diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-17 07:01:38 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-17 07:01:38 -0700 |
| commit | c227fb4b17469864298087f8c9367e4cfc8dd6b9 (patch) | |
| tree | 6f4db8017a8bd3975d257c5f35e637caa39c6a2b /pkgs/test | |
| parent | 3ff6965554e6daedca27cf6a87d35cbbbec4afb7 (diff) | |
| parent | 631cbc3de7aaf244d322111ada656e0bedf55bff (diff) | |
| download | nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.gz nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.bz2 nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.lz nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.xz nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.zst nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/tools/rust/cargo-cache/default.nix pkgs/development/tools/rust/cargo-embed/default.nix pkgs/development/tools/rust/cargo-flash/default.nix pkgs/servers/nosql/influxdb2/default.nix
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 89656dde292..b9f05bdff8d 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -50,5 +50,7 @@ with pkgs; cuda = callPackage ./cuda { }; + trivial = callPackage ../build-support/trivial-builders/test.nix {}; + writers = callPackage ../build-support/writers/test.nix {}; } |