From 3b74f9060768c5963bab33810f4c489f677351c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Nov 2021 14:39:24 +0100 Subject: [PATCH 01/12] linux_zen: 5.15.3-zen1 -> 5.15.5-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index a822f5d10805..8ff8b30809b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.3-zen1"; + modDirVersion = "5.15.5-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-GleOhTKLhnhepAlR+TkiCYcgEe5KfVvDKTPWP7/D8wQ="; + sha256 = "sha256-sEt6h29GY18+45jHheRd69eCw+EAzn/CVUK5XRqdZcA="; }; structuredExtraConfig = with lib.kernel; { From 93ee1a9cb0cedc65b26c8ebd748c7045506c4e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Dec 2021 13:30:06 +0100 Subject: [PATCH 02/12] knot-resolver: 5.4.2 -> 5.4.3 https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.4.3 --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 420b09234547..26f35145b67c 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b"; + sha256 = "488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506"; }; outputs = [ "out" "dev" ]; From a99ea202552ebd447b835b2ccc98b8fcc4f64336 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:24:35 +0100 Subject: [PATCH 03/12] checkov: 2.0.614 -> 2.0.625 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index aabbcd07a535..7927a797656b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.614"; + version = "2.0.625"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-z1d1Zcq4x2wU/j4yWpaRwJXsUqy95Ai2uM18EHqxze0="; + sha256 = "sha256-Q2GaLHciqgsvnYAFdq6839OHcpxWM2m/H10CPmBj2vg="; }; nativeBuildInputs = with py.pkgs; [ From cfc39c0331813fd6f3db894a8591182160a53fbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:28:44 +0100 Subject: [PATCH 04/12] kubescape: 1.0.131 -> 1.0.132 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index e68980cc9659..9534480b7dde 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.131"; + version = "1.0.132"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcReo4pTdI8ssWH1IqD8gDUm4jQ0jBBJ+ltxSpdkxQE="; + sha256 = "sha256-hx11RCLEUW/2MKNIXz51wOyKC7zv0M3Wvblam/E3rdQ="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-SxJnYJyKFed1c+zgeeXQQhsKHlaDevJGMwqA5gPef3s="; + vendorSha256 = "sha256-GrQmWHdCk8Yl/ryS2zLQU8XCkjfS20qjlEScU8AQT0o="; ldflags = [ "-s" From b6b825ac0929b6c295b98cc677b7ccf38443c630 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 23:22:42 +0100 Subject: [PATCH 05/12] python3Packages.flux-led: 0.25.1 -> 0.25.10 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 1bfc96ff7217..58e271b10dc5 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.25.1"; + version = "0.25.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-+GgA7ma27dah8G/ITsy84jZHpktJHnGSMjzMfAvvuJg="; + sha256 = "sha256-WkLwiQNwueksPpuQ5aMBsenKyzUid1fbeOqEDAhfjkA="; }; propagatedBuildInputs = [ From 31ea056e676c29b1f996098165a76ce0bafe1124 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 3 Dec 2021 00:13:08 -0500 Subject: [PATCH 06/12] =?UTF-8?q?poke:=201.3=20=E2=86=92=201.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/poke/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index a24666741e14..cdfacaf92ede 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,13 +19,15 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs="; + sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; }; + outputs = [ "out" "dev" "info" "lib" "man" ]; + postPatch = '' patchShebangs . ''; @@ -46,7 +48,9 @@ in stdenv.mkDerivation rec { ++ lib.optional textStylingSupport gettext ++ lib.optional (!isCross) dejagnu; - configureFlags = lib.optionals guiSupport [ + configureFlags = [ + "--datadir=${placeholder "lib"}/share" + ] ++ lib.optionals guiSupport [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-tkinclude=${tk.dev}/include" @@ -57,6 +61,10 @@ in stdenv.mkDerivation rec { doCheck = !isCross; checkInputs = lib.optionals (!isCross) [ dejagnu ]; + postInstall = '' + moveToOutput share/emacs "$out" + ''; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; From 6bad84a25da85dd16a2c9badd2ed893ad231210f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Dec 2021 13:25:15 +1000 Subject: [PATCH 07/12] shellcheck: drop removeAttrs workaround for hydraPlatforms No longer necessary, resolved by 6496069ddaa38504450897831579b44798cab454 --- pkgs/development/tools/shellcheck/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 13cfc93cfc67..e85b596607b1 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -21,9 +21,7 @@ let pname = "shellcheck"; version = bin.version; - inherit (ShellCheck) src; - - meta = builtins.removeAttrs ShellCheck.meta [ "hydraPlatforms" ]; + inherit (ShellCheck) meta src; nativeBuildInputs = [ pandoc ]; From 3baeba2654c87ae9488cbbcc522777634a39041f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 3 Dec 2021 10:39:42 +0200 Subject: [PATCH 08/12] gnuradio: 3.9.3.0 -> 3.9.4.0 --- pkgs/applications/radio/gnuradio/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d92af80701b1..61aafb63b5db 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "3"; + minor = "4"; patch = "0"; } }: let - sourceSha256 = "sha256-jVfExv1CcnlOaaj/XtnfhWAHnQsshZJ1l/zXo0uovdo="; + sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk="; featuresInfo = { # Needed always basic = { @@ -79,6 +79,9 @@ let native = [ doxygen ]; cmakeEnableFlag = "DOXYGEN"; }; + man-pages = { + cmakeEnableFlag = "MANPAGES"; + }; python-support = { pythonRuntime = [ python.pkgs.six ]; native = [ @@ -269,11 +272,6 @@ stdenv.mkDerivation rec { patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch - (fetchpatch { - # https://github.com/gnuradio/gnuradio/pull/5225 - url = "https://github.com/gnuradio/gnuradio/commit/4cef46e3ea0faf04e05ca1a5846cd1568fa51bb2.patch"; - sha256 = "sha256-6AlGbtD1S0c3I9JSoLTMP4YqwDU17i2j+XRkuR+QTuc="; - }) ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must From daeb62345c192b887ad8fe53f1607a1e02365dd1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 1 Dec 2021 14:23:58 +0000 Subject: [PATCH 09/12] lzlib: init at 1.10 --- pkgs/development/libraries/lzlib/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/lzlib/default.nix diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix new file mode 100644 index 000000000000..098336dfbd12 --- /dev/null +++ b/pkgs/development/libraries/lzlib/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, texinfo }: + +stdenv.mkDerivation rec { + pname = "lzlib"; + version = "1.10"; + outputs = [ "out" "info" ]; + + nativeBuildInputs = [ texinfo ]; + + src = fetchurl { + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-HWq3gApbQ+Vv0gYH/Sz9qeVQNQ3JX1vrakzhT4W0EEM="; + }; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + doCheck = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/${pname}.html"; + description = + "Data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a61a562dbd61..8d6b5858c6b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18542,6 +18542,8 @@ with pkgs; lyra = callPackage ../development/libraries/lyra { }; + lzlib = callPackage ../development/libraries/lzlib { }; + lzo = callPackage ../development/libraries/lzo { }; opencl-clang = callPackage ../development/libraries/opencl-clang { }; From 7fff1e9c0c77a22c83504bf9ba63c3c949bd66f0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 1 Dec 2021 14:24:35 +0000 Subject: [PATCH 10/12] tarlz: init at 0.11 --- pkgs/tools/archivers/tarlz/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/archivers/tarlz/default.nix diff --git a/pkgs/tools/archivers/tarlz/default.nix b/pkgs/tools/archivers/tarlz/default.nix new file mode 100644 index 000000000000..d5b53c5eaaaa --- /dev/null +++ b/pkgs/tools/archivers/tarlz/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, lzip, lzlib, texinfo }: + +stdenv.mkDerivation rec { + pname = "tarlz"; + version = "0.11"; + outputs = [ "out" "man" "info" ]; + + nativeBuildInputs = [ lzip texinfo ]; + buildInputs = [ lzlib ]; + + src = fetchurl { + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; + sha256 = "sha256-PalRMerepfYDSaDs4irck+1v5Gy/vlB9CyU6omWUXlk="; + }; + + enableParallelBuilding = true; + makeFlags = [ "CXX:=$(CXX)" ]; + doCheck = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/${pname}.html"; + description = + "Massively parallel combined implementation of the tar archiver and the lzip compressor"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d6b5858c6b2..7674300b4e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9915,6 +9915,8 @@ with pkgs; target-isns = callPackage ../os-specific/linux/target-isns { }; + tarlz = callPackage ../tools/archivers/tarlz { }; + tarsnap = callPackage ../tools/backup/tarsnap { }; tarsnapper = callPackage ../tools/backup/tarsnapper { }; From b5b74c914e135834ee3d88c76a3db9f563ed4ca7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 3 Dec 2021 12:22:31 +0100 Subject: [PATCH 11/12] m17n_lib: fix m17n-db support --- pkgs/tools/inputmethods/m17n-lib/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 2ca60bca3e74..cc290ab0eca9 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { strictDeps = true; # reconf needed to sucesfully cross-compile - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ m17n_db ]; + nativeBuildInputs = [ + autoreconfHook pkg-config + # requires m17n-db tool at build time + m17n_db + ]; # Fails parallel build due to missing intra-package depends: # https://savannah.nongnu.org/bugs/index.php?61377 From 2db21cf063d49cf7c1265959c1799c8cc64da538 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 26 Nov 2021 16:50:20 +0000 Subject: [PATCH 12/12] =?UTF-8?q?coqPackages.equations:=201.2.4=20?= =?UTF-8?q?=E2=86=92=201.3=20(for=20Coq=208.13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/equations/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index e6d5e11fcc5f..f563d1728744 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = switch coq.coq-version [ { case = "8.14"; out = "1.3-8.14"; } - { case = "8.13"; out = "1.2.4+coq8.13"; } + { case = "8.13"; out = "1.3-8.13"; } { case = "8.12"; out = "1.2.4+coq8.12"; } { case = "8.11"; out = "1.2.4+coq8.11"; } { case = "8.10"; out = "1.2.1+coq8.10-2"; } @@ -44,6 +44,8 @@ with lib; mkCoqDerivation { release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3"; release."1.2.4+coq8.13".rev = "v1.2.4-8.13"; release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"; + release."1.3-8.13".rev = "v1.3-8.13"; + release."1.3-8.13".sha256 = "1jwjbkkkk4bwf6pz4zzz8fy5bb17aqyf4smkja59rgj9ya6nrdhg"; release."1.3-8.14".rev = "v1.3-8.14"; release."1.3-8.14".sha256 = "19bj9nncd1r9g4273h5qx35gs3i4bw5z9bhjni24b413hyj55hkv";