Mirrors/naersk
2
0
Fork 0
mirror of https://github.com/nix-community/naersk synced 2024-11-26 05:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable --locked by default

Browse source
This commit is contained in:
Nicolas Mattia 2020-02-06 23:28:28 +01:00
parent 45bee2e6b5
commit 92432c40d9
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -51,7 +51,7 @@ it is converted to an attribute set equivalent to `{ root = theArg; }`.
| `cargoTestCommands` | The commands to run in the `checkPhase`. Default: `[ ''cargo $cargo_options test $cargo_test_options'' ]` | | `cargoTestCommands` | The commands to run in the `checkPhase`. Default: `[ ''cargo $cargo_options test $cargo_test_options'' ]` |
| `cargoTestOptions` | baaaar Default: `[ "$cargo_release" ''-j "$NIX_BUILD_CORES"'' ]` | | `cargoTestOptions` | baaaar Default: `[ "$cargo_release" ''-j "$NIX_BUILD_CORES"'' ]` |
| `buildInputs` | Extra `buildInputs` to all derivations. Default: `[]` | | `buildInputs` | Extra `buildInputs` to all derivations. Default: `[]` |
| `cargoOptions` | Options passed to cargo before the command (cargo OPTIONS <cmd>) used by the default cargoBuild Default: `[ "--locked" "-Z" "unstable-options" ]` | | `cargoOptions` | Options passed to cargo before the command (cargo OPTIONS <cmd>) used by the default cargoBuild Default: `[ "-Z" "unstable-options" ]` |
| `doDoc` | When true, `cargo doc` is run and a new output `doc` is generated. Default: `false` | | `doDoc` | When true, `cargo doc` is run and a new output `doc` is generated. Default: `false` |
| `release` | When true, all cargo builds are run with `--release`. sets cargo_release Default: `true` | | `release` | When true, all cargo builds are run with `--release`. sets cargo_release Default: `true` |
| `override` | An override for all derivations involved in the build. Default: `(x: x)` | | `override` | An override for all derivations involved in the build. Default: `(x: x)` |

2
config.nix
View file

@ -47,7 +47,7 @@ let
# Options passed to cargo before the command (cargo OPTIONS <cmd>) # Options passed to cargo before the command (cargo OPTIONS <cmd>)
# used by the default cargoBuild # used by the default cargoBuild
cargoOptions = cargoOptions =
allowFun attrs0 "cargoOptions" [ "--locked" "-Z" "unstable-options" ]; allowFun attrs0 "cargoOptions" [ "-Z" "unstable-options" ];
# When true, `cargo doc` is run and a new output `doc` is generated. # When true, `cargo doc` is run and a new output `doc` is generated.
doDoc = attrs0.doDoc or false; doDoc = attrs0.doDoc or false;

10
test.nix
View file

@ -110,11 +110,7 @@ rec
doDoc = true; doDoc = true;
}; };
simple-dep-patched = naersk.buildPackage simple-dep-patched = ./test/simple-dep-patched;
{ root = ./test/simple-dep-patched;
# TODO: the lockfile needs to be regenerated
cargoOptions = builtins.filter (x: x != "--locked");
};
dummyfication = naersk.buildPackage ./test/dummyfication; dummyfication = naersk.buildPackage ./test/dummyfication;
dummyfication_test = pkgs.runCommand dummyfication_test = pkgs.runCommand
@ -124,12 +120,12 @@ rec
git-dep = naersk.buildPackage { git-dep = naersk.buildPackage {
root = ./test/git-dep; root = ./test/git-dep;
cargoOptions = [ "--locked" ]; cargoOptions = (opts: opts ++ [ "--locked" ]);
}; };
git-dep-dup = naersk.buildPackage { git-dep-dup = naersk.buildPackage {
root = ./test/git-dep-dup; root = ./test/git-dep-dup;
cargoOptions = [ "--locked" ]; cargoOptions = (opts: opts ++ [ "--locked" ]);
}; };
cargo-wildcard = naersk.buildPackage ./test/cargo-wildcard; cargo-wildcard = naersk.buildPackage ./test/cargo-wildcard;