Skip to content

Commit 600297b

Browse files
committed
Updated haskell.nix
1 parent ab7b36e commit 600297b

File tree

3 files changed

+137
-28
lines changed

3 files changed

+137
-28
lines changed

nix-tools/flake.lock

+133-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix-tools/flake.nix

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
inputs = {
33
nixpkgs.follows = "haskellNix/nixpkgs";
4+
# nixpkgs-unstable.url = "github:NixOS/nixpkgs";
45

56
haskellNix.url = "github:input-output-hk/haskell.nix";
67
};

nix-tools/static/zipped.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ let
4747
pkgs.runCommand "${pkgs.hostPlatform.system}-all-nix-tools" {
4848
requiredSystemFeatures = [ "recursive-nix" ];
4949
nativeBuildInputs =
50-
[ pkgs.nix pkgs.gitMinimal ]
50+
# [ inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.nix pkgs.gitMinimal ]
51+
[ (pkgs.lib.trace pkgs.nix.version pkgs.nix) pkgs.gitMinimal ]
5152
++ stringifyInputs inputs
5253
++ stringifyInputs inputs.haskellNix.inputs;
5354
} ''
5455
export HOME=$(mktemp -d)
5556
mkdir $out
56-
cp $(nix --offline --extra-experimental-features "flakes nix-command recursive-nix" \
57+
cp $(nix --offline --extra-experimental-features "flakes nix-command" \
5758
build --accept-flake-config --no-link --print-out-paths --no-allow-import-from-derivation \
5859
--system ${pkgs.hostPlatform.system} \
5960
${../.}#${fragment-drv})/*.zip $out/

0 commit comments

Comments
 (0)