From d6915ebb3f5011bc66b88a591b267b71ff884525 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 7 Aug 2021 03:20:36 +0000 Subject: [PATCH 01/47] buildFHSUserEnvBubblewrap: allow for non-x86 platforms --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 945b9287ed00..b934f44da90b 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -22,8 +22,10 @@ # /lib will link to /lib32 let - is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; - isMultiBuild = multiPkgs != null && is64Bit; + inherit (stdenv) is64Bit; + + # use of glibc_multi is only supported on x86_64-linux + isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux; isTargetBuild = !isMultiBuild; # list of packages (usually programs) which are only be installed for the From d48f6467e223216fbb886043c51de8c8dcbf2cfe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 7 Aug 2021 03:21:16 +0000 Subject: [PATCH 02/47] plex: use buildFHSUserEnvBubblewrap --- 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 c6e0cc915c0b..c650468c1840 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9444,7 +9444,9 @@ with pkgs; inherit (callPackage ../servers/plik { }) plik plikd; - plex = callPackage ../servers/plex { }; + plex = callPackage ../servers/plex { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; plexRaw = callPackage ../servers/plex/raw.nix { }; psitransfer = callPackage ../servers/psitransfer { }; From efb35dff8a38ea5277fa29aecc5920de2c022714 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 28 Jul 2022 14:02:46 -0700 Subject: [PATCH 03/47] stdenv/linux/bootstrap-files: add mipsel-linux (mips32) --- pkgs/stdenv/linux/bootstrap-files/mipsel.nix | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/stdenv/linux/bootstrap-files/mipsel.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mipsel.nix b/pkgs/stdenv/linux/bootstrap-files/mipsel.nix new file mode 100644 index 000000000000..42f2e871d92e --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/mipsel.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/185311909 +# +# Which used nixpkgs revision 5bd14b3cfe2f87a2e2b074645aba39c69563e4bc +# to instantiate: +# +# /nix/store/184fa520zv8ls9fzcqyfa5dmkp8kf6xr-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu.drv +# +# and then built: +# +# /nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/busybox"; + hash = "sha256-EhuzjL52VEIOfEcFdVGZaDMClQbMc9V9ISrTUNaA7HQ="; + executable = true; + }; + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/bootstrap-tools.tar.xz"; + hash = "sha256-OEGgLJOLnV+aobsb+P8mY3Dp8qbeVODBH6x3aUE/MGM="; + }; +} From 3670639415ad0e12934af9df2b833217c2102c66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 00:58:44 +0000 Subject: [PATCH 04/47] mod: 0.4.1 -> 0.4.2 --- pkgs/development/tools/mod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index c1d17bba57b9..837b431a5f46 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-IPdZ2PSS4rYVoMxrunse8Z2NHXLjXAoBcDvB6D70ki0="; + sha256 = "sha256-ZmBh59za1OaFObmNzLtuLKkbR0mBeh6OeD+EHton0nE="; }; - vendorSha256 = "sha256-1+06/yXi07iWZhcCEGNnoL2DpeVRYMW/NdyEhZQePbk="; + vendorSha256 = "sha256-+87QR3l9XBJVsx4+8ixaidTHaKyLAxMA9CguOlTVoHM="; doCheck = false; From 3aa2d9376dc7d9b8a23b9bd43785e127f7e00ba4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 01:18:01 +0000 Subject: [PATCH 05/47] mustache-go: 1.3.1 -> 1.4.0 --- pkgs/development/tools/mustache-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 70997a7a29d5..46df83a66cdf 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "mustache-go"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-3mGxbgxZFL05ZKn6T85tYYjaEkEJbIUkCwlNJTwoIfc="; + sha256 = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; }; vendorSha256 = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA="; From 063d68accc0931d58611199d615a0b525f6ac04b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 19:04:09 +0000 Subject: [PATCH 06/47] log4cplus: 2.0.7 -> 2.0.8 --- pkgs/development/libraries/log4cplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 160cdabed708..6cc40fc70921 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "log4cplus"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; - sha256 = "sha256-j626/uK6TlWKD3iEJhPJ+yOcd12D8jNA0JEITA4bEqs="; + sha256 = "sha256-yjaqNmA20cYfwDZqn/vPMrrVXXSHiyw2qcNNzAC4oMo="; }; meta = { From a7b9a7b1e8c74843a321a5ad36e9b90da763bd6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 06:49:21 +0000 Subject: [PATCH 07/47] pkcs11helper: 1.28 -> 1.29.0 --- pkgs/development/libraries/pkcs11helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 4de361a59842..660313092202 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.28"; + version = "1.29.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "sha256-gy04f62TX42mW4hKD/jTZXTpz9v6gQXNrY/pv8Ie4p0="; + sha256 = "sha256-HPaPmsCJ81NaS7mgRGbR7KFG6AM3s6HXdWKdfREhcLc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From cce0acf4bcce6baf64b6f236549c0ae0754390fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 13:48:06 +0000 Subject: [PATCH 08/47] elinks: 0.15.0 -> 0.15.1 --- pkgs/applications/networking/browsers/elinks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1daa5d351a8c..3278191a9c53 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-2TF0rbmjwhwV2AVUXjfzoprzpeqrETis3AFhMftpaZQ="; + sha256 = "sha256-9OEi4UF/4/IRtccJou3QuevQzWjA6PuU5IVlT7qqGZ0="; }; buildInputs = [ From 89f690790ae8638042a450a94d22d9bd94fd72d1 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Mon, 1 Aug 2022 03:10:32 +1000 Subject: [PATCH 09/47] stegsolve: init at 1.3 --- pkgs/tools/graphics/stegsolve/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/graphics/stegsolve/default.nix diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/tools/graphics/stegsolve/default.nix new file mode 100644 index 000000000000..56ad908d41a2 --- /dev/null +++ b/pkgs/tools/graphics/stegsolve/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem }: + +stdenv.mkDerivation rec { + pname = "stegsolve"; + version = "1.3"; + + src = fetchurl { + # No versioned binary is published :( + url = "http://www.caesum.com/handbook/Stegsolve.jar"; + sha256 = "0np5zb28sg6yzkp1vic80pm8iiaamvjpbf5dxmi9kwvqcrh4jyq0"; + }; + + dontUnpack = true; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = pname; + desktopName = "Stegsolve"; + comment = "A steganographic image analyzer, solver and data extractor for challanges"; + exec = pname; + categories = [ "Graphics" ]; + }) + ]; + + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + export JAR=$out/share/java/stegsolve/stegsolve.jar + install -D $src $JAR + makeWrapper ${jre}/bin/java $out/bin/stegsolve \ + --add-flags "-jar $JAR" + + runHook postInstall + ''; + + meta = with lib; { + description = "A steganographic image analyzer, solver and data extractor for challanges"; + homepage = "http://www.caesum.com/handbook/stego.htm"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.unfree; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb54ec331072..09f8a37c07a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21263,6 +21263,8 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; + stegsolve = callPackage ../tools/graphics/stegsolve { }; + StormLib = callPackage ../development/libraries/StormLib { }; stxxl = callPackage ../development/libraries/stxxl { }; From a47212c175d3c484e05551fce118ac74cd44a674 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 13:29:59 +0000 Subject: [PATCH 10/47] fio: 3.30 -> 3.31 --- 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 42ece88147ba..5939729492d3 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.30"; + version = "3.31"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-X2B8xlCLSHDgTaH55TUJq4WcaObZy/fvfkQ0j3J9Kzo="; + sha256 = "sha256-wqm9yjrJKP3JgsLmPnu14Pi2zm0iTdGcTOGOqXmZslM="; }; buildInputs = [ python3 zlib ] From db1c79d7673f2f15a9fe86e2b600348202d98b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 04:02:56 +0000 Subject: [PATCH 11/47] vendir: 0.26.0 -> 0.30.0 --- pkgs/development/tools/vendir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index d6ff0825737a..b20db017ce3c 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.26.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-a/fftMJuN6YnjPP0Gk6bMckoCouwgtxhf23OuyLR5Tk="; + sha256 = "sha256-iIqfm07qO5qf7mYHdBJVRiokRLHdE7qS2mjaeU9G3U4="; }; vendorSha256 = null; From 3d058aeef7cb6c9d67fca760f885eb422722235c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 14 Aug 2022 16:17:58 +0200 Subject: [PATCH 12/47] perlPackages.TestMockHTTPTiny: init at 0.002 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 272cbeb38e66..6883f6b880bc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22605,6 +22605,21 @@ let }; }; + TestMockHTTPTiny = buildPerlPackage { + pname = "Test-Mock-HTTP-Tiny"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OD/ODYNIEC/Test-Mock-HTTP-Tiny-0.002.tar.gz"; + sha256 = "sha256-+c+tfYUEZQvtNJO8bSyoLXuRvDcTyGxDXnXriKxb5eY="; + }; + propagatedBuildInputs = [ TestDeep URI ]; + meta = { + homepage = "https://github.com/odyniec/p5-Test-Mock-HTTP-Tiny.git"; + description = "Record and replay HTTP requests/responses with HTTP::Tiny"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestMockModule = buildPerlModule { pname = "Test-MockModule"; version = "0.175.0"; From cbf423d754116227bf1e1eb3bef47728ac0c5272 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 20:05:11 +0200 Subject: [PATCH 13/47] python310Packages.netmiko: 4.1.1 -> 4.1.2 --- pkgs/development/python-modules/netmiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 9686ae0f0881..97a6b7fac0d7 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.1.1"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZSmxHaFm0wCarBEzp+7bL7r2EQxRm7tLT0j4ZdjarJo="; + sha256 = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; }; buildInputs = [ setuptools ]; From b8d78111a42a2aa194a2f1f83680b8bba5cef71d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 20:27:12 +0200 Subject: [PATCH 14/47] python310Packages.pyswitchbot: 0.18.7 -> 0.18.10 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 0258e3c8b517..1f42d140d564 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.7"; + version = "0.18.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-TAFrrCwlcbKoQk6puoSx2sk1WeucThf7614RNQ1NFbM="; + hash = "sha256-tK5U94rHPz/LHU4qAj1yv8CtMhjpAIQ1ktFooVIIqiw="; }; propagatedBuildInputs = [ From 90ba8bfb8a8cadb6736d24d18473274647d8a105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 22:44:49 +0000 Subject: [PATCH 15/47] findomain: 8.1.1 -> 8.2.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index a1020a319a7d..105dce78c0ac 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-ngT9ZtPsCzcmZbwpmzbEcSUTHPezzdyAB12qrm5Z6n0="; + sha256 = "sha256-VT4iPm6CbuKw9D53eSvunRC4Yvn94D5J95JJyq1Za9M="; }; - cargoSha256 = "sha256-nHNS1Uskggm5e1paWRSiL4HHcooDbYe0toMwR05OkDQ="; + cargoSha256 = "sha256-gwBsIFhMHTISlKXCBqhzYhq0p5yX0OE0/zcU1yTOADQ="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 9c6f7712a246d1c1aae7279de9684897dc015542 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:19:55 +0200 Subject: [PATCH 16/47] mariadb: sha256 -> hash --- pkgs/servers/sql/mariadb/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 71b638b9ab8c..2e11bbbf032f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -31,7 +31,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds src = fetchurl { url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; - inherit (packageSettings) sha256; + inherit (packageSettings) hash; }; nativeBuildInputs = [ cmake pkg-config ] @@ -239,26 +239,26 @@ in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 version = "10.4.25"; - sha256 = "1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + hash = "sha256:1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 version = "10.5.16"; - sha256 = "19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + hash = "sha256:19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 version = "10.6.8"; - sha256 = "0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + hash = "sha256:0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 version = "10.7.4"; - sha256 = "0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + hash = "sha256:0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 version = "10.8.3"; - sha256 = "14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + hash = "sha256:14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; }; } From 7ea9e62df1ffe2d59de1d0ea271620cd44bd641e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:20:37 +0200 Subject: [PATCH 17/47] mariadb_104: 10.4.25 -> 10.4.26 https://mariadb.com/kb/en/mariadb-10426-release-notes/ Fixes: - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2e11bbbf032f..63522457761a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -238,8 +238,8 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.25"; - hash = "sha256:1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + version = "10.4.26"; + hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8="; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 From aeb72f7668c480ff4d90f7119d6343011c8d5b2e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:22:59 +0200 Subject: [PATCH 18/47] mariadb_105: 10.5.16 -> 10.5.17 https://mariadb.com/kb/en/mariadb-10517-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 63522457761a..c0036f9d7759 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -243,8 +243,8 @@ in { }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.16"; - hash = "sha256:19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + version = "10.5.17"; + hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E="; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 From c7aba71f1ce2df31b26f9eeef9d470e90b4b72f8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:23:59 +0200 Subject: [PATCH 19/47] mariadb_106: 10.6.8 -> 10.6.9 https://mariadb.com/kb/en/mariadb-1069-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c0036f9d7759..c2c52abdbc24 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -248,8 +248,8 @@ in { }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.8"; - hash = "sha256:0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + version = "10.6.9"; + hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 From 4131e59c77428ca97ece087d8b709f40fc0dad0a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:25:57 +0200 Subject: [PATCH 20/47] mariadb_107: 10.7.4 -> 10.7.5 https://mariadb.com/kb/en/mariadb-1075-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c2c52abdbc24..47a7f2ded045 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -252,9 +252,9 @@ in { hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { - # Supported until 2023-02 - version = "10.7.4"; - hash = "sha256:0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + # Supported until 2023-02. TODO: remove ahead of 22.11 release. + version = "10.7.5"; + hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo="; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 From e710cd5106ed3d890f9cfa7ba21c36635eea0e49 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:26:18 +0200 Subject: [PATCH 21/47] mariadb_108: 10.8.3 -> 10.8.4 https://mariadb.com/kb/en/mariadb-1084-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 47a7f2ded045..706188b40305 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -258,7 +258,7 @@ in { }; mariadb_108 = mariadbPackage { # Supported until 2023-05 - version = "10.8.3"; - hash = "sha256:14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + version = "10.8.4"; + hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; }; } From 4666fc08fcc3669a83f9acafa37accd78de4c11e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 05:51:07 +0000 Subject: [PATCH 22/47] python310Packages.vowpalwabbit: 9.2.0 -> 9.3.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 8e501972443e..8bc7c0badc1e 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.2.0"; + version = "9.3.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-hh1AdMO9G2OwnG4qFiEbMHVpKwFGc7MBiOnde0vN9aU="; + sha256 = "sha256-lIvSpgnXHiFEMrdObAODh5/T/J8rXsPVIRyWCnt2w7Q="; }; nativeBuildInputs = [ From 1f744728a9eaa7abf36608a3a9ff1eed4eaa0cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 10:05:40 +0000 Subject: [PATCH 23/47] ansible-lint: 6.3.0 -> 6.4.0 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index a3867db819f4..90da98520120 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.3.0"; + version = "6.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9X9SCuXYEM4GIVfcfWM5kK0vvsgbu7NMzEzjoMIfzTg="; + sha256 = "sha256-xadjBsrpBqJgz3KGyofE0DukSSsu17/qIa0R/fPH6NE="; }; postPatch = '' From 9bf60e07c1ec87ee143c0670d53f50e632e12f3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 10:44:56 +0000 Subject: [PATCH 24/47] cargo-license: 0.4.2 -> 0.5.0 --- pkgs/development/tools/rust/cargo-license/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index 6202e297b9a9..8d6e8ca6ebfe 100644 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-license"; - version = "0.4.2"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rAHw5B/rK0N8myTzTyv/IUq3o+toWO5HOSaHQko2lPI="; + sha256 = "sha256-z68idQqjH0noNZLwoTtnLrIOXZPG4kAYS9+7yrFXKOA="; }; - cargoSha256 = "sha256-DkINY3j0x0fUynMX8+pxNFwKI/YGqEv1M2a55FuKBGY="; + cargoSha256 = "sha256-8QgDKgJC5l2h5ysQaICjToI7gGxnmlolTwEtxHJMlj8="; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; From fd99bc4e3903d0559cbd3b71e096aeb0ee51fa39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 13:03:31 +0000 Subject: [PATCH 25/47] igrep: 0.5.0 -> 0.5.1 --- pkgs/tools/text/igrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index bb93574f1ffb..7869e1f478e2 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-mJtxqwbqofiDuiGokn24qdnck27w7w/3A5mdqZIU88U="; + sha256 = "sha256-Blfkis0Ix0qhSt83YxRqJQJ2oQQK9DGmI60OkyQN5CE="; }; - cargoSha256 = "sha256-ikU4SRLu7PQGbidPmf2W39e3sE8QY8YMU6Q0eWhgvLM="; + cargoSha256 = "sha256-wEprTtD9/kKtGsbpj7gR+PjsDSAdl39ZoeU5BAGERRQ="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From a3d5cf1dd2853306d50397d8bfdee0d7566704e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 21:48:46 +0000 Subject: [PATCH 26/47] python310Packages.recoll: 1.32.5 -> 1.32.7 --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 7ba18bf9edc5..d73cd11036a4 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,11 +35,11 @@ mkDerivation rec { pname = "recoll"; - version = "1.32.5"; + version = "1.32.7"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UvRpJkapN9nXHy3TY7SVdZ/sy8f3QCHkg3/FM0oP9VY="; + sha256 = "sha256-ygim9LsLUZv5FaBiqbeq3E80NHPMHweJVwggjWYzfbo="; }; configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] From 9fa27cd43ef82ce8704cbf06356f9cc8010fe486 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 06:09:37 +0000 Subject: [PATCH 27/47] docker-buildx: 0.8.2 -> 0.9.0 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index b9d5a3e9275d..6aee614b816e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-AGRdmYKd76k5tmBTTqsSHj3yOU8QSd11G5ito0O/dWY="; + sha256 = "sha256-fWtPoOUI5tgY9Xsf/FAZPlaagC5FR5FBHysWv788Pik="; }; vendorSha256 = null; From 7d959092b6905231a5e30b18271e1fded39fb7f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 11:04:05 +0000 Subject: [PATCH 28/47] gitleaks: 8.10.3 -> 8.11.0 --- pkgs/tools/security/gitleaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 4cd4d2c0a4ea..5a0d90218f3e 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.10.3"; + version = "8.11.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uLCV0eSsQhx9/U/iaAPI25w4Q6pI0PeHAPAQvOJwSWI="; + sha256 = "sha256-6zuxEEJlSppR6yBWNKjfNOndICWMnAHaO4mOI9pP7aQ="; }; - vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; + vendorSha256 = "sha256-KtBE8zOCSh/sItEpEA+I2cG3U44FJ2wxxVX3F6choUY="; ldflags = [ "-s" From 2ff9f7d156c4bf24dc04127dc968547f5c155a4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 11:04:24 +0000 Subject: [PATCH 29/47] git-cliff: 0.8.1 -> 0.9.0 --- .../version-management/git-and-tools/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index 2e467b657d64..086281a1d15c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-lRONRLTByhMalN9BKilCcQn2c9f4cxOnHJLL0l0jaOs="; + sha256 = "sha256-xmpT4xzajarc/1Iu0GqLthQlh0N9tJ1LdqJXrB4EN9Q="; }; - cargoSha256 = "sha256-1r/k3DQ/vjIjMpOHYCRRosbZ22iAFkuq4EbZUcZoWn0="; + cargoSha256 = "sha256-f4tB37WiHompXjXqdVy+dNEIn5rhNqda8JTSVUOOlcE="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 9e773ac11fcab22a8ce17cf967a15f3d576ef7b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:02:08 +0200 Subject: [PATCH 30/47] nuclei: 2.7.5 -> 2.7.6 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 16f35f3c9823..f441772dbc17 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R9Z+xcmrzv89ocDWfWqSLhrgeOSmsnqmPYGUmULAJAI="; + sha256 = "sha256-KFTVXHATWeKL+fvB52IekT9WMa61Aca0bDJ7g1n1kfU="; }; - vendorSha256 = "sha256-jvgwVtYndf+xbGJycnUidMUMDGFRIVJtSAA4Akd64Dk="; + vendorSha256 = "sha256-hzKGqX0YPo4lhp0RTmeQlhUsvG2XhZxkl/TtI9YjEoY="; modRoot = "./v2"; subPackages = [ From fe5e97d2b8b45f4aa240c9b9e1fbfa70b35f1341 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:08:06 +0200 Subject: [PATCH 31/47] dnstwist: 20220131 -> 20220815 --- pkgs/tools/networking/dnstwist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 3fa6e352bc8e..03f31e5064b8 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20220131"; + version = "20220815"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = version; - sha256 = "sha256-2sRKRzYR6F2cvz9K7MBe2JIorJkPQ5M2/SRKXGTBVGk="; + sha256 = "sha256-cmwgnjhfTqehMCu6mN0840NIaTN8gf4r098ULVj0yPI="; }; propagatedBuildInputs = with python3.pkgs; [ From 435d3c17ed4031070ef4b804e403d926a795e62e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:29 +0200 Subject: [PATCH 32/47] python310Packages.archinfo: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 3c5bead9d03c..651404e7fedc 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ili+jbrCKQCRD5eIWZBZqlX8wRaHiY6fC1QFEE2YOng="; + hash = "sha256-kWZ5z9Tn0SAqrGP4gtGfPny+kj/2ibSdTwp+0RCx40s="; }; checkInputs = [ From d9e7c010510b4f1084fc9ca4a067717b37a9c8e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:34 +0200 Subject: [PATCH 33/47] python310Packages.ailment: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index c56b09cb9b57..30c524ce9bce 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-fnCeNW0Rccu6e1WrmLeHgUnlxMHh9t1q10DtzyVymP8="; + hash = "sha256-Axjyqn1TtZbYdgaC6hOhIQM3FBs0a1oHNK8wLuWQLHM="; }; propagatedBuildInputs = [ From e7e8cbffebdbf3beac09df540e14ec787d9845c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:51 +0200 Subject: [PATCH 34/47] python310Packages.pyvex: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 6d365ef07b46..7a8d9f2b40ee 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YW8kfCs9j4Ay0Kw75MFZDp24NZrcmQ+82sOdJdpBsPI="; + hash = "sha256-xKy/+MbJJEYWXalvYhVi/J7IAn1CSrvkeg18vM0fy4k="; }; propagatedBuildInputs = [ From b324a8a0ccc7ea4e5365dc7c544c6a7cdfebea87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:57 +0200 Subject: [PATCH 35/47] python310Packages.claripy: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 1459493ef0c8..78457c2da6ce 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-kZs2BYVfXCqi1v/cnJCDtLsEKc7xh8nG59G4N1RVSjs="; + hash = "sha256-802ToJGxwJSFcnl3suQMPNz0/7HnqvqxCpy9u7iU6EE="; }; propagatedBuildInputs = [ From e094abb0023c858438f460be2479294fea7cbf9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:12:02 +0200 Subject: [PATCH 36/47] python310Packages.cle: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 7a0177ad2d43..1932856fd956 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.13"; + version = "9.2.14"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mgEDYUh3ZYvlcj8u3M3Rpfi57CA0MYuf2C3eZ4ElAzA="; + hash = "sha256-ueR5reEmaI9drFMQn/CBHCW7DmsTWWYi1zCNaUQ2y7g="; }; propagatedBuildInputs = [ From c68e496f8e21d71e8613be1e4f354854006e3228 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:12:10 +0200 Subject: [PATCH 37/47] python310Packages.angr: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 63165f6214e1..dde5372e1870 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-yEYqwyRJ/LN9q0f5vJIVMnVXQxRht73zDifWeevGc80="; + hash = "sha256-lxquiow2hI0xqdPLyZTZtxIo5nR60OtJV/kf6ukGF4c="; }; propagatedBuildInputs = [ From d3e5bd022862cc1bcae505ddf746531269d51dd4 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 17 Aug 2022 10:47:13 -0400 Subject: [PATCH 38/47] nixos: Don't enable packagekit by default --- nixos/modules/services/desktops/system-config-printer.nix | 3 ++- nixos/modules/services/x11/desktop-managers/gnome.nix | 3 ++- nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixos/modules/services/desktops/system-config-printer.nix index 09c68c587b43..55f27b0e6534 100644 --- a/nixos/modules/services/desktops/system-config-printer.nix +++ b/nixos/modules/services/desktops/system-config-printer.nix @@ -34,7 +34,8 @@ with lib; ]; # for $out/bin/install-printer-driver - services.packagekit.enable = true; + # TODO: Enable once #177946 is resolved + # services.packagekit.enable = true; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index bbecd2796aee..b69102f046a2 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -361,7 +361,8 @@ in services.gnome.tracker-miners.enable = mkDefault true; services.gnome.tracker.enable = mkDefault true; services.hardware.bolt.enable = mkDefault true; - services.packagekit.enable = mkDefault true; + # TODO: Enable once #177946 is resolved + # services.packagekit.enable = mkDefault true; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 2ada36c12a46..94de7f4dd7db 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -134,7 +134,8 @@ in services.bamf.enable = true; services.colord.enable = mkDefault true; services.fwupd.enable = mkDefault true; - services.packagekit.enable = mkDefault true; + # TODO: Enable once #177946 is resolved + # services.packagekit.enable = mkDefault true; services.power-profiles-daemon.enable = mkDefault true; services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; From 881512e23f51f0c00f5adb58788998aca65ebea3 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Wed, 10 Aug 2022 22:46:00 +0200 Subject: [PATCH 39/47] x11: Source .profile and .xprofile Other popular distros (OpenSuse, Ubuntu, Gentoo, Arch) read $HOME/.profile when starting X11 display managers. When moving to nixOS, that is then broken leading to unpredictable behavior (probably programs not working). This adds similar behavior to https://github.com/sddm/sddm/blob/develop/data/scripts/Xsession Related to #185979 --- nixos/modules/services/x11/display-managers/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index cc94fe7c0bef..03bf5d1cd2da 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -35,6 +35,10 @@ let # Shared environment setup for graphical sessions. . /etc/profile + if test -f ~/.profile; then + source ~/.profile + fi + cd "$HOME" # Allow the user to execute commands at the beginning of the X session. From bdf889ce6daadb9425157351b7927ae380062857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 15:04:31 +0000 Subject: [PATCH 40/47] libjaylink: 0.2.0 -> 0.3.0 --- pkgs/development/libraries/libjaylink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix index 6aac7675dcdc..bf42624f7651 100644 --- a/pkgs/development/libraries/libjaylink/default.nix +++ b/pkgs/development/libraries/libjaylink/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libjaylink"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.zapb.de"; owner = "libjaylink"; repo = "libjaylink"; rev = version; - sha256 = "0ndyfh51hiqyv2yscpj6qd091w7myxxjid3a6rx8f6k233vy826q"; + sha256 = "sha256-90obLaSE3oxrocyJWZ4+j4U4GuPIZEiiIQqenu4vsJg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 59888d2218772b7bfde2929be29e586de418beb5 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Aug 2022 22:36:45 +0300 Subject: [PATCH 41/47] build-fhs-userenv-bubblewrap: fix eval --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index ddd97704b859..7ebcba73708c 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -22,7 +22,7 @@ # /lib will link to /lib32 let - inherit (stdenv) is64Bit; + inherit (stdenv) is64bit; # use of glibc_multi is only supported on x86_64-linux isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux; @@ -141,7 +141,7 @@ let setupLibDirsTarget = '' # link content of targetPaths cp -rsHf ${staticUsrProfileTarget}/lib lib - ln -s lib lib${if is64Bit then "64" else "32"} + ln -s lib lib${if is64bit then "64" else "32"} ''; # setup /lib, /lib32 and /lib64 From f766110c2058332247d38ef4bec6bf4da35bbd20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 20:06:20 +0000 Subject: [PATCH 42/47] python310Packages.hcloud: 1.17.0 -> 1.18.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index ad8e79b63fd1..3d8c2e53db27 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.17.0"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+BQuBDi+J3xvod3uE67NXaFStIxt7H/Ulw3vG13CGeI="; + hash = "sha256-oh2UDN6PDB/RCgWBsGGOuECm9ZJAT6r9tgcBAfRSX/Y="; }; propagatedBuildInputs = [ From 2e8dc051ebd58ca27c4f3e429bc1eaa4c3e6c347 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 20:37:52 +0000 Subject: [PATCH 43/47] python310Packages.iminuit: 2.15.2 -> 2.16.0 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 386bd1961208..246f04618f2d 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.15.2"; + version = "2.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YKx9L+lAXJIGZ1IpJz9AFhHT9d+iKUJUFkbEYltZ8eo="; + hash = "sha256-ECSlGdvI/VLV/So3ef1IWwm8J8QFVt74tvkWlUIxmdY="; }; nativeBuildInputs = [ From d17a7fb13de9ffb9b220ec65e3b311b94682f519 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 22:51:52 +0200 Subject: [PATCH 44/47] python310Packages.hahomematic: 2022.8.7 -> 2022.8.8 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 33274119a309..fac21f83d565 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.7"; + version = "2022.8.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-HSxGCytQ099GCG3LanExOEp9DYeboQ2fS0QxHbtSI3s="; + sha256 = "sha256-H5XGidHvFF75uuDoUHyN5N81M+F2m47vUYwtHSCM8W0="; }; propagatedBuildInputs = [ From 42ca2379ba38a09bd740ae2fad7d95d32b907c35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 22:52:23 +0200 Subject: [PATCH 45/47] python310Packages.hahomematic: 2022.8.8 -> 2022.8.9 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index fac21f83d565..394fcc53e369 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.8"; + version = "2022.8.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-H5XGidHvFF75uuDoUHyN5N81M+F2m47vUYwtHSCM8W0="; + sha256 = "sha256-tiCSemX68Bfe3+E+xMhHKfMH8ZW5ffE89vv66Vmvju4="; }; propagatedBuildInputs = [ From ee0fedf7c2b8197ff39eab858ec721d4f6e084cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 22:52:45 +0200 Subject: [PATCH 46/47] python310Packages.hahomematic: 2022.8.9 -> 2022.8.10 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 394fcc53e369..f90e414d17e7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.9"; + version = "2022.8.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-tiCSemX68Bfe3+E+xMhHKfMH8ZW5ffE89vv66Vmvju4="; + sha256 = "sha256-JyHIX0G6REIRJDxSrGwZr0mMvAE0R1/zkullh/SXAXA="; }; propagatedBuildInputs = [ From 3e43b5e4bc1d80da0a39bf0155357d9bd4495cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 22:04:33 +0000 Subject: [PATCH 47/47] python310Packages.pymupdf: 1.20.1 -> 1.20.2 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a516525e3bba..daf2197f8337 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.20.1"; + version = "1.20.2"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "sha256-MFwaZLj7L9Rl4nzIvcvw9kIk8Oxtd2Pj9fLKZ4MTZkk="; + sha256 = "sha256-Au7fAfV8a6+16GZ86gCIotJSJkPEcQDxkIvsOmioSIg="; }; postPatch = ''