Skip to content

Commit 8a11bb0

Browse files
committed
Remove usage of nixWrapped.
it was introduced for adding flake flags by default and also as a work around for nix flake show/check: NixOS/nix#4265 But the added complexity is not worth it, given it breaks other workflows with nix run (since the wrapper script does not use `exec`). Also nowadays everyone (should) have flake activated by default in the nix config.
1 parent 0c5d82b commit 8a11bb0

File tree

7 files changed

+6
-21
lines changed

7 files changed

+6
-21
lines changed

nix/README.md

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
# Nix dependencies
22

3-
The nix build use the new flake format to manage dependencies. A flake-compatible nix command is provided from within `nix-shell`. To add flake support to your native nix setup please see https://nixos.wiki/wiki/Flakes.
3+
The nix build use the new flake format to manage dependencies. To add flake support to your native nix setup please see https://nixos.wiki/wiki/Flakes.
44

55
Cardano-node nix build depends primarily on [haskell.nix](https://github.com/input-output-hk/haskell.nix) and secondarily, for some utilities, on [iohk-nix](https://github.com/input-output-hk/iohk-nix/).
66

7-
Both can be updated from within a cardano-node `nix-shell` with:
7+
Both can be updated with:
88

99
```
1010
nix flake lock --update-input haskellNix
1111
nix flake lock --update-input iohkNix
1212
```
13-
14-
Or from outside the `nix-shell` with the scripts:
15-
16-
```
17-
./nix/update-haskellNix.sh
18-
./nix/update-iohkNix.sh
19-
```

nix/update-haskellNix.sh

-4
This file was deleted.

nix/update-iohkNix.sh

-4
This file was deleted.

nix/workbench/analyse.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
pkgs.runCommand "workbench-run-analysis-${profileNix.name}"
88
{ requiredSystemFeatures = [ "benchmark" ];
99
nativeBuildInputs = with pkgs.haskellPackages; with pkgs;
10-
[ bash coreutils gnused jq moreutils nixWrapped workbench.workbench ];
10+
[ bash coreutils gnused jq moreutils nix workbench.workbench ];
1111
}
1212
''
1313
echo "analysing run: ${run}"

nix/workbench/backend/runner.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ in
8484
gnused
8585
jq
8686
moreutils
87-
nixWrapped
87+
nix
8888
pstree
8989
workbench.workbench
9090
zstd

nix/workbench/shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ in project.shellFor {
9393
pkgs.graphviz
9494
graphmod
9595
weeder
96-
nixWrapped
96+
nix
9797
pkgconfig
9898
profiteur
9999
profiterole

shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ let
9797
packages = _: [];
9898

9999
nativeBuildInputs = with cardanoNodePackages; [
100-
nixWrapped
100+
nix
101101
cardano-cli
102102
bech32
103103
cardano-ping

0 commit comments

Comments
 (0)