Nix: allow building from pure-eval mode (#2427)

* default.nix: allow import with pure-eval enabled

* Update hercules-ci/gitignore

* shell.nix: fix import of default.nix
This commit is contained in:
Matt Votava
2022-08-15 20:44:02 -05:00
committed by GitHub
parent ba3ba9fd5b
commit f75e77cf60
4 changed files with 9 additions and 7 deletions
+4 -2
View File
@@ -1,3 +1,5 @@
{ system ? builtins.currentSystem }:
let let
name = name =
"postgrest"; "postgrest";
@@ -42,7 +44,7 @@ let
# Evaluated expression of the Nixpkgs repository. # Evaluated expression of the Nixpkgs repository.
pkgs = pkgs =
import nixpkgs { inherit overlays; }; import nixpkgs { inherit overlays system; };
postgresqlVersions = postgresqlVersions =
[ [
@@ -64,7 +66,7 @@ let
# Function that derives a fully static Haskell package based on # Function that derives a fully static Haskell package based on
# nh2/static-haskell-nix # nh2/static-haskell-nix
staticHaskellPackage = staticHaskellPackage =
import nix/static-haskell-package.nix { inherit nixpkgs compiler patches allOverlays; }; import nix/static-haskell-package.nix { inherit nixpkgs system compiler patches allOverlays; };
# Options passed to cabal in dev tools and tests # Options passed to cabal in dev tools and tests
devCabalOptions = devCabalOptions =
+2 -2
View File
@@ -12,8 +12,8 @@ self: super:
gitignoreSrc = super.fetchFromGitHub { gitignoreSrc = super.fetchFromGitHub {
owner = "hercules-ci"; owner = "hercules-ci";
repo = "gitignore"; repo = "gitignore";
rev = "211907489e9f198594c0eb0ca9256a1949c9d412"; rev = "a20de23b925fd8264fd7fad6454652e142fd7f73";
sha256 = "06j7wpvj54khw0z10fjyi31kpafkr6hi1k0di13k1xp8kywvfyx8"; sha256 = "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=";
}; };
in in
(super.callPackage gitignoreSrc { }).gitignoreSource; (super.callPackage gitignoreSrc { }).gitignoreSource;
+2 -2
View File
@@ -1,5 +1,5 @@
# Derive a fully static Haskell package based on musl instead of glibc. # Derive a fully static Haskell package based on musl instead of glibc.
{ nixpkgs, compiler, patches, allOverlays }: { nixpkgs, system, compiler, patches, allOverlays }:
name: src: name: src:
let let
@@ -46,7 +46,7 @@ let
# Apply our overlay to nixpkgs. # Apply our overlay to nixpkgs.
normalPkgs = normalPkgs =
import nixpkgs { inherit overlays; }; import nixpkgs { inherit overlays system; };
defaultCabalPackageVersionComingWithGhc = defaultCabalPackageVersionComingWithGhc =
{ {
+1 -1
View File
@@ -11,7 +11,7 @@
}: }:
let let
postgrest = postgrest =
import ./default.nix; import ./default.nix { };
inherit (postgrest) pkgs; inherit (postgrest) pkgs;