JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #151411 from hercules-ci/pkgs-tests-fetch

Browse Source 
pkgs.tests: Add fetcher tests so ofborg can run them
This commit is contained in:
Robert Hensing 2021-12-20 18:33:50 +01:00 committed by GitHub
commit f6ff6c4ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/test/default.nix
View File

@ -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 {};

6
pkgs/top-level/all-packages.nix
View File

@ -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 {};