From f2281f6186ab73006e516bb1976e3271137e6a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Wed, 26 May 2021 13:38:08 +0200 Subject: [PATCH 01/17] nixos/boot: properly override the kernel in boot.kernelPatches Previously the code took the kernelPatches of the final derivation, which might or might not be what was passed to the derivation in the original call. The previous behaviour caused various hacks to become neccessary to avoid duplicates in kernelPatches. (cherry picked from commit 436f61c878e3992b3d980168a5532416dd5be504) --- nixos/modules/system/boot/kernel.nix | 6 +++--- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 2 +- pkgs/os-specific/linux/kernel/linux-rt-5.11.nix | 2 +- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 363d8e47a0ff..1a6a9d99d5bb 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -38,11 +38,11 @@ in default = pkgs.linuxPackages; type = types.unspecified // { merge = mergeEqualOption; }; apply = kernelPackages: kernelPackages.extend (self: super: { - kernel = super.kernel.override { + kernel = super.kernel.override (originalArgs: { inherit randstructSeed; - kernelPatches = super.kernel.kernelPatches ++ kernelPatches; + kernelPatches = (originalArgs.kernelPatches or []) ++ kernelPatches; features = lib.recursiveUpdate super.kernel.features features; - }; + }); }); # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 78d1155e8ed7..6ef781f6095c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -27,7 +27,7 @@ in buildLinux (args // { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk"; }; - }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + }; in [ rt-patch ] ++ kernelPatches; structuredExtraConfig = with lib.kernel; { PREEMPT_RT = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix index d9ebedf68016..5d1b14f1d0f0 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix @@ -27,7 +27,7 @@ in buildLinux (args // { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc"; }; - }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + }; in [ rt-patch ] ++ kernelPatches; structuredExtraConfig = with lib.kernel; { PREEMPT_RT = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index ec065e6833e2..7be45dc3e683 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -23,7 +23,7 @@ in buildLinux (args // { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; sha256 = "0prfrvk2ds20sclikizzgg5qf4mfcyaymp9r272d5nj35293622n"; }; - }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + }; in [ rt-patch ] ++ kernelPatches; structuredExtraConfig = with lib.kernel; { PREEMPT_RT = yes; From a17528c2843edb40bae6585564b7749fe4e6a25c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 Oct 2021 23:33:53 +0200 Subject: [PATCH 02/17] php74: 7.4.24 -> 7.4.25, fix CVE-2021-21703 Details: https://nvd.nist.gov/vuln/detail/CVE-2021-21703 ChangeLog: https://www.php.net/ChangeLog-7.php#7.4.25 (cherry picked from commit af404d852f39b18257024d8010192d74829c0917) --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 849767b2b722..4f4d30a2f24f 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -5,8 +5,8 @@ let base = callPackage generic (_args // { - version = "7.4.24"; - sha256 = "0cigvwp469kmc27r28liq5dwdz5icp61vqqr3w24jhw6i2vk43pm"; + version = "7.4.25"; + sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM="; }); in base.withExtensions ({ all, ... }: with all; ([ From 1b8d9c1854476650c4949509605d6da729e34b91 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 Oct 2021 23:35:07 +0200 Subject: [PATCH 03/17] php80: 8.0.11 -> 8.0.12, fix CVE-2021-21703 Details: https://nvd.nist.gov/vuln/detail/CVE-2021-21703 ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.12 (cherry picked from commit ab5c10c42a95de2192f270ea13ba05e149e8cead) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 507d16246149..993b356fcb27 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.11"; - sha256 = "0fj0yk0h0fvr9ckszp496wdyvf8kdfsvydw95qg0q0g4hm18gvbh"; + version = "8.0.12"; + sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8="; }); in base.withExtensions ({ all, ... }: with all; ([ From 4ecfdc7f469181455f1a9244cd0bfeefdc71e5ce Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 19 Sep 2021 09:29:56 +0900 Subject: [PATCH 04/17] haskell.compiler.ghcjs: mark hydraPlatforms as none because output is too large (cherry picked from commit 3389aab889719081e240ce169ec5bc0d5ccd60d0) --- pkgs/development/compilers/ghcjs/8.10/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index f1ef34eed51e..b2d480888441 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -108,7 +108,15 @@ in stdenv.mkDerivation { inherit passthru; - # The emscripten is broken on darwin - meta.platforms = lib.platforms.linux; - meta.maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + meta = { + # The emscripten is broken on darwin + platforms = lib.platforms.linux; + + # Hydra limits jobs to only outputting 1 gigabyte worth of files. + # GHCJS outputs over 3 gigabytes. + # https://github.com/NixOS/nixpkgs/pull/137066#issuecomment-922335563 + hydraPlatforms = lib.platforms.none; + + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + }; } From ce5e240b2b61c970768b3e3fd0f74061450d5e61 Mon Sep 17 00:00:00 2001 From: Divam Narula Date: Sun, 26 Sep 2021 13:51:46 +0900 Subject: [PATCH 05/17] ghcjs: Enable on darwin (#139067) (cherry picked from commit d032f60c37ebdae3afd9a24212497ec8725ee4fb) --- pkgs/development/compilers/ghcjs/8.10/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index b2d480888441..f8e7c31353f7 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -109,8 +109,7 @@ in stdenv.mkDerivation { inherit passthru; meta = { - # The emscripten is broken on darwin - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; # Hydra limits jobs to only outputting 1 gigabyte worth of files. # GHCJS outputs over 3 gigabytes. From 7670a0e6c675b6c63ac2431912f77044e1be5388 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:14 +0000 Subject: [PATCH 06/17] linux: 4.14.252 -> 4.14.253 (cherry picked from commit 20e62a2b01f41a2ead0408c8c65b02edfcce95d9) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 553d8dd786e2..bc94f0d74426 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.252"; + version = "4.14.253"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "022rw51s8fzz6wcxa9xq6h60fglfx0hq7bmqgs5dlrci6plv4fwk"; + sha256 = "1mgl55c8fa2ry4qp0phkdkzjhwfnkbhvi266n348kyjyqnjl234f"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 75c0de24952b9bcb61defc810e68eef744eccb8a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:20 +0000 Subject: [PATCH 07/17] linux: 4.19.213 -> 4.19.214 (cherry picked from commit b7efb90537964cee5fb6c350d14d89b477e58912) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a1df1a43ccd2..f95156685c6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.213"; + version = "4.19.214"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "162f5y3jplql3ca5xy889mq6izjinryx2kx16zp582yvsqf8rwiq"; + sha256 = "0i08np4gxiks7chp6j328pdqb02apbba53mj4zvxb9v37qpxzqgz"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From f9c1a37c6030444f65f135f2d08f4489a11471b8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:24 +0000 Subject: [PATCH 08/17] linux: 4.4.289 -> 4.4.290 (cherry picked from commit 3a69f006d9418de7ee58d16e1b32ec55dd0eca85) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8adc9cf57a5f..1f6ee3f4dc50 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.289"; + version = "4.4.290"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1g77kf0yzwvpdxs3kw7wdvb07mmk3zm6ydjcw5dnsza8q2inl69k"; + sha256 = "1dcx58nmzkcc5nz2b5b7mgw4w7y28v3s9wd8h78czdqfa0kxrl20"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From fbdac79b1a0e6266662a7e7ae38e45bc8fa07e52 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:29 +0000 Subject: [PATCH 09/17] linux: 4.9.287 -> 4.9.288 (cherry picked from commit 19735ff28026c7d3bb6f7ec2b30f30d392c95eab) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index f52749a6dd8d..0342785f5095 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.287"; + version = "4.9.288"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hlpxnlz0y5vxcmkavsirk2kfb2l34fcvmhlcb99slh28xkjhhfl"; + sha256 = "0v5592v565bl924c23m1n7p5zddr0w7zn8m97pmikk6p7cyhjq9n"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 01915f55ea71c01f2e494a76e259569a26a2c6bf Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:34 +0000 Subject: [PATCH 10/17] linux: 5.10.75 -> 5.10.76 (cherry picked from commit 4bd2c087e06419ffb266cd8f39d4a755437bf845) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index d5b394450ae9..11142efb9a60 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.75"; + version = "5.10.76"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0jrhhk89587caw54nhnwms93kq33qdm75x5f18cp61xrxxgjyaqa"; + sha256 = "140qkvs88b5zh6mxxzpf36z1r8bbvyh3yigripqjz1k236x0j2j8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From c34af3c32f2727b61afd6dd3699b3af5b7831d0f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:41 +0000 Subject: [PATCH 11/17] linux: 5.14.14 -> 5.14.15 (cherry picked from commit 0719e92d1b84200d990ace44c039b3f001997c7d) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 337ef105d7c7..e9d10e5d4683 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.14"; + version = "5.14.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0snh17ah49wmfmazy6x42rhvl484h657y0iq4l09a885sjb4xzsd"; + sha256 = "01m4qw1z7xn3ngsbm1bvcvikqpkjjr9n8585556wkmz9d469mwvl"; }; } // (args.argsOverride or { })) From 35fe117f23ac443ea8677d5ae1cde8e36d31ecf7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:52:46 +0000 Subject: [PATCH 12/17] linux: 5.4.155 -> 5.4.156 (cherry picked from commit 67e5b8b626c12d575e10a82e88644bbf257eac86) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0104e3c3be32..a92b1b5bf8b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.155"; + version = "5.4.156"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0f2hfz76rnhmv99zhbh7n1z48316ilxrxrnh4b5m3lj84y80y36c"; + sha256 = "1zkpqfhrc5n0yiij3jzvzywgabva53c8668f1ly1pkrzcbj77zh6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 4d8b9a6846fc172f260d0711529d6382ff32d139 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:53:20 +0000 Subject: [PATCH 13/17] linux-rt_5_4: 5.4.143-rt64 -> 5.4.154-rt65 (cherry picked from commit 55af4f5da2bf6d1c28aca5c98ecbc31504de01ea) --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 7be45dc3e683..c299cd2a27d7 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.143-rt64"; # updated by ./update-rt.sh + version = "5.4.154-rt65"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9"; + sha256 = "01iwbz1ncakw90yykdw3cx04wnclwf1qa8nmlis08svbcvs99285"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0prfrvk2ds20sclikizzgg5qf4mfcyaymp9r272d5nj35293622n"; + sha256 = "0vbcmwg91hzcxiwq9dj550bw24k8r7lk61j06nwcnwmjg9a3g449"; }; }; in [ rt-patch ] ++ kernelPatches; From 7868d08c53c5855dee0b91eee15343a21d227c3e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 27 Oct 2021 09:53:28 +0000 Subject: [PATCH 14/17] linux_latest-libre: 18380 -> 18413 (cherry picked from commit 748cc6042768547201a9f6c4365cda6ed3d7dbd4) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 8ee8c663b3b5..9153b9232493 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18380"; - sha256 = "0sg7mnxqzc5zdnl8l7gfy1kc52w7c85fdhywvdbjgs7inx2bb1qd"; + rev = "18413"; + sha256 = "1s0nr3pnczr1ijv86307mfhmkk7xn5ah46wx6jrx857agcd73fzq"; } , ... }: From 7f1ea2dc2d5f733a424954b8aab426a1adf182db Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 26 Oct 2021 21:57:01 +0200 Subject: [PATCH 15/17] signal-desktop: 5.20.0 -> 5.21.0 (cherry picked from commit 374ab216aa4a37febf54eefe605d0cbe18cd4fe2) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 174dab625a7b..114be0833103 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let --set LC_MESSAGES "${spellcheckerLanguage}"''); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.20.0"; # Please backport all updates to the stable channel. + version = "5.21.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0a57gajxjqkp7zcmjc3iiys06b7v53nd81gkwrsfn2gmshihlzkd"; + sha256 = "19bp5gjf13n87cyicqaikmz3bdx6szazq1kbp4gkyhq0mw7nah7c"; }; nativeBuildInputs = [ From 27db642c6508320584d8b69d5e8141cb6b844018 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 29 Jul 2021 20:14:53 -0400 Subject: [PATCH 16/17] multimc: change license to asl20 (cherry picked from commit 9a8f5b712fa5beb86659dd1f2d0a830c16f4cfc9) --- pkgs/games/multimc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index aa32efaa9402..7ccafd2b8600 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -43,7 +43,7 @@ in mkDerivation rec { Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; platforms = platforms.linux; - license = licenses.lgpl21Plus; + license = licenses.asl20; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } From 28188b0b4278babff90a8fdc2480d377fd099bda Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 29 Jul 2021 20:18:05 -0400 Subject: [PATCH 17/17] multimc: don't re-distribute package Fixes NixOS#131983 (cherry picked from commit 8dfddb341ebaf718904722692dbbcd1d5d9d5e12) --- pkgs/games/multimc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 7ccafd2b8600..8e72b9588561 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -44,6 +44,9 @@ in mkDerivation rec { ''; platforms = platforms.linux; license = licenses.asl20; + # upstream don't want us to re-distribute this application: + # https://github.com/NixOS/nixpkgs/issues/131983 + hydraPlatforms = []; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; }