From 7cb947ef5443709f4fc7a13cce55ce6b0befeeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 11 May 2021 09:49:07 +0200 Subject: [PATCH 1/7] python3Packages.tensorflow: 2.4.0 -> 2.4.1 Changelog: https://github.com/tensorflow/tensorflow/releases/tag/v2.4.1 (cherry picked from commit ef3322507a8523eb487dd31e4d1b30e05db36363) --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0216c05eeac..522fd730127 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.4.0"; + version = "2.4.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -110,7 +110,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "0yl06aypfxrcs35828xf04mkidz1x0j89v0q5h4d2xps1cb5rv3f"; + sha256 = "sha256-J62QfP45g5nxN9Nqa1tAGyc4vD2JKh50ddHLrd6/qsY="; }; patches = [ From da141a254370d28d8172a02320edd99f6012c5c7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 22 Jul 2021 23:55:38 +0100 Subject: [PATCH 2/7] python3Packages.tensorflow: 2.4.1 -> 2.4.2 (cherry picked from commit 98fa0f29bc394e3f9048ae18376b4ce08254fe7e) --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 522fd730127..372c371b545 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.4.1"; + version = "2.4.2"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -110,7 +110,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "sha256-J62QfP45g5nxN9Nqa1tAGyc4vD2JKh50ddHLrd6/qsY="; + sha256 = "07a2y05hixch1bjag5pzw3p1m7bdj3bq4gdvmsfk2xraz49b1pi8"; }; patches = [ From cee88fa02aab382324af0e6dbeeb728e796ed39e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 4 Aug 2021 23:42:13 +0000 Subject: [PATCH 3/7] linux: 4.4.277 -> 4.4.278 (cherry picked from commit 202b9e653658a7b77ebd41c7858cd57b8e8655dc) --- 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 9f0f566494d..e74cd257d28 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.277"; + version = "4.4.278"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5"; + sha256 = "1r2sbxn8finzcg72ds5dyh4578vv2s5zwylq3b3xyw3hzr4swn4f"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 44afd0cf9ab8eb1b9b67f0317f759296bd9d922f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 4 Aug 2021 23:42:21 +0000 Subject: [PATCH 4/7] linux: 4.9.277 -> 4.9.278 (cherry picked from commit aea5caaeab20f2991593c4ccde0bf5d540e8394b) --- 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 5d3a556da3d..d88479ee18c 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.277"; + version = "4.9.278"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6"; + sha256 = "04byav6cbga3jqkppygm5zj73d9v44xyvx6hbrhwr22lsk282dz7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From ab3104a98db5dc518749ac48cd6eead0a9275bf1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 4 Aug 2021 23:42:35 +0000 Subject: [PATCH 5/7] linux: 5.13.7 -> 5.13.8 (cherry picked from commit ba2b85dbbb72f34dcdce87f1a1d8fe376d5a5e2b) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 2f2dc1516b2..efa1329153c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.7"; + version = "5.13.8"; # 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 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr"; + sha256 = "0a54r71mcyqvq7c8kff817vh6zfj0bdzmp6ql4az84wq9nwc526h"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From e96ec15bc42339c59e6775d25de4636ab1621323 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 5 Aug 2021 17:21:00 +0200 Subject: [PATCH 6/7] signal-desktop: 5.12.1 -> 5.12.2 (cherry picked from commit bba311e5dfcc7a67aa63fea41839ce7b52fa05cf) --- .../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 a3c12277b3b..2f0a2d9faff 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.12.1"; # Please backport all updates to the stable channel. + version = "5.12.2"; # 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: @@ -35,7 +35,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 = "099p0bmaa60dfij5wq9pyfxnhy77cdnfqx4dj4377rzyfmfgnhzx"; + sha256 = "0z8nphlm3q9gqri6bqh1iaayx5yy0bhrmjb7l7facdkm1aahmaa7"; }; nativeBuildInputs = [ From 5ed554543c2e570de87c81abcfb894c0af0f6e2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Aug 2021 10:01:37 +0100 Subject: [PATCH 7/7] [Backport release-21.05] terraria-server: update source URL (#132855) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * terraria-server: update source URL The old URL redirects to the main page. (cherry picked from commit 1e919bfeedae2abefb520a4fad7e9e37e98be8e0) * Apply suggestions from code review Co-authored-by: Naïm Favier Co-authored-by: Jörg Thalheim --- pkgs/games/terraria-server/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index b5a8c7e486b..95510266c45 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { - url = "https://terraria.org/system/dedicated_servers/archives/000/000/046/original/terraria-server-${urlVersion}.zip"; + url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; sha256 = "0qm4pbm1d9gax47fk4zhw9rcxvajxs36w7dghirli89i994r7g8j"; }; @@ -14,16 +14,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook unzip ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp -r Linux $out/ chmod +x "$out/Linux/TerrariaServer.bin.x86_64" ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer + + runHook postInstall ''; meta = with lib; { homepage = "https://terraria.org"; - description = - "Dedicated server for Terraria, a 2D action-adventure sandbox"; + description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; };