Skip to content
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.

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

Fix nix update scripts to work without using a system-wide nixFlake #2766

Merged
merged 1 commit into from
Jun 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions nix/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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.

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:

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

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

```
./nix/update-haskellNix.sh
./nix/update-iohkNix.sh
```
4 changes: 4 additions & 0 deletions nix/update-haskellNix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
cd "$(dirname "$0")/.."
nix-shell -I nixpkgs=./nix -p nixWrapped \
--run "nix flake update --update-input haskellNix"
3 changes: 0 additions & 3 deletions nix/update-iohk-nix.sh

This file was deleted.

4 changes: 4 additions & 0 deletions nix/update-iohkNix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
cd "$(dirname "$0")/.."
nix-shell -I nixpkgs=./nix -p nixWrapped \
--run "nix flake update --update-input iohkNix"