From 6932bbea63011e044a52990edceb67a39237dfff Mon Sep 17 00:00:00 2001 From: Rasmus Rendal Date: Mon, 16 May 2022 12:36:21 +0200 Subject: [PATCH 001/297] mingw-w64: 9.0.0 -> 10.0.0 --- pkgs/os-specific/windows/mingw-w64/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 38293e65f70f..73d66945e1fb 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, windows, fetchurl }: let - version = "9.0.0"; + version = "10.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r"; + hash = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ="; }; outputs = [ "out" "dev" ]; From 00a0eeb2cb9f63b42dbc15d4a15b5d2a403852f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 23 May 2022 19:34:26 -0500 Subject: [PATCH 002/297] stdenv: switch default from gcc10 to gcc11 This will mainly affect ARM which is still using gcc10; x86_64 (darwin and linux), RISC-V (linux), and aarch64 (darwin) are already using gcc11 so this will remove their version override. aarch64 (linux), vc4, and relibc will remain pinned to previous versions due to unresolved issues. --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d59013e7419..df19193113a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12500,10 +12500,8 @@ with pkgs; inherit (let num = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else if (stdenv.targetPlatform.isAarch64 && stdenv.isDarwin) then 11 - else if (stdenv.targetPlatform.isx86_64 || stdenv.targetPlatform.isRiscV) then 11 - else if stdenv.targetPlatform.isAarch64 then 9 - else 10; + else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9 + else 11; numS = toString num; in { gcc = pkgs.${"gcc${numS}"}; From b51e4f631e694b0ada2c227fa1d833e4194b33e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 06:14:07 +0000 Subject: [PATCH 003/297] waf: 2.0.23 -> 2.0.24 --- pkgs/development/tools/build-managers/waf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index c0707a1cd935..8fcb5f2dbac1 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "waf"; - version = "2.0.23"; + version = "2.0.24"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "${pname}-${version}"; - sha256 = "sha256-AASjkXb3eCVjbuT0GOwhagoNHxG7/XP1Mj0i1U4j13Q="; + sha256 = "sha256-nunPDYAy0yfDJpsc+E8SyyFLny19wwrVzxeUOhh7nc4="; }; nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ]; From a73156c64cc44a3b0270706ab9044e89c698ba99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Aug 2022 09:14:39 +0000 Subject: [PATCH 004/297] util-linux: 2.38 -> 2.38.1 --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index cb323e623bed..d57fdba7310b 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = "2.38"; + version = "2.38.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-bREcvk1VszbbLx++/7xluJkIcEwBE2Nx0yqpvsNz62Q="; + hash = "sha256-YEkqGbRObPmj3f9oMlszO4tStsWc4+vWoOyqTFEX6E8="; }; patches = [ From 17c8b2e3a7fbb8be0a227931bbd817127288bbda Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 14 Aug 2022 12:53:25 +0100 Subject: [PATCH 005/297] xz: 5.2.5 -> 5.2.6 While at it added trivial updater. Changes: https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;hb=v5.2.6 --- pkgs/tools/compression/xz/default.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 75a58d011cef..86df04c26691 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl , enableStatic ? stdenv.hostPlatform.isStatic +, writeScript }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -9,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.2.5"; + version = "5.2.6"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; + sha256 = "E+NALjAbYBj2px7w5Jf3FMbRHiFK6C2rFWuBwqZKyyU="; }; strictDeps = true; @@ -34,6 +35,21 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; + passthru = { + updateScript = writeScript "update-xz" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '>xz-5.2.6.tar.bz2' + # We pick first match where a stable release goes first. + new_version="$(curl -s https://tukaani.org/xz/ | + pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { homepage = "https://tukaani.org/xz/"; description = "A general-purpose data compression software, successor of LZMA"; From 7233d35e49e3254b782ca7d36b8ae0494fb61464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Aug 2022 14:33:13 +0200 Subject: [PATCH 006/297] python310Packages.setuptools-rust: 1.5.0 -> 1.5.1 --- pkgs/development/python-modules/setuptools-rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 2f331bace589..0afa482960c6 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C4rrgUr+Dp18MVaewJNtH1IBmTUwY5JE+pc+F0IAVnE="; + sha256 = "sha256-DgXkVmRdWUKcsQITcK7ec8B2DpNgu/2q77W87VMOudc="; }; nativeBuildInputs = [ setuptools-scm ]; From bdc07d61f9dd9721b6cb2833895925d93e33be4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Aug 2022 13:58:42 +0200 Subject: [PATCH 007/297] python310Packages.pygments: 2.12.0 -> 2.13.0 --- pkgs/development/python-modules/pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index c8759a2fe056..e5c2ca53686c 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -10,12 +10,12 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.12.0"; + version = "2.13.0"; src = fetchPypi { pname = "Pygments"; inherit version; - sha256 = "sha256-XrEWEY+WEv8e6JrJZDe7a0no8E2KE7UUuib2ICCOJus="; + sha256 = "sha256-VqhQiulfmOK5vfk6a+WuP32K+Fi0PgLFov8INya+QME="; }; propagatedBuildInputs = [ From 913ea47f6ba806e964251061ed58989a12b78577 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Aug 2022 21:01:41 +1000 Subject: [PATCH 008/297] tzdata: 2022b -> 2022c https://mm.icann.org/pipermail/tz-announce/2022-August/000072.html --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 7cb13e0535ee..1a6cba44ef87 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2022b"; + version = "2022c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - hash = "sha256-9ZDq8Eo5UkVCbCvk+uccFDrqXOvBEIi3oKVwRGHfOX0="; + hash = "sha256-aXT040i/IyMnS1bf+edQAkfjFZ6qS0hd+gzWbnXBS/4="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - hash = "sha256-urINlD5ZoyGENfSNhopOVS8Y1tfz3RKGYMVmDIC4oF8="; + hash = "sha256-Pnzh82IMwEgZB8fgdNaZEHkyhb/+DKMx7xptGuPqkMw="; }) ]; From f96b6627529aa21ce9a7dd08b74350a2b4d71873 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Aug 2022 11:33:51 +1000 Subject: [PATCH 009/297] lz4: 1.9.3 -> 1.9.4 https://github.com/lz4/lz4/releases/tag/v1.9.4 --- pkgs/tools/compression/lz4/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 94f739a6c532..bf048eeb87df 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,32 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, valgrind, fetchpatch +{ lib, stdenv, fetchFromGitHub, valgrind , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "lz4"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { - sha256 = "1w02kazh1fps3sji2sn89fz862j1199c5ajrqcgl1bnlxj09kcbz"; + sha256 = "sha256-YiMCD3vvrG+oxBUghSrCmP2LAfAGZrEaKz0YoaQJhpI="; rev = "v${version}"; repo = pname; owner = pname; }; - patches = [ - (fetchpatch { # https://github.com/lz4/lz4/pull/972 - name = "CVE-2021-3520.patch"; - url = "https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7.patch"; - sha256 = "0r1cwpqdkdc8im0pf2r5jp7mwwn69xcw405rrk7rc0mpjcp5ydfk"; - }) - (fetchpatch { # https://github.com/lz4/lz4/pull/973 - name = "avoid-null-pointer-dereference.patch"; - url = "https://github.com/lz4/lz4/commit/29a6a1f4941e7243241fe00d6c13b749fd6b60c2.patch"; - sha256 = "0v5yl5hd3qrfm3xm7m06j4b21qwllb4cqkjn2az7x1vnzqgpf8y7"; - }) - ]; - # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; From bd01cc76fb1f3202714e735865167dd8c0ee7ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 16:43:40 +0000 Subject: [PATCH 010/297] python310Packages.markdown: 3.3.7 -> 3.4.1 https://github.com/Python-Markdown/markdown/blob/3.4.1/docs/change_log/release-3.4.md --- pkgs/development/python-modules/markdown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 999fe2682b8c..da3a8af52058 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.3.7"; + version = "3.4.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; format = "setuptools"; src = fetchPypi { pname = "Markdown"; inherit version; - sha256 = "cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874"; + sha256 = "3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ From 775ba78608546df5f8273b79f1062ab2f391257b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 16:54:23 +0000 Subject: [PATCH 011/297] python310Packages.Nikola: 8.2.2 -> 8.2.3 https://github.com/getnikola/nikola/releases/tag/v8.2.3 --- pkgs/development/python-modules/Nikola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index b15f07bfcaeb..804a93883b7a 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.2.2"; + version = "8.2.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lfSrBRwkWMHTFEJ4KmrWIx9XIMO5I9XxcuJe7zTxJsE="; + sha256 = "sha256-c8eadkmYWS88nGwi6QwPqHg7FBXlkdazKSrbWDMw/UA="; }; propagatedBuildInputs = [ From 36c03d0f55d3fcc0518f898fa5da9a0b5fba7090 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Aug 2022 11:54:23 +0000 Subject: [PATCH 012/297] pkgsMusl.colord: enable the daemon Since f95d9a668ef ("pkgsMusl.polkit: fix build"), pkgsMusl.polkit builds, which means the colord daemon can also build in pkgsMusl. --- pkgs/tools/misc/colord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 77d06a6848ac..c2a3cd10803f 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -26,7 +26,7 @@ , docbook_xml_dtd_412 , gtk-doc , libxslt -, enableDaemon ? !stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isStatic +, enableDaemon ? true }: stdenv.mkDerivation rec { From bf44c7ec3e53a9aebc92078910a15258b78a4685 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Wed, 17 Aug 2022 17:51:15 +0200 Subject: [PATCH 013/297] bluez: 5.64 -> 5.65 --- pkgs/os-specific/linux/bluez/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index d09ef77fb0d8..8191624fa828 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -23,11 +23,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.64"; + version = "5.65"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-rkN+ZbazBwwZi8WwEJ/pzeueqjhzgOIHL53mX+ih3jQ="; + sha256 = "sha256-JWWk1INUtXbmrZLiW1TtZoCCllgciruAWHBR+Zk9ltQ="; }; buildInputs = [ @@ -50,17 +50,6 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "test" ]; - patches = [ - # https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5 - # which fixes https://github.com/bluez/bluez/issues/329 - # and is already merged upstream and not yet in a release. - (fetchpatch { - name = "StateDirectory_and_ConfigurationDirectory.patch"; - url = "https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5.patch"; - sha256 = "sha256-MI6yPTiDLHsSTjLvNqtWnuy2xUMYpSat1WhMbeoedSM="; - }) - ]; - postPatch = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \ From f16be229dcb9e3bb914820ed0f74a0009b0235dc Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 17 Aug 2022 20:43:58 +0300 Subject: [PATCH 014/297] gcc/: correct gnused conditionals and move to nativeBuildInputs hostPlatform changes were done in commits like https://github.com/nixos/nixpkgs/commit/7a134572532323900a6661e5f1fea09b6dea3479 it should have been buildPlatform instead according to the comment --- pkgs/development/compilers/gcc/10/default.nix | 8 ++++---- pkgs/development/compilers/gcc/11/default.nix | 8 ++++---- pkgs/development/compilers/gcc/12/default.nix | 8 ++++---- pkgs/development/compilers/gcc/4.8/default.nix | 11 ++++++----- pkgs/development/compilers/gcc/4.9/default.nix | 11 ++++++----- pkgs/development/compilers/gcc/6/default.nix | 8 ++++---- pkgs/development/compilers/gcc/7/default.nix | 11 ++++++----- pkgs/development/compilers/gcc/8/default.nix | 11 ++++++----- pkgs/development/compilers/gcc/9/default.nix | 8 ++++---- 9 files changed, 44 insertions(+), 40 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 1c223fa82f4a..a439fc26d5b8 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -33,7 +33,7 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -159,6 +159,9 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional langAda gnatboot) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) ; # For building runtime libs @@ -177,9 +180,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index ca3a89af1806..7fb75530828c 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -33,7 +33,7 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -167,6 +167,9 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional langAda gnatboot) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) ; # For building runtime libs @@ -185,9 +188,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 6fdc31079a89..273ad85f8899 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -33,7 +33,7 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -162,6 +162,9 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional langAda gnatboot) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) ; # For building runtime libs @@ -180,9 +183,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index bc93d6e13585..6f9e7da32e0b 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -43,7 +43,7 @@ assert cloog != null -> isl != null; assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -165,7 +165,11 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config); + ++ (optional javaAwtGtk pkg-config) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) + ; # For building runtime libs depsBuildTarget = @@ -186,9 +190,6 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index cc675de22549..d9a319fadb68 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -43,7 +43,7 @@ assert cloog != null -> isl != null; assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -185,7 +185,11 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config); + ++ (optional javaAwtGtk pkg-config) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) + ; # For building runtime libs depsBuildTarget = @@ -206,9 +210,6 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index d108dc11f18c..b48d867daf1a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -44,7 +44,7 @@ assert langJava -> zip != null && unzip != null assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -196,6 +196,9 @@ stdenv.mkDerivation ({ ++ (optional javaAwtGtk pkg-config) ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex) ++ (optional langAda gnatboot) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) ; # For building runtime libs @@ -216,9 +219,6 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e4e1f2038de5..fc1bd41f8ea3 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -30,7 +30,7 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -164,7 +164,11 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); + ++ (optional (perl != null) perl) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) + ; # For building runtime libs depsBuildTarget = @@ -182,9 +186,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 7e94ec61c6b7..06c50d78d45e 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -30,7 +30,7 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -148,7 +148,11 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); + ++ (optional (perl != null) perl) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) + ; # For building runtime libs depsBuildTarget = @@ -166,9 +170,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 707ead542f06..cb524e99fbd9 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -38,7 +38,7 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; +assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -161,6 +161,9 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional langAda gnatboot) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional buildPlatform.isDarwin gnused) ; # For building runtime libs @@ -179,9 +182,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; From 0565276a075531b6dad21171de459473dd5e6a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 10 Dec 2021 18:04:11 +0100 Subject: [PATCH 015/297] openssl: Default version to 3.0 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 115e5b2696e4..fee4873e8a62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20627,7 +20627,7 @@ with pkgs; wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_1; + openssl = openssl_3; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 From c6de1d4b2442b96b66f0cd8bafcc0b50e62179a3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 1 Aug 2022 17:47:15 +0200 Subject: [PATCH 016/297] openssl: fix static build https://mta.openssl.org/pipermail/openssl-users/2022-February/014906.html --- pkgs/development/libraries/openssl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0b4050c76cce..60f3a0eb45ee 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -135,6 +135,7 @@ let # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared" + ++ lib.optional (lib.versionAtLeast version "3.0.0" && static) "no-module" # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. ++ lib.optional static "no-ct" From 075b85282026478801afaa7680f99d8a047c7fe8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 1 Aug 2022 17:48:17 +0200 Subject: [PATCH 017/297] openssl: versionAtLeast 1.1.0 -> 1.1.1 we don't have/support 1.1.0 anymore, so 1.1.1 is the new minimum --- pkgs/development/libraries/openssl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 60f3a0eb45ee..471666129fc1 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -30,7 +30,7 @@ let postPatch = '' patchShebangs Configure - '' + lib.optionalString (lib.versionOlder version "1.1.0") '' + '' + lib.optionalString (lib.versionOlder version "1.1.1") '' patchShebangs test/* for a in test/t* ; do substituteInPlace "$a" \ @@ -40,7 +40,7 @@ let # config is a configure script which is not installed. + lib.optionalString (lib.versionAtLeast version "1.1.1") '' substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' - '' + lib.optionalString (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' + '' + lib.optionalString (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isMusl) '' substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' @@ -130,11 +130,11 @@ let ] ++ lib.optional enableSSL2 "enable-ssl2" ++ lib.optional enableSSL3 "enable-ssl3" ++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls" - ++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" + ++ lib.optional (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isAarch64) "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared" + ++ lib.optional (lib.versionAtLeast version "1.1.1" && static) "no-shared" ++ lib.optional (lib.versionAtLeast version "3.0.0" && static) "no-module" # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. From ac6e552a3049218b13362b4fed3b1fe4042dc0b8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 7 Feb 2022 23:06:07 +0100 Subject: [PATCH 018/297] oven-media-engine: openssl_3_0 -> openssl --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 02e904fa98e6..76357bb4d8ab 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -5,7 +5,7 @@ , bc , pkg-config , perl -, openssl_3 +, openssl , zlib , ffmpeg , libvpx @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl_3 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; preBuild = '' patchShebangs core/colorg++ From af91144ef52a2ccb929b7af29cd16a4cf689c5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 25 Dec 2021 19:45:48 +0100 Subject: [PATCH 019/297] ibm-sw-tpm2: Pin OpenSSL 1.1.1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fee4873e8a62..de1d9aeec586 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7424,7 +7424,9 @@ with pkgs; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; - ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { }; + ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { + openssl = openssl_1_1; + }; ibniz = callPackage ../tools/graphics/ibniz { }; From 8b1f16573cc6fa50facc3fe3154ba437e64a9220 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 3 Apr 2022 22:42:33 +0100 Subject: [PATCH 020/297] python3.pkgs.cryptography: use openssl_1_1 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc9c4d56149d..a010651b51b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2086,6 +2086,7 @@ in { cryptography = callPackage ../development/python-modules/cryptography { inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; + openssl = pkgs.openssl_1_1; }; cryptolyzer = callPackage ../development/python-modules/cryptolyzer { }; From 5cb3e0708147327d5f5fa8c8008a06cf462210c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 9 Apr 2022 00:24:36 +0100 Subject: [PATCH 021/297] openvpn*: use matching openssl version for each release --- pkgs/tools/networking/openvpn/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 71a14b169ac1..f6d4590e3185 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -5,6 +5,7 @@ , iproute2 , lzo , openssl +, openssl_1_1 , pam , useSystemd ? stdenv.isLinux , systemd @@ -17,7 +18,7 @@ let inherit (lib) versionOlder optional optionals optionalString; - generic = { version, sha256 }: + generic = { version, sha256, extraBuildInputs ? [] }: let withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4"); in @@ -33,11 +34,12 @@ let nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lzo openssl ] + buildInputs = [ lzo ] ++ optional stdenv.isLinux pam ++ optional withIpRoute iproute2 ++ optional useSystemd systemd - ++ optional pkcs11Support pkcs11helper; + ++ optional pkcs11Support pkcs11helper + ++ extraBuildInputs; configureFlags = optionals withIpRoute [ "--enable-iproute2" @@ -75,10 +77,12 @@ in openvpn_24 = generic { version = "2.4.12"; sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; + extraBuildInputs = [ openssl_1_1 ]; }; openvpn = generic { version = "2.5.6"; sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik"; + extraBuildInputs = [ openssl ]; }; } From a90227726294c7de57fee120c3a193d9272a89a7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 9 Apr 2022 10:54:25 +0100 Subject: [PATCH 022/297] ruby*: use matching openssl version for each release --- pkgs/development/interpreters/ruby/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 236508d67353..524734b5a5fa 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,9 +1,10 @@ { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub -, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison +, zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix , makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo +, openssl, openssl_1_1 } @ args: let @@ -26,7 +27,7 @@ let , useRailsExpress ? true , rubygemsSupport ? true , zlib, zlibSupport ? true - , openssl, opensslSupport ? true + , openssl, openssl_1_1, opensslSupport ? true , gdbm, gdbmSupport ? true , ncurses, readline, cursesSupport ? true , groff, docSupport ? true @@ -75,7 +76,8 @@ let ++ (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) ++ (op zlibSupport zlib) - ++ (op opensslSupport openssl) + ++ (op (lib.versionOlder ver.majMin "3.0" && opensslSupport) openssl_1_1) + ++ (op (atLeast30 && opensslSupport) openssl_1_1) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) # Looks like ruby fails to build on darwin without readline even if curses From 498d67e45efa175e324f0811a613f9b6c5a55212 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 17 Apr 2022 23:34:47 +0100 Subject: [PATCH 023/297] krb5: use openssl_1_1 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de1d9aeec586..3960ef1c67e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18714,6 +18714,8 @@ with pkgs; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; + # TODO: can be removed once we have 1.20 + openssl = openssl_1_1; }; krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; From 7cf34b26e97e72100557aa4903dea4d1607b1e95 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 31 May 2022 22:21:24 +0200 Subject: [PATCH 024/297] coturn: use openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3960ef1c67e2..91ca44afdcb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3410,7 +3410,9 @@ with pkgs; cot = with python3Packages; toPythonApplication cot; - coturn = callPackage ../servers/coturn { }; + coturn = callPackage ../servers/coturn { + openssl = openssl_1_1; + }; coursier = callPackage ../development/tools/coursier {}; From 94d808692485abbdf2f60743502e873243de9ccf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 31 May 2022 23:37:19 +0200 Subject: [PATCH 025/297] lighttpd: pin to openssl_1_1 tests fail with openssl_3_0 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91ca44afdcb2..f07278283531 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22640,7 +22640,9 @@ with pkgs; nodejs = nodejs-14_x; }; - lighttpd = callPackage ../servers/http/lighttpd { }; + lighttpd = callPackage ../servers/http/lighttpd { + openssl = openssl_1_1; + }; listmonk = callPackage ../servers/mail/listmonk { }; From ed3fab51733f66c455c5b828891cd40580680a93 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 31 May 2022 23:57:20 +0200 Subject: [PATCH 026/297] nodejs-14_x: pin to openssl_1_1 --- pkgs/development/web/nodejs/v14.nix | 3 ++- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index ab2d2c01bc18..457e0ff29e1a 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -1,7 +1,8 @@ -{ callPackage, python3, lib, stdenv, enableNpm ? true }: +{ callPackage, python3, lib, stdenv, openssl, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { + inherit openssl; python = python3; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f07278283531..4316d33fc10e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8241,8 +8241,11 @@ with pkgs; nodejs-slim = nodejs-slim-16_x; - nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; + nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { + openssl = openssl_1_1; + }; nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + openssl = openssl_1_1; enableNpm = false; }; nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; From bf95b6e456e80a820e2d27f6b8c4a56ef74a5b2b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 02:51:04 +0200 Subject: [PATCH 027/297] qca2: remove --- pkgs/development/libraries/qca2/default.nix | 35 ------------------- .../development/libraries/qca2/libressl.patch | 28 --------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/development/libraries/qca2/default.nix delete mode 100644 pkgs/development/libraries/qca2/libressl.patch diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix deleted file mode 100644 index 42dcf1a87d36..000000000000 --- a/pkgs/development/libraries/qca2/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }: - -stdenv.mkDerivation rec { - pname = "qca"; - version = "2.2.1"; - - src = fetchurl { - url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl qt ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - - # tells CMake to use this CA bundle file if it is accessible - preConfigure = '' - export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt - ''; - - # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) - cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; - - postPatch = '' - sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt - ''; - - meta = with lib; { - description = "Qt Cryptographic Architecture"; - license = "LGPL"; - homepage = "http://delta.affinix.com/qca"; - maintainers = [ maintainers.sander ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/qca2/libressl.patch b/pkgs/development/libraries/qca2/libressl.patch deleted file mode 100644 index c9b0267f85d8..000000000000 --- a/pkgs/development/libraries/qca2/libressl.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:34:25.810682094 +0000 -+++ b/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:29:51.720392423 +0000 -@@ -5403,11 +5403,13 @@ - ctx = SSL_CTX_new(SSLv2_client_method()); - break; - #endif -+#ifndef OPENSSL_NO_SSL3 - case TLS::SSL_v3: - ctx = SSL_CTX_new(SSLv3_client_method()); - break; -+#endif - case TLS::TLS_v1: -+ ctx = SSL_CTX_new(SSLv23_client_method()); -- ctx = SSL_CTX_new(TLSv1_client_method()); - break; - case TLS::DTLS_v1: - default: -@@ -7133,8 +7135,10 @@ - return new opensslInfoContext(this); - else if ( type == "sha1" ) - return new opensslHashContext( EVP_sha1(), this, type); -+#ifndef OPENSSL_NO_SHA0 - else if ( type == "sha0" ) - return new opensslHashContext( EVP_sha(), this, type); -+#endif - else if ( type == "ripemd160" ) - return new opensslHashContext( EVP_ripemd160(), this, type); - #ifdef HAVE_OPENSSL_MD2 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d1eb0c2035a..f7e0a6fd87a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1192,6 +1192,7 @@ mapAliases ({ QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22 qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 + qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qflipper = qFlipper; # Added 2022-02-11 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4316d33fc10e..fb3a8de23630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20832,8 +20832,6 @@ with pkgs; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; - qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qimageblitz = callPackage ../development/libraries/qimageblitz {}; qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; From 1c6327d79d72bdb2526341903ceedbe05017b3ef Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:12:25 +0200 Subject: [PATCH 028/297] freeswitch: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3a8de23630..1c30ed673d2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22482,6 +22482,7 @@ with pkgs; freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + openssl = openssl_1_1; }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; From 08ed8cfc65d70bf19fc2aa46526ed31d013fe978 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:14:04 +0200 Subject: [PATCH 029/297] libsForQt.qca-qt5_2_3_2: pin to openssl_1_1 --- pkgs/top-level/qt5-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c4bd055f5738..02735c5b0f46 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -175,7 +175,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; # Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2 - qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { }; + qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { + openssl = pkgs.openssl_1_1; + }; qcoro = callPackage ../development/libraries/qcoro { }; From 3c33219182cc4666754a2022a60f1aae5a7f2b5e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:14:59 +0200 Subject: [PATCH 030/297] mysql57: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c30ed673d2d..8c96e59a7a96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23015,6 +23015,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost159; protobuf = protobuf3_7; + openssl = openssl_1_1; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { From b802fc1e5c6aae7a8800433938cbba7df707bed0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:15:04 +0200 Subject: [PATCH 031/297] mysql80: pin to openssl_1_1 --- pkgs/servers/sql/mysql/8.0.x.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index a59bd44fb028..d40d42a41d07 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -23,7 +23,7 @@ self = stdenv.mkDerivation rec { ''; buildInputs = [ - boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c96e59a7a96..7c692ab1e875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23024,6 +23024,7 @@ with pkgs; boost = boost177; # Configure checks for specific version. protobuf = protobuf3_19; icu = icu69; + openssl = openssl_1_1; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; From 1f48d6fd5000461e7501942f4f2da9b62330bfe8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 01:23:48 +0200 Subject: [PATCH 032/297] cyrus_sasl: pin to openssl_1_1 fixes openldap(???) can hopefully be dropped once https://github.com/cyrusimap/cyrus-sasl/pull/653 makes it into a release --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c692ab1e875..6e1b6833d4c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17570,6 +17570,7 @@ with pkgs; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; + openssl = openssl_1_1; }; # Make bdb5 the default as it is the last release under the custom From de5a1214ce07075f3800fe4a9e2c10821a32bf10 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 9 Jun 2022 00:35:29 +0200 Subject: [PATCH 033/297] openldap: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e1b6833d4c0..00d838c12332 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20590,7 +20590,9 @@ with pkgs; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; - openldap = callPackage ../development/libraries/openldap { }; + openldap = callPackage ../development/libraries/openldap { + openssl = openssl_1_1; + }; opencolorio = callPackage ../development/libraries/opencolorio { inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; From 484f8ab00c9a5074fe1558ded47100b29d5c6901 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 13:12:06 +0200 Subject: [PATCH 034/297] python3.pkgs.m2crypto: pin to openssl_1_1 --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a010651b51b0..6cfcdc82c07e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5313,7 +5313,10 @@ in { lzstring = callPackage ../development/python-modules/lzstring { }; - m2crypto = callPackage ../development/python-modules/m2crypto { }; + m2crypto = callPackage ../development/python-modules/m2crypto { + # https://gitlab.com/m2crypto/m2crypto/-/issues/310 + openssl = pkgs.openssl_1_1; + }; m2r = callPackage ../development/python-modules/m2r { }; From e472d36311af193497efaef846d025985ca074b6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 13:23:51 +0200 Subject: [PATCH 035/297] perlPackages.CryptOpenSSLRSA: pin to openssl_1_1 https://github.com/toddr/Crypt-OpenSSL-RSA/issues/31 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39cd70147d4b..55f09410856c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4862,8 +4862,8 @@ let sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; }; From f8ce3f931111401eebd2e1753577ab66b38e2ddf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 13:33:27 +0200 Subject: [PATCH 036/297] lua-modules: pin to openssl_1_1 --- pkgs/development/lua-modules/overrides.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 60fcf2ca1ca5..418db1b7bd3b 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -31,8 +31,8 @@ with prev; cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: { externalDeps = [ - { name = "CRYPTO"; dep = pkgs.openssl; } - { name = "OPENSSL"; dep = pkgs.openssl; } + { name = "CRYPTO"; dep = pkgs.openssl_1_1; } + { name = "OPENSSL"; dep = pkgs.openssl_1_1; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; })).overrideAttrs(oa: rec { @@ -271,14 +271,15 @@ with prev; luaossl = prev.lib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ - { name = "CRYPTO"; dep = pkgs.openssl; } - { name = "OPENSSL"; dep = pkgs.openssl; } + # https://github.com/wahern/luaossl/pull/199 + { name = "CRYPTO"; dep = pkgs.openssl_1_1; } + { name = "OPENSSL"; dep = pkgs.openssl_1_1; } ]; }); luasec = prev.lib.overrideLuarocks prev.luasec (drv: { externalDeps = [ - { name = "OPENSSL"; dep = pkgs.openssl; } + { name = "OPENSSL"; dep = pkgs.openssl_1_1; } ]; }); From c88c43e559d84e2fdcc406bfb083b1616b74ece3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 2 Jun 2022 01:41:50 +0200 Subject: [PATCH 037/297] libs3: update and fix build against openssl3 --- pkgs/development/libraries/libs3/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index d30fc55fc77f..b9f9278fad8c 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,19 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, curl, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, curl, libxml2 }: stdenv.mkDerivation { pname = "libs3"; - version = "unstable-2018-12-03"; + version = "unstable-2019-04-10"; src = fetchFromGitHub { owner = "bji"; repo = "libs3"; - rev = "111dc30029f64bbf82031f3e160f253a0a63c119"; - sha256 = "1ahf08hc7ql3fazfmlyj9vrhq7cvarsmgn2v8149y63zr1fl61hs"; + rev = "287e4bee6fd430ffb52604049de80a27a77ff6b4"; + hash = "sha256-xgiY8oJlRMiXB1fw5dhNidfaq18YVwaJ8aErKU11O6U="; }; + patches = [ + (fetchpatch { # Fix compilation with openssl 3.0 + url = "https://github.com/bji/libs3/pull/112/commits/3c3a1cf915e62b730db854d8007ba835cb38677c.patch"; + hash = "sha256-+rWRh8dOznHlamc/T9qbgN0E2Rww3Hn94UeErxNDccs="; + }) + ]; + buildInputs = [ curl libxml2 ]; - makeFlags = [ "DESTDIR=$(out)" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; meta = with lib; { homepage = "https://github.com/bji/libs3"; From 58edfe972f134b964a1bd7a60c9aef05fde58727 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 7 Jun 2022 19:55:39 +0200 Subject: [PATCH 038/297] apk-tools: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00d838c12332..4e9c802e2fb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1912,6 +1912,7 @@ with pkgs; apk-tools = callPackage ../tools/package-management/apk-tools { lua = lua5_3; + openssl = openssl_1_1; }; apkid = callPackage ../development/tools/apkid { }; From 2a49c87bc5365ebbaad4cc3eebdec78b2474cf6e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 8 Jun 2022 23:42:43 +0200 Subject: [PATCH 039/297] haskellPackages.hopenssl: use openssl_1_1 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3db220ab901a..676bff625267 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2393,6 +2393,9 @@ self: super: { ''; }) super.linear-base; + # https://github.com/peti/hopenssl/issues/5 + hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; }; + # Fixes compilation with GHC 9.0 and above # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3 regex-compat-tdfa = appendPatches [ From 2a32ce73ac50846e064f767609098aebba9301e0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 9 Jun 2022 00:48:49 +0200 Subject: [PATCH 040/297] serf: pin to openssl_1_1 to fix the subversion build --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e9c802e2fb0..b4e50213e2aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21192,7 +21192,9 @@ with pkgs; serd = callPackage ../development/libraries/serd {}; - serf = callPackage ../development/libraries/serf {}; + serf = callPackage ../development/libraries/serf { + openssl = openssl_1_1; + }; sfsexp = callPackage ../development/libraries/sfsexp {}; From 35099b99b018338d0c5b5a538e81c1b135e6f01c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Jun 2022 17:54:49 +0200 Subject: [PATCH 041/297] dovecot: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4e50213e2aa..78fbabe6224e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22424,7 +22424,9 @@ with pkgs; dodgy = with python3Packages; toPythonApplication dodgy; - dovecot = callPackage ../servers/mail/dovecot { }; + dovecot = callPackage ../servers/mail/dovecot { + openssl = openssl_1_1; + }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { }; From 9601981023536af15822c11673d8891c9e1a26d1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Jun 2022 18:27:08 +0200 Subject: [PATCH 042/297] libewf: fix build with OpenSSL 3.0 --- pkgs/development/libraries/libewf/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 1935c7d947ff..c7311d166b33 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: +{ fetchurl, fetchpatch, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: stdenv.mkDerivation rec { version = "20201230"; @@ -6,9 +6,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - sha256 = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc="; + hash = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc="; }; + patches = [ + # fix build with OpenSSL 3.0 + (fetchpatch { + url = "https://github.com/libyal/libewf/commit/033ea5b4e5f8f1248f74a2ec61fc1be183c6c46b.patch"; + hash = "sha256-R4+NO/91kiZP48SJyVF9oYjKCg1h/9Kh8/0VOEmJXPQ="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ] ++ lib.optionals stdenv.isDarwin [ bzip2 ]; From 6ebaf8532ecc4b467518622b188e6737b44faf4d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Jun 2022 18:33:32 +0200 Subject: [PATCH 043/297] thrift: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78fbabe6224e..00ee17172cd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21559,7 +21559,9 @@ with pkgs; theft = callPackage ../development/libraries/theft { }; - thrift = callPackage ../development/libraries/thrift { }; + thrift = callPackage ../development/libraries/thrift { + openssl = openssl_1_1; + }; thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; From 84f17a3082491d6a01baa840e3a94c5fb6128941 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:07:33 +0200 Subject: [PATCH 044/297] mariadb: use openssl_1_1 for older releases https://jira.mariadb.org/browse/MDEV-28339 --- pkgs/servers/sql/mariadb/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 71b638b9ab8c..6cedd8d05fb4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,7 +2,7 @@ # Native buildInputs components , bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config # Common components -, curl, libiconv, ncurses, openssl, pcre, pcre2 +, curl, libiconv, ncurses, openssl, openssl_1_1, pcre, pcre2 , libkrb5, libaio, liburing, systemd , CoreServices, cctools, perl , jemalloc, less, libedit @@ -39,13 +39,16 @@ commonOptions = packageSettings: rec { # attributes common to both builds ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = [ - curl libiconv ncurses openssl zlib + libiconv ncurses zlib ] ++ (packageSettings.extraBuildInputs or []) ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] - ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]); + ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) + ++ (if (lib.versionOlder version "10.8") + then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] + else [ openssl curl ]); prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt From e51d2c27156721c47842429dc824ec39fc094321 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Jun 2022 19:10:57 +0200 Subject: [PATCH 045/297] erlang*: use matching openssl version for each release --- pkgs/top-level/beam-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 714873775269..9cd28546dd40 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,5 @@ { beam, callPackage, wxGTK30, buildPackages, stdenv +, openssl_1_1 , wxSupport ? true , systemdSupport ? stdenv.isLinux }: @@ -51,6 +52,7 @@ with beam; { # R23 erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { + openssl = openssl_1_1; wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; @@ -66,6 +68,7 @@ with beam; { # R22 erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { + openssl = openssl_1_1; wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; @@ -81,6 +84,7 @@ with beam; { # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + openssl = openssl_1_1; wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; From 80f2c05c52ce35177e87ae40c6cc591632da55ad Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Jun 2022 13:28:48 +0200 Subject: [PATCH 046/297] php80Extensions.openssl: pin to openssl_1_1 --- pkgs/top-level/php-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ce3af252abc7..e3f03fd46877 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -31,6 +31,7 @@ , net-snmp , oniguruma , openldap +, openssl_1_1 , openssl , pam , pcre2 @@ -407,7 +408,7 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "openssl"; - buildInputs = [ openssl ]; + buildInputs = if (lib.versionAtLeast php.version "8.1") then [ openssl ] else [ openssl_1_1 ]; configureFlags = [ "--with-openssl" ]; doCheck = false; } From 8d8f4cde9bfd1dd77fc68cd432a6f6fcbb9b7406 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Jun 2022 17:39:27 +0200 Subject: [PATCH 047/297] sbsigntool: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00ee17172cd1..ce97fe5b1468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7117,7 +7117,9 @@ with pkgs; efitools = callPackage ../tools/security/efitools { }; - sbsigntool = callPackage ../tools/security/sbsigntool { }; + sbsigntool = callPackage ../tools/security/sbsigntool { + openssl = openssl_1_1; + }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; From 3ab75249abcbb1b2352999bfb97e2c7bb6f8e5c8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Jun 2022 17:39:34 +0200 Subject: [PATCH 048/297] sbsigntool: clean up a bit --- pkgs/tools/security/sbsigntool/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 4c548bbd535f..34c5e4d235c8 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -35,12 +35,7 @@ stdenv.mkDerivation rec { automake --add-missing -Wno-portability ./configure --prefix=$out - ''; - - installPhase = '' - mkdir -p $out - make install - ''; + ''; meta = with lib; { description = "Tools for maintaining UEFI signature databases"; @@ -50,4 +45,3 @@ stdenv.mkDerivation rec { license = licenses.gpl3; }; } - From 8496e1a448c6aef75afeae2bb3ed4084da3b8729 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Jun 2022 18:01:25 +0200 Subject: [PATCH 049/297] dot-http: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce97fe5b1468..34b93f0aece3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2374,6 +2374,7 @@ with pkgs; dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; dot-http = callPackage ../development/tools/dot-http { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From f38d2ae25a095fc031f5d85b7ceb95fa4f420aa5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Jun 2022 18:01:35 +0200 Subject: [PATCH 050/297] dogdns: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34b93f0aece3..2cf755af5591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5610,6 +5610,7 @@ with pkgs; dog = callPackage ../tools/system/dog { }; dogdns = callPackage ../tools/networking/dogdns { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From 42d8c348f8c34aa859f67124e0c25be79b735afb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Jun 2022 18:01:41 +0200 Subject: [PATCH 051/297] freeradius: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cf755af5591..04d352d5061c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22492,7 +22492,9 @@ with pkgs; inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; - freeradius = callPackage ../servers/freeradius { }; + freeradius = callPackage ../servers/freeradius { + openssl = openssl_1_1; + }; freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; From 69f1ec7f3a394353161b12eb99fb60d02e5a8e4b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 28 Jun 2022 00:39:38 +0200 Subject: [PATCH 052/297] qt5_openssl_1_1: init this is needed, because some qt modules propagate openssl --- pkgs/top-level/all-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d352d5061c..bfa304c812d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20925,6 +20925,21 @@ with pkgs; qt5 = qt515; libsForQt5 = libsForQt515; + # TODO: remove once no package needs this anymore or together with OpenSSL 1.1 + qt5_openssl_1_1 = qt5.overrideScope' (_: super: { + qtbase = super.qtbase.override { + openssl = openssl_1_1; + libmysqlclient = libmysqlclient.override { + openssl = openssl_1_1; + curl = curl.override { openssl = openssl_1_1; }; + }; + }; + }); + libsForQt5_openssl_1_1 = recurseIntoAttrs (import ./qt5-packages.nix { + inherit lib pkgs; + qt5 = qt5_openssl_1_1; + }); + # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; From e20f0040c63c73a866bada759831d66a64c808c9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 27 Jun 2022 20:51:35 +0200 Subject: [PATCH 053/297] mumble: fix build by using qt5_openssl_1_1 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfa304c812d1..efc7345769f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29322,12 +29322,14 @@ with pkgs; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; grpcSupport = config.murmur.grpcSupport or true; + qt5 = qt5_openssl_1_1; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; + qt5 = qt5_openssl_1_1; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { From 302e4e8c75eba6bf26e717959ee50120f2de3d2b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 01:46:32 +0200 Subject: [PATCH 054/297] amarok: pin to openssl 1.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efc7345769f6..f3477ce25884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26060,7 +26060,7 @@ with pkgs; msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; + amarok = libsForQt5_openssl_1_1.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; From d39a635d8ce3f5a67c4a4d1ae288a66149381923 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 02:51:02 +0200 Subject: [PATCH 055/297] hurl: pin to openssl 1.1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3477ce25884..ad40d3e19d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7396,7 +7396,9 @@ with pkgs; httpx = callPackage ../tools/security/httpx { }; - hurl = callPackage ../tools/networking/hurl { }; + hurl = callPackage ../tools/networking/hurl { + openssl = openssl_1_1; + }; hub = callPackage ../applications/version-management/git-and-tools/hub { }; From ece71cc343eff654ddc5a9560fa37c84b90fcf7c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 13:31:22 +0200 Subject: [PATCH 056/297] nodejs-16_x-openssl_1_1 & yarn2nix-moretea-openssl_1_1: init --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad40d3e19d68..1af26dc71297 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8259,6 +8259,7 @@ with pkgs; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; + nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { }; nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; @@ -12389,6 +12390,9 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; + yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { + nodejs = nodejs.override { openssl = openssl_1_1; }; + }; inherit (yarn2nix-moretea) yarn2nix From d1b2156d4288ef9e0df05933426745fcc48bb86f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 13:31:31 +0200 Subject: [PATCH 057/297] element-web: use openssl 1.1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1af26dc71297..e743e092191a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3692,6 +3692,7 @@ with pkgs; ''; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { + inherit (yarn2nix-moretea-openssl_1_1) mkYarnPackage fixup_yarn_lock; conf = config.element-web.conf or {}; }; From 945ac1c9d83c7d216b7a655d02b3e7eefb9e2393 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 01:48:24 +0200 Subject: [PATCH 058/297] google-cloud-cpp: pin to openssl 1.1 --- pkgs/development/libraries/google-cloud-cpp/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 8758daf9c3ab..2c5cade6b69c 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { abseil-cpp c-ares crc32c - curl + (curl.override { inherit openssl; }) grpc nlohmann_json openssl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e743e092191a..3005b5150cfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6955,6 +6955,7 @@ with pkgs; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { + openssl = openssl_1_1; abseil-cpp = abseil-cpp.override { cxxStandard = "14"; }; From cc120206d830998a1bcb8ad7aa9f1b2e8c213b31 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 16:03:29 +0200 Subject: [PATCH 059/297] tqsl: pin to openssl_1_1 --- pkgs/applications/radio/tqsl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index b5198f78b0aa..069656560c9f 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { openssl zlib db - curl + (curl.override { inherit openssl; }) wxGTK ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3005b5150cfc..fb8a9f4ab7b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31102,7 +31102,9 @@ with pkgs; buildGoModule = buildGo117Module; }; - tqsl = callPackage ../applications/radio/tqsl { }; + tqsl = callPackage ../applications/radio/tqsl { + openssl = openssl_1_1; + }; trustedqsl = tqsl; # Alias added 2019-02-10 transcode = callPackage ../applications/audio/transcode { }; From b9c0db8d86d7a2d278fb5d439c3a2504ff010073 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 16:03:36 +0200 Subject: [PATCH 060/297] odp-dpdk: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb8a9f4ab7b1..be853bd4a762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24406,7 +24406,9 @@ with pkgs; odin = callPackage ../development/compilers/odin { }; - odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { + openssl = openssl_1_1; + }; odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; From 659ea66a8ece39d414e02f66819619edf52aad35 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 16:10:09 +0200 Subject: [PATCH 061/297] rustup: pin to openssl_1_1 --- pkgs/development/tools/rust/rustup/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 65bad79aa8c3..12e69bae20ba 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -6,6 +6,7 @@ , rustPlatform , makeWrapper , pkg-config +, openssl , curl , zlib , Security @@ -36,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - curl + (curl.override { inherit openssl; }) zlib ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be853bd4a762..42a63a4b4126 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14438,6 +14438,7 @@ with pkgs; }; rust-script = callPackage ../development/tools/rust/rust-script { }; rustup = callPackage ../development/tools/rust/rustup { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { From 50e225d42b7be18e5b11233f8a7e58201a26b061 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 17:31:50 +0200 Subject: [PATCH 062/297] s3rs: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42a63a4b4126..0982e11c1b19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10504,6 +10504,7 @@ with pkgs; s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; s3rs = callPackage ../tools/networking/s3rs { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From ea94d17deba812a1d928ccd2c6a76dbcf4a96d54 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 18:15:25 +0200 Subject: [PATCH 063/297] simple-http-server: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0982e11c1b19..e2d4d2d56bbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36331,6 +36331,7 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; simple-http-server = callPackage ../servers/simple-http-server { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From faac333edd78482aa743627e85fc41d9e5abcafb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 18:16:14 +0200 Subject: [PATCH 064/297] python3.pkgs.uamqp: pin to openssl_1_1 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cfcdc82c07e..0fdfc3723ce3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11096,6 +11096,7 @@ in { tzlocal = callPackage ../development/python-modules/tzlocal { }; uamqp = callPackage ../development/python-modules/uamqp { + openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security; }; From 04e9a388b208832a32acac6749e69a473a1c1fd1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 18:18:05 +0200 Subject: [PATCH 065/297] nginx: remove openssl_3 override --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2d4d2d56bbd..73ea3c84abce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22816,7 +22816,6 @@ with pkgs; nginxStable = callPackage ../servers/http/nginx/stable.nix { zlib = zlib-ng.override { withZlibCompat = true; }; - openssl = openssl_3; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 @@ -22825,7 +22824,6 @@ with pkgs; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { zlib = zlib-ng.override { withZlibCompat = true; }; - openssl = openssl_3; withKTLS = true; withPerl = false; # We don't use `with` statement here on purpose! From 3908614fe9061c51800c6451f620819ee687d1ee Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 18:18:21 +0200 Subject: [PATCH 066/297] tengine: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73ea3c84abce..cb6d6e1f63f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33372,6 +33372,7 @@ with pkgs; teeworlds = callPackage ../games/teeworlds { }; tengine = callPackage ../servers/http/tengine { + openssl = openssl_1_1; modules = with nginxModules; [ rtmp dav moreheaders modsecurity-nginx ]; }; From 03d1fd84d5a5e9af1eaca2b10c13330a3f6fd2cd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 18:30:48 +0200 Subject: [PATCH 067/297] gemConfig/openssl: pin to openssl_1_1 --- pkgs/development/ruby-modules/gem-config/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 5a6d885159a5..4e935c6537a1 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi -, cmake, libssh2, openssl, libmysqlclient, git, perl, pcre, gecode_3, curl +, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz @@ -478,7 +478,8 @@ in }; openssl = attrs: { - buildInputs = [ openssl ]; + # https://github.com/ruby/openssl/issues/369 + buildInputs = [ openssl_1_1 ]; }; opus-ruby = attrs: { From b6aad16660f0b7d3e5027b1d7556a8d07e8a3964 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 02:50:56 +0200 Subject: [PATCH 068/297] gitlab: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb6d6e1f63f8..eb0948fca9d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6774,8 +6774,11 @@ with pkgs; gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { }; + gitlab = callPackage ../applications/version-management/gitlab { + openssl = openssl_1_1; + }; gitlab-ee = callPackage ../applications/version-management/gitlab { + openssl = openssl_1_1; gitlabEnterprise = true; }; From 240ace010db8979fed8c0246fe978497b4404484 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 02:40:59 +0200 Subject: [PATCH 069/297] sysdig: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/linux-kernels.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0948fca9d0..1cdfb7bbddc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24623,6 +24623,7 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; sysdig = callPackage ../os-specific/linux/sysdig { + openssl = openssl_1_1; kernel = null; }; # sysdig is a client, for a driver look at linuxPackagesFor diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bb19710ffd87..3dd6e2c43c30 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -442,7 +442,9 @@ in { rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { }; - sysdig = callPackage ../os-specific/linux/sysdig {}; + sysdig = callPackage ../os-specific/linux/sysdig { + openssl = pkgs.openssl_1_1; + }; systemtap = callPackage ../development/tools/profiling/systemtap { }; From 09f53a8624ba3b7a9bea9da5a64f8e680b68c0fd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 02:41:55 +0200 Subject: [PATCH 070/297] swiProlog: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cdfb7bbddc8..bbbfe9b4487c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14544,6 +14544,7 @@ with pkgs; swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; From f6390b357d4a3c6f96cefdd9c5d4f56ae762c42d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 4 Nov 2021 05:06:29 +0100 Subject: [PATCH 071/297] percona-server56: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbbfe9b4487c..001c63b5331d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23039,7 +23039,10 @@ with pkgs; nginx-sso = callPackage ../servers/nginx-sso { }; - percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { + stdenv = gcc10StdenvCompat; + openssl = openssl_1_1; + }; percona-server = percona-server56; influxdb = callPackage ../servers/nosql/influxdb { From 4915e5913604c4ee246156ad584ce7856b99f8dc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 03:06:38 +0200 Subject: [PATCH 072/297] pam_p11: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 001c63b5331d..081f9b14f392 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24447,7 +24447,9 @@ with pkgs; pam_mysql = callPackage ../os-specific/linux/pam_mysql { }; - pam_p11 = callPackage ../os-specific/linux/pam_p11 { }; + pam_p11 = callPackage ../os-specific/linux/pam_p11 { + openssl = openssl_1_1; + }; pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; From bf4c320600c3a28d0c1e5910076c446245b712f9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 03:09:53 +0200 Subject: [PATCH 073/297] umurmur: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 081f9b14f392..4cdd834503a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31203,7 +31203,9 @@ with pkgs; uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; - umurmur = callPackage ../applications/networking/umurmur { }; + umurmur = callPackage ../applications/networking/umurmur { + openssl = openssl_1_1; + }; udocker = callPackage ../tools/virtualization/udocker { }; From a9fc19c7cfdb532bc24d3461a5031bf5563ea529 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 03:10:22 +0200 Subject: [PATCH 074/297] libstrophe: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cdd834503a4..4c3862fcb193 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19842,7 +19842,9 @@ with pkgs; libstroke = callPackage ../development/libraries/libstroke { }; - libstrophe = callPackage ../development/libraries/libstrophe { }; + libstrophe = callPackage ../development/libraries/libstrophe { + openssl = openssl_1_1; + }; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; From 0a90c5d1603ee14f5c8438ffcfa9eb4a8bf10716 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 03:19:24 +0200 Subject: [PATCH 075/297] zookeeper_mt: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c3862fcb193..633f17fe28e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23516,7 +23516,9 @@ with pkgs; zookeeper = callPackage ../servers/zookeeper { }; - zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; + zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { + openssl = openssl_1_1; + }; xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; }; From 8dfc998207dca2e2928cd1f204e4f37444aa40a6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 15:47:56 +0200 Subject: [PATCH 076/297] python3: pin to openssl_1_1 --- .../interpreters/python/cpython/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 44cf836fc9c8..73197f065625 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -7,6 +7,7 @@ , mailcap, mimetypesSupport ? true , ncurses , openssl +, openssl_1_1 , readline , sqlite , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false @@ -75,6 +76,10 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) with lib; let + # cpython does support/build with openssl 3.0, but some libraries using the ssl module seem to have issues with it + # null check for Minimal + openssl' = if openssl != null then openssl_1_1 else null; + buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; @@ -115,7 +120,7 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl' ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) @@ -321,8 +326,8 @@ in with passthru; stdenv.mkDerivation { "--with-threads" ] ++ optionals (sqlite != null && isPy3k) [ "--enable-loadable-sqlite-extensions" - ] ++ optionals (openssl != null) [ - "--with-openssl=${openssl.dev}" + ] ++ optionals (openssl' != null) [ + "--with-openssl=${openssl'.dev}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_buggy_getaddrinfo=no" # Assume little-endian IEEE 754 floating point when cross compiling @@ -484,7 +489,7 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - lib.optionals (openssl != null && !static) [ openssl.dev ] + lib.optionals (openssl' != null && !static) [ openssl'.dev ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. From b2bed48781c1e78aca4044f7af598f09549d948a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 31 Jul 2022 23:25:17 +0200 Subject: [PATCH 077/297] fractal: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 633f17fe28e6..24058c9db8e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27535,7 +27535,9 @@ with pkgs; foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; - fractal = callPackage ../applications/networking/instant-messengers/fractal { }; + fractal = callPackage ../applications/networking/instant-messengers/fractal { + openssl = openssl_1_1; + }; fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; From ad76e3dd39255770ddba7774c5bab96d1317858e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 31 Jul 2022 23:35:00 +0200 Subject: [PATCH 078/297] ceph: pin to openssl_1_1 propagated through curl --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24058c9db8e7..c24c74dec26f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4919,6 +4919,8 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; + # needs to be the same openssl version as python/pyopenssl + curl = (curl.override { openssl = openssl_1_1; }); }) ceph ceph-client; From 9c8e33f2cebde1c1e0ad17598021517bccfc0069 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 31 Jul 2022 23:45:34 +0200 Subject: [PATCH 079/297] git-crypt: fix build with openssl_3 --- .../version-management/git-and-tools/git-crypt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 1cf29fbd6c2d..49dcb14fc013 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl" ]; + # https://github.com/AGWA/git-crypt/issues/232 + CXXFLAGS = [ + "-DOPENSSL_API_COMPAT=0x30000000L" + ]; + postFixup = '' wrapProgram $out/bin/git-crypt \ --suffix PATH : ${lib.makeBinPath [ git gnupg ]} From 14f18b31c3f9c7d6762f4b687ae8a5ccac35fe13 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 31 Jul 2022 23:57:36 +0200 Subject: [PATCH 080/297] git-backup: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c24c74dec26f..e345dbdad6c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6626,6 +6626,7 @@ with pkgs; git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise {}; git-backup = callPackage ../applications/version-management/git-backup { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From ce6deb535b6d300dfbe107315d63f58cac1d9620 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 31 Jul 2022 23:58:54 +0200 Subject: [PATCH 081/297] firmware-manager: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e345dbdad6c1..1dd5b05b2c36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23813,7 +23813,9 @@ with pkgs; fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { }; - firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { + openssl = openssl_1_1; + }; firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; From e891feb271e036cfac4fd20e1827164519996965 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 1 Aug 2022 00:03:47 +0200 Subject: [PATCH 082/297] meli: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dd5b05b2c36..77369d197c4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29041,7 +29041,9 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { }; + meli = callPackage ../applications/networking/mailreaders/meli { + openssl = openssl_1_1; + }; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; From dd5518bd8fafa8be0e9e00562225649418b72ae3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 1 Aug 2022 00:07:31 +0200 Subject: [PATCH 083/297] squid: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77369d197c4d..dbcff8972bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23409,7 +23409,10 @@ with pkgs; spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; - squid = callPackage ../servers/squid { }; + squid = callPackage ../servers/squid { + # https://bugs.squid-cache.org/show_bug.cgi?id=5133 + openssl = openssl_1_1; + }; duckling-proxy = callPackage ../servers/duckling-proxy { }; From 5cc75bbb98cd5dc94be1dee3aba10547b62dbdd1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 1 Aug 2022 00:49:43 +0200 Subject: [PATCH 084/297] percona-xtrabackup_*: pin to openssl_1_1 --- pkgs/tools/backup/percona-xtrabackup/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 4caafcae679b..2ea2088645e4 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; buildInputs = [ - curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4 + (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4 ncurses numactl openssl protobuf valgrind xxd zlib ] ++ (with perlPackages; [ perl DBI DBDmysql ]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbcff8972bae..6d9583ea3018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9645,10 +9645,16 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix - { stdenv = gcc10StdenvCompat; boost = boost159; }; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix - { stdenv = gcc10StdenvCompat; boost = boost170; }; + percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { + stdenv = gcc10StdenvCompat; + boost = boost159; + openssl = openssl_1_1; + }; + percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { + stdenv = gcc10StdenvCompat; + boost = boost170; + openssl = openssl_1_1; + }; pick = callPackage ../tools/misc/pick { }; From dc13b70ad9cc5f5f55b2b93373bd4a649c806a8a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Aug 2022 01:12:53 +0200 Subject: [PATCH 085/297] ipfs: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d9583ea3018..635854ab4761 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7585,7 +7585,9 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + openssl = openssl_1_1; + }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { }; From fffda8a63ff9ce66ecd89a577745901255bb9bfd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Aug 2022 01:13:04 +0200 Subject: [PATCH 086/297] nzbget: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 635854ab4761..12a40b658322 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9263,7 +9263,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - nzbget = callPackage ../tools/networking/nzbget { }; + nzbget = callPackage ../tools/networking/nzbget { + openssl = openssl_1_1; + }; nzbhydra2 = callPackage ../servers/nzbhydra2 { # You need Java (at least 8, at most 15) From b17c551aa2bc948181a5e62e4fd4e813c2cb224c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 4 Aug 2022 01:12:12 +0200 Subject: [PATCH 087/297] libmysqlconnectorcpp: pin to openssl_1_1 --- pkgs/development/compilers/dotnet/build-dotnet.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index f8cf3d302ec4..6cc7dace6f15 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -15,7 +15,7 @@ assert if type == "sdk" then packages != null else true; , autoPatchelfHook , makeWrapper , libunwind -, openssl +, openssl_1_1 , libuuid , zlib , curl @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { icu libunwind libuuid - openssl + openssl_1_1 ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12a40b658322..4f5d695a16f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19440,7 +19440,9 @@ with pkgs; libmysofa = callPackage ../development/libraries/audio/libmysofa { }; - libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { + openssl = openssl_1_1; + }; libnatpmp = callPackage ../development/libraries/libnatpmp { }; From 4921d9473fbc5e4095b35bd42ab6e07ee458fd41 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 4 Aug 2022 01:13:33 +0200 Subject: [PATCH 088/297] git-trim: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f5d695a16f8..c813026cbd1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6744,6 +6744,7 @@ with pkgs; git-test = callPackage ../applications/version-management/git-and-tools/git-test { }; git-trim = callPackage ../applications/version-management/git-and-tools/git-trim { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From 76064cccc240946a80a972ca64ede231920b51dd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 4 Aug 2022 01:13:50 +0200 Subject: [PATCH 089/297] git-subset: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c813026cbd1c..b96095a52e64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6734,6 +6734,7 @@ with pkgs; git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { }; git-subset = callPackage ../applications/version-management/git-and-tools/git-subset { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From 424885f5f8f1db8df2991d5ddfbc579bc4719c74 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 7 Aug 2022 00:19:16 +0200 Subject: [PATCH 090/297] perlPackages.CryptOpenSSLGuess: 0.11 -> 0.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55f09410856c..72449e9d5a03 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4826,10 +4826,10 @@ let CryptOpenSSLGuess = buildPerlPackage { pname = "Crypt-OpenSSL-Guess"; - version = "0.11"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz"; - sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; + url = "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.15.tar.gz"; + sha256 = "1c5033381819fdb4c9087dd291b90ec70e7810d31d57eade9b388eccfd70386d"; }; meta = { description = "Guess OpenSSL include path"; From 1a75cc1f1f77a0842e8b6c2d5d462c03f9e14bec Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 7 Aug 2022 00:19:22 +0200 Subject: [PATCH 091/297] perlPackages.CryptOpenSSLX509: 1.813 -> 1.914 for openssl 3.x support --- pkgs/top-level/perl-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72449e9d5a03..5bfa31154e1a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4869,13 +4869,15 @@ let CryptOpenSSLX509 = buildPerlPackage rec { pname = "Crypt-OpenSSL-X509"; - version = "1.813"; + version = "1.914"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.813.tar.gz"; - sha256 = "684bd888d2ed4c748f8f6dd8e87c14afa2974b12ee01faa082ad9cfa1e321e62"; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.914.tar.gz"; + sha256 = "49c575257e6408ad5a89011e5b5800d598f9ccafdf42e71004ed81cb2f44ee7a"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; + buildInputs = [ CryptOpenSSLGuess ]; + propagatedBuildInputs = [ ConvertASN1 ]; meta = { homepage = "https://github.com/dsully/perl-crypt-openssl-x509"; description = "Perl extension to OpenSSL's X509 API"; From cc375c4d89c4cedf7de1fc26b2888fabb155e597 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 7 Aug 2022 00:25:43 +0200 Subject: [PATCH 092/297] wraith: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b96095a52e64..45112bcd1542 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36091,7 +36091,9 @@ with pkgs; wprecon = callPackage ../tools/security/wprecon { }; - wraith = callPackage ../applications/networking/irc/wraith { }; + wraith = callPackage ../applications/networking/irc/wraith { + openssl = openssl_1_1; + }; wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; From d761390cd04a1a9510b9a4f42803878e0ca268ba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 7 Aug 2022 00:31:47 +0200 Subject: [PATCH 093/297] sgx/sdk/ipp-crypto: pin to openssl_1_1 --- pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix index 85fcfc9c554d..16f3d836833d 100644 --- a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix +++ b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , nasm -, openssl +, openssl_1_1 , python3 , extraCmakeFlags ? [ ] }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm - openssl + openssl_1_1 python3 ]; } From 63adbbdb6611e0eb7f4db06ea862052cd799d7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 9 Aug 2022 19:12:07 +0100 Subject: [PATCH 094/297] nixos/changelog: Mention openssl3 update --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 5 +++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 7 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 47f8fbb3abc5..1930184a50e9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -100,6 +100,11 @@ Cinnamon has been updated to 5.4. + + + OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. + + hardware.nvidia has a new option diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 2fd8b1bbe753..09c6b767de9b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -48,6 +48,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Cinnamon has been updated to 5.4. +- OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. + - `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement. From 0df0cbff9482893c5db2d6c98c372c9973ed4d8c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 23:49:14 +0200 Subject: [PATCH 095/297] proxysql: don't reference openssl_3 explicitly it's the default now --- pkgs/servers/sql/proxysql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index f4c244e6632a..94d6e28c569b 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -20,7 +20,7 @@ , libuuid , lz4 , nlohmann_json -, openssl_3 +, openssl , pcre , perl , python2 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison - (curl.override { openssl = openssl_3; }) + curl flex gnutls libgcrypt @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { { f = "libev"; p = libev; } { f = "libinjection"; p = libinjection; } { f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; } - { f = "libssl"; p = openssl_3; } + { f = "libssl"; p = openssl; } { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } { f = "re2"; p = re2; } From dbc5a792a26189e2e610b9736b218d3f5df50ebf Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 18 Aug 2022 00:10:08 -0400 Subject: [PATCH 096/297] llvmPackages*.libunwind: Don't redo install phase from scratch I can't think of any good reason it was the way it was before. I think CMake can be made to install the headers too, but this is a fine first step. --- .../compilers/llvm/10/libcxxabi/default.nix | 36 ++++++++----------- .../compilers/llvm/11/libcxxabi/default.nix | 36 ++++++++----------- .../compilers/llvm/12/libcxxabi/default.nix | 36 ++++++++----------- .../compilers/llvm/13/libcxxabi/default.nix | 36 ++++++++----------- .../compilers/llvm/5/libcxxabi/default.nix | 35 ++++++++---------- .../compilers/llvm/6/libcxxabi/default.nix | 35 ++++++++---------- .../compilers/llvm/7/libcxxabi/default.nix | 35 ++++++++---------- .../compilers/llvm/8/libcxxabi/default.nix | 36 ++++++++----------- .../compilers/llvm/9/libcxxabi/default.nix | 36 ++++++++----------- .../compilers/llvm/git/libcxxabi/default.nix | 36 ++++++++----------- 10 files changed, 140 insertions(+), 217 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/libcxxabi/default.nix b/pkgs/development/compilers/llvm/10/libcxxabi/default.nix index b427949a8426..482ced8e0c3f 100644 --- a/pkgs/development/compilers/llvm/10/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/10/libcxxabi/default.nix @@ -40,28 +40,20 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index 61cfe8eede92..6c4ca925ab11 100644 --- a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -44,28 +44,20 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 803fe6a62fac..89b56ad230d8 100644 --- a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -42,28 +42,20 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 0bdbee07b738..16ea0b113c75 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -39,28 +39,20 @@ stdenv.mkDerivation rec { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix index 5146e20089b7..60a41ab2d830 100644 --- a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix @@ -25,27 +25,20 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/6/libcxxabi/default.nix b/pkgs/development/compilers/llvm/6/libcxxabi/default.nix index 6a03d8a1835e..d7de130fbaaf 100644 --- a/pkgs/development/compilers/llvm/6/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/6/libcxxabi/default.nix @@ -25,27 +25,20 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix index 0bb76f916285..1bc9444feda1 100644 --- a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix @@ -44,27 +44,20 @@ stdenv.mkDerivation { "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - ${lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"} - install -m 644 ../include/cxxabi.h $out/include - ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"} - ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"} - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/libcxxabi/default.nix b/pkgs/development/compilers/llvm/8/libcxxabi/default.nix index 593b1df9b7ad..50a5eabc1703 100644 --- a/pkgs/development/compilers/llvm/8/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/8/libcxxabi/default.nix @@ -40,28 +40,20 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/libcxxabi/default.nix b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix index 2af3322fd68d..ee6834affbcd 100644 --- a/pkgs/development/compilers/llvm/9/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix @@ -40,28 +40,20 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index d64708ab040a..441aba651666 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -49,28 +49,20 @@ stdenv.mkDerivation rec { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 ../include/cxxabi.h $out/include - '' + lib.optionalString enableShared '' - install -m 644 lib/libc++abi.so.1.0 $out/lib - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; From 3b60b31d6072055195a07b175c4999326e26ab14 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Aug 2022 08:35:41 +0100 Subject: [PATCH 097/297] gcc: drop unused libelf dependency gcc stopped using libelf in commit 48215350c24 ("re PR lto/46273 (Failed to bootstrap)") around 2010, before gcc-4.6.0. --- pkgs/development/compilers/gcc/10/default.nix | 8 ++------ pkgs/development/compilers/gcc/11/default.nix | 8 ++------ pkgs/development/compilers/gcc/12/default.nix | 8 ++------ pkgs/development/compilers/gcc/4.8/default.nix | 8 ++------ pkgs/development/compilers/gcc/4.9/default.nix | 8 ++------ pkgs/development/compilers/gcc/6/default.nix | 8 ++------ pkgs/development/compilers/gcc/7/default.nix | 8 ++------ pkgs/development/compilers/gcc/8/default.nix | 8 ++------ pkgs/development/compilers/gcc/9/default.nix | 8 ++------ pkgs/development/compilers/gcc/common/configure-flags.nix | 3 +-- 10 files changed, 19 insertions(+), 56 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 1c223fa82f4a..b6f4d57f9b35 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -14,7 +14,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -29,9 +28,6 @@ , buildPackages }: -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -173,7 +169,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -203,7 +199,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index ca3a89af1806..17cb8c454932 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -14,7 +14,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -29,9 +28,6 @@ , buildPackages }: -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -181,7 +177,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -211,7 +207,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 6fdc31079a89..5d971c3d5ea7 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -14,7 +14,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -29,9 +28,6 @@ , buildPackages }: -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -176,7 +172,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -206,7 +202,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index bc93d6e13585..65d0a54bc107 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -13,7 +13,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -39,9 +38,6 @@ assert langJava -> zip != null && unzip != null # We enable the isl cloog backend. assert cloog != null -> isl != null; -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -179,7 +175,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (cloog != null) cloog) ++ (optional (isl != null) isl) @@ -210,7 +206,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl cloog enableLTO diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index cc675de22549..8387f2e95496 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -13,7 +13,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -39,9 +38,6 @@ assert langJava -> zip != null && unzip != null # We enable the isl cloog backend. assert cloog != null -> isl != null; -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -199,7 +195,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (cloog != null) cloog) ++ (optional (isl != null) isl) @@ -230,7 +226,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl cloog enableLTO diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index d108dc11f18c..0eb5b0feb25b 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -15,7 +15,6 @@ , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null @@ -40,9 +39,6 @@ assert langJava -> zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -210,7 +206,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -242,7 +238,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e4e1f2038de5..64dac4cf8e13 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -12,7 +12,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -26,9 +25,6 @@ , buildPackages }: -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -178,7 +174,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -209,7 +205,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 7e94ec61c6b7..140379eff547 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -12,7 +12,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -26,9 +25,6 @@ , buildPackages }: -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -162,7 +158,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -192,7 +188,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 707ead542f06..cd34bfe3591f 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -14,7 +14,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -34,9 +33,6 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.hostPlatform.isDarwin -> gnused != null; @@ -175,7 +171,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -205,7 +201,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 8ac7152d7e28..09533163cbfe 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -4,7 +4,7 @@ , crossStageStatic, libcCross , version -, gmp, mpfr, libmpc, libelf, isl +, gmp, mpfr, libmpc, isl , cloog ? null , enableLTO @@ -110,7 +110,6 @@ let "--with-mpfr-lib=${mpfr.out}/lib" "--with-mpc=${libmpc}" ] - ++ lib.optional (libelf != null) "--with-libelf=${libelf}" ++ lib.optionals (!crossStageStatic) [ (if libcCross == null then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" From c864ea9d03ecbb2e401a6a0bf8004356367021b9 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Thu, 18 Aug 2022 07:49:15 +0000 Subject: [PATCH 098/297] gpgme: respect the doCheck parameter The current `gpgme` expression ignores the `doCheck` parameter because upstream's `Makefile` runs the tests automatically as part of the `buildPhase`. Let's run the tests as part of the `checkPhase` iff `doCheck` is set, like the rest of nixpkgs' packages. In particular, with this commit, `pkgsCross.*.gpgme` will no longer attempt to run the tests (tests are not supposed to be run when host!=build). --- pkgs/development/libraries/gpgme/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9b90f912912b..8d4e2e7271d4 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -110,8 +110,13 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" ); + # prevent tests from being run during the buildPhase + makeFlags = [ "tests=" ]; + doCheck = true; + checkFlags = [ "-C" "tests" ]; + passthru.tests = { python = python3.pkgs.gpgme; qt = libsForQt5.qgpgme; From c6e106cd9e8ef4d97c6df98f43a93809a53ff2aa Mon Sep 17 00:00:00 2001 From: Berk Ozkutuk Date: Tue, 16 Aug 2022 18:51:00 +0200 Subject: [PATCH 099/297] python3Packages.werkzeug: 2.1.2 -> 2.2.2 --- pkgs/development/python-modules/werkzeug/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index aaaecc6098fa..d31fd1569f28 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -9,11 +9,12 @@ , pytest-timeout , pytest-xprocess , pytestCheckHook +, markupsafe }: buildPythonPackage rec { pname = "werkzeug"; - version = "2.1.2"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,10 +22,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; + sha256 = "sha256-fqLUgyLMfA+LOiFe1z6r17XXXQtQ4xqwBihsz/ngC48="; }; - propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ + propagatedBuildInputs = [ + markupsafe + ] ++ lib.optionals (!stdenv.isDarwin) [ # watchdog requires macos-sdk 10.13+ watchdog ] ++ lib.optionals (pythonOlder "3.7") [ From ad3c038fa5813224ad3de21ebb3b73dd5efe2b19 Mon Sep 17 00:00:00 2001 From: Berk Ozkutuk Date: Thu, 18 Aug 2022 23:34:28 +0200 Subject: [PATCH 100/297] python3Packages.flask: 2.1.3 -> 2.2.2 --- pkgs/development/python-modules/flask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 760c3ee671ae..7f0ac90533c2 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "flask"; - version = "2.1.3"; + version = "2.2.2"; src = fetchPypi { pname = "Flask"; inherit version; - sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + sha256 = "sha256-ZCxFDRnErUgvlnKb0qj20yVUqh4jH09rTn5SZLFsyis="; }; propagatedBuildInputs = [ From 7f01443ef1cf09be0dd772af0a58409a4a02ccb1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Aug 2022 00:11:08 +0200 Subject: [PATCH 101/297] nss: Drop nss-pem patchset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch url went 404 and other distros¹ have discarded it as well in favor of packaging nss-pem² [1] https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-libs/nss?id=5eca3e02c87163b3c541cdee893830d201abfb86 [2] https://github.com/kdudka/nss-pem --- pkgs/development/libraries/nss/generic.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index febc2423388e..c0d07cd382c6 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -19,11 +19,6 @@ }: let - nssPEM = fetchurl { - url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; - sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; - }; - underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version; in stdenv.mkDerivation rec { @@ -45,13 +40,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; prePatch = '' - # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_ - xz -d < ${nssPEM} | sed \ - -e 's/-DIRS = builtins $/-DIRS = . builtins/g' \ - -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \ - -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \ - | patch -p1 - patchShebangs nss for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do From df214678dcf8444d290e835c6039a48cefed65b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Aug 2022 00:17:15 +0200 Subject: [PATCH 102/297] nss: Drop ckpem patch It's usefulness is not clear to us maintainers. --- pkgs/development/libraries/nss/ckpem.patch | 11 ----------- pkgs/development/libraries/nss/generic.nix | 1 - 2 files changed, 12 deletions(-) delete mode 100644 pkgs/development/libraries/nss/ckpem.patch diff --git a/pkgs/development/libraries/nss/ckpem.patch b/pkgs/development/libraries/nss/ckpem.patch deleted file mode 100644 index c1a65a6c0b28..000000000000 --- a/pkgs/development/libraries/nss/ckpem.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:12.000000000 -0800 -+++ nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:20.000000000 -0800 -@@ -156,8 +156,6 @@ - NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; - NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; - -- PRBool logged_in; -- - /* our raw object data array */ - NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; - NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index c0d07cd382c6..c2d9518c9023 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { else ./85_security_load_3.77+.patch ) - ./ckpem.patch ./fix-cross-compilation.patch ]; From dcf4dc23c703cf86678f212668dba7733d500f02 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Thu, 18 Aug 2022 17:35:28 -0400 Subject: [PATCH 103/297] pythonPackages.twisted: fix sandboxed build on Darwin --- pkgs/development/python-modules/twisted/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 7779f0531370..6689a2ce80d3 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; }; + __darwinAllowLocalNetworking = true; + propagatedBuildInputs = [ attrs automat From cc3690002460dc1ad6ad4572f767ffe45e52a4ca Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Fri, 19 Aug 2022 08:25:23 +0200 Subject: [PATCH 104/297] bluez: remove unused fetchpatch import --- pkgs/os-specific/linux/bluez/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 8191624fa828..ff8fbb460b27 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , alsa-lib , dbus , ell From 9d2a6192d8a00b7be9a14b79543b404262db0de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 19 Aug 2022 12:17:21 +0200 Subject: [PATCH 105/297] nettle: 3.8 -> 3.8.1 https://lists.gnu.org/archive/html/info-gnu/2022-07/msg00010.html --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index ed4948cd7f80..1ce011a3231c 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.8"; + version = "3.8.1"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - hash = "sha256-dXbGhIHBmPZEsIwWDRpIULqUSeMIBpRVtSEzGfI06OY="; + hash = "sha256-Nk8+K3fNfc3oP9fEUhnINOVLDHXkKLb4lKI9Et1By/4="; }; } From 977cbb7e822028cc51a1cf02908af9074daff6ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Aug 2022 13:07:23 +0200 Subject: [PATCH 106/297] python3Packages.django_3: patch in zoneinfo directory Related: #187388 --- pkgs/development/python-modules/django/3.nix | 8 +++++++- .../django/django_3_set_zoneinfo_dir.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/django/django_3_set_zoneinfo_dir.patch diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 204857b925f4..d90277961800 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -8,6 +8,7 @@ , asgiref , pytz , sqlparse +, tzdata , pythonOlder , withGdal ? false }: @@ -24,7 +25,12 @@ buildPythonPackage rec { hash = "sha256-9xk0sagi8UqGyayWNAU2iSec0ErmnLat5KWUcbiGWCs="; }; - patches = lib.optional withGdal + patches = [ + (substituteAll { + src = ./django_3_set_zoneinfo_dir.patch; + zoneinfo = tzdata + "/share/zoneinfo"; + }) + ] ++ lib.optional withGdal (substituteAll { src = ./django_3_set_geos_gdal_lib.patch; inherit geos39; diff --git a/pkgs/development/python-modules/django/django_3_set_zoneinfo_dir.patch b/pkgs/development/python-modules/django/django_3_set_zoneinfo_dir.patch new file mode 100644 index 000000000000..69ad1c85d80c --- /dev/null +++ b/pkgs/development/python-modules/django/django_3_set_zoneinfo_dir.patch @@ -0,0 +1,13 @@ +diff --git a/django/conf/__init__.py b/django/conf/__init__.py +index 28302440c7..278cfa5e62 100644 +--- a/django/conf/__init__.py ++++ b/django/conf/__init__.py +@@ -200,7 +200,7 @@ class Settings: + if hasattr(time, 'tzset') and self.TIME_ZONE: + # When we can, attempt to validate the timezone. If we can't find + # this file, no check happens and it's harmless. +- zoneinfo_root = Path('/usr/share/zoneinfo') ++ zoneinfo_root = Path('@zoneinfo@') + zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split('/')) + if zoneinfo_root.exists() and not zone_info_file.exists(): + raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE) From 0badc2389af6f730d2acab4cb66554ddab39b57a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Aug 2022 15:16:13 +0200 Subject: [PATCH 107/297] nss: migrate manual patching into postPatch --- pkgs/development/libraries/nss/generic.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index c2d9518c9023..e6d2eae2449c 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -39,16 +39,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - prePatch = '' - patchShebangs nss - - for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do - substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" - done - - substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" - ''; - patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch (if (lib.versionOlder version "3.77") then @@ -61,7 +51,15 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = '' + patchShebangs nss + + for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do + substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" + done + + substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; From 5b709277f48df630c8fa7aab0cf6157f71a5b45c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 19 Aug 2022 19:34:51 +0200 Subject: [PATCH 108/297] perl: `verify_SSL=>1` by default in HTTP::Tiny --- .../development/interpreters/perl/default.nix | 3 + .../http-tiny-verify-ssl-by-default.patch | 79 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 0a9c53e11c5f..79e2bf84a0cd 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -39,6 +39,9 @@ let [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs-5.31.patch + + # Enable TLS/SSL verification in HTTP::Tiny by default + ./http-tiny-verify-ssl-by-default.patch ] ++ optional stdenv.isSunOS ./ld-shared.patch ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] diff --git a/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch b/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch new file mode 100644 index 000000000000..59248061513d --- /dev/null +++ b/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch @@ -0,0 +1,79 @@ +Patch for HTTP::Tiny that defaults verify_SSL to 1 + +Based on proposed Debian patch by Dominic Hargreaves: +https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92 + + +diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +index 5803e4599..88ba51461 100644 +--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm ++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -40,7 +40,7 @@ sub _croak { require Carp; Carp::croak(@_) } + #pod * C — Request timeout in seconds (default is 60) If a socket open, + #pod read or write takes longer than the timeout, an exception is thrown. + #pod * C — A boolean that indicates whether to validate the SSL +-#pod certificate of an C — connection (default is false) ++#pod certificate of an C — connection (default is true) + #pod * C — A hashref of C — options to pass through to + #pod L + #pod +@@ -112,7 +112,7 @@ sub new { + max_redirect => 5, + timeout => defined $args{timeout} ? $args{timeout} : 60, + keep_alive => 1, +- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default ++ verify_SSL => $args{verify_SSL} // $args{verify_ssl} // 1, # verification by default + no_proxy => $ENV{no_proxy}, + }; + +@@ -1038,7 +1038,7 @@ sub new { + timeout => 60, + max_line_size => 16384, + max_header_lines => 64, +- verify_SSL => 0, ++ verify_SSL => 1, + SSL_options => {}, + %args + }, $class; +@@ -1765,7 +1765,7 @@ C — Request timeout in seconds (default is 60) If a socket open, read + + =item * + +-C — A boolean that indicates whether to validate the SSL certificate of an C — connection (default is false) ++C — A boolean that indicates whether to validate the SSL certificate of an C — connection (default is true) + + =item * + +@@ -2035,7 +2035,7 @@ Verification of server identity + + =back + +-B. ++B. + + Server identity verification is controversial and potentially tricky because it + depends on a (usually paid) third-party Certificate Authority (CA) trust model +@@ -2043,16 +2043,14 @@ to validate a certificate as legitimate. This discriminates against servers + with self-signed certificates or certificates signed by free, community-driven + CA's such as L. + +-By default, HTTP::Tiny does not make any assumptions about your trust model, +-threat level or risk tolerance. It just aims to give you an encrypted channel +-when you need one. +- + Setting the C attribute to a true value will make HTTP::Tiny verify + that an SSL connection has a valid SSL certificate corresponding to the host + name of the connection and that the SSL certificate has been verified by a CA. + Assuming you trust the CA, this will protect against a L. If you are +-concerned about security, you should enable this option. ++attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. ++ ++If you are not concerned about security, and this default in NixOS causes ++problems, you should disable this option. + + Certificate verification requires a file containing trusted CA certificates. + +-- + + From 5b76f42372dd0784d5661626c8ce23a7bea9ccfd Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 19 Aug 2022 23:37:14 +0200 Subject: [PATCH 109/297] buildGo{Module,Package}: don't run vet linter --- pkgs/build-support/go/module.nix | 1 + pkgs/build-support/go/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 8b5185979e45..84d9023209d3 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -212,6 +212,7 @@ let flags+=("-v" "-p" "$NIX_BUILD_CORES") if [ "$cmd" = "test" ]; then + flags+=(-vet=off) flags+=($checkFlags) fi diff --git a/pkgs/build-support/go/package.nix b/pkgs/build-support/go/package.nix index 56c8ceeca15f..957a65572b85 100644 --- a/pkgs/build-support/go/package.nix +++ b/pkgs/build-support/go/package.nix @@ -171,6 +171,7 @@ let flags+=("-v" "-p" "$NIX_BUILD_CORES") if [ "$cmd" = "test" ]; then + flags+=(-vet=off) flags+=($checkFlags) fi From 3bd6484563edae14ac528b5dc30d018bef66bf61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Aug 2022 08:45:18 +0200 Subject: [PATCH 110/297] Re-Revert Merge #184360: json-glib: add installed tests This reverts commit 78182194c652df7bdcfa0a6a788d17895188b777. --- nixos/tests/installed-tests/default.nix | 1 + nixos/tests/installed-tests/json-glib.nix | 5 ++++ .../libraries/json-glib/default.nix | 15 ++++++++++- ...on-add-installed-tests-prefix-option.patch | 27 +++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/installed-tests/json-glib.nix create mode 100644 pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index b81384aa8c0b..3bb678d36782 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -98,6 +98,7 @@ in gnome-photos = callInstalledTest ./gnome-photos.nix {}; graphene = callInstalledTest ./graphene.nix {}; gsconnect = callInstalledTest ./gsconnect.nix {}; + json-glib = callInstalledTest ./json-glib.nix {}; ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; librsvg = callInstalledTest ./librsvg.nix {}; diff --git a/nixos/tests/installed-tests/json-glib.nix b/nixos/tests/installed-tests/json-glib.nix new file mode 100644 index 000000000000..3dfd3dd0b098 --- /dev/null +++ b/nixos/tests/installed-tests/json-glib.nix @@ -0,0 +1,5 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.json-glib; +} diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 1f8f4fd1acc0..e095945dabaa 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -4,6 +4,7 @@ , glib , meson , ninja +, nixosTests , pkg-config , gettext , gobject-introspection @@ -17,13 +18,18 @@ stdenv.mkDerivation rec { pname = "json-glib"; version = "1.6.6"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; }; + patches = [ + # Add option for changing installation path of installed tests. + ./meson-add-installed-tests-prefix-option.patch + ]; + strictDeps = true; depsBuildBuild = [ @@ -49,6 +55,9 @@ stdenv.mkDerivation rec { glib ]; + mesonFlags = [ + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) # it should be a build-time dep for build @@ -73,6 +82,10 @@ stdenv.mkDerivation rec { ''; passthru = { + tests = { + installedTests = nixosTests.installed-tests.json-glib; + }; + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch new file mode 100644 index 000000000000..626db09cd03f --- /dev/null +++ b/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch @@ -0,0 +1,27 @@ +diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build +index 1eb56c8..dca444e 100644 +--- a/json-glib/tests/meson.build ++++ b/json-glib/tests/meson.build +@@ -21,8 +21,9 @@ test_data = [ + 'stream-load.json', + ] + +-installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name) +-installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name) ++installed_test_prefix = get_option('installed_test_prefix') ++installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name) ++installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name) + + install_data(test_data, install_dir: installed_test_bindir) + +diff --git a/meson_options.txt b/meson_options.txt +index 068a03f..03f398a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -10,3 +10,6 @@ option('man', + option('tests', + type: 'boolean', value: true, + description: 'Build the tests') ++option('installed_test_prefix', ++ description: 'Prefix for installed tests', ++ type: 'string') From f2805f293dd95bbc32bd49134263f52d8212508d Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 20 Aug 2022 10:28:03 +0200 Subject: [PATCH 111/297] gnupg: Fix regression when using YubiKey devices as smart cards. --- pkgs/tools/security/gnupg/23.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index b93e533e6fd8..af28b4903df2 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -32,6 +32,14 @@ stdenv.mkDerivation rec { # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 ./v3-0001-Disallow-compressed-signatures-and-certificates.patch + + # Fix regression when using YubiKey devices as smart cards. + # See https://dev.gnupg.org/T6070 for details. + # Committed upstream, remove this patch when updating to the next release. + (fetchpatch { + url = "https://dev.gnupg.org/rGf34b9147eb3070bce80d53febaa564164cd6c977?diff=1"; + sha256 = "sha256-J/PLSz8yiEgtGv+r3BTGTHrikV70AbbHQPo9xbjaHFE="; + }) ]; postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 From 410a9ae7000e5dc2c6ca55b1c8b3cb188b841708 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 10:52:56 +0000 Subject: [PATCH 112/297] cmake: 3.24.0 -> 3.24.1 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0bdc6514cf7e..7badaccf8ab1 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.24.0"; + version = "3.24.1"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-wrYffN7LFXbK0l+Rio9CuGhdiKgy/UtiueD6MukVplg="; + sha256 = "sha256-STHid6TbGoBfE7qnATp3V6DL/lt5MogpJccGHZ0fqCs="; }; patches = [ From 457e2672066c8dc0df2df1a3193139c659581639 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 20 Aug 2022 03:51:09 +0000 Subject: [PATCH 113/297] rsync: 3.2.4 -> 3.2.5 This release fixes CVE-2022-29154: https://download.samba.org/pub/rsync/NEWS#3.2.5 Remove enableCopyDevicesPatch because --copy-devices was included in rsync 3.2.4: https://download.samba.org/pub/rsync/NEWS#3.2.4:~:text=Added%20the%20%2D%2Dcopy%2Ddevices%20option --- .../networking/sync/rsync/default.nix | 22 +++++-------------- .../networking/sync/rsync/rrsync.nix | 2 +- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 5e0ddc69a46c..bdddfe4f8677 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , perl , libiconv , zlib @@ -16,27 +15,18 @@ , xxHash , enableZstd ? true , zstd -, enableCopyDevicesPatch ? false , nixosTests }: stdenv.mkDerivation rec { pname = "rsync"; - version = "3.2.4"; + version = "3.2.5"; - srcs = [ - (fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE="; - }) - ] ++ lib.optional enableCopyDevicesPatch (fetchurl { + src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; - }); - - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; + url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; + sha256 = "sha256-KsTSFjXN95GGe8N3w1ym3af1DZGaWL5FBX/VFgDGmro="; + }; nativeBuildInputs = [ perl ]; @@ -64,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://rsync.samba.org/"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index c18f454d87ce..09f9ab22f335 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "rrsync"; - inherit (rsync) version srcs; + inherit (rsync) version src; buildInputs = [ rsync From b5aad8addf1d4a84dbf7545965584bd19fb7e42e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 20 Aug 2022 19:56:11 -0700 Subject: [PATCH 114/297] libtool: fix shebang-fixing from 2.4.7 version bump Libtool 2.4.7 changed the shebangs in `libtoolize.in` and `ltmain.sh` from `/bin/sh` (which is a special sandbox exception) to `/usr/bin/env sh` (which is not). My PR (#167071) to bump the libtool version adjusted both of these shebangs, when it should only have adjusted the one in `libtoolize.in`. `ltmain.sh` is not a script to be *executed* at `libtool`-invocation-time. It is a script which is *vendored into a release* at `libtoolize`-invocation-time. Thanks to @trofi for reporting this https://github.com/NixOS/nixpkgs/pull/167071#pullrequestreview-1079484605 --- pkgs/development/tools/misc/libtool/libtool2.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 92a230374df6..8625a421af64 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -38,10 +38,9 @@ stdenv.mkDerivation rec { # libtool commit da2e352735722917bf0786284411262195a6a3f6 changed # the shebang from `/bin/sh` (which is a special sandbox exception) # to `/usr/bin/env sh`, meaning that we now need to patch shebangs - # in libtoolize and ltmain.sh since `dontPatchShebangs` is set: + # in libtoolize.in: '' substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' - substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' ''; strictDeps = true; From 64d5ca085a8cfb55b9c9780642e79a4020ec717c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 21 Aug 2022 05:25:00 +0200 Subject: [PATCH 115/297] nodejs_18: fix eval --- pkgs/development/web/nodejs/v18.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index dd6028edcaa9..2bcf9aac950c 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, python3, fetchpatch, enableNpm ? true }: +{ callPackage, python3, fetchpatch, enableNpm ? true, ... }: let buildNodejs = callPackage ./nodejs.nix { From 1609e4a63e268f5e4e33fee1b6a3c7687d331bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Aug 2022 14:00:37 +0200 Subject: [PATCH 116/297] python310Packages.jsonschema: 4.9.1 -> 4.13.0 --- .../python-modules/jsonschema/default.nix | 8 +++-- .../jsonschema/remove-fancy-pypi-readme.patch | 33 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index cde909e79b83..2ccbacbf61c8 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -14,16 +14,20 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.9.1"; + version = "4.13.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QIxMjtDe3jsmj3pEF4T3QgY4CwT5PrLVN8e++z3zCZ8="; + sha256 = "sha256-N3ZRLfT1P3Tm4o/jVxe1siPBdWh1SGmEoxvJFl5/ySA="; }; + patches = [ + ./remove-fancy-pypi-readme.patch + ]; + postPatch = '' patchShebangs json/bin/jsonschema_suite ''; diff --git a/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch b/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch new file mode 100644 index 000000000000..7124e5a6263b --- /dev/null +++ b/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch @@ -0,0 +1,33 @@ +--- a/pyproject.toml 2022-08-21 05:04:18.443484836 +0200 ++++ b/pyproject.toml 2022-08-21 05:04:50.789353514 +0200 +@@ -76,30 +76,6 @@ + Changelog = "https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst" + Source = "https://github.com/python-jsonschema/jsonschema" + +-[tool.hatch.metadata.hooks.fancy-pypi-readme] +-content-type = "text/x-rst" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "README.rst" +-end-before = ".. start cut from PyPI" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "README.rst" +-start-after = ".. end cut from PyPI\n\n\n" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """ +- +- +-Release Information +-------------------- +- +-""" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "CHANGELOG.rst" +-pattern = "(^v.+?)\nv" +- + [tool.isort] + from_first = true + include_trailing_comma = true From 44b594e6192fdab87a3019818be797967fbe7950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 21 Aug 2022 04:16:53 +0200 Subject: [PATCH 117/297] python310Packages.hatchling: 1.6.0 -> 1.8.0 --- pkgs/development/python-modules/hatchling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index eedebeff3108..636d46dfdd7f 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -20,7 +20,7 @@ let pname = "hatchling"; - version = "1.6.0"; + version = "1.8.0"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-vW6FBd5RGsQhf/UJJ/bRhFSUYI5AHmOmK4MMMfthNUQ="; + sha256 = "sha256-pPmC/coHF9jEa/57UBMC+QqvKlMChF1VC0nIc5aB/rI="; }; # listed in backend/src/hatchling/ouroboros.py From 7059a8ee8fd50d678c008cb044ff0694a83f79cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 18 Aug 2022 15:36:18 +0200 Subject: [PATCH 118/297] aitrack: init at 0.6.5 --- pkgs/applications/misc/aitrack/default.nix | 51 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/misc/aitrack/default.nix diff --git a/pkgs/applications/misc/aitrack/default.nix b/pkgs/applications/misc/aitrack/default.nix new file mode 100644 index 000000000000..48e0afe13ebd --- /dev/null +++ b/pkgs/applications/misc/aitrack/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, wrapQtAppsHook +, opencv +, spdlog +, onnxruntime +, qtx11extras +}: stdenv.mkDerivation { + pname = "aitrack"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "mdk97"; + repo = "aitrack-linux"; + rev = "00bcca9b685abf3a19e4eab653198ca2b1895ae4"; + sha256 = "sha256-pPvYVLUPYdjtJKdxqZI+JN7OZ4xw9gZ3baYTnJUSTGE="; + }; + + nativeBuildInputs = [ + pkg-config + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + opencv + spdlog + qtx11extras + onnxruntime + ]; + + postPatch = '' + substituteInPlace Client/src/Main.cpp \ + --replace "/usr/share/" "$out/share/" + ''; + + postInstall = '' + install -Dt $out/bin aitrack + install -Dt $out/share/aitrack/models models/* + ''; + + meta = with lib; { + description = "6DoF Head tracking software"; + maintainers = with maintainers; [ ck3d ]; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffb545896903..cf141d0e9e75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36512,4 +36512,6 @@ with pkgs; swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { }; swaysettings = callPackage ../applications/misc/swaysettings { }; + + aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; } From ca0120a4bcb759b9a9040219b1f0a5e5a86e34a1 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 21 Aug 2022 12:22:16 +0200 Subject: [PATCH 119/297] systemd: enable `BPF_FRAMEWORK` by default (`withLibBPF=true`) So far, we have been building Systemd without `BPF_FRAMEWORK`. As a result, some Systemd features like `RestrictNetworkInterfaces=` cannot work. To make things worse, Systemd doesn't even complain when using a feature which requires `+BPF_FRAMEWORK`; yet, the option has no effect: # systemctl --version | grep -o "\-BPF_FRAMEWORK" -BPF_FRAMEWORK # systemd-run -t -p RestrictNetworkInterfaces="lo" ping -c 1 8.8.8.8 This commit enables `BPF_FRAMEWORK` by default. This is in line with other distros (e.g., Fedora). Also note that BPF does not support stack protector: https://lkml.org/lkml/2020/2/21/1000. To that end, I added a small `CFLAGS` patch to the BPF building to keep using stack protector as a default. I also added an appropriate NixOS test. --- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-bpf.nix | 42 ++++++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 6 +++- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/systemd-bpf.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c718c292b257..72dac624f85c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -541,6 +541,7 @@ in { systemd-analyze = handleTest ./systemd-analyze.nix {}; systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; systemd-boot = handleTest ./systemd-boot.nix {}; + systemd-bpf = handleTest ./systemd-bpf.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-coredump = handleTest ./systemd-coredump.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; diff --git a/nixos/tests/systemd-bpf.nix b/nixos/tests/systemd-bpf.nix new file mode 100644 index 000000000000..e11347a2a817 --- /dev/null +++ b/nixos/tests/systemd-bpf.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "systemd-bpf"; + meta = with lib.maintainers; { + maintainers = [ veehaitch ]; + }; + nodes = { + node1 = { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + interfaces.eth1.ipv4.addresses = [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + }; + + node2 = { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + interfaces.eth1.ipv4.addresses = [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + }; + }; + + testScript = '' + start_all() + node1.wait_for_unit("systemd-networkd-wait-online.service") + node2.wait_for_unit("systemd-networkd-wait-online.service") + + with subtest("test RestrictNetworkInterfaces= works"): + node1.succeed("ping -c 5 192.168.1.2") + node1.succeed("systemd-run -t -p RestrictNetworkInterfaces='eth1' ping -c 5 192.168.1.2") + node1.fail("systemd-run -t -p RestrictNetworkInterfaces='lo' ping -c 5 192.168.1.2") + ''; +}) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 348f0e11342e..9544e6270a5a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -83,7 +83,7 @@ , withHostnamed ? true , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl -, withLibBPF ? false # currently fails while generating BPF objects +, withLibBPF ? true , withLocaled ? true , withLogind ? true , withMachined ? true @@ -207,6 +207,10 @@ stdenv.mkDerivation { --replace \ "run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()" \ "'${stdenv.cc.bintools.targetPrefix}objcopy'" + '' + lib.optionalString withLibBPF '' + # BPF does not work with stack protector + substituteInPlace src/core/bpf/meson.build \ + --replace "clang_flags = [" "clang_flags = [ '-fno-stack-protector'," '' + ( let # The following patches references to dynamic libraries to ensure that From 029137d9eaf89cd8a97a18a2d1a6e18434441761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 28 Jan 2022 17:49:53 +0100 Subject: [PATCH 120/297] soundtouch: 2.2 -> 2.3.1 and update the repo URL The soundtouch repository has been moved from Gitlab to Codeberg in October. According to the main developer, Gitlab has blocked the soundtouch account for unknown reasons. The Gitlab repository is no longer available as the user is private. References: https://codeberg.org/soundtouch/soundtouch/src/branch/master/readme.md https://www.surina.net/soundtouch/ This commit replaces #135972 --- pkgs/development/libraries/soundtouch/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index b03a7cc07228..318ead830f9b 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -1,14 +1,15 @@ -{stdenv, lib, fetchFromGitLab, autoconf, automake, libtool}: +{ stdenv, lib, fetchFromGitea, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.2"; + version = "2.3.1"; - src = fetchFromGitLab { - owner = pname; - repo = pname; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "soundtouch"; + repo = "soundtouch"; rev = version; - sha256 = "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p"; + sha256 = "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr"; }; nativeBuildInputs = [ autoconf automake libtool ]; From da0a5e5f3b88ce34314f1c4b29fd7c9526263ca6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 21 Aug 2022 19:01:43 +0100 Subject: [PATCH 121/297] cmake: fix crash on CC without libc support Without this change pkgsLLVM fails to build any packages as compiler-rt fails early in cmake: CMake Error at ...-cmake-3.24.0/share/cmake-3.24/Modules/Platform/UnixPaths.cmake:53 (file): file STRINGS file "...-x86_64-unknown-linux-gnu-clang-wrapper-11.1.0/nix-support/orig-libc-dev" cannot be read. It's a regression caused by 871cf9f7b3e5a "cmake: detect libc location at runtime #181431" where we started using `orig-libc-dev` as a libc pointer. During pkgsLLVM pootstrap first compiler has no libc support yet. The change skips runtime detection if there are no libc signs. --- .../tools/build-managers/cmake/001-search-path.diff | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/001-search-path.diff b/pkgs/development/tools/build-managers/cmake/001-search-path.diff index c059bf5bffc3..607668b13155 100644 --- a/pkgs/development/tools/build-managers/cmake/001-search-path.diff +++ b/pkgs/development/tools/build-managers/cmake/001-search-path.diff @@ -12,7 +12,7 @@ index b9381c3d7d..5e944640b5 100644 # CMake install location "${_CMAKE_INSTALL_DIR}" ) -@@ -47,48 +44,46 @@ endif() +@@ -47,48 +44,48 @@ endif() # Non "standard" but common install prefixes list(APPEND CMAKE_SYSTEM_PREFIX_PATH @@ -22,7 +22,9 @@ index b9381c3d7d..5e944640b5 100644 ) # List common include file locations not under the common prefixes. -+if(IS_DIRECTORY $ENV{NIX_CC}) ++if(IS_DIRECTORY $ENV{NIX_CC} ++ AND EXISTS $ENV{NIX_CC}/nix-support/orig-libc ++ AND EXISTS $ENV{NIX_CC}/nix-support/orig-libc-dev) + file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc) + file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev) +else() From 262d3eba50c03d7b65c8a220ba3b51bec3c0f650 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 21 Aug 2022 16:26:26 +0200 Subject: [PATCH 122/297] Revert "nodejs_18: fix eval" This reverts commit 64d5ca085a8cfb55b9c9780642e79a4020ec717c. --- pkgs/development/web/nodejs/v18.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 2bcf9aac950c..dd6028edcaa9 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, python3, fetchpatch, enableNpm ? true, ... }: +{ callPackage, python3, fetchpatch, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { From 5b59025b266da0f96b650abd51fe1f45ce239e52 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 21 Aug 2022 16:29:40 +0200 Subject: [PATCH 123/297] Revert "element-web: use openssl 1.1" This reverts commit d1b2156d4288ef9e0df05933426745fcc48bb86f. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3d7f0bc5fba..99efe4fb379a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3706,7 +3706,6 @@ with pkgs; ''; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { - inherit (yarn2nix-moretea-openssl_1_1) mkYarnPackage fixup_yarn_lock; conf = config.element-web.conf or {}; }; From dc3e75802bf3ca99dffb64a0578d3403d8e27ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Aug 2022 21:25:08 +0200 Subject: [PATCH 124/297] python310Packages.cryptography: remove empty dev output --- pkgs/development/python-modules/cryptography/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 1442b784cb37..873d1b99356a 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { cargoRoot = "src/rust"; - outputs = [ "out" "dev" ]; - nativeBuildInputs = lib.optionals (!isPyPy) [ cffi ] ++ [ From 37a4365913235e405575a02d6e1765887f38527a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Aug 2022 01:42:50 +0200 Subject: [PATCH 125/297] libtirpc: remove no longer required postPatch --- pkgs/development/libraries/ti-rpc/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index fa4782b5524f..0e67ce8adea8 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postPatch = '' - sed '1i#include ' -i src/xdr_sizeof.c - ''; - KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; @@ -24,7 +20,9 @@ stdenv.mkDerivation rec { sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; - preInstall = "mkdir -p $out/etc"; + preInstall = '' + mkdir -p $out/etc + ''; doCheck = true; From ec4019f6dcecbacb1c07882d8bb1fac021e8873b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Aug 2022 15:00:00 -0500 Subject: [PATCH 126/297] Set inherit_errexit after bash version check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit inherit_errexit wasn’t available in bash 3. We have a check to show a nice error message, but that check is after we set inherit_errexit in setup.sh. So we can just move this to below the BASH_VERSINFO check. --- pkgs/stdenv/generic/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0ba8d1018233..f0fcb30451dd 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -2,7 +2,6 @@ __nixpkgs_setup_set_original=$- set -eu set -o pipefail -shopt -s inherit_errexit if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" @@ -10,6 +9,8 @@ if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then exit 1 fi +shopt -s inherit_errexit + if (( "${NIX_DEBUG:-0}" >= 6 )); then set -x fi From e924a39abd4f2e4b66cd02e2686d64ac01ea96cc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 22 Aug 2022 07:03:53 +0200 Subject: [PATCH 127/297] jemalloc: support page size up to 64KB on AArch64 The default build configuration only supports page sizes up to 4KB. AArch64 systems (among other architectures) can be configured with larger page sizes. nixpkgs's jemalloc currently crashes in these situations. --- pkgs/development/libraries/jemalloc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 6f9cb774c2a8..a2812a9c6677 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { "--disable-thp" "je_cv_thp=no" ] + # AArch64 has configurable page size up to 64k. The default configuration + # for jemalloc only supports 4k page sizes. + ++ lib.optional stdenv.isAarch64 "--with-lg-page=16" ; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; From e54978395b37826a27bc8bba9f0cecf3794d1003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Aug 2022 05:53:02 +0000 Subject: [PATCH 128/297] liburcu: 0.13.1 -> 0.13.2 --- pkgs/development/libraries/liburcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index e2dc63609c41..120b5d9c61ae 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.13.1"; + version = "0.13.2"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-MhPzPSuPcQ65IOsauyeewEv4rmNh9E8lE8KMINM2MIM="; + sha256 = "sha256-EhP9nxsLdNp94rt0M1t2CY25c4/sXTzcB8DFJPNPwDI="; }; checkInputs = [ perl ]; From 28dd75158d0a9c25814dd2496d430053a12610d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sun, 21 Aug 2022 14:15:09 -0300 Subject: [PATCH 129/297] mesa: 22.1.6 -> 22.1.7 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c851c196f184..6b78a570cccb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -34,7 +34,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.1.6"; + version = "22.1.7"; branch = versions.major version; self = stdenv.mkDerivation { @@ -48,7 +48,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"; + sha256 = "da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89"; }; # TODO: From bfd2a6d47112f13ccae556aa56a1320d348b89e1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 22 Aug 2022 14:45:43 +0200 Subject: [PATCH 130/297] vim: 9.0.0180 -> 9.0.0244 Fixes CVE-2022-2816, CVE-2022-2817, CVE-2022-2819, CVE-2022-2845, CVE-2022-2849, CVE-2022-2862, CVE-2022-2874, CVE-2022-2889. --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 95799f09cf44..016d8ad02d60 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.0180"; + version = "9.0.0244"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-38l97auTi6cue457bfRHme5fvsAmvk1MT2va1E/qguw="; + hash = "sha256-l6fLM6+tc1Wy1mjNPa/s73GKhhGBLz3OXUJgJN1wuxY="; }; enableParallelBuilding = true; From 3e2a42102bfb4598cbb330b4ca5e0f28e7bdfc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 22 Aug 2022 18:20:24 -0300 Subject: [PATCH 131/297] Vulkan: 1.3.216.0 -> 1.3.224.0 --- pkgs/development/compilers/glslang/default.nix | 4 ++-- pkgs/development/libraries/spirv-headers/default.nix | 2 +- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- pkgs/development/tools/spirv-tools/default.nix | 4 ++-- pkgs/development/tools/vulkan-validation-layers/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-extension-layer/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-tools/default.nix | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index c3716c1556aa..0da4b60a3ed6 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "1.3.216.0"; + version = "1.3.224.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = "sdk-${version}"; - hash = "sha256-sjidkiPtRADhyOEKDb2cHCBXnFjLwk2F5Lppv5/fwNQ="; + hash = "sha256-+NKp/4e3iruAcTunpxksvCHxoVYmPd0kFI8JDJJUVg4="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 21117c7d80b2..c634b8330428 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.216.0"; + version = "1.3.224.0"; src = fetchFromGitHub { owner = "KhronosGroup"; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index a4424db68943..0e1a01032f62 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.216.0"; + version = "1.3.224.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - hash = "sha256-jHzW3m9smuzEGbZrSyBI74K9rFozxiG3M5Xql/WOw7U="; + hash = "sha256-zUT5+Ttmkrj51a9FS1tQxoYMS0Y0xV8uaCEJNur4khc="; }; meta = with lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 928a7a16e699..b825214dbb55 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.216.0"; + version = "1.3.224.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - hash = "sha256-EcsJzY/R9rreWvYTgoxHNloR5n2xaR/0rouDJVAGaxs="; + hash = "sha256-lmdImPeosHbAbEzPVW4K9Wkz/mF6gr8MVroGf0bDEPc="; }); patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 7abd150c2752..150df6e25093 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.216.0"; + version = "1.3.224.0"; src = (assert version == spirv-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "sdk-${version}"; - hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + hash = "sha256-jpVvjrNrTAKUY4sjUT/gCUElLtW4BrznH1DbStojGB8="; } ); diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 28b47bb99820..1ae5e520e0f7 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.216.0"; + version = "1.3.224.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - hash = "sha256-ri6ImAuskbvYL/ZM8kaVDZRP2v1qfSaafVacwwRF424="; + hash = "sha256-MmAxUuV9CVJ6LHUb6ePEiE37meDB1TqPAwLsPdHQ1u8="; }); # Include absolute paths to layer libraries in their associated diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 466f29378533..2a8e999565d1 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.216.0"; + version = "1.3.224.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "sdk-${version}"; - hash = "sha256-h38LxV8G72Xxh44212IoGKQ0tKXwBnSpBjTB2gsr1zA="; + hash = "sha256-KOlwtfuAYWzUFtf0NOJCNzWW+/ogRUgkaWw8NdW2vb8="; }); nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index df0e9398eb7b..be708e6c605f 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.3.216.0"; + version = "1.3.224.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - hash = "sha256-NhYQSL5iU7iSO5Q6lp1iwhbi5GEfD11MDmBn9Uk1jm0="; + hash = "sha256-YQv6YboyQJjLTEKspZQdV8YFhHux/4RIncHXOsz1cBw="; fetchSubmodules = true; }); diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 3660632e16e0..93663ec2a2c6 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.216.0"; + version = "1.3.224.0"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - hash = "sha256-VEMeURNboiOwPGrtFGUt9ZyChj8pV0xcpydrarcwtF0="; + hash = "sha256-Z+QJBd2LBdiJD1fHhBLbOfOoLhqTg0J3tq+XQRSiQaY="; }); nativeBuildInputs = [ From 5a78501dd3b816d7a8c7d08ee6e6a7415ba8ec58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 08:02:28 +0000 Subject: [PATCH 132/297] SDL2_ttf: 2.0.18 -> 2.20.1 --- pkgs/development/libraries/SDL2_ttf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 6975dfff24ae..f424a2e67f56 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.0.18"; + version = "2.20.1"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE="; + sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; From 10c1827eab020e6c4c3a88b2c9d8fb04b92a3174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 13:27:29 +0000 Subject: [PATCH 133/297] graphviz: 5.0.0 -> 5.0.1 --- pkgs/tools/graphics/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 96a7ffb2ed49..2915474735fe 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - sha256 = "sha256-vDqVJJg2ezYGZPp7UtpvWfCypLBqRrr0aPMSyEN+IQo="; + sha256 = "sha256-lcU6Pb45kg7AxXQ9lmqwAazT2JpGjBz4PzK+S5lpYa0="; }; nativeBuildInputs = [ From 1acad4d826e4011c168edb89be3b2fac400f8332 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 14:41:35 +0000 Subject: [PATCH 134/297] libtasn1: 4.18.0 -> 4.19.0 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index d7eb36b97a79..2f0b1cdaad4a 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtasn1"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { url = "mirror://gnu/libtasn1/libtasn1-${version}.tar.gz"; - sha256 = "sha256-Q2XBVJU1Y9ZMZ6AktgfR7nXG23bg0PZXCeqAozTNGJg="; + sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o="; }; outputs = [ "out" "dev" "devdoc" ]; From 4a0eaf9dccadfcfe80927c2510057843fb55dab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 15:21:20 +0000 Subject: [PATCH 135/297] libglvnd: 1.4.0 -> 1.5.0 --- pkgs/development/libraries/libglvnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 769140ff54a3..46a3d9e40308 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "06y7m486kgg566krbhb0gvmpzy6ayd98psnrmmkrnw8p513lg8k3"; + sha256 = "sha256-yXSuG8UwD5KZbn4ysDStTdOGD4uHigjOhazlHT9ndNs="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; From abaa4b5e514b93011c23cc05b21c13c20fbb93f9 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 24 Aug 2022 23:32:48 +0200 Subject: [PATCH 136/297] Imlib2: Add JPEGXL and Postscript support, make webp support optional (#186492) Co-authored-by: Robert Scott --- pkgs/development/libraries/imlib2/default.nix | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index a5dc57c8ffd8..12d972390630 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,14 +1,16 @@ { lib, stdenv, fetchurl # Image file formats -, libjpeg, libtiff, giflib, libpng, libwebp +, libjpeg, libtiff, giflib, libpng, libwebp, libjxl +, libspectre # imlib2 can load images from ID3 tags. , libid3tag, librsvg, libheif , freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null -# Compilation error on Darwin with librsvg. For more information see: -# https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 -, svgSupport ? !stdenv.isDarwin -, heifSupport ? !stdenv.isDarwin +, svgSupport ? false +, heifSupport ? false +, webpSupport ? false +, jxlSupport ? false +, psSupport ? false # for passthru.tests , libcaca @@ -33,11 +35,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libjpeg libtiff giflib libpng libwebp + libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper ++ optional heifSupport libheif - ++ optional svgSupport librsvg; + ++ optional svgSupport librsvg + ++ optional webpSupport libwebp + ++ optional jxlSupport libjxl + ++ optional psSupport libspectre; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99efe4fb379a..393acb1410a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18653,6 +18653,15 @@ with pkgs; iml = callPackage ../development/libraries/iml { }; imlib2 = callPackage ../development/libraries/imlib2 { }; + imlib2Full = imlib2.override { + # Compilation error on Darwin with librsvg. For more information see: + # https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 + svgSupport = !stdenv.isDarwin; + heifSupport = !stdenv.isDarwin; + webpSupport = true; + jxlSupport = true; + psSupport = true; + }; imlib2-nox = imlib2.override { x11Support = false; }; From 1f07b6e50d0b23e6c9e041c147dd731a7721f3e8 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 24 Aug 2022 19:25:29 -0400 Subject: [PATCH 137/297] python3Packages.requests: Fix sandboxed build on Darwin --- pkgs/development/python-modules/requests/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 9b19c7b9c256..5eab25fa3e15 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { version = "2.28.1"; disabled = pythonOlder "3.7"; + __darwinAllowLocalNetworking = true; + src = fetchPypi { inherit pname version; hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM="; From 392811708825f15e0c43b46e677e950a9deaec79 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 24 Aug 2022 20:59:32 -0400 Subject: [PATCH 138/297] python3Packages.responses: Fix sandboxed build on Darwin --- pkgs/development/python-modules/responses/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 1343aa6cfd01..21e3dd38cdb8 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "getsentry"; repo = pname; From e1c292692ff8a78222ceca5c812340b20557d7e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 25 Aug 2022 02:40:36 +0200 Subject: [PATCH 139/297] python3Packages.cffi: drop empty dev output --- pkgs/development/python-modules/cffi/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 7691d9b7d59b..66b315f14ab0 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -11,8 +11,6 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; }; - outputs = [ "out" "dev" ]; - buildInputs = [ libffi ]; nativeBuildInputs = [ pkg-config ]; From daa11b3e4677d7e7bd81b31c0c7a79669cbd7e51 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 24 Aug 2022 22:18:56 -0400 Subject: [PATCH 140/297] python3Packages.pytest-aiohttp: Fix sandboxed build on Darwin --- pkgs/development/python-modules/pytest-aiohttp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index bc9d4c37a876..728544bd2618 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { format = "setuptools"; + __darwinAllowLocalNetworking = true; + src = fetchPypi { inherit pname version; sha256 = "39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4"; From 6c0348fe8760352e8fe9e2ea7182cf70b200e156 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 24 Aug 2022 22:34:16 -0400 Subject: [PATCH 141/297] python3Packages.python-socks: Fix sandboxed build on Darwin --- pkgs/development/python-modules/python-socks/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 5254a6cbab25..b0d0fbd36616 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6.1"; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "romis2012"; repo = pname; From 767c3e5fa97605fafb29d89be5bac43abf9ceb80 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 25 Aug 2022 21:34:19 +0800 Subject: [PATCH 142/297] systemd: fix cross compilation with libbpf enabled --- pkgs/os-specific/linux/systemd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 81a1d8d238fd..e158cba54e6f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -208,6 +208,8 @@ stdenv.mkDerivation { "run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()" \ "'${stdenv.cc.bintools.targetPrefix}objcopy'" '' + lib.optionalString withLibBPF '' + substituteInPlace meson.build \ + --replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'" # BPF does not work with stack protector substituteInPlace src/core/bpf/meson.build \ --replace "clang_flags = [" "clang_flags = [ '-fno-stack-protector'," @@ -352,7 +354,7 @@ stdenv.mkDerivation { docbook_xml_dtd_45 (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) ] - ++ lib.optional withLibBPF [ + ++ lib.optionals withLibBPF [ bpftools llvmPackages.clang llvmPackages.libllvm From ad83ae5119dc3c00901e649fbe6897800e47210f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 08:36:08 +0200 Subject: [PATCH 143/297] python3Packages.flask-restx: fix build with werkzeug>=2.2.0 --- pkgs/development/python-modules/flask-restx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 4b88ab564507..c1e81a1801e5 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -41,6 +41,12 @@ buildPythonPackage rec { url = "https://github.com/python-restx/flask-restx/commit/bb3e9dd83b9d4c0d0fa0de7d7ff713fae71eccee.patch"; hash = "sha256-HJpjG4aQWzEPCMfbXfkw4mz5TH9d89BCvGH2dE6Jfv0="; }) + # Fixes werkzeug 2.2 compatibility + (fetchpatch { + # https://github.com/python-restx/flask-restx/pull/463 + url = "https://github.com/python-restx/flask-restx/commit/82f7340ebb51e5c143b804bc0f20f785e96968c0.patch"; + hash = "sha256-GA+UlFDu771ul3qplsukce/mjGvJ3E4Dw/IoJQLevNU="; + }) ]; propagatedBuildInputs = [ From b33f9716e74e535db3bb0f6c13bd11dd30cd49fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 08:59:52 +0200 Subject: [PATCH 144/297] python3Packages.limits: fix package version --- pkgs/development/python-modules/limits/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 5064f39b991d..a45acb35d445 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -57,6 +57,9 @@ buildPythonPackage rec { --replace "--cov=limits" "" \ --replace "-K" "" + substituteInPlace setup.py \ + --replace "versioneer.get_version()" "'${version}'" + # Recreate _version.py, deleted at fetch time due to non-reproducibility. echo 'def get_versions(): return {"version": "${version}"}' > limits/_version.py ''; From 530c690c47a2870c9a93b32240fb41dcff7d5317 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 09:10:18 +0200 Subject: [PATCH 145/297] python3Packages.flask-limiter: 1.4 -> 2.6.2 This unties the tests from the regularly broken flask-restful dependency, that has its largest reverse dependency chain via this package. --- .../python-modules/flask-limiter/default.nix | 55 ++++++++++++++----- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index c593c855c70f..275b4507fb3b 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,54 +1,79 @@ { lib , buildPythonPackage , fetchFromGitHub + , flask -, flask-restful -, hiro , limits -, mock +, rich +, typing-extensions + +, asgiref +, hiro , pymemcache +, pytest-mock , pytestCheckHook , redis +, pymongo }: buildPythonPackage rec { pname = "Flask-Limiter"; - version = "1.4"; + version = "2.6.2"; src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; rev = version; - sha256 = "1k1b4b3s1acphqnar0y5g747bh1y7w35gcl5g819idq2a5vqnass"; + sha256 = "sha256-JjksKwSMWzcslXCs977/Wlq1wDMaACxm8e6Ub+r3wPg="; }; - propagatedBuildInputs = [ flask limits ]; + propagatedBuildInputs = [ + flask + limits + rich + typing-extensions + ]; checkInputs = [ + asgiref + pytest-mock pytestCheckHook hiro - mock redis - flask-restful pymemcache + pymongo ]; postPatch = '' sed -i "/--cov/d" pytest.ini + + # flask-restful is unmaintained and breaks regularly, don't depend on it + sed -i "/import flask_restful/d" tests/test_views.py ''; - # Some tests requires a local Redis instance disabledTests = [ - "test_fallback_to_memory" - "test_reset_unsupported" + # flask-restful is unmaintained and breaks regularly + "test_flask_restful_resource" + + # Requires running a docker instance + "test_clear_limits" "test_constructor_arguments_over_config" - "test_fallback_to_memory_config" - "test_fallback_to_memory_backoff_check" - "test_fallback_to_memory_with_global_override" "test_custom_key_prefix" + "test_custom_key_prefix_with_headers" + "test_fallback_to_memory_backoff_check" + "test_fallback_to_memory_config" + "test_fallback_to_memory_with_global_override" "test_redis_request_slower_than_fixed_window" "test_redis_request_slower_than_moving_window" - "test_custom_key_prefix_with_headers" + "test_reset_unsupported" + + # Requires redis + "test_fallback_to_memory" + ]; + + disabledTestPaths = [ + # requires running redis/memcached/mongodb + "tests/test_storage.py" ]; pythonImportsCheck = [ "flask_limiter" ]; From b7c258d38788ea017f220801b71c45b45454aa72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 09:15:01 +0200 Subject: [PATCH 146/297] python3Packages.limits: update meta --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index a45acb35d445..2b4499e29e8e 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -76,8 +76,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Rate limiting utilities"; - homepage = "https://limits.readthedocs.org/"; + description = "Rate limiting using various strategies and storage backends such as redis & memcached"; + homepage = "https://github.com/alisaifee/limits"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 4e4104a96199a7ba9eed44c96487955b7a45b5c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 08:44:34 +0200 Subject: [PATCH 147/297] python3Packages.flask-restful: disable failing test This test broke with flask>2.2.0 and the project is otherwise unmaintained, so this is a best-effort fix. --- pkgs/development/python-modules/flask-restful/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index cefedfe7fc37..c9314e1cfcb7 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Broke in flask 2.2 upgrade + "test_exception_header_forwarded" + ]; + pythonImportsCheck = [ "flask_restful" ]; From 360ad99eacc23766c50e47ca615ca2682ce50f5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 09:29:01 +0200 Subject: [PATCH 148/297] python3Packages.flask-sqlalchemy: disable failing test --- pkgs/development/python-modules/flask-sqlalchemy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index cd45e8ab12f8..c7cc7351e66e 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_session_scoping_changing" + # https://github.com/pallets-eco/flask-sqlalchemy/issues/1084 + "test_persist_selectable" ]; meta = with lib; { From a92964ec5df651e584dee79c8794a8f69542e11b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Aug 2022 09:44:06 +0200 Subject: [PATCH 149/297] python3Packages.mdx_truly_sane_lists: 1.2 -> 1.3 --- .../mdx-truly-sane-lists/default.nix | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix index 5d100c3d24f5..823d1e26efef 100644 --- a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix +++ b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix @@ -8,34 +8,23 @@ buildPythonPackage rec { pname = "mdx_truly_sane_lists"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "radude"; repo = "mdx_truly_sane_lists"; - rev = version; - sha256 = "1h8403ch016cwdy5zklzp7c6xrdyyhl4z07h97qzbafrbq07jyss"; + rev = "refs/tags/${version}"; + hash = "sha256-hPnqF1UA4peW8hzeFiMlsBPfodC1qJXETGoq2yUm7d4="; }; - patches = [ - # fix with markdown>=3.4 - # Upstream PR: https://github.com/radude/mdx_truly_sane_lists/pull/12/ - (fetchpatch { - url = "https://github.com/radude/mdx_truly_sane_lists/commit/197fa16bc8d3481b8ea29d54b9cc89716f5d43a2.patch"; - sha256 = "sha256-cYCb+EI4RpebNN02bCy1SSH9Tz4BsnFgUCOeQNC03Oo="; - }) - ]; - propagatedBuildInputs = [ markdown ]; pythonImportsCheck = [ "mdx_truly_sane_lists" ]; - # Hard ImportError from the package trying to view version of markdown, - # which was removed. - # Upstream issue: https://github.com/radude/mdx_truly_sane_lists/issues/11 - doCheck = false; checkPhase = '' + runHook preCheck ${python.interpreter} mdx_truly_sane_lists/tests.py + runHook postCheck ''; meta = with lib; { From bcd41f289122c4a182f892ee740b37e436daf89e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 27 Aug 2022 17:10:06 -0400 Subject: [PATCH 150/297] linux: Disable DRM_LEGACY, NOUVEAU_LEGACY_CTX_SUPPORT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This currently gets enabled as generate-config.pl will enable all the drivers below it as modules. Is “not set” in [Arch][1], [Debian][2], [Fedora][3]. See also [summary of setting from various distros in April 2020][4]. Recommended disabled by [CLIP OS][5] and per current [Kernel config description][6]: > bool "Enable legacy drivers (DANGEROUS)" > Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous > APIs to user-space, which can be used to circumvent access > restrictions and other security measures. For backwards compatibility > those drivers are still available, but their use is highly > inadvisable and might harm your system. > > You are recommended to use the safe modeset-only drivers instead, and > perform 3D emulation in user-space. > > Unless you have strong reasons to go rogue, say "N". Also disable NOUVEAU_LEGACY_CTX_SUPPORT, as this does `select DRM_LEGACY`. Per Kernel config docs: >There was a version of the nouveau DDX that relied on legacy > ctx ioctls not erroring out. But that was back in time a long > ways, so offer a way to disable it now. For uapi compat with > old nouveau ddx this should be on by default, but modern distros > should consider turning it off. and the [commit][7]: > These driver functions contain several bugs and security holes. This > change makes these functions optional can be turned on by a setting, > they are turned off by default for modeset driver with the exception of > the nouvea driver that may require them with an old version of libdrm. Referenced earlier commit elaborates that > libdrm_nouveau before 2.4.33 used contexts Since nixpkgs here has a much newer version (2.4.33 is from March 2012), should not be a concern. NOUVEAU_LEGACY_CTX_SUPPORT is also “not set” in the linked Arch, Debian, & Fedora configs. [1]: https://github.com/archlinux/svntogit-packages/blob/66d72ee54afc604391b618fc3eecc43f29e479e8/trunk/config#L6637 [2]: https://salsa.debian.org/kernel-team/linux/-/blob/07731f5956cf29876a7abc13f4ecbdf4d9459592/debian/config/config#L713 [3]: https://src.fedoraproject.org/rpms/kernel/blob/rawhide/f/kernel-x86_64-fedora.config#_1528 [4]: https://github.com/a13xp0p0v/kconfig-hardened-check/issues/38#issuecomment-608639217 [5]: https://docs.clip-os.org/clipos/kernel.html#configuration [6]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/Kconfig#n421 [7]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b30a43ac7132cdda833ac4b13dd1ebd35ace14b7 --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8211860b62f5..97bf388d46a6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -270,6 +270,9 @@ let }; video = { + DRM_LEGACY = no; + NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no; + # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; VGA_SWITCHEROO = yes; # Hybrid graphics support From d78648fec4c046777175b1a3bdc74eca9ca28abf Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 29 Aug 2022 13:18:32 +0200 Subject: [PATCH 151/297] python3Packages.flask-login: 0.6.1 -> 0.6.2 fix staging-next due to werkzeug error Signed-off-by: Florian Brandes --- pkgs/development/python-modules/flask-login/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index cd5bab252cc8..faf93f4eee98 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-login"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Login"; inherit version; - sha256 = "sha256-EwbUdKJwoDbW/RT0VkDE13NV5PHGfKQzGzctNEiZe4w="; + sha256 = "sha256-wKe6qf3ESM3T3W8JOd9y7sUXey96vmy4L8k00pyqycM="; }; propagatedBuildInputs = [ From 4ccddf5d9a531a274af335daab0665364f2ef03d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Aug 2022 03:02:02 +0000 Subject: [PATCH 152/297] xml2rfc: 3.14.1 -> 3.14.2 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 794cda0d509c..d7d5b52ee42e 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.14.1"; + version = "3.14.2"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-v8wvmAV5t2dEWFWtbM68Npe+QzwXksRUl0H+tP0RgFc="; + sha256 = "sha256-7UKav9IOH3u/3ZPDWVTBSf+A1li65qK2qASJpNVezdI="; }; postPatch = '' From ad41e043760ed1da3d8c957b3bf168bdfc9bd9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 30 Aug 2022 14:44:31 +0200 Subject: [PATCH 153/297] python310Packages.moto: disable failing tests after werkzeug update --- pkgs/development/python-modules/moto/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 52c0b6a250b2..355ad0766c62 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -130,6 +130,9 @@ buildPythonPackage rec { disabledTests = [ # only appears in aarch64 currently, but best to be safe "test_state_machine_list_executions_with_filter" + # tests fail with 404 after Werkzeug 2.2 upgrade, see https://github.com/spulec/moto/issues/5341#issuecomment-1206995825 + "test_appsync_list_tags_for_resource" + "test_s3_server_post_to_bucket_redirect" ]; meta = with lib; { From d7dce5f206907871ecb1ed90e5243c51b91963a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 06:34:54 +0000 Subject: [PATCH 154/297] fio: 3.31 -> 3.32 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 5939729492d3..0fc90be2dcbf 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.31"; + version = "3.32"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-wqm9yjrJKP3JgsLmPnu14Pi2zm0iTdGcTOGOqXmZslM="; + sha256 = "sha256-z9p9WDVjKQAQIP1v5RxnDXjwVl4SVZOvdxlSt5NZN1k="; }; buildInputs = [ python3 zlib ] From 78f3f7790b40b870c43ff3b05cb278e8718be55f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 31 Aug 2022 16:05:42 +0200 Subject: [PATCH 155/297] perlPackages.IOAsyncSSL: fix test Apply patch from Debian to fix test compatibility with OpenSSL 3 --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 45c3ee62c530..efb6c91d7f28 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12003,6 +12003,14 @@ let url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz"; hash = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4="; }; + patches = [ + (fetchpatch { + # Fixes test compatibility with OpenSSL 3 + url = "https://sources.debian.org/data/main/libi/libio-async-ssl-perl/0.23-1/debian/patches/upgrade-error-match.patch"; + hash = "sha256-RK36nVba203I9awZtHiU7jwhCV7U8Gw6wnbs3e9Hbjk="; + name = "IO-Async-SSL-upgrade-error-match.patch"; + }) + ]; buildInputs = [ TestIdentity ]; propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; meta = { From f5f1d11b9e5f33b5037fe896e69510d0fcad86c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 31 Aug 2022 17:28:35 +0200 Subject: [PATCH 156/297] aws-sdk-cpp: ignore openssl 3 deprecation warnings --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7ae09460adda..5d5c5e956026 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -99,6 +99,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; + NIX_CFLAGS_COMPILE = [ + # openssl 3 generates several deprecation warnings + "-Wno-error=deprecated-declarations" + ]; + # aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp # seem to have a datarace enableParallelChecking = false; From 0762cbf11624c232ac3425a233d12947cc43e5a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 18:28:54 +0000 Subject: [PATCH 157/297] ircdHybrid: 8.2.41 -> 8.2.42 --- pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 5d4987cea9d1..c7c50edb466c 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ircd-hybrid"; - version = "8.2.41"; + version = "8.2.42"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; - sha256 = "sha256-zg6mllRgEEe9hkI93AAjwHlVcCSZkAEeqmxB1jcrBFQ="; + sha256 = "sha256-aS0he/x+o3xOQ5H7hrCpJ4C8MusUT2liM0lyF1W4H2o="; }; buildInputs = [ openssl zlib ]; From 0e66a97683694d8071315fb0d6227f6850a5ba36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 19:58:29 +0000 Subject: [PATCH 158/297] usbguard: 1.1.1 -> 1.1.2 --- pkgs/os-specific/linux/usbguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 35505af5a1ed..b3cd47f26127 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -24,14 +24,14 @@ assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.1.2"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - sha256 = "sha256-lAh+l9GF+FHQqv2kEYU5JienZKGwR5e45BYAwjieYgw="; + sha256 = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; fetchSubmodules = true; }; From 7d009061c96d51b56c475016b9d9183902dc0699 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 4 Sep 2022 12:00:00 +0000 Subject: [PATCH 159/297] nixos/vaultwarden: Restart=always there is no reason vaultwarden should remain not started --- nixos/modules/services/security/vaultwarden/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 9351bff448d3..f33ed300baf5 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -197,6 +197,7 @@ ADMIN_TOKEN=...copy-paste a unique generated secret token here... AmbientCapabilities = "CAP_NET_BIND_SERVICE"; StateDirectory = "bitwarden_rs"; StateDirectoryMode = "0700"; + Restart = "always"; }; wantedBy = [ "multi-user.target" ]; }; From 7160e94e270984312e93719b03f268cc1a393af9 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 4 Sep 2022 12:00:00 +0000 Subject: [PATCH 160/297] nixos/vaultwarden: fix race with backup when vaultwarden starts while backup-vaultwarden.service is running, it fails because the sqlite database is locked --- nixos/modules/services/security/vaultwarden/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index f33ed300baf5..dd9390f4ede6 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -210,6 +210,8 @@ ADMIN_TOKEN=...copy-paste a unique generated secret token here... BACKUP_FOLDER = cfg.backupDir; }; path = with pkgs; [ sqlite ]; + # if both services are started at the same time, vaultwarden fails with "database is locked" + before = [ "vaultwarden.service" ]; serviceConfig = { SyslogIdentifier = "backup-vaultwarden"; Type = "oneshot"; From 70b8ef1df6ff5a998b76d2263af2d1f4e73116ed Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 4 Sep 2022 12:00:00 +0000 Subject: [PATCH 161/297] nixos/vaultwarden: fix typo in timer alias --- nixos/modules/services/security/vaultwarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index dd9390f4ede6..a438539ddace 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -223,7 +223,7 @@ ADMIN_TOKEN=...copy-paste a unique generated secret token here... }; systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs.service" ]; + aliases = [ "backup-bitwarden_rs.timer" ]; description = "Backup vaultwarden on time"; timerConfig = { OnCalendar = mkDefault "23:00"; From 6f05f7c172b182e5d467de829953d9937291f9c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 17:07:09 +0000 Subject: [PATCH 162/297] joker: 1.0.0 -> 1.0.1 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ae408f5fec5e..85fba63f1597 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-SlkhxALJwrZ/DOuBbqjb+wHEfT5mhd3lSD6E0geFP4Y="; + sha256 = "sha256-yetHt8zrIEenb1Z5L3oUmgVGxWaYOu4Nk4pbJD6K3zA="; }; vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; From 52fd3468374dab2e2b693846f4fb065182936084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 5 Sep 2022 09:48:44 +0200 Subject: [PATCH 163/297] graphviz: patch a regression in 5.0.1 The issue was breaking tests in python3Packages.*graphviz. It's a big rebuild, but I think we should fix the regression during this staging-next iteration. /cc 5.0.1 PR: #188175 --- pkgs/tools/graphics/graphviz/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 2915474735fe..104167c6d721 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , autoreconfHook , pkg-config , cairo @@ -38,6 +39,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-lcU6Pb45kg7AxXQ9lmqwAazT2JpGjBz4PzK+S5lpYa0="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/graphviz/graphviz/-/commit/8d662734b6a34709d9475b120e7ce3de872339e2.diff"; + includes = [ "lib/*" ]; + sha256 = "sha256-cqzUpK//2TnzWb7oSa/g8LJ61yr3O+Wiq5LsZzw34NE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config From 37dca4189efff7f432a2427395e85ba6a0c13618 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 21:41:07 +0000 Subject: [PATCH 164/297] gmic-qt: 3.1.5 -> 3.1.6 --- pkgs/tools/graphics/gmic-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 29d326439d7f..5da3c45d0049 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -58,13 +58,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "rSBdh6jhiVZogZADEKn3g7bkGPnWWOEnRF0jNCe1BCk="; + sha256 = "sha256-/5wDHvJSMgEheg8YV4W40wUiHz25emIoFnGdfO8i92g="; }; nativeBuildInputs = [ From a59c0cd11533f26cfb9d79cc75f979a9a4e29d82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 23:04:03 +0000 Subject: [PATCH 165/297] libglibutil: 1.0.66 -> 1.0.67 --- pkgs/development/libraries/libglibutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 44de9f314b53..20c9a64c60b4 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.66"; + version = "1.0.67"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-CYZDlmnHOCT0HC7sG0dN7zWkhcSRzX6XXPrEFmFEye8="; + sha256 = "sha256-SXyMmkyC1RZLIYhrG2TDcH/PDCHfrJOVZOX1PC3EDLg="; }; outputs = [ "out" "dev" ]; From f0f68ccc99420fddea0902d22d4152ef88ed3d7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 01:13:58 +0000 Subject: [PATCH 166/297] opera: 90.0.4480.48 -> 90.0.4480.84 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 71b755e60d82..92afe2f4baa0 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "90.0.4480.48"; + version = "90.0.4480.84"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-nFReaBvtIQ1N5lfOJHoayiI4TWlfmGocNWirbvPRbnM="; + sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; From ab5169d64c0fa81e6804575f444746c198979baa Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 6 Sep 2022 16:24:08 +0300 Subject: [PATCH 167/297] =?UTF-8?q?hobbits:=200.53.1=20=E2=86=92=200.53.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/hobbits/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix index cf3377d383ed..2406df815269 100644 --- a/pkgs/tools/graphics/hobbits/default.nix +++ b/pkgs/tools/graphics/hobbits/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, mkDerivation, fetchFromGitHub -, cmake, pkg-config, pffft, libpcap, libusb1, python3 +, cmake, pkg-config, pffft, libpcap, libusb1, python3, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hobbits"; - version = "0.53.1"; + version = "0.53.2"; src = fetchFromGitHub { owner = "Mahlet-Inc"; - repo = pname; + repo = "hobbits"; rev = "v${version}"; - sha256 = "sha256-dMFsv2M96+65JxTOq0CG+vm7a75GkD7N7PmbsyZ2Fog="; + hash = "sha256-X2DotmzqeIESkO6o39si4kEkRhLO7yBr6Djh+0s+lFc="; }; postPatch = '' @@ -22,7 +22,9 @@ mkDerivation rec { buildInputs = [ pffft libpcap libusb1 python3 ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + + cmakeFlags = [ "-DUSE_SYSTEM_PFFFT=ON" ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; From 4e4e8b529502bc1d72b2ced55529571d07703d5d Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 5 Sep 2022 23:23:57 +0300 Subject: [PATCH 168/297] alfis: 0.7.7 -> 0.8.2 https://github.com/Revertron/Alfis/releases/tag/v0.8.2 https://github.com/Revertron/Alfis/compare/v0.7.7...v0.8.2 --- pkgs/applications/blockchains/alfis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 0fd55594f2ef..62f21dff30f3 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.7.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-I9vJc3J3OoUA6GOc8NkWBKSCkjHC4KOztglJOg9S0Eo="; + sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84="; }; - cargoSha256 = "sha256-VVBO2w6iwZ+K4gnN6+TckgBXCCc/dGO6/yZEunWGK8g="; + cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI="; checkFlags = [ # these want internet access, disable them From d5656236191580303cced83df778444a53842609 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 6 Sep 2022 22:15:40 +0200 Subject: [PATCH 169/297] python310Packages.mitmproxy: fix failing tests with Flask 2.2 --- .../python-modules/mitmproxy/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index ed390ef33658..1b89d73864b0 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,6 +1,6 @@ { lib -, stdenv , fetchFromGitHub +, fetchpatch , buildPythonPackage , pythonOlder # Mitmproxy requirements @@ -20,7 +20,6 @@ , passlib , protobuf , publicsuffix2 -, pyasn1 , pyopenssl , pyparsing , pyperclip @@ -32,8 +31,6 @@ , wsproto , zstandard # Additional check requirements -, beautifulsoup4 -, glibcLocales , hypothesis , parver , pytest-asyncio @@ -55,6 +52,14 @@ buildPythonPackage rec { sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; }; + patches = [ + # Fix onboarding addon tests failing with Flask >= v2.2 + (fetchpatch { + url = "https://github.com/mitmproxy/mitmproxy/commit/bc370276a19c1d1039e7a45ecdc23c362626c81a.patch"; + hash = "sha256-Cp7RnYpZEuRhlWYOk8BOnAKBAUa7Vy296UmQi3/ufes="; + }) + ]; + propagatedBuildInputs = [ setuptools # setup.py From 96398396ebf7caea18a9a25e14421f2a67844b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 6 Sep 2022 17:16:10 +0200 Subject: [PATCH 170/297] nginxModules.vts: 0.1.18 -> 0.2.0 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e2f7119440a1..555615a83f54 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -566,8 +566,8 @@ in name = "vts"; owner = "vozlt"; repo = "nginx-module-vts"; - rev = "v0.1.18"; - sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7"; + rev = "v0.2.0"; + sha256 = "sha256-uVGHFJt9KNcM4cdCUcSYL5KxbCiZkFf1eTdafCZXRew="; }; }; } From b1a70d4a7b1bc3a7f8fc7d26dca132db2cebad1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Tue, 6 Sep 2022 18:45:26 -0300 Subject: [PATCH 171/297] kde/plasma: 5.25.4 -> 5.25.5 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 424 ++++++++++++++++---------------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 549f3e3c9445..95361c1173e2 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 4cffaba594a2..7db192740255 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/bluedevil-5.25.4.tar.xz"; - sha256 = "1cygnmigwqx1mqynfafcypkvf9bmz05rmrfwlxsksvll8yd9xn84"; - name = "bluedevil-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/bluedevil-5.25.5.tar.xz"; + sha256 = "1dsah7rcx2brcd1d5x7bvhrixx5nvwp1fwq9b8k2zc038xzpx6ys"; + name = "bluedevil-5.25.5.tar.xz"; }; }; breeze = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/breeze-5.25.4.tar.xz"; - sha256 = "0lw0vj07z8l19v2z31d601kfanqixy3dbsv0lf8q273xv3li9sbp"; - name = "breeze-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/breeze-5.25.5.tar.xz"; + sha256 = "0m3ggv5znzfcp25afgl7v5w7m27v5hdvv6jw9vrvwbqj8lzq1hlx"; + name = "breeze-5.25.5.tar.xz"; }; }; breeze-grub = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/breeze-grub-5.25.4.tar.xz"; - sha256 = "10n380h77czwgbpcjhriai43pk9q08l9j819nqm9wbwmsw7gj31s"; - name = "breeze-grub-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/breeze-grub-5.25.5.tar.xz"; + sha256 = "1w5lrnfhnzd9mjs93r1y8f9mlpqd7jlrjwzfryy919alqsxfpyyl"; + name = "breeze-grub-5.25.5.tar.xz"; }; }; breeze-gtk = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/breeze-gtk-5.25.4.tar.xz"; - sha256 = "1x9a74f2anybvgmj4yl7pzz14jckjly55sb8hhlyrd1mp2k8p4mi"; - name = "breeze-gtk-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/breeze-gtk-5.25.5.tar.xz"; + sha256 = "0wj8qzy2104ggczxagxm45zwsvvpwd6jjnbv1893mhlr6f2zrbmh"; + name = "breeze-gtk-5.25.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/breeze-plymouth-5.25.4.tar.xz"; - sha256 = "0wfhhaknvy51zrgfkcjrgc5s3q8y3pqb4r92nr37055cdvncwz79"; - name = "breeze-plymouth-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/breeze-plymouth-5.25.5.tar.xz"; + sha256 = "1p9xgcxx543dddpz7sahk1ky6inzl9lyaf0z506vh91xs5rn0srv"; + name = "breeze-plymouth-5.25.5.tar.xz"; }; }; discover = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/discover-5.25.4.tar.xz"; - sha256 = "154sjr7c8dwlf1m22vh3wqiyfii8xpmxmfrf36i9r0xyb0zb5zg6"; - name = "discover-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/discover-5.25.5.tar.xz"; + sha256 = "01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv"; + name = "discover-5.25.5.tar.xz"; }; }; drkonqi = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/drkonqi-5.25.4.tar.xz"; - sha256 = "06na44x22bxd94r24xkzc373d0rhmv6l1awfq0bzh9cxpy8yg3f4"; - name = "drkonqi-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/drkonqi-5.25.5.tar.xz"; + sha256 = "0vw4bfld2jdiwm4g3008x8s1lq1ydf87ckb0fvyzsp11hq9nnnk7"; + name = "drkonqi-5.25.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kactivitymanagerd-5.25.4.tar.xz"; - sha256 = "1cpz08jkmxw9576h9mkn15vwg3bxgk8k6w4f38rkiasxzj6zfamd"; - name = "kactivitymanagerd-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kactivitymanagerd-5.25.5.tar.xz"; + sha256 = "0hsllhqi46n25sr27crnad053ghk3hni2w496g6d2qfmi20l3g4n"; + name = "kactivitymanagerd-5.25.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kde-cli-tools-5.25.4.tar.xz"; - sha256 = "00p6vm9qw871hjclvw21nh93dq60r1ylb95hscx917gfx42dan8x"; - name = "kde-cli-tools-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kde-cli-tools-5.25.5.tar.xz"; + sha256 = "0i1lnkyb2bdvbhnr2wsgjy2sjichzxxqkvn30ca85rj21cavk2z3"; + name = "kde-cli-tools-5.25.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kde-gtk-config-5.25.4.tar.xz"; - sha256 = "03cr5v7sr67vhcidr87min8z1ld5dm0n6yh79c1ghp1hp5ndscl8"; - name = "kde-gtk-config-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kde-gtk-config-5.25.5.tar.xz"; + sha256 = "0zr4626fmx5adg65qa0npc222kjxmhml1i014gsrmjmsp0s5w8pw"; + name = "kde-gtk-config-5.25.5.tar.xz"; }; }; kdecoration = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kdecoration-5.25.4.tar.xz"; - sha256 = "1yw7qjrf0c9xl2mncasbh3c1nf3c8x1v8ccfnp540z9slqi5qfmi"; - name = "kdecoration-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kdecoration-5.25.5.tar.xz"; + sha256 = "1x3scszz5nfwqciwc3bv0r04wgqlxs0c9j1090zvn6mjjg2nsyb7"; + name = "kdecoration-5.25.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kdeplasma-addons-5.25.4.tar.xz"; - sha256 = "1lgmmqr798cfxmllalgzixf3v9xbiiazbn3vkcdqxcj6cjf730c0"; - name = "kdeplasma-addons-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kdeplasma-addons-5.25.5.tar.xz"; + sha256 = "1a5cq0jz69hlcr22wxi2p5mzxv5xcp88220irxmq0dhpk85kywlx"; + name = "kdeplasma-addons-5.25.5.tar.xz"; }; }; kgamma5 = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kgamma5-5.25.4.tar.xz"; - sha256 = "1m72dl1rxsh56pmacx0q0qda7lr4359azik2lnhw7nhs30z4p25a"; - name = "kgamma5-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kgamma5-5.25.5.tar.xz"; + sha256 = "1c305bs50km7bsn0phz7yj4x2168sxwsw9zxbpcgw4q3r53c0ywz"; + name = "kgamma5-5.25.5.tar.xz"; }; }; khotkeys = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/khotkeys-5.25.4.tar.xz"; - sha256 = "0hkicwkcjb4p4k5yh8d60h6khsvrqkhjx42aby6rxd3mgvrqd3xy"; - name = "khotkeys-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/khotkeys-5.25.5.tar.xz"; + sha256 = "0c9i4vxiiv90dpzsd2hjwavks87cvwplkj63751z8mazax6r95as"; + name = "khotkeys-5.25.5.tar.xz"; }; }; kinfocenter = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kinfocenter-5.25.4.tar.xz"; - sha256 = "0ns2xsqghglg4ikq7w556y1kh20gs677km1vs0paw50xhi7jzbd2"; - name = "kinfocenter-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kinfocenter-5.25.5.tar.xz"; + sha256 = "0zvki76yghkn158s7hb5g9drz7xaqxkmp2747404n2n0gmnmsdif"; + name = "kinfocenter-5.25.5.tar.xz"; }; }; kmenuedit = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kmenuedit-5.25.4.tar.xz"; - sha256 = "1y3ml4jscb28nvadh7iq2y240qifv71dv2nkd32i69h52xdrvz27"; - name = "kmenuedit-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kmenuedit-5.25.5.tar.xz"; + sha256 = "0z85w7w207dnsinsz8yg6s408pwfy3l7wjkcsjpyg8aj8s9x6nl7"; + name = "kmenuedit-5.25.5.tar.xz"; }; }; kscreen = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kscreen-5.25.4.tar.xz"; - sha256 = "1wjpyq56iw8axbjhsa82w67g54v6y3rv5nx623d1kddvlzlhh8pf"; - name = "kscreen-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kscreen-5.25.5.tar.xz"; + sha256 = "0361202n0366jiyv61w06jikh2i4s1fzr6x3chmdykx4fgvbqj7s"; + name = "kscreen-5.25.5.tar.xz"; }; }; kscreenlocker = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kscreenlocker-5.25.4.tar.xz"; - sha256 = "0zfvkdvyqxxxgpiimqjxhavwna0z94i28ky8qmvbcmn1705x5lvx"; - name = "kscreenlocker-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kscreenlocker-5.25.5.tar.xz"; + sha256 = "0mivx0l266310iy52qi94b6wi8w2a8nl7cjn5750x66dz81jl3yj"; + name = "kscreenlocker-5.25.5.tar.xz"; }; }; ksshaskpass = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/ksshaskpass-5.25.4.tar.xz"; - sha256 = "0dzhddylzigaaigacynncd5q0s4884dgr4wyrrdpqj42d47wjikz"; - name = "ksshaskpass-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/ksshaskpass-5.25.5.tar.xz"; + sha256 = "0z8pp2mh4s98jh8jkf6r8v014gb6svapmp0m1npzw7zcmr6jvpn6"; + name = "ksshaskpass-5.25.5.tar.xz"; }; }; ksystemstats = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/ksystemstats-5.25.4.tar.xz"; - sha256 = "0ray2v90vv1j1sbd7fx4x5n7s7xwlil1zynwi4pzpgnyi13zq60x"; - name = "ksystemstats-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/ksystemstats-5.25.5.tar.xz"; + sha256 = "07xm6gn2k3vsl1pkrd2n9w8w8b7jq26h3cpslqha4ipw0by2mlqa"; + name = "ksystemstats-5.25.5.tar.xz"; }; }; kwallet-pam = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kwallet-pam-5.25.4.tar.xz"; - sha256 = "14j3xngwliqhhvw60izv5kdjvv8xhqw8cjsc4l22v8jj4m8yw2xk"; - name = "kwallet-pam-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kwallet-pam-5.25.5.tar.xz"; + sha256 = "14w803lc3s2c0f4mqzzdhpfy5qnlz7wv00pbrc3v4k3zv381ci8n"; + name = "kwallet-pam-5.25.5.tar.xz"; }; }; kwayland-integration = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kwayland-integration-5.25.4.tar.xz"; - sha256 = "1iqnwcp08kg91pwm3i4grd0i4bqf8h1z0n0fhcw6l0cbhdkcad39"; - name = "kwayland-integration-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kwayland-integration-5.25.5.tar.xz"; + sha256 = "10xl7yrj519b9s5vq0hqqfz3vvg1fdwggw96snzm44iwycqbgss8"; + name = "kwayland-integration-5.25.5.tar.xz"; }; }; kwin = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kwin-5.25.4.tar.xz"; - sha256 = "0zahw7hd3g775a6iyglvv60h9vw52jc9pg9ffkg4mpqb00f159p8"; - name = "kwin-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kwin-5.25.5.tar.xz"; + sha256 = "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s"; + name = "kwin-5.25.5.tar.xz"; }; }; kwrited = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/kwrited-5.25.4.tar.xz"; - sha256 = "0xn20irka7adbqfc8w6gnhwp0pbv7bz7l7g16qddv1wq3xix9053"; - name = "kwrited-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/kwrited-5.25.5.tar.xz"; + sha256 = "03gw3czdgyf35n6x79x416rk6f7w1ayzmy5pb65v9733nx1j34mh"; + name = "kwrited-5.25.5.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/layer-shell-qt-5.25.4.tar.xz"; - sha256 = "0pd88nnp925l09gzq4cajjnx810df4n0ssd65i1bmvgnxynzh5i7"; - name = "layer-shell-qt-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/layer-shell-qt-5.25.5.tar.xz"; + sha256 = "1mvhklq7n9hhjing704jr3ybq58ixwr9fdg3phnqhmdnqc2q3w0l"; + name = "layer-shell-qt-5.25.5.tar.xz"; }; }; libkscreen = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/libkscreen-5.25.4.tar.xz"; - sha256 = "17ib0sgrhmmf3f8w3fni0825xz5581av5vnz8gca41vyf12css25"; - name = "libkscreen-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/libkscreen-5.25.5.tar.xz"; + sha256 = "17f2pbbkpmw3a32nsqlwd0x5xb71l6dzrh7ldwcqv46nvb54yhfa"; + name = "libkscreen-5.25.5.tar.xz"; }; }; libksysguard = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/libksysguard-5.25.4.tar.xz"; - sha256 = "1kzpimhkagsmqj0cky4cfav1kbzyfjaj2l5xdapnmaygbm6r8086"; - name = "libksysguard-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/libksysguard-5.25.5.tar.xz"; + sha256 = "1gqsjsdkp25abqqp4f6cv6ih199q9ad7q1a4lkhjgsh4h8jq1856"; + name = "libksysguard-5.25.5.tar.xz"; }; }; milou = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/milou-5.25.4.tar.xz"; - sha256 = "17npfn7gwiqrvy5w8vzpc38c4bgkx3vjgjkm1caizn04zfk7xar7"; - name = "milou-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/milou-5.25.5.tar.xz"; + sha256 = "0ijdbiq169sy47g0x22pj9x6abldpfxcnski4w1jh9hi9qz1rc25"; + name = "milou-5.25.5.tar.xz"; }; }; oxygen = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/oxygen-5.25.4.tar.xz"; - sha256 = "1cd76fa2szhb3apabyvl76p8vdk97229g5sgv94xx9pr7rx8a67y"; - name = "oxygen-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/oxygen-5.25.5.tar.xz"; + sha256 = "1szkaln4if8rafvjg2yjxarspf7lqls2pk0gzac89ncr7840c970"; + name = "oxygen-5.25.5.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/oxygen-sounds-5.25.4.tar.xz"; - sha256 = "0v8j8kf86ri1z14mgqc1c6kkpsbih8rjph35sr5y0i4av9mh6p9b"; - name = "oxygen-sounds-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/oxygen-sounds-5.25.5.tar.xz"; + sha256 = "04rn3ccqszznknvblz2i8r406m32hk4d3yzma4vzq93jfk57hdf1"; + name = "oxygen-sounds-5.25.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-browser-integration-5.25.4.tar.xz"; - sha256 = "1l3n4psbqimfar5qsmrfp3nhgg3v9yy93rkjpvyqgdmizi44scqw"; - name = "plasma-browser-integration-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-browser-integration-5.25.5.tar.xz"; + sha256 = "18pbn5ic5l3m8i1y99yprpwd4x4746aq3abqn1f2cq5h2683h2ia"; + name = "plasma-browser-integration-5.25.5.tar.xz"; }; }; plasma-desktop = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-desktop-5.25.4.tar.xz"; - sha256 = "1jkjc412n1wn17qrmx0sv91pzv5xjsljms3bsln6bbxj5fkhmkfm"; - name = "plasma-desktop-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-desktop-5.25.5.tar.xz"; + sha256 = "05s1pkwr4xmkghp8jrwcyrvjm83n68ngmk2694055xcfgi0pxicg"; + name = "plasma-desktop-5.25.5.tar.xz"; }; }; plasma-disks = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-disks-5.25.4.tar.xz"; - sha256 = "04hs8jg7f5bm5rjcb6i6zidyamq6cfry5sm5mj6hqdj0qmn9i396"; - name = "plasma-disks-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-disks-5.25.5.tar.xz"; + sha256 = "0vci2cf8vx2lclypys9rmvjb8haakv6ksrvqm5j28pazbq2kskvl"; + name = "plasma-disks-5.25.5.tar.xz"; }; }; plasma-firewall = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-firewall-5.25.4.tar.xz"; - sha256 = "12rmf7x8dyyb1k5ycj43kn4c0wzidig4h5wdh1igrgcvyypmjjcl"; - name = "plasma-firewall-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-firewall-5.25.5.tar.xz"; + sha256 = "0k3pc0dcsjr2hhh4hr8vhsvaddn66s6imm8skrr02icxqvljs6jh"; + name = "plasma-firewall-5.25.5.tar.xz"; }; }; plasma-integration = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-integration-5.25.4.tar.xz"; - sha256 = "1cbcp722pzbfiqfl5rcw6py74jbxg83k96kdx2m0g3ix1f0dmkbi"; - name = "plasma-integration-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-integration-5.25.5.tar.xz"; + sha256 = "1pab56cg2zi8fcaar53lhhh98iw7l07f5lkymkqhsh8a5crfc3yr"; + name = "plasma-integration-5.25.5.tar.xz"; }; }; plasma-mobile = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-mobile-5.25.4.tar.xz"; - sha256 = "0b0n3mjlj33191jgs8xqbk35y5nglfz4d8dih3qmg3kbs81qizwy"; - name = "plasma-mobile-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-mobile-5.25.5.tar.xz"; + sha256 = "1q4amdqvjbcx88qdyvhhl6j5f0f9p41b3k99zsqv381f94dpybn9"; + name = "plasma-mobile-5.25.5.tar.xz"; }; }; plasma-nano = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-nano-5.25.4.tar.xz"; - sha256 = "1pn6025wb3w855f3vy77879qlrb266bikw3nhar1dzv3sfgxw4w9"; - name = "plasma-nano-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-nano-5.25.5.tar.xz"; + sha256 = "1kgglhr3cvg0crfr6di21kp1pfdc017qh3jnaf25f15bllypznq9"; + name = "plasma-nano-5.25.5.tar.xz"; }; }; plasma-nm = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-nm-5.25.4.tar.xz"; - sha256 = "147p572pmkrgg52pvwhzs8lvxy3rs8y622n9lj7hjc6hrlh14qk2"; - name = "plasma-nm-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-nm-5.25.5.tar.xz"; + sha256 = "036bx0qjrjanfxy8aiy6ab7rmm2h8l7wlkvlwhzw2hgl1w03xjps"; + name = "plasma-nm-5.25.5.tar.xz"; }; }; plasma-pa = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-pa-5.25.4.tar.xz"; - sha256 = "0v92jk826jj2kf11hlxh3xrxl9nsj6835ik2pmb192xbn6gpb4lm"; - name = "plasma-pa-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-pa-5.25.5.tar.xz"; + sha256 = "0g06pm1isnzx4hv6380rjpyr22s4j5iw9083s71vnl4npx28npvb"; + name = "plasma-pa-5.25.5.tar.xz"; }; }; plasma-sdk = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-sdk-5.25.4.tar.xz"; - sha256 = "00s345l5jj1kfdvyyfq8718khfy88n6gyajb07n582q266mry39l"; - name = "plasma-sdk-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-sdk-5.25.5.tar.xz"; + sha256 = "1z0cn0aiiivdb02r5vn8hm8hj9wbx053ksh5jgx2x048g67gmq96"; + name = "plasma-sdk-5.25.5.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-systemmonitor-5.25.4.tar.xz"; - sha256 = "1fj0vyjdk6h3f4p9aagh03hyhbf69y2qwlavs2zr7d0iadih7b4c"; - name = "plasma-systemmonitor-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-systemmonitor-5.25.5.tar.xz"; + sha256 = "0rs3avhpmfapzha8dkir9ny60ba2m92bbfv4avsd85vz5kggg29h"; + name = "plasma-systemmonitor-5.25.5.tar.xz"; }; }; plasma-tests = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-tests-5.25.4.tar.xz"; - sha256 = "0d86zmlmagik2chagsm549yg78vy2qw3kl67skrlrmbkv82dhrz2"; - name = "plasma-tests-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-tests-5.25.5.tar.xz"; + sha256 = "14gdnyxl4fb5rqv1gpmp2wgx3x30pli919wjn835lbd2mf4rzwfq"; + name = "plasma-tests-5.25.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-thunderbolt-5.25.4.tar.xz"; - sha256 = "0hjvkss0qfmwhrsba83wfxwxhikvzf56faan325ic0iv7fdaj3ns"; - name = "plasma-thunderbolt-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-thunderbolt-5.25.5.tar.xz"; + sha256 = "1lbs4y163ccvd5zllazlp0f5v0g0rii1apbji9j7mr1n4w10wp16"; + name = "plasma-thunderbolt-5.25.5.tar.xz"; }; }; plasma-vault = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-vault-5.25.4.tar.xz"; - sha256 = "10ym2gk46yr1vgjnm1li1shdawklvvy3yvjcanm8ic5llchbxvzq"; - name = "plasma-vault-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-vault-5.25.5.tar.xz"; + sha256 = "15nf4myl6sry0930m8qiixpr1i8bh1g58cy2gf304h029vr2fn5j"; + name = "plasma-vault-5.25.5.tar.xz"; }; }; plasma-workspace = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-5.25.4.tar.xz"; - sha256 = "1aw9ms6rzxrk384xzdc3sqwqs1shbnkap40vfwxp4jamjk0pyglw"; - name = "plasma-workspace-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-5.25.5.tar.xz"; + sha256 = "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x"; + name = "plasma-workspace-5.25.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-wallpapers-5.25.4.tar.xz"; - sha256 = "1vjrfmzib17cb9r2q17rv4zmnqsk5mf55vy8kzx71djjif7gaqiy"; - name = "plasma-workspace-wallpapers-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-wallpapers-5.25.5.tar.xz"; + sha256 = "0pdgg8h6zwyxf1pj241mg3hd94wh38bqxj68af5jfp10xrwkzcyr"; + name = "plasma-workspace-wallpapers-5.25.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/plymouth-kcm-5.25.4.tar.xz"; - sha256 = "1wbgcccc1ili3j0k1njgj1q6jl35s20gf9m25s9d3mjwd9xnxrbv"; - name = "plymouth-kcm-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/plymouth-kcm-5.25.5.tar.xz"; + sha256 = "1knywmc6wdjqfq1xqli8hyi69kj7fvc0x0s246y7nrkskfc9ah67"; + name = "plymouth-kcm-5.25.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.4"; + version = "1-5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/polkit-kde-agent-1-5.25.4.tar.xz"; - sha256 = "0skadgzv97vfl4n2x889fiy5gsr6n894fr5viq3rizs0qsqc68b5"; - name = "polkit-kde-agent-1-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/polkit-kde-agent-1-5.25.5.tar.xz"; + sha256 = "1qb9nxlkgcv0c30l2vqgf9xs9d220q5pg7ikpb6zjzvj4wsvlvwd"; + name = "polkit-kde-agent-1-5.25.5.tar.xz"; }; }; powerdevil = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/powerdevil-5.25.4.tar.xz"; - sha256 = "1nznjxi59xc6pmyh0vainznhp9ig1ini3i87iapayawpnpf8sdxx"; - name = "powerdevil-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/powerdevil-5.25.5.tar.xz"; + sha256 = "0anisirn7z8aw442npdnk1csb5ghpzj2hx49gpw4l6ijk70b76pr"; + name = "powerdevil-5.25.5.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/qqc2-breeze-style-5.25.4.tar.xz"; - sha256 = "0sylffvbfdi44lmz6s78scf2p2iswf6p8g209wbd5fm1dgi6yi2z"; - name = "qqc2-breeze-style-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/qqc2-breeze-style-5.25.5.tar.xz"; + sha256 = "0z71kmhajk1jyp0f32kpl4pklbvxc34jp9jzq09gkq5vpsdccy6g"; + name = "qqc2-breeze-style-5.25.5.tar.xz"; }; }; sddm-kcm = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/sddm-kcm-5.25.4.tar.xz"; - sha256 = "1gqz9j6vha8i6bra63pfqrpl5wsg9a7qz351z5rkj5jwnkw1dxl7"; - name = "sddm-kcm-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/sddm-kcm-5.25.5.tar.xz"; + sha256 = "1hvwjcgsjvlg61rfrak5111828lxf0lfh5p95d5kw1x4y2wlr756"; + name = "sddm-kcm-5.25.5.tar.xz"; }; }; systemsettings = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/systemsettings-5.25.4.tar.xz"; - sha256 = "130739bfxl1jwkn3f4h7dnr7dv2i76g6sd2svmg0qy60cnwvcgcv"; - name = "systemsettings-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/systemsettings-5.25.5.tar.xz"; + sha256 = "0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl"; + name = "systemsettings-5.25.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.4"; + version = "5.25.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.4/xdg-desktop-portal-kde-5.25.4.tar.xz"; - sha256 = "13gva3mci9gawlxpw4ymdma8w6lc2b3y8z36699kmzli4vib214g"; - name = "xdg-desktop-portal-kde-5.25.4.tar.xz"; + url = "${mirror}/stable/plasma/5.25.5/xdg-desktop-portal-kde-5.25.5.tar.xz"; + sha256 = "0l3lmwihxyl65y0mkyg3afk1k6gc0ldjw2vg92g7yydbgmn39q7k"; + name = "xdg-desktop-portal-kde-5.25.5.tar.xz"; }; }; } From 09800d7f75b2c31820b43ce9287212efba2f523b Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 7 Sep 2022 21:36:04 +0800 Subject: [PATCH 172/297] firefox wrapper: write extraPrefsFiles before extraPrefs --- .../networking/browsers/firefox/wrapper.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ba44513ceea2..3e20e6158c97 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -147,7 +147,7 @@ let // extraPolicies; }; - mozillaCfg = writeText "mozilla.cfg" '' + mozillaCfg = '' // First line must be a comment // Disables addon signature checking @@ -155,7 +155,6 @@ let // Security is maintained because only user whitelisted addons // with a checksum can be installed ${ lib.optionalString usesNixExtensions ''lockPref("xpinstall.signatures.required", false)'' }; - ${extraPrefs} ''; ############################# @@ -345,13 +344,19 @@ let echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${libName}/defaults/pref/autoconfig.js" echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${libName}/defaults/pref/autoconfig.js" - cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg} + cat > "$out/lib/${libName}/mozilla.cfg" << EOF + ${mozillaCfg} + EOF extraPrefsFiles=(${builtins.toString extraPrefsFiles}) for extraPrefsFile in "''${extraPrefsFiles[@]}"; do cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg" done + cat >> "$out/lib/${libName}/mozilla.cfg" << EOF + ${extraPrefs} + EOF + mkdir -p $out/lib/${libName}/distribution/extensions ############################# From 7bc322a73634746f836e22ebec325eb155d119cc Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 5 Sep 2022 20:32:45 +0300 Subject: [PATCH 173/297] netbird: 0.8.11 -> 0.9.1 https://github.com/netbirdio/netbird/releases/tag/v0.9.1 https://github.com/netbirdio/netbird/compare/v0.8.11...v0.9.1 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 001a6deeedb0..b90e2b92169d 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.8.11"; + version = "0.9.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bVfe2Imklv1Q/5HoGJVlIO+CotrFQ1yG0L6p+MBE9vI="; + sha256 = "sha256-ECQ9W4YJdqjFP/Fs2P/JlPLJntewi1kowzYyid7IQGc="; }; - vendorSha256 = "sha256-HGWKkvJKIEwTLhEK8i+4lraoFEDSljmwxMOhFHhobms="; + vendorSha256 = "sha256-qBglJ9PYUApyOrZhZRvyK3WMcZQglDHmsy3Qv5K1PqA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From f5e995a8d61c1d52f41da72fb5e14b6b16e4728b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Thu, 8 Sep 2022 10:19:06 -0300 Subject: [PATCH 174/297] kde/gear: 22.08.0 -> 22.08.1 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1864 ++++++++++++++++---------------- 2 files changed, 933 insertions(+), 933 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 540500529890..05159b39bb81 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.0/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.1/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 7795913f4e24..d199db1ca980 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1867 +4,1867 @@ { akonadi = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-22.08.0.tar.xz"; - sha256 = "1ggvyxrkc76yjmyl1q23gdsar9sp7ijz13hznsdpj5pmbwixlszd"; - name = "akonadi-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-22.08.1.tar.xz"; + sha256 = "1yfy0b6kyiq82zkfkx9ldgjlbwg3lgg4di53fqjllmqhzaj1xy91"; + name = "akonadi-22.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-calendar-22.08.0.tar.xz"; - sha256 = "0bxkx7jp406g9a1cwnshpf8ij2dkii7jwzmh1rmvwlywmp3pbjaq"; - name = "akonadi-calendar-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-calendar-22.08.1.tar.xz"; + sha256 = "1xcnlkipy2rq0bsm811y9khw7dmsgkqxgw18b3lmy29xs7wcsiv5"; + name = "akonadi-calendar-22.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-calendar-tools-22.08.0.tar.xz"; - sha256 = "07lgkiz64h30irv5a3fkdncx66dh03cz2hs1wgbzfkiw1z4cyyh8"; - name = "akonadi-calendar-tools-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-calendar-tools-22.08.1.tar.xz"; + sha256 = "1h3gh8n2hwasb1grmmy1vwlym12d0awhncnb2zy8iyvky47psj8a"; + name = "akonadi-calendar-tools-22.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-contacts-22.08.0.tar.xz"; - sha256 = "1npkpxgn56yd15bbhq32h6dv0bi5z9nr0493dl9mggba7qmfd6lz"; - name = "akonadi-contacts-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-contacts-22.08.1.tar.xz"; + sha256 = "1mzlv124wa135xfbxl2ghl4n8pi1a6zd64195px1v90qnhjljw28"; + name = "akonadi-contacts-22.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-import-wizard-22.08.0.tar.xz"; - sha256 = "0bhl673dl66lnsljgpb1nrnaza91dpxqqk8lf5frwi4q8i9zpan5"; - name = "akonadi-import-wizard-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-import-wizard-22.08.1.tar.xz"; + sha256 = "1m3qfxbwiwskcyin44mrnm6lfplw4f1payc2s6w93k9lgz5j9cpd"; + name = "akonadi-import-wizard-22.08.1.tar.xz"; }; }; akonadi-mime = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-mime-22.08.0.tar.xz"; - sha256 = "02q4cg5cayzx3y6rph1nhpppf0x79v1gacfalcnkakb9c1za5yd7"; - name = "akonadi-mime-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-mime-22.08.1.tar.xz"; + sha256 = "19wbfkvhkyzlz5r49y7rzbn4ay7rm8zyj7d4j3x9j79nprjr4zw0"; + name = "akonadi-mime-22.08.1.tar.xz"; }; }; akonadi-notes = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-notes-22.08.0.tar.xz"; - sha256 = "0hv7b77608sa5ly26lccd55js6kflkbdh5hak5q2n9ql2g2r9gjh"; - name = "akonadi-notes-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-notes-22.08.1.tar.xz"; + sha256 = "05sx7h1aw4mx93l4krv4574zpjf63vdrhaiwayqz11wrdpvdq7ww"; + name = "akonadi-notes-22.08.1.tar.xz"; }; }; akonadi-search = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadi-search-22.08.0.tar.xz"; - sha256 = "1makxy4xc0xaq9xd2msra8qpazgzmj0cqbw1wnhgjsrin0x3mrgg"; - name = "akonadi-search-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadi-search-22.08.1.tar.xz"; + sha256 = "06apb5lx7bs0lfvsnbf8kyxk7yyjrzb1f1wfckfsjaysf0xmdvfg"; + name = "akonadi-search-22.08.1.tar.xz"; }; }; akonadiconsole = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akonadiconsole-22.08.0.tar.xz"; - sha256 = "00ilplawr9w20qd8x8hyfii8l559jy2kjcc5kk98srmcqls8l63m"; - name = "akonadiconsole-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akonadiconsole-22.08.1.tar.xz"; + sha256 = "06pnp57hgi972s2kkxi5na07zss3rv2lzlknbnd75j2gmfn04zrp"; + name = "akonadiconsole-22.08.1.tar.xz"; }; }; akregator = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/akregator-22.08.0.tar.xz"; - sha256 = "0iisl2djkv26dxki81xy85jdmg4yljxnm9gh73cyy76wmwmky6g6"; - name = "akregator-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/akregator-22.08.1.tar.xz"; + sha256 = "01rgyl2hwjprq4z5yjc99j6jk9vrhjy608ha72j470pw6g47ac5s"; + name = "akregator-22.08.1.tar.xz"; }; }; analitza = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/analitza-22.08.0.tar.xz"; - sha256 = "1n2p4a2v1zxapcmpgg7c1im6kn333x0vz2cz6f0g7nlxn57vxl3a"; - name = "analitza-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/analitza-22.08.1.tar.xz"; + sha256 = "032mbws2cv6kgxcnghcxj8jwm1k8miq9r21vdqx9i00yxvh83qys"; + name = "analitza-22.08.1.tar.xz"; }; }; ark = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ark-22.08.0.tar.xz"; - sha256 = "0iz82w77z1nrxr76ymv3c3kidnlqw6rhbwcxsazfshrjgimpdpfr"; - name = "ark-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ark-22.08.1.tar.xz"; + sha256 = "05qsiplkcz6fn6wdrnyliif8qzdy3kcc4nx8y8mrh6kbpv94q39r"; + name = "ark-22.08.1.tar.xz"; }; }; artikulate = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/artikulate-22.08.0.tar.xz"; - sha256 = "1w7alnqn8hvmniahv06wadikxjs6v80vljz0fbl5zjf8wi9lkmxr"; - name = "artikulate-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/artikulate-22.08.1.tar.xz"; + sha256 = "0xpznzfzqj12izr2pjddb26mmmj7k9mc8kmgvgs71r86ca0yx8i2"; + name = "artikulate-22.08.1.tar.xz"; }; }; audiocd-kio = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/audiocd-kio-22.08.0.tar.xz"; - sha256 = "14qlkdyy853cp0i6gg6pkh7yyqy2xmr6awfqszdg58sgmmqq5avq"; - name = "audiocd-kio-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/audiocd-kio-22.08.1.tar.xz"; + sha256 = "0an98whnn4dzn1n06dch8q4cr31l4lyfzvmb2q08sli8s1bdl59z"; + name = "audiocd-kio-22.08.1.tar.xz"; }; }; baloo-widgets = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/baloo-widgets-22.08.0.tar.xz"; - sha256 = "1yl9jq65mslngpph41pyrk12dliqfglswg2r46nky78bwzyrkxrq"; - name = "baloo-widgets-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/baloo-widgets-22.08.1.tar.xz"; + sha256 = "02p4v8g4syk908mg7f0l5fpqn7ddsxqji1n8jqghsdkkdsvry7mn"; + name = "baloo-widgets-22.08.1.tar.xz"; }; }; blinken = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/blinken-22.08.0.tar.xz"; - sha256 = "12bi5zvd1zzs2xh2205kckp341wgpxnqgp9z31yr7ld2p00i0593"; - name = "blinken-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/blinken-22.08.1.tar.xz"; + sha256 = "1qc9c91y7rp882dpjz94yn8aqhbnf5ax955q99hrkpzmg6mkvpg2"; + name = "blinken-22.08.1.tar.xz"; }; }; bomber = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/bomber-22.08.0.tar.xz"; - sha256 = "1sgg5d3r1cncb8z7zb1wy182yagxaixbkjbpdrf4z9ncd4h6dr2a"; - name = "bomber-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/bomber-22.08.1.tar.xz"; + sha256 = "14zbmwznz1hi51gyd4l767ilgp3ydvrc3b2nvn4029qhihjpaanm"; + name = "bomber-22.08.1.tar.xz"; }; }; bovo = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/bovo-22.08.0.tar.xz"; - sha256 = "0d9lw90w900q6j96w3mwj1b2wlykvjrhy6yj599njryqj6sbcwf7"; - name = "bovo-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/bovo-22.08.1.tar.xz"; + sha256 = "1r1qbrxs9i2lv7gbi6w0672dd9gq44bncdda26b3fn4s4pv2xnzr"; + name = "bovo-22.08.1.tar.xz"; }; }; calendarsupport = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/calendarsupport-22.08.0.tar.xz"; - sha256 = "02z0c4apqxk8dgn39ipj7g1lqc9yqavpaw38g91d7xbpvygasqrx"; - name = "calendarsupport-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/calendarsupport-22.08.1.tar.xz"; + sha256 = "09fs15qckydmbs6idl5k1b6gyhjkygsa1r8frlysn1ahhfmxr33p"; + name = "calendarsupport-22.08.1.tar.xz"; }; }; cantor = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/cantor-22.08.0.tar.xz"; - sha256 = "015myrrr8gk1lhgxh8wkalac4v0180nf48nb7cbsyb4y9c00gw87"; - name = "cantor-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/cantor-22.08.1.tar.xz"; + sha256 = "1c99xqf8jdbcyippd3kag31p0050s875fmc6l2zhr4icmxwbz3v7"; + name = "cantor-22.08.1.tar.xz"; }; }; cervisia = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/cervisia-22.08.0.tar.xz"; - sha256 = "0ck9ra0qldky9hn8gk8j8nfjjrgvpd7h4h23shq6g72pi07k4swj"; - name = "cervisia-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/cervisia-22.08.1.tar.xz"; + sha256 = "1iqpr90n7k6gnv9y0sqp11928b8yjrff6w6f7nql20rh59x8j039"; + name = "cervisia-22.08.1.tar.xz"; }; }; dolphin = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/dolphin-22.08.0.tar.xz"; - sha256 = "10k6y78qp20hnd1gncbxwxkyi6s0wyzv0srral52zn3hif3qyi83"; - name = "dolphin-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/dolphin-22.08.1.tar.xz"; + sha256 = "1scv3jd5qxzspvgvsk0q8d64qn6x23nn5viamlmvl4f44hfyyyq6"; + name = "dolphin-22.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/dolphin-plugins-22.08.0.tar.xz"; - sha256 = "1ls3wdkh060j70lg5fdyi0xqk09awsp42kzvsdpjnxpdibar6965"; - name = "dolphin-plugins-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/dolphin-plugins-22.08.1.tar.xz"; + sha256 = "0xdwyyr812c88n1fk8y1ykgbrsq0drr9r0jl3yjqgkx0rczk8y53"; + name = "dolphin-plugins-22.08.1.tar.xz"; }; }; dragon = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/dragon-22.08.0.tar.xz"; - sha256 = "1w40yjf5zy1libh4ranka3z6gqv12szdi92bm3pislc80vmb565n"; - name = "dragon-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/dragon-22.08.1.tar.xz"; + sha256 = "1x6ryll5q911a5yahnj9almrzisbvrc88cw7izd091p94bg7ishr"; + name = "dragon-22.08.1.tar.xz"; }; }; elisa = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/elisa-22.08.0.tar.xz"; - sha256 = "14x1jmgzwga6j7482n9k6acshdwxk5wagvqc7cj1gqjn1lns2w1y"; - name = "elisa-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/elisa-22.08.1.tar.xz"; + sha256 = "05al0nh88zggg8rabzh31sp5kds61rd0zpaxg2arrza7c6cfz39p"; + name = "elisa-22.08.1.tar.xz"; }; }; eventviews = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/eventviews-22.08.0.tar.xz"; - sha256 = "14hy6mkh9vmmxpcwrmfcp7zalcpznylqina9r844ap82w8xdhqaj"; - name = "eventviews-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/eventviews-22.08.1.tar.xz"; + sha256 = "0bkidva045q85z4ymhj4m9ayfbsckjl4cl7nncl48yk2dmanfg51"; + name = "eventviews-22.08.1.tar.xz"; }; }; falkon = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/falkon-22.08.0.tar.xz"; - sha256 = "1jqvr6b3jakdazr9iykfn4d1dwclm0h0m487i03nxmn1svg2nihd"; - name = "falkon-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/falkon-22.08.1.tar.xz"; + sha256 = "1lgb626jidyxf2a0xm87y144c72hfrdh40c31jfsx4mnf6igjamh"; + name = "falkon-22.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ffmpegthumbs-22.08.0.tar.xz"; - sha256 = "1v98mggg9zjzzzycwwr8k4p9imj2phx534h69vczliwbjw015x43"; - name = "ffmpegthumbs-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ffmpegthumbs-22.08.1.tar.xz"; + sha256 = "032ccgz11yf0fwdmwadbdy10afkmxnk1l0kcf5sbm4szd8klq18d"; + name = "ffmpegthumbs-22.08.1.tar.xz"; }; }; filelight = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/filelight-22.08.0.tar.xz"; - sha256 = "1dq4a2ggppf7b1095i0dmz4mvs2m3b1lxlnbx3c5jksar0810mkh"; - name = "filelight-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/filelight-22.08.1.tar.xz"; + sha256 = "1fqgmpq5dznbn5lalx1j6dyynhylijrcqw3x9hrwxcqwr275h9iw"; + name = "filelight-22.08.1.tar.xz"; }; }; granatier = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/granatier-22.08.0.tar.xz"; - sha256 = "0j7bz44pmamy5knijw02pcpay0f86967gmv762x0wgfbcgkylvz1"; - name = "granatier-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/granatier-22.08.1.tar.xz"; + sha256 = "1gd2bbdnhklqr3vdc51xf9dq80f99rq937kbgijykqh8l9jayi81"; + name = "granatier-22.08.1.tar.xz"; }; }; grantlee-editor = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/grantlee-editor-22.08.0.tar.xz"; - sha256 = "1cdj144rc14nzxsg13srh0xd9wngphffc03a34gd5b5366km0cc5"; - name = "grantlee-editor-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/grantlee-editor-22.08.1.tar.xz"; + sha256 = "1qf5dhqbmgg67y2jwbxhf33d63cv1sv9qilszskv809gd8z8x0vd"; + name = "grantlee-editor-22.08.1.tar.xz"; }; }; grantleetheme = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/grantleetheme-22.08.0.tar.xz"; - sha256 = "19xc0ajdjskrkj255nzhc7k46p92nh2fksh7wl98mrlvk7qg1j1c"; - name = "grantleetheme-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/grantleetheme-22.08.1.tar.xz"; + sha256 = "01ls16x6ngi43lcwffav9qig3afakrs04v4wvyfb8lm7sd65hgf9"; + name = "grantleetheme-22.08.1.tar.xz"; }; }; gwenview = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/gwenview-22.08.0.tar.xz"; - sha256 = "05ppkxw89m3hiz9amiz2z5crpxvagmnl0klshz16yiqr1j51wza4"; - name = "gwenview-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/gwenview-22.08.1.tar.xz"; + sha256 = "171avx587fib1ajp8spcnbi76p4gam346hxan660ix4m0g2r6iav"; + name = "gwenview-22.08.1.tar.xz"; }; }; incidenceeditor = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/incidenceeditor-22.08.0.tar.xz"; - sha256 = "07zq8y0h9cwxp2kgkdhqpqd48n667mn0p0w19zd8x6h11ijwga2n"; - name = "incidenceeditor-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/incidenceeditor-22.08.1.tar.xz"; + sha256 = "1znbpqpxkbn79pzhcg5v77bqr345lcmy2h0a6d90rzdmnlh303ln"; + name = "incidenceeditor-22.08.1.tar.xz"; }; }; itinerary = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/itinerary-22.08.0.tar.xz"; - sha256 = "0jpjlb7jawr4k2g8khjvzi7j0zl29l77qcbc9l83i7gykiqkzmkp"; - name = "itinerary-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/itinerary-22.08.1.tar.xz"; + sha256 = "1w1gl4lz8gwf8cmxhsfyp4afiaq9anc8glrxay407bqp28andp3a"; + name = "itinerary-22.08.1.tar.xz"; }; }; juk = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/juk-22.08.0.tar.xz"; - sha256 = "10h19k6iysyywgm8vb2mjrslmh7j3kdcdhi3d9hk1yiv4dazsvbg"; - name = "juk-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/juk-22.08.1.tar.xz"; + sha256 = "0p9mkw13csxm9vp62kp657a096ncix72bsahzca9k9r4wwjwkzxa"; + name = "juk-22.08.1.tar.xz"; }; }; k3b = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/k3b-22.08.0.tar.xz"; - sha256 = "1cxd872x2jsf6r2hgfz3av22mwbs19cshp803fw515gx46h3d2g5"; - name = "k3b-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/k3b-22.08.1.tar.xz"; + sha256 = "0m4qzxcy8gd6knsiz6kjf77q156j4js2g2w2pjhapjzdwh28kbzi"; + name = "k3b-22.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kaccounts-integration-22.08.0.tar.xz"; - sha256 = "0xhs0334hrxkcq8jk1pr9nrixkdfr9ifqrjw9rad2z3fj7xqapwf"; - name = "kaccounts-integration-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kaccounts-integration-22.08.1.tar.xz"; + sha256 = "1q1d2a1qknfkgm63gji6ijji35d0b1jy1kvf10a7ac4l1z1fvnpl"; + name = "kaccounts-integration-22.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kaccounts-providers-22.08.0.tar.xz"; - sha256 = "1cafslsmk3blvy60ai35lbjgfyhvfmzi25hy6jcxhn0b99022wcx"; - name = "kaccounts-providers-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kaccounts-providers-22.08.1.tar.xz"; + sha256 = "08k627ybavyagf4iqsmzx4rp7aqkwblyvfw90y7ibm4d2mjxxbmd"; + name = "kaccounts-providers-22.08.1.tar.xz"; }; }; kaddressbook = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kaddressbook-22.08.0.tar.xz"; - sha256 = "1s1dhnikh0q668b63s9ry5b8lwhn9f93x34k1w35c2xj9mg888yq"; - name = "kaddressbook-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kaddressbook-22.08.1.tar.xz"; + sha256 = "177zgbpgignvglpvbis1q9d36pi1dvyckv3q2gcgd9425gpm0vmb"; + name = "kaddressbook-22.08.1.tar.xz"; }; }; kajongg = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kajongg-22.08.0.tar.xz"; - sha256 = "0rysk99y98wm07ad3m2q02jp0w3jdjwak3j3fik6rnswvq7pgy3y"; - name = "kajongg-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kajongg-22.08.1.tar.xz"; + sha256 = "0k1028a2mn15197w0f7bnanmx4in6qm7zj27az1w8kp87p725vqi"; + name = "kajongg-22.08.1.tar.xz"; }; }; kalarm = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kalarm-22.08.0.tar.xz"; - sha256 = "0ffj8dpnw11dgrsz6qzq2nzmmwrq580274mqli32impnks0gy9fr"; - name = "kalarm-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kalarm-22.08.1.tar.xz"; + sha256 = "1kbybncccvbvmjnzdl2lrcxy34ayxcx1jwfja64sbii0lrivm25k"; + name = "kalarm-22.08.1.tar.xz"; }; }; kalendar = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kalendar-22.08.0.tar.xz"; - sha256 = "1dqysfh8lqznvrdcc22xc7ig63zjhkdb09bf5v99mfjhskabg14l"; - name = "kalendar-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kalendar-22.08.1.tar.xz"; + sha256 = "0slk9z7p1z5m2kbb8kq05afslxad8w5pjsajxawckcx0mlsd3apj"; + name = "kalendar-22.08.1.tar.xz"; }; }; kalgebra = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kalgebra-22.08.0.tar.xz"; - sha256 = "1g50j09agz0hm6lxxr7jlqqh27wxv6dq0h24pf59h04h8idxarsg"; - name = "kalgebra-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kalgebra-22.08.1.tar.xz"; + sha256 = "02rni6w5x4qrd2xzvbh55fxma307pn8pkx705y00kimk07hlnvzx"; + name = "kalgebra-22.08.1.tar.xz"; }; }; kalzium = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kalzium-22.08.0.tar.xz"; - sha256 = "114y1clhn5dan4jyjwdm5ggns3zr47vbmmpmh1w25xrnkgznr7ig"; - name = "kalzium-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kalzium-22.08.1.tar.xz"; + sha256 = "0albsch6j1jdhq14cw70g6wsj85as74ni2ds373402va03ssl5as"; + name = "kalzium-22.08.1.tar.xz"; }; }; kamera = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kamera-22.08.0.tar.xz"; - sha256 = "18fmrl75aw9yh19jysmcgry5iw6sjrn32m7s6dq7w7vgv7m46hrd"; - name = "kamera-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kamera-22.08.1.tar.xz"; + sha256 = "1dc3wwl63a56az2g8swbfpfk1dnc88g4i4s2dbbnfx78shs2zg8m"; + name = "kamera-22.08.1.tar.xz"; }; }; kamoso = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kamoso-22.08.0.tar.xz"; - sha256 = "1k09kkxs4agqzl0whhdr5fb53x92bkbfykjjzldybxk6yya4ri9x"; - name = "kamoso-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kamoso-22.08.1.tar.xz"; + sha256 = "17cha6rg9v8x4iyshxmd1ahfl7cn6c090si8ga879k8h54wgzp9q"; + name = "kamoso-22.08.1.tar.xz"; }; }; kanagram = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kanagram-22.08.0.tar.xz"; - sha256 = "18qd71lrw57lzfpwvk26wxrrg4vi3rfb2hnqyqzbcjbhkl9b5x6w"; - name = "kanagram-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kanagram-22.08.1.tar.xz"; + sha256 = "1rdqxz0diag4aw54fwawsa2nngkacs5fqqfq7ysvm08g21icl3qp"; + name = "kanagram-22.08.1.tar.xz"; }; }; kapman = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kapman-22.08.0.tar.xz"; - sha256 = "1r347dmc82wr1gnswkhlbdf2x4iny5vm6z35bz688lpa1vfml05p"; - name = "kapman-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kapman-22.08.1.tar.xz"; + sha256 = "0rxw397rgnqnbqd9h1vfpidw80zsmhaa8mlgq3vb89nh638c7y83"; + name = "kapman-22.08.1.tar.xz"; }; }; kapptemplate = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kapptemplate-22.08.0.tar.xz"; - sha256 = "1jkamjy7jvr57j81r90wf0x1aycpx561z25v0rgfl942dgz9rqmn"; - name = "kapptemplate-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kapptemplate-22.08.1.tar.xz"; + sha256 = "1vgxfcyzvrdhv930z2ywn51d954gjadj5z4isbqfs7x7gcdyygq7"; + name = "kapptemplate-22.08.1.tar.xz"; }; }; kate = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kate-22.08.0.tar.xz"; - sha256 = "125pdf42fj1kj5b8mq8w19sfcv557siym9aqhfmri59sw4qv3n9g"; - name = "kate-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kate-22.08.1.tar.xz"; + sha256 = "0bs8qvvfqk86gi4r18jibnvb323942ix6d8mi5rksyn8xy7w0mc3"; + name = "kate-22.08.1.tar.xz"; }; }; katomic = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/katomic-22.08.0.tar.xz"; - sha256 = "0vc0c7kcxccwgxi3w3l87b3dka6scj3iv5rhvzhb3syvv3qwqafw"; - name = "katomic-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/katomic-22.08.1.tar.xz"; + sha256 = "10hrfzfqmi76ck9i0zi4583mg7znb8z8czw70pj8v47g8h13023z"; + name = "katomic-22.08.1.tar.xz"; }; }; kbackup = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kbackup-22.08.0.tar.xz"; - sha256 = "1jqk09lzmv7xqnz4c4vr2mzbh1xxi4ciasvymgzjlgya4jfr3fd6"; - name = "kbackup-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kbackup-22.08.1.tar.xz"; + sha256 = "0c0zdk00j9qssjdb5dg5hwc5mx7h5kvriyszia2xizqjq2m53c3k"; + name = "kbackup-22.08.1.tar.xz"; }; }; kblackbox = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kblackbox-22.08.0.tar.xz"; - sha256 = "07d45jzcgrnx2c85vmgw0kl0fc98barhyiclk99bihbycd9s2698"; - name = "kblackbox-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kblackbox-22.08.1.tar.xz"; + sha256 = "15cd267xy6kibm3lj4m127pimzrrixlccbw4c840vf783mp31yyr"; + name = "kblackbox-22.08.1.tar.xz"; }; }; kblocks = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kblocks-22.08.0.tar.xz"; - sha256 = "1cpam66jrfkyc0jcgf3jvd46c5ffk1frvajngijff9svxrxf0dbm"; - name = "kblocks-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kblocks-22.08.1.tar.xz"; + sha256 = "1dy3fyhjcfib67awjpxcf5444jl2yp4j5da2gq5zydff1ibwn3rd"; + name = "kblocks-22.08.1.tar.xz"; }; }; kbounce = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kbounce-22.08.0.tar.xz"; - sha256 = "0dl29iph9924lwlsybaks042ia7cxxj3x91mi2yn1y09kncss50m"; - name = "kbounce-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kbounce-22.08.1.tar.xz"; + sha256 = "0z4lnkiqdyby25l7ksac9g3s7b7780ikysja45g5x7y28sp64iw5"; + name = "kbounce-22.08.1.tar.xz"; }; }; kbreakout = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kbreakout-22.08.0.tar.xz"; - sha256 = "1n21h981i9h4sa68d1mrv21q22q34vnxjljmj914ydzvkmkdjyyb"; - name = "kbreakout-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kbreakout-22.08.1.tar.xz"; + sha256 = "0xksmxiq9zdqakw8kvkdkdr6kp0jcdbvhqgbkir342pf2vffbdxl"; + name = "kbreakout-22.08.1.tar.xz"; }; }; kbruch = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kbruch-22.08.0.tar.xz"; - sha256 = "18bw6cr9wmb9rpw0faa2mdqvzjzcjmbbpqdgxb3kym2prjzar3d0"; - name = "kbruch-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kbruch-22.08.1.tar.xz"; + sha256 = "0hany9jskr0bbdp10knh17wkk7gvsk892kkkdy3jjvk7dhc2lyr9"; + name = "kbruch-22.08.1.tar.xz"; }; }; kcachegrind = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kcachegrind-22.08.0.tar.xz"; - sha256 = "1mkn5wiz42i3y9ss55r2hirdkpnffswzgs2zgg9z1c5karnhlkb7"; - name = "kcachegrind-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kcachegrind-22.08.1.tar.xz"; + sha256 = "05wcnfqs0fdfhfpagn0pqky0l7014nblv8r9fv1khy4g5mdlm4hs"; + name = "kcachegrind-22.08.1.tar.xz"; }; }; kcalc = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kcalc-22.08.0.tar.xz"; - sha256 = "0jyp6n46z8bx8dq3zavnszg480bx7d9s1y5fzdby5g6h00g4vgnn"; - name = "kcalc-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kcalc-22.08.1.tar.xz"; + sha256 = "01rn6qy40q4b90i5mysrygkqh5fzq885dgcd11l6r8s59ijjcjlk"; + name = "kcalc-22.08.1.tar.xz"; }; }; kcalutils = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kcalutils-22.08.0.tar.xz"; - sha256 = "169ii8vw9wnsrisbjmn4ak9g7r4l9jss6lg574k7vl7jj354dw3q"; - name = "kcalutils-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kcalutils-22.08.1.tar.xz"; + sha256 = "1y25csn37lp14ba18gqmw9ssimy4dqi55irx8c89p4p1lypjwfzq"; + name = "kcalutils-22.08.1.tar.xz"; }; }; kcharselect = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kcharselect-22.08.0.tar.xz"; - sha256 = "10cmd735vanmrx4h593qp2735i380r4dx32f8492ngrzlsbmxw0b"; - name = "kcharselect-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kcharselect-22.08.1.tar.xz"; + sha256 = "1gs9jkq76dkhjgjqpl5dcsx0l2qi6i0pk122y1qmwgyd6f8af35b"; + name = "kcharselect-22.08.1.tar.xz"; }; }; kcolorchooser = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kcolorchooser-22.08.0.tar.xz"; - sha256 = "006xdjrk93xqfr42s1lfkz55ylrn4g5awzfq0xahs3jhbnrd0yl2"; - name = "kcolorchooser-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kcolorchooser-22.08.1.tar.xz"; + sha256 = "0chxldb8m8ciivnhd1p51ag6s0s232xbmb3b5a1gmkb0hy005js7"; + name = "kcolorchooser-22.08.1.tar.xz"; }; }; kcron = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kcron-22.08.0.tar.xz"; - sha256 = "14qa9mlqbaqzakpgmd8qbjspqsicd3yy6a23f9z1k3svdxcnmz9m"; - name = "kcron-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kcron-22.08.1.tar.xz"; + sha256 = "0f3lwa15d81bbr3yxg94yvp0h6x4ncmx0ya0jzkc86x5xbb3wcw9"; + name = "kcron-22.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kde-dev-scripts-22.08.0.tar.xz"; - sha256 = "1xkpc92kyxz2m1gv84h272159960rb2biw7c9yi12sar7mgs2p7r"; - name = "kde-dev-scripts-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kde-dev-scripts-22.08.1.tar.xz"; + sha256 = "1l06yk9rsrk4xhvidwlhywdvw9mji205cayd1fzcdz7ibzfydgs4"; + name = "kde-dev-scripts-22.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kde-dev-utils-22.08.0.tar.xz"; - sha256 = "1y3wvvnb0p0v04dxh860knm58plwwjm34g1wsgkz33vn5wpg83wj"; - name = "kde-dev-utils-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kde-dev-utils-22.08.1.tar.xz"; + sha256 = "07jj08gwbsqjvpzw7pqq6sqs6idg7qn4ainxq3jya3nrqs30bqdk"; + name = "kde-dev-utils-22.08.1.tar.xz"; }; }; kdebugsettings = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdebugsettings-22.08.0.tar.xz"; - sha256 = "03d1gicnbgl9f6kfq9jcqnniw6cb36q6lzf4zqhn73q2yap52i7s"; - name = "kdebugsettings-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdebugsettings-22.08.1.tar.xz"; + sha256 = "0l9q7cmzc93zz2zc5ncq3q7q6jil6ai36n2vh70s2wsi8b0gsms8"; + name = "kdebugsettings-22.08.1.tar.xz"; }; }; kdeconnect-kde = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdeconnect-kde-22.08.0.tar.xz"; - sha256 = "080r8xclkvnayjnr20pllj8s3pkxmrkav2m8720ac160c3x93xf1"; - name = "kdeconnect-kde-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdeconnect-kde-22.08.1.tar.xz"; + sha256 = "1yzx49gcm7x2wdk53iznyjz09y2a6mrrhh68xilbcsafyiw3l3zr"; + name = "kdeconnect-kde-22.08.1.tar.xz"; }; }; kdeedu-data = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdeedu-data-22.08.0.tar.xz"; - sha256 = "00pk7j44vr2smai06as75amz4iicj80zh6qpdl7c3355haq1a6k6"; - name = "kdeedu-data-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdeedu-data-22.08.1.tar.xz"; + sha256 = "1zbssqzkbwry4f9ffl1j92wp4j740vbvb05ksgbg9ys0zx4zk25y"; + name = "kdeedu-data-22.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdegraphics-mobipocket-22.08.0.tar.xz"; - sha256 = "06fpr06pblflld6i7cvl4gk4h1pfqmin2nfpygfffzns3v1h2wp9"; - name = "kdegraphics-mobipocket-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdegraphics-mobipocket-22.08.1.tar.xz"; + sha256 = "1kxvzgmq83hml10pc4j66r59dsar7h92w2i0cs1nhar781mz666n"; + name = "kdegraphics-mobipocket-22.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdegraphics-thumbnailers-22.08.0.tar.xz"; - sha256 = "0x5lsdmyp338nc4mdvyw6b2zcf3in63wgk8jz6dsycj3a5fg5d7h"; - name = "kdegraphics-thumbnailers-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdegraphics-thumbnailers-22.08.1.tar.xz"; + sha256 = "0akl217rw0yzqmfq339ymxkh5rgbc6l2ayhlf7kbyxwsqffqdf0r"; + name = "kdegraphics-thumbnailers-22.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdenetwork-filesharing-22.08.0.tar.xz"; - sha256 = "0xykgmp42cdbanrvnkr490w756gjnh3rv5aa49bjkmhrrk5w33q1"; - name = "kdenetwork-filesharing-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdenetwork-filesharing-22.08.1.tar.xz"; + sha256 = "1245mvljlwxhbd4li6myipa2b43abq6z3lvj6cmxxp9g80qp2r41"; + name = "kdenetwork-filesharing-22.08.1.tar.xz"; }; }; kdenlive = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdenlive-22.08.0.tar.xz"; - sha256 = "0h48mjlasc2xscvqk446gwdi6727sjzdcwqsg4wrhx9pzf4ryqx2"; - name = "kdenlive-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdenlive-22.08.1.tar.xz"; + sha256 = "0h5zc0npx6vwjjz1m38y5r4ic0c8djjmq7iskxlxzjcpk0rgz7na"; + name = "kdenlive-22.08.1.tar.xz"; }; }; kdepim-addons = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdepim-addons-22.08.0.tar.xz"; - sha256 = "1n7f7z7knxal4vq7b6i4hp69vryj4sldkc66ckm0hdxzhq889bdr"; - name = "kdepim-addons-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdepim-addons-22.08.1.tar.xz"; + sha256 = "140kqxr3mw78nbmiaplf968xl5hkcmrsi6si899csh0l83vm4vzk"; + name = "kdepim-addons-22.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdepim-runtime-22.08.0.tar.xz"; - sha256 = "0abcnfa3zm6gsiq2z2l1vif6whmyf3al21vns0jx4gd2m4a2m9qq"; - name = "kdepim-runtime-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdepim-runtime-22.08.1.tar.xz"; + sha256 = "1g6bq27s7nf9rmrbl5kwycl4lzjpp3m088mji3p7qrrv01ywp4mn"; + name = "kdepim-runtime-22.08.1.tar.xz"; }; }; kdesdk-kio = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdesdk-kio-22.08.0.tar.xz"; - sha256 = "0jhg2iran86m3zgvcxn4885cwrxbpbma002dmr7qfh46adii0dmh"; - name = "kdesdk-kio-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdesdk-kio-22.08.1.tar.xz"; + sha256 = "1sgfddkbydgihiz5w3p55508r3l4nmq2drx2vsg54plvznyqkmcv"; + name = "kdesdk-kio-22.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdesdk-thumbnailers-22.08.0.tar.xz"; - sha256 = "0lfbi1clv1sjgw4dlydi2swvgicmbx6bajwlyajimjnz07gxzk0n"; - name = "kdesdk-thumbnailers-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdesdk-thumbnailers-22.08.1.tar.xz"; + sha256 = "1nzxyv9f4l0x2sglr32qb0gry1fijpgrfc8lpjx3l06b0mclnxy3"; + name = "kdesdk-thumbnailers-22.08.1.tar.xz"; }; }; kdev-php = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdev-php-22.08.0.tar.xz"; - sha256 = "1my0z318y4zwkv5kshmv50fjm6w4ff25x7xaqrcnq43qrnm40k43"; - name = "kdev-php-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdev-php-22.08.1.tar.xz"; + sha256 = "1w9abs0rmsy8915y874iaadmqmn5w3027qav4zk9kx239n26dc6x"; + name = "kdev-php-22.08.1.tar.xz"; }; }; kdev-python = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdev-python-22.08.0.tar.xz"; - sha256 = "10dm0alfayzwgbifg9vmd4kig9wa7wvd5msibmrfclv9hjqv1n5m"; - name = "kdev-python-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdev-python-22.08.1.tar.xz"; + sha256 = "15i6q10rvwkv59nx1yncrmigf7sxnblhlbl1l9dghc058ndl9c7b"; + name = "kdev-python-22.08.1.tar.xz"; }; }; kdevelop = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdevelop-22.08.0.tar.xz"; - sha256 = "02pqylysxx4zfzp9zvd1r5snd9gh52fr4a0zwfj54fwxd5lrcnjz"; - name = "kdevelop-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdevelop-22.08.1.tar.xz"; + sha256 = "14a80z4sahxyzssrz605zp7ah5xdjbc22ccv0vwcnhr5lzr76v31"; + name = "kdevelop-22.08.1.tar.xz"; }; }; kdf = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdf-22.08.0.tar.xz"; - sha256 = "05jii5ic9ihhlv6wkjfyapxrg6s49dxh3n3vlpxh3vdpgiqh1klq"; - name = "kdf-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdf-22.08.1.tar.xz"; + sha256 = "0p7iqld2phc74pmhyb8bqqg9clnc7l2rh6hd0i6jcsp266cgg205"; + name = "kdf-22.08.1.tar.xz"; }; }; kdialog = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdialog-22.08.0.tar.xz"; - sha256 = "1jv3s7dv0sz2gw57qpci0panp5alh7pf4qxzgqw9ayhfvvzy5pbm"; - name = "kdialog-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdialog-22.08.1.tar.xz"; + sha256 = "1lqzhfn5g16qr6ada9i0i3kshna1zxp1y20ylwmmsa82bgmyblhx"; + name = "kdialog-22.08.1.tar.xz"; }; }; kdiamond = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kdiamond-22.08.0.tar.xz"; - sha256 = "1nkhjvlbxnvx0b699g9qzx4kgvs2ks47i9bs6915wyjmw68bjzr3"; - name = "kdiamond-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kdiamond-22.08.1.tar.xz"; + sha256 = "1r4w0b41gl96i319vsph5rs5r43kkpbbzhy5k26ps6cgppzl074v"; + name = "kdiamond-22.08.1.tar.xz"; }; }; keditbookmarks = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/keditbookmarks-22.08.0.tar.xz"; - sha256 = "19llhh6kf182dgd81wp6m8d5i5zzz3czgqihb5rq21rg0fv7nhwg"; - name = "keditbookmarks-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/keditbookmarks-22.08.1.tar.xz"; + sha256 = "0dhr17qqq9bkj1cyrxgjjrxg95mnkb4dmlhvdmr33ngm5rhi5jv3"; + name = "keditbookmarks-22.08.1.tar.xz"; }; }; kfind = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kfind-22.08.0.tar.xz"; - sha256 = "1vsvhz2r486ay76m3lrs1yf8140cn5chqd7fb9k8qqj14pj86pbi"; - name = "kfind-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kfind-22.08.1.tar.xz"; + sha256 = "0py6ygnj7qxbwrldf2a3hqc1cqd5yvyfi1l0nji0hwn8lvidnjhc"; + name = "kfind-22.08.1.tar.xz"; }; }; kfloppy = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kfloppy-22.08.0.tar.xz"; - sha256 = "1dcbi8q8irqh0plfmqf3zzc0qwvncsq4nqjl2780zp7mh0dmkxzy"; - name = "kfloppy-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kfloppy-22.08.1.tar.xz"; + sha256 = "1mb64yqrag7bvrdj4gh4vp58yw8362vpa4ga7rbbmiqllks4iy58"; + name = "kfloppy-22.08.1.tar.xz"; }; }; kfourinline = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kfourinline-22.08.0.tar.xz"; - sha256 = "0jqnsml7g8l15b85ylvga0ibf0yccd1l373hhwmi7m927sx2h9rr"; - name = "kfourinline-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kfourinline-22.08.1.tar.xz"; + sha256 = "1ir3bbxfg07apykfryl8dsd5fdv0dnm2v3ni3qmmx1ap514qjq0a"; + name = "kfourinline-22.08.1.tar.xz"; }; }; kgeography = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kgeography-22.08.0.tar.xz"; - sha256 = "0gip8z15kbb5kqm3qrcdxbmb2nla1dfbz3lfbav44nry951rzfaa"; - name = "kgeography-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kgeography-22.08.1.tar.xz"; + sha256 = "1ya4briidmypckncnrvzmh00zy2avybaray72003y08vg6jh1had"; + name = "kgeography-22.08.1.tar.xz"; }; }; kget = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kget-22.08.0.tar.xz"; - sha256 = "0h84skrn7r657hnsb1kf8wk5dfyrfy1hplsq3fhmsvbvcdmk3fxh"; - name = "kget-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kget-22.08.1.tar.xz"; + sha256 = "13pya07hz0i596bk8jp6j3f24jllr9jbnpv3hr5k3nbnm6yyp8h2"; + name = "kget-22.08.1.tar.xz"; }; }; kgoldrunner = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kgoldrunner-22.08.0.tar.xz"; - sha256 = "0xci7l5ng6gn1v2hxi1gi4hkz3raqz8r26mbsnsajv61ylxg3lxw"; - name = "kgoldrunner-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kgoldrunner-22.08.1.tar.xz"; + sha256 = "0hlqw2c25zdiybjzb9snv59l9ckwbm7ishhk1wrnnind0kdm9rxk"; + name = "kgoldrunner-22.08.1.tar.xz"; }; }; kgpg = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kgpg-22.08.0.tar.xz"; - sha256 = "1zv5nzbqnng7xlqm56xgpi8s8k1hv5npanys3fy10dwaywyrd15x"; - name = "kgpg-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kgpg-22.08.1.tar.xz"; + sha256 = "1xs0w6lxwq3hzs8r1cwmygcjilbgwa8zpjxwj6zz1wmbg04gqk36"; + name = "kgpg-22.08.1.tar.xz"; }; }; khangman = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/khangman-22.08.0.tar.xz"; - sha256 = "0lrh5gkqavwwbnsm7nxvzhbiq5l91rq8ald5cj4wkj0m316iyvrd"; - name = "khangman-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/khangman-22.08.1.tar.xz"; + sha256 = "12m15kpr32svmfzvfwvp2k0hcgb8i4i0mv37vc4x2ln4cjmz7p68"; + name = "khangman-22.08.1.tar.xz"; }; }; khelpcenter = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/khelpcenter-22.08.0.tar.xz"; - sha256 = "1f0w7c1cnydqbdyiqviw1kbr7ha4bl590x8fnsdbv8xsaf6ysdqf"; - name = "khelpcenter-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/khelpcenter-22.08.1.tar.xz"; + sha256 = "14di37qndpk4caxcqnjfsvl8rjvjcnbf8mgmsb8bq34l01qzjfv6"; + name = "khelpcenter-22.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kidentitymanagement-22.08.0.tar.xz"; - sha256 = "0yfrn8bvrqc6vlfr31vj0c3lwzhqjxc74035n5b0l28b2j19krh8"; - name = "kidentitymanagement-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kidentitymanagement-22.08.1.tar.xz"; + sha256 = "1h76c8k6lvf4dlh9awd4z71hkikm7x71760gljybd6fkygxpm992"; + name = "kidentitymanagement-22.08.1.tar.xz"; }; }; kig = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kig-22.08.0.tar.xz"; - sha256 = "1armddz92qnhds59rh8jjk87v2lyd2gpiqk2w5hgna5ib53lp6bn"; - name = "kig-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kig-22.08.1.tar.xz"; + sha256 = "1zi0faypg4n3rh6w8cpnkdawcsk23h1cnxgw6nai39x9slv9lnqp"; + name = "kig-22.08.1.tar.xz"; }; }; kigo = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kigo-22.08.0.tar.xz"; - sha256 = "16rq75pbvsrpff112pdyk18f5g33agrw1k7c85drvy7l4i7wsp71"; - name = "kigo-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kigo-22.08.1.tar.xz"; + sha256 = "1061fb5kllh7gsab82p6n8micy9f7wnlkzvbnf1wp1dcydb03qg8"; + name = "kigo-22.08.1.tar.xz"; }; }; killbots = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/killbots-22.08.0.tar.xz"; - sha256 = "169fyrv4372bbjggjaamrxyzmzrxnxsp1vn1myja807c43jbvcrg"; - name = "killbots-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/killbots-22.08.1.tar.xz"; + sha256 = "1mw78a867kip26k92aqmi1yzpbx10bj1iqm63a6pwadyigzir83g"; + name = "killbots-22.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kimagemapeditor-22.08.0.tar.xz"; - sha256 = "18y0d0i7bm02mzqcclpz0lvgb7d4niz357v25wzccdl714m420gn"; - name = "kimagemapeditor-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kimagemapeditor-22.08.1.tar.xz"; + sha256 = "09b8mn1kar5hghkd73vi3qjx4y0kr0dcsbsck52z2g1vlb3md8bc"; + name = "kimagemapeditor-22.08.1.tar.xz"; }; }; kimap = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kimap-22.08.0.tar.xz"; - sha256 = "1vdgk7rm3k89ci86m8f1y1a17d86a9ii2bhca913dxpjw6qjqxmc"; - name = "kimap-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kimap-22.08.1.tar.xz"; + sha256 = "1a3wwzwlp0zsj4brhs22sygfxh65slikapa4iipxjw78mkwhiq8h"; + name = "kimap-22.08.1.tar.xz"; }; }; kio-extras = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kio-extras-22.08.0.tar.xz"; - sha256 = "0gzna2ps2qd2js28c97kjpcbah7zz8n4s4932faggc2nz5z5wnyn"; - name = "kio-extras-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kio-extras-22.08.1.tar.xz"; + sha256 = "0f1hlmngx51ns46n0rdd1zzgl7cd21sm72v8rfw591v6wvhl1qc9"; + name = "kio-extras-22.08.1.tar.xz"; }; }; kio-gdrive = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kio-gdrive-22.08.0.tar.xz"; - sha256 = "0x9pxvljci5qg4xagr54njmgabcxjmpx24qlg6ilmajg1f7jvmvp"; - name = "kio-gdrive-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kio-gdrive-22.08.1.tar.xz"; + sha256 = "19ms3siziyx0yf663p5s4vanqn80lx16l4yph4ymdby6bys3axii"; + name = "kio-gdrive-22.08.1.tar.xz"; }; }; kio-zeroconf = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kio-zeroconf-22.08.0.tar.xz"; - sha256 = "122j340zav5wqha5cphrh1jizzs31s3bvf82w8dk4jrk7ymprcjs"; - name = "kio-zeroconf-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kio-zeroconf-22.08.1.tar.xz"; + sha256 = "19dpnxrlpqx94xn2z8w53nz89hn55favk50igf1vphxlm3c4xzli"; + name = "kio-zeroconf-22.08.1.tar.xz"; }; }; kipi-plugins = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kipi-plugins-22.08.0.tar.xz"; - sha256 = "1rjiy57x18ivhqablgzxcba26gm67x11i7mg5gwzw9rbd5bnj0sn"; - name = "kipi-plugins-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kipi-plugins-22.08.1.tar.xz"; + sha256 = "14v56h5209jmpgwhhg57dnv7jyxi6j0nsvyjdihfw7swk69hp3hf"; + name = "kipi-plugins-22.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kirigami-gallery-22.08.0.tar.xz"; - sha256 = "1j0hh33f7x0zibdpjqp9w9cxic2x7m08y0fscwh8ffwvimzkswhz"; - name = "kirigami-gallery-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kirigami-gallery-22.08.1.tar.xz"; + sha256 = "0nngnnmh6ywj3vndz76954l3abk51jfylrs76206ad7h6v50ly1s"; + name = "kirigami-gallery-22.08.1.tar.xz"; }; }; kiriki = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kiriki-22.08.0.tar.xz"; - sha256 = "0gh9a50pmk4cyhy7h9yf2q56m7hi9fjizqldy0dg51gjs5249am0"; - name = "kiriki-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kiriki-22.08.1.tar.xz"; + sha256 = "0hjvyslw2qxf9sf6350mg2k8813rdq5wklh2q4p7dndq73k6ba97"; + name = "kiriki-22.08.1.tar.xz"; }; }; kiten = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kiten-22.08.0.tar.xz"; - sha256 = "15mq6hm7m6nin45sx84w824nh7lraxw5rx2yhhrjlg2z80ij9sx9"; - name = "kiten-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kiten-22.08.1.tar.xz"; + sha256 = "1f208z37cx202wqpnviipd9vdgj9l3pwc33mxrpx2khv1yh3869q"; + name = "kiten-22.08.1.tar.xz"; }; }; kitinerary = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kitinerary-22.08.0.tar.xz"; - sha256 = "1jrkh4b3azfh24frg4qg6qlgbshh038s41l0r5hknwj85hr5zlrg"; - name = "kitinerary-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kitinerary-22.08.1.tar.xz"; + sha256 = "1knxyn9imj4vfvsqya740l36d8sczj2fh35qfnqh88j5xjbhiys3"; + name = "kitinerary-22.08.1.tar.xz"; }; }; kjumpingcube = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kjumpingcube-22.08.0.tar.xz"; - sha256 = "1pd5ji8wp1yjdad1q0spqg79mfi0syb8vv2syhav8n5mahkjfbyh"; - name = "kjumpingcube-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kjumpingcube-22.08.1.tar.xz"; + sha256 = "1s88s0z4j9d20lnfmf3zsn96hgvydghr9j2yycsbr7gk6s6wzp2l"; + name = "kjumpingcube-22.08.1.tar.xz"; }; }; kldap = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kldap-22.08.0.tar.xz"; - sha256 = "042agvl62hpl7lazw77q58jbfbm4410r50nf2by8s1jn5kg0wkmv"; - name = "kldap-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kldap-22.08.1.tar.xz"; + sha256 = "0hqvf939d2sqb2frizw9pnhgpc8vi627882d30ssymw5p5nm58il"; + name = "kldap-22.08.1.tar.xz"; }; }; kleopatra = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kleopatra-22.08.0.tar.xz"; - sha256 = "1nw8jlnqcha4hmchrqcf9z9na8lkywbq0b2jj5dnyinjaibzd1ig"; - name = "kleopatra-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kleopatra-22.08.1.tar.xz"; + sha256 = "1vay6cdrx1l7qyg0rrc7z7rwv1jjpwksqzadka7rpshfqhf3r9y8"; + name = "kleopatra-22.08.1.tar.xz"; }; }; klettres = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/klettres-22.08.0.tar.xz"; - sha256 = "0wm5fg8l75kwb0cbm3qsdq3f0sdb3401184s6r0cxgiq8hlkrvfp"; - name = "klettres-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/klettres-22.08.1.tar.xz"; + sha256 = "1441smdlbx8vmpf98acclmbpsivbwzzi2fh8kca3ph4szz8jnq0i"; + name = "klettres-22.08.1.tar.xz"; }; }; klickety = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/klickety-22.08.0.tar.xz"; - sha256 = "11d55hfhs5m87j91naj86wzqnikw0v0nbncd3j47r0spywyv52d0"; - name = "klickety-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/klickety-22.08.1.tar.xz"; + sha256 = "1mfwjcaq9bf41mfsfv6ycjf5a99xmx860bw4q3f6d5hay5wjif9f"; + name = "klickety-22.08.1.tar.xz"; }; }; klines = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/klines-22.08.0.tar.xz"; - sha256 = "153ly2pxfb9n0s42c829vqcpddy0xignxmhkrfqiyxixfx11m8p9"; - name = "klines-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/klines-22.08.1.tar.xz"; + sha256 = "1hvmh0ycjb4vf4gamw4yzp5c4rvvxrb078iqq3h90jvczal8zd1j"; + name = "klines-22.08.1.tar.xz"; }; }; kmag = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmag-22.08.0.tar.xz"; - sha256 = "0fl11nm5j9487kc9wlg74mldfpcmxhzdp3qpxxxsbcm6sl1n18dr"; - name = "kmag-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmag-22.08.1.tar.xz"; + sha256 = "09g1r88dbkzwv8imhxx0mfp0b3r7w68yn94iac2gsi461zwp3bzs"; + name = "kmag-22.08.1.tar.xz"; }; }; kmahjongg = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmahjongg-22.08.0.tar.xz"; - sha256 = "0hmq99sv0n3lwizfzr299gp8pz056c5zk5mg1i7im8s5kizp98r0"; - name = "kmahjongg-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmahjongg-22.08.1.tar.xz"; + sha256 = "1qjjxblzspp874smg75d3xx3mkqjjvv61q7fydd7isp2q52kmwi6"; + name = "kmahjongg-22.08.1.tar.xz"; }; }; kmail = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmail-22.08.0.tar.xz"; - sha256 = "1ymv7z95k1v31pvaq678n9l873l3rb2ys8n1mxnng4sf0sqd4pkl"; - name = "kmail-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmail-22.08.1.tar.xz"; + sha256 = "1q7d2jazc6792dhwxb2zx66bghdnn43sw6lvdg44a7d9zgik1qzb"; + name = "kmail-22.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmail-account-wizard-22.08.0.tar.xz"; - sha256 = "03m8glx627kkyxgcpkvh667cxh78l0nw50cqxsrb5x9amhi02fm6"; - name = "kmail-account-wizard-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmail-account-wizard-22.08.1.tar.xz"; + sha256 = "0mmlximx6406gwpg004dms3d8i76x0jxq3wngw0qfi7wl2irmk3b"; + name = "kmail-account-wizard-22.08.1.tar.xz"; }; }; kmailtransport = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmailtransport-22.08.0.tar.xz"; - sha256 = "0zsmhnvm1jpixj9nwl67ijaq62ywgq3v5zw7g6hb99vb1qc6pjr0"; - name = "kmailtransport-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmailtransport-22.08.1.tar.xz"; + sha256 = "0hhd1m1kfagyiwwfmsxhpin5c25dsiwbzg188khppn6fp2dh79dg"; + name = "kmailtransport-22.08.1.tar.xz"; }; }; kmbox = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmbox-22.08.0.tar.xz"; - sha256 = "0lrw415691lfqv8igw6jsbzf4xqcq9xzf56j542q3wv1bxi1p399"; - name = "kmbox-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmbox-22.08.1.tar.xz"; + sha256 = "0n49xqgyx40hml9554zvnycff26qki9fdy32awx9v9l8jbnrmm6p"; + name = "kmbox-22.08.1.tar.xz"; }; }; kmime = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmime-22.08.0.tar.xz"; - sha256 = "1ymcd443sk448wgyvqsw79nqznm72kq0gdl4s0mfwbwg2gd696x6"; - name = "kmime-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmime-22.08.1.tar.xz"; + sha256 = "1vz5gw33ncc5lx8fx2nnp8ayxpdhfjwwx226gwa94vhxxkfcnmh4"; + name = "kmime-22.08.1.tar.xz"; }; }; kmines = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmines-22.08.0.tar.xz"; - sha256 = "190cmbkp00mzdsxnhgpb0pw5p2qcccn8k6lqf3ia81h5vhmbs9j6"; - name = "kmines-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmines-22.08.1.tar.xz"; + sha256 = "019mgqf20ygmi0ibqjh4idw5ff8wmdxg82c4c3djljv6ir15i59i"; + name = "kmines-22.08.1.tar.xz"; }; }; kmix = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmix-22.08.0.tar.xz"; - sha256 = "0rqb647w60r0m1l1c9ag50rh1bl026apf6k8y7vqhvwfssmj9a25"; - name = "kmix-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmix-22.08.1.tar.xz"; + sha256 = "1dmcch538vi0inxs6gv4va31g22255bb9c5rvpf81ivmjcsfczqd"; + name = "kmix-22.08.1.tar.xz"; }; }; kmousetool = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmousetool-22.08.0.tar.xz"; - sha256 = "1icrya0zicj06amb0gr26z2m4sq9vqvkxhpi0j4m7l0xj72k68vf"; - name = "kmousetool-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmousetool-22.08.1.tar.xz"; + sha256 = "12gh8k4zmysw97n9dxn2158xcwn5s4wxmnj9x1kcfqi29p5pgjpn"; + name = "kmousetool-22.08.1.tar.xz"; }; }; kmouth = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmouth-22.08.0.tar.xz"; - sha256 = "0ia4i07gdgc2sa7s550xwj4ba2cw8kl4mfb1s65sy2g39s7c6m1d"; - name = "kmouth-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmouth-22.08.1.tar.xz"; + sha256 = "0m5h0fiqvqjlip8pzxcmda0mzdaga7ymdqb0kwyiwprrn1f6bj0x"; + name = "kmouth-22.08.1.tar.xz"; }; }; kmplot = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kmplot-22.08.0.tar.xz"; - sha256 = "1i7pxxzjykwcqi2fgyfddimvrfpan6wyrwv109va8nhah23h53lp"; - name = "kmplot-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kmplot-22.08.1.tar.xz"; + sha256 = "0aa7h9bf2pwnp1w2gaa7fxcrmqdi8zpmrrzhizdibmy3yvniagbg"; + name = "kmplot-22.08.1.tar.xz"; }; }; knavalbattle = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/knavalbattle-22.08.0.tar.xz"; - sha256 = "1vnjl8zcq5fqd37gvy0l4623r5lzfjbdz90n2byxs41jypq2nvl7"; - name = "knavalbattle-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/knavalbattle-22.08.1.tar.xz"; + sha256 = "0ka1ciydyk8icwypq4kwd57hhgagj7knfrzlf3yjm2f033mwfy8c"; + name = "knavalbattle-22.08.1.tar.xz"; }; }; knetwalk = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/knetwalk-22.08.0.tar.xz"; - sha256 = "1ywrjp1ffagyyqzwliqpansnw11vvaa0w7k7idqb923p2pqd23ah"; - name = "knetwalk-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/knetwalk-22.08.1.tar.xz"; + sha256 = "17l0mrp900r50s4xa6n3i9hcpp3xyk2pqfzgbaj2plbkgkx2mf5h"; + name = "knetwalk-22.08.1.tar.xz"; }; }; knights = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/knights-22.08.0.tar.xz"; - sha256 = "16fz6l9dpsd3w7g3pxam2w2d3xlnz0ldqn4ss526ml7ndn4p3lqw"; - name = "knights-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/knights-22.08.1.tar.xz"; + sha256 = "0ilcswywgwfqp9nfd1na737258y6n882ni3k2259rh3gbv3rdwyi"; + name = "knights-22.08.1.tar.xz"; }; }; knotes = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/knotes-22.08.0.tar.xz"; - sha256 = "12y0r2i62w9233xp2alcgdi39yw63sgrvziv1asrfrw106w5s0n6"; - name = "knotes-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/knotes-22.08.1.tar.xz"; + sha256 = "076rwgkwx67rn6z0mj0sj77h1jngcpbvrwka3ijg2309r9f2wg8h"; + name = "knotes-22.08.1.tar.xz"; }; }; kolf = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kolf-22.08.0.tar.xz"; - sha256 = "00xki17sninfn0mcfz9i6vijbwb31hj8zrisgr4c46vqpv3mplqx"; - name = "kolf-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kolf-22.08.1.tar.xz"; + sha256 = "0mbgddjjakj41pmirsrjxz6845ps3jb5v581hhjrwnca96vix616"; + name = "kolf-22.08.1.tar.xz"; }; }; kollision = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kollision-22.08.0.tar.xz"; - sha256 = "1x6xxdan276v3d6nkdi4b0i3g05a16jy0hfj5631q4v25w4pyw1y"; - name = "kollision-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kollision-22.08.1.tar.xz"; + sha256 = "1f35jqpvma701kxpgg1i5qi8f0jif3df0w7ja8x1j102q1h92xks"; + name = "kollision-22.08.1.tar.xz"; }; }; kolourpaint = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kolourpaint-22.08.0.tar.xz"; - sha256 = "13ja5z17via16gwzxlcm5v1f1iy51lziazkj7jwpj4pm2abbizvv"; - name = "kolourpaint-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kolourpaint-22.08.1.tar.xz"; + sha256 = "02qny9r2h9g9arfwb5s0gcmydmmb0lblv37ngcfg5kjy4ila3j3s"; + name = "kolourpaint-22.08.1.tar.xz"; }; }; kompare = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kompare-22.08.0.tar.xz"; - sha256 = "14sxxjpg3h021vkr5d5qrx7xrn4gfnjrljy9pkm1s31mycks8fn9"; - name = "kompare-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kompare-22.08.1.tar.xz"; + sha256 = "0qrj91vjpajx7qlx6fw05mppxsh3iw2jyvd115qn6l01jx08cw4m"; + name = "kompare-22.08.1.tar.xz"; }; }; konqueror = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/konqueror-22.08.0.tar.xz"; - sha256 = "0vk23w07823dzr7nv8hzj6m1hlsyhzdf434ylml79jdv0h1wy4sa"; - name = "konqueror-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/konqueror-22.08.1.tar.xz"; + sha256 = "0qf113ji4479ymmbj2fgwpikmbsgssz1a4qdyavr2rahrzw4a4yz"; + name = "konqueror-22.08.1.tar.xz"; }; }; konquest = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/konquest-22.08.0.tar.xz"; - sha256 = "1pjsd3cjfgjyirfvjm7l38785qhbrd47j3c7785drf1r8nvim8qa"; - name = "konquest-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/konquest-22.08.1.tar.xz"; + sha256 = "1gxg5h9bvnif8dkrq48a94yzpbf7gq0c3pz3ghz121m0qy6pq2nq"; + name = "konquest-22.08.1.tar.xz"; }; }; konsole = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/konsole-22.08.0.tar.xz"; - sha256 = "1mji6nfq11jb5zmnwavadjxm8awgns13dr1gfakaxzyvczjmrk5v"; - name = "konsole-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/konsole-22.08.1.tar.xz"; + sha256 = "0091vi7ihqgrpvw77biccld450zgxkm00d8anx28pifdg54ra97i"; + name = "konsole-22.08.1.tar.xz"; }; }; kontact = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kontact-22.08.0.tar.xz"; - sha256 = "0k29kln9fgchqf0z3cn11jcwpnfc3k8m346kb1pvl3m62l3graqw"; - name = "kontact-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kontact-22.08.1.tar.xz"; + sha256 = "0g86qkkqsi6scff17dgw5xv0vynfmzf37ahcfchc8wpy5f0h66jv"; + name = "kontact-22.08.1.tar.xz"; }; }; kontactinterface = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kontactinterface-22.08.0.tar.xz"; - sha256 = "1j49s4jpddvvx6qfq07s9ajz858vzihs580kyhpjn1fdjgdcbsl3"; - name = "kontactinterface-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kontactinterface-22.08.1.tar.xz"; + sha256 = "0j7cck262j8z7m7fm55qa5i936x81ljn3cijrk5c5h881152h4fs"; + name = "kontactinterface-22.08.1.tar.xz"; }; }; kontrast = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kontrast-22.08.0.tar.xz"; - sha256 = "076rs9wmk7km9jv7wvg0ryxpbl8kvmj90x1r8c3mirf37ba9vja6"; - name = "kontrast-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kontrast-22.08.1.tar.xz"; + sha256 = "03y3y5p29zx4nmqi7hp3abxq2n2bgwbz2knhn9vhl3im3ghp7lmp"; + name = "kontrast-22.08.1.tar.xz"; }; }; konversation = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/konversation-22.08.0.tar.xz"; - sha256 = "10pddgmvx4npasyhry35n5q81izhfzyayc3f1ajkmcqgw51all0k"; - name = "konversation-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/konversation-22.08.1.tar.xz"; + sha256 = "0aa71wxznd4js9f653f2x72k4cbzpspbq5p0lzx8sk5xf31pl4kv"; + name = "konversation-22.08.1.tar.xz"; }; }; kopeninghours = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kopeninghours-22.08.0.tar.xz"; - sha256 = "1fz2yzdp8i9f1j6faj7gxqv56ika559sr3hh1r2c0rfqcwdwznj8"; - name = "kopeninghours-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kopeninghours-22.08.1.tar.xz"; + sha256 = "03hslgx4zgg7gsnz2xhx4wnchvqfc5n8c6ihgwz3972fkxsjfdvq"; + name = "kopeninghours-22.08.1.tar.xz"; }; }; kopete = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kopete-22.08.0.tar.xz"; - sha256 = "1pw65b7cfmzvcrpya74j64slk4r2am1ry0dp1c749llqmjdjknil"; - name = "kopete-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kopete-22.08.1.tar.xz"; + sha256 = "0r9pqfv0vndaz8x3f9x1ik4xa0mr9scjqnkp6v0jfcnnzmwagvwm"; + name = "kopete-22.08.1.tar.xz"; }; }; korganizer = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/korganizer-22.08.0.tar.xz"; - sha256 = "0zzl4ji265353gihl1z5y7pfprs8gbdy82s7jhfkqbyivlac7hbf"; - name = "korganizer-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/korganizer-22.08.1.tar.xz"; + sha256 = "0pcyij50k96mrm9vkq0pzr7n0nrgy1d51zrcb3hly7fpl4gvkx4x"; + name = "korganizer-22.08.1.tar.xz"; }; }; kosmindoormap = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kosmindoormap-22.08.0.tar.xz"; - sha256 = "15i4hmaw68cmv6s4bbvbn954q8v9bz2hb6ir8nbqxplqpgaawhkf"; - name = "kosmindoormap-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kosmindoormap-22.08.1.tar.xz"; + sha256 = "042axwxa1497snr8f0m6a61gl9ypdkvllnhnlw4h5ffah7yl5n3s"; + name = "kosmindoormap-22.08.1.tar.xz"; }; }; kpat = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kpat-22.08.0.tar.xz"; - sha256 = "1rd98d83xwmqkrr58vp0zn36s9l37ymwkaswzjwy5i9rfdlzi8b6"; - name = "kpat-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kpat-22.08.1.tar.xz"; + sha256 = "1bmwha8smi6ibg4q7rbwrl5vzavgkg657h6wx0h1vr59w10vf90d"; + name = "kpat-22.08.1.tar.xz"; }; }; kpimtextedit = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kpimtextedit-22.08.0.tar.xz"; - sha256 = "0zh93bf7g2afd379c81cwg3n6f0mvj9vzhgf82l4yfnl83m1b393"; - name = "kpimtextedit-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kpimtextedit-22.08.1.tar.xz"; + sha256 = "1dxdlspqssxnvha202bgh9yaszs77cph5qd9wcbd45xj07dqgbw1"; + name = "kpimtextedit-22.08.1.tar.xz"; }; }; kpkpass = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kpkpass-22.08.0.tar.xz"; - sha256 = "112yqpdxvmcrrvbs38fy05685a54wpamgsjpn5c3a5hy35m01a3h"; - name = "kpkpass-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kpkpass-22.08.1.tar.xz"; + sha256 = "09l6c7nsgfnffgkm0yzjhsfkm79fv9izasislrlzdvca5xninrgb"; + name = "kpkpass-22.08.1.tar.xz"; }; }; kpmcore = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kpmcore-22.08.0.tar.xz"; - sha256 = "0vig2wszlmjqqak56zybx7h06mcixsjh90cwgdj3g27nln2b9kas"; - name = "kpmcore-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kpmcore-22.08.1.tar.xz"; + sha256 = "1y28dnmbnkkjar4kl033fkmcnazgczc3pgdac2q1ry2hjzkcbnpa"; + name = "kpmcore-22.08.1.tar.xz"; }; }; kpublictransport = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kpublictransport-22.08.0.tar.xz"; - sha256 = "11khg73lcwfs346laqvia3g6z6zrwa8vn1a5h51k3x5vwpm0cbr4"; - name = "kpublictransport-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kpublictransport-22.08.1.tar.xz"; + sha256 = "0z7zyyiq4815m74s6p841k1c4pxbrss7hnkag8kr5qa3q4264kg9"; + name = "kpublictransport-22.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kqtquickcharts-22.08.0.tar.xz"; - sha256 = "0har9xd0s22nh685zmr9vvjyr3ddwi19hy30jd43x504f8304v5f"; - name = "kqtquickcharts-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kqtquickcharts-22.08.1.tar.xz"; + sha256 = "0x92wgw2ghafwy1bpdl2nfwxr2vqmdjgqljszhhlx3hys500zbr8"; + name = "kqtquickcharts-22.08.1.tar.xz"; }; }; krdc = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/krdc-22.08.0.tar.xz"; - sha256 = "0rsw54gsqr60y67ja5rnhf5cy9scvq8gq85ddv6rw5yz92mzxwwc"; - name = "krdc-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/krdc-22.08.1.tar.xz"; + sha256 = "04mr75qxjnwxxycarmlvhgv05rkqwmb6y8g1c8ssqppafnknf006"; + name = "krdc-22.08.1.tar.xz"; }; }; kreversi = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kreversi-22.08.0.tar.xz"; - sha256 = "1vdq7959v9iccvwd007qh68hrq1qljda9phlzv2s9qhm8x4b29c0"; - name = "kreversi-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kreversi-22.08.1.tar.xz"; + sha256 = "00wp7nhvkpz0vq41kjhnnbb8mxh56sy50fmvigjqcckb269gqlkl"; + name = "kreversi-22.08.1.tar.xz"; }; }; krfb = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/krfb-22.08.0.tar.xz"; - sha256 = "012bjqkf96zq1lnga1xk5vqzl0hj4a3m4kqnvz5jwyx0b4apb8yy"; - name = "krfb-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/krfb-22.08.1.tar.xz"; + sha256 = "17bb7dmp1xzmxk3hm2jf6ag4vz8plhkpxsvij9nhqvib17i5qas5"; + name = "krfb-22.08.1.tar.xz"; }; }; kross-interpreters = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kross-interpreters-22.08.0.tar.xz"; - sha256 = "1f616zzdgi4iqidj85sq468idchhad9f7db8jxx7wly48pwfzmlh"; - name = "kross-interpreters-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kross-interpreters-22.08.1.tar.xz"; + sha256 = "0kkk9k8fxrxy8xh5pxh8zvn23b04vyml5w15x7hwx2g3w2gizn5r"; + name = "kross-interpreters-22.08.1.tar.xz"; }; }; kruler = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kruler-22.08.0.tar.xz"; - sha256 = "0686129fnyjhkg5kj39b9dqwxkg3988hcsvp9ir5mxxschinh2vq"; - name = "kruler-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kruler-22.08.1.tar.xz"; + sha256 = "02fi07ygl9i6r5r9xa8zknh2rd6d7mw4drayz8sw8bpdbg418lwf"; + name = "kruler-22.08.1.tar.xz"; }; }; ksanecore = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksanecore-22.08.0.tar.xz"; - sha256 = "17r0yxji190vyzc1bilm9563igsjrdjm874p7ql13z4nfdzf0jkz"; - name = "ksanecore-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksanecore-22.08.1.tar.xz"; + sha256 = "1rfj36d95g6yynr2f1jvdw50waliajzpj2ralvnn2afq6fk7mjzm"; + name = "ksanecore-22.08.1.tar.xz"; }; }; kshisen = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kshisen-22.08.0.tar.xz"; - sha256 = "19jv90vj1z0rwjiqc0zhqlmypzx7wi5g507rgihvx7c6agfdq7mx"; - name = "kshisen-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kshisen-22.08.1.tar.xz"; + sha256 = "0plhf018x1lzpgalkgbp4cc9ymgrhm1p9bx9ghrxq0nclyl4pg6d"; + name = "kshisen-22.08.1.tar.xz"; }; }; ksirk = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksirk-22.08.0.tar.xz"; - sha256 = "0pdz09w206lrb0v0i2i4glvq9sly20asxcijkz6sp9xj8jvh0zp1"; - name = "ksirk-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksirk-22.08.1.tar.xz"; + sha256 = "1rl1517jinnmbq1khjy2bvv6jd9llhfmaq7n91iq80ccg58hrncb"; + name = "ksirk-22.08.1.tar.xz"; }; }; ksmtp = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksmtp-22.08.0.tar.xz"; - sha256 = "0dsibgmhpbxmn4307yqqw5vbasip66pxp846gr9ixn09r9p2b29z"; - name = "ksmtp-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksmtp-22.08.1.tar.xz"; + sha256 = "13ybnr39pim3r83p56wj98fwj0yk1rspd9g24a8d0qykmnbx57l3"; + name = "ksmtp-22.08.1.tar.xz"; }; }; ksnakeduel = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksnakeduel-22.08.0.tar.xz"; - sha256 = "1as0xrj0drdyh2ys57m2qwsrw63c6ml44013lwhnr2mcc310qpqv"; - name = "ksnakeduel-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksnakeduel-22.08.1.tar.xz"; + sha256 = "07qfrhxnsrv96x97lqbm0pm4wgvc0v3lrlgddaz7srk0b157yqrz"; + name = "ksnakeduel-22.08.1.tar.xz"; }; }; kspaceduel = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kspaceduel-22.08.0.tar.xz"; - sha256 = "1bfskv91szml7wx6d3gzgaa0da5nqrasfgd3si869xx16fjx02wz"; - name = "kspaceduel-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kspaceduel-22.08.1.tar.xz"; + sha256 = "155syd31vmj6rjlhkpscy8fszinx5b5gv0vjlapg9l48cvv1hrwa"; + name = "kspaceduel-22.08.1.tar.xz"; }; }; ksquares = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksquares-22.08.0.tar.xz"; - sha256 = "15hc1lly1v6a60sd7yiqp0jprfz95mhf6hfmn2i5rqfq1cs5fm7s"; - name = "ksquares-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksquares-22.08.1.tar.xz"; + sha256 = "1xp7kc8x2624p67wl13s5sayw7xf0d44jzl6x03wd80lsckji9rm"; + name = "ksquares-22.08.1.tar.xz"; }; }; ksudoku = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksudoku-22.08.0.tar.xz"; - sha256 = "0vkvrvk1bi4rmygfswg1l2lxy7mywrba34nsq6dapraf1ak9nflh"; - name = "ksudoku-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksudoku-22.08.1.tar.xz"; + sha256 = "0afhffdly2233a3gzlslwybsyiww1zgx6gf94j43rl9jskwr2hn4"; + name = "ksudoku-22.08.1.tar.xz"; }; }; ksystemlog = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ksystemlog-22.08.0.tar.xz"; - sha256 = "00qvsjh4awrp0c9kcy0byz4mkfkb7bs2dd5d9izhn8dd8r80i22r"; - name = "ksystemlog-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ksystemlog-22.08.1.tar.xz"; + sha256 = "0k1n5804j4bgh0bd87dcx3rbw328ih0dzzwjqk7c08vf5pwyibcy"; + name = "ksystemlog-22.08.1.tar.xz"; }; }; kteatime = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kteatime-22.08.0.tar.xz"; - sha256 = "0wxh6ywzkm5w43h0h96ydvk168mjb0887qi0yxnflwdqpf8r4abj"; - name = "kteatime-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kteatime-22.08.1.tar.xz"; + sha256 = "0mgvncr9pvmgwkzn9vfi8zcf40bdncn2j781gfnsv2blpz96mahz"; + name = "kteatime-22.08.1.tar.xz"; }; }; ktimer = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktimer-22.08.0.tar.xz"; - sha256 = "1da2h4ayfiql23vsfnc0gx149hlivikfzb9fm6vac694dm3fsi2s"; - name = "ktimer-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktimer-22.08.1.tar.xz"; + sha256 = "0nplfpxws178r7lrvr24pf2gxw387h9s91gmqfbf8zrk4pcqsr22"; + name = "ktimer-22.08.1.tar.xz"; }; }; ktnef = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktnef-22.08.0.tar.xz"; - sha256 = "04smqz0chlx9m66pa6jdbzvp0mb1kdxpl5bcp2njk5dkx7h8dflk"; - name = "ktnef-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktnef-22.08.1.tar.xz"; + sha256 = "05rcs0m4dr4p4wxigcnhjmmp15nlf36ka85v8b8gd8630v61w6y6"; + name = "ktnef-22.08.1.tar.xz"; }; }; ktorrent = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktorrent-22.08.0.tar.xz"; - sha256 = "197cpqj4vwsn1wc2arprf6zpag7g36krnkml0xvhhmb6xpllg0rx"; - name = "ktorrent-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktorrent-22.08.1.tar.xz"; + sha256 = "1din8qkjhq8nx20g1v2ib4zb7yj63qps3y18lbcdxqbdx6hx7pw2"; + name = "ktorrent-22.08.1.tar.xz"; }; }; ktouch = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktouch-22.08.0.tar.xz"; - sha256 = "158p2z5kcxlg3mrw2nc6qx5qbcjc1rr34yhnmc37gay0yvcds2r9"; - name = "ktouch-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktouch-22.08.1.tar.xz"; + sha256 = "023vsrxz19z0jy04fnknp9mwqf06rcizn5vwdbl5lzicj5dkmwws"; + name = "ktouch-22.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-accounts-kcm-22.08.0.tar.xz"; - sha256 = "0il64ys0dfr0kzj5as7vzggcf702h4545icfip5q8ik3dpsa47w7"; - name = "ktp-accounts-kcm-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-accounts-kcm-22.08.1.tar.xz"; + sha256 = "0a6ij11wpz4j9g1sajxm6hrwyyzindkn23ri5qh1q7y2frml3c2l"; + name = "ktp-accounts-kcm-22.08.1.tar.xz"; }; }; ktp-approver = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-approver-22.08.0.tar.xz"; - sha256 = "1y1g6q41yh6kizqmz2ka7n755h8zz44icq4dy9hy19263hnqmhj3"; - name = "ktp-approver-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-approver-22.08.1.tar.xz"; + sha256 = "15m4y01vq3xkw9n1cww19p1ccqjaq4jsyxnkh7xmw7ivwjmqr96h"; + name = "ktp-approver-22.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-auth-handler-22.08.0.tar.xz"; - sha256 = "1iwclkvvgh211jdmxsivi4k1g1ip20kxd34lx33llgbyjsdkqjrd"; - name = "ktp-auth-handler-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-auth-handler-22.08.1.tar.xz"; + sha256 = "1ssrpgx8lb1926l5a52y7gr8k5vndrjn89hmghqzhc5gs7f4blzp"; + name = "ktp-auth-handler-22.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-call-ui-22.08.0.tar.xz"; - sha256 = "057d6hk9ci683hd9gf8lzjvq4mqsh7rslgi6c3cp49pfcpkb1y30"; - name = "ktp-call-ui-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-call-ui-22.08.1.tar.xz"; + sha256 = "1k7jk9fcxl829d09lbri1filr9jk5fii5n53jc7sfmwyzksdi5s8"; + name = "ktp-call-ui-22.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-common-internals-22.08.0.tar.xz"; - sha256 = "1a2ryscpgn45l9wivc4zzwqflvv2q6d1qj7hqndbk9l2wiinvl49"; - name = "ktp-common-internals-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-common-internals-22.08.1.tar.xz"; + sha256 = "15hwf04bhay16zpfznylnvz36bfklq7aydpq1ss66cszgrnc82yk"; + name = "ktp-common-internals-22.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-contact-list-22.08.0.tar.xz"; - sha256 = "0is8b7yh5s0521ribfc9jj3jbax00625kaii67gjp674ss1a4ngc"; - name = "ktp-contact-list-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-contact-list-22.08.1.tar.xz"; + sha256 = "1svbqqzxamv5zr9aal7556sfykvr898x9p1kyh6523dcbj360r3w"; + name = "ktp-contact-list-22.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-contact-runner-22.08.0.tar.xz"; - sha256 = "1fw2z131dpscbr97nr8znbsv3d7rf25g63l4afybpjhxqh6cawp5"; - name = "ktp-contact-runner-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-contact-runner-22.08.1.tar.xz"; + sha256 = "0fb36v47vh6gsk8zcmrk0qfzdxbdvd7pvh4zl6cbw16xrn5h7lsr"; + name = "ktp-contact-runner-22.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-desktop-applets-22.08.0.tar.xz"; - sha256 = "0pqjrx9vzf2bdbj8iav89bppdx6fnczpjg3h9h0cpsazwb9jbp9s"; - name = "ktp-desktop-applets-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-desktop-applets-22.08.1.tar.xz"; + sha256 = "179nb7b72nl6vxlqy2s3s06n0nlnhl0dn9java2kslf0197sy71y"; + name = "ktp-desktop-applets-22.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-filetransfer-handler-22.08.0.tar.xz"; - sha256 = "008pknj0fb9scb6anbfc7yr9xy1g8kb8bpixv0vq6pnli39n9915"; - name = "ktp-filetransfer-handler-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-filetransfer-handler-22.08.1.tar.xz"; + sha256 = "08bs3sarjbrx180vjjr2z0d5r95i2vdmnry65b84nnxykmclaspf"; + name = "ktp-filetransfer-handler-22.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-kded-module-22.08.0.tar.xz"; - sha256 = "0mkwcvs1ps29hhksxz4kwlkxmnrmql2934rf63d6q4s39a32l6ab"; - name = "ktp-kded-module-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-kded-module-22.08.1.tar.xz"; + sha256 = "0yx1nr9lzijbiz47ni3livzazzapp9bxj14jnl9jczlgi4sq94q3"; + name = "ktp-kded-module-22.08.1.tar.xz"; }; }; ktp-send-file = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-send-file-22.08.0.tar.xz"; - sha256 = "1kw53mvihjch29lf7dcdk31h55qh6zl3xdrl1a8v8xkyypi701jn"; - name = "ktp-send-file-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-send-file-22.08.1.tar.xz"; + sha256 = "19wdffn4ylf3sx0cl8sbccnmi78finms52ncjbkfb5akg6hl6sq4"; + name = "ktp-send-file-22.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktp-text-ui-22.08.0.tar.xz"; - sha256 = "01aqp00gcm696bbd4gzgj3nf0zxvjiv95k1gav5n25z64ncxbhld"; - name = "ktp-text-ui-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktp-text-ui-22.08.1.tar.xz"; + sha256 = "1sh5b4vk4lwngka328651mqr19ypip6f0wnqc74ymcf6n62v6wsf"; + name = "ktp-text-ui-22.08.1.tar.xz"; }; }; ktuberling = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/ktuberling-22.08.0.tar.xz"; - sha256 = "07164nd4xd4nzb8blxxcp6706azf0g99h4ypyq4lyjl5iplyw7cz"; - name = "ktuberling-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/ktuberling-22.08.1.tar.xz"; + sha256 = "1rgh0bkm6hm1wg2bsh6y59pbdwvlj8ps32hympazfav8njy3skqf"; + name = "ktuberling-22.08.1.tar.xz"; }; }; kturtle = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kturtle-22.08.0.tar.xz"; - sha256 = "0h9si8dq9wxrl827xp487brxfh8py1h45dijlv4r7mm0skz88hyc"; - name = "kturtle-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kturtle-22.08.1.tar.xz"; + sha256 = "0419wwrmlg2b7zrgkss1wv22q7wlbic0gx84iybzwhn62vfhggq6"; + name = "kturtle-22.08.1.tar.xz"; }; }; kubrick = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kubrick-22.08.0.tar.xz"; - sha256 = "01gp74p65hcrg21084zbk08yihjwszfqp85z1j738djq89mam5fr"; - name = "kubrick-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kubrick-22.08.1.tar.xz"; + sha256 = "14r7jznfgn9q71ldbf1nrdmy8l15lcclcvra7g515b94cxx7kbp9"; + name = "kubrick-22.08.1.tar.xz"; }; }; kwalletmanager = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kwalletmanager-22.08.0.tar.xz"; - sha256 = "175w8blvl70nx7708ggkhyw7v9vp4nc2vgfl2gjd1g5hd0rb1zfn"; - name = "kwalletmanager-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kwalletmanager-22.08.1.tar.xz"; + sha256 = "1d07z1dmkz5h7amixp9d8cwpzgd3zm58gw8d9qax53zk0qh4a3n0"; + name = "kwalletmanager-22.08.1.tar.xz"; }; }; kwave = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kwave-22.08.0.tar.xz"; - sha256 = "0rn6ikbfl6fcxrb49ch8pcxrfj5wq9i17iabshc7r2179srwiwag"; - name = "kwave-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kwave-22.08.1.tar.xz"; + sha256 = "0a0cmpvp1s70c1fhrqhdzqhzdx2bsvgnkjdhyrggmj61iflkb5gh"; + name = "kwave-22.08.1.tar.xz"; }; }; kwordquiz = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/kwordquiz-22.08.0.tar.xz"; - sha256 = "1hb4zvys2pk7jba3r5gyk9az3h6f2l0ggpbdvm5i01krkjmmrr6q"; - name = "kwordquiz-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/kwordquiz-22.08.1.tar.xz"; + sha256 = "0vv60gdy6l5ysaxf7qwacsbjv689g2qa414hfxn54zbrq5lgdah1"; + name = "kwordquiz-22.08.1.tar.xz"; }; }; libgravatar = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libgravatar-22.08.0.tar.xz"; - sha256 = "1q4nmr4iz0jgw9fq3xnz5fw1wvslx538x6ds1k5ddavhwjz8j0zx"; - name = "libgravatar-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libgravatar-22.08.1.tar.xz"; + sha256 = "1yhmxl2gqwrn5flr5qm56aqg6rgmqbgcr3pyb4d0vshdfksjr4rc"; + name = "libgravatar-22.08.1.tar.xz"; }; }; libkcddb = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkcddb-22.08.0.tar.xz"; - sha256 = "0rgw1c9ygpdas7ihwggi94kqdkap37lanw207dcsny896gy9c4wy"; - name = "libkcddb-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkcddb-22.08.1.tar.xz"; + sha256 = "129qm4hz48fq7s573zgnm0zl9z887zc4lx1znqfbbpj53igd1xm0"; + name = "libkcddb-22.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkcompactdisc-22.08.0.tar.xz"; - sha256 = "0f6zij81d4j1hfidpbrllkdv4g3mckv6s3ngnsr3fblypaicp60j"; - name = "libkcompactdisc-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkcompactdisc-22.08.1.tar.xz"; + sha256 = "12lw9dmp7sj3f6zdqw9hlxy7an4vj4lbli888456h8sfxq3ydd4z"; + name = "libkcompactdisc-22.08.1.tar.xz"; }; }; libkdcraw = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkdcraw-22.08.0.tar.xz"; - sha256 = "1kxn0zfayi8yimw7bcq35fkf0rsar5zd8372ralg8396xwxh9b9a"; - name = "libkdcraw-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkdcraw-22.08.1.tar.xz"; + sha256 = "12w48dz0s0k5qn029kzp8qbz06kqn9hpxsq00bj5q99ir1lzf3hf"; + name = "libkdcraw-22.08.1.tar.xz"; }; }; libkdegames = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkdegames-22.08.0.tar.xz"; - sha256 = "107dp3sq020i1mlbf8w6w1y49ixqx7ggf8ryn7j51pmqyqyq61db"; - name = "libkdegames-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkdegames-22.08.1.tar.xz"; + sha256 = "1aihbha073fw2bxmdk4l768716kvrlyjd72x2nfx0vvr0ngc5wx9"; + name = "libkdegames-22.08.1.tar.xz"; }; }; libkdepim = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkdepim-22.08.0.tar.xz"; - sha256 = "0jrb8m6d17i2ccamcxzaj08c0af4ng8z18430116avsldxywz7ck"; - name = "libkdepim-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkdepim-22.08.1.tar.xz"; + sha256 = "07ihnps983x3sp74yq5glsq3h3jw4k80mnc4xxzm6ps2vgswah12"; + name = "libkdepim-22.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkeduvocdocument-22.08.0.tar.xz"; - sha256 = "1ic8agzkz832dgs494f2411r99qbppkikdhkwiji1sjbw0v62gdj"; - name = "libkeduvocdocument-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkeduvocdocument-22.08.1.tar.xz"; + sha256 = "0f99xqhz1rk0m2mw7n2jxbx4iv2a9mlr87q9fj1b607i2sg119bz"; + name = "libkeduvocdocument-22.08.1.tar.xz"; }; }; libkexiv2 = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkexiv2-22.08.0.tar.xz"; - sha256 = "0ak2p7z95fffxlj7py74cy2qjbwqfjmv81mw0ardbps3ndcsfkgr"; - name = "libkexiv2-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkexiv2-22.08.1.tar.xz"; + sha256 = "0iwpy79ppv4bbsqrszp9kmghgjvkl13gdpnafsbikh4wy1ch4cv9"; + name = "libkexiv2-22.08.1.tar.xz"; }; }; libkgapi = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkgapi-22.08.0.tar.xz"; - sha256 = "0fhrw80d1z1vj7vp6f9d9hncglww0s9jik16z5iqbgdmffjnx0zd"; - name = "libkgapi-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkgapi-22.08.1.tar.xz"; + sha256 = "065441mbl67wyp4nz03jdygkn5wmnmkj4fiql4mnq99k2v80y0ka"; + name = "libkgapi-22.08.1.tar.xz"; }; }; libkipi = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkipi-22.08.0.tar.xz"; - sha256 = "0rdahb2cl7wdv2mdaanlnydp15dgi0sxfhmrjymlnmpgw15w2dh0"; - name = "libkipi-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkipi-22.08.1.tar.xz"; + sha256 = "14pywsi08p94hkk48iynlk7g36lch6ljqq80xmi8rpdh8zsmsg86"; + name = "libkipi-22.08.1.tar.xz"; }; }; libkleo = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkleo-22.08.0.tar.xz"; - sha256 = "1f356dhks3ayxrz28sav68hf5d8xrn64ybqpfmw7zsqy0c7hrwxi"; - name = "libkleo-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkleo-22.08.1.tar.xz"; + sha256 = "05ypgrwynm1hr32hj35faj3sxabi46x8slnbs3pxwz2f2z2ry58a"; + name = "libkleo-22.08.1.tar.xz"; }; }; libkmahjongg = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkmahjongg-22.08.0.tar.xz"; - sha256 = "1raxwnh6b20k11hiv3mx87m3q3r24nv95dan2vb7yaynnj2f0qzh"; - name = "libkmahjongg-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkmahjongg-22.08.1.tar.xz"; + sha256 = "0ilviq0lvnqf9fi32r3jqapf4zhciy4fb900005zs32vqpbk6v31"; + name = "libkmahjongg-22.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libkomparediff2-22.08.0.tar.xz"; - sha256 = "1s7d1c19hfdknfkh4nhbg2fspcvavhp4bfx5yki25r89v691r12x"; - name = "libkomparediff2-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libkomparediff2-22.08.1.tar.xz"; + sha256 = "0hjxxhfv0ds05l821avq787sfdy0afr595xx266c20x8fxgm6kv9"; + name = "libkomparediff2-22.08.1.tar.xz"; }; }; libksane = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libksane-22.08.0.tar.xz"; - sha256 = "12v5hfx40x66h7lrxp0z0dgwgl9fi3z04gi9y7jjqkd64r2655ng"; - name = "libksane-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libksane-22.08.1.tar.xz"; + sha256 = "1m9jx3k2k0p7n4s4w1czlxhlxqsrsghk8da40arbkqmpal93j8yn"; + name = "libksane-22.08.1.tar.xz"; }; }; libksieve = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libksieve-22.08.0.tar.xz"; - sha256 = "1nrmcvrgrm5v2dra9vrcichfmiphdw9c3g7xn8f37q4085xah1kv"; - name = "libksieve-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libksieve-22.08.1.tar.xz"; + sha256 = "1ia1gjx8x9ym3dml3y403kif50jhcsrqmhivn3j5yxf8abc3rnk6"; + name = "libksieve-22.08.1.tar.xz"; }; }; libktorrent = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/libktorrent-22.08.0.tar.xz"; - sha256 = "1zkd0bbl33718w11g3xx7043p662srqz5yjzlkmksilr8swxw56y"; - name = "libktorrent-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/libktorrent-22.08.1.tar.xz"; + sha256 = "0gsmvblszsvwp6dpyax36ahd2n5bqbbv49zfnq8x8h5fpaf415db"; + name = "libktorrent-22.08.1.tar.xz"; }; }; lokalize = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/lokalize-22.08.0.tar.xz"; - sha256 = "0sp555i2i0z246hnd9rqcfkz8impadiiaw7f2iqyh64617gn409x"; - name = "lokalize-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/lokalize-22.08.1.tar.xz"; + sha256 = "0gmnis0b1628b5429s8mgd8y9kxdxx466k5xpw2634phrgc0i19c"; + name = "lokalize-22.08.1.tar.xz"; }; }; lskat = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/lskat-22.08.0.tar.xz"; - sha256 = "0mbixqg8z0qccwfggfkgrpm58ic8kj29y91c47k6g464m48flqps"; - name = "lskat-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/lskat-22.08.1.tar.xz"; + sha256 = "08ijscnvm0dywnjahzrpnicjnh5gb1l8cwzac4qh42pj7hds1mzc"; + name = "lskat-22.08.1.tar.xz"; }; }; mailcommon = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/mailcommon-22.08.0.tar.xz"; - sha256 = "1baxhfcmrp5l5x77jq7bd4zc0f6wvc7swxw705cknz6gp0ldjzq9"; - name = "mailcommon-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/mailcommon-22.08.1.tar.xz"; + sha256 = "1lpnfcj2p58lhgcjg6ray5b9ygz7gpb8xh8qkakn4m7cpjhgcj5j"; + name = "mailcommon-22.08.1.tar.xz"; }; }; mailimporter = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/mailimporter-22.08.0.tar.xz"; - sha256 = "0w7z4wy2ak69xm5d21ghfslagir08zsbbhg7760qpkcv5bkcqpz0"; - name = "mailimporter-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/mailimporter-22.08.1.tar.xz"; + sha256 = "1k7gwagcvhj733c48ayxwi1gf37y6w5g6n2b9fknhfs40kqpdri9"; + name = "mailimporter-22.08.1.tar.xz"; }; }; marble = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/marble-22.08.0.tar.xz"; - sha256 = "0vmbzb8496z23hh33bg8v79hvhs06ywpbq3hd2n76kwd0xvqma02"; - name = "marble-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/marble-22.08.1.tar.xz"; + sha256 = "1ry3svfbj2frbbfiix77p8822w48ayf5jkmrz8lagayqqvah7dlh"; + name = "marble-22.08.1.tar.xz"; }; }; markdownpart = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/markdownpart-22.08.0.tar.xz"; - sha256 = "1c4p8cq605sh2ryvpp7yqbi0qfrc8aw6mbpkw2xsi20z89x33irw"; - name = "markdownpart-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/markdownpart-22.08.1.tar.xz"; + sha256 = "0v4lkzd7hmb7gzxscr02pcsd13bsnvyvd5k0l4s3lzyb0ik3ygb3"; + name = "markdownpart-22.08.1.tar.xz"; }; }; mbox-importer = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/mbox-importer-22.08.0.tar.xz"; - sha256 = "16icnri9967mhzf6rc28qkx9kzc3cvjjr3sz9bs3wx9z8a9rxqx2"; - name = "mbox-importer-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/mbox-importer-22.08.1.tar.xz"; + sha256 = "1lcjybmjwkvfsldfrr6fqxc93plch65q3qsz8ccig0j3ar2msi66"; + name = "mbox-importer-22.08.1.tar.xz"; }; }; messagelib = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/messagelib-22.08.0.tar.xz"; - sha256 = "0xyrwqqinrzr7i9c64rnnahlkm88jjf85n7z20bzdvr1cq1y5b0l"; - name = "messagelib-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/messagelib-22.08.1.tar.xz"; + sha256 = "0xq1a064g3h3igrqanfald9n21nnrsg16a4kmn9vn1k03qv1vlp2"; + name = "messagelib-22.08.1.tar.xz"; }; }; minuet = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/minuet-22.08.0.tar.xz"; - sha256 = "1bxwbh6bwwcf5ffjqx7x2jz57jzdj19mj2hc89a0fa31914b4wwa"; - name = "minuet-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/minuet-22.08.1.tar.xz"; + sha256 = "1r4c057d5pqmk5gzd2abpf15471vfx65m57ssjgi2pwbql95frkr"; + name = "minuet-22.08.1.tar.xz"; }; }; okular = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/okular-22.08.0.tar.xz"; - sha256 = "1dszyi6m37b3jdk6pxdahh33dqqyxqgrc603mkll7428z9f3ih3j"; - name = "okular-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/okular-22.08.1.tar.xz"; + sha256 = "0f98kfsb6sirpym27j2wwz4qr4p5vl4pbnckxd3gmgyfpz8mszln"; + name = "okular-22.08.1.tar.xz"; }; }; palapeli = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/palapeli-22.08.0.tar.xz"; - sha256 = "1jcg6s2f26lshqnpnlb41hxhjns811drv2h5sqvmvd463s131mcv"; - name = "palapeli-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/palapeli-22.08.1.tar.xz"; + sha256 = "0gz3wsl0896wn5mfrm2dyvgxqsqkwbs28vgnf2lwndj8gljvkm9z"; + name = "palapeli-22.08.1.tar.xz"; }; }; parley = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/parley-22.08.0.tar.xz"; - sha256 = "05xamssa940gna6gq891q5ckq0i64a925sbvz83y60fxlx7zm355"; - name = "parley-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/parley-22.08.1.tar.xz"; + sha256 = "1ri4vz1a3v0baxdwg4krn5j9wmndjbxp33p7j2d9ksxiawipma99"; + name = "parley-22.08.1.tar.xz"; }; }; partitionmanager = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/partitionmanager-22.08.0.tar.xz"; - sha256 = "1vny4g4rrhmpbkn964n738bk0crl6s3bdb2cw8mgf6hi5wcphl46"; - name = "partitionmanager-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/partitionmanager-22.08.1.tar.xz"; + sha256 = "0ggh3pmvqvi01shzkk4zir7kdh7cgksr41ywqr7mqn4b22v7kj2w"; + name = "partitionmanager-22.08.1.tar.xz"; }; }; picmi = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/picmi-22.08.0.tar.xz"; - sha256 = "088ygxx8w2vahhq7mkl5g79x9w6nwn1d2n6gs9m64qyl37c3xf9a"; - name = "picmi-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/picmi-22.08.1.tar.xz"; + sha256 = "0s7q020l1lb3jmvgrrw9gq9h78bb0n9n5hm2r8087fx75ncbnrjp"; + name = "picmi-22.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/pim-data-exporter-22.08.0.tar.xz"; - sha256 = "1rzn0pq84b1c3dcw6bg4sbzz2ffb15yq5ck13c3xa4n2pidyaasz"; - name = "pim-data-exporter-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/pim-data-exporter-22.08.1.tar.xz"; + sha256 = "0lmmkmlhnc6v910r22dzip5vd53q63zjf6n538jvj6j1qsnm3fa7"; + name = "pim-data-exporter-22.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/pim-sieve-editor-22.08.0.tar.xz"; - sha256 = "03j5miinmm1ffwjdcbw4n5qswr4i9v5hvw6i2b9rwg1b7f1lrha3"; - name = "pim-sieve-editor-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/pim-sieve-editor-22.08.1.tar.xz"; + sha256 = "0hdrp1nvxmmxybrm6m8qhklfp1w4ym4ck939cn47lhffdpr0i9vy"; + name = "pim-sieve-editor-22.08.1.tar.xz"; }; }; pimcommon = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/pimcommon-22.08.0.tar.xz"; - sha256 = "1ykmm91kdwxi7rvkq76lg8bxiynbjmvf52gmlhwqj38d72ap52il"; - name = "pimcommon-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/pimcommon-22.08.1.tar.xz"; + sha256 = "00gxv1028xdp7ag44z9h6cpmlw55f3rk7i6msymga3pdq639c19y"; + name = "pimcommon-22.08.1.tar.xz"; }; }; poxml = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/poxml-22.08.0.tar.xz"; - sha256 = "1wg9x86663zlhivvbzm9j3j3q2qr06avszmbadvi3a6yhs8ijkpf"; - name = "poxml-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/poxml-22.08.1.tar.xz"; + sha256 = "13jp5g5la3kq9i3qybdvwfl4vgqz3hxf64qzmh7kl71ykas7s5vi"; + name = "poxml-22.08.1.tar.xz"; }; }; print-manager = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/print-manager-22.08.0.tar.xz"; - sha256 = "1abwj1ccm70adzx07ykqjlb4f6y55k2rv1j861dl0822187vl799"; - name = "print-manager-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/print-manager-22.08.1.tar.xz"; + sha256 = "0rligj48l3wc6712wmbhy8h6xig34mjh2mpj39lxzvgsmpkqbb4h"; + name = "print-manager-22.08.1.tar.xz"; }; }; rocs = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/rocs-22.08.0.tar.xz"; - sha256 = "06xcil9ddp75c9qzgq50acp0gq3afjw1b5vsx085kd1zyqs1k0xk"; - name = "rocs-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/rocs-22.08.1.tar.xz"; + sha256 = "1646w4a3y2gkl3a71mrxk5v9nw23sy5vdf54y0b476xgyiry5jqx"; + name = "rocs-22.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/signon-kwallet-extension-22.08.0.tar.xz"; - sha256 = "0hhpninlj7pdlvhiys88da0v3l0rjz1aq2gjicqdv2cczv73ggil"; - name = "signon-kwallet-extension-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/signon-kwallet-extension-22.08.1.tar.xz"; + sha256 = "0352qh3ck8rfz9s0iys9235m7z36jsz91hav0g4qzjx7bjq90aqy"; + name = "signon-kwallet-extension-22.08.1.tar.xz"; }; }; skanlite = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/skanlite-22.08.0.tar.xz"; - sha256 = "1cajwgwc3h097vndcg7a4b10g24fzad7gf3c2pd75m31y3031bsf"; - name = "skanlite-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/skanlite-22.08.1.tar.xz"; + sha256 = "10h8ln3avdynjf1zanmrxrwwr72xa08s251jh2qhny2j8mlxqi9s"; + name = "skanlite-22.08.1.tar.xz"; }; }; skanpage = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/skanpage-22.08.0.tar.xz"; - sha256 = "13gjy379x1frwvr8yis4hc30vpyfqb3wyqfv4cgx00g7g4mz7j39"; - name = "skanpage-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/skanpage-22.08.1.tar.xz"; + sha256 = "1b9mfb9bdgdbsnzmisifp4cyrw3n9mbfjcrynd3w355x208bxqnh"; + name = "skanpage-22.08.1.tar.xz"; }; }; spectacle = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/spectacle-22.08.0.tar.xz"; - sha256 = "1dmmvrkkczfnmp24nx0yc3r12mi2xijzks61sdss3bg89m1xa6jd"; - name = "spectacle-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/spectacle-22.08.1.tar.xz"; + sha256 = "1248b8bm5c39xfssdcr4gc9id7hs1bkv7dy5bzqki6k850hvpzkc"; + name = "spectacle-22.08.1.tar.xz"; }; }; step = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/step-22.08.0.tar.xz"; - sha256 = "1hqsv77kb22zw02x13ip3cfa163qn6kigsrs2k0pb03dmwhl5hzy"; - name = "step-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/step-22.08.1.tar.xz"; + sha256 = "0mmgwi1pb8x73jmi8bd9v76z7a8mmvnb61xlpf2z1ixvqwd7m09k"; + name = "step-22.08.1.tar.xz"; }; }; svgpart = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/svgpart-22.08.0.tar.xz"; - sha256 = "10z2mkw05zfhvi44yj5gavv2gd5lxcir4qjiyi5m9cwv918kdysx"; - name = "svgpart-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/svgpart-22.08.1.tar.xz"; + sha256 = "14g2k55sj53xcx8z7n4bjag266yjdqs1wn7nig9iwjrswwiq2yj4"; + name = "svgpart-22.08.1.tar.xz"; }; }; sweeper = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/sweeper-22.08.0.tar.xz"; - sha256 = "07mhkshqhynmrc34gf48rqg0iixpn800i1xhwba0axx3isrkcssf"; - name = "sweeper-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/sweeper-22.08.1.tar.xz"; + sha256 = "0sg8myfw8jn5iqqag3nddy5iab351d39j09nf0dk2pjs8jjs7bbw"; + name = "sweeper-22.08.1.tar.xz"; }; }; umbrello = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/umbrello-22.08.0.tar.xz"; - sha256 = "0cl909q89rqk53773bi43zzgmds17zh2rvkas7ls1yphk91qkgv5"; - name = "umbrello-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/umbrello-22.08.1.tar.xz"; + sha256 = "0qgl7n4g6h7bab9smjn0ay8ss31drsg0dgyv11l5m0r88q0vy9fx"; + name = "umbrello-22.08.1.tar.xz"; }; }; yakuake = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/yakuake-22.08.0.tar.xz"; - sha256 = "1w9g2nn9bc0p01sxpnpmd4vkz7rrywrfc2y9nr61qah9hda2mv6y"; - name = "yakuake-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/yakuake-22.08.1.tar.xz"; + sha256 = "1q9a6zg4mmsyih8pyggfq6ln5mpcl5bh92z6pkx0l80zkj9hnfp3"; + name = "yakuake-22.08.1.tar.xz"; }; }; zanshin = { - version = "22.08.0"; + version = "22.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.0/src/zanshin-22.08.0.tar.xz"; - sha256 = "1irw9qpl3r9zy7a09nqib7pdi2g1rghxwkqg78djdc84qbzhaskq"; - name = "zanshin-22.08.0.tar.xz"; + url = "${mirror}/stable/release-service/22.08.1/src/zanshin-22.08.1.tar.xz"; + sha256 = "1fayh3f7kkwy16c9l07l0giwzzxxfmakj10w5hqmxmgambf3ml0x"; + name = "zanshin-22.08.1.tar.xz"; }; }; } From cbffc686f43e6307a52ffc9a1bb1766954b3ceef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Thu, 8 Sep 2022 12:03:24 -0300 Subject: [PATCH 175/297] Revert "kleopatra: fix broken build" This reverts commit a4fda24f16d374ce70eb97f2186f417b5753221a. --- pkgs/applications/kde/kleopatra.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index 37b10d1085c8..b3444e97532f 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, knotifications, kwindowsystem, kxmlgui, libkleo, kcrash @@ -8,13 +8,6 @@ mkDerivation { pname = "kleopatra"; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/pim/kleopatra/-/commit/87d8b00d4b2286489d5fadc9cfa07f1d721cdfe3.patch"; - sha256 = "sha256-s1tXB7h0KtFwwZHx8rhpI0nLZmwhWAiraHEF3KzncMc="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ From 8376aee278a42421cce79141901a6832fd8dcb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 8 Sep 2022 21:56:44 +0200 Subject: [PATCH 176/297] libvirt: fix cross compile --- pkgs/development/libraries/libvirt/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 28b9ff50251d..6302e4b9e3ec 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -147,14 +147,20 @@ stdenv.mkDerivation rec { sed -i '/virnetdaemontest/d' tests/meson.build ''; + strictDeps = true; + nativeBuildInputs = [ - meson + meson # needs to be first cmake docutils + libxml2 # for xmllint + libxslt # for xsltproc makeWrapper ninja + perl pkg-config + util-linux # for mount ] ++ optional (!isDarwin) rpcsvc-proto # NOTE: needed for rpcgen @@ -171,8 +177,6 @@ stdenv.mkDerivation rec { libpcap libtasn1 libxml2 - libxslt - perl perlPackages.XMLXPath pkg-config python3 From 7c6977b318edd43c2af23b0dbe6c7e7e75b4a614 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 03:41:49 +0000 Subject: [PATCH 177/297] victoriametrics: 1.81.0 -> 1.81.2 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index a6e9213cd748..6b75e72a047c 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.81.0"; + version = "1.81.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-O13dNhj+0SVz/6RNmFIJKSXqd38zdFc1CJ09q3jiKfg="; + sha256 = "sha256-wf/YQX7vrwiNWz1kjWLPSH00rB70HDW3bRuN1DUiP1Y="; }; vendorSha256 = null; From 033ae6bee8b831a3a93133cf3cfd4081871a198d Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Fri, 9 Sep 2022 10:43:52 +0530 Subject: [PATCH 178/297] mpvc: 2017-03-18 -> 1.3 --- pkgs/applications/misc/mpvc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index bfdfeebae271..58f6962f4c3a 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, socat, fetchFromGitHub, makeWrapper }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mpvc"; - version = "unstable-2017-03-18"; + version = "1.3"; src = fetchFromGitHub { - owner = "wildefyr"; + owner = "lwilletts"; repo = "mpvc"; - rev = "aea5c661455248cde7ac9ddba5f63cc790d26512"; - sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml"; + rev = version; + sha256 = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A mpc-like control interface for mpv"; - homepage = "https://github.com/wildefyr/mpvc"; + homepage = "https://github.com/lwilletts/mpvc"; license = licenses.mit; maintainers = [ maintainers.neeasade ]; platforms = platforms.linux; From 288b886396efd7ae461477485cd8b014557adb34 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 2 Sep 2022 09:30:55 +0200 Subject: [PATCH 179/297] jetbrains.rider: fix startup Rider 2022.2 changed the way it invokes Rider.Backend, this adds the required patching so that startup succeeds again. --- pkgs/applications/editors/jetbrains/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3ec39fa071fd..f8f93a1fec8f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, fetchurl -, jdk, cmake, gdb, zlib, python3 +, jdk, cmake, gdb, zlib, python3, icu , lldb , dotnet-sdk_6 , maven @@ -211,6 +211,8 @@ let (mkJetBrainsProduct { inherit pname version src wmClass jdk; product = "Rider"; + # icu is required by Rider.Backend + extraLdPath = [ icu ]; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; inherit description license platforms; @@ -226,9 +228,11 @@ let }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp lib/ReSharperHost/linux-x64/Rider.Backend + rm -rf lib/ReSharperHost/linux-x64/dotnet - mkdir -p lib/ReSharperHost/linux-x64/dotnet/ - ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet + ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet ''); }); From c1ad7b9056598690422dd13e245350dc1702fb74 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Mon, 5 Sep 2022 00:19:39 +0200 Subject: [PATCH 180/297] jetbrains.rider: add raphaelr to maintainers --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/applications/editors/jetbrains/default.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c429c50b9853..e7ae43fc8a6f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10934,6 +10934,13 @@ githubId = 314564; name = "Ryan Lahfa"; }; + raphaelr = { + email = "raphael-git@tapesoftware.net"; + matrix = "@raphi:tapesoftware.net"; + github = "raphaelr"; + githubId = 121178; + name = "Raphael Robatsch"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f8f93a1fec8f..47dabbf0cbb9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -224,7 +224,7 @@ let apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications. ''; - maintainers = [ ]; + maintainers = with maintainers; [ raphaelr ]; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' From 0e753fca65f704fea8a8508f46e672ed17e69d57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 23:54:30 +0000 Subject: [PATCH 181/297] libofx: 0.10.5 -> 0.10.7 --- pkgs/development/libraries/libofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index dacce64c723b..dd14504bf8b6 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.5"; + version = "0.10.7"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-KinJhCscuOCvTkll6sE+404ISqwGX38GnArFKm6hi3U="; + sha256 = "sha256-zbSVmduEH7iO/8N6hEpQQMUYDVG6CaNycGOl5bd6fsw="; }; preConfigure = "./autogen.sh"; From 3a2a763a4265712a972952880933bb2342b0550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Sep 2022 21:19:14 +0200 Subject: [PATCH 182/297] python310Packages.tensorflow-datasets: fix tests --- .../development/python-modules/tensorflow-datasets/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 772e6da92edd..1afd6c55a3fb 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -37,6 +37,7 @@ , termcolor , tifffile , tqdm +, zarr }: buildPythonPackage rec { @@ -99,6 +100,7 @@ buildPythonPackage rec { scipy tensorflow tifffile + zarr ]; disabledTestPaths = [ @@ -123,6 +125,7 @@ buildPythonPackage rec { "tensorflow_datasets/image/lsun_test.py" # Requires `envlogger` which is not packaged in `nixpkgs`. + "tensorflow_datasets/rlds/locomotion/locomotion_test.py" "tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py" # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments` From 8676f60f1f301981bb9a7cd347ea2e592c6f6494 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 10 Sep 2022 22:25:02 +0300 Subject: [PATCH 183/297] nheko: 0.10.0 -> 0.10.1-1 Fixes a build failure https://hydra.nixos.org/build/190031815 --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index d3a7abae8205..f3714b4fee97 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.10.0"; + version = "0.10.1-1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng="; + sha256 = "sha256-Bpf38BAGfvmVyrAptIsQ9HaRUopqvytko6unlWLooUo="; }; nativeBuildInputs = [ From 0ad235a42b197831030fd54195de979aa3a16390 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 15:12:11 +0200 Subject: [PATCH 184/297] python310Packages.flask-wtf: fix failing build --- .../python-modules/flask-wtf/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 014f250128c3..e32877385b8b 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , flask , itsdangerous @@ -18,6 +19,20 @@ buildPythonPackage rec { sha256 = "34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9"; }; + patches = [ + # Fix failing `test_set_default_message_language` test + # + # Caused by Flask 2.2 that throws an error when setup methods are + # mistakenly called before the first request. + # + # Will be fixed upstream with: https://github.com/wtforms/flask-wtf/pull/533 + # + (fetchpatch { + url = "https://github.com/wtforms/flask-wtf/commit/36a53fadf7bc42c79a1428657531961ec30ca003.patch"; + hash = "sha256-bgLwDG9Wpufm6fd/6PS83Jvvuk1Ha6XdyaWngluPs30="; + }) + ]; + propagatedBuildInputs = [ flask itsdangerous @@ -35,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; homepage = "https://github.com/lepture/flask-wtf/"; }; } From 7083952d2b6c3fc112f3738f94ef6f6fa148fd07 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 15:17:07 +0200 Subject: [PATCH 185/297] python310Packages.flask-wtf: add anthonyroussel to maintainers --- pkgs/development/python-modules/flask-wtf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index e32877385b8b..4c2e485c4bf1 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 anthonyroussel ]; homepage = "https://github.com/lepture/flask-wtf/"; }; } From 5ed6dd7666568055c3c1f49f5a8fdca6b2597ca1 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 11 Sep 2022 00:43:19 +0200 Subject: [PATCH 186/297] uefitool: A60 -> A61 Signed-off-by: Felix Singer --- pkgs/tools/system/uefitool/variants.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index 9437f6b40f72..3ea24e55c6e0 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -3,9 +3,9 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; in rec { new-engine = common rec { - version = "A60"; - sha256 = "sha256-E99Mf2T6Bg4NsFXzFn4kNf602DmtiyBk6Vcj6JfOPR0="; - installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; + version = "A61"; + sha256 = "sha256-6RxWAR0KY6o98RwOLRHy6wShTHAaQlvYYbCNLa5FzH4="; + installFiles = [ "build/UEFITool/UEFITool" "build/UEFIFind/UEFIFind" "build/UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { version = "0.28.0"; From 2a5bb722e991d4e1bbfa29b63aef9672ed98d513 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 14:18:55 +0200 Subject: [PATCH 187/297] chit: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2037e8c9a06a..edbba9ad0402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5042,7 +5042,9 @@ with pkgs; checkmake = callPackage ../development/tools/checkmake { }; - chit = callPackage ../development/tools/chit { }; + chit = callPackage ../development/tools/chit { + openssl = openssl_1_1; + }; chkrootkit = callPackage ../tools/security/chkrootkit { }; From e3755a384c902dc9ba44ca4488d7e902f62fa5e6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 14:19:12 +0200 Subject: [PATCH 188/297] tunnelto: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edbba9ad0402..8d33696345a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11800,6 +11800,7 @@ with pkgs; tunnelto = callPackage ../tools/networking/tunnelto { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; tuptime = callPackage ../tools/system/tuptime { }; From 191c4487032452274d46a2feb620fb5762b8b691 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 14:19:39 +0200 Subject: [PATCH 189/297] wkhtmltopdf-bin: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d33696345a6..9ebfc51694f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12471,6 +12471,7 @@ with pkgs; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { libjpeg8 = libjpeg.override { enableJpeg8 = true; }; + openssl = openssl_1_1; }; wml = callPackage ../development/web/wml { }; From b909c461bf3d90472d7d40ada3cb226a66c15a10 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 14:19:48 +0200 Subject: [PATCH 190/297] eidolon: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ebfc51694f6..53708d84559b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33139,7 +33139,9 @@ with pkgs; egoboo = callPackage ../games/egoboo { }; - eidolon = callPackage ../games/eidolon { }; + eidolon = callPackage ../games/eidolon { + openssl = openssl_1_1; + }; EmptyEpsilon = callPackage ../games/empty-epsilon { }; From 823d14f3e53d95e064b7705619e5964a63144241 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 14:20:00 +0200 Subject: [PATCH 191/297] xbps: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53708d84559b..6ab6f802d97f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36551,7 +36551,9 @@ with pkgs; xorex = callPackage ../tools/security/xorex { }; - xbps = callPackage ../tools/package-management/xbps { }; + xbps = callPackage ../tools/package-management/xbps { + openssl = openssl_1_1; + }; xcftools = callPackage ../tools/graphics/xcftools { }; From 7646a6defcd647c43c286d407ccaa62d3f8605bf Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:29:24 +0200 Subject: [PATCH 192/297] coinlive: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ab6f802d97f..f4656c8ba949 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17802,7 +17802,9 @@ with pkgs; CoinMP = callPackage ../development/libraries/CoinMP { }; - coinlive = callPackage ../tools/misc/coinlive { }; + coinlive = callPackage ../tools/misc/coinlive { + openssl = openssl_1_1; + }; cointop = callPackage ../applications/misc/cointop { }; From 5765cef3ae5216f5ea58775d5238c8c38d0362ad Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:31:03 +0200 Subject: [PATCH 193/297] cliscord: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4656c8ba949..940367b990bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14991,6 +14991,7 @@ with pkgs; cliscord = callPackage ../misc/cliscord { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; clisp = callPackage ../development/interpreters/clisp { }; From ab0cb98d4cba994e893e95adf91defb334c83ba7 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:34:08 +0200 Subject: [PATCH 194/297] devserver: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 940367b990bd..5bbde3d88e02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14653,6 +14653,7 @@ with pkgs; devserver = callPackage ../development/tools/rust/devserver { inherit (darwin.apple_sdk.frameworks) CoreServices; + openssl = openssl_1_1; }; devspace = callPackage ../development/tools/misc/devspace { }; From 5a57ba3bddf8714641112d39b64d4d69a845d3ba Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:36:32 +0200 Subject: [PATCH 195/297] finalfrontier: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bbde3d88e02..e27503da53dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27488,6 +27488,7 @@ with pkgs; finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { From c9a1beb23895e85beda47b7920962f8eaa9ac194 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:38:00 +0200 Subject: [PATCH 196/297] git-series: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e27503da53dc..8a469ce4b5ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6852,7 +6852,9 @@ with pkgs; git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { }; - git-series = callPackage ../development/tools/git-series { }; + git-series = callPackage ../development/tools/git-series { + openssl = openssl_1_1; + }; git-sizer = callPackage ../applications/version-management/git-sizer { }; From 12ad25411d9dcbf2556b1e8aafd54de8fb24db98 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:39:14 +0200 Subject: [PATCH 197/297] gmnisrv: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a469ce4b5ce..8b87278c4c95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2576,7 +2576,9 @@ with pkgs; gmni = callPackage ../applications/networking/browsers/gmni { }; - gmnisrv = callPackage ../servers/gemini/gmnisrv { }; + gmnisrv = callPackage ../servers/gemini/gmnisrv { + openssl = openssl_1_1; + }; gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; From a0c0a349d267de3f7aaa39264f994efad0f2149b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:40:53 +0200 Subject: [PATCH 198/297] habitat: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b87278c4c95..371efe6721b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7374,7 +7374,9 @@ with pkgs; haveged = callPackage ../tools/security/haveged { }; - habitat = callPackage ../applications/networking/cluster/habitat { }; + habitat = callPackage ../applications/networking/cluster/habitat { + openssl = openssl_1_1; + }; hashcash = callPackage ../tools/security/hashcash { }; From d4e0a8f1d2a044a65bfdfde5ed2e211927a92572 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:42:12 +0200 Subject: [PATCH 199/297] hash_extender: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 371efe6721b3..1aaae8d82eef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7384,7 +7384,9 @@ with pkgs; hashcat-utils = callPackage ../tools/security/hashcat-utils { }; - hash_extender = callPackage ../tools/security/hash_extender { }; + hash_extender = callPackage ../tools/security/hash_extender { + openssl = openssl_1_1; + }; hash-identifier = callPackage ../tools/security/hash-identifier { }; From 45c8684e2cc4b15978cfee4ced4177faa73e8838 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:44:02 +0200 Subject: [PATCH 200/297] hydra-cli: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aaae8d82eef..49f22ba5699b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18846,7 +18846,9 @@ with pkgs; hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_11; }; - hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; + hydra-cli = callPackage ../development/tools/misc/hydra-cli { + openssl = openssl_1_1; + }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; From 85d62cef64570cf17314673642757bb8153e856e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 23:44:57 +0200 Subject: [PATCH 201/297] imag: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f22ba5699b..3416ddaf74b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28678,6 +28678,7 @@ with pkgs; imag = callPackage ../applications/misc/imag { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; image-roll = callPackage ../applications/graphics/image-roll { }; From 62ee0617103bffa1e64256684a78f889ac7a15de Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:03:06 +0200 Subject: [PATCH 202/297] mdbook-plantuml: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3416ddaf74b5..6d163333bb85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8291,6 +8291,7 @@ with pkgs; mdbook-plantuml = callPackage ../tools/text/mdbook-plantuml { inherit (darwin.apple_sdk.frameworks) CoreServices; + openssl = openssl_1_1; }; mdbook-admonish = callPackage ../tools/text/mdbook-admonish { From 18ee52cae45993d7c5e66d8930e57c49bdcb9d2e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:05:00 +0200 Subject: [PATCH 203/297] paperoni: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d163333bb85..822cf44f4904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9772,6 +9772,7 @@ with pkgs; paperoni = callPackage ../tools/text/paperoni { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; From 60283ad9539d0caaf2d9c913a710239a224bd9fb Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:05:36 +0200 Subject: [PATCH 204/297] netease-music-tui: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 822cf44f4904..ff8ba04edda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25838,7 +25838,9 @@ with pkgs; national-park-typeface = callPackage ../data/fonts/national-park { }; - netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; + netease-music-tui = callPackage ../applications/audio/netease-music-tui { + openssl = openssl_1_1; + }; netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration; From dee738a1d0280043d3132c76c37d57d58c2130df Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:09:44 +0200 Subject: [PATCH 205/297] quill: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff8ba04edda9..48d544966625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21327,6 +21327,7 @@ with pkgs; quill = callPackage ../tools/security/quill { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; From a1ce22e7a9846e50f997c64e844e451499625d9b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:11:46 +0200 Subject: [PATCH 206/297] rucredstash: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48d544966625..d12fc511aaa1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30855,6 +30855,7 @@ with pkgs; rucredstash = callPackage ../tools/security/rucredstash { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; runc = callPackage ../applications/virtualization/runc {}; From ceb1673ca7a187471ae071a6fb1af0b7cd070e72 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:13:25 +0200 Subject: [PATCH 207/297] shticker-book-unwritten: pin to openssl_1_1 --- pkgs/games/shticker-book-unwritten/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix index aa02087a75aa..651481a5a0db 100644 --- a/pkgs/games/shticker-book-unwritten/default.nix +++ b/pkgs/games/shticker-book-unwritten/default.nix @@ -1,7 +1,9 @@ -{ buildFHSUserEnv, callPackage, lib }: +{ buildFHSUserEnv, callPackage, lib, openssl }: let - shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { }; + shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { + inherit openssl; + }; in buildFHSUserEnv { name = "shticker_book_unwritten"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12fc511aaa1..24c28177cb35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33735,7 +33735,9 @@ with pkgs; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; - shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; + shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { + openssl = openssl_1_1; + }; sienna = callPackage ../games/sienna { love = love_0_10; }; From 4c84ab3fa59ac47dfb75bc58a154fa2c12c501a0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:14:30 +0200 Subject: [PATCH 208/297] ndn-cxx: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24c28177cb35..8380d06474b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17702,7 +17702,9 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + ndn-cxx = callPackage ../development/libraries/ndn-cxx { + openssl = openssl_1_1; + }; ndn-tools = callPackage ../tools/networking/ndn-tools { }; From cfca6eb1d995587684e5c47526617f89148c038c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:14:45 +0200 Subject: [PATCH 209/297] ndn-tools: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8380d06474b4..43c8208368e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17706,7 +17706,9 @@ with pkgs; openssl = openssl_1_1; }; - ndn-tools = callPackage ../tools/networking/ndn-tools { }; + ndn-tools = callPackage ../tools/networking/ndn-tools { + openssl = openssl_1_1; + }; nfd = callPackage ../servers/nfd { }; From 72827e4b5dc95f9ef506728d91717b88b337bc4d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:17:21 +0200 Subject: [PATCH 210/297] spotify-tui: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43c8208368e8..9f4d1b8a9bfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30998,6 +30998,7 @@ with pkgs; spotify-tui = callPackage ../applications/audio/spotify-tui { inherit (darwin.apple_sdk.frameworks) AppKit Security; + openssl = openssl_1_1; }; sptlrx = callPackage ../applications/audio/sptlrx { }; From 7fae589af3ad4f1c07131bd1ce559ca803543c03 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:18:42 +0200 Subject: [PATCH 211/297] synapse-bt: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f4d1b8a9bfa..cc719080017f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29981,6 +29981,7 @@ with pkgs; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { inherit (darwin.apple_sdk.frameworks) CoreServices Security; + openssl = openssl_1_1; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; From fdbb3e2b6a162f1070fccb8c9b90fb3779015456 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:19:59 +0200 Subject: [PATCH 212/297] taizen: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc719080017f..11a3029810d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31308,6 +31308,7 @@ with pkgs; taizen = callPackage ../applications/misc/taizen { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; talosctl = callPackage ../applications/networking/cluster/talosctl { }; From 7a1078c5c0a5c53d31fdf79336cd8d0e26fe0c5e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:20:38 +0200 Subject: [PATCH 213/297] tensorman: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11a3029810d1..4c420cf02407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30989,7 +30989,9 @@ with pkgs; spike = callPackage ../applications/virtualization/spike { }; - tensorman = callPackage ../tools/misc/tensorman { }; + tensorman = callPackage ../tools/misc/tensorman { + openssl = openssl_1_1; + }; spideroak = callPackage ../applications/networking/spideroak { }; From 5b3be0c3bfeb6d5dd0352b171bebda2d859303d3 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:22:40 +0200 Subject: [PATCH 214/297] tremor-rs: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c420cf02407..2b81151376c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12245,6 +12245,7 @@ with pkgs; tremor-rs = callPackage ../tools/misc/tremor-rs { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; truecrack = callPackage ../tools/security/truecrack { }; From 954f49b653af6289c72675344df4771d6ae395eb Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 00:52:00 +0200 Subject: [PATCH 215/297] sslsplit: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b81151376c8..6df66eb725b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11226,7 +11226,9 @@ with pkgs; ssldump = callPackage ../tools/networking/ssldump { }; - sslsplit = callPackage ../tools/networking/sslsplit { }; + sslsplit = callPackage ../tools/networking/sslsplit { + openssl = openssl_1_1; + }; sstp = callPackage ../tools/networking/sstp {}; From 76c7f5739dad79888d96512b513c0b4eb6df90e8 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 01:28:35 +0200 Subject: [PATCH 216/297] nfd: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6df66eb725b5..034917ee2e77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17713,7 +17713,9 @@ with pkgs; openssl = openssl_1_1; }; - nfd = callPackage ../servers/nfd { }; + nfd = callPackage ../servers/nfd { + openssl = openssl_1_1; + }; cddlib = callPackage ../development/libraries/cddlib {}; From cc43c149ce4ae6f21805dde414626eec3f093296 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 01:44:15 +0200 Subject: [PATCH 217/297] mrustc-bootstrap: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 034917ee2e77..93ee0f00d8d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14480,7 +14480,10 @@ with pkgs; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; - mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; }; + mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { + stdenv = gcc10StdenvCompat; + openssl = openssl_1_1; + }; rustPackages_1_63 = rust_1_63.packages.stable; rustPackages = rustPackages_1_63; From 3d248461ec3458e68e70026592bc4e2e9dabade6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 01:56:09 +0200 Subject: [PATCH 218/297] hadoop: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93ee0f00d8d7..03a3e1935909 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15090,7 +15090,9 @@ with pkgs; groovy = callPackage ../development/interpreters/groovy { }; - inherit (callPackages ../applications/networking/cluster/hadoop { }) + inherit (callPackages ../applications/networking/cluster/hadoop { + openssl = openssl_1_1; + }) hadoop_3_3 hadoop_3_2 hadoop2; From 5311245e0d1f444a2fbb8e66f05762196a49325a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:00:12 +0200 Subject: [PATCH 219/297] archiveopteryx: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03a3e1935909..05c00cf4e3ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22679,7 +22679,9 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - archiveopteryx = callPackage ../servers/mail/archiveopteryx { }; + archiveopteryx = callPackage ../servers/mail/archiveopteryx { + openssl = openssl_1_1; + }; asouldocs = callPackage ../servers/asouldocs { }; From 3bd60b6f2a27f74d81b7a1ca617801218755dd01 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:01:18 +0200 Subject: [PATCH 220/297] bip: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05c00cf4e3ed..c57f729afdfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28823,7 +28823,9 @@ with pkgs; istioctl = callPackage ../applications/networking/cluster/istioctl { }; - bip = callPackage ../applications/networking/irc/bip { }; + bip = callPackage ../applications/networking/irc/bip { + openssl = openssl_1_1; + }; j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { }; From 69b6d651fbab83eb1674bd79506bbbf020501e3e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:01:49 +0200 Subject: [PATCH 221/297] break-time: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c57f729afdfe..d7091303b543 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26782,7 +26782,9 @@ with pkgs; brave = callPackage ../applications/networking/browsers/brave { }; - break-time = callPackage ../applications/misc/break-time { }; + break-time = callPackage ../applications/misc/break-time { + openssl = openssl_1_1; + }; breezy = with python3Packages; toPythonApplication breezy; From b2a6d7d7d4ef0595c4b58146139b54a64e017640 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:02:59 +0200 Subject: [PATCH 222/297] cargo-bisect-rustc: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7091303b543..d08e3fd758a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14516,6 +14516,7 @@ with pkgs; }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { From e41500b6e66b2797c93cef2098552096e73b7587 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:03:35 +0200 Subject: [PATCH 223/297] cargo-dephell: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d08e3fd758a5..891fd3b7865e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14574,6 +14574,7 @@ with pkgs; cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { }; cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { From faa8136e81f5d485d2e5cd2bbca8836467ae1d40 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:05:07 +0200 Subject: [PATCH 224/297] cargo-raze: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 891fd3b7865e..e3b54324f9de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14615,6 +14615,7 @@ with pkgs; cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { From 3aa4e0127a49e17be590b3c53c7cd33a5d4391ca Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:09:05 +0200 Subject: [PATCH 225/297] cfdyndns: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b54324f9de..0072a21a5d5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3277,7 +3277,9 @@ with pkgs; { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; - cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; + cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { + openssl = openssl_1_1; + }; charliecloud = callPackage ../applications/virtualization/charliecloud { }; From 0d75cebac7cfb847e10e10e43333eb17a3d45544 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:15:27 +0200 Subject: [PATCH 226/297] espanso: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0072a21a5d5d..c0bfba7bb3b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3811,6 +3811,7 @@ with pkgs; espanso = callPackage ../applications/office/espanso { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; + openssl = openssl_1_1; }; esphome = callPackage ../tools/misc/esphome { }; From 23022b2779ca1d06955069d00ddc349e0d7ca263 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:15:38 +0200 Subject: [PATCH 227/297] journaldriver: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0bfba7bb3b8..4fd9d94c1af8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7880,7 +7880,9 @@ with pkgs; joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; - journaldriver = callPackage ../tools/misc/journaldriver { }; + journaldriver = callPackage ../tools/misc/journaldriver { + openssl = openssl_1_1; + }; jp = callPackage ../development/tools/jp { }; From 7033bc7e3bd2726dd5994e831ba0716591bdafb6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:16:38 +0200 Subject: [PATCH 228/297] kore: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd9d94c1af8..4660d6c6459a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8044,7 +8044,9 @@ with pkgs; knockpy = callPackage ../tools/security/knockpy { }; - kore = callPackage ../development/web/kore { }; + kore = callPackage ../development/web/kore { + openssl = openssl_1_1; + }; krakenx = callPackage ../tools/system/krakenx { }; From 6449e23dbc5ab40101e2cc984becf9c9f9eeec96 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:21:13 +0200 Subject: [PATCH 229/297] movine: pin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4660d6c6459a..cff85437743e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20672,6 +20672,7 @@ with pkgs; movine = callPackage ../development/tools/database/movine { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; movit = callPackage ../development/libraries/movit { }; From 782138c792b2e9c6e5f80ddc7c0b9baa316d492e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 02:25:43 +0200 Subject: [PATCH 230/297] perl534Packages.ZonemasterLDNS: pin to openssl_1_1 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index efb6c91d7f28..6a5806736e91 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27801,12 +27801,12 @@ let url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-2.2.2.tar.gz"; hash = "sha256-4KccPjWqdhkJvjI9QQGCPX/B8vRUGw91eUUgxhHk788="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include -I${pkgs.libidn2}.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; - makeMakerFlags = "--prefix-openssl=${pkgs.openssl.dev}"; + makeMakerFlags = "--prefix-openssl=${pkgs.openssl_1_1.dev}"; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl pkgs.pkg-config ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 pkgs.pkg-config ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; From 7a6a8b41fc4eeb26eaf77936470b908230c19965 Mon Sep 17 00:00:00 2001 From: Benedikt Tissot Date: Sun, 11 Sep 2022 11:01:15 +0200 Subject: [PATCH 231/297] git-credential-gopass: 1.14.3 -> 1.14.6 --- pkgs/tools/security/gopass/git-credential.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 9877131d0a34..b8e58ba31b58 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.14.3"; + version = "1.14.6"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ggdQL8BU56zE5figmbfHKlZ7WGZ7z5nKunXTy3kn170="; + sha256 = "sha256-sguhKK3YBVitv4/tFLZtto2ZgUXWDdCKMksKC3zVgrY="; }; - vendorSha256 = "sha256-fwqkiPzrfo83NweuGONRx8+MOE4wQxg2Xk4/1kZwnCM="; + vendorSha256 = "sha256-OADJVtnggv3y5tjyiJxhKQsWs0svLN63M1wCOqBEKpU="; subPackages = [ "." ]; From cfbf9bd15c15338bfd4406feb50337590aaa430b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 11 Sep 2022 13:07:51 +0200 Subject: [PATCH 232/297] nixos/nspawn: Fix configuration name PrivateUsersOwnership Fix #189046 --- nixos/modules/system/boot/systemd/nspawn.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd/nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix index 0d06fb3c0322..d9e42ad5b26b 100644 --- a/nixos/modules/system/boot/systemd/nspawn.nix +++ b/nixos/modules/system/boot/systemd/nspawn.nix @@ -27,12 +27,12 @@ let (assertOnlyFields [ "ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystem" "Overlay" "OverlayReadOnly" "PrivateUsersChown" "BindUser" - "Inaccessible" "PrivateUserOwnership" + "Inaccessible" "PrivateUsersOwnership" ]) (assertValueOneOf "ReadOnly" boolValues) (assertValueOneOf "Volatile" (boolValues ++ [ "state" ])) (assertValueOneOf "PrivateUsersChown" boolValues) - (assertValueOneOf "PrivateUserOwnership" [ "off" "chown" "map" "auto" ]) + (assertValueOneOf "PrivateUsersOwnership" [ "off" "chown" "map" "auto" ]) ]; checkNetwork = checkUnitConfig "Network" [ From 03870e938a90ce9df600f2442fc576f51227bda6 Mon Sep 17 00:00:00 2001 From: "\"Viacheslav Lotsmanov\"" <"lotsmanov89@gmail.com"> Date: Sun, 11 Sep 2022 17:23:34 +0300 Subject: [PATCH 233/297] vimPlugins.haskell-with-unicode-vim: init at 2022-09-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19fd08a4d59f..9ed7903e2826 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3392,6 +3392,18 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; + haskell-with-unicode-vim = buildVimPluginFrom2Nix { + pname = "haskell-with-unicode.vim"; + version = "2022-09-11"; + src = fetchFromGitHub { + owner = "wenzel-hoffman"; + repo = "haskell-with-unicode.vim"; + rev = "28899d6795efe2feaca6b53c20ec5ef3b5a1b761"; + sha256 = "11a3a981x4av2lvknq1xbxbr8ybgazxfikr45qdm1mby6533kx69"; + }; + meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/"; + }; + hasksyn = buildVimPluginFrom2Nix { pname = "hasksyn"; version = "2014-09-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c900a9865dca..4708e3c2c9bd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -284,6 +284,7 @@ https://github.com/junegunn/gv.vim/,, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,, https://github.com/neovimhaskell/haskell-vim/,, +https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, https://github.com/Yggdroot/hiPairs/,, https://github.com/mpickering/hlint-refactor-vim/,, From d9038bd6e65fa5d919745917990b0d64590ff025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 11 Sep 2022 17:14:11 +0200 Subject: [PATCH 234/297] zq: remove noop overwrite --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1090104cccfd..71700e52556c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1426,7 +1426,7 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - zq = callPackage ../development/tools/zq { buildGoModule = buildGo118Module; }; + zq = callPackage ../development/tools/zq { }; ### APPLICATIONS/EMULATORS From ae852f5692b37c0e4bb409341b7cfc1bd640f2ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 16:01:05 +0000 Subject: [PATCH 235/297] datree: 1.6.13 -> 1.6.19 --- pkgs/development/tools/datree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 921872e41288..9aaa787b3c2a 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "1.6.13"; + version = "1.6.19"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-8Qv/b/UrNqVI+DZc9H2rjx4JmW66BqAhgxyqCZXMnsI="; + hash = "sha256-cR01/IzbrD2ergJUH3XSKTGLcDuzXuOoKEvnwD2K6hs="; }; - vendorSha256 = "sha256-FvLNG7zz/tPW8SdUvfD1e4/a7nBHFOvhpyn2cXZE9AA="; + vendorSha256 = "sha256-mEtnZO4AZEcnEHuiAWguT8VelD0yLj1rytl6gPkPKBg="; ldflags = [ "-extldflags '-static'" From 649cd671b515366d04fe025a5c930b79811703f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 16:26:58 +0000 Subject: [PATCH 236/297] eksctl: 0.110.0 -> 0.111.0 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 144524df6949..f4d45b003186 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.110.0"; + version = "0.111.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-QcSSdMWQNgsxzK9JJxGgIUkx54sLYXaF2HEAJZGWnjI="; + sha256 = "sha256-I/EYq83snTphHlOk6SgZSYpRS3RNpD2JX1fkwqEG9j0="; }; vendorSha256 = "sha256-Dka0UbTxR2UsMkClq8t0//m+Ky7NEw3g9XP6PtTWOe4="; From a27f6b1b0423fbfb37779087b4201f0d7df65ab2 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sun, 11 Sep 2022 19:03:50 +0200 Subject: [PATCH 237/297] gh-dash: 3.2.0 -> 3.3.0 --- pkgs/tools/misc/gh-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 2dcf9dfea461..23fde30648da 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - sha256 = "sha256-y7PJ8BDTiip6cjKQ3CVIcf3LwlGsEj3DHn3EOtCGa4A="; + sha256 = "sha256-fgafubFMYkWEqYVC9aHhheJQO8DnHB9onS1NJ63g74Y="; }; - vendorSha256 = "sha256-Hk/sBUI2XYB+ZHfuGUR3muEzUtVsGR28EkRD1jKg0Ss="; + vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8="; ldflags = [ "-s" "-w" ]; From 8926897c2bde06bf76feaacbb9f9e77af581b865 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sun, 11 Sep 2022 19:26:51 +0200 Subject: [PATCH 238/297] mopidy-iris: 3.60.0 -> 3.64.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 5b2cbe031c67..c22508e437ea 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.60.0"; + version = "3.64.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "18w6qqmxzn8psiacybryxailm826f3j1wgiv0c03fbdsy6kr5f7l"; + sha256 = "062x73glhn1x4wgc7zmb9y3cq15d5grgqf5drdpbp6p3cgk4s2vc"; }; propagatedBuildInputs = [ From eefbc3dad4bcde46b9c6d3804a6c963a03eb29f1 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sun, 11 Sep 2022 19:46:45 +0200 Subject: [PATCH 239/297] mopidy-ytmusic: 0.3.5 -> 0.3.7 --- pkgs/applications/audio/mopidy/ytmusic.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index 9f393a0e7520..dd2692fb9d78 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -2,19 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.5"; + version = "0.3.7"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YTMusic"; - sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv"; + sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0' - ''; - propagatedBuildInputs = [ mopidy python3Packages.ytmusicapi From dca7412a8b050ecf5b7a0fa7efe299c57ae6418a Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 11 Sep 2022 20:11:35 +0200 Subject: [PATCH 240/297] borgmatic: Add bash completion (no other supported shell) --- pkgs/tools/backup/borgmatic/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 136be31d8b81..fbafa92c7196 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,4 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd }: +{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec { "test_borgmatic_version_matches_news_version" ]; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = with python3Packages; [ borgbackup colorama @@ -27,6 +29,9 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' + installShellCompletion --cmd borgmatic \ + --bash <($out/bin/borgmatic --bash-completion) + mkdir -p $out/lib/systemd/system cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ substitute sample/systemd/borgmatic.service \ From 31d2aff2430b978a888c47ea2630e6914078963f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 11 Sep 2022 20:16:48 +0200 Subject: [PATCH 241/297] borgmatic: Add passthru.tests.version --- pkgs/tools/backup/borgmatic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index fbafa92c7196..bd41dd4854cb 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,4 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles }: +{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles, borgmatic, testers }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -41,6 +41,8 @@ python3Packages.buildPythonApplication rec { --replace sleep ${coreutils}/bin/sleep ''; + passthru.tests.version = testers.testVersion { package = borgmatic; }; + meta = with lib; { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; From 1f5aa244353e6e2d4bc23c48c5f7d054fa332e0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 19:04:22 +0000 Subject: [PATCH 242/297] jql: 5.0.1 -> 5.0.2 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index e19bd18b68c1..b91777a8e56c 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UfVhkwb89OU7yENcCXM7JfYNsO//des0gsEnvnJGMjA="; + sha256 = "sha256-bCq8EUczhBx/txafdJvTKqbJoZaGZlrdl87TQt8iMDM="; }; - cargoSha256 = "sha256-kkWslFEdjsWGIrRWylGyTDZnNXcfCVrWT+dVnyvTRqk="; + cargoSha256 = "sha256-V+fzGg0MOCG8ikuiFtN3k6825QXRfBRpUKfdTjQVChM="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 7135794653b3093b5c90c3926acc693a0613e585 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 11 Sep 2022 21:09:58 +0200 Subject: [PATCH 243/297] got: 0.74 -> 0.75 --- .../version-management/got/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 75473ddb113e..14827119f237 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,19 +1,28 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libossp_uuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl +, pkg-config, openssl, libbsd, libevent, libuuid, libossp_uuid, libmd, zlib, ncurses, bison +}: stdenv.mkDerivation rec { pname = "got"; - version = "0.74"; + version = "0.75"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-XElSCdFh24rf2gosjS0BG+VNqLZNLYeYkUy4t5RIdv4="; + sha256 = "sha256-s1MkiTya771r9JYCpsm7nW4gZwr/PJc0/v6tAgW7nLI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config bison ]; - buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ] + buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; + preConfigure = lib.optionals stdenv.isDarwin '' + # The configure script assumes dependencies on Darwin are install via + # Homebrew or MacPorts and hardcodes assumptions about the paths of + # dependencies which fails the nixpkgs configurePhase. + substituteInPlace configure --replace 'xdarwin' 'xhomebrew' + ''; + doInstallCheck = true; installCheckPhase = '' From f7723d082d210bb0e7454f4487d379294997fac2 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 11 Sep 2022 15:22:36 -0400 Subject: [PATCH 244/297] baresip: Build the GTK module --- .../networking/instant-messengers/baresip/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 0644b431cc87..e310b2c0ba61 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -8,6 +8,7 @@ , pkg-config , gst_all_1 , cairo +, gtk3 , mpg123 , alsa-lib , SDL2 @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { libre librem cairo + gtk3 mpg123 alsa-lib SDL2 @@ -75,6 +77,7 @@ stdenv.mkDerivation rec { "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" + "USE_GTK=1" "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" From 3c3f3a160c2aef45d4bae87e6cd2947af3254a97 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 11 Sep 2022 12:29:15 -0700 Subject: [PATCH 245/297] flake8-bugbear: 22.8.23 -> 22.9.11 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 8631457ab85a..a3db5f41feb6 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.8.23"; + version = "22.9.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5SBG/lrbe25kcABngDpOdjA/JJQ0DKcCYi6JBxTurPg="; + hash = "sha256-f95mwHjWoCRjAc8djrHm57q32hyp8Ukg7d2hSNlLvXs="; }; propagatedBuildInputs = [ From e3be4ad2f06450b43ee723250cb96bb39a1b50a7 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 11 Sep 2022 21:55:12 +0200 Subject: [PATCH 246/297] paperless: fix array formatting --- pkgs/applications/office/paperless-ngx/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 1deb8e7efe6e..d9a9cef77552 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -49,7 +49,16 @@ let }; }; - path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; + path = lib.makeBinPath [ + ghostscript + imagemagick + jbig2enc + optipng + pngquant + qpdf + tesseract4 + unpaper + ]; in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; From a611c674c211fe776588dda9a9df88cb914046da Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 11 Sep 2022 21:55:13 +0200 Subject: [PATCH 247/297] paperless: use `imagemagickBig` `imagemagickBig` has `gs` support. This fixes a warning during thumbnail generation (`convert: no images defined`). The type of thumbnails that are generated is unchanged. --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index d9a9cef77552..e85f13b892f7 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -3,7 +3,7 @@ , nixosTests , python3 , ghostscript -, imagemagick +, imagemagickBig , jbig2enc , optipng , pngquant @@ -51,7 +51,7 @@ let path = lib.makeBinPath [ ghostscript - imagemagick + imagemagickBig jbig2enc optipng pngquant From 19cd03d456109f4fffa6e848525e4d4fe61243c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sun, 11 Sep 2022 22:07:03 +0200 Subject: [PATCH 248/297] clojure: use latest java LTS --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1733a14dbb4..79429a702041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14963,7 +14963,7 @@ with pkgs; clojure = callPackage ../development/interpreters/clojure { # set this to an LTS version of java - jdk = jdk11; + jdk = jdk17; }; clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; From 1778eb5fdc44e1cbcb1620f574d368daa16fa2bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 20:26:36 +0000 Subject: [PATCH 249/297] mani: 0.21.0 -> 0.22.0 --- pkgs/development/tools/mani/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix index 6ff38f02fef1..e9261c062589 100644 --- a/pkgs/development/tools/mani/default.nix +++ b/pkgs/development/tools/mani/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mani"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-eH6V7J0KHGyR//kVr0dOdBYuoR3FDbW/pSh0RhHd4A8="; + sha256 = "sha256-2WuUQt9q19JYlfAyoGFRVpiLmsMbN45cYdF16j+jhhk="; }; - vendorSha256 = "sha256-g336is8Jjbbzmtsu3suhO9SNq3IJyy1MQ3s8P39MhvU="; + vendorSha256 = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From cb62326e36148b60a95898b26c07ab221209cf9a Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Sun, 11 Sep 2022 19:14:17 +0200 Subject: [PATCH 250/297] hex: init at 0.4.2 Fixes #190768 --- pkgs/tools/misc/hex/default.nix | 34 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/hex/default.nix diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/tools/misc/hex/default.nix new file mode 100644 index 000000000000..618fbe1dda60 --- /dev/null +++ b/pkgs/tools/misc/hex/default.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, testers +, hex +}: + +rustPlatform.buildRustPackage rec { + pname = "hex"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "sitkevij"; + repo = "hex"; + rev = "v${version}"; + hash = "sha256-mxKjiciejnOTbSkCzOWdAtysRAnEv4JgntPS1qM9og8="; + }; + + cargoHash = "sha256-kGe6XN03V+ILnlAcT0E8BvrYMa7ub05STFsFY6X5Gkk="; + + passthru.tests.version = testers.testVersion { + package = hex; + version = "hx ${version}"; + }; + + meta = with lib; { + description = "Futuristic take on hexdump, made in Rust"; + homepage = "https://github.com/sitkevij/hex"; + changelog = "https://github.com/sitkevij/hex/releases/tag/v${version}"; + mainProgram = "hx"; + license = licenses.mit; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 389f5cff4ecc..85891f45135f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7445,6 +7445,8 @@ with pkgs; hevea = callPackage ../tools/typesetting/hevea { }; + hex = callPackage ../tools/misc/hex { }; + hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; From 0a586cd4d5e82bcf949a3734c0cf48b73c03bfe1 Mon Sep 17 00:00:00 2001 From: Tomasz Hanc <7013293+tomaszhanc@users.noreply.github.com> Date: Sun, 11 Sep 2022 22:55:18 +0200 Subject: [PATCH 251/297] php: 8.1.9 -> 8.1.10 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 37e471601ddb..8f3f41248309 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.9"; - hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8="; + version = "8.1.10"; + hash = "sha256-LejgQCKF98Voh97+ZRkiMIre1YumC+/PO3dyAgnjHxA="; }); in From 195f1fb59aafe80090f74431e541a54109140a4a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 23:27:17 +0200 Subject: [PATCH 252/297] cargo-raze: pin to openssl_1_1 --- pkgs/development/tools/rust/cargo-raze/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 0299fe516d94..3a5b44a20d5b 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -16,8 +16,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vlywdq0bx6b1k3w1grisca0hvv2s4s88yxq7bil8nhm5ghjgxdr"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl libgit2 openssl ] - ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libgit2 + openssl + (curl.override { inherit openssl; }) + ] + ++ lib.optional stdenv.isDarwin Security; # thread 'main' panicked at 'Cannot ping mock server.: "cannot send request to mock server: cannot send request to mock server: failed to resolve host name"' # __darwinAllowLocalNetworking does not fix the panic From 949f55c0dda937f84d0d5c532ebfac1910f9f01a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 11 Sep 2022 23:28:36 +0200 Subject: [PATCH 253/297] mrustc-bootstrap: pin to openssl_1_1 --- pkgs/development/compilers/mrustc/bootstrap.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index 85b328848b1f..cb96ac2e56d4 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -71,7 +71,8 @@ stdenv.mkDerivation rec { # for rustc llvm_7 libffi zlib libxml2 # for cargo - openssl curl + openssl + (curl.override { inherit openssl; }) ]; makeFlags = [ From e3d748a92bec86330d1ab86a1836bbf4386cff06 Mon Sep 17 00:00:00 2001 From: Robin Voetter Date: Sun, 11 Sep 2022 22:51:09 +0200 Subject: [PATCH 254/297] hip: fix hip cmake config Update paths in cmake config files provided by HIP and hipamd to the proper location in the Nix store. Previously these files were trying to find headers in a way that assumes the typical ROCm installation (where everything is in /opt/rocm). This resulted in a bunch of errors when trying to compile HIP projects that are configured with cmake, like include paths that were set incorrectly or header paths that were not found. --- pkgs/development/compilers/hip/default.nix | 17 +++++++ .../compilers/hip/hip-config-paths.patch | 36 ++++++++++++++ .../compilers/hip/hipamd-config-paths.patch | 47 +++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 pkgs/development/compilers/hip/hip-config-paths.patch create mode 100644 pkgs/development/compilers/hip/hipamd-config-paths.patch diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index a459d30dbc95..329d523ddc23 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -21,6 +21,7 @@ , rocm-runtime , rocm-thunk , rocminfo +, substituteAll , writeScript , writeText }: @@ -37,6 +38,14 @@ let hash = "sha256-QaN666Rku2Tkio2Gm5/3RD8D5JgmCZLe0Yun1fGxa8U="; }; + patches = [ + (substituteAll { + src = ./hip-config-paths.patch; + inherit llvm; + rocm_runtime = rocm-runtime; + }) + ]; + # - fix bash paths # - fix path to rocm_agent_enumerator # - fix hcc path @@ -121,6 +130,14 @@ stdenv.mkDerivation rec { rocminfo ]; + patches = [ + (substituteAll { + src = ./hipamd-config-paths.patch; + inherit llvm hip; + rocm_runtime = rocm-runtime; + }) + ]; + preConfigure = '' export HIP_CLANG_PATH=${clang}/bin export DEVICE_LIB_PATH=${rocm-device-libs}/lib diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch new file mode 100644 index 000000000000..71e804c74482 --- /dev/null +++ b/pkgs/development/compilers/hip/hip-config-paths.patch @@ -0,0 +1,36 @@ +diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in +index 1a72643a..7f35031f 100644 +--- a/hip-lang-config.cmake.in ++++ b/hip-lang-config.cmake.in +@@ -72,8 +72,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) + + + #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@llvm@/lib/clang/*/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@llvm@/lib/clang/*/include") + find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h + HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} + ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} +@@ -88,10 +88,7 @@ endif() + #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= + find_path(HSA_HEADER hsa/hsa.h + PATHS +- "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY +- "${_IMPORT_PREFIX}/include" +- "${ROCM_PATH}/include" +- /opt/rocm/include ++ "@rocm_runtime@/include" + ) + + if (HSA_HEADER-NOTFOUND) +@@ -99,7 +96,7 @@ if (HSA_HEADER-NOTFOUND) + endif() + + get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) +-file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") ++file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@llvm@/lib/clang/*/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch new file mode 100644 index 000000000000..605b73f75c7a --- /dev/null +++ b/pkgs/development/compilers/hip/hipamd-config-paths.patch @@ -0,0 +1,47 @@ +diff --git a/hip-config.cmake.in b/hip-config.cmake.in +index 89d1224e..120b68c6 100755 +--- a/hip-config.cmake.in ++++ b/hip-config.cmake.in +@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") + file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) + endif() + else() +- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") ++ set(HIP_CLANG_ROOT "@llvm@") + endif() + if(NOT HIP_CXX_COMPILER) + set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) +@@ -206,10 +206,7 @@ if(NOT WIN32) + #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= + find_path(HSA_HEADER hsa/hsa.h + PATHS +- "${_IMPORT_PREFIX}/include" +- #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility +- "${_IMPORT_PREFIX}/../include" +- ${ROCM_PATH}/include ++ "@rocm_runtime@/include" + ) + + if (NOT HSA_HEADER) +@@ -224,8 +221,8 @@ set_target_properties(hip::host PROPERTIES + + if(HIP_RUNTIME MATCHES "rocclr") + set_target_properties(hip::amdhip64 PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" +- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" ++ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" ++ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" + ) + + get_target_property(amdhip64_type hip::amdhip64 TYPE) +@@ -233,8 +230,8 @@ if(HIP_RUNTIME MATCHES "rocclr") + + if(NOT WIN32) + set_target_properties(hip::device PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" ++ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include" ++ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include" + ) + endif() + endif() From fabbaedaa24056a0c18d48028f4017744551e5e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 00:00:17 +0000 Subject: [PATCH 255/297] openapi-generator-cli: 6.0.1 -> 6.1.0 --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 2a7522cf7d71..ebb164e91e5d 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.0.1"; + version = "6.1.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-upJ5kA0f78nwuXcmS3CffUgcJ41ngAkLNmc7ZcsakSI="; + sha256 = "sha256-O8v/d2By5OUWEwf4N9NKtHE6E+2e3CDkmDwjIXkeoDc="; }; dontUnpack = true; From 01d0040bac5d9845ff0d842de517bf4254753d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 01:59:33 +0000 Subject: [PATCH 256/297] pure-prompt: 1.20.1 -> 1.20.3 --- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 994f223b58da..d8bd689d31a4 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.20.1"; + version = "1.20.3"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-iuLi0o++e0PqK81AKWfIbCV0CTIxq2Oki6U2oEYsr68="; + sha256 = "sha256-vFms0MaSiLEzlYdgmUPGXaApTHVSVhwbw11N4GucgLg="; }; strictDeps = true; From 1a20be1a312b69c13b40d246358cf7d315d52b60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 03:00:22 +0000 Subject: [PATCH 257/297] sish: 2.6.0 -> 2.7.0 --- pkgs/tools/networking/sish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index 18d2c0a5cbce..6a7602845d8b 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sish"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gk6hUv6SKZ71iJdeh9fvA45Oj3J1TjPWpvKQT5qj8NU="; + sha256 = "sha256-TiS28bqwcTbKKAj1trTOEs2a4FGADrkutIU3DkaTcjE="; }; - vendorSha256 = "sha256-FCLhAJxEPskigvlzvm5A+hVQOSWqqZnAxCPe7cawryA="; + vendorSha256 = "sha256-Cky4ggZoNbIZK7w4tL00XqqyDDe0fmYk/+xZvtG/Nmg="; meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; From eebe8d3655a72783d860de78258717fed38c4491 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 11 Sep 2022 20:49:37 -0700 Subject: [PATCH 258/297] just: 1.4.0 -> 1.5.0 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8853b2208c8c..e5b9aa90f002 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-LDLxPNLUyDmJgnoFMMt82pt7J2qf/cBQilcCLk7xNUI="; + hash = "sha256-x/4+5m/FiqH68xTHP/cyPDbQ1DtpBXJr32iTq/9GWwI="; }; - cargoSha256 = "sha256-Gg0KaFTTsBH55VyYnIA0ZHy5l55tp9xodv0zBgHdLic="; + cargoSha256 = "sha256-EjX2U+H8sw+v+NEa5uCxIqG8HDl2P6PjpvWrhuF9Jr0="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From d103a9186b98ac92ae601703b7cd3b713d98f772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 04:07:11 +0000 Subject: [PATCH 259/297] tere: 1.1.0 -> 1.2.0 --- pkgs/tools/misc/tere/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index e1dac5a6bf2a..97b1506e93d3 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tere"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mgunyho"; repo = "tere"; rev = "v${version}"; - sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs="; + sha256 = "sha256-2DpJYOzswT7dHEIj+qaTx1Jm28NE+61opoxuMChNwbM="; }; - cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs="; + cargoSha256 = "sha256-8qSikfsHX8xwBqSSxWwNbiOpXmfzwGTAOALPjxVHadc="; # This test confirmed not working. # https://github.com/mgunyho/tere/issues/44 From 7a02685e60a5c4fb9c3907edab66b84c2c46a2b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 04:38:51 +0000 Subject: [PATCH 260/297] tidal-hifi: 4.1.1 -> 4.1.2 --- pkgs/applications/audio/tidal-hifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 730a5fce19a9..ca7fc28f7405 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "1l8axsf9d7a370fs96j16bnsi8fcdgwq036yxc4r4ykpnnskf1ds"; + sha256 = "sha256-HurREfN4VxhFiyP+oAx8QeTfoZTk+PlRX5pVWyU+Dwg="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; From 5f1dfe2c0ffba6cd4615bc46cf5d9a0f3b57deba Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 12 Sep 2022 07:17:16 +0200 Subject: [PATCH 261/297] php80: 8.0.22 -> 8.0.23 --- 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 5e346788ee48..68203db555df 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.22"; - hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw="; + version = "8.0.23"; + hash = "sha256-FBLbRoAKRc7Td8KJLsYmGzxBLxPcEzv8mYz7LxR7QM8="; }); in From bbe49339b81aa7acc13612d78ace0e4cfcaaaa6b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 11 Sep 2022 17:01:47 +1000 Subject: [PATCH 262/297] .github/workflows: fix permissions the merge actions comment on pull requests, seems this was broken by 2c71278a2395d6d8c4e06d1ebe4de1ffdae727c7 also: - fix permissions on new manual rendering action - drop unnecessary issues permission from the terraform action --- .github/workflows/manual-rendering.yml | 2 +- .github/workflows/periodic-merge-24h.yml | 2 +- .github/workflows/periodic-merge-6h.yml | 2 +- .github/workflows/update-terraform-providers.yml | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 4f5486f2acff..5d2518dffc04 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -13,7 +13,7 @@ permissions: jobs: check-rendering-equivalence: permissions: - issues: write # for peter-evans/create-or-update-comment to create or update comment + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment if: github.repository_owner == 'NixOS' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 2eec69f65257..e8ec13496025 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -21,7 +21,7 @@ jobs: periodic-merge: permissions: contents: write # for devmasx/merge-branch to merge branches - issues: write # for peter-evans/create-or-update-comment to create or update comment + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment if: github.repository_owner == 'NixOS' runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index bcc9f4883588..764ccaec0dfc 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -21,7 +21,7 @@ jobs: periodic-merge: permissions: contents: write # for devmasx/merge-branch to merge branches - issues: write # for peter-evans/create-or-update-comment to create or update comment + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment if: github.repository_owner == 'NixOS' runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 1650f537b7bc..1ae78a4fb8f8 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -12,8 +12,7 @@ jobs: tf-providers: permissions: contents: write # for peter-evans/create-pull-request to create branch - issues: write # for peter-evans/create-or-update-comment to create or update comment - pull-requests: write # for peter-evans/create-pull-request to create a PR + pull-requests: write # for peter-evans/create-pull-request to create a PR, for peter-evans/create-or-update-comment to create or update comment if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: From fce8e2200adcfe848f40758190d8be10cea8603f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 05:59:29 +0000 Subject: [PATCH 263/297] ipinfo: 2.8.1 -> 2.9.0 --- pkgs/tools/networking/ipinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 26f4f68c778f..6269c23afe2b 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - hash = "sha256-j+ASyNWfYh4/u7OX3iZx8DZZg1XAwuy6fpC9TJKI+18="; + hash = "sha256-kv8krhmqwE4IfEYPpN+cRAnku/Vm0ctQskCiYAb5YQ0="; }; vendorSha256 = null; From 121aeadda77f42fa272fff45518eacbec08bfc3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 07:03:22 +0000 Subject: [PATCH 264/297] apache-jena: 4.6.0 -> 4.6.1 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index b43305c728ef..738f110403d3 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "sha256-1fNl6O9FVLzBx4U+4E72GY60UGMSRFdKNxIrPdcb/aA="; + sha256 = "sha256-XCExqN0S5aIeLUNkAXjBHPW/fvj+MxQP3GEOP9gSdLE="; }; nativeBuildInputs = [ makeWrapper From 55e1e9a10419922d2be9bf33730f5108f73c9bbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 07:15:47 +0000 Subject: [PATCH 265/297] jmol: 14.32.73 -> 14.32.74 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 67a6f150efad..3ff22bad3cee 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.73"; + version = "14.32.74"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-95bZ6SYPKH+CGHETfdt/0YcUiZaP1gBiNf70GfUd4+M="; + sha256 = "sha256-wqZJn/kp3nd94AVe1kJpIa6VU1HYhiM4WoY6fRaJoNg="; }; patchPhase = '' From fdead18e9e7c5f157c572858494b1c292430eede Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 12 Sep 2022 09:20:53 +0200 Subject: [PATCH 266/297] nixos/paperless: use python from pkg for gunicorn This ensures that a compatible `gunicorn` is used when `pkg` is overridden. --- nixos/modules/services/misc/paperless.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index b3b1d265c19e..e11158f8a12b 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -282,7 +282,7 @@ in serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = '' - ${pkgs.python3Packages.gunicorn}/bin/gunicorn \ + ${pkg.python.pkgs.gunicorn}/bin/gunicorn \ -c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application ''; Restart = "on-failure"; From a953aca3d73cee231c4f852524d6f336d027ece0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 16:44:53 +0000 Subject: [PATCH 267/297] fclones: 0.27.2 -> 0.27.3 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 5dd351c30bb5..abccd8e00248 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cP17WnQsP2S78O9MfmpivibvN1vYMeSNBSrrOENHUiE="; + sha256 = "sha256-IAo7FKHh4oRPEmToEJca6b6E+TZvTeICPRYxol6Ppwo="; }; - cargoSha256 = "sha256-P1T9AAeEmCOiM74RPE/3Lz/XGAj150xTF3egjDv+zvc="; + cargoSha256 = "sha256-S4F/2kf9jbOA3o3kj5Ouo3QvCULbVILh3QbBLXUeOzc="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From 133d72aa16b4d5f2d2b5c1e841c21a377be93015 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 18:01:00 +0000 Subject: [PATCH 268/297] gopass-jsonapi: 1.14.5 -> 1.14.6 --- pkgs/tools/security/gopass/jsonapi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index c4f73630257a..503ce999254d 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.14.5"; + version = "1.14.6"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zEyzoIl5LiVbNSRebbcE70HxhOGYaZvArdHQqgvi1ns="; + sha256 = "sha256-4jpW1XGT3LWucrDYsz30fKTO7v7AxDKhjx4UYE7NnMQ="; }; - vendorSha256 = "sha256-mcI8ys+Vs46BEaETzsf0f1f2CgjEIV4iwSF4FWgNjUY="; + vendorSha256 = "sha256-bTZ7fjRCKvp7AJcuNDHnsgB8hQUURPBCISgWtBAO1fI="; subPackages = [ "." ]; From f847472df6996c2ec4dd98c459b6734d0729d498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 22:47:04 +0000 Subject: [PATCH 269/297] neatvnc: 0.5.3 -> 0.5.4 --- pkgs/development/libraries/neatvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 9936d388d813..aeade2f22c14 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y+qFTSvMX/iop+5UOm+4NqMSAZesFIJeTR+CRnlZTYo="; + sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q="; }; nativeBuildInputs = [ meson pkg-config ninja ]; From 564fb910650c72a9e11aab2e9068aafebcd67564 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 12 Sep 2022 11:47:47 +0200 Subject: [PATCH 270/297] =?UTF-8?q?libusb-compat-0=5F1:=20remove=20patchel?= =?UTF-8?q?f=20from=20nativeBuildInputs=20as=20it=20is=20includ=E2=80=A6?= =?UTF-8?q?=20(#190201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libusb-compat/0.1.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index f977d72e7242..b9aa26c67a08 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , autoreconfHook -, patchelf , pkg-config , libusb1 }: @@ -14,10 +13,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook patchelf pkg-config ]; - - buildInputs = [ libusb1 ]; - src = fetchFromGitHub { owner = "libusb"; repo = "libusb-compat-0.1"; @@ -27,6 +22,10 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libusb1 ]; + # without this, libusb-compat is unable to find libusb1 postFixup = '' find $out/lib -name \*.so\* -type f -exec \ From f085846ed2b1cec849bd27f88f5edbc03b5f5da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Sep 2022 11:35:43 +0200 Subject: [PATCH 271/297] knot-dns: add a test for version-sensitive dependencies --- pkgs/servers/dns/knot-dns/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fc4efcfe56a1..6d46bfb4dce7 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls -, autoreconfHook, nixosTests, knot-resolver +, autoreconfHook +, nixosTests, knot-resolver, knot-dns, runCommandLocal , fetchpatch }: @@ -65,6 +66,19 @@ stdenv.mkDerivation rec { inherit knot-resolver; } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) knot; + # Some dependencies are very version-sensitive, so the might get dropped + # or embedded after some update, even if the nixPackagers didn't intend to. + # For non-linux I don't know a good replacement for `ldd`. + deps = runCommandLocal "knot-deps-test" + { nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; } + '' + for libname in libngtcp2 libbpf; do + echo "Checking for $libname:" + ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname" + echo "OK" + done + touch "$out" + ''; }; meta = with lib; { From 997fb2b5709372f893d264e045c7b826e41d7ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Sep 2022 11:38:31 +0200 Subject: [PATCH 272/297] knot-dns: 3.2.0 -> 3.2.1 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.2.1 --- pkgs/servers/dns/knot-dns/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 6d46bfb4dce7..02b8e01437d0 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -3,16 +3,15 @@ , ngtcp2-gnutls , autoreconfHook , nixosTests, knot-resolver, knot-dns, runCommandLocal -, fetchpatch }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "426d120994daf93af348aa6c48428e583dd286656415de4daf7a59106fd98631"; + sha256 = "51efa36f92679b25d43dbf8ba543e9f26138559f0fa1ba5fae172f5400659c8f"; }; outputs = [ "bin" "out" "dev" ]; @@ -24,11 +23,6 @@ stdenv.mkDerivation rec { ]; patches = [ - (fetchpatch { - name = "test-32bit-xdp.patch"; - url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/325dfeefdfd8a3dd318cfe0ab52cd7efbf839ccd.diff"; - sha256 = "E5J2Jf4/m5H59Xn6TyATu2gKs3CgShYlMF2Qj1SW1zw="; - }) # Don't try to create directories like /var/lib/knot at build time. # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch From 33956f6fdb079ade70493f23da421cf4471cba64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 22:11:15 +0000 Subject: [PATCH 273/297] ngtcp2-gnutls: 0.7.0 -> 0.8.1 vcunat: knot-dns now needs >= 0.8.0 instead of == 0.7.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index c2b928e851c8..08b0ecea74a6 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no="; + sha256 = "sha256-Sn03nY80UmL5oeoK6ScPye1oSUmEKxgoz2VLHcvor3U="; }; outputs = [ "out" "dev" ]; From 5b79100cadb9c802d65a84a278a901343a1c53e7 Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Mon, 12 Sep 2022 13:29:44 +0300 Subject: [PATCH 274/297] ledger-live-desktop: 2.46.2 -> 2.47.0 ledger-live-desktop: 2.46.2 -> 2.47.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 10c95a91eda2..e85cb9d28dab 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.46.2"; + version = "2.47.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-fSfES+6+LCRTLdOy3RJaHzv0zRXkqT+0Rsdt2kSeU18="; + hash = "sha256-KmNiyWF74hHLLu+uQDiFAMJJvyU/rgyrBhh6O6iMVIg="; }; appimageContents = appimageTools.extractType2 { From 6d36e7b05709eb5ec0049b33c09c6d7fde944f50 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 12 Sep 2022 19:14:13 +0800 Subject: [PATCH 275/297] cinnamon.cinnamon-common: Fix upload-system-info path --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 284371f48216..d477b0122614 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings # this one really IS optional From f940383130e605332052abd23c9cfe153d63e90d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 15:14:53 +0000 Subject: [PATCH 276/297] cocogitto: 5.1.0 -> 5.2.0 --- pkgs/development/tools/cocogitto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 793beb43b990..b07946e70bb7 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-q2WJKAXpIO+VsOFrjdyEx06yis8f2SkCuB0blUgqq0M="; + sha256 = "sha256-ZjDZMI84z8riRtidZVeCktwJUMkZU28E23MveJSD7xY="; }; - cargoSha256 = "sha256-UArYBcUkXPYlNRLQBMwNhsd3bNgLeEwtJdzepMTt2no="; + cargoSha256 = "sha256-oaWWAVTKxrshfvqE+HMQ1WeeEz8lOE7qc6RrgSjDtdU="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. From dd22a79c0aef00fd6f7c7257b1f785fe91e19480 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 05:35:38 +0000 Subject: [PATCH 277/297] xplr: 0.19.0 -> 0.19.3 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index d24345389cab..5fca27915f0a 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.19.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rvqx0s56VozG8M0m3uZsHuugx0BXucSFqLbq0L1KhAM="; + sha256 = "sha256-0aNtBf3np9cq9JTgHRWy73i4AKaVEOluhSMSUyobduI="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-CyHkjXZVISkQJEQx5vNBGBf6zZrVv/cLWIYeOq9Ac5k="; + cargoSha256 = "sha256-DXPpW7vls4yDEMiRrqDndxEKSA7Uncrt6n8nmsBXHcU="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From bc7d278ac67666ce98c03152a87062b8f9e17f3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 08:15:45 +0000 Subject: [PATCH 278/297] libjcat: 0.1.11 -> 0.1.12 --- pkgs/development/libraries/libjcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index ca4509ff3cc2..99de3acb38c7 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.11"; + version = "0.1.12"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "2kdoOwgaLpo/Cp3wkCMgdyQ++BC3Cn7CRhXhVCHn/iM="; + sha256 = "sha256-9+wtCJzvT9uAXRXj/koFG7asxm5JIDw0Ffp4wK6tbDk="; }; patches = [ From 344d5219dd8898ba8f05c6bd9e4a374cb287de5f Mon Sep 17 00:00:00 2001 From: firefly-cpp Date: Mon, 12 Sep 2022 15:11:58 +0200 Subject: [PATCH 279/297] python310Packages.tcxparser: init at 2.3.0 --- .../python-modules/tcxparser/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/tcxparser/default.nix diff --git a/pkgs/development/python-modules/tcxparser/default.nix b/pkgs/development/python-modules/tcxparser/default.nix new file mode 100644 index 000000000000..2f8f4e6b1d21 --- /dev/null +++ b/pkgs/development/python-modules/tcxparser/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, pytestCheckHook +, python-dateutil +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tcxparser"; + version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vkurup"; + repo = "python-tcxparser"; + rev = version; + hash = "sha256-HOACQpPVg/UKopz3Jdsyg0CIBnXYuVyhWUVPA+OXI0k="; + }; + + propagatedBuildInputs = [ + lxml + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tcxparser" + ]; + + meta = with lib; { + description = "Simple parser for Garmin TCX files"; + homepage = "https://github.com/vkurup/python-tcxparser"; + license = licenses.bsd2; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1e446976971..2a926cd8a932 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10708,6 +10708,8 @@ in { tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + tcxparser = callPackage ../development/python-modules/tcxparser { }; + tcxreader = callPackage ../development/python-modules/tcxreader { }; teamcity-messages = callPackage ../development/python-modules/teamcity-messages { }; From e449f76a1f333c96f9494bd28a7fcd3b40b563c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 09:17:09 +0000 Subject: [PATCH 280/297] libxmlb: 0.3.9 -> 0.3.10 --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 4e44ced6cb28..09dbcc3a0f51 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.9"; + version = "0.3.10"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-4WTuwxpIsE7gHXFiuWuZeu2JMGzPLpsmS1KTEdR3ztg="; + sha256 = "sha256-uitnVqR2VVNAf8H1Q/u6LezhvfQJ/G2bE0Dv9dyP8+A="; }; patches = [ From 31f69654820318de1d0cde6c640f82282c56b0ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 22:35:58 +0000 Subject: [PATCH 281/297] ibus-engines.m17n: 1.4.10 -> 1.4.11 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 798e6fa16516..4636eedc56cd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-OYWEYi2KVzGR+DS1cWMJFexuEwBQfqC+T3cVJF+glXg="; + sha256 = "sha256-y9cWQ6Z7sxGCdRgWRoKPGH3TDWyrzCwXDEx0pfTjgyM="; }; nativeBuildInputs = [ From be9e813d762cc138e499ae49a2d43ff27fbfb20d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 20:45:40 +0000 Subject: [PATCH 282/297] sierra-breeze-enhanced: 1.2.0 -> 1.3.1 --- .../kwin-decorations/sierra-breeze-enhanced/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index b799124a7831..605157458bde 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sierra-breeze-enhanced"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kupiqu"; repo = "SierraBreezeEnhanced"; rev = "V${version}"; - sha256 = "sha256-Tzd8ATdmOjVe8OCSdcB9h7r6sqtb+24Fq80t/hmGJcE="; + sha256 = "sha256-x3OTLH8gcWrqpFGQPZHwvyPFwLhEGeHhU4cRqvtPupQ="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; From 446f8cc58969c063c03670234f294626e16871be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 14:44:29 +0000 Subject: [PATCH 283/297] fluxcd: 0.33.0 -> 0.34.0 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index f4afc5d17127..8a837399048f 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.33.0"; - sha256 = "1rrx2sq9wap7xzvqa6dw54kmmlnj4d45y8ziaxkyibz7hsqvzyqk"; - manifestsSha256 = "0zzv5mkcnxcrd6yq330bm4b1bvlp93qv80n4yb4y7g16d0a2xp9a"; + version = "0.34.0"; + sha256 = "1znxhjqvch0z0s98v3hvvh1pa3nlv0l6qhlm0f61z64srz3i5d1k"; + manifestsSha256 = "1fchzr7fb894hdya9bbh59avqsa66wcz06fck60wmwpc93m64cqs"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-jKluPTBg7wVbbApKul/68qC1xoMyp86/ok2UZLAoRUY="; + vendorSha256 = "sha256-0oHcitczG+sW9mkwxY6hCdR2ASpat2XQ+IsLAiqCUb8="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From f0f4ad0cb0723e8962e18d1fa805df6a80029483 Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 12 Sep 2022 09:07:34 -0700 Subject: [PATCH 284/297] nixos/self-deploy: add tar to path. Previously it was missing, and the service would fail. --- nixos/modules/services/system/self-deploy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index a508cecef26c..db7b24f0829e 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -139,6 +139,7 @@ in path = with pkgs; [ git + gnutar nix ] ++ lib.optionals (cfg.switchCommand == "boot") [ systemd ]; From c619f9ca0415b4b43dc2f9c51cef10ff18e700b2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 12 Sep 2022 14:53:43 -0300 Subject: [PATCH 285/297] linuxKernel.kernels.linux_testing: 6.0-rc1 -> 6.0-rc5 --- 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 a4304e9e9369..3d07fd3175bc 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 = "6.0-rc1"; + version = "6.0-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 = "sha256-RReHoEYavib86K9XQKwguBYQvyQboRl7537p69P8ca0="; + hash = "sha256-GELU1ZEOM5gGUJxG54JoiI9qLQXJ2Cd/kyOLcp0AWgc="; }; # Should the testing kernels ever be built on Hydra? From a9c4243eec6d0daaf13308662e65a0d5dcce8e23 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 12 Sep 2022 14:54:19 -0300 Subject: [PATCH 286/297] tabnine: 4.4.123 -> 4.4.139 --- pkgs/development/tools/tabnine/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index c413ebed6013..8e1a1aaea010 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -2,19 +2,19 @@ let # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` # There's a handy prefetch script in ./fetch-latest.sh - version = "4.4.123"; + version = "4.4.139"; supportedPlatforms = { "x86_64-linux" = { name = "x86_64-unknown-linux-musl"; - hash = "sha256-mkG7Fd82L5vnS/K1UQF/JZCdQYsnPZ1iTISqFjXXnq0="; + hash = "sha256-CXm9WR77SMvv+9w+8QUBNHKPhe4otquLyHAwzd+jbNk="; }; "x86_64-darwin" = { name = "x86_64-apple-darwin"; - hash = "sha256-+B9Oobhh1TmDoRhNlObn5jYrDgsjvpTKguwj3wbkaO0="; + hash = "sha256-01lotn9DzgwIj1n9GCUuGmwgtS4DtK+XOl/wduI+QyI="; }; "aarch64-darwin" = { name = "aarch64-apple-darwin"; - hash = "sha256-HNZSQaVd8530sM4JpUTWfo7aTfKaJHg00u+M/x/pKdQ="; + hash = "sha256-RQBBsp48Xhxi3WQKsYzSiiSEW8W7UikKAyFf4sJ2JqQ="; }; }; platform = From a594429bfa1eda2c909a08d00eb76a83d9a3e907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 18:16:08 +0000 Subject: [PATCH 287/297] dua: 2.17.8 -> 2.18.0 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 33504df8d4f7..fb89e91c1044 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.17.8"; + version = "2.18.0"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-zlXv5RY/JRDS2vzC/LhSumZX+OOeaFoOmLq5TaulGDY="; + sha256 = "sha256-8WXby+b5bZEylAmgONTHsKCDl9W9KCCk76utZUd9CuA="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-PSAhRUODedmJg67K00W0RQ5LycMme2bidL4L8gd6qkw="; + cargoSha256 = "sha256-NHPlBZhZoZHASQ3BaYfH+sLyWKYmCsAwwd7ENI0bIFo="; doCheck = false; From 2e3e0081e5e843599aaa8f7128d2a139bda7dbca Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 12 Sep 2022 21:08:21 +0200 Subject: [PATCH 288/297] element-web: allow older openssl codecs (#190950) fix build error on current staging-next due to openssl upgrade Signed-off-by: Florian Brandes --- .../networking/instant-messengers/element/element-web.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 5254c07223ee..92130d309902 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -42,6 +42,11 @@ in stdenv.mkDerivation rec { runHook preConfigure export HOME=$PWD/tmp + # with the update of openssl3, some key ciphers are not supported anymore + # this flag will allow those codecs again as a workaround + # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 + # and https://github.com/vector-im/element-web/issues/21043 + export NODE_OPTIONS=--openssl-legacy-provider mkdir -p $HOME fixup_yarn_lock yarn.lock From 99e71eee21a2b8c5b2b0258a4e8d599b763c0b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Mon, 12 Sep 2022 22:11:46 +0900 Subject: [PATCH 289/297] dendrite: 0.9.6 -> 0.9.8 --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index cd7b56e12706..4df1961282cf 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-IkskR/30vu/RYuCvIH3trPte0MkYhgWzHLBmb325bhM="; + sha256 = "sha256-BA+jI5S8pDXIWzCelUh8pWiXy98E94DJgLvqiy0r23g="; }; - vendorSha256 = "sha256-U3buvPu2mZh79DwKYrSj1Y0x3gNjuKscOyAWNKeloXQ="; + vendorSha256 = "sha256-xcgnpaq0owlCD4nA4I1oD8FpsTGziUghRFy/7ZPVpKY="; # some tests are racy, re-enable once upstream has fixed them doCheck = false; From fdabbea239e9bbe723df31fb93adb3fdb0bf3f9a Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 10 Sep 2022 15:11:22 +0200 Subject: [PATCH 290/297] python310Packages.certbot-dns-inwx: init at 2.1.3 --- .../certbot-dns-inwx/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/certbot-dns-inwx/default.nix diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix new file mode 100644 index 000000000000..7c24a042c95c --- /dev/null +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, acme +, certbot +}: + +buildPythonPackage rec { + pname = "certbot-dns-inwx"; + version = "2.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yAgualY4J92pJ8PIkICg8w0eYHmT5L3qAUOCW/cAitw="; + }; + + propagatedBuildInputs = [ + acme + certbot + ]; + + # Doesn't have any tests + doCheck = false; + + pytestCheckHook = [ "certbot_dns_inwx" ]; + + meta = with lib; { + description = "INWX DNS Authenticator plugin for Certbot"; + homepage = "https://github.com/oGGy990/certbot-dns-inwx"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16b408ab0cbb..86e4e6944063 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1691,6 +1691,8 @@ in { certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + certbot-dns-inwx = callPackage ../development/python-modules/certbot-dns-inwx { }; + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; certbot-dns-google = callPackage ../development/python-modules/certbot-dns-google { }; From 5519e1b89bf02443b056fac9acf5f6d607bb622f Mon Sep 17 00:00:00 2001 From: a-kenji Date: Mon, 12 Sep 2022 10:34:55 +0200 Subject: [PATCH 291/297] nixos/lemmy: remove `services.lemmy.jwtSecretPath` Co-authored-by: Ctem Co-authored-by: Brian Leung Co-authored-by: Shahar Dawn Or Co-authored-by: Ilan Joselevich --- nixos/modules/services/web-apps/lemmy.md | 3 --- nixos/modules/services/web-apps/lemmy.nix | 13 ++++--------- nixos/modules/services/web-apps/lemmy.xml | 7 +------ nixos/tests/lemmy.nix | 4 ---- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/web-apps/lemmy.md b/nixos/modules/services/web-apps/lemmy.md index e6599cd843e3..faafe096d138 100644 --- a/nixos/modules/services/web-apps/lemmy.md +++ b/nixos/modules/services/web-apps/lemmy.md @@ -13,13 +13,10 @@ services.lemmy = { hostname = "lemmy.union.rocks"; database.createLocally = true; }; - jwtSecretPath = "/run/secrets/lemmyJwt"; caddy.enable = true; } ``` -(note that you can use something like agenix to get your secret jwt to the specified path) - this will start the backend on port 8536 and the frontend on port 1234. It will expose your instance with a caddy reverse proxy to the hostname you've provided. Postgres will be initialized on that same instance automatically. diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 1f2168b2a4c6..1945c8291433 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -10,15 +10,14 @@ in # `pandoc lemmy.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > lemmy.xml` meta.doc = ./lemmy.xml; + imports = [ + (mkRemovedOptionModule [ "services" "lemmy" "jwtSecretPath" ] "As of v0.13.0, Lemmy auto-generates the JWT secret.") + ]; + options.services.lemmy = { enable = mkEnableOption (lib.mdDoc "lemmy a federated alternative to reddit in rust"); - jwtSecretPath = mkOption { - type = types.path; - description = lib.mdDoc "Path to read the jwt secret from."; - }; - ui = { port = mkOption { type = types.port; @@ -168,18 +167,14 @@ in requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; - # script is needed here since loadcredential is not accessible on ExecPreStart script = '' ${pkgs.coreutils}/bin/install -m 600 ${settingsFormat.generate "config.hjson" cfg.settings} /run/lemmy/config.hjson - jwtSecret="$(< $CREDENTIALS_DIRECTORY/jwt_secret )" - ${pkgs.jq}/bin/jq ".jwt_secret = \"$jwtSecret\"" /run/lemmy/config.hjson | ${pkgs.moreutils}/bin/sponge /run/lemmy/config.hjson ${pkgs.lemmy-server}/bin/lemmy_server ''; serviceConfig = { DynamicUser = true; RuntimeDirectory = "lemmy"; - LoadCredential = "jwt_secret:${cfg.jwtSecretPath}"; }; }; diff --git a/nixos/modules/services/web-apps/lemmy.xml b/nixos/modules/services/web-apps/lemmy.xml index 0be9fb8aefa9..f04316b3c515 100644 --- a/nixos/modules/services/web-apps/lemmy.xml +++ b/nixos/modules/services/web-apps/lemmy.xml @@ -8,21 +8,16 @@ the minimum to start lemmy is - + services.lemmy = { enable = true; settings = { hostname = "lemmy.union.rocks"; database.createLocally = true; }; - jwtSecretPath = "/run/secrets/lemmyJwt"; caddy.enable = true; } - - (note that you can use something like agenix to get your secret - jwt to the specified path) - this will start the backend on port 8536 and the frontend on port 1234. It will expose your instance with a caddy reverse proxy to diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index 543bd2ce57a5..a317b4cf15ba 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -14,10 +14,6 @@ in "${lemmyNodeName}" = { services.lemmy = { enable = true; - jwtSecretPath = pkgs.writeTextFile { - name = "lemmy-secret"; - text = "very-secret-password123"; - }; ui.port = uiPort; settings = { hostname = "http://${lemmyNodeName}"; From c231a20d98ec8b7cc521c490ab9d957c9778fa0a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 12 Sep 2022 01:54:27 -0700 Subject: [PATCH 292/297] nixos/lemmy: move systemd script to serviceConfig Co-authored-by: Shahar Dawn Or Co-authored-by: Ctem Co-authored-by: Ilan Joselevich Co-authored-by: a-kenji --- nixos/modules/services/web-apps/lemmy.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 1945c8291433..7f619489893e 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -167,14 +167,11 @@ in requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; - script = '' - ${pkgs.coreutils}/bin/install -m 600 ${settingsFormat.generate "config.hjson" cfg.settings} /run/lemmy/config.hjson - ${pkgs.lemmy-server}/bin/lemmy_server - ''; - serviceConfig = { DynamicUser = true; RuntimeDirectory = "lemmy"; + ExecStartPre = "${pkgs.coreutils}/bin/install -m 600 ${settingsFormat.generate "config.hjson" cfg.settings} /run/lemmy/config.hjson"; + ExecStart = "${pkgs.lemmy-server}/bin/lemmy_server"; }; }; From 953918a0f9d7e24b45aefc47cdc6a607fc108767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Thu, 8 Sep 2022 13:40:26 -0300 Subject: [PATCH 293/297] trojita-unstable: unstable-2020-07-06 -> unstable-2022-08-22 Needed for compatibility with latest Akonadi version --- .../networking/mailreaders/trojita/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index d7c7320b9e4f..cd0a61f6636d 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -1,6 +1,6 @@ { akonadi-contacts , cmake -, fetchgit +, fetchFromGitLab , fetchsvn , gnupg , gpgme @@ -29,12 +29,14 @@ let }; in mkDerivation rec { pname = "trojita"; - version = "unstable-2020-07-06"; + version = "unstable-2022-08-22"; - src = fetchgit { - url = "https://anongit.kde.org/trojita.git"; - rev = "e973a5169f18ca862ceb8ad749c93cd621d86e14"; - sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "pim"; + repo = "trojita"; + rev = "91087933c5e7a03a8097c0ffe5f7289abcfc123b"; + sha256 = "sha256-15G9YjT3qBKbeOKfb/IgXOO+DaJaTULP9NJn/MFYZS8="; }; patches = (substituteAll { From 3a818092242b3de9debe9033ef60513e3db10cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= Date: Mon, 12 Sep 2022 21:52:45 +0100 Subject: [PATCH 294/297] maintainers: add Necior --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 163d540c3e38..80b7e04371bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9395,6 +9395,13 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + Necior = { + email = "adrian@sadlocha.eu"; + github = "Necior"; + githubId = 2404518; + matrix = "@n3t:matrix.org"; + name = "Adrian Sadłocha"; + }; neeasade = { email = "nathanisom27@gmail.com"; github = "neeasade"; From 4def96490a620e457b10f80efcb9d36172ca686a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= Date: Mon, 12 Sep 2022 21:55:15 +0100 Subject: [PATCH 295/297] rsstail: add Necior to maintainers --- pkgs/applications/networking/feedreaders/rsstail/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index ea1566cd6974..dd63a377ee63 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.vanheusden.com/rsstail/"; license = licenses.gpl2Plus; + maintainers = [ maintainers.Necior ]; platforms = platforms.unix; }; } From 77746d1ddf48ab48136b8952e28b1472dfc5b784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= Date: Mon, 12 Sep 2022 21:57:16 +0100 Subject: [PATCH 296/297] rsstail: update repository location Project's repository has been moved. Former location, `github.com/flok99/rsstail`, is no longer accessible. The author moved the code repository to `github.com/folkertvanheusden/rsstail`. I've verified this in the following ways. First of all, by checking project's homepage, i.e. https://www.vanheusden.com/rsstail/. It indeed points to the new location. Second of all, I've emailed the author, Folkert van Heusden, and they confirmed the new location. What is more, one can also note that the commit hash is still the same. --- pkgs/applications/networking/feedreaders/rsstail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index dd63a377ee63..cd020e2bd7df 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; repo = "rsstail"; - owner = "flok99"; + owner = "folkertvanheusden"; }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; From 9717e20f4b8daea22d1dc6bc96477831150512e1 Mon Sep 17 00:00:00 2001 From: Pauan Date: Mon, 12 Sep 2022 17:07:07 -0600 Subject: [PATCH 297/297] blender: 3.2.0 -> 3.3.0 (#190732) --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index ea59e9bd108f..c6f16733cc21 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-k78LL1urcQWxnF1lSoSi3CH3Ylhzo2Bk2Yvq5zbTYEo="; + hash = "sha256-IsUaTmY4XLFIGKpNdtz3+m1uEDr7DTaRbhLqFZiNIfA="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch;