From af3175189576e643e3662652a8528c493fa74583 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 03:46:18 +0000 Subject: [PATCH 01/42] python38Packages.google-cloud-tasks: 2.5.2 -> 2.6.0 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 138637d70a7b..45999fb332bb 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "af870971187b3d58fc87a81323cabec1628fac910c6af82076dd6270b111f17e"; + sha256 = "fd9fe318063ec0f7e4e1780aca81a798d3e90e8def1c24b6f450ea1a8c131c0a"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; From df7ff9c12bd48f57a7de8ef0c21b3fcfe279c7e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 06:05:49 +0000 Subject: [PATCH 02/42] python38Packages.google-cloud-monitoring: 2.5.1 -> 2.6.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 938c97689aaa..1ebb1fa6332e 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f8b3842fd11965a3872622988359a21bff62bd1b7b9be3ccf095b7ae2f4c796f"; + sha256 = "47feb2e635ef79af98696eb22a5af1db8a78b3a2919e39bdec65ba45659b59ac"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From 2cf2aaf93468eedb8cba4293fb6a8f78fbd66820 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 06:11:20 +0000 Subject: [PATCH 03/42] python38Packages.google-cloud-texttospeech: 2.5.3 -> 2.6.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 201e0ce821f9..9adb5df95974 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2672f5caf518105fe9389269efd59a0761ad48b8140e68bac3f6a5062be9d8a4"; + sha256 = "d24dec1ee71bb63a7f6805b2d78923b2325de59407b4688978b7769bbafc3eb8"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From 51a29c24e2e34fb87264ce677f93cc20591dba4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 06:25:18 +0000 Subject: [PATCH 04/42] python38Packages.google-cloud-videointelligence: 2.3.3 -> 2.4.0 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 942c100a5964..e405c43e90f2 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.3.3"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bb3a98b5b8044be80c5fdbd76e7acd9b9bdd6026729a53eae9692a9a6c6683ef"; + sha256 = "92dd4f1e87b02ab414ad744eefa321e079358527cb8c352e1054ae1dab5f1055"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From eee7a432039dcf06415ad401f4b75c260ad0b9c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 06:30:34 +0000 Subject: [PATCH 05/42] python38Packages.google-cloud-datacatalog: 3.4.2 -> 3.4.3 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6e9bf1aa29e1..74410ea129df 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.4.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "f16ff1bb49ff760cdc0ff30bbc352f0c27b8bdd2ba76d8bf22e0fd9af3a2ca16"; + sha256 = "1b0f7bb8aaf8a3e0f4b4509808ee9e1de77b5f076214b0b3e52e0ce86734fd84"; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; From 172b3fb07011549fc4b264f27043109160a13f68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Oct 2021 03:34:38 +0000 Subject: [PATCH 06/42] python38Packages.google-cloud-runtimeconfig: 0.32.6 -> 0.33.0 --- .../python-modules/google-cloud-runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 91a1e354acca..fb581ee0c604 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.6"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "3f333aa1f6a47cb5a38f3416c4ac9a4bbeaceeb1f3f2381fef9553c9fb665cc7"; + sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; From b060f936a3cdff7602a529c5ed586b825a3c40a1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Oct 2021 14:20:01 +0000 Subject: [PATCH 07/42] python38Packages.r2pipe: 1.6.2 -> 1.6.4 --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index fb767e5c4685..1d7b4e95e854 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.6.2"; + version = "1.6.4"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "088e1a0778f8021af90b9458c9b706ae3d303a3e6a5064e1ca25d4fd737dc3c7"; + sha256 = "a79877781b8e8e9bd5612faebd3991d75d7189f2941021d2adea9b4b4c5b9b7b"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From 7bd84b66850100c3ffdec3ee9ef7c27a6a57ce41 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Sun, 26 Sep 2021 17:54:36 +0200 Subject: [PATCH 08/42] systemd-boot: add 'graceful' configuration option On some systems bootctl cannot write the `LoaderSystemToken` EFI variable during installation, which results in a failure to install the boot loader. Upstream provides a flag (--graceful) to ignore such write failures - this change exposes it as a configuration option. As the exact semantics of this option appear to be somewhat volatile it should be used only if systemd-boot otherwise fails to install. --- .../systemd-boot/systemd-boot-builder.py | 13 +++++++++---- .../boot/loader/systemd-boot/systemd-boot.nix | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 7134b4321630..6c26b4e0f87a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -208,10 +208,15 @@ def main() -> None: if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") - if "@canTouchEfiVariables@" == "1": - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) - else: - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) + flags = [] + + if "@canTouchEfiVariables@" != "1": + flags.append("--no-variables") + + if "@graceful@" == "1": + flags.append("--graceful") + + subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@"] + flags + ["install"]) else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ff304f570d35..0f76d7d6b24a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -24,7 +24,7 @@ let configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; - inherit (cfg) consoleMode; + inherit (cfg) consoleMode graceful; inherit (efi) efiSysMountPoint canTouchEfiVariables; @@ -126,6 +126,22 @@ in { ''; }; }; + + graceful = mkOption { + default = false; + + type = types.bool; + + description = '' + Invoke bootctl install with the --graceful option, + which ignores errors when EFI variables cannot be written or when the EFI System Partition + cannot be found. Currently only applies to random seed operations. + + Only enable this option if systemd-boot otherwise fails to install, as the + scope or implication of the --graceful option may change in the future. + ''; + }; + }; config = mkIf cfg.enable { From 9d09793cab9e323575821a2b6fd1fcc19a2c8965 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Oct 2021 23:07:39 +0200 Subject: [PATCH 09/42] python3Packages.asyncwhois: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/asyncwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index c19dcda24522..4bb201b251e9 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yJ+AHUyzAl8lRcKcLfMJ8InhV0LVUK+Neb5ngQOwFTM="; + sha256 = "sha256-mKKN2IuveOE+3mZGS5LFa15lJPA9y7KgLd0FoRuEMH0="; }; propagatedBuildInputs = [ From 95194b0dff87481d22e78b5796542f6f0c0aa4da Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 12 Oct 2021 00:04:27 +0200 Subject: [PATCH 10/42] yggdrasil: add genkeys utility --- pkgs/tools/networking/yggdrasil/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 874205f592bd..bb17691cbad4 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -13,14 +13,12 @@ buildGoModule rec { vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; - doCheck = false; - # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to # be granted write permission to /run. patches = [ ./change-runtime-dir.patch ]; - subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; + subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" From 292a1d631000c0c40686b15a972615b82970f413 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 12 Oct 2021 10:17:32 +1100 Subject: [PATCH 11/42] htslib: 1.11 -> 1.13 --- pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 3233a29449aa..52822baca631 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1mrq4mihzx37yqhj3sfz6da6mw49niia808bzsw2gkkgmadxvyng"; + sha256 = "sha256-8kB9+fl/C7awdlZXnkGhylEARkBntrIb+WKi6ksO/WU="; }; # perl is only used during the check phase. From 02a1a2b3c81a8a93bbc75046804cfe4e90f1bced Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 12 Oct 2021 10:19:36 +1100 Subject: [PATCH 12/42] samtools: 1.11 -> 1.13 --- pkgs/applications/science/biology/samtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 20d9565bce44..99210092a154 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1dp5wknak4arnw5ghhif9mmljlfnw5bgm91wib7z0j8wdjywx0z2"; + sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA="; }; nativeBuildInputs = [ perl ]; From ddf8d9a0d4f19bfe5d009ac15af53aea4abfeb1d Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 12 Oct 2021 10:58:07 +1100 Subject: [PATCH 13/42] pythonPackages.pysam: 0.16.0.1 -> 0.17.0 --- pkgs/development/python-modules/pysam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 31e01e83dbf6..41cdcad20385 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.16.0.1"; + version = "0.17.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "168bwwm8c2k22m7paip8q0yajyl7xdxgnik0bgjl7rhqg0majz0f"; + sha256 = "sha256-RDeBq6pwBGCBNIn8YOPQr96GuL6FKEYeLAPQD6XN0iE="; }; nativeBuildInputs = [ samtools ]; From 7cea9253efc82c7638e24b3e9588e78a93f6aabe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 04:05:10 +0000 Subject: [PATCH 14/42] python38Packages.google-cloud-speech: 2.9.3 -> 2.10.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 90ec3078d24e..849f1ea6ef94 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.9.3"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "52b8a056f26e9ed082576b7b173c9a86f286a12c2883ec7cf5a0e8be68020bac"; + sha256 = "bc85ae6694c9a1e02046364776b9f2401a3826ddc7b532b32c316559ff4f1afa"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From a835cbba0df8c4a85fc42ba2f22c36895fb18bbe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:20:48 +0000 Subject: [PATCH 15/42] electron_13: 13.5.1 -> 13.5.2 https://github.com/electron/electron/releases/tag/v13.5.2 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 4aca895c6af3..590cc9765eb3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,14 +115,14 @@ rec { headers = "1m1hcdb96rcxcdg812cn2m68bh1s1h6qyy39lmvkjvhbpyzd02pr"; }; - electron_13 = mkElectron "13.5.1" { - armv7l-linux = "9cb773eaa9882c313513cb1bb552f8bcac859f35854de477dc2ec6cc24e7d003"; - aarch64-linux = "ae605f169482b1c40e9449073c0f962cceeac4166a00cb304ba22f4f5a7a5d48"; - x86_64-linux = "4d145dbca59541d665435198c9fb697b1ec85c6e525878b7f48ecb8431dc4836"; - i686-linux = "95acabcf7d0a5a3bbfa0634c1956d8aea59565fb695d22ec65edd77c2a09e3a8"; - x86_64-darwin = "ac342741a17034ccc305b83fde18d014f8c6080f8f7143e953545a945542168d"; - aarch64-darwin = "79ad1c22afb2e5338467621fc16a092d16be329c3b60bb753caa311e9933a4b4"; - headers = "0pjj0ra5ksn6cdqiy84ydy45hivksknzbq3szs9r9dlajcczgw9l"; + electron_13 = mkElectron "13.5.2" { + armv7l-linux = "f325d48761ec222a2f9bbf0d0a3b995959266314b8375d4d6bb8e014bddd3a06"; + aarch64-linux = "6d89c41e53d8c14ae4a4b7f2f9d7b477055decad3074675e4cef745967829688"; + x86_64-linux = "6f9b9ad08f74ea8a2c214a7bafbc5b08e316674ff964b91a93f575e499d00464"; + i686-linux = "62d8766c1c921a95b24e2128bcee66e2e832491715df51554d9a12a16087d35c"; + x86_64-darwin = "d5f6262e89a986e3a453f37086ce27e389c9b3fab0f797d169c7a065aac80850"; + aarch64-darwin = "04213cc9303b2114b0db2db0e1a598427788118c125d306b68d1da6ee41a8d2f"; + headers = "1hpcpnkzs834fr5kqaiww4dpq44bpxhgbrrs6a2njkdfv4j3xmrk"; }; electron_14 = mkElectron "14.1.1" { From edbfad1cd5e0742b8e25ed69c67cda494b53fc5d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:21:15 +0000 Subject: [PATCH 16/42] electron_12: 12.2.1 -> 12.2.2 https://github.com/electron/electron/releases/tag/v12.2.2 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 590cc9765eb3..5a70d57045ce 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.1" { - armv7l-linux = "7cad4f432655e3ac8b4b2f792648015f820f52abe4f2f489302de6d5a170d62a"; - aarch64-linux = "53f4397bf88f026f1a73919b6d1c74eb15b908283f93935801b76647530acd08"; - x86_64-linux = "a3e736c286f326eced0080f29a56b546c308716f4ce0d4f144adc37b530990ef"; - i686-linux = "be333c8fffb8adbf96b19b33f87e1cbe6ff8a36ecd0a5c48fa8352fed8850510"; - x86_64-darwin = "9a8e4fe8069e164fb2a87736bc9f9a1546a5c4060c499a92a7f9a95bd3c5c19d"; - aarch64-darwin = "e9844eeb0e2a26ba60a8eb1540f0d1c52069806c885842a33b45b4fd2b2bb187"; - headers = "1m1hcdb96rcxcdg812cn2m68bh1s1h6qyy39lmvkjvhbpyzd02pr"; + electron_12 = mkElectron "12.2.2" { + armv7l-linux = "aeee4acf40afa0397c10a4c76bc61ed2967433bab5c6f11de181fa33d0b168ff"; + aarch64-linux = "593a3fef97a7fed8e93b64d659af9c736dff445eedcbfd037f7d226a88d58862"; + x86_64-linux = "a8e88c67f375e41f3a6f8b8a8c3a1e41b8c0a46f1b731e05de21208caa005fb2"; + i686-linux = "5f0bdc9581237f2f87b5d34e232d711617bd8bf5ff5d7ebd66480779c13fba0a"; + x86_64-darwin = "8a33d2bed668e30a6d64856e01d2aa3b1f1d9efe4eb0e808e916694d32d5e8f2"; + aarch64-darwin = "256daa25a8375c565b32c3c2f0e12fbac8d5039a13a9edbb3673a863149b750a"; + headers = "1fvqkw08pync38ixi5cq4f8a108k2ajxpm1w2f8sn2hjph9kpbsd"; }; electron_13 = mkElectron "13.5.2" { From 958841476247089d81cd662619dce303e119b81c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 05:15:47 +0000 Subject: [PATCH 17/42] python38Packages.google-cloud-container: 2.8.1 -> 2.9.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 15f496c99182..39358062fc04 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.8.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "dc0302b1fa4a435ffd97c13d669ed5b1a60c5a0a21d5528418466ca54d0cd4d5"; + sha256 = "2454e8dd93093fe6f6ec8e6771f8a7dab19f1d02c629dbbe8972e84b5d9c01e0"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; From 6ddd8a833e3feafb42d0682aceae26cb6557b7d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 06:28:50 +0000 Subject: [PATCH 18/42] python38Packages.google-cloud-automl: 2.4.2 -> 2.5.0 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index f7a567357310..98ff29921d0e 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c3zlpCejXB/RO8RnyFUpDknefpoMZWXWgaS7ACpqdAw="; + sha256 = "c360f40f4c63e16ae6dfe701892bb74a1055169e58f1ef39136809eecf73264e"; }; propagatedBuildInputs = [ From 8e3a5a34049d4dfb469ee7e5f112585fc5c09a30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Oct 2021 09:30:43 +0200 Subject: [PATCH 19/42] mpop: 1.4.14 -> 1.4.15 --- pkgs/applications/networking/mpop/default.nix | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 75f620ead9cf..a14e55e51f29 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,26 +1,42 @@ -{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }: - -with lib; +{ lib +, stdenv +, fetchurl +, gnutls +, gsasl +, libidn +, pkg-config +, Security +}: stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "046wbglvry54id9wik6c020fs09piv3gig3z0nh5nmyhsxjw4i18"; + sha256 = "sha256-P1KytdS8WO2TzwsRRs7k903oHCwHol7gMu+mWUZaAnA="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnutls gsasl libidn ] - ++ optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; - configureFlags = optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + buildInputs = [ + gnutls + gsasl + libidn + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; - meta = { - description = "POP3 mail retrieval agent"; - homepage = "https://marlam.de/mpop"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; + configureFlags = lib.optional stdenv.isDarwin [ + "--with-macosx-keyring" + ]; + + meta = with lib;{ + description = "POP3 mail retrieval agent"; + homepage = "https://marlam.de/mpop"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; } From c15eb6722d48c8b312770beb9ee3afb47fcb819b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Oct 2021 09:37:14 +0200 Subject: [PATCH 20/42] urlscan: 0.9.6 -> 0.9.7 --- pkgs/applications/misc/urlscan/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 576d66659a3a..c125c2f75161 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,24 +1,31 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "D+WJ1HG1gXIFtIpaqazFqC9Y4GBCUsz88U8q8W9tHFA="; + sha256 = "sha256-Wg1QecSMyifID9uIvVWrmkHax4FbbwEcoXIZ8V8P3FU="; }; - propagatedBuildInputs = [ python3Packages.urwid ]; + propagatedBuildInputs = [ + python3Packages.urwid + ]; doCheck = false; # No tests available + pythonImportsCheck = [ "urlscan" ]; + meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; homepage = "https://github.com/firecat53/urlscan"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; } From 670dcebf7a104e2e77086644ccbf3f49b57ff33c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 12 Oct 2021 09:38:20 +0200 Subject: [PATCH 21/42] mutt: 2.1.2 -> 2.1.3 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index a7b90c284acf..a94555e7959b 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0s9wkygjd7xhvd1zdaidbvszq4abb0iv5830ir65glcfzbdbfak9"; + sha256 = "0z74slnq3y9wr1xr07jigz4n8dgxhk9qb0787sd0j6wj9g4rqxgg"; }; patches = optional smimeSupport (fetchpatch { From ad1aa8ecf9414a46d20fffe9021f11e7a99926b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 07:53:04 +0000 Subject: [PATCH 22/42] python38Packages.google-cloud-error-reporting: 1.2.3 -> 1.3.0 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index e9bf6f82d021..3e1a1c93bfb4 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.2.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5a7d742ab1c94525a68c75c94ccb7af3f19759627ebe7869fe16db158f0eba4e"; + sha256 = "a5482a7b05ac3be13a3d96db32d158cb4cebf0ac35c82c3a27ee2fd9aa0dcc25"; }; postPatch = '' From 880b84b37c84d6bd56804fca47f9f91358e1feb8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Oct 2021 16:00:56 +0800 Subject: [PATCH 23/42] maddy: 0.5.0 -> 0.5.2 --- pkgs/servers/maddy/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 658d5e34fb33..3f495add9f18 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -1,23 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils }: +{ lib, buildGoModule, fetchFromGitHub, coreutils, installShellFiles, scdoc }: buildGoModule rec { pname = "maddy"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-SxJfuNZBtwaILF4zD4hrTANc/GlOG53XVwg3NvKYAkg="; + sha256 = "sha256-b85g8Eu7qWTI+ggMr7JL/2BAVbkXocpsR89P6s6TfMg="; }; - vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; + vendorSha256 = "sha256-kzSwqT3r6uGxq1GNzCWCn8VoCxmVtiUb23XLCpsPv/c="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; + nativeBuildInputs = [ installShellFiles scdoc ]; + postInstall = '' + for f in docs/man/*.scd; do + local page="docs/man/$(basename "$f" .scd)" + scdoc < "$f" > "$page" + installManPage "$page" + done + mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ @@ -33,6 +41,6 @@ buildGoModule rec { description = "Composable all-in-one mail server"; homepage = "https://maddy.email"; license = licenses.gpl3Plus; - maintainers = with maintainers; []; + maintainers = with maintainers; [ nickcao ]; }; } From 860a61f1ccf13a49e7f1ab0fa5d2ceb6abb0fd6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 08:11:39 +0000 Subject: [PATCH 24/42] img2pdf: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/img2pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 204e3e93b8d3..48557d34bc86 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-OKEinKhLIR13gtHWWtclGpeBvyT29kl8c4x1X8/tVVI="; + sha256 = "sha256-qs9YZQPWET5Tv7A8hcheVGw4RBOlbBXd0I7lHIZEeaI="; }; propagatedBuildInputs = [ From 467fb8f8b3a4c5a527b6d25e4d03ae69afdb39ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 09:01:19 +0000 Subject: [PATCH 25/42] python38Packages.google-cloud-securitycenter: 1.6.0 -> 1.7.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 74fb1f1e01b2..404a51529934 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "5ac6bad2506d21e9176dcc1afd74cd9c87209c40e85cd2a03bb0421f76b7fa77"; + sha256 = "7321a88191d61ca0cc720b7ad07d9693e07726728492739930562bcd33ec1494"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From db3dea9b26a10473943b00e2051792ade361679b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Oct 2021 11:07:38 +0200 Subject: [PATCH 26/42] python3Packages.python-gvm: 21.10.0 -> 21.10.0 --- .../python-modules/python-gvm/default.nix | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 27b85215e655..5f3ff50d1a8d 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -1,19 +1,18 @@ { lib , stdenv , buildPythonPackage +, defusedxml , fetchFromGitHub -, fetchpatch +, lxml +, paramiko , poetry-core , pytestCheckHook , pythonOlder -, paramiko -, lxml -, defusedxml }: buildPythonPackage rec { pname = "python-gvm"; - version = "21.6.0"; + version = "21.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "070qpj2y7834i50lhkkbv93s77j91js06zs1bpbmplppiraxqmyz"; + sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA="; }; nativeBuildInputs = [ @@ -30,24 +29,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - paramiko - lxml defusedxml + lxml + paramiko ]; checkInputs = [ pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/greenbone/python-gvm/pull/552 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/greenbone/python-gvm/commit/e48afa614ba9cf69d9b22ce1a4642c625acbaa06.patch"; - sha256 = "0f5wfdymp5dcjk1xb7ynsf0g6idjg2ifwgggp4agic5nkh1k1inl"; - }) - ]; - disabledTests = [ # No running SSH available "test_connect_error" @@ -55,7 +45,9 @@ buildPythonPackage rec { "test_feed_xml_error" ]; - pythonImportsCheck = [ "gvm" ]; + pythonImportsCheck = [ + "gvm" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; From a98569d9d6dcf274d85d910a999e4090cab1211f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Oct 2021 11:08:28 +0200 Subject: [PATCH 27/42] python3Packages.gvm-tools: disable sending tests --- pkgs/development/python-modules/gvm-tools/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 6c946b826252..8d3d4f240bd5 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -43,7 +43,14 @@ buildPythonPackage rec { }) ]; - pythonImportsCheck = [ "gvmtools" ]; + disabledTests = [ + # Don't test sending + "SendTargetTestCase" + ]; + + pythonImportsCheck = [ + "gvmtools" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; From 7be5740e5b84de183afecaf2047c6b4717dceebb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 Oct 2021 15:38:24 +0000 Subject: [PATCH 28/42] python38Packages.sagemaker: 2.59.8 -> 2.60.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 95a649bf9afb..32c6cc4f9f11 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.59.8"; + version = "2.60.0"; src = fetchPypi { inherit pname version; - sha256 = "655cf9b86fdba71f505e809b97a63c5cd5973158578a141748db83c469e87d87"; + sha256 = "0fbd43343918137460eb1b563a81fe6de9b51c2ae4be0b844cf198c5567cd82e"; }; pythonImportsCheck = [ From 1fa11a373e221c1aeab52764c095a86ce5911989 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 03:08:20 +0000 Subject: [PATCH 29/42] oh-my-zsh: 2021-10-07 -> 2021-10-11 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index de3177f7ca49..ba9ac9fdab35 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-07"; + version = "2021-10-11"; pname = "oh-my-zsh"; - rev = "dc83d0b7204cf66315471e980729490813b7d915"; + rev = "beeda72826f7288d3edf6cec4114bbda9bbae347"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "7V6v9II48C4OoTf2CBQt+mqfh4kbMb8MspGBkX42Q/c="; + sha256 = "Ch1r4fSKR3VGDO/4GLJj2vETOEa6oRb1noEl8N4vJps="; }; installPhase = '' From ac66a2835c4d62a6a85aef9db9264fa0f328b757 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:35 +0000 Subject: [PATCH 30/42] linux: 4.14.249 -> 4.14.250 --- 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 8eff0d4d78f9..69ca1d3e2541 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.249"; + version = "4.14.250"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0wn4yw9fliw3a8knvj2hdprbyyx7akm9ycclr2y1whpa5gmrc3rj"; + sha256 = "0zbf6gxm8iwf7cra310gfd0zyj8l9ckdahky9w6wb9wlznwkvd54"; }; } // (args.argsOverride or {})) From 4d1cd369c8483f1b2c20c461546e13e40427649a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:39 +0000 Subject: [PATCH 31/42] linux: 4.19.209 -> 4.19.210 --- 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 1e4abbdb67f7..922675fa422c 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.209"; + version = "4.19.210"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "04z9hxgqw2p86xxi2667kaj2w99xxxiw9gn9i1217c305swxa9vk"; + sha256 = "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"; }; } // (args.argsOverride or {})) From 97f30440d94dfa35521108e6fd263053b4710069 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:44 +0000 Subject: [PATCH 32/42] linux: 4.4.287 -> 4.4.288 --- 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 72a0d434e819..8f52d3af51de 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.287"; + version = "4.4.288"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qraild006in01vsqbhx1lf585g34skzwi2m3hv3kal8s03q0gzw"; + sha256 = "028w3yzmzymy7l1nf3n1pfbg95hfi4ilphkyl00ddgj8sfm542c7"; }; } // (args.argsOverride or {})) From 049968322bc63cccbbebe400dddfed022c103e28 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:50 +0000 Subject: [PATCH 33/42] linux: 4.9.285 -> 4.9.286 --- 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 8b67538fb302..4c00580a8aa5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.285"; + version = "4.9.286"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hkkk4mhr5qnrhwqcz0b20rff6j8pnwd868a5hsq8s867pa24ajb"; + sha256 = "0id62p43dmkl9ir278p0dsfg3q7m1d8rlxv0c9qi1pzalkygv8p2"; }; } // (args.argsOverride or {})) From 2363ead00306ec8ff8e34ac8b855b4f81af00dfc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:56 +0000 Subject: [PATCH 34/42] linux: 5.10.71 -> 5.10.72 --- 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 0f7acb6ccc20..5a8ef895c2b9 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.71"; + version = "5.10.72"; # 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 = "15x4jbwy6j78ss31avdl7nr0mw4w6a1y6c6dyljh6gwngp98irh2"; + sha256 = "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"; }; } // (args.argsOverride or {})) From e2be686e0a24e791ceb9a3b806aa949102bb344e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:05:03 +0000 Subject: [PATCH 35/42] linux: 5.14.10 -> 5.14.11 --- 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 c0864239133f..465a3f82d515 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.10"; + version = "5.14.11"; # 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 = "1n454038vp55wbi814fqpidjmk8k6p6h0jl07hknpd6imgh2bkj5"; + sha256 = "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"; }; } // (args.argsOverride or { })) From 1d14ebf4140eebcb6a5c956b0a6fe6a513260c30 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:05:11 +0000 Subject: [PATCH 36/42] linux: 5.4.151 -> 5.4.152 --- 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 ca4ad25ebf1d..931f9f56f828 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.151"; + version = "5.4.152"; # 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 = "04rkymyg79mp1frdlkizc7k33palplmnnnz8klkag9ii7jw3zrxv"; + sha256 = "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"; }; } // (args.argsOverride or {})) From 86589e8cd38e73ca655aef4f363cb06b946102bb Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:07:49 +0000 Subject: [PATCH 37/42] linux_latest-libre: 18314 -> 18380 --- 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 d9f8912416a5..d8d9edcf4af7 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 = "18314"; - sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; + rev = "18380"; + sha256 = "0sg7mnxqzc5zdnl8l7gfy1kc52w7c85fdhywvdbjgs7inx2bb1qd"; } , ... }: From 6e94404dc33f7ad6fc491ed6fe6fcc0e5f23611c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:09 +0000 Subject: [PATCH 38/42] linux/hardened/patches/4.14: 4.14.248-hardened1 -> 4.14.250-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6b9aaccadd36..7b427f604f4c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.248-hardened1.patch", - "sha256": "1lwqlpd21f8rwqfyz61083w0lg2bjzdjf7rzrqxsw1jz0l879035", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.248-hardened1/linux-hardened-4.14.248-hardened1.patch" + "name": "linux-hardened-4.14.250-hardened1.patch", + "sha256": "1jgqmrj5djapvk56jwlfq181knhywzrk9cswv1lp5y2jwnnvlj9x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.250-hardened1/linux-hardened-4.14.250-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 8df94e6d31232545ae83cc6cc44f210810234774 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:10 +0000 Subject: [PATCH 39/42] linux/hardened/patches/4.19: 4.19.208-hardened1 -> 4.19.210-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 7b427f604f4c..ef5446694466 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.208-hardened1.patch", - "sha256": "0bg45n1kgd628gwjkp1vxslxyci6589ygy9mmmhpl7kj3y7370ck", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.208-hardened1/linux-hardened-4.19.208-hardened1.patch" + "name": "linux-hardened-4.19.210-hardened1.patch", + "sha256": "0lnv0ym6jcf460hsn26lax65n2yb1vvzsfmckaz04jb2kdgm6hr5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.210-hardened1/linux-hardened-4.19.210-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 42dd28857d8eaddaca3e36b23f6ee7e3d6f98181 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:11 +0000 Subject: [PATCH 40/42] linux/hardened/patches/5.10: 5.10.70-hardened1 -> 5.10.72-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ef5446694466..55a2fce8244b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.70-hardened1.patch", - "sha256": "12r6x7v7n3f7c7pn86ivykg6gqmqlzwrsncdkvj5qf7raw38ad5r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.70-hardened1/linux-hardened-5.10.70-hardened1.patch" + "name": "linux-hardened-5.10.72-hardened1.patch", + "sha256": "14zchx1hc4jrq7prv4kkswjnmyqv74wfkjvky57scc8yl04yaqs6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.72-hardened1/linux-hardened-5.10.72-hardened1.patch" }, "5.14": { "extra": "-hardened1", From 331bb5fcecd7397cbcc86b26b3f014c1294fa78e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:12 +0000 Subject: [PATCH 41/42] linux/hardened/patches/5.14: 5.14.9-hardened1 -> 5.14.11-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 55a2fce8244b..bc6cb947891b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.9-hardened1.patch", - "sha256": "190588p6xw65y1f106zgnv5s043yi633vg0zdbz85qjz27g49db8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.9-hardened1/linux-hardened-5.14.9-hardened1.patch" + "name": "linux-hardened-5.14.11-hardened1.patch", + "sha256": "05n74rnq5c2jx7iynxwgj5wypb0i0p3dar0ri2zxmyssasmbkfa7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.11-hardened1/linux-hardened-5.14.11-hardened1.patch" }, "5.4": { "extra": "-hardened1", From c7b05f54dff6c0a5775523035d3ee4111050229d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:13 +0000 Subject: [PATCH 42/42] linux/hardened/patches/5.4: 5.4.150-hardened1 -> 5.4.152-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bc6cb947891b..8e1902b61dc1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.150-hardened1.patch", - "sha256": "0vaxp5lfs7d5py0530sdhz8yzbzjxlwaam63mflwfd4mm8gf3ggc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.150-hardened1/linux-hardened-5.4.150-hardened1.patch" + "name": "linux-hardened-5.4.152-hardened1.patch", + "sha256": "01rf9za9sv14pxpi0pj1izq4bihhldi2qnhaka5rxlw7nifzzsj2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.152-hardened1/linux-hardened-5.4.152-hardened1.patch" } }