diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-12-20 13:12:30 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-12-20 13:13:07 +0100 |
commit | 7195f7d5b9c2963fa9796a1231e479f9b309f2b8 (patch) | |
tree | e69160830a953ef3b8d65f208fb061e3b27042a7 | |
parent | ced417eb721ece1be46da84e14506f80773e1cdc (diff) |
pkgs.tests: Add fetcher tests so ofborg can run them
-rw-r--r-- | pkgs/test/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b73617daa8952..2ca3fc6c950e1 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -27,6 +27,10 @@ with pkgs; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; + fetchgit = callPackages ../build-support/fetchgit/tests.nix { }; + fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; + install-shell-files = callPackage ./install-shell-files {}; kernel-config = callPackage ./kernel.nix {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c3d02871e60..f81c27fec97e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -488,7 +488,7 @@ with pkgs; cacert = buildPackages.cacert; git-lfs = buildPackages.git-lfs; }) // { # fetchgit is a function, so we use // instead of passthru. - tests = callPackages ../build-support/fetchgit/tests.nix {}; + tests = pkgs.tests.fetchgit; }; fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; @@ -531,7 +531,7 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { } // { - tests = callPackages ../build-support/fetchpatch/tests.nix { }; + tests = pkgs.tests.fetchpatch; }; fetchs3 = callPackage ../build-support/fetchs3 { }; @@ -549,7 +549,7 @@ with pkgs; fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon { } // { - tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; + tests = pkgs.tests.fetchFirefoxAddon; }; fetchNextcloudApp = callPackage ../build-support/fetchnextcloudapp {}; |