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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-12 18:02:35 +00:00 committed by GitHub
commit 695f489e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/release-combined.nix
View File

@ -156,7 +156,6 @@ in rec {
(onSystems ["i686-linux"] "nixos.tests.zfs.installer") (onSystems ["i686-linux"] "nixos.tests.zfs.installer")
(onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.emacs")
(onFullSupported "nixpkgs.jdk") (onFullSupported "nixpkgs.jdk")
(onFullSupported "nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck")
["nixpkgs.tarball"] ["nixpkgs.tarball"]
]; ];
}; };

1
nixos/release-small.nix
View File

@ -120,7 +120,6 @@ in rec {
"nixos.tests.proxy.x86_64-linux" "nixos.tests.proxy.x86_64-linux"
"nixos.tests.simple.x86_64-linux" "nixos.tests.simple.x86_64-linux"
"nixpkgs.jdk.x86_64-linux" "nixpkgs.jdk.x86_64-linux"
"nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-linux"
"nixpkgs.tarball" "nixpkgs.tarball"
]; ];
}; };

8
pkgs/test/default.nix
View File

@ -24,14 +24,6 @@ with pkgs;
config = callPackage ./config.nix { }; config = callPackage ./config.nix { };
# we can't add 'nixpkgs.curl.tests' to hydra jobs due to 'tests' (and 'passthru') being stripped
# TODO: add a function in lib-release.nix to get derivations and add `.x86_64-linux` to them
# then we can just point release files to nixpkgs.tests.packageTestsForChannelBlockers instead of
# nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck
packageTestsForChannelBlockers = recurseIntoAttrs {
curl = recurseIntoAttrs pkgs.curl.tests;
};
haskell = callPackage ./haskell { }; haskell = callPackage ./haskell { };
cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };

2
pkgs/top-level/release.nix
View File

@ -97,7 +97,6 @@ let
jobs.lib-tests jobs.lib-tests
jobs.pkgs-lib-tests jobs.pkgs-lib-tests
jobs.stdenv.x86_64-linux jobs.stdenv.x86_64-linux
jobs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-linux
jobs.cargo.x86_64-linux jobs.cargo.x86_64-linux
jobs.go.x86_64-linux jobs.go.x86_64-linux
jobs.linux.x86_64-linux jobs.linux.x86_64-linux
@ -134,7 +133,6 @@ let
++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
++ lib.optionals supportDarwin.x86_64 [ ++ lib.optionals supportDarwin.x86_64 [
jobs.stdenv.x86_64-darwin jobs.stdenv.x86_64-darwin
jobs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-darwin
jobs.cargo.x86_64-darwin jobs.cargo.x86_64-darwin
jobs.cachix.x86_64-darwin jobs.cachix.x86_64-darwin
jobs.go.x86_64-darwin jobs.go.x86_64-darwin