Skip to content

Commit 5468683

Browse files
committed
Move to contrib/nix
1 parent dbeee90 commit 5468683

File tree

3 files changed

+52
-36
lines changed

3 files changed

+52
-36
lines changed

contrib/nix/README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# `nix` flake
2+
3+
Build `stacks-node` and `stacks-signer` by pointing to the `flake.nix` file in
4+
this directory. For instance, from the root directory: `nix build
5+
'./contrib/nix'`.
6+
7+
## Using `direnv`
8+
9+
If using `direnv`, from the root directory of this repository:
10+
11+
```bash
12+
echo "use flake ./contrib/nix/" > .envrc
13+
direnv allow
14+
```
15+
16+
This will provide a `sh` environment with required dependencies (e.g., `bitcoind`) available.

flake.lock renamed to contrib/nix/flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix renamed to contrib/nix/flake.nix

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939

4040
inherit (pkgs) lib;
4141

42-
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain;
42+
toolchain = pkgs.rust-bin.fromRustupToolchainFile ../../rust-toolchain;
4343
craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
4444

4545
name = "stacks-core";
4646

47-
versions = (builtins.fromTOML (builtins.readFile ./versions.toml));
47+
versions = (builtins.fromTOML (builtins.readFile ../../versions.toml));
4848
version = versions.stacks_node_version;
4949

5050
# Common arguments can be set here to avoid repeating them later
@@ -68,7 +68,7 @@
6868
// {
6969
inherit version;
7070
pname = name;
71-
src = fileSetForCrate ./.;
71+
src = fileSetForCrate ../..;
7272
}
7373
);
7474

@@ -83,35 +83,35 @@
8383
fileSetForCrate =
8484
crate:
8585
lib.fileset.toSource {
86-
root = ./.;
86+
root = ../..;
8787
fileset = lib.fileset.unions [
88-
./Cargo.toml
89-
./Cargo.lock
88+
../../Cargo.toml
89+
../../Cargo.lock
9090
#
91-
./versions.toml
91+
../../versions.toml
9292
#
93-
./stx-genesis/name_zonefiles.txt
94-
./stx-genesis/name_zonefiles.txt.sha256
95-
./stx-genesis/name_zonefiles-test.txt
96-
./stx-genesis/name_zonefiles-test.txt.sha256
97-
./stx-genesis/chainstate.txt
98-
./stx-genesis/chainstate.txt.sha256
99-
./stx-genesis/chainstate-test.txt
100-
./stx-genesis/chainstate-test.txt.sha256
93+
../../stx-genesis/name_zonefiles.txt
94+
../../stx-genesis/name_zonefiles.txt.sha256
95+
../../stx-genesis/name_zonefiles-test.txt
96+
../../stx-genesis/name_zonefiles-test.txt.sha256
97+
../../stx-genesis/chainstate.txt
98+
../../stx-genesis/chainstate.txt.sha256
99+
../../stx-genesis/chainstate-test.txt
100+
../../stx-genesis/chainstate-test.txt.sha256
101101
#
102102
(craneLib.fileset.commonCargoSources crate)
103103
#
104-
(lib.fileset.fileFilter (file: file.hasExt "clar") ./.)
104+
(lib.fileset.fileFilter (file: file.hasExt "clar") ../..)
105105
#
106-
(craneLib.fileset.commonCargoSources ./clarity)
107-
(craneLib.fileset.commonCargoSources ./contrib/tools/relay-server)
108-
(craneLib.fileset.commonCargoSources ./libsigner)
109-
(craneLib.fileset.commonCargoSources ./libstackerdb)
110-
(craneLib.fileset.commonCargoSources ./pox-locking)
111-
(craneLib.fileset.commonCargoSources ./stacks-common)
112-
(craneLib.fileset.commonCargoSources ./stackslib)
113-
(craneLib.fileset.commonCargoSources ./stx-genesis)
114-
(craneLib.fileset.commonCargoSources ./testnet/stacks-node)
106+
(craneLib.fileset.commonCargoSources ../../clarity)
107+
(craneLib.fileset.commonCargoSources ../../contrib/tools/relay-server)
108+
(craneLib.fileset.commonCargoSources ../../libsigner)
109+
(craneLib.fileset.commonCargoSources ../../libstackerdb)
110+
(craneLib.fileset.commonCargoSources ../../pox-locking)
111+
(craneLib.fileset.commonCargoSources ../../stacks-common)
112+
(craneLib.fileset.commonCargoSources ../../stackslib)
113+
(craneLib.fileset.commonCargoSources ../../stx-genesis)
114+
(craneLib.fileset.commonCargoSources ../../testnet/stacks-node)
115115
];
116116
};
117117

@@ -122,7 +122,7 @@
122122
pname = "stacks-signer";
123123
cargoFeatures = "--features monitoring_prom";
124124
cargoExtraArgs = "${cargoFeatures} -p ${pname}";
125-
src = fileSetForCrate ./stacks-signer;
125+
src = fileSetForCrate ../../stacks-signer;
126126
}
127127
);
128128

@@ -136,7 +136,7 @@
136136
pname = name;
137137
cargoFeatures = "--features monitoring_prom,slog_json";
138138
cargoExtraArgs = "${cargoFeatures}";
139-
src = fileSetForCrate ./.;
139+
src = fileSetForCrate ../..;
140140
}
141141
);
142142
in

0 commit comments

Comments
 (0)