diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2020-04-29 11:09:50 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2020-04-29 11:09:50 +0200 |
| commit | 50befbedeb9c987d78b12a5cce81b1a9ea95f535 (patch) | |
| tree | 77b15d55d81ef214f45257fb94a811cad109011c | |
| parent | 3b344e015c753f02f9cb033e8f0466e53b45445a (diff) | |
Replace default.nix with shell.nix
Use the ci.nix and move it to shell.nix.
With this, default.nix is no longer needed.
Docs and CI configuration is adapted.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | .builds/nixos.yml | 8 | ||||
| -rw-r--r-- | default.nix | 32 | ||||
| -rw-r--r-- | doc/src/09010-contributing.md | 2 | ||||
| -rw-r--r-- | shell.nix (renamed from ci.nix) | 0 |
4 files changed, 5 insertions, 37 deletions
diff --git a/.builds/nixos.yml b/.builds/nixos.yml index eef09fab..5fee7051 100644 --- a/.builds/nixos.yml +++ b/.builds/nixos.yml @@ -12,19 +12,19 @@ tasks: bash ./scripts/version-updated - install: | cd imag - nix-shell ./ci.nix --run "echo nix-shell ready" + nix-shell ./shell.nix --run "echo nix-shell ready" - userdoc: | cd imag - nix-shell ./ci.nix --run "cargo install mdbook --force" + nix-shell ./shell.nix --run "cargo install mdbook --force" cd doc/user ~/.cargo/bin/mdbook build - build: | cd imag - nix-shell ./ci.nix --run "cargo build --all --all-features" + nix-shell ./shell.nix --run "cargo build --all --all-features" - prepare-test: | git config --global user.name "Test user" git config --global user.email "test@user.tld" - test: | cd imag - nix-shell ./ci.nix --run "cargo test --all --all-features" + nix-shell ./shell.nix --run "cargo test --all --all-features" diff --git a/default.nix b/default.nix deleted file mode 100644 index d038df2a..00000000 --- a/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs ? (import <nixpkgs> {}) }: - -let - env = with pkgs.rustChannels.stable; [ - rust - cargo - ]; - - dependencies = with pkgs; [ - cmake - curl - gcc - libpsl - openssl - pkgconfig - which - zlib - dbus - libtool - ]; -in - -pkgs.stdenv.mkDerivation rec { - name = "imag"; - src = /var/empty; - version = "0.0.0"; - - buildInputs = env ++ dependencies; - - LIBCLANG_PATH="${pkgs.llvmPackages.libclang}/lib"; -} - diff --git a/doc/src/09010-contributing.md b/doc/src/09010-contributing.md index 81dce995..2a2cd082 100644 --- a/doc/src/09010-contributing.md +++ b/doc/src/09010-contributing.md @@ -25,7 +25,7 @@ The prerequisites are simple: `cargo` and `rustc` in current version (stable) or newer (we do not use nighly features though). Build dependencies for building are listed in the -[default.nix file](http://git.imag-pim.org/imag/tree/default.nix), +[shell.nix file](http://git.imag-pim.org/imag/tree/shell.nix), though you do not have to have the `nix` package manager installed to build imag. Everything else will be done by `cargo`. |