diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-22 06:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 06:01:10 +0000 |
| commit | cbcbfb490198385bc119c152e7a4cf58b6c49ec2 (patch) | |
| tree | a752073e7df2e4d23e9c0c32dad578d7c11b6d2f /pkgs/top-level | |
| parent | 2f9a2c9dfeae6c11773f88a64a8b7f501e5a9a89 (diff) | |
| parent | 726f7c9688bad4574abee4f47565bf272daf8f81 (diff) | |
| download | nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.gz nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.bz2 nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.lz nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.xz nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.zst nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b72cdb9034d..658913a445d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1841,6 +1841,8 @@ with pkgs; pacparser = callPackage ../tools/networking/pacparser { }; + parquet-tools = callPackage ../tools/misc/parquet-tools { }; + pass = callPackage ../tools/security/pass { }; passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e109cca8207..2aa9f8482f1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -173,12 +173,17 @@ in { ]; }; - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_testing = let + testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + latest = packageAliases.linux_latest.kernel; + in if latest.kernelAtLeast testing.baseVersion + then latest + else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { kernel = linux_5_15; |