From b0dc3d26f21f96400d4ab0310ef767f325a9ced6 Mon Sep 17 00:00:00 2001 From: Galen Huntington Date: Wed, 26 Jul 2023 12:15:32 -0700 Subject: [PATCH 01/97] doc/stdenv: Minor syntax fix. --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a0f81b97f6bc..f7c27af0c642 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1164,7 +1164,7 @@ someVar=$(stripHash $name) ### `wrapProgram` \ \ {#fun-wrapProgram} -Convenience function for `makeWrapper` that replaces `<\executable\>` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations). +Convenience function for `makeWrapper` that replaces `` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations). If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided. From fbb3f8286622e37e903d644b199e27492cf26ba5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 16:39:22 +0000 Subject: [PATCH 02/97] pkg: 1.20.4 -> 1.20.5 --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 25c3fd134324..800400ba93c4 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.20.4"; + version = "1.20.5"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-GW29jbFt68ITJfmuxkwl8c39mA+ObYiV6NeT/OXPlyM="; + sha256 = "sha256-svAxEBRnqwWhmu3aRfeGeEjXfADbb1zWPj+REK9fsDM="; }; setOutputFlags = false; From 25e0861024ed5bc257d56b88130906877ace61ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 05:20:09 +0000 Subject: [PATCH 03/97] utf8cpp: 3.2.3 -> 3.2.4 --- pkgs/development/libraries/utf8cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index 147248ee3461..c32c6e1e52f5 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4="; + sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; }; cmakeFlags = [ From a5017e3c3af29805796e9333438a9a55ccefbc23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 06:58:03 +0000 Subject: [PATCH 04/97] besu: 23.4.1 -> 23.4.4 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 1aeb8a1eec5f..aa963a499af5 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.4.1"; + version = "23.4.4"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-SdOnoGnK4wdJcJPYNPhzzngEpG3VkgfV6DIUWVMtMY4="; + sha256 = "sha256-vUdtI1tv4fI2pivHCfQch962i3LEe7W1jla52Sg68sQ="; }; nativeBuildInputs = [ makeWrapper ]; From be63df415e9d84e879debd5c3336d2642596a8ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 08:59:29 +0000 Subject: [PATCH 05/97] ibus-engines.table-others: 1.3.16 -> 1.3.17 --- .../inputmethods/ibus-engines/ibus-table-others/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 89e4d3d15cd1..c997c20c8d26 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.16"; + version = "1.3.17"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TybqFQ2EgYo4zCYXwDJ0dke7HSzkZXs0lG2zR2XmlG4="; + hash = "sha256-7//axHjQ1LgLpeWR4MTI8efLURm4Umj4JV3G33Y0m0g="; }; nativeBuildInputs = [ pkg-config python3 ]; From dc1330d7d7877f49ac06c8a9059dd6b07d581f09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 14:18:54 +0000 Subject: [PATCH 06/97] libburn: 1.5.4 -> 1.5.6 --- pkgs/development/libraries/libburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index ba24182ade80..fe1b789fc42f 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q="; + sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs="; }; meta = with lib; { From c34b58af4a5697644974b451bc9b70cc0466ceda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 15:02:10 +0000 Subject: [PATCH 07/97] weave-gitops: 0.28.0 -> 0.29.0 --- .../networking/cluster/weave-gitops/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix index b9e5e023fe81..607955ef5c68 100644 --- a/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chL88vWUMN4kcuh8g2ckWOqYAs9JwE0vnm69zLd5KIM="; + sha256 = "sha256-d/MC+QJypLvURLRRp4U3oErf+MdyJ291Pa+gNPkV4xQ="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorHash = "sha256-EV8MDHiQBmp/mEB+ug/yALPhcqytp0W8V6IPP+nt9DA="; + vendorHash = "sha256-qwuV/c4lWjtmLp197EOScgZHMe4Wmnbj/Jy8x0n2VSo="; subPackages = [ "cmd/gitops" ]; From c92c960150fa39336901439d8d04999d68fd8839 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 16:36:23 +0000 Subject: [PATCH 08/97] libdigidocpp: 3.15.0 -> 3.16.0 --- pkgs/development/libraries/libdigidocpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 9cf19fa3d312..49c3713bbe0e 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.15.0"; + version = "3.16.0"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-CNHBPeodU2EzvmQBa9KI+1vGuuD25gSwdU9dVhVG04Q="; + hash = "sha256-XgObeVQJ2X7hNIelGK55RTtkKvU6D+RkLMc24/PZCzY="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; From 667d01930da84d532759a6eac04420fd533c0aee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 17:46:10 +0000 Subject: [PATCH 09/97] vmagent: 1.91.3 -> 1.93.0 --- pkgs/servers/monitoring/vmagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index a5a473db8a39..95736f726b9f 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.91.3"; + version = "1.93.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-xW31Lm+WiJ1quMaIDa7tbZuKhILTMdUviIDTRJT1Cqg="; + sha256 = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; From a8de2f00b434fb24e75c57fb397e89f941d50909 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Aug 2023 05:47:51 +0000 Subject: [PATCH 10/97] pgbackrest: 2.46 -> 2.47 --- pkgs/tools/backup/pgbackrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index 3cf9ebecfff0..5adf07df325d 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.46"; + version = "2.47"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-Jd49ZpG/QhX+ayk9Ld0FB8abemfxQV6KZZuSXmybZw4="; + sha256 = "sha256-HKmJA/WlMR6Epu5WuD8pABDh5gaN+T98lc4ejgoD8LM="; }; nativeBuildInputs = [ pkg-config ]; From 43475f181c7318e3c085bd41653ce896513dd25f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Aug 2023 06:47:31 +0000 Subject: [PATCH 11/97] stress-ng: 0.15.10 -> 0.16.04 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 889b061ac137..f93716ff4332 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.15.10"; + version = "0.16.04"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-JRdqbZAWcPBNspziM/qo2ioIaJOrMgLmx10w7NNaps0="; + hash = "sha256-Qr1t+xyl0aS2tSB+DyS7oXOkbcJRaSabS6g/qc8hdWc="; }; postPatch = '' From 78edd5b64e8c87ccbbc129aff560067bc41b4a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Aug 2023 08:46:04 +0000 Subject: [PATCH 12/97] mc: 4.8.29 -> 4.8.30 --- pkgs/applications/file-managers/mc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 65211bb54391..e83dd0379a19 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.29"; + version = "4.8.30"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; + sha256 = "sha256-Xrw8shRLlwxRSf2lVsStULeHgElGls3y0UpTIEyVx98="; }; nativeBuildInputs = [ pkg-config unzip ] From ba787d2a27c2f7c1b8596b41240516505c560fdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Aug 2023 03:23:34 +0000 Subject: [PATCH 13/97] python310Packages.ansible: 8.2.0 -> 8.3.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index f4fed78d6204..17418868dddc 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "8.2.0"; + version = "8.3.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-k1ppIf+wNKoY5lB7SeQBZ2zRUkPW+qXgXiIQCL9yXJc="; + hash = "sha256-XlgAHX1twz5dFWyjQ4g7YT7JiPaTZLCkP3Ek/ktb4vI="; }; postPatch = '' From 83705435680ebf6dc48e6adb819641280552d71b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Aug 2023 03:53:34 +0000 Subject: [PATCH 14/97] fheroes2: 1.0.6 -> 1.0.7 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 8ede4b40bda4..4e9e5ab965b1 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-FTxmcRD6PlY46HuakD/7wcBa26nEHYdWYUGmOR4R58Q="; + sha256 = "sha256-DRwCTy87mC1bXpOEaPGQc+dJaPOaKzlmJv9d/BntR7s="; }; nativeBuildInputs = [ imagemagick ]; From fb3601ed52efa1b52e4776613c009f535ca2a657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Aug 2023 22:30:44 +0000 Subject: [PATCH 15/97] netmaker: 0.20.5 -> 0.20.6 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index dab2a9406f9d..ba02c837e543 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.20.5"; + version = "0.20.6"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-bnYIyYnJhrdI8zfeOBdab8yZuK2rxTO5YO6EKlaRlHo="; + hash = "sha256-2NrqplVduDsaLGla1rzLGhX1YgZL6NBFFDVQRen7Pfk="; }; - vendorHash = "sha256-Nz1vE3SelUdgJoGQLOBXtFwAtM1VTDL9oKDQqxVi8Vg="; + vendorHash = "sha256-TrVtUv1xlz3Wbw4RY4NAzWmPE8JVk+GqPveqvfTe8e4="; inherit subPackages; From 1e7ec4773b7d7fe1123699f830f79336b69ac14e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Aug 2023 22:44:38 +0000 Subject: [PATCH 16/97] radarr: 4.6.4.7568 -> 4.7.5.7809 --- pkgs/servers/radarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 17e216a74b5c..1c93b50a1a1a 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-EDaccNDSKAkGGT4wSgPUp373M9WXwB5U6KpJS5GO24Y="; - arm64-linux_hash = "sha256-xUhWdmQ5RMXxrYge3Qz3XEC6wa2d660hgirS39E62fk="; - x64-osx_hash = "sha256-UdJd7xrL9aoIziaN4db4orEs48udXTqqongxsCt5L1Y="; + x64-linux_hash = "sha256-Y08mLq/lpWqwcffPczL+ntS7CWLmOgz9irfbhIKbL5A="; + arm64-linux_hash = "sha256-gswwyq9ZIObwrcs6PABhcN4saF8VDQHLpP2trAnVSck="; + x64-osx_hash = "sha256-MxlUQLXiCg02AMTYsAWrM4l3IfgCRIPoU0cgwT8S98g="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "4.6.4.7568"; + version = "4.7.5.7809"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; From 06366e869ebb47e0d2dbcc06396c3c027ebdd728 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 00:45:35 +0000 Subject: [PATCH 17/97] nwg-drawer: 0.3.8 -> 0.3.9 --- pkgs/applications/misc/nwg-drawer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index ad2850910cb7..009476e6bca7 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; + sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; }; - vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; + vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; buildInputs = [ cairo gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; From 0837ab431d4fab9a97890479465777ff7ecb777f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 00:50:49 +0000 Subject: [PATCH 18/97] zrok: 0.4.2 -> 0.4.5 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index bbd5c2dc260b..fa59d9f7ddf2 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-sHQD8uN8Pm/LnayW1XdWXJ90gN4cCE4sGd+Or4TlhP8="; - aarch64-linux = "sha256-VJaVC+sfqdT0BnV1v8MjzftemP4Iuln1wy3BaCTbeYA="; - armv7l-linux = "sha256-7v9u7OtUbtnzvlTBvO5zuIuTgNqualxYsrv97TZGa9U="; + x86_64-linux = "sha256-lI9FmAvUTzfukxyhjbB4mULURSQNhLcLbZ0NzIDem0g="; + aarch64-linux = "sha256-A77yPDC3MVDhc4Le+1XmHl/HRc0keYDfnS3kM1hQYL4="; + armv7l-linux = "sha256-khl0g8IDHtB53Sg4IdRzQs7A+FmUZyT/1dpKVTGnMs8="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.2"; + version = "0.4.5"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; From 63cdd30f46b40a2249c54e29ea3612b1a6d61e40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 06:25:26 +0000 Subject: [PATCH 19/97] circleci-cli: 0.1.28528 -> 0.1.28811 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 6904414601a3..6192322c2c34 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.28528"; + version = "0.1.28811"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y8KpJdJLYSsDLT6/z0/Nx9qByLdtNNBeiwFUupJxxCQ="; + sha256 = "sha256-HaBFKjVw6EzhH1oxSeKFmZUDZleFGrxjOegTVCGmrzI="; }; vendorHash = "sha256-OWdJ7nFR5hrKQf2H763ezjXkEh0PvtBcjjeSNvH+ca4="; From 0bda00c6deee9d1b2a7362849fefc7e9cf7c8471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Aug 2023 11:40:37 +0000 Subject: [PATCH 20/97] linkerd_edge: 23.8.2 -> 23.8.3 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 84b68727d23a..ca34c20a1a54 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.8.2"; - sha256 = "18lz817d1jjl8ynkdhvm32p8ja9bkh1xqkpi514cws27y3zcirrz"; - vendorSha256 = "sha256-SIyS01EGpb3yzw3NIBAO47ixAiWPX2F+9ANoeCTkbRg="; + version = "23.8.3"; + sha256 = "1mj16nzs2da530lvvsg6gh8fcgy8rwq13mryqznflgyr39x4c56i"; + vendorSha256 = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; } From c862dce860d07c7a72075ccf307f156db85287be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Aug 2023 12:50:50 +0000 Subject: [PATCH 21/97] angband: 4.2.4 -> 4.2.5 --- pkgs/games/angband/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 6c34176be375..0b24988c54f2 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-Fp3BGCZYYdQCKXOLYsT4zzlibNRlbELZi26ofrbGGPQ="; + sha256 = "sha256-XH2FUTJJaH5TqV2UD1CKKAXE4CRAb6zfg1UQ79a15k0="; }; From 0623457cba4f956f026efb148aa0620ad24d83bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Aug 2023 14:05:46 +0000 Subject: [PATCH 22/97] libyang: 2.1.80 -> 2.1.111 --- pkgs/development/libraries/libyang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 9a78bc4422c7..9102286746b6 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.80"; + version = "2.1.111"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-3Lf8JUnzD20Xq6UswCbcWpgEBs0z4OEo7CGt0vWiPhI="; + sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; }; nativeBuildInputs = [ From cceff19a9aa03e6ed19cf409e183a6d9ad709bf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Aug 2023 18:54:21 +0000 Subject: [PATCH 23/97] lima: 0.17.0 -> 0.17.2 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 3aed14d9ca95..9dc433c1716d 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EVPIb8+0pMDq7sRiG5ERHRW8Lq2NRdHiBj0zPouzwpc="; + sha256 = "sha256-0yWQhyDSDGZT6K/SeVntTdqnDzyGD244+r5kG1MFh1c="; }; - vendorHash = "sha256-BrfrCsVJ6ca16dyBHOUXFZHU8JZz2iUxcc2gGf3MF/U="; + vendorHash = "sha256-yA6qwnbRFR/V2Aaf53jLTejPKuNzbod2dVnLEQLoQkM="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; From b0679238bbdf322203b482fc588055fc56a79453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Aug 2023 09:58:41 -0700 Subject: [PATCH 24/97] html-minifier: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 31 ------------------- .../tools/html-minifier/default.nix | 30 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/tools/html-minifier/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 90aa467bd5ea..6e82b5f2bbb0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -57,6 +57,7 @@ mapAliases { eslint_d = pkgs.eslint_d; # Added 2023-05-26 flood = pkgs.flood; # Added 2023-07-25 gtop = pkgs.gtop; # added 2023-07-31 + inherit (pkgs) html-minifier; # added 2023-08-19 inherit (pkgs) htmlhint; # added 2023-08-19 hueadm = pkgs.hueadm; # added 2023-07-31 indium = throw "indium was removed because it was broken"; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1ee6dd6e46aa..0a11794b5e5b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -157,7 +157,6 @@ , "gulp" , "gulp-cli" , "he" -, "html-minifier" , "http-server" , "hsd" , "hs-airdrop" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index be13f1cffbdd..6c1ddeae92fd 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -107851,37 +107851,6 @@ in bypassCache = true; reconstructLock = true; }; - html-minifier = nodeEnv.buildNodePackage { - name = "html-minifier"; - packageName = "html-minifier"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz"; - sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; - }; - dependencies = [ - sources."camel-case-3.0.0" - sources."clean-css-4.2.4" - sources."commander-2.20.3" - sources."he-1.2.0" - sources."lower-case-1.1.4" - sources."no-case-2.3.2" - sources."param-case-2.1.1" - sources."relateurl-0.2.7" - sources."source-map-0.6.1" - sources."uglify-js-3.17.4" - sources."upper-case-1.1.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = "https://kangax.github.io/html-minifier/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; diff --git a/pkgs/development/tools/html-minifier/default.nix b/pkgs/development/tools/html-minifier/default.nix new file mode 100644 index 000000000000..6fd239fa816c --- /dev/null +++ b/pkgs/development/tools/html-minifier/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "html-minifier"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "kangax"; + repo = "html-minifier"; + rev = "v${version}"; + hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A="; + }; + + npmDepsHash = "sha256-VWXc/nBXgvSE/DoLHR4XTFQ5kuwWC1m0/cj1CndfPH8="; + + npmFlags = [ "--ignore-scripts" ]; + + dontNpmBuild = true; + + meta = { + description = "Highly configurable, well-tested, JavaScript-based HTML minifier"; + homepage = "https://github.com/kangax/html-minifier"; + license = lib.licenses.mit; + mainProgram = "html-minifier"; + maintainers = with lib.maintainers; [ chris-martin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fdcdd20e589..0b3276a0af17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19363,6 +19363,8 @@ with pkgs; confluent-cli = callPackage ../development/tools/confluent-cli { }; + html-minifier = callPackage ../development/tools/html-minifier { }; + htmlhint = callPackage ../development/tools/htmlhint { }; htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; From a93f86aada0ca790fdac364ff1a8de2691ac60ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Aug 2023 01:20:59 +0000 Subject: [PATCH 25/97] benthos: 4.18.0 -> 4.19.0 --- pkgs/development/tools/benthos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 2678da07a280..8dc8b26f43dd 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-wap11/D1PIvDt5Jk3CCyxWJNULMg62WFmiA09gc95dY="; + hash = "sha256-C/dExBN+ZBE8o3L0RBgYe4griFhv/Yd2I10em2UK/nQ="; }; - vendorHash = "sha256-pA8SBawcl8YFbUrDfWxzcrMK715xBTx1slvHoA/a9OM="; + vendorHash = "sha256-33eY+jF12lYSO1Fqm1hRLKA1+aMNxe0c9gqNl2wf10I="; doCheck = false; From 7820fd253d22a10b2548774116c6cd0d6a93ad0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Aug 2023 01:49:00 +0000 Subject: [PATCH 26/97] qcad: 3.28.1.0 -> 3.28.1.3 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 683f0eb5a8cb..f10201b4f375 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.28.1.0"; + version = "3.28.1.3"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-NizAUyj6YbfjxXDQkVaqzkp11WMJlt4FMr72i3Cn564="; + sha256 = "sha256-4Kr/zKE2VqAblNvxT9dg1325V0OCMca3MPEiG3fTxT4="; }; patches = [ From 38da5e47a6d924085a331c963df1017c4a18079e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Aug 2023 03:03:37 +0000 Subject: [PATCH 27/97] avalanchego: 1.10.5 -> 1.10.8 --- pkgs/applications/networking/avalanchego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 8a13341b119c..2894b740dd5b 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.5"; + version = "1.10.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY="; + hash = "sha256-1SD+0WkqFGInrFtVmXHz3FuOso7rooeCPMAq9eFOSDg="; }; - vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0="; + vendorHash = "sha256-7O1ENOZUkt0NPXk0KK+ydbeLB9ht17jBSH+/cmpOg8U="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; From 39132f4ee8d9fed8d357f6fafad3211648c96630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Aug 2023 06:06:02 +0000 Subject: [PATCH 28/97] codeql: 2.14.1 -> 2.14.2 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 3825f81bcf10..9bdf3829cd9e 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.1"; + version = "2.14.2"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-6gq70bF954CNUS1t38o+1YqWZORGgxM1CWcbUnRyhOU="; + sha256 = "sha256-FITcbf1+9euy55nQutDZMmRzpHxICdLBmTVHTRCyFLQ="; }; nativeBuildInputs = [ From e3b4ba396debb886ce4ce870deb6ce439b606cb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Aug 2023 19:36:59 +0000 Subject: [PATCH 29/97] ryujinx: 1.1.986 -> 1.1.999 --- pkgs/applications/emulators/ryujinx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 19e9ea8026d8..8136be89601d 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.986"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.999"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "33f544fd9248361440afd6013e0ef9d69971d6da"; - sha256 = "1cnz3j8qndfrm1iifbzswyf4vcii939naj29bvr2mp6bdwrbqi49"; + rev = "7f96dbc0242f169caeb8461237bc01a23c115f56"; + sha256 = "1fi1bfbz07k9n8civ7gv0rlksdm59wpjcq50hrj7dgwnkrlmxdi2"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; From 5b6244cb5002bd5d0516874ee1cebe020be38c83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Aug 2023 12:33:21 +0000 Subject: [PATCH 30/97] commit-mono: 1.132 -> 1.134 --- pkgs/data/fonts/commit-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index 87d5f9dab25f..1d67beb8a240 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.132"; + version = "1.134"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip"; - sha256 = "sha256-a9zxzjfOFmqemSIb4Tav0l7YtKvbyizDy+1dwPuZ4d4="; + sha256 = "sha256-r2+ehmJPwiodVZGnha8uMHaWcbbONiorrOvv6WW/kio="; stripRoot = false; }; From faf2e6345043630fbd986a6773e026743db93549 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Aug 2023 00:59:53 +0000 Subject: [PATCH 31/97] arduino-language-server: 0.7.4 -> 0.7.5 --- .../embedded/arduino/arduino-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index da3d1e7e7c60..1a0c3665ea27 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; rev = "refs/tags/${version}"; - hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; + hash = "sha256-RBoDT/KnbQHeuE5WpoL4QWu3gojiNdsi+/NEY2e/sHs="; }; subPackages = [ "." ]; - vendorHash = "sha256-SKqorfgesYE0kXR/Fm6gI7Me0CxtDeNsTRGYuGJW+vo="; + vendorHash = "sha256-tS6OmH757VDdViPHJAJAftQu+Y1YozE7gXkt5anDlT0="; doCheck = false; From 8fef15abdb43d5f679bff48d907543624282c624 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Aug 2023 16:22:35 +0200 Subject: [PATCH 32/97] python310Packages.pybox2d: init at 2.3.10 --- .../python-modules/pybox2d/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pybox2d/default.nix diff --git a/pkgs/development/python-modules/pybox2d/default.nix b/pkgs/development/python-modules/pybox2d/default.nix new file mode 100644 index 000000000000..c7a8e7d83ebf --- /dev/null +++ b/pkgs/development/python-modules/pybox2d/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, swig +}: + +buildPythonPackage rec { + pname = "pybox2d"; + version = "2.3.10"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pybox2d"; + repo = "pybox2d"; + rev = "refs/tags/${version}"; + hash = "sha256-yjLFvsg8GQLxjN1vtZM9zl+kAmD4+eS/vzRkpj0SCjY="; + }; + + nativeBuildInputs = [ + swig + ]; + + # We need to build the package explicitly a first time so that the library/Box2D/Box2D.py file + # gets generated. + # After that, the default behavior will succeed at installing the package. + preBuild = '' + python setup.py build + ''; + + pythonImportsCheck = [ + "Box2D" + "Box2D._Box2D" + ]; + + # Tests need to start GUI windows. + doCheck = false; + + meta = with lib; { + description = "2D Game Physics for Python"; + homepage = "https://github.com/pybox2d/pybox2d"; + license = licenses.zlib; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28f2118aa08b..1bd005640466 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8734,6 +8734,8 @@ self: super: with self; { pybotvac = callPackage ../development/python-modules/pybotvac { }; + pybox2d = callPackage ../development/python-modules/pybox2d { }; + pybravia = callPackage ../development/python-modules/pybravia { }; pybrowserid = callPackage ../development/python-modules/pybrowserid { }; From ba48b30bb299b1e58c364bff84d113063b93a4ba Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Aug 2023 07:44:13 +0200 Subject: [PATCH 33/97] python310Packages.gymnasium: 0.29.0 -> 0.29.1 --- .../python-modules/gymnasium/default.nix | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index 9926b3cfe915..6e9e33913fb7 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -10,34 +10,67 @@ , farama-notifications , importlib-metadata , pythonOlder +, ffmpeg +, jax +, jaxlib +, matplotlib +, moviepy +, opencv4 +, pybox2d +, pygame +, pytestCheckHook +, scipy }: buildPythonPackage rec { pname = "gymnasium"; - version = "0.29.0"; + version = "0.29.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "Farama-Foundation"; - repo = pname; + repo = "gymnasium"; rev = "refs/tags/v${version}"; - hash = "sha256-4YaEFEWSOTEdGgO1kSOleZQp7OrcOf+WAT/E0BWeoKI="; + hash = "sha256-L7fn9FaJzXwQhjDKwI9hlFpbPuQdwynU+Xjd8bbjxiw="; }; - format = "pyproject"; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - jax-jumpy cloudpickle - numpy - gym-notices - typing-extensions farama-notifications + gym-notices + jax-jumpy + numpy + typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; pythonImportsCheck = [ "gymnasium" ]; + nativeCheckInputs = [ + ffmpeg + jax + jaxlib + matplotlib + moviepy + opencv4 + pybox2d + pygame + pytestCheckHook + scipy + ]; + + disabledTestPaths = [ + # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. + "tests/envs/mujoco/test_mujoco_custom_env.py" + + # Those tests need to write on the filesystem which cause them to fail. + "tests/experimental/wrappers/test_record_video.py" + "tests/utils/test_save_video.py" + "tests/wrappers/test_record_video.py" + "tests/wrappers/test_video_recorder.py" + ]; + meta = with lib; { description = "A standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)"; homepage = "https://github.com/Farama-Foundation/Gymnasium"; From 3bf068398e66b372f3fe0de37a4699512a9a44a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Aug 2023 09:30:43 +0000 Subject: [PATCH 34/97] PageEdit: 1.9.20 -> 2.0.0 --- pkgs/applications/office/PageEdit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index b95eb6cb51e4..dd6c94615fd4 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pageedit"; - version = "1.9.20"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Sigil-Ebook"; repo = pname; rev = version; - hash = "sha256-naoflFANeMwabbdrNL3+ndvEXYT4Yqf+Mo77HcCexHE="; + hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q="; }; nativeBuildInputs = [ cmake qttranslations wrapQtAppsHook ]; From ef345b63ec7d3cc3560016aca7a1f4cbcf2aca99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Aug 2023 19:24:54 +0000 Subject: [PATCH 35/97] jellyfin-ffmpeg: 6.0-4 -> 6.0-5 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 73bbe1782b7f..d9064ee85d17 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-4"; + version = "6.0-5"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA="; + sha256 = "sha256-pKmR+IVJAaY91KiboCBkwZleMmMFToez1fW+eXyrZjs="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; From 75f5ea32fc16d8da2bc43dccc40578985db68468 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 23 Aug 2023 22:35:07 +0100 Subject: [PATCH 36/97] igraph: use finalAttrs-based self-references this allows overrideAttrs to work better --- pkgs/development/libraries/igraph/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index c0e20ba7f594..69f25fd79c83 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -24,19 +24,19 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "igraph"; version = "0.10.6"; src = fetchFromGitHub { owner = "igraph"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE="; }; postPatch = '' - echo "${version}" > IGRAPH_VERSION + echo "${finalAttrs.version}" > IGRAPH_VERSION ''; outputs = [ "out" "dev" "doc" ]; @@ -95,9 +95,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library for complex network analysis and graph theory"; homepage = "https://igraph.org/"; - changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; -} +}) From e9594e0d42fc8cca96a64e329ec2a9aedcb92cc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 02:30:45 +0000 Subject: [PATCH 37/97] svlint: 0.8.0 -> 0.9.0 --- pkgs/development/tools/analysis/svlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index b0c94ef8c647..7b5e3522ef3b 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ykAuypWBbZ+53ImzNJGsztLHG8OQLIGBHC6Z3Amu+L0="; + sha256 = "sha256-bd0epx3AciECCYi4OYG2WzTVhZ+JYnf5ebDZoMrPfmo="; }; - cargoHash = "sha256-517AXkFqYaHC/FejtxolAQxJVpvcFhmf3Nptzcy9idY="; + cargoHash = "sha256-RjjYfdcdJzIxnJFZqx93KADihN5YK+bCuk1QaPhVuGQ="; cargoBuildFlags = [ "--bin" "svlint" ]; From 34dbf216e6267d1eab8beb4050a7dd47274c7774 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 02:48:48 +0000 Subject: [PATCH 38/97] unpoller: 2.8.0 -> 2.8.1 --- pkgs/servers/monitoring/unpoller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 021bed53eb87..741142cf8fd7 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-1LfpMjKf1pLW2loyXWIJEQclYgNnXhSchlOD4JWRCEc="; + hash = "sha256-w0DcU27wrqzWxPwoY/as2vBtJQytz1482tNIXdyvHbY="; }; - vendorHash = "sha256-mRuJ9B4u62VENQmQJTkVZHzNba224ZqewjUjGZBjdz4="; + vendorHash = "sha256-2uvQhEEtsnGPQxYnNND6kM1HeN3kFlHzUXiehM+GpMs="; ldflags = [ "-w" "-s" From d8e857148c0468fb194313c8d7b326914c2038f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 03:04:08 +0000 Subject: [PATCH 39/97] s5cmd: 2.1.0 -> 2.2.0 --- pkgs/tools/networking/s5cmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/tools/networking/s5cmd/default.nix index 71d1cf51fae9..cdfa2cee6033 100644 --- a/pkgs/tools/networking/s5cmd/default.nix +++ b/pkgs/tools/networking/s5cmd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "s5cmd"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - hash = "sha256-uH6KE3sTPc2FfqOxr6cB3A8DOq+VjGsJ3KoK8riOKXk="; + hash = "sha256-4Jx9hgjj+rthiyB7eKXNcbBv9oJWfwHanPO7bZ4J/K0="; }; - vendorSha256 = null; + vendorHash = null; # Skip e2e tests requiring network access excludedPackages = [ "./e2e" ]; From f6e73e4ac1aaa7984b0e928dab392e7e3503718b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 03:51:04 +0000 Subject: [PATCH 40/97] klayout: 0.28.10 -> 0.28.11 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 9a535dfa8b52..6306400a3c12 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.10"; + version = "0.28.11"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-CDaLKBDm4slUMZ8OWm/wNub4P8LY26P8G8oIxwzJyXY="; + hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ="; }; postPatch = '' From 146074e17066cde84a857f469e80f95ab2d26335 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 11:38:49 +0000 Subject: [PATCH 41/97] xmrig-mo: 6.19.3-mo1 -> 6.20.0-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index be5d08f6ef48..99d8225f264a 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.19.3-mo1"; + version = "6.20.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-0yH+EFhzhDS/75AIjMiFbkQuHfPaJRzdr7n4/WBkeNM="; + sha256 = "sha256-yHAipyZJXwH21u4YwjUqDCsXHVrI+eSnp4Iqt3AZC9A="; }; meta = with lib; { From 2012414272ad4c9816b00c3fd71aaa424c7d1966 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 24 Aug 2023 21:43:39 +1000 Subject: [PATCH 42/97] giada: 0.24.0 -> 0.25.1 --- pkgs/applications/audio/giada/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 86cb565fa820..d2ccb6d47472 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -24,26 +24,16 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-pKzc+RRW3o5vYaiGqW9/VjYZZJvr6cg1kdjP9qRkHwM="; + rev = version; + sha256 = "sha256-SW2qT+pMKTMBnkaL+Dg87tqutcLTqaY4nCeFfJjHIw4="; fetchSubmodules = true; }; - patches = [ - # Remove when updating to the next release, this PR is already merged - # Fix fmt type error: https://github.com/monocasual/giada/pull/635 - (fetchpatch { - name = "fix-fmt-type-error.patch"; - url = "https://github.com/monocasual/giada/commit/032af4334f6d2bb7e77a49e7aef5b4c4d696df9a.patch"; - hash = "sha256-QuxETvBWzA1v2ifyNzlNMGfQ6XhYQF03sGZA9rBx1xU="; - }) - ]; - env.NIX_CFLAGS_COMPILE = toString [ "-w" "-Wno-error" @@ -82,7 +72,7 @@ stdenv.mkDerivation rec { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kashw2 ]; platforms = platforms.all; }; } From 56f2307ab6c41dda987e23eeec285e9fff3da960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 12:05:09 +0000 Subject: [PATCH 43/97] genymotion: 3.4.0 -> 3.5.0 --- pkgs/development/mobile/genymotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 01caa76f67b7..53c1dc13cdc9 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-2pYnjjskmIxQXLXwQpSz/HxoCqvK0TuRDBoh/KrVTpM="; + sha256 = "sha256-rZyTdVn0mnNLrGPehah62/AvTgUpNEtzn+Di1O3G3Sg="; }; nativeBuildInputs = [ makeWrapper ]; From aa8b09f450094844725671e84a31dbb76cd01d3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 19:53:20 +0000 Subject: [PATCH 44/97] cypress: 12.17.3 -> 12.17.4 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 4532b7743045..6802f218b523 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -18,7 +18,7 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-khMJRCGNIITvs56SHHKxoxptoMBb7lqA3FS293qfMys="; + checksum = "sha256-9f5Ewd63pLpMbewtQ0u4WsRnZQEn1lfh6b/jZ8yDSMU="; }; aarch64-linux = { platform = "linux-arm64"; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "12.17.3"; + version = "12.17.4"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; From d516998a89d36c8b25ec5600750d489b02d61fe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Aug 2023 13:29:53 +0000 Subject: [PATCH 45/97] clojure: 1.11.1.1386 -> 1.11.1.1405 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 2aaefaed7a43..62b9f2d841b9 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1386"; + version = "1.11.1.1405"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-e5RLnsydCZKRv6P/yC8FxK5AgK0Gj6YJw7E41neGYsM="; + hash = "sha256-sqKhnddOy2rKcYtM2rSiaHIihoajZ8GBfBfyU4oPtXQ="; }; nativeBuildInputs = [ From 46fd5f04994db3ffa88a37f1b555e52dc1abcab9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Aug 2023 19:22:38 +0000 Subject: [PATCH 46/97] semgrep: 1.35.0 -> 1.37.0 --- pkgs/tools/security/semgrep/common.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/tools/security/semgrep/common.nix index c144d7634cf7..da646461a20f 100644 --- a/pkgs/tools/security/semgrep/common.nix +++ b/pkgs/tools/security/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.35.0"; + version = "1.37.0"; - srcHash = "sha256-SUKswvY49Hxis5CwguXC5QSshG0sGKb23mz2IT1vNJI="; + srcHash = "sha256-oFJ43dq3DAhux0UEFDKFZnxruoRdOfCndKY6XgG3d5I="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "f7fed064dadb859f0b802b11fb60f7f77008c4d7"; - hash = "sha256-EXYRc6p94QxkOBMPOdr608JqLY6kN1AanlRfOFXxPm8="; + rev = "331603197022625f50a64dd5e3029a96a5f03ada"; + hash = "sha256-UAcWbTSCIdBGvgGSbdQ+miFOEuBvQ6m42MkU3VeErKY="; }; }; @@ -25,15 +25,15 @@ rec { core = { x86_64-linux = { platform = "any"; - hash = "sha256-ZqSbiuVKGjH+2fB0ReSw07CzTDSK35a8Adstzrvh8zA="; + hash = "sha256-Sj/6tzZMyRQAJL09X/3zgvdGTIhNibqO8usKsus9Xss="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-MusoteFarPJm8eQO7T/LrXDWUV0Wx4nw80ZvjG7HHhM="; + hash = "sha256-hC04VknZG6aYYNX7lqvkcOoVslewNqlYax+o1nV2TcM="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-xN87fp5jqes/smMrtLbZowMIuTevpDJNFNeWdo0Seu4="; + hash = "sha256-0F+ndM4+0dnxf9acwWvGdIy9iYWSqixS9IzOxa95/yM="; }; }; From 55c42e893bb68332cffd13aac9f8711c57014c58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Aug 2023 21:38:12 +0000 Subject: [PATCH 47/97] smartdns: 42 -> 43 --- pkgs/tools/networking/smartdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index a0d5e21e50e4..79b089e8e16a 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "42"; + version = "43"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - hash = "sha256-FVHOjW5SEShxTPPd4IuEfPV6vvqr0RepV976eJmxqwM="; + hash = "sha256-gwbyP2duUvZafMclPwP4uZh7A7OzAvSyqjl6Eg1N6Gg="; }; buildInputs = [ openssl ]; From c99f6eae3f973461c7da2a6c79e0e3722ca9b63c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Aug 2023 22:39:53 +0000 Subject: [PATCH 48/97] kaniko: 1.13.0 -> 1.14.0 --- pkgs/applications/networking/cluster/kaniko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 427bc8868e73..089176d7446e 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-bzMhK60BwJ7A1sGV0rutLOfgvbH/deDQNFZ8BB1hREc="; + hash = "sha256-sDZg2eKTwy3Y7Uaky4rz7EuU1EKY/S4VAEaj7GMN6Uo="; }; vendorHash = null; From f0ac17b9858bbd7e1f42cb07e12082a720e8a864 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Aug 2023 22:54:53 +0000 Subject: [PATCH 49/97] pulsar: 1.107.1 -> 1.108.0 --- pkgs/applications/editors/pulsar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index 0cdc2d81e75b..f376cff4a97f 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -23,13 +23,13 @@ let pname = "pulsar"; - version = "1.107.1"; + version = "1.108.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-stY/sutbFVWQuN6C/tkT/G5MMVypgm3Um78jk8RHF6k="; + x86_64-linux.hash = "sha256-9wxMKekowNkFX+m3h2ZeTXu/uMLyPi6IIbseJ16shG4="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-umL60+FJKT8ThnzxgzzVzsY0nhJwsNF4YvrKoruxz7U="; + aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); additionalLibs = lib.makeLibraryPath [ From e4b2bd41b64923d6a43785b3850932f0177f767f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 02:50:24 +0000 Subject: [PATCH 50/97] ombi: 4.39.1 -> 4.43.5 --- pkgs/servers/ombi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 1f648f095bde..d1a74eb4d136 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-3gvR82JiWvw+jkF68Xm/UH7OsOPqmDlVwYDaNbNf7Jg="; - arm64-linux_hash = "sha256-4ckLs7vwTffB205Pa9BOkw+6PbVOb8tVp8S2D+Ic8fM="; - x64-osx_hash = "sha256-by2+rf/pODD7RuxTEeyh1pJ+kGYVmwlVSwxDPgeNzW4="; + x64-linux_hash = "sha256-4343S9fxNmoZhbfq/ZAfI2wF7ZwIw7IyyyZUsga48Zo="; + arm64-linux_hash = "sha256-XnR/uT73luKSpYr6ieZyu0mjOy23XGs5UVDke0IU9PQ="; + x64-osx_hash = "sha256-4EoMZm++T4K2zwPw8G4J44RV/HcssAdzmKjQFqBXbwY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.39.1"; + version = "4.43.5"; sourceRoot = "."; From 0e67341785afe77a8e3f33d006871ada8c7c2b15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 05:26:21 +0000 Subject: [PATCH 51/97] vnstat: 2.10 -> 2.11 --- pkgs/applications/networking/vnstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 56a609e3de4d..6eb7271d8f30 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XBApdQA6E2mx9WPIEiY9z2vxJS3qR0mjBnhbft4LNuQ="; + sha256 = "sha256-IO5B+jyY6izPpam3Qt4Hu8BOGwfO10ER/GFEbsQORK0="; }; postPatch = '' From 14d6d59bc0a7d1577cc64c21301c4da7433815f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 07:38:14 +0000 Subject: [PATCH 52/97] easyrsa: 3.1.5 -> 3.1.6 --- pkgs/tools/networking/easyrsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 8900681443be..8790d5ada935 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "sha256-GOgwGCsutg4WsBjs1f9jiTS2fvmVMyWCoTw+J/7iZG0="; + sha256 = "sha256-VbL2QXc4IaTe6u17nhByIk+SEsKLhl6sk85E5moGfjs="; }; nativeBuildInputs = [ makeWrapper ]; From 1c36ac78e7ff3a2c7b066680ab50e5459f94f9e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 12:59:45 +0000 Subject: [PATCH 53/97] tempo: 2.2.0 -> 2.2.1 --- pkgs/servers/tracing/tempo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index eb35a2ccb2dd..9046fb9a96f8 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+qBfscfAtVr8SEqAkpjkJfWfGfEImvO7BQfKvpVvf/0="; + hash = "sha256-ols6cYKd1FVRG/fbq+oXst18eCQ3+V2032m03t3DvEc="; }; vendorHash = null; From 624d5537b6d0443ba93b86429ebc88dd7682c82e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 13:29:09 +0000 Subject: [PATCH 54/97] spire: 1.7.1 -> 1.7.2 --- pkgs/tools/security/spire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 6c64e19043a2..13e42efa7888 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.7.1"; + version = "1.7.2"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-42UEFil9b2z8vfnA5oJvkqcPuSApi61m//RZ4pKZZ5w="; + sha256 = "sha256-3D7TlL4SulLAqpVIMJ4Yl2OWnNsMYMLVJqgGhOYMiio="; }; - vendorHash = "sha256-H4INblBEWc/AuOn59lXmj5XX6mKrhmRTRVWtVhusW9k="; + vendorHash = "sha256-Vct++sjkkosBOY0Uho58MHSQoL5121kYbQTf1j+HFUk="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; From cf2aba5eeaac6edb58bbbefc1b5da47a6dd31c1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 13:58:34 +0000 Subject: [PATCH 55/97] nwg-dock: 0.3.6 -> 0.3.7 --- pkgs/applications/misc/nwg-dock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index 1156bd4a94c9..c480a1481a71 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nh6VAgQIGxNxkWnNieRope5Hj3RL0uSFuOLqg+/oucw="; + sha256 = "sha256-Ci+221sXlaqr164OYVhj8sqGSwlpFln2RRUiGoTO8Fk="; }; - vendorHash = "sha256-k/2JD25ZmVI3G9GqJnI9vz5WtRc2vo4nfAiGUt6IPyU="; + vendorHash = "sha256-GW+shKOCwU8yprEfBeAPx1RDgjA7cZZzXDG112bdZ6k="; ldflags = [ "-s" "-w" ]; From 3327b632a42b598f826f4535de9aa3a93ebadf6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 14:03:15 +0000 Subject: [PATCH 56/97] goimports-reviser: 3.3.1 -> 3.4.1 --- pkgs/development/tools/goimports-reviser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/development/tools/goimports-reviser/default.nix index 2d36c207fdbe..9f87aa67020e 100644 --- a/pkgs/development/tools/goimports-reviser/default.nix +++ b/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.3.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-JIXBC7fk/Bd3tTHiK+qtB+5CdAATaB/j1nvKOJrz4n4="; + hash = "sha256-aQVjnJ//fV3i6blGKb05C2Sw1Bum9b4/o00q6krFtVI="; }; vendorHash = "sha256-lyV4HlpzzxYC6OZPGVdNVL2mvTFE9yHO37zZdB/ePBg="; From a20979b583a9df1933e8f8528bf70f375338833b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 14:40:31 +0000 Subject: [PATCH 57/97] eventstore: 22.10.2 -> 23.6.0 --- pkgs/servers/nosql/eventstore/default.nix | 4 +- pkgs/servers/nosql/eventstore/deps.nix | 71 ++++++++++++++++++----- 2 files changed, 58 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 8ade5ff4342d..4165a6ff4390 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -14,13 +14,13 @@ in buildDotnetModule rec { pname = "EventStore"; - version = "22.10.2"; + version = "23.6.0"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "sha256-CYI1VE+6bR3UFx98IquS8rgucKmQqcHh74Jf/9CGE0k="; + sha256 = "sha256-+Wxm6yusaCoqXIbsi0ZoALAviKUyNMQwbzsQtBK/PCo="; leaveDotGit = true; }; diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/pkgs/servers/nosql/eventstore/deps.nix index b49ee16e4852..c1bdacfbf074 100644 --- a/pkgs/servers/nosql/eventstore/deps.nix +++ b/pkgs/servers/nosql/eventstore/deps.nix @@ -5,30 +5,34 @@ (fetchNuGet { pname = "CompareNETObjects"; version = "4.78.0"; sha256 = "0vs0bxnw7287rh7yigq55750hfdzh04xbcaahawfdl9467vp4dgm"; }) (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "dotnet-retire"; version = "4.0.1"; sha256 = "0zqyivj00mjagzhhkvzckdk5d5ldxhxhv7qk985pis9krfkgzhww"; }) - (fetchNuGet { pname = "Esprima"; version = "2.1.2"; sha256 = "15gvrak3qqm7s943nx7fzpsjjcjygwvwjjjvypw42gjvj8pcywaq"; }) + (fetchNuGet { pname = "Esprima"; version = "3.0.0-rc-01"; sha256 = "068xfs4h34irqab9zbq5s45iycxhbrv2r6fdv47zsxcday9xq617"; }) (fetchNuGet { pname = "EventStore.Client"; version = "21.2.0"; sha256 = "1crnk0nbwcz4l2dv3ia96skmfn274nbyh5j1p0g9rjbzyy7kzf5j"; }) - (fetchNuGet { pname = "EventStore.Plugins"; version = "22.10.1"; sha256 = "018q2awlmvbw4wjphiqfjs0gws7ydxrcipb9v9cfmiw4g8wifan1"; }) + (fetchNuGet { pname = "EventStore.Plugins"; version = "22.10.3"; sha256 = "0irii0xk806bc1pfnyn5dgksy4x9nqj9x2m01h9ddnzkzds2n9bi"; }) (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.1"; sha256 = "155d1fmnxlq7p7wk4v74b8v8h36nq0i6bq1vhdjf8sbq7f95fj0f"; }) (fetchNuGet { pname = "GitInfo"; version = "2.0.26"; sha256 = "050l74vkamvbsp8f02b8aknizcknk4fr26dvwvw86mm8iw1dlvrv"; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.21.6"; sha256 = "1mjal5h5dn3ncf3cmx0d85qilfj984d5sbr8vs1l1jb14j0r45xz"; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.0"; sha256 = "1wjxxlqdrjjb0f3py8sbgsivqms8d22m7xk1zx68gfmyih671in7"; }) (fetchNuGet { pname = "gpr"; version = "0.1.122"; sha256 = "0z65n8zqdz0p2ackha572gpdjydhgnfszb46rca44773ak6mfa2b"; }) - (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.49.0"; sha256 = "04hgp08p59cjwvqhrzmk1fs82yb5pwvg1c208rlpizv7y3fgwp7r"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.49.0"; sha256 = "0j3djf49p345lh2jymmssi3d6lwf60wachx7jxb5r1hpr2z02mls"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.49.0"; sha256 = "088k52ianb5aigymigaw354m3fpxkk4ayz7mh5pjk5ckmd4ph566"; }) + (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.52.0"; sha256 = "1apbsqzkns2p0rn31j0q21n3a4lbnp06b4kh2wf44kancvhaj4ch"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.52.0"; sha256 = "0bvi61phh4r48ha0xc8mp0n79n3l0pniik08kvc2cwyq2fk3iiji"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.52.0"; sha256 = "192bqxg63mn0nc8d8v21xnq3qmchiz90df6liqpbnisdl3avdyhk"; }) (fetchNuGet { pname = "Grpc.Core"; version = "2.46.5"; sha256 = "0s1vyb1cx5id62kwx67qaqx25bykwpqnm2nmwsmcyqpzgyy0zwy2"; }) (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.46.5"; sha256 = "0m0vjr69rfqllvvij6rvv79mbks27rhh7b4wnfvj88v43zvvlnq0"; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.49.0"; sha256 = "0yq459zkzsxphgpr9ik6qaqv4whd854425ws3qljia94y877nz8a"; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.49.0"; sha256 = "01wbba3g9gmbvb3h1rqz560q6nkv0wnnm7sbcj76fncwdrr42m6b"; }) - (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.49.0"; sha256 = "076vi0pmv3gvxjp7vqk6grrnay85zsbvfyzyi3c0h202bhp1yg7h"; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.49.0"; sha256 = "0fs2pzw0i6r9697x6m2y59dz8hf58i80nfy9pm0690lxmgpsasxc"; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.52.0"; sha256 = "1mrc8zkcgvklrc0xalky9xxy9dkq5yk92idj1wm5zgdh6pghsa11"; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.52.0"; sha256 = "0f8m8nmx30bb5wk61i7aqxnwz00rflyc7l8pl9i60mr8ybq5n671"; }) + (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.52.0"; sha256 = "18zcrbzhg06f6wvm120176zfkz2sy9jal6p9wh2xsapjk52qin27"; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.52.0"; sha256 = "1dhf98h89xbcpx4v6lmr3gq51br9r8jm38zhrs9dw8l9vy73x1jy"; }) (fetchNuGet { pname = "Grpc.Tools"; version = "2.49.1"; sha256 = "1nsxm73b1bn4jjjpz5q6hvqjm77l9vhl4wi36b1pxwgdbdspy5rm"; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.52.0"; sha256 = "1a13rrdryykazhq71q339r0xpsyi8vlj2zprrpriak2yn7zhxiqh"; }) (fetchNuGet { pname = "HdrHistogram"; version = "2.5.0"; sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; }) (fetchNuGet { pname = "HostStat.NET"; version = "1.0.2"; sha256 = "1khxpp1fy36njjcmikr0xnxk7zv9d3rcnm6f7x2s94agins23hg7"; }) - (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2038"; sha256 = "0gnp5pqsxd9lr7b4i73mpq5lyq16vzn0pr8rcyvnjjf3fanls8kc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.TestHost"; version = "6.0.9"; sha256 = "1c48772hhz7izsv2ndgiwxxg6b89f1hykbw6d5mhjjd3d3dfa4n2"; }) + (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2048"; sha256 = "1iyfzpj36b8ybiwrjxwxqz42jgx2wsm8l0dmkiaip8ds0lal71iw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.TestHost"; version = "6.0.16"; sha256 = "1zpiiq9yjwgcwq89j3jj7jdd2ycp15d3pklqdmhfxclv43ssn3hf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.3.0"; sha256 = "0qpxygiq53v2d2wl6hccnkjf1lhlxjh4q3w5b6d23aq9pw5qj626"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.3.0"; sha256 = "0m9qqn391ayfi1ffkzvhpij790hs96q6dbhzfkj2ahvw6qx47b30"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) @@ -39,41 +43,61 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; sha256 = "0244czr3jflvzcj6axq61j10dkl0f16ad34rw81ryg57v4cvlwx6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.0.3"; sha256 = "0fiwv35628rzkpixpbqcj8ln4c0hnwhr3is8ha38a9pdzlrs6zx8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; sha256 = "0b4bn0cf39c6jlc8xnpi1d8f3pz0qhf8ng440yb95y5jv5q4fdyw"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.3"; sha256 = "18l6ys6z7j07vf5pa3g0d018dfgk5vb9hf3393cmmh448rpjq41m"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; sha256 = "0n91s6cjfv8plf5swhr307s849jmq2pa3i1rbpb0cb0grxml0mqm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.3"; sha256 = "0zy90kvlvxinwqz38cwj1jmp06a8gar1crdbycjk5wy8d6w5m0br"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "3.1.0"; sha256 = "1bkcrsmm37i7dcg4arffwqmd90vfhaxhrc6vh8mjwwp41q09ghna"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.3"; sha256 = "0nd36n0zfqv5l4w4jlbs2smaw0x7lw49aw1wgk3wsyv69s74p3gj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; sha256 = "0rn0925aqm1fsbaf0n8jy6ng2fm1cy97lp7yikvx31m6178k9i84"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.3"; sha256 = "1hyilp5gr19xz7zcyar6h8jpfksqbn5s9kz0qrfqwvqhq2p7sm5g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.0.0"; sha256 = "1cm0hycgb33mf1ja9q91wxi3gk13d1p462gdq7gndrya23hw2jm5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Composite"; version = "6.0.0"; sha256 = "1yn0cnclbm3lv12fmf6z0mxqsyjk8s8r952fcw4fdv54mvqbfgkl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Embedded"; version = "6.0.9"; sha256 = "0pni3y0drcjfr3cgpw8iiac589rsh6z5c2h2xnzy3yvk5lx5pl0d"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.0.3"; sha256 = "0glfid82amr4mxjqpq2ar6vhq6wv88sp463yvhg4pravkcrd0611"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; sha256 = "12pag6rf01xfa8x1h30mf4czfhlhg2kgi5q712jicy3h12c02w8y"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.0.3"; sha256 = "0kyh6bk9iywbdvn29zm1770fwmag58y7c8rfpx886anxs6p9rh61"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; sha256 = "1wj871vl1azasbn2lrzzycvzkk72rvaxywnj193xwv11420b0mjh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "3.1.0"; sha256 = "00bx95j2j0lkrr1znm53qicigvrj4sbc7snh27nqwsp4vkjnpz5h"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; sha256 = "0wgpsi874gzzjj099xbdmmsifslkbdjkxd5xrzpc5xdglpkw08vl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.0.3"; sha256 = "0lq433x3z3dhf4w10vrxnqami6xsr6mwasla3qhmfx7yfybgz7y0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "3.1.0"; sha256 = "13bhi1q4s79k4qb19m4p94364543jr3a1f8kacjvdhigpmqa732r"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; sha256 = "033rkqdffybq5prhc7nn6v68zij393n00s5a82yf2n86whwvdfwx"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.3"; sha256 = "08zlr6kl92znj9v2cs1wsjw6s98nxbkwnxk8pccbv0b4c7xhb3pf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.FASTER.Core"; version = "1.9.5"; sha256 = "1vp2644301bsdad0sd20pjqa8lbf1vc8yvd9rkl986h56hgwczsj"; }) (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.8"; sha256 = "1s0n68z6v5mbys4jjrd4jdxrrz81iq4dzmmbmxzmlf59769x8rj9"; }) @@ -102,7 +126,13 @@ (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.2.1"; sha256 = "0gildh4xcb6gkxcrrgh5a1j7lq0a7l670jpbs71akl5b5bgy5gc3"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.4.0-rc.1"; sha256 = "17cbj0dx6fxk169rs0ds6cph75z9r1i90xgjdapx1zmx1kwcdn00"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.4.0-rc.1"; sha256 = "09pc8vbhgjq5bibvjw39gjdb99x3nclsggzp509qfcxv8gizcs21"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.4.0-rc.1"; sha256 = "129qk929f21akx87g66f8h1ckj2lj2ij5by5ma7bdm19jpk2yhdx"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.DependencyInjection"; version = "1.4.0-rc.1"; sha256 = "19sraav8y53yi1pf8dsjd2n5cnffqd876rjxmlkkbi550qdr9l0v"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.4.0-rc.1"; sha256 = "0h781wdirsqz1hxwmag6dzzng3kpk7nqrmfg0j04z3q23zi9rp9h"; }) (fetchNuGet { pname = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; }) + (fetchNuGet { pname = "Quickenshtein"; version = "1.5.1"; sha256 = "0mhnywivqxlpznr2fk7jp8g0bshsbq0yyyggcn51blkaabf18grl"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -162,6 +192,7 @@ (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "Serilog.Sinks.InMemory"; version = "0.11.0"; sha256 = "0kmnj3wx1hwxvgp06avn2zw1mzsfjamrgpaav44ir40100g4hdkd"; }) (fetchNuGet { pname = "Serilog.Sinks.TextWriter"; version = "2.1.0"; sha256 = "0p13m8spj6psybwdw21gjaxw854va8n6m2rbdy0w78q135br1kcd"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) @@ -170,20 +201,23 @@ (fetchNuGet { pname = "Superpower"; version = "2.3.0"; sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "6.0.0"; sha256 = "16zfx5mivkkykp76krw8x68izmjf79ldfmn26k9x3m55lmp9i77c"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.0"; sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm"; }) (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "6.0.1"; sha256 = "17p5vwbgrycsrvv9a9ksxbiziy75x4s25dw71fnbw1ci5kpp8yz7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) @@ -200,10 +234,13 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.10.0"; sha256 = "0048hmv4j4wfpa9hwn8d5l3ag3hwmhp5r26iarfbsxj0q3i2d1a8"; }) @@ -218,6 +255,7 @@ (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -226,6 +264,7 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) @@ -243,11 +282,11 @@ (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; sha256 = "0px6snb8gdb6mpwsqrhlpbkmjgd63h4yamqm2gvyf9rwibymjbm9"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "7.0.1"; sha256 = "0p6kx6ag0il7rxxcvm84w141phvr7fafjzxybf920bxwa0jkwzq8"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) @@ -256,6 +295,7 @@ (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.5.3"; sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) @@ -267,6 +307,7 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) From 061b238aaf01b50a1b12b6b8801e637e8e1cef47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Aug 2023 23:26:03 +0000 Subject: [PATCH 58/97] furnace: 0.6pre8 -> 0.6pre9 --- pkgs/applications/audio/furnace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index f865d7c69ca8..a819cd746ed1 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6pre8"; + version = "0.6pre9"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-kV3XlZAVkb+SfGqBi7I7Br58zjSAfh4kiUk2KCcXnFA="; + sha256 = "sha256-i7/NN179Wyr1FqNlgryyFtishFr5EY1HI6BRQKby/6E="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' From 26c4dcb79431cd8a9861398b5658410fbbd27a59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 02:22:45 +0000 Subject: [PATCH 59/97] firefly-desktop: 1.3.3 -> 2.1.5 --- pkgs/applications/misc/firefly-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 34c0e857a448..53c4e88c3e09 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "firefly-desktop"; - version = "1.3.3"; + version = "2.1.5"; src = fetchurl { url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage"; - sha256 = "a052efa29aa692eeafc921a2be4a5cbf71ae0b4216bd4759ea179086fb44c6d6"; + sha256 = "sha256-33LQedZTfps7uAB5LGGXM/YB7SySTJLp70+yS5pMvIk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 2e2efe8d0abf9fdd44a9cd0e27d3005418a9cf69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 02:52:46 +0000 Subject: [PATCH 60/97] thermald: 2.5.3 -> 2.5.4 --- pkgs/tools/system/thermald/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index b4696d704224..9f667bb4203e 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.3"; + version = "2.5.4"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-rYhf+mbELNmm6gVS7eH1EEY73Dsw1vZLFUbaTOU980I="; + sha256 = "sha256-5UILKdv+HhilY+NsbMwqqvYjbM3mAeec/lX+CGY0CPE="; }; nativeBuildInputs = [ From d189406ad2c7ce9e937cdb3f6b033eef745a011e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Jun 2023 15:53:17 +0300 Subject: [PATCH 61/97] hal-hardware-analyzer: 3.3.0 -> 4.2.0 Diff: https://github.com/emsec/hal/compare/v3.3.0...v4.2.0 --- .../hal-hardware-analyzer/default.nix | 105 +++++++++++------- 1 file changed, 64 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 5ee77fce963a..2b74a7de24e5 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,75 +1,71 @@ { lib , stdenv +, boost +, cmake , fetchFromGitHub , fetchpatch -, cmake +, graphviz +, igraph +, llvmPackages , ninja , pkg-config , python3Packages -, boost -, rapidjson , qtbase , qtsvg -, igraph +, quazip +, rapidjson , spdlog -, wrapQtAppsHook -, graphviz -, llvmPackages -, z3 -, fmt_8 , suitesparse +, wrapQtAppsHook +, z3 }: let - igraph' = igraph.overrideAttrs (old: rec { + # hal doesn't work with igraph 0.10.x yet https://github.com/emsec/hal/pull/487 + igraph' = igraph.overrideAttrs (final: prev: { version = "0.9.10"; src = fetchFromGitHub { owner = "igraph"; - repo = "igraph"; - rev = version; + repo = final.pname; + rev = final.version; hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; }; - postPatch = old.postPatch + lib.optionalString stdenv.isAarch64 '' + patches = (prev.patches or []) ++ [ + # needed by clang + (fetchpatch { + name = "libxml2-2.11-compat.patch"; + url = "https://github.com/igraph/igraph/commit/5ad464be5ae2f6ebb69c97cb0140c800cc8d97d6.patch"; + hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; + }) + ]; + postPatch = prev.postPatch + lib.optionalString stdenv.isAarch64 '' # https://github.com/igraph/igraph/issues/1694 substituteInPlace tests/CMakeLists.txt \ --replace "igraph_scg_grouping3" "" \ --replace "igraph_scg_semiprojectors2" "" ''; - buildInputs = old.buildInputs ++ [ suitesparse ]; - cmakeFlags = old.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; + # general options brought back from the old 0.9.x package + buildInputs = prev.buildInputs ++ [ suitesparse ]; + cmakeFlags = prev.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; }); - # no stable hal release yet with recent spdlog/fmt support, remove - # once 4.0.0 is released - see https://github.com/emsec/hal/issues/452 - spdlog' = spdlog.override { - fmt_9 = fmt_8.overrideAttrs (_: rec { - version = "8.0.1"; - src = fetchFromGitHub { - owner = "fmtlib"; - repo = "fmt"; - rev = version; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; - }; - }); - }; + in stdenv.mkDerivation rec { - version = "3.3.0"; + version = "4.2.0"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; + sha256 = "sha256-Yl86AClE3vWygqj1omCOXX8koJK2SjTkMZFReRThez0="; }; patches = [ (fetchpatch { - # Fix build with python 3.10 - # https://github.com/emsec/hal/pull/463 - name = "hal-fix-python-3.10.patch"; - url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch"; - sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8="; - includes = [ "plugins/gui/src/python/python_context.cpp" ]; + name = "cmake-add-no-vendored-options.patch"; + # https://github.com/emsec/hal/pull/529 + url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch"; + hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY="; }) ]; @@ -77,14 +73,30 @@ in stdenv.mkDerivation rec { # copies them in full to the output, bloating the package postPatch = '' shopt -s extglob - rm -rf deps/!(sanitizers-cmake)/* + rm -rf deps/!(abc|sanitizers-cmake|subprocess)/* shopt -u extglob ''; - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph' spdlog' graphviz wrapQtAppsHook z3 ] - ++ (with python3Packages; [ python pybind11 ]) - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + nativeBuildInputs = [ + cmake + ninja + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ + qtbase + qtsvg + boost + rapidjson + igraph' + spdlog + graphviz + z3 + quazip + ] + ++ (with python3Packages; [ python pybind11 ]) + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ; cmakeFlags = with lib.versions; [ "-DHAL_VERSION_RETURN=${version}" @@ -96,12 +108,23 @@ in stdenv.mkDerivation rec { "-DHAL_VERSION_DIRTY=false" "-DHAL_VERSION_BROKEN=false" "-DENABLE_INSTALL_LDCONFIG=off" + "-DUSE_VENDORED_PYBIND11=off" + "-DUSE_VENDORED_SPDLOG=off" + "-DUSE_VENDORED_QUAZIP=off" + "-DUSE_VENDORED_IGRAPH=off" "-DBUILD_ALL_PLUGINS=on" ]; # needed for macos build - this is why we use wrapQtAppsHook instead of # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; + # some plugins depend on other plugins and need to be able to load them + postFixup = lib.optionalString stdenv.isLinux '' + find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do + patchelf --set-rpath "$(patchelf --print-rpath "$f"):$out/lib/hal_plugins" "$f" + done + ''; + meta = with lib; { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; From 94b818800dd276dce4108239c281644a418fb9c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 22:19:29 +0000 Subject: [PATCH 62/97] maven: 3.9.3 -> 3.9.4 --- .../development/tools/build-managers/apache-maven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index c912818285aa..5ed41717f3da 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -10,11 +10,11 @@ assert jdk != null; stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; - version = "3.9.3"; + version = "3.9.4"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-4eE6wMQvO2TZAMV//GUuzvaCuCVdfTVO+7tPYlGdpPE="; + hash = "sha256-/2a3DIMKONMx1E9sJaN7WCRx3vmhYck5ArrHvqMJgxk="; }; sourceRoot = "."; From a8fd3d603cb1c6f3799f1dd59e3846d33ecb2e44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 23:24:44 +0000 Subject: [PATCH 63/97] fluidd: 1.25.0 -> 1.25.2 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 2b0cd7de054d..5e1802d002bb 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.25.0"; + version = "1.25.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-p8NesTNwsiq4YiEHtBpYP6eljs4PvDaQ2Ot6/htvzr4="; + sha256 = "sha256-WlUTRmQ1RWI2HQ5Kn85q+/fzVnTsda2aqgTWRlA+5JY="; }; nativeBuildInputs = [ unzip ]; From 36d6b0bd9dd69babcc4ecde227eebbfa5a311d26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 00:36:31 +0000 Subject: [PATCH 64/97] networkmanager_dmenu: 2.3.0 -> 2.3.1 --- pkgs/tools/networking/networkmanager/dmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix index 2d4656e69b70..8bf9af1ffbf9 100644 --- a/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "networkmanager_dmenu"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; rev = "v${version}"; - sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0="; + sha256 = "sha256-RbJE6JCElctBY5HDJa6SIJhm8g9BugncLF5kmambPPc="; }; nativeBuildInputs = [ gobject-introspection ]; From 3d52741a6a66b816ee3cbc65bdebc108f8c82aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 00:41:45 +0000 Subject: [PATCH 65/97] rsyslog: 8.2306.0 -> 8.2308.0 --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index ceb83ff202fc..b406c5b4a312 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2306.0"; + version = "8.2308.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-9ig++q3GCVQKVua+yIo2LJZud/Kf5I5rc0vWwRI+C+U="; + hash = "sha256-AghrkSHocs6mnl0PbI4tjr/zMjSzytVQNmU3jTry48k="; }; nativeBuildInputs = [ From 6aea92129082bed32d45ba1a4d99ef392a7bbc98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 01:01:46 +0000 Subject: [PATCH 66/97] napari: 0.4.17 -> 0.4.18 --- pkgs/development/python-modules/napari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 769134bcd4e5..9df87e357dd3 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -38,7 +38,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.17"; + version = "0.4.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -47,7 +47,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE="; + hash = "sha256-xF0DYK+226MZpB050IukNvTg2iHMQAIZW0serKRJd/0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 7f90f3b57cb881ddcf56e0627e9a5d0c10b80c2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 01:48:49 +0000 Subject: [PATCH 67/97] nixpacks: 1.12.0 -> 1.13.0 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 6c9ea55a2949..513da2279614 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pm02VKqaxXVLKqChbp7MQIccwzukAG2h0QrEZftQoQo="; + sha256 = "sha256-xUQpo9KqKXKz1nT+eqmIX1domBHGsFO1DQoR/lDdncM="; }; - cargoHash = "sha256-elBLH2n+t+bixKePRmK1YiXsdDuerYzV+PbpjFEcA1g="; + cargoHash = "sha256-6OuDZzX7mCc8LiC808eu1fa1OspA5+Yk5h3VxusgFDU="; # skip test due FHS dependency doCheck = false; From 744ceaeef0066a74f403195314d327930d74cb23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 02:07:05 +0000 Subject: [PATCH 68/97] tegola: 0.17.0 -> 0.18.0 --- pkgs/servers/geospatial/tegola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/geospatial/tegola/default.nix b/pkgs/servers/geospatial/tegola/default.nix index 0930f3f697d9..1c7e0697dac9 100644 --- a/pkgs/servers/geospatial/tegola/default.nix +++ b/pkgs/servers/geospatial/tegola/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tegola"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "go-spatial"; repo = "tegola"; rev = "v${version}"; - sha256 = "sha256-FYKsAkOVqhgTaps0eTI/SLCEI1BRTKKpRtwKo2m7srQ="; + sha256 = "sha256-lrFRPD16AFavc+ghpKoxwQJsfJLe5jxTQVK/0a6SIIs="; }; vendorHash = null; From 1debaa9be52924f746ab3a48ec62849d978552b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 02:54:54 +0000 Subject: [PATCH 69/97] brev-cli: 0.6.252 -> 0.6.259 --- pkgs/development/misc/brev-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index b51df0073977..04e3760f4b7e 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.252"; + version = "0.6.259"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CwoSLAY6KNGaEKt+/ojlO/v1fRZSRsRpd67vXellLSQ="; + sha256 = "sha256-ALfWvfyQyMHSkj+6zE/+zpsdRFUr40XQHNOcAXhJFd8="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; From 9824764bf1901e71c99c67172a1b2a800100501c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 02:58:50 +0000 Subject: [PATCH 70/97] open-stage-control: 1.25.2 -> 1.25.3 --- pkgs/applications/audio/open-stage-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 5524c9a53609..87f1e1512954 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-7D3C1W2Y7FJnLxbXKXFFPDf+EXhLgPEj0APc2ZFYUlM="; + hash = "sha256-drv+QNBmUjvlRul8PlFK4ZBIDw6BV4kJXVw287H6WT4="; }; # Remove some Electron stuff from package.json From e5193e1e6902114eee9d01d509cb6b6aa72b2849 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 03:09:10 +0000 Subject: [PATCH 71/97] kubernetes-controller-tools: 0.12.1 -> 0.13.0 --- .../tools/kubernetes-controller-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index bdafbc3ed8cf..bf318108c430 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OqBTlzHqnwu6GaNFS6cdcOoBNdSGus/piR4tXRfzpn0="; + sha256 = "sha256-strTBBpmG60H38WWLakIjZHVUgKC/ajS7ZEFDhZWnlo="; }; patches = [ ./version.patch ]; - vendorHash = "sha256-gztTF8UZ5N4mip8NIyuCfoy16kpJymtggfG0sAcZW6c="; + vendorHash = "sha256-YQfMq0p3HfLgOjAk/anZpGx/fDnvovI3HtmYdKRKq5w="; ldflags = [ "-s" From 4aa293136ff795611cb568405bb1d2807fc4fb10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 03:33:55 +0000 Subject: [PATCH 72/97] libcef: 116.0.14 -> 116.0.15 --- pkgs/development/libraries/libcef/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 38a62255b15e..b9d31c6fd874 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0iqih0fbafzlcfq3kljjr3pkywamwvahgm6b7b0z0xdbzq0idxdx"; - platforms."x86_64-linux".sha256 = "1cc7lmp984653b9909pnk4brs96bmgq7hd6p9i6xgxy2y4n3887m"; + platforms."aarch64-linux".sha256 = "0ij7y0whlq8g1sskbhirbw3ngbp95k1in2pi9kjhb9flydjwxq8g"; + platforms."x86_64-linux".sha256 = "0dyv1ddsakxi51a7iwmy006mx27gvjq49i45difkmjv6mw9s2fw9"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.14"; - gitRevision = "376a780"; - chromiumVersion = "116.0.5845.97"; + version = "116.0.15"; + gitRevision = "0b8c265"; + chromiumVersion = "116.0.5845.111"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; From 116480d33f9e2de18b1c596112d276fee0a46e28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 05:48:08 +0000 Subject: [PATCH 73/97] kstars: 3.6.4 -> 3.6.6 --- pkgs/applications/science/astronomy/kstars/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index c4721c490cce..ce29c5172a29 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.4"; + version = "3.6.6"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-9MJqJVgSZVBzlLv08Z6i8yO4YV1exsD5+yLJjqIGD20="; + sha256 = "sha256-Z4PatRvtIJBoeRDJJYkkBTOB/R+R7nGdDT38bfAShJQ="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From e6f84c74b341573488ded0e98a4bd2ec98a25dd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 06:26:17 +0000 Subject: [PATCH 74/97] grsync: 1.3.0 -> 1.3.1 --- pkgs/applications/misc/grsync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index 3a6a717b6e10..856eeea21f37 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "grsync"; src = fetchurl { url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; - sha256 = "sha256-t8fGpi4FMC2DF8OHQefXHvmrRjnuW/8mIqODsgQ6Nfw="; + sha256 = "sha256-M8wOJdqmLlunCRyuo8g6jcdNxddyHEUB00nyEMSzxtM="; }; nativeBuildInputs = [ From ed59f79befe011f7a1db3be4fbbc71300d7fa4cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 06:26:27 +0000 Subject: [PATCH 75/97] kubeseal: 0.23.0 -> 0.23.1 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ab8c7463f037..e76b69696fe1 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Xtyn08rlBo17ouxSLQcVT8mQQ6nuDKPjE4OHBdze8/Q="; + sha256 = "sha256-FhkeovWuDQZ7KwyIk6YY/iWfRQxTUT0fcAJcCiTZ9Cg="; }; - vendorHash = "sha256-MTueX4+cZIUdjE2BRLVGv7PJr3haV11woJmrkeKFpr0="; + vendorHash = "sha256-mtWh5nJrdy7PIk4+S+66Xgqpllg6lAyc73lW/bjV5AE="; subPackages = [ "cmd/kubeseal" ]; From e61a70f884bd7bc49e8e0c9135c69a6f8e998910 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 08:47:53 +0000 Subject: [PATCH 76/97] vgmtools: unstable-2023-07-14 -> unstable-2023-08-27 --- pkgs/tools/audio/vgmtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index dc3e4e2df65d..ae6184a850f2 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-07-14"; + version = "unstable-2023-08-27"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "1b880040e0f730f180ecd019cb06c3db717420d2"; - hash = "sha256-6JNBQGVAs49l80ITKDabPFeN3XQtIH/RGhR7vIlMNxs="; + rev = "7b7f2041e346f0d4fff8c834a763edc4f4d88896"; + hash = "sha256-L52h94uohLMnj29lZj+i9hM8n9hIYo20nRS8RCW8npY="; }; nativeBuildInputs = [ From 2cf01b045047407130d0fa60318ae36cf222271c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 13:57:29 +0000 Subject: [PATCH 77/97] linkerd: 2.13.6 -> 2.14.0 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 8141b8bd87d6..413fc8b1ec75 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.13.6"; - sha256 = "1z5gcz1liyxydy227vb350k0hsq31x80kvxamx7l1xkd2p0mcmbj"; - vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0="; + version = "2.14.0"; + sha256 = "0j4qzmfhi286vsngf1j3s8zhk7xj2saqr27clmjy7ypjszlz5rvm"; + vendorSha256 = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; } From cf18421ae05dd695ca4389b9f1f4593c2a08927e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 19:00:34 +0000 Subject: [PATCH 78/97] zoom-us: 5.15.10.6882 -> 5.15.11.7239 --- .../instant-messengers/zoom-us/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 636068184162..1fa08dd530e7 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.10.21826"; - versions.x86_64-darwin = "5.15.10.21826"; - versions.x86_64-linux = "5.15.10.6882"; + versions.aarch64-darwin = "5.15.11.22019"; + versions.x86_64-darwin = "5.15.11.22019"; + versions.x86_64-linux = "5.15.11.7239"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-C+CkVB0Auj43JElKZgarGqx7AttgQWu/EOqpwHPVSLI="; + hash = "sha256-R3QD2jo0+kwgOZ0PwHbFxAlbutSpxyDr+CzEwdKxioY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-hr2wCTmJ/ToEzfgXm+91Ab8+8u3gijIQgjPfTZxRWaM="; + hash = "sha256-nSiG2n8oN1k0xyBw4jWbrZT6AiP5VVJXkeBXppvNcAk="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-KHxG06VZoFDxVh/7r/lLHMZEh9l8QAysDfG1sw7D+Yo="; + hash = "sha256-pnVy+rS3NxMPwm86+ERLf1oSrsniP3i+FhSg16BuO38="; }; }; From c52b0593cf6c350d52b3b0f49d7879636fd450dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Aug 2023 21:52:26 +0200 Subject: [PATCH 79/97] prometheus-unbound-exporter: replace at 0.4.4 The previous exporter was archived in 2022, the one from Let's encrypt is now recommended. --- .../prometheus/unbound-exporter.nix | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index 3f8206b14edf..a7575e809b3a 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -1,36 +1,34 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests, Security }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: -rustPlatform.buildRustPackage rec { - pname = "unbound-telemetry"; - version = "unstable-2021-09-18"; +let + version = "0.4.4"; +in +buildGoModule { + pname = "unbound_exporter"; + inherit version; src = fetchFromGitHub { - owner = "svartalf"; - repo = pname; - rev = "19e53b05828a43b7062b67a9cc6c84836ca26439"; - sha256 = "sha256-wkr9T6GlJP/PSv17z3MC7vC0cXg/Z6rGlhlCUHH3Ua4="; + owner = "letsencrypt"; + repo = "unbound_exporter"; + rev = "refs/tags/v${version}"; + hash = "sha256-0eo56z5b+hzKCY5OKg/9F7rjLyoSKPJoHLoXeMjCuFU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "native-tls-0.2.3" = "sha256-I1+ZNLDVGS1x9Iu81RD2//xnqhKhNGBmlrT0ryNFSlE="; - }; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + vendorHash = "sha256-4aWuf9UTPQseEwDJfWIcQW4uGMffRnWlHhiu0yMz4vk="; passthru.tests = { inherit (nixosTests.prometheus-exporters) unbound; }; meta = with lib; { + changelog = "https://github.com/letsencrypt/unbound_exporter/releases/tag/v${version}"; description = "Prometheus exporter for Unbound DNS resolver"; - homepage = "https://github.com/svartalf/unbound-telemetry"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/letsencrypt/unbound_exporter/tree/main"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; }; } From 73c5a5a778cebc386fbbc0e6423cc03550c32390 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Aug 2023 23:21:52 +0200 Subject: [PATCH 80/97] nixos/prometheus/unbound-exporter: update for new package The command line interface changed slightly, but still supports the TCP as well as the UDS control interface. --- .../manual/release-notes/rl-2311.section.md | 3 + .../prometheus/exporters/unbound.nix | 84 +++++++++++++------ nixos/tests/prometheus-exporters.nix | 5 +- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index e6c23f69e471..4c656e8037b7 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -116,6 +116,9 @@ - The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq. +- `prometheus-unbound-exporter` has been replaced by the Let's Encrypt maintained version, since the previous version was archived. This requires some changes to the module configuration, most notable `controlInterface` needs migration + towards `unbound.host` and requires either the `tcp://` or `unix://` URI scheme. + - `odoo` now defaults to 16, updated from 15. - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix index f52d92a73d5d..f2336429d42f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix @@ -1,4 +1,8 @@ -{ config, lib, pkgs, options }: +{ config +, lib +, pkgs +, options +}: with lib; @@ -6,17 +10,14 @@ let cfg = config.services.prometheus.exporters.unbound; in { + imports = [ + (mkRemovedOptionModule [ "controlInterface" ] "This option was removed, use the `unbound.host` option instead.") + (mkRemovedOptionModule [ "fetchType" ] "This option was removed, use the `unbound.host` option instead.") + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; + port = 9167; extraOpts = { - fetchType = mkOption { - # TODO: add shm when upstream implemented it - type = types.enum [ "tcp" "uds" ]; - default = "uds"; - description = lib.mdDoc '' - Which methods the exporter uses to get the information from unbound. - ''; - }; - telemetryPath = mkOption { type = types.str; default = "/metrics"; @@ -25,34 +26,65 @@ in ''; }; - controlInterface = mkOption { - type = types.nullOr types.str; - default = null; - example = "/run/unbound/unbound.socket"; - description = lib.mdDoc '' - Path to the unbound socket for uds mode or the control interface port for tcp mode. + unbound = { + ca = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_server.pem"; + example = null; + description = '' + Path to the Unbound server certificate authority + ''; + }; - Example: - uds-mode: /run/unbound/unbound.socket - tcp-mode: 127.0.0.1:8953 - ''; + certificate = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_control.pem"; + example = null; + description = '' + Path to the Unbound control socket certificate + ''; + }; + + key = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_control.key"; + example = null; + description = '' + Path to the Unbound control socket key. + ''; + }; + + host = mkOption { + type = types.str; + default = "tcp://127.0.0.1:8953"; + example = "unix:///run/unbound/unbound.socket"; + description = lib.mdDoc '' + Path to the unbound control socket. Supports unix domain sockets, as well as the TCP interface. + ''; + }; }; }; serviceOpts = mkMerge ([{ serviceConfig = { + User = "unbound"; # to access the unbound_control.key ExecStart = '' - ${pkgs.prometheus-unbound-exporter}/bin/unbound-telemetry \ - ${cfg.fetchType} \ - --bind ${cfg.listenAddress}:${toString cfg.port} \ - --path ${cfg.telemetryPath} \ - ${optionalString (cfg.controlInterface != null) "--control-interface ${cfg.controlInterface}"} \ + ${pkgs.prometheus-unbound-exporter}/bin/unbound_exporter \ + --unbound.host "${cfg.unbound.host}" \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${optionalString (cfg.unbound.ca != null) "--unbound.ca ${cfg.unbound.ca}"} \ + ${optionalString (cfg.unbound.certificate != null) "--unbound.cert ${cfg.unbound.certificate}"} \ + ${optionalString (cfg.unbound.key != null) "--unbound.key ${cfg.unbound.key}"} \ ${toString cfg.extraFlags} ''; RestrictAddressFamilies = [ - # Need AF_UNIX to collect data "AF_UNIX" + "AF_INET" + "AF_INET6" ]; + } // optionalAttrs (!config.services.unbound.enable) { + DynamicUser = true; }; }] ++ [ (mkIf config.services.unbound.enable { diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 5734e54de023..306c5e071e75 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1422,8 +1422,7 @@ let unbound = { exporterConfig = { enable = true; - fetchType = "uds"; - controlInterface = "/run/unbound/unbound.ctl"; + unbound.host = "unix:///run/unbound/unbound.ctl"; }; metricProvider = { services.unbound = { @@ -1438,7 +1437,7 @@ let wait_for_unit("unbound.service") wait_for_unit("prometheus-unbound-exporter.service") wait_for_open_port(9167) - succeed("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") + wait_until_succeeds("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") ''; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5674a6f48f67..9d1c50d5c677 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27299,9 +27299,7 @@ with pkgs; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; - prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { }; prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { From a529934027c05080f544c9c4504cd2de7b4563d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 10:17:22 +0000 Subject: [PATCH 81/97] netbird-ui: 0.22.6 -> 0.22.7 --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index e7b1727c1603..97a53e882c70 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.22.6"; + version = "0.22.7"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/7iJbl9MFe5D9g+4a8nFavZG3jXIiEgKU3toGpx0hyM="; + sha256 = "sha256-2Xvpalizazhkp8aYPYY5Er9I6dkL8AKnrjpIU44o2WM="; }; vendorHash = "sha256-CwozOBAPFSsa1XzDOHBgmFSwGiNekWT8t7KGR2KOOX4="; From 139c45309454156581e6d5a09d5b5cc9ebc1db70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 10:19:49 +0000 Subject: [PATCH 82/97] moolticute: 1.01.0 -> 1.02.0 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index f51d9a329cd1..faa6c2180fc6 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.01.0"; + version = "1.02.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; + sha256 = "sha256-URGAhd7u1DrGReQAwsX9LMj7Jq1GsILzP8fVFnA74O4="; }; outputs = [ "out" "udev" ]; From 8614e0e392279c731d0eddd83a7ba8141b514ad2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 12:36:08 +0000 Subject: [PATCH 83/97] unciv: 4.7.13 -> 4.7.17-patch1 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index d5a884a01381..d105093f4ef7 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.7.13"; + version = "4.7.17-patch1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-KvRDPu2FZY+iZ2vNi/tly/7/Tpg/EN8jHTKizYV5jeY="; + hash = "sha256-0kHeTzA9GnTHHV11aGHq6gATnBsW/jaPqKQYhgb1zqg="; }; dontUnpack = true; From 4a05d4a24ed3252e4ee7ab9153db76cf7e9a2747 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 29 Aug 2023 09:35:33 -0400 Subject: [PATCH 84/97] cargo-hack: 0.6.3 -> 0.6.4 Diff: https://diff.rs/cargo-hack/0.6.3/0.6.4 Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.6.4/CHANGELOG.md --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index d4d09d0290e3..95eb36a70dc1 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.3"; + version = "0.6.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-KfY2ZZ6+wTKWT+kM+pDVVhCWhhyEZZmbTC6iFstl/e8="; + sha256 = "sha256-kb4ftO4nhQ+MykK18O5aoexuBoN+u0xobUvIEge00jU="; }; - cargoSha256 = "sha256-hpD/Wb+17TeU8nLGC/fxX+9Na6ve6Ov6VEy11vQA+kY="; + cargoSha256 = "sha256-+Am9w3iU2kSAIx+1tK3kpoa+oJvLQ6Ew7LeP6njYEQw="; # some necessary files are absent in the crate version doCheck = false; From 0fd29ad676b88eeeb845b2c616702df11255610c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 29 Aug 2023 21:51:40 +0800 Subject: [PATCH 85/97] sing-box: 1.3.6 -> 1.4.0 Diff: https://github.com/SagerNet/sing-box/compare/v1.3.6...v1.4.0 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 3acc4acc64ef..db1541eac1cd 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.6"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-iVoouUEZ3dMv3sD7eljltsWrdhAn9L+YtG1bbB5YuPM="; + hash = "sha256-i6Cpb4NQNsyIrMOihWYdR37BkSouSCWi3nxMnbODnZU="; }; - vendorHash = "sha256-4Rr/ILnDLJ4x0uSDOzTX2cjT3kaIApLOCo2NEOzGoyA="; + vendorHash = "sha256-6Mx8kdZL7EguQoh1upuu6wGZckczDoGmRjOFCpv756s="; tags = [ "with_quic" From 20a15c7985768e0b0f7c1a2643e40b4516629569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Aug 2023 18:38:49 -0700 Subject: [PATCH 86/97] npm-check-updates: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 432 ------------------ .../npm-check-updates/default.nix | 27 ++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 30 insertions(+), 433 deletions(-) create mode 100644 pkgs/tools/package-management/npm-check-updates/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e3ff0d15396a..e9540a7a1bbc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -80,6 +80,7 @@ mapAliases { inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) npm-check-updates; # added 2023-08-22 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c715380e4f2a..899b270aa014 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -204,7 +204,6 @@ , "nodemon" , "np" , "npm" -, "npm-check-updates" , "npm-merge-driver" , "nrm" , "ocaml-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 845812fdad5e..1406e47cca73 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -101470,438 +101470,6 @@ in bypassCache = true; reconstructLock = true; }; - npm-check-updates = nodeEnv.buildNodePackage { - name = "npm-check-updates"; - packageName = "npm-check-updates"; - version = "16.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.13.0.tgz"; - sha512 = "zTJCqov2+KpCLM7lOOxXLFiqKg8RLt10dempIbE9EfKCzoN1yqSrDcBCpU6uOmlSRy3IIGm1rK+piCrn+uulJw=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" - (sources."@npmcli/git-4.1.0" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@npmcli/installed-package-contents-2.0.2" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/promise-spawn-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - (sources."@npmcli/run-script-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - sources."@tufjs/models-1.0.4" - sources."@types/http-cache-semantics-4.0.1" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" - sources."argparse-2.0.1" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-from-1.1.2" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chownr-2.0.0" - sources."ci-info-3.8.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-3.0.0" - sources."cli-table3-0.6.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."commander-10.0.1" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."configstore-6.0.0" - sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.1" - sources."delegates-1.0.0" - sources."dir-glob-3.0.1" - sources."dot-prop-6.0.1" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."escape-goat-4.0.0" - sources."exponential-backoff-3.1.1" - sources."fast-glob-3.3.1" - sources."fast-memoize-2.5.2" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."foreground-child-3.1.1" - sources."form-data-encoder-2.1.4" - sources."fp-and-or-0.1.3" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."get-stdin-8.0.0" - sources."get-stream-6.0.1" - sources."glob-10.3.3" - sources."glob-parent-5.1.2" - (sources."global-dirs-3.0.1" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) - sources."globby-11.1.0" - sources."got-12.6.1" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-unicode-2.0.1" - sources."has-yarn-3.0.0" - sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."ignore-5.2.4" - sources."ignore-walk-6.0.3" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-4.1.1" - sources."ip-2.0.0" - sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-lambda-1.0.1" - sources."is-npm-6.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."jju-1.4.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.2.3" - sources."jsonlines-0.1.1" - sources."jsonparse-1.3.1" - sources."keyv-4.5.3" - sources."kleur-4.1.5" - sources."latest-version-7.0.0" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lowercase-keys-3.0.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-response-4.0.0" - sources."minimatch-9.0.3" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - sources."rimraf-3.0.2" - ]; - }) - sources."nopt-6.0.0" - (sources."normalize-package-data-5.0.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."normalize-url-8.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - (sources."npm-package-arg-10.1.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npmlog-6.0.2" - sources."once-1.4.0" - sources."p-cancelable-3.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" - sources."package-json-8.1.1" - sources."pacote-15.2.0" - sources."parse-github-url-1.0.2" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."proc-log-3.0.0" - sources."progress-2.0.3" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."prompts-ncu-3.0.0" - sources."proto-list-1.2.4" - sources."pupa-3.1.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."rc-config-loader-4.1.3" - sources."read-package-json-6.0.4" - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."remote-git-tags-3.0.0" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-5.0.1" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."semver-diff-4.0.0" - sources."semver-utils-1.1.4" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."sigstore-1.9.0" - sources."sisteransi-1.0.5" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spawn-please-2.0.2" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-5.0.1" - (sources."tar-6.1.15" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."to-regex-range-5.0.1" - sources."tuf-js-1.1.7" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."unique-string-3.0.0" - sources."untildify-4.0.0" - sources."update-notifier-6.0.2" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."which-2.0.2" - sources."wide-align-1.1.5" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) - sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Find newer versions of dependencies than what your package.json allows"; - homepage = "https://github.com/raineorshine/npm-check-updates"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-merge-driver = nodeEnv.buildNodePackage { name = "npm-merge-driver"; packageName = "npm-merge-driver"; diff --git a/pkgs/tools/package-management/npm-check-updates/default.nix b/pkgs/tools/package-management/npm-check-updates/default.nix new file mode 100644 index 000000000000..93585593a494 --- /dev/null +++ b/pkgs/tools/package-management/npm-check-updates/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "npm-check-updates"; + version = "16.13.0"; + + src = fetchFromGitHub { + owner = "raineorshine"; + repo = "npm-check-updates"; + rev = "v${version}"; + hash = "sha256-RrNO1TAPNFB/6JWY8xZjNCZ+FDgM0MCn7vaDXoCSIfI="; + }; + + npmDepsHash = "sha256-aghW4d3/8cJmwpmI5PcHioCnc91Yu4N5EfwuoaB5Xqw="; + + meta = { + changelog = "https://github.com/raineorshine/npm-check-updates/blob/${src.rev}/CHANGELOG.md"; + description = "Find newer versions of package dependencies than what your package.json allows"; + homepage = "https://github.com/raineorshine/npm-check-updates"; + license = lib.licenses.asl20; + mainProgram = "ncu"; + maintainers = with lib.maintainers; [ flosse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292624c41fd3..56100dccf4de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1892,6 +1892,8 @@ with pkgs; nominatim = callPackage ../servers/nominatim { }; + npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; + ntpd-rs = callPackage ../tools/networking/ntpd-rs { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; From 56087449b1a661751c4236cff82c87f46d8a2d25 Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 29 Aug 2023 21:01:31 +0500 Subject: [PATCH 87/97] where-is-my-sddm-theme: init at 1.3.0 --- .../themes/where-is-my-sddm-theme/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/data/themes/where-is-my-sddm-theme/default.nix diff --git a/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/pkgs/data/themes/where-is-my-sddm-theme/default.nix new file mode 100644 index 000000000000..7a683093614c --- /dev/null +++ b/pkgs/data/themes/where-is-my-sddm-theme/default.nix @@ -0,0 +1,50 @@ +{ lib +, formats +, stdenvNoCC +, fetchFromGitHub +, qtgraphicaleffects + /* An example of how you can override the background on the NixOS logo + * + * environment.systemPackages = [ + * (pkgs.where-is-my-sddm-theme.override { + * themeConfig.General = { + * background = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + * backgroundMode = "none"; + * }; + * }) + * ]; + */ +, themeConfig ? null +}: + +let + user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig; +in + +stdenvNoCC.mkDerivation rec { + pname = "where-is-my-sddm-theme"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "stepanzubkov"; + repo = pname; + rev = "v${version}"; + hash = "sha256-40XTihp3hYbXzXSmgrmFCQjZUBkDi/NLiGQEs5ZmRIg="; + }; + + propagatedUserEnvPkgs = [ qtgraphicaleffects ]; + + installPhase = '' + mkdir -p $out/share/sddm/themes/ + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ + '' + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user + ''; + + meta = with lib; { + description = "The most minimalistic SDDM theme among all themes"; + homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; + license = licenses.mit; + maintainers = with maintainers; [ name-snrl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ba26b924f42..3d1bdbe62da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25373,6 +25373,8 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; + where-is-my-sddm-theme = libsForQt5.callPackage ../data/themes/where-is-my-sddm-theme { }; + wildmidi = callPackage ../development/libraries/wildmidi { inherit (darwin.apple_sdk.frameworks) OpenAL; }; From 5d13f3f4e9822e068181d5186308122190793cd0 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 29 Aug 2023 13:55:02 -0400 Subject: [PATCH 88/97] mkvtoolnix: disable update check Downloading via the update check is probably nonsensical if installed via Nix, and removing telemetry is generally good. --- pkgs/applications/video/mkvtoolnix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0f5b7ca7a070..45a23ca7deb6 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { "--disable-precompiled-headers" "--disable-profiling" "--disable-static-qt" + "--disable-update-check" "--enable-optimization" "--with-boost-libdir=${lib.getLib boost}/lib" "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl" From 3b8331a9986b86ec7f9b2dcf8ab03c9bd7322719 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 12 Aug 2023 10:06:01 -0700 Subject: [PATCH 89/97] parsec-bin: update runtime dependencies parsecd-150-89b now requires curl, png, and jpeg8 --- pkgs/applications/misc/parsec/bin.nix | 26 +++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 12 +++++------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index 7aae31152f7f..96d98867e9d6 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -1,13 +1,25 @@ -{ stdenvNoCC, stdenv +{ stdenvNoCC +, stdenv , lib -, dpkg, autoPatchelfHook, makeWrapper +, dpkg +, autoPatchelfHook +, makeWrapper , fetchurl -, alsa-lib, openssl, udev +, alsa-lib +, openssl +, udev , libglvnd -, libX11, libXcursor, libXi, libXrandr +, libX11 +, libXcursor +, libXi +, libXrandr +, libXfixes , libpulseaudio , libva , ffmpeg +, libpng +, libjpeg8 +, curl }: stdenvNoCC.mkDerivation { @@ -15,7 +27,7 @@ stdenvNoCC.mkDerivation { version = "150_86e"; src = fetchurl { - url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb"; + url = "https://web.archive.org/web/20230531105208/https://builds.parsec.app/package/parsec-linux.deb"; sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; }; @@ -44,10 +56,14 @@ stdenvNoCC.mkDerivation { libpulseaudio libva ffmpeg + libpng + libjpeg8 + curl libX11 libXcursor libXi libXrandr + libXfixes ]; prepareParsec = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d03d105649ec..81c1b1dd2710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11996,9 +11996,7 @@ with pkgs; porsmo = callPackage ../applications/misc/porsmo { }; - pantum-driver = callPackage ../misc/drivers/pantum-driver { - libjpeg8 = libjpeg.override { enableJpeg8 = true; }; - }; + pantum-driver = callPackage ../misc/drivers/pantum-driver { }; posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor { }; @@ -14714,7 +14712,6 @@ with pkgs; wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { - libjpeg8 = libjpeg.override { enableJpeg8 = true; }; openssl = openssl_1_1; }; @@ -23013,6 +23010,7 @@ with pkgs; # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg = libjpeg_turbo; + libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; }; libjreen = callPackage ../development/libraries/libjreen { }; @@ -30488,10 +30486,10 @@ with pkgs; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { - libjpeg = libjpeg.override { enableJpeg8 = true; }; + libjpeg = libjpeg8; }; bitwig-studio5 = callPackage ../applications/audio/bitwig-studio/bitwig-studio5.nix { - libjpeg = libjpeg.override { enableJpeg8 = true; }; + libjpeg = libjpeg8; }; bitwig-studio = bitwig-studio5; @@ -35059,7 +35057,7 @@ with pkgs; sish = callPackage ../tools/networking/sish { }; sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky { - libjpeg_turbo = libjpeg_turbo.override { enableJpeg8 = true; }; + libjpeg_turbo = libjpeg8; }; skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; From b1979e6d66830363609288d44e59919bcf831ad8 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 29 Aug 2023 16:13:24 +0000 Subject: [PATCH 90/97] pythonPackages.pysimplesoap: init at 1.16.2 --- .../python-modules/pysimplesoap/default.nix | 55 +++++++++++++++++++ .../pysimplesoap/stringIO.patch | 31 +++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/development/python-modules/pysimplesoap/default.nix create mode 100644 pkgs/development/python-modules/pysimplesoap/stringIO.patch diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix new file mode 100644 index 000000000000..11ffdaa7aa58 --- /dev/null +++ b/pkgs/development/python-modules/pysimplesoap/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchpatch +, fetchPypi +, buildPythonPackage +, m2crypto +}: + +buildPythonPackage rec { + pname = "pysimplesoap"; + # Unfortunately, the latest stable release is broken on Python 3. + version = "1.16.2"; + + src = fetchPypi { + pname = "PySimpleSOAP"; + inherit version; + hash = "sha256-sbv00NCt/5tlIZfWGqG3ZzGtYYhJ4n0o/lyyUJFtZ+E="; + }; + + propagatedBuildInputs = [ + m2crypto + ]; + + patches = + let + debianRevision = "5"; # The Debian package revision we get patches from + fetchDebianPatch = { name, hash }: fetchpatch { + url = "https://salsa.debian.org/python-team/packages/pysimplesoap/-/raw/debian/${version}-${debianRevision}/debian/patches/${name}.patch"; + inherit hash; + }; + in map fetchDebianPatch [ + # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027 + { name = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; } + # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb + { name = "fix-httplib2-version-check"; + hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; } + { name = "reorder-type-check-to-avoid-a-TypeError"; + hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; } + # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227 + { name = "Support-integer-values-in-maxOccurs-attribute"; + hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; } + { name = "PR204"; + hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; } + ] ++ [ ./stringIO.patch ]; + + meta = with lib; { + description = "Python simple and lightweight SOAP Library"; + homepage = "https://github.com/pysimplesoap/pysimplesoap"; + license = licenses.lgpl3Plus; + + # I don't directly use this, only needed it as a dependency of debianbts + # so co-maintainers would be welcome. + maintainers = [ maintainers.nicoo ]; + }; +} diff --git a/pkgs/development/python-modules/pysimplesoap/stringIO.patch b/pkgs/development/python-modules/pysimplesoap/stringIO.patch new file mode 100644 index 000000000000..8ecad11b9a74 --- /dev/null +++ b/pkgs/development/python-modules/pysimplesoap/stringIO.patch @@ -0,0 +1,31 @@ +diff --git i/pysimplesoap/c14n.py w/pysimplesoap/c14n.py +index 5749e49..297592e 100644 +--- i/pysimplesoap/c14n.py ++++ w/pysimplesoap/c14n.py +@@ -55,11 +55,8 @@ except: + class XMLNS: + BASE = "http://www.w3.org/2000/xmlns/" + XML = "http://www.w3.org/XML/1998/namespace" +-try: +- import cStringIO +- StringIO = cStringIO +-except ImportError: +- import StringIO ++ ++from io import StringIO + + _attrs = lambda E: (E.attributes and E.attributes.values()) or [] + _children = lambda E: E.childNodes or [] +diff --git i/pysimplesoap/xmlsec.py w/pysimplesoap/xmlsec.py +index 2f96df7..053149f 100644 +--- i/pysimplesoap/xmlsec.py ++++ w/pysimplesoap/xmlsec.py +@@ -15,7 +15,7 @@ from __future__ import print_function + import base64 + import hashlib + import os +-from cStringIO import StringIO ++from io import StringIO + from M2Crypto import BIO, EVP, RSA, X509, m2 + + # if lxml is not installed, use c14n.py native implementation diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 386a25b44b30..bf1e9e4be910 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8232,6 +8232,8 @@ self: super: with self; { pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pysimplesoap = callPackage ../development/python-modules/pysimplesoap { }; + pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; pyskyqremote = callPackage ../development/python-modules/pyskyqremote { }; From 61d6693090da115bed79f14e10a445e0abc00569 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 29 Aug 2023 16:14:11 +0000 Subject: [PATCH 91/97] pythonPackages.debianbts: init at 4.0.1 --- .../python-modules/debianbts/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/debianbts/default.nix diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix new file mode 100644 index 000000000000..b2c2b271d61d --- /dev/null +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pysimplesoap +, pytest , pytest-xdist +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "python-debianbts"; + version = "4.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0817d593ccdfb58a5f37b8cb3873bd0b2268b434f2798dc75b206d7550fdf04"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ pysimplesoap ]; + checkInputs = [ + pytest + pytest-xdist + ]; + + meta = with lib; { + description = "Python interface to Debian's Bug Tracking System"; + homepage = "https://github.com/venthur/python-debianbts"; + downloadPage = "https://pypi.org/project/python-debianbts/"; + changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.nicoo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf1e9e4be910..c5e0bbeedd37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2557,6 +2557,8 @@ self: super: with self; { debian = callPackage ../development/python-modules/debian { }; + debianbts = callPackage ../development/python-modules/debianbts { }; + debian-inspector = callPackage ../development/python-modules/debian-inspector { }; debtcollector = callPackage ../development/python-modules/debtcollector { }; From 0ed4dff7dd5a37ee89d8ca030eadb6c506d66a7e Mon Sep 17 00:00:00 2001 From: arcnmx Date: Thu, 24 Aug 2023 08:53:13 -0700 Subject: [PATCH 92/97] parsec-bin: avoid patching dylib in `share/parsec/skel` Only the main binary needs to be patched, the wrapper script handles everything else. --- pkgs/applications/misc/parsec/bin.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index 96d98867e9d6..f631312b6faa 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -90,6 +90,19 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + # Only the main binary needs to be patched, the wrapper script handles + # everything else. The libraries in `share/parsec/skel` would otherwise + # contain dangling references when copied out of the nix store. + dontAutoPatchelf = true; + + fixupPhase = '' + runHook preFixup + + autoPatchelf $out/bin + + runHook postFixup + ''; + meta = with lib; { homepage = "https://parsecgaming.com/"; changelog = "https://parsec.app/changelog"; From c022ff0b502e8081eaf20772b889d75ce48316f0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 29 Aug 2023 23:27:48 +0400 Subject: [PATCH 93/97] gpsd: enable on darwin --- pkgs/servers/gpsd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index c254c60d9fed..662c4d530170 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -10,7 +10,7 @@ , dbus , libusb1 , ncurses -, pps-tools +, kppsSupport ? stdenv.isLinux, pps-tools , python3Packages # optional deps for GUI packages @@ -53,8 +53,9 @@ stdenv.mkDerivation rec { dbus libusb1 ncurses - pps-tools python3Packages.python + ] ++ lib.optionals kppsSupport [ + pps-tools ] ++ lib.optionals guiSupport [ atk dbus-glib @@ -135,7 +136,7 @@ stdenv.mkDerivation rec { homepage = "https://gpsd.gitlab.io/gpsd/index.html"; changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor rasendubi ]; }; } From 4c360a02250c1634cb0d04e83016a9cd44a728d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 19:45:09 +0000 Subject: [PATCH 94/97] pyenv: 2.3.24 -> 2.3.25 --- pkgs/development/tools/pyenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 83e5a6b667b7..a60ca4eda3f3 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.24"; + version = "2.3.25"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-hIScCDm15voOamgiRrgn303x2JsWXIF6Oe5PqGUGJQI="; + hash = "sha256-804bLieYrfwzUrKSvZtC6Td4+fFPw1WrhV1NE4n49Rw="; }; postPatch = '' From 55c8f51af5edeaa4d568df15e206601d233e8d33 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 14 Aug 2023 19:58:42 +0100 Subject: [PATCH 95/97] nixos/nncp: add caller and daemon services --- .../manual/release-notes/rl-2311.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/nncp.nix | 131 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 nixos/modules/services/networking/nncp.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 4c656e8037b7..c4ed81e0b5b6 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -53,6 +53,8 @@ - [Honk](https://humungus.tedunangst.com/r/honk), a complete ActivityPub server with minimal setup and support costs. Available as [services.honk](#opt-services.honk.enable). +- [NNCP](http://www.nncpgo.org/). Added nncp-daemon and nncp-caller services. Configuration is set with [programs.nncp.settings](#opt-programs.nncp.settings) and the daemons are enabled at [services.nncp](#opt-services.nncp.caller.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e0d940c8f3ef..ec6424682ccc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -981,6 +981,7 @@ ./services/networking/nix-serve.nix ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix + ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix ./services/networking/nomad.nix ./services/networking/nsd.nix diff --git a/nixos/modules/services/networking/nncp.nix b/nixos/modules/services/networking/nncp.nix new file mode 100644 index 000000000000..3cfe41995e76 --- /dev/null +++ b/nixos/modules/services/networking/nncp.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + nncpCfgFile = "/run/nncp.hjson"; + programCfg = config.programs.nncp; + callerCfg = config.services.nncp.caller; + daemonCfg = config.services.nncp.daemon; + settingsFormat = pkgs.formats.json { }; + jsonCfgFile = settingsFormat.generate "nncp.json" programCfg.settings; + pkg = programCfg.package; +in { + options = { + + services.nncp = { + caller = { + enable = mkEnableOption '' + cron'ed NNCP TCP daemon caller. + The daemon will take configuration from + [](#opt-programs.nncp.settings) + ''; + extraArgs = mkOption { + type = with types; listOf str; + description = "Extra command-line arguments to pass to caller."; + default = [ ]; + example = [ "-autotoss" ]; + }; + }; + + daemon = { + enable = mkEnableOption '' + NNCP TCP synronization daemon. + The daemon will take configuration from + [](#opt-programs.nncp.settings) + ''; + socketActivation = { + enable = mkEnableOption '' + Whether to run nncp-daemon persistently or socket-activated. + ''; + listenStreams = mkOption { + type = with types; listOf str; + description = lib.mdDoc '' + TCP sockets to bind to. + See [](#opt-systemd.sockets._name_.listenStreams). + ''; + default = [ "5400" ]; + }; + }; + extraArgs = mkOption { + type = with types; listOf str; + description = "Extra command-line arguments to pass to daemon."; + default = [ ]; + example = [ "-autotoss" ]; + }; + }; + + }; + }; + + config = mkIf (programCfg.enable or callerCfg.enable or daemonCfg.enable) { + + assertions = [{ + assertion = with builtins; + let + callerCongfigured = + let neigh = config.programs.nncp.settings.neigh or { }; + in lib.lists.any (x: hasAttr "calls" x && x.calls != [ ]) + (attrValues neigh); + in !callerCfg.enable || callerCongfigured; + message = "NNCP caller enabled but call configuration is missing"; + }]; + + systemd.services."nncp-caller" = { + inherit (callerCfg) enable; + description = "Croned NNCP TCP daemon caller."; + documentation = [ "http://www.nncpgo.org/nncp_002dcaller.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-caller -noprogress -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs callerCfg.extraArgs + }''; + Group = "uucp"; + UMask = "0002"; + }; + }; + + systemd.services."nncp-daemon" = mkIf daemonCfg.enable { + enable = !daemonCfg.socketActivation.enable; + description = "NNCP TCP syncronization daemon."; + documentation = [ "http://www.nncpgo.org/nncp_002ddaemon.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-daemon -noprogress -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs daemonCfg.extraArgs + }''; + Restart = "on-failure"; + Group = "uucp"; + UMask = "0002"; + }; + }; + + systemd.services."nncp-daemon@" = mkIf daemonCfg.socketActivation.enable { + description = "NNCP TCP syncronization daemon."; + documentation = [ "http://www.nncpgo.org/nncp_002ddaemon.html" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-daemon -noprogress -ucspi -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs daemonCfg.extraArgs + }''; + Group = "uucp"; + UMask = "0002"; + StandardInput = "socket"; + StandardOutput = "inherit"; + StandardError = "journal"; + }; + }; + + systemd.sockets.nncp-daemon = mkIf daemonCfg.socketActivation.enable { + inherit (daemonCfg.socketActivation) listenStreams; + description = "socket for NNCP TCP syncronization."; + conflicts = [ "nncp-daemon.service" ]; + wantedBy = [ "sockets.target" ]; + socketConfig.Accept = true; + }; + }; +} From 6f887c05e6764d764bb53cd8e47a1ffc706afba1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Aug 2023 09:54:42 +0000 Subject: [PATCH 96/97] python310Packages.xml2rfc: 3.17.3 -> 3.18.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index a04ff8b72eed..33911fbd16db 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -11,6 +11,7 @@ , jinja2 , lxml , markupsafe +, platformdirs , pycairo , pycountry , pyflakes @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.17.3"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-5RL4DkWcQRxzi1dhSJlGgoU0BU3aUWOfBNINFKiOwLg="; + hash = "sha256-yhzOfX2umux1ulDiInbbKXvATA+k1TLQrSa9vcR/i58="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { jinja2 lxml markupsafe + platformdirs pycountry pyflakes pypdf2 From d42ae665dc4a541f25a9bc810505025c2c090624 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 29 Aug 2023 22:19:04 +0200 Subject: [PATCH 97/97] tests.nixpkgs-check-by-name: Cleaner testing - Better filesystem case-sensitivity heuristic We shouldn't assume that Linux is always case-sensitive. - Don't include case-sensitive filename in tree Was used for tests, but this broke channel updates because there's a check to make sure there's no case-sensitive files! https://hydra.nixos.org/build/233371356/nixlog/1 --- pkgs/test/nixpkgs-check-by-name/src/main.rs | 92 +++++++++++++------ .../default.nix | 1 - .../case-sensitive-duplicate-package/expected | 1 - .../pkgs/by-name/fo/foO/package.nix | 1 - .../pkgs/by-name/fo/foo/package.nix | 1 - 5 files changed, 65 insertions(+), 31 deletions(-) delete mode 100644 pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/default.nix delete mode 100644 pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/expected delete mode 100644 pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foO/package.nix delete mode 100644 pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foo/package.nix diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 1f4a7b99a99b..db22e524553b 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -85,49 +85,87 @@ pub fn check_nixpkgs( #[cfg(test)] mod tests { use crate::check_nixpkgs; + use crate::structure; use anyhow::Context; use std::env; use std::fs; - use std::path::PathBuf; + use std::path::Path; + use tempfile::{tempdir, tempdir_in}; #[test] - fn test_cases() -> anyhow::Result<()> { - let extra_nix_path = PathBuf::from("tests/mock-nixpkgs.nix"); - - // We don't want coloring to mess up the tests - env::set_var("NO_COLOR", "1"); - - for entry in PathBuf::from("tests").read_dir()? { + fn tests_dir() -> anyhow::Result<()> { + for entry in Path::new("tests").read_dir()? { let entry = entry?; let path = entry.path(); let name = entry.file_name().to_string_lossy().into_owned(); - if !entry.path().is_dir() { + if !path.is_dir() { continue; } - // This test explicitly makes sure we don't add files that would cause problems on - // Darwin, so we cannot test it on Darwin itself - #[cfg(not(target_os = "linux"))] - if name == "case-sensitive-duplicate-package" { - continue; - } - - let mut writer = vec![]; - check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) - .context(format!("Failed test case {name}"))?; - - let actual_errors = String::from_utf8_lossy(&writer); let expected_errors = fs::read_to_string(path.join("expected")).unwrap_or(String::new()); - if actual_errors != expected_errors { - panic!( - "Failed test case {name}, expected these errors:\n\n{}\n\nbut got these:\n\n{}", - expected_errors, actual_errors - ); - } + test_nixpkgs(&name, &path, &expected_errors)?; } Ok(()) } + + // We cannot check case-conflicting files into Nixpkgs (the channel would fail to + // build), so we generate the case-conflicting file instead. + #[test] + fn test_case_sensitive() -> anyhow::Result<()> { + let temp_nixpkgs = tempdir()?; + let path = temp_nixpkgs.path(); + + if is_case_insensitive_fs(&path)? { + eprintln!("We're on a case-insensitive filesystem, skipping case-sensitivity test"); + return Ok(()); + } + + let base = path.join(structure::BASE_SUBPATH); + + fs::create_dir_all(base.join("fo/foo"))?; + fs::write(base.join("fo/foo/package.nix"), "{ someDrv }: someDrv")?; + + fs::create_dir_all(base.join("fo/foO"))?; + fs::write(base.join("fo/foO/package.nix"), "{ someDrv }: someDrv")?; + + test_nixpkgs( + "case_sensitive", + &path, + "pkgs/by-name/fo: Duplicate case-sensitive package directories \"foO\" and \"foo\".\n", + )?; + + Ok(()) + } + + fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> { + let extra_nix_path = Path::new("tests/mock-nixpkgs.nix"); + + // We don't want coloring to mess up the tests + env::set_var("NO_COLOR", "1"); + + let mut writer = vec![]; + check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) + .context(format!("Failed test case {name}"))?; + + let actual_errors = String::from_utf8_lossy(&writer); + + if actual_errors != expected_errors { + panic!( + "Failed test case {name}, expected these errors:\n\n{}\n\nbut got these:\n\n{}", + expected_errors, actual_errors + ); + } + Ok(()) + } + + /// Check whether a path is in a case-insensitive filesystem + fn is_case_insensitive_fs(path: &Path) -> anyhow::Result { + let dir = tempdir_in(path)?; + let base = dir.path(); + fs::write(base.join("aaa"), "")?; + Ok(base.join("AAA").exists()) + } } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/default.nix deleted file mode 100644 index af25d1450122..000000000000 --- a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/expected b/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/expected deleted file mode 100644 index e3928858221c..000000000000 --- a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo: Duplicate case-sensitive package directories "foO" and "foo". diff --git a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foO/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foO/package.nix deleted file mode 100644 index a1b92efbbadb..000000000000 --- a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foO/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foo/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foo/package.nix deleted file mode 100644 index a1b92efbbadb..000000000000 --- a/pkgs/test/nixpkgs-check-by-name/tests/case-sensitive-duplicate-package/pkgs/by-name/fo/foo/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv