Skip to content

Commit

Permalink
Remove usage of nixWrapped.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jbgi committed Feb 7, 2023
1 parent 0c5d82b commit 8a11bb0
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 21 deletions.
11 changes: 2 additions & 9 deletions nix/README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
# Nix dependencies

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.
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.

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/).

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

```
nix flake lock --update-input haskellNix
nix flake lock --update-input iohkNix
```

Or from outside the `nix-shell` with the scripts:

```
./nix/update-haskellNix.sh
./nix/update-iohkNix.sh
```
4 changes: 0 additions & 4 deletions nix/update-haskellNix.sh

This file was deleted.

4 changes: 0 additions & 4 deletions nix/update-iohkNix.sh

This file was deleted.

2 changes: 1 addition & 1 deletion nix/workbench/analyse.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
pkgs.runCommand "workbench-run-analysis-${profileNix.name}"
{ requiredSystemFeatures = [ "benchmark" ];
nativeBuildInputs = with pkgs.haskellPackages; with pkgs;
[ bash coreutils gnused jq moreutils nixWrapped workbench.workbench ];
[ bash coreutils gnused jq moreutils nix workbench.workbench ];
}
''
echo "analysing run: ${run}"
Expand Down
2 changes: 1 addition & 1 deletion nix/workbench/backend/runner.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ in
gnused
jq
moreutils
nixWrapped
nix
pstree
workbench.workbench
zstd
Expand Down
2 changes: 1 addition & 1 deletion nix/workbench/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ in project.shellFor {
pkgs.graphviz
graphmod
weeder
nixWrapped
nix
pkgconfig
profiteur
profiterole
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ let
packages = _: [];

nativeBuildInputs = with cardanoNodePackages; [
nixWrapped
nix
cardano-cli
bech32
cardano-ping
Expand Down

0 comments on commit 8a11bb0

Please sign in to comment.