Skip to content

Remove usage of nixWrapped. #4866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2023
Merged

Remove usage of nixWrapped. #4866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions nix/README.md
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions nix/update-iohkNix.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion nix/workbench/analyse.nix
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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