From ab4789bf07ecdc89439a713f8a54a19125ec6eef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 01:35:35 +0000 Subject: [PATCH 01/23] stella: 6.6 -> 6.7 (cherry picked from commit a5c0e67ed47a51d0f68b2536af00be42b1d41273) --- pkgs/applications/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/stella/default.nix b/pkgs/applications/emulators/stella/default.nix index 212c06690468..593845cca61c 100644 --- a/pkgs/applications/emulators/stella/default.nix +++ b/pkgs/applications/emulators/stella/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "stella"; - version = "6.6"; + version = "6.7"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - hash = "sha256-+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI="; + hash = "sha256-E8vbBbsVMOSY3iSSE+UCwBwmfHU7Efmre1cYlexVZ+E="; }; nativeBuildInputs = [ From e2920f23495da9c4005a6bf6e0d6808f41d292b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 16:11:31 +0000 Subject: [PATCH 02/23] lbreakouthd: 1.0.9 -> 1.0.10 (cherry picked from commit 8a1f471e850856c91682b04203a4a462176e9225) --- pkgs/games/lgames/lbreakouthd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix index 59447f2d0029..bfe8eecc95b8 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lbreakouthd"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-MHwK4jeDfZSS4jh///jW0/q4ntM4IuB0fQ8Bsaq0d0s="; + hash = "sha256-hlGhPa91u6pOaZoFJSDcXYQdizTFjuuTLnx9fcrXUhA="; }; buildInputs = [ From dd68bb484de727a24b9c98e764681b3a4085ec32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 07:27:50 +0000 Subject: [PATCH 03/23] zxing-cpp: 1.2.0 -> 1.4.0 (cherry picked from commit 1953e425a90d98b3adad981310216b1207578f82) --- pkgs/development/libraries/zxing-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 514ebe9975ad..126ef2bc69d6 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zxing-cpp"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nu-book"; repo = pname; rev = "v${version}"; - hash = "sha256-M565VNKhSmYFmCMEI9UFuHWNZWeHrf9qzZkMAw9LUr4="; + hash = "sha256-MTu8tvJXpo6+Z0aSIZ27nmerNtNBOwnL/jDkGedIiM8="; }; nativeBuildInputs = [ From 9e6cffdb0cc35d6a4c2fea70aae8162c52b65a05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 06:57:46 +0000 Subject: [PATCH 04/23] psi-plus: 1.5.1618 -> 1.5.1633 (cherry picked from commit f9d4fb6a95c69b8df234ac0414a8ae1031d4acad) --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index fe3f90346f1c..c5e5b063c4e2 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1618"; + version = "1.5.1633"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A="; + sha256 = "sha256-kXdDxpIOcwcFy+OmsqlE8a19sGPfMNI08fMy5OFuP9w="; }; cmakeFlags = [ From 35dabbc3179c7594d8544882be3251c524634ee4 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Fri, 8 Jul 2022 22:39:51 +0100 Subject: [PATCH 05/23] linux_testing: 5.15-rc6 -> 5.19-rc5 (cherry picked from commit 20efc11d74971c2b83ea877446e83dcf24e4d3ff) --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 0754ff335bae..0ed4c48047ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15-rc6"; + version = "5.19-rc5"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1lp3jqwsbd97k3bx4crs8rc2wssyaf0v8x4kl4zv7g7ww2kkg2ii"; + sha256 = "sha256-eqBbQBZaqexgx6m3jAoU/0HWAdHbAuT3slZWMZhrht0="; }; # Should the testing kernels ever be built on Hydra? From 7747d334da20ade26d9378739ad34d0ad83aae77 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 11 Jul 2022 13:07:37 +0200 Subject: [PATCH 06/23] kernel: port randstruct patch to 5.19 Signed-off-by: Roman Volosatovs Signed-off-by: Roman Volosatovs (cherry picked from commit 5a9ed0ff2c156863627fca64deb6df9bfba98718) --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- .../linux/kernel/randstruct-provide-seed-5.19.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index aeb8d8d0902a..a2683c373ed5 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -112,7 +112,8 @@ let patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic. - ++ optional (lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch + ++ optional (lib.versionAtLeast version "4.13" && lib.versionOlder version "5.19") ./randstruct-provide-seed.patch + ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch # Fixes determinism by normalizing metadata for the archive of kheaders ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; diff --git a/pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch b/pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch new file mode 100644 index 000000000000..5ca897a76bf6 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/gen-randstruct-seed.sh b/scripts/gen-randstruct-seed.sh +index 61017b36c464..7bb494dd2e18 100755 +--- a/scripts/gen-randstruct-seed.sh ++++ b/scripts/gen-randstruct-seed.sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # SPDX-License-Identifier: GPL-2.0 + +-SEED=$(od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n') ++SEED="NIXOS_RANDSTRUCT_SEED" + echo "$SEED" > "$1" + HASH=$(echo -n "$SEED" | sha256sum | cut -d" " -f1) + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2" From d5a7d719e9c67ebb20e89085e7c87821c8c2cced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 14:21:10 +0000 Subject: [PATCH 07/23] hut: 0.1.0 -> 0.2.0 (cherry picked from commit 43e64074f2c9b64cb37c7aa415a548334d195edf) --- .../version-management/git-and-tools/hut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hut/default.nix b/pkgs/applications/version-management/git-and-tools/hut/default.nix index 49e5fa675a94..f2623d326d0a 100644 --- a/pkgs/applications/version-management/git-and-tools/hut/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hut"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "hut"; rev = "v${version}"; - sha256 = "sha256-2YUrDPulpLQQGw31nEasHoQ/AppECg7acwwqu6JDT5U="; + sha256 = "sha256-g9KbOtZaBAgy/iBBh/Tv5ULJNnNzwzZpA6DOynl+dnk="; }; - vendorSha256 = "sha256-EmokL3JlyM6C5/NOarCAJuqNsDO2tgHwqQdv0rAk+Xk="; + vendorSha256 = "sha256-vuAx8B34Za+GEtekFOUaY07hBk3O2OaJ1JmulbIhwbs="; nativeBuildInputs = [ scdoc From 53303b908723bbe4139931123d09ef49967fb16f Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Mon, 1 Aug 2022 03:01:24 +0200 Subject: [PATCH 08/23] freetube: 0.16.0 -> 0.17.0 (cherry picked from commit 3c2a83612955daa0e2457f1c58caab461300756f) --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index c93be6b63834..3ceda283d3d8 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-G4lZ1lbNN8X9ocWhcuuNZGTZm9AUzuWKVm23YgsJwig="; + sha256 = "sha256-OlWNln62VouUJzzk0CtED+OdSM+aBc4NOu1TSaKVWnk="; }; appimageContents = appimageTools.extractType2 { From 5aef865cefc2a906296b9a256bf597f70e4ee243 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 12 Jan 2022 08:48:49 +0000 Subject: [PATCH 09/23] buildRustCrate: Add support for standard library deps We are replicating one mechanism behind `-Z build-std`. There isn't yet crate2nix support for this, but one can (and I do) add the missing stdlib deps (for this feature to pick up) with overrides. (cherry picked from commit cc29693a0979c3b81da6942c214841ef11de95b5) --- .../rust/build-rust-crate/build-crate.nix | 8 ++++++- .../rust/build-rust-crate/default.nix | 21 ++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index b5db1ffa7fb5..b24398665a10 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, mkRustcDepArgs, mkRustcFeatureArgs, rust }: +{ lib, stdenv +, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI +, rust +}: + { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -18,6 +22,8 @@ (mkRustcFeatureArgs crateFeatures) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--target" (rust.toRustTargetSpec stdenv.hostPlatform) + ] ++ lib.optionals (needUnstableCLI dependencies) [ + "-Z" "unstable-options" ] ++ extraRustcOpts # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index e122871f8f5a..98030225bcbb 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -46,17 +46,28 @@ let ) else extern; + opts = lib.optionalString (dep.stdlib or false) "noprelude:"; + filename = + if lib.any (x: x == "lib" || x == "rlib") dep.crateType + then "${dep.metadata}.rlib" + else "${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"; in - (if lib.any (x: x == "lib" || x == "rlib") dep.crateType then - " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib" - else - " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") + " --extern ${opts}${name}=${dep.lib}/lib/lib${extern}-${filename}" ) dependencies; # Create feature arguments for rustc. mkRustcFeatureArgs = lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"''); + # Whether we need to use unstable command line flags + # + # Currently just needed for standard library dependencies, which have a + # special "noprelude:" modifier. If in later versions of Rust this is + # stabilized we can account for that here, too, so we don't opt into + # instability unnecessarily. + needUnstableCLI = dependencies: + lib.any (dep: dep.stdlib or false) dependencies; + inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { @@ -64,7 +75,7 @@ let }; buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs rust; + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI rust; }; installCrate = import ./install-crate.nix { inherit stdenv; }; From 0bee6c25c22571548fd7b7d63e2c9be50a07cdf2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 1 Aug 2022 09:05:02 +0000 Subject: [PATCH 10/23] linuxPackages.apfs: mark broken on 5.19 (cherry picked from commit 116f3443115e958c26c6d0ae6517cebee2566d48) --- pkgs/os-specific/linux/apfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 44cfefe68088..6b911142f588 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.9"; + broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ Luflosi ]; }; } From 6968c9465ac4e21b4d96b85d2ae5cd520ce2c164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 2 Aug 2022 14:12:52 +0200 Subject: [PATCH 11/23] syncthing: also link nixosTests.syncthing in passthru.tests Before this change it linked syncthing-init and syncthing-relay but was missing the main syncthing test itself. (cherry picked from commit b5900c1bb9d980935eb236c7209590c87715ee0e) --- pkgs/applications/networking/syncthing/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index f09f9fb45ab3..39e76da67bc4 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -34,9 +34,8 @@ let inherit postInstall; - passthru.tests = with nixosTests; { - init = syncthing-init; - relay = syncthing-relay; + passthru.tests = { + inherit (nixosTests) syncthing syncthing-init syncthing-relay; }; meta = with lib; { From 1ef0f17f8e46ad5cd7ac5774f451eab09dab51ed Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 2 Aug 2022 11:14:32 +0200 Subject: [PATCH 12/23] syncthing: 1.20.3 -> 1.20.4 https://github.com/syncthing/syncthing/releases/tag/v1.20.4 (cherry picked from commit 515d6cff4af6311b2e9cd3a22e5f2db94c760ff0) --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 39e76da67bc4..6fdc0e0d0051 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,13 +4,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-8sxCTPFdf5VDysANUYqic6zq5gipTL6wmPXstJc+6bA="; + hash = "sha256-umnlYvCtT+76Yer17T7ZvWJ5sUdXu+7kiRikrmWrIM8="; }; vendorSha256 = "sha256-CJFKY69Iz8GrVpvUdDveMQQFj6RXApfgYjP7B1wfgfo="; From c1f7fa8a3d22d86a430b001985317a38460570ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Aug 2022 16:48:57 +0000 Subject: [PATCH 13/23] imagemagick: 7.1.0-43 -> 7.1.0-44 (cherry picked from commit 25a8587508a594078d28580bef1879d578ba5b8a) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 0b4416aca51b..32ea7122d172 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-43"; + version = "7.1.0-44"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = builtins.replaceStrings [ "-" ] [ "." ] version; - hash = "sha256-SOy7Ci1rzLB12ofSQBWmX86dfbr/ywsRPunHRswlAt4="; + hash = "sha256-vJGZ47l8nSRnINWHsw562zsQ14fSR5SObr/SO+/40yw="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 728df4438cef81b69dcb9644fe9a2c51ef1795ef Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 2 Aug 2022 08:23:59 -0600 Subject: [PATCH 14/23] matrix-synapse: 1.63.1 -> 1.64.0 Signed-off-by: Sumner Evans (cherry picked from commit 463fe0db3d511b6b13d42263c565162d0604d4b7) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 366720b01bb7..8f5240b42eb1 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.63.1"; + version = "1.64.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AjxvZye3bRjGT355eAnwuP2lvTU/RSnOPxxKqaUxN9g="; + sha256 = "sha256-hybl63hbhuUYnMi03z0Yp7L4n0x01z5uR8r5ZwHzgfI="; }; buildInputs = [ openssl ]; From eb6515c619bd99c2a94a95d42a3f17549f34addc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 00:58:44 +0000 Subject: [PATCH 15/23] sakura: 3.8.4 -> 3.8.5 (cherry picked from commit 6702078739f61daee2b0325de4cfbbdcb12eb9ea) --- pkgs/applications/terminal-emulators/sakura/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 52b35ad38ae7..18e913619435 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "sakura"; - version = "3.8.4"; + version = "3.8.5"; src = fetchFromGitHub { owner = "dabisu"; repo = pname; rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-Sqo1gyCvCMlEv1rYqw6P3Dmu10osi/KqB7/WlgTTNAc="; + hash = "sha256-eMGhPkfhpPHMg69J+XgK/ssJjwRSFgd/a64lAYi7hd0="; }; nativeBuildInputs = [ From c49a24b8118af52a3cec0475b2b9f07f15cf3b9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 06:00:13 +0000 Subject: [PATCH 16/23] xa: 2.3.12 -> 2.3.13 (cherry picked from commit eea38ee7157f95959baf87c606382ec62f98997c) --- pkgs/development/compilers/xa/xa.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index 08f31148d4c5..0fb9d7d058b4 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "xa"; - version = "2.3.12"; + version = "2.3.13"; src = fetchurl { urls = [ "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" ]; - hash = "sha256-+P0VNgEtZ2/Gy/zdapF5PlZMibbvdH+NuPRnwXj7BwQ="; + hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; }; checkInputs = [ perl ]; From 7d4924c2211b43aaf08def3fbd870ed719763b9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 08:19:11 +0000 Subject: [PATCH 17/23] yabasic: 2.90.1 -> 2.90.2 (cherry picked from commit 7c8629447b8b585e62bd8397c9f62f1b151dc8aa) --- pkgs/development/interpreters/yabasic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 02d3dbeb9fd1..9266ec012251 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yabasic"; - version = "2.90.1"; + version = "2.90.2"; src = fetchurl { url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo="; + hash = "sha256-ff5j0cJ1i2HWIsYjwzx5FFtZfchWsGRF2AZtbDXrNJw="; }; buildInputs = [ From 091e563caca3f68d7fef25e7549bb4d638e8c759 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 07:32:54 +0000 Subject: [PATCH 18/23] zchunk: 1.2.0 -> 1.2.2 (cherry picked from commit 740b51832063248b477374d0a51bfc4fc4b5b2e9) --- pkgs/development/libraries/zchunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index c639eb7b30e9..ecbef5caf026 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; + hash = "sha256-/gtkw020pybUDUeYydXgJ4PLvdOqZ0RbrLOfNMDaCmA="; }; nativeBuildInputs = [ From dce0b5d026eda8e088073574427911af922747da Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Tue, 2 Aug 2022 15:22:06 +0000 Subject: [PATCH 19/23] nixos/soju: add defaults and assertions for TLS Enabling soju without providing a value for tlsCertificate currently results in: error: The option `services.soju.tlsCertificate' is used but not defined. Since tlsCertificate is intended to be optional, set default to null. Additionally, add assertions to ensure that both tlsCertificate and tlsCertificateKey are either set or unset. (cherry picked from commit 5c0e18a6bb553e692f276b7dafcd8058d5460046) --- nixos/modules/services/networking/soju.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix index cb0acf4765ff..ee1a311ccdb7 100644 --- a/nixos/modules/services/networking/soju.nix +++ b/nixos/modules/services/networking/soju.nix @@ -49,12 +49,14 @@ in tlsCertificate = mkOption { type = types.nullOr types.path; + default = null; example = "/var/host.cert"; description = "Path to server TLS certificate."; }; tlsCertificateKey = mkOption { type = types.nullOr types.path; + default = null; example = "/var/host.key"; description = "Path to server TLS certificate key."; }; @@ -97,6 +99,16 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.tlsCertificate != null) == (cfg.tlsCertificateKey != null); + message = '' + services.soju.tlsCertificate and services.soju.tlsCertificateKey + must both be specified to enable TLS. + ''; + } + ]; + systemd.services.soju = { description = "soju IRC bouncer"; wantedBy = [ "multi-user.target" ]; From 433e7391d0f3b1d7036fad9a9ab9d988959dee90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 21:16:12 +0000 Subject: [PATCH 20/23] lpairs2: 2.1 -> 2.2 (cherry picked from commit 8f6d9b45fb82849af44dda4d44c17c9fc52e632a) --- pkgs/games/lgames/lpairs2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix index 7fcc03d8cce6..394b690b63dd 100644 --- a/pkgs/games/lgames/lpairs2/default.nix +++ b/pkgs/games/lgames/lpairs2/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lpairs2"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-35KYDnPWOjNPu9wz9AWvSBAo1tdVDo7I2TNxtxE5RRg="; + hash = "sha256-swe/cB9RqxHSNSShiryJ8XfwZk2X6qIDxFURbwNOd58="; }; buildInputs = [ From dab2d8c6ad9b7fb0716cf88e5e2cdac25ab7ce2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 19:26:40 +0000 Subject: [PATCH 21/23] ltris: 1.2.4 -> 1.2.5 (cherry picked from commit e17f70ef42452d65273e06c5ed9532b584043fb6) --- pkgs/games/lgames/ltris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/games/lgames/ltris/default.nix index acf0f64d8c2b..618e86561f03 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/games/lgames/ltris/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ltris"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-1ut7MBAjJ4YE2SkqkvL9L1ED7kEqdaEm0lUOLsI2j4M="; + hash = "sha256-Ksb5TdQMTEzaJfjHVhgq27dSFvZxUnNUQ6OpAU+xwzM="; }; buildInputs = [ From 7daf2a4e1fa39c042b4e82dc535484cdc7415173 Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Fri, 15 Jul 2022 09:38:54 -0500 Subject: [PATCH 22/23] erlang: 25.0 -> 25.0.2 https://www.erlang.org/patches/otp-25.0.1 https://www.erlang.org/patches/otp-25.0.2 (cherry picked from commit ddcc8217dcd4989f6af9b66375d9f3c739f4c974) --- pkgs/development/interpreters/erlang/R25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index f11633d3d1cc..4d56472baf55 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "25.0"; - sha256 = "1nf72yiirdpxcs8m10xc04ryghxxc73x954x38m5a6fhv2hfhp2n"; + version = "25.0.2"; + sha256 = "01jgmrskm04vdx560wry4xjy7xj57b82fhwyhn42hpv5k3dz4lp7"; } From b0343f8b7c135c1f0020177f8bba8675edce4d51 Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Fri, 15 Jul 2022 09:41:56 -0500 Subject: [PATCH 23/23] erlang: 25.0.2 -> 25.0.3 https://www.erlang.org/patches/otp-25.0.3 (cherry picked from commit 3a6483f5ebd7ef59c85c5ed15c9a81e31d844521) --- pkgs/development/interpreters/erlang/R25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index 4d56472baf55..381ea8d5c227 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "25.0.2"; - sha256 = "01jgmrskm04vdx560wry4xjy7xj57b82fhwyhn42hpv5k3dz4lp7"; + version = "25.0.3"; + sha256 = "0zchcm7gv52j30fq5p658h9c593ziirq09kkah6mpsvjfdsmvmgl"; }