From b6a646e08f1ccbf689187ce57b60224a99854228 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Oct 2022 10:03:30 +0200 Subject: [PATCH 01/28] python310Packages.types-setuptools: 65.5.0.1 -> 65.5.0.2 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 4afc13df60f0..c9ce9c92c4cd 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "65.5.0.1"; + version = "65.5.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Wylwgcjx+9mSzYswWpftlu5v/HZekRUSQClZfdELinE="; + sha256 = "sha256-mEfebXCH+x3UqIwqIVQ9G4amF5w2dE8IGXQwP+LzD1A="; }; # Module doesn't have tests From 60c70541cfe8f35105f52660742150deadac72bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Oct 2022 10:03:44 +0200 Subject: [PATCH 02/28] python310Packages.types-colorama: 0.4.15.1 -> 0.4.15.2 --- pkgs/development/python-modules/types-colorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 818862d13d33..2a0e3a38fa59 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.1"; + version = "0.4.15.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vENoegvz9CEVpWQAvVPGGFksxhHmb/V9XMlQJMtE+xo="; + hash = "sha256-FXy+ZuFjllliWEZNONeMrojYEus9erKoc+Da9PR8bIk="; }; # Module has no tests From c3e23153b56761498c7812c3c18e47639f0e7ba4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Oct 2022 11:29:49 +0800 Subject: [PATCH 03/28] waybox: fix cross compilation by adding wayland-scanner --- pkgs/applications/window-managers/waybox/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix index ad3028b4ac03..4fab49544113 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -6,6 +6,7 @@ , ninja , libxkbcommon , wayland +, wayland-scanner , wayland-protocols , wlroots , pixman @@ -25,7 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + buildInputs = [ libxkbcommon wayland From c2e593710fbe0e708d3a788c7115d5865a2f218f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 07:10:01 +0000 Subject: [PATCH 04/28] flyctl: 0.0.419 -> 0.0.421 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index bf4341006b0e..f1e1e2eeecb2 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.419"; + version = "0.0.421"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-x9ZwwUn6Rwn6tGaSpkWc8syMJDusn4j2QzLjmr1/ciM="; + sha256 = "sha256-5J+L4X/QbEQzVT3586Syxi8IsdC5zU3UHfhmMz74/mw="; }; vendorSha256 = "sha256-a0ZnZlKB/Uotrm4npXB1dd1+oWHRhJVW7ofMSKlqcvM="; From cb31f8cf5ba49ea6b1c1f984e8067313978fcafa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 09:31:28 +0000 Subject: [PATCH 05/28] jackett: 0.20.2167 -> 0.20.2169 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 29113891827d..26ec3ecc960c 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2167"; + version = "0.20.2169"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "119VBstPmcXaNRxwv2w6yn1oiR6VIcHccLhLFtlyCFM="; + sha256 = "D1q2nzDxlsFrxZRmZJTiJSWQ/BihuEDUVirv2qKgsnI="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From beed58c503d4b8196ad2cd5201f4391410db362d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 27 Oct 2022 18:49:13 +0800 Subject: [PATCH 06/28] pantheon.appcenter: 3.10.0 -> 4.0.0 --- pkgs/desktops/pantheon/apps/appcenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index e097249564df..a80ecc078f40 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-Y3ueicw6Hn6lw24hdPeJohGol6l7UlQFIefYsBVY6Hg="; + sha256 = "sha256-6QWvDBhOxoK8HjmygV92WPDgq2Jbk4igWDbXrXc7/FQ="; }; nativeBuildInputs = [ From dad236c46bddd6a771a865fbfb721be505900cc4 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 27 Oct 2022 17:56:45 +0530 Subject: [PATCH 07/28] tailscale: 1.32.1 -> 1.32.2 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e6634d031234..b3f1e03f6cfb 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-gy8C/JA/KoFtPBHZMwNW0EuW8M/+bTIxUcA/Et+P7zs="; + sha256 = "sha256-CYNHD6TS9KTRftzSn9vAH4QlinqNgU/yZuUYxSvsl/M="; }; vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE="; From bc7e3135ab74fa74ea3fdaf19b6bc5000841b604 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 26 Oct 2022 12:10:42 -0400 Subject: [PATCH 08/28] ruff: 0.0.83 -> 0.0.86 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ff5f5f0c16e4..1291b5bb0aa6 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.83"; + version = "0.0.86"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oBeshV3VYhkHa53xjbFSSVPfPhEP0orBbW7Qlkpp8hw="; + sha256 = "sha256-6PcP4QzHmsuV73i3ptO/sIhsa1+/NgSBd/WCOgOx5Uw="; }; - cargoSha256 = "sha256-8Qx5P7NQB1gL48fii2iMr9Fr4zOQRfINdGUmHoqiP28="; + cargoSha256 = "sha256-owjGCZUduL7yAXE8BUD1Y4DdhQWsc8BwLa/rY8+VRuE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 867941decf630135e7581b106a05446e11e908a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 20:48:17 +0000 Subject: [PATCH 09/28] python310Packages.azure-mgmt-containerservice: 20.5.0 -> 20.6.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index c1c31ed20a03..ce0920b972b6 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "20.5.0"; + version = "20.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-tSlupPxnMkvBDBXAvZUGlzUhkODPpL31jAPTvjrKUFg="; + hash = "sha256-zQ3Lg45rO1vgtsjQnokNFjWt6qnrNQ2CnElGJ0Dksew="; }; propagatedBuildInputs = [ From a167a657a5609c26ec06d0fe2d0a2bcd9ab450e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 21:25:18 +0000 Subject: [PATCH 10/28] rage: 0.8.1 -> 0.9.0 --- pkgs/tools/security/rage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 1d23209a3b1b..897c990d6fed 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FexplUdn56TanxAKC+a8uWoR3soJT1/1qi9t2tw19Vw="; + sha256 = "sha256-/qrhD7AqVGMBi6PyvYww5PxukUU//KrttKqnPS0OYPc="; }; - cargoSha256 = "sha256-xlpi6UQTL1p9JSLENKrLjG2DF9mYiV+E8bfjHQtqOyY="; + cargoSha256 = "sha256-hVjtjeaIyySAHm3v0kFQ387THqYU1s+nGdBUwzIzBjg="; nativeBuildInputs = [ installShellFiles From 083fa6a16f8135d28b1537d9e1e387f170528e94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 21:37:50 +0000 Subject: [PATCH 11/28] rmfakecloud: 0.0.9 -> 0.0.10 --- pkgs/servers/rmfakecloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index 4b84ca3e3567..b9b160a18bb9 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SefgXJUe0fh4BW7vOIKW6O26oEngq/1+dAYStBfkKao="; + sha256 = "sha256-/y3BHWCErBZT3u/Es44nxkDDsin8XN4P5MAMuixd2KM="; }; vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A="; From daf258603cb5cda0d4062e6281b9dbebfd044bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 27 Oct 2022 17:11:36 -0500 Subject: [PATCH 12/28] =?UTF-8?q?pgsync:=200.6.8=20=E2=86=92=200.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/database/pgsync/Gemfile.lock | 10 +++++----- .../development/tools/database/pgsync/gemset.nix | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index e6cb2fb570ab..4381dd83b62c 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - parallel (1.21.0) - pg (1.2.3) - pgsync (0.6.8) + parallel (1.22.1) + pg (1.4.4) + pgsync (0.7.2) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.9.1) + slop (4.9.3) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) @@ -20,4 +20,4 @@ DEPENDENCIES pgsync BUNDLED WITH - 2.2.24 + 2.3.7 diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index cc456be8eb0f..f556be4eb99d 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -4,20 +4,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.21.0"; + version = "1.22.1"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.4"; }; pgsync = { dependencies = ["parallel" "pg" "slop" "tty-spinner"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rsm1irmz97v1kxhnq4lbwwiapqa2zkx0n0xlcf68ca8sfcfql1z"; + sha256 = "009xrrxqwcrcackw2w86xamkb1clb70ghcr8g8n8w9h13qaa0j78"; type = "gem"; }; - version = "0.6.8"; + version = "0.7.2"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "067bvjmjdjs19bvy138hkqqvw8li3732radcd4x5f5dbf30yk3a9"; + sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf"; type = "gem"; }; - version = "4.9.1"; + version = "4.9.3"; }; tty-cursor = { groups = ["default"]; From 4760d574c45de89c4690f78ef1df91e3fec2742c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 23:59:41 +0000 Subject: [PATCH 13/28] tflint: 0.42.1 -> 0.42.2 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 8572c759e7d8..061a5d348ead 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.42.1"; + version = "0.42.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pcd9xyfH0n7UwR/Cyd+PSo9WPK1g7FaBhxOtlRttGEA="; + sha256 = "sha256-hlmIf8VD8LUxHrhEephw1e+RK6e+Jdf1HvhHu6bZxco="; }; - vendorSha256 = "sha256-Ced/3KY78wBSo02sbowV8eI1tHe+a6g9DnRQ3AXp8fU="; + vendorSha256 = "sha256-KDXS/YWuA83MeBF6rXn3zm0oIHWJaxhdQazD2kRR0mM="; doCheck = false; From 276ab9c4c6e6e20efc67a50457883c81faf72e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 11:46:44 +0000 Subject: [PATCH 14/28] kubectl-tree: 0.4.2 -> 0.4.3 --- .../networking/cluster/kubectl-tree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/pkgs/applications/networking/cluster/kubectl-tree/default.nix index 0ee6c44ba072..5a6d0efc0584 100644 --- a/pkgs/applications/networking/cluster/kubectl-tree/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-tree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-tree"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tE3ujknd7GDjTPIzZaL1Ynm6F9tJI/R1u2l0nCttjrI="; + sha256 = "sha256-J4/fiTECcTE0N2E+MPrQKE9Msvvm8DLdvLbnDUnUo74="; }; - vendorSha256 = "sha256-EQEsOJ/IZoR+9CjfFtQmBGeUXgmtACDvvpKCgnep+go="; + vendorSha256 = "sha256-iblEfpYOvTjd3YXQ3Mmj5XckivHoXf4336H+F7NEfBA="; meta = with lib; { description = "kubectl plugin to browse Kubernetes object hierarchies as a tree"; From b43682ff0962f11a9e0f755297e24bb191c8ea4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 07:00:54 +0000 Subject: [PATCH 15/28] ferretdb: 0.5.4 -> 0.6.0 --- pkgs/servers/nosql/ferretdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 0769e70974de..2d06100ea68f 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,20 +5,20 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-GRxs+MTF+ZhZH2yGMY3+2ZCRmVZ7m8uYlqNXASEiS+8="; + sha256 = "sha256-b12188yIEv2Ne0jhrPh6scvJyu+SipYvySe81Z+gYrc="; }; postPatch = '' echo ${version} > internal/util/version/gen/version.txt ''; - vendorSha256 = "sha256-MSIU99IOpCU3g5GASCKc6mqghnkFXXpan9PyI6L5+dI="; + vendorSha256 = "sha256-Tm7uuvs/OyhO1cjtwtiaokjyXF1h01Ev88ofT9gpWXs="; CGO_ENABLED = 0; From 1b1ab2dbaca7db8f0d9249fb80d3f1fdf507186e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Oct 2022 11:30:41 +0000 Subject: [PATCH 16/28] btrbk: 0.32.4 -> 0.32.5 --- pkgs/tools/backup/btrbk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index a9247792e008..e1aaafa3d1f6 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.32.4"; + version = "0.32.5"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "zGWdHrQZwBtMZ58gcnpj5eZksIwbCRIiz1qwif9ihto="; + sha256 = "8f5AkWgCFteMeQPYKn+P+V6Ypb6x0f/bK6UpOovDn7Q="; }; nativeBuildInputs = [ asciidoctor makeWrapper ]; From 3023508eba9139d334cc7bba40f20b2611b17b6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 00:44:32 +0000 Subject: [PATCH 17/28] wasmtime: 2.0.0 -> 2.0.1 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index c222517384ce..f1952da3ab02 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ffmdm+L4QL4NHQp58TgHYC0sGIbCIi4Q9AleG0tSt0s="; + sha256 = "sha256-C0HH8JLF6fKXFC3AEcM/lizGFZYJkdtBCbu2YxRwMdI="; fetchSubmodules = true; }; - cargoSha256 = "sha256-BkH9gPo61s4m36hjAFU8ZLmtje787mBswF7zUMwEc70="; + cargoSha256 = "sha256-4kLladdrDaCcEk9xpqWuzf5H1NNuOvq92qhjoRKXZ4E="; cargoBuildFlags = [ "--package wasmtime-cli" From d7ce65a977a053e7b70117b2e39c3be7c75bfa96 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 28 Oct 2022 10:01:48 +0900 Subject: [PATCH 18/28] hackgen-font: init at 2.7.1 --- pkgs/data/fonts/hackgen/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/data/fonts/hackgen/default.nix diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/data/fonts/hackgen/default.nix new file mode 100644 index 000000000000..5d87131c1028 --- /dev/null +++ b/pkgs/data/fonts/hackgen/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchzip +}: + +fetchzip rec { + pname = "hackgen-font"; + version = "2.7.1"; + + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; + sha256 = "sha256-UL6U/q2u1UUP31lp0tEnFjzkn6dn8AY6hk5hJhPsOAE="; + postFetch = '' + install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob + ''; + + meta = with lib; { + description = "A composite font of Hack and GenJyuu-Goghic"; + homepage = "https://github.com/yuru7/HackGen"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2194ba1c97..bc03067fa387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26052,6 +26052,8 @@ with pkgs; hack-font = callPackage ../data/fonts/hack { }; + hackgen-font = callPackage ../data/fonts/hackgen { }; + helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; helvum = callPackage ../applications/audio/helvum { }; From ecd50e8b86d583fc9e84b024b89cc0013986aa35 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 28 Oct 2022 10:02:53 +0900 Subject: [PATCH 19/28] hackgen-nf-font: init at 2.7.1 --- pkgs/data/fonts/hackgen/nerdfont.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/data/fonts/hackgen/nerdfont.nix diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/data/fonts/hackgen/nerdfont.nix new file mode 100644 index 000000000000..effa2bc45ad4 --- /dev/null +++ b/pkgs/data/fonts/hackgen/nerdfont.nix @@ -0,0 +1,25 @@ +{ lib +, fetchzip +}: + +fetchzip rec { + pname = "hackgen-nf-font"; + version = "2.7.1"; + + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; + sha256 = "sha256-9sylGr37kKIGWgThZFqL2y6oI3t2z4kbXYk5DBMIb/g="; + postFetch = '' + install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen-nf + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob + ''; + + meta = with lib; { + description = "A composite font of Hack, GenJyuu-Gothic and nerd-fonts"; + homepage = "https://github.com/yuru7/HackGen"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc03067fa387..1accd8a28f9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26054,6 +26054,8 @@ with pkgs; hackgen-font = callPackage ../data/fonts/hackgen { }; + hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { }; + helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; helvum = callPackage ../applications/audio/helvum { }; From 1eec94495a3dc8446e2c92691c84a6509f15382c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 28 Oct 2022 14:15:35 +1300 Subject: [PATCH 20/28] poetry2nix: 1.35.0 -> 1.36.0 --- .../tools/poetry2nix/poetry2nix/default.nix | 15 +++---- .../poetry2nix/poetry2nix/mk-poetry-dep.nix | 12 +++--- .../poetry2nix/overrides/build-systems.json | 43 +++++++++++++++++++ .../poetry2nix/overrides/default.nix | 13 +++--- 4 files changed, 63 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 5f565a62eb18..153d9beb159e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.35.0"; + version = "1.36.0"; inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; @@ -202,7 +202,7 @@ lib.makeScope pkgs.newScope (self: { sourceSpec = ( (normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName} or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName} - or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies { }).${normalizedName} # Poetry 1.2.0+ + or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies or { }).${normalizedName} # Poetry 1.2.0+ or { } ); } @@ -223,9 +223,6 @@ lib.makeScope pkgs.newScope (self: { [ ( self: super: - let - hooks = self.callPackage ./hooks { }; - in { mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { inherit lib python poetryLib evalPep508; @@ -236,8 +233,6 @@ lib.makeScope pkgs.newScope (self: { poetry = poetryPkg; __toPluginAble = toPluginAble self; - - inherit (hooks) pipBuildHook removePathDependenciesHook removeGitDependenciesHook poetry2nixFixupHook wheelUnpackHook; } // lib.optionalAttrs (! super ? setuptools-scm) { # The canonical name is setuptools-scm setuptools-scm = super.setuptools_scm; @@ -375,6 +370,8 @@ lib.makeScope pkgs.newScope (self: { }; py = poetryPython.python; + hooks = py.pkgs.callPackage ./hooks { }; + inherit (poetryPython) pyProject; specialAttrs = [ "overrides" @@ -391,8 +388,8 @@ lib.makeScope pkgs.newScope (self: { app = py.pkgs.buildPythonPackage ( passedAttrs // inputAttrs // { nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [ - py.pkgs.removePathDependenciesHook - py.pkgs.removeGitDependenciesHook + hooks.removePathDependenciesHook + hooks.removeGitDependenciesHook ]; } // { pname = normalizePackageName pyProject.tool.poetry.name; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 56c312f4b50c..9f7936d9f829 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -89,6 +89,8 @@ pythonPackages.callPackage }; format = if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; + + hooks = python.pkgs.callPackage ./hooks { }; in buildPythonPackage { pname = normalizePackageName name; @@ -103,18 +105,18 @@ pythonPackages.callPackage dontStrip = format == "wheel"; nativeBuildInputs = [ - pythonPackages.poetry2nixFixupHook + hooks.poetry2nixFixupHook ] ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook ++ lib.optionals (format == "wheel") [ - pythonPackages.wheelUnpackHook + hooks.wheelUnpackHook pythonPackages.pipInstallHook pythonPackages.setuptools ] ++ lib.optionals (format == "pyproject") [ - pythonPackages.removePathDependenciesHook - pythonPackages.removeGitDependenciesHook - pythonPackages.pipBuildHook + hooks.removePathDependenciesHook + hooks.removeGitDependenciesHook + hooks.pipBuildHook ]; buildInputs = ( diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index fd63cb1ff73e..e2e674d967bd 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -1093,6 +1093,9 @@ "asynctest": [ "setuptools" ], + "asyncua": [ + "setuptools" + ], "asyncwhois": [ "setuptools" ], @@ -1702,6 +1705,9 @@ "setuptools", "setuptools-scm" ], + "backports-zoneinfo": [ + "setuptools" + ], "bagit": [ "setuptools", "setuptools-scm" @@ -3695,6 +3701,9 @@ "django-cleanup": [ "setuptools" ], + "django-cockroachdb": [ + "setuptools" + ], "django-colorful": [ "setuptools" ], @@ -4745,6 +4754,9 @@ "fasttext": [ "setuptools" ], + "faust-streaming": [ + "setuptools" + ], "favicon": [ "setuptools" ], @@ -8348,6 +8360,10 @@ "setuptools" ], "mkdocs": [ + { + "buildSystem": "hatchling", + "from": "1.4.1" + }, "setuptools" ], "mkdocs-autorefs": [ @@ -8456,6 +8472,9 @@ "mockupdb": [ "setuptools" ], + "mode-streaming": [ + "setuptools" + ], "moderngl": [ "setuptools" ], @@ -10597,6 +10616,9 @@ "psycopg2": [ "setuptools" ], + "psycopg2-binary": [ + "setuptools" + ], "psycopg2cffi": [ "setuptools" ], @@ -11418,6 +11440,9 @@ "setuptools", "setuptools-scm" ], + "pygltflib": [ + "setuptools" + ], "pygmars": [ "setuptools", "setuptools-scm" @@ -13372,6 +13397,9 @@ "python-sat": [ "setuptools" ], + "python-schema-registry-client": [ + "setuptools" + ], "python-simple-hipchat": [ "setuptools" ], @@ -14532,6 +14560,9 @@ "s3-credentials": [ "setuptools" ], + "s3cmd": [ + "setuptools" + ], "s3fs": [ "setuptools" ], @@ -14690,6 +14721,9 @@ "scikit-optimize": [ "setuptools" ], + "scikit-spatial": [ + "poetry" + ], "scikit-survival": [ "cython", "setuptools", @@ -14718,6 +14752,9 @@ "scmrepo": [ "setuptools" ], + "scooby": [ + "setuptools" + ], "scour": [ "setuptools" ], @@ -15890,6 +15927,9 @@ "svgwrite": [ "setuptools" ], + "svix-ksuid": [ + "setuptools" + ], "swagger-spec-validator": [ "setuptools" ], @@ -17610,6 +17650,9 @@ "wsgitools": [ "setuptools" ], + "wslink": [ + "setuptools" + ], "wsnsimpy": [ "setuptools" ], diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index e169aced4a15..90533ef84978 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -385,7 +385,7 @@ lib.composeManyExtensions [ ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] + ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); @@ -1061,9 +1061,9 @@ lib.composeManyExtensions [ buildInputs = old.buildInputs or [ ] ++ [ pkgs.which - ] ++ lib.optionals enableGhostscript [ + ] ++ lib.optional enableGhostscript [ pkgs.ghostscript - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optional stdenv.isDarwin [ Cocoa ]; @@ -1080,7 +1080,7 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config - ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ + ] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [ self.setuptools-scm self.setuptools-scm-git-archive ]; @@ -2030,7 +2030,8 @@ lib.composeManyExtensions [ if old.format != "wheel" then { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ] ++ - lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ]; + lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ + lib.optional (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; @@ -2039,7 +2040,7 @@ lib.composeManyExtensions [ sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; - preBuild = '' + preBuild = lib.optional (lib.versionOlder super.scipy.version "1.9.0") '' ln -s ${self.numpy.cfg} site.cfg ''; } else old From f2d791c477fe65eee2efd498390e247639f3b681 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 01:43:56 +0000 Subject: [PATCH 21/28] aliyun-cli: 3.0.133 -> 3.0.134 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 2527a8288761..94a6a1fc3120 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.133"; + version = "3.0.134"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-cYR/AQJSSXXVH2PBPrc9bBGVU4M59yttj2ykoCsuZcU="; + sha256 = "sha256-popi+eF0nIA0C9QHbV4cu1vKfv9QUUq8oOJW/XkEabg="; }; vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo="; From 498ebaf86df2a5fc4ec461acd6778b766528232d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 00:27:11 +0000 Subject: [PATCH 22/28] v2ray-geoip: 202210200105 -> 202210270100 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 453af56965dd..0d2c4588ede9 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202210200105"; + version = "202210270100"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "a9409c3b7c6a788e7be62c9b92a24d034f521603"; - sha256 = "sha256-CuR1xeCcuzxMMgstyjcdQKpU0n6AkA6X786LpUmANGE="; + rev = "7558586fefca29c5d1705777187677fd8a4c4e6f"; + sha256 = "sha256-8UKcmkaRe51X4JgQ5pqPE46BnVF0AlXETD/Pliwx9xk="; }; installPhase = '' From ba87f8528aa798bb41bf237c9e83024ff39158f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 02:01:42 +0000 Subject: [PATCH 23/28] bazel-gazelle: 0.27.0 -> 0.28.0 --- pkgs/development/tools/bazel-gazelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index 6d94b768d09f..70e76ca389c0 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V3XNh2Npxt941wvLICMGmEBsji/TNoDkWBC27EjLsKY="; + sha256 = "sha256-axpRS8SZwChmLYSaarxZkwvrRk72XRHW7v4d11EtJ3k="; }; vendorSha256 = null; From f2a3f4616dcdd048268ca9f87d291fe8da74ef20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 04:19:45 +0000 Subject: [PATCH 24/28] python310Packages.youtube-transcript-api: 0.4.4 -> 0.5.0 --- .../python-modules/youtube-transcript-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index a3c7e93031c7..100aa2eaf06e 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jdepoix"; repo = pname; - rev = "v${version}"; - hash = "sha256-RNPWTgAOwS+tXGLQYyIyka36xS1E1499OAP84aT6m3A="; + rev = "refs/tags/v${version}"; + hash = "sha256-oTKvJt6tyv/ESJ5+Io8M8/KnuW4hN2P7w14sldsKwzw="; }; propagatedBuildInputs = [ From 611f95786db0445db7a1ec0ab247bcacd423b262 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 17:43:04 +0000 Subject: [PATCH 25/28] pantheon.switchboard-plug-sound: 2.3.1 -> 2.3.2 --- .../pantheon/apps/switchboard-plugs/sound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ed258623ab24..b421648e05a2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-hyBmo9P68XSXRUuLw+baEAetba2QdqOwUti64geH6xc="; + sha256 = "sha256-a3GYtV0f+I9grnwndGI782/shpUWpR6GrRRD380Q6+o="; }; nativeBuildInputs = [ From 91f998ce299889a542db7ccb9ba90f3d177cb004 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 23:44:44 +0000 Subject: [PATCH 26/28] python310Packages.blebox-uniapi: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/blebox-uniapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index 9bdf212db518..92ea182ccc5c 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.1.2"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-YOWzP89Qpj1o6OjCrtgT+UioJZKePAQOkb4dBeE4IYo="; + hash = "sha256-rgZ/nHihhPZnc8LLtsrAXDCQT1XaXOnI7xBid+6khfs="; }; postPatch = '' From b177479e0326cc7db4205a4131ebc813c23890e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 00:16:27 +0000 Subject: [PATCH 27/28] trompeloeil: 42 -> 43 --- pkgs/development/libraries/trompeloeil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 2ebee9bfae0b..8a73e1f34716 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "42"; + version = "43"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-QGATz/uDk1GsifGddFBQvUdgaCgUERnUp9CRA2dQVz0="; + sha256 = "sha256-+Eihm5dFy72iYtkwx+p8yv9og3e/dpkzo47TV+wzbbM="; }; nativeBuildInputs = [ cmake ]; From 2575346f009f487543d8ca415fe9a411e6273d91 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 21 Oct 2022 08:39:26 +0200 Subject: [PATCH 28/28] =?UTF-8?q?ocamlPackages.zmq:=2020180726=20=E2=86=92?= =?UTF-8?q?=205.1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/zmq/default.nix | 17 +++++++---------- pkgs/development/ocaml-modules/zmq/lwt.nix | 3 ++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index 9779004085c3..267566d7ba0a 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,17 +1,14 @@ -{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, czmq, stdint }: +{ lib, fetchurl, buildDunePackage, dune-configurator, czmq, stdint }: buildDunePackage rec { - minimumOCamlVersion = "4.03"; pname = "zmq"; - version = "20180726"; + version = "5.1.5"; - useDune2 = true; + duneVersion = "3"; - src = fetchFromGitHub { - owner = "issuu"; - repo = "ocaml-zmq"; - rev = "d312a8458d6b688f75470248f11875fbbfa5bb1a"; - sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; + src = fetchurl { + url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-lwt-${version}.tbz"; + sha256 = "sha256-mUfRPatLPFeSzWDwCIoFaVl85VkvDch4i6pOn3Kme1Y="; }; buildInputs = [ czmq dune-configurator ]; @@ -22,6 +19,6 @@ buildDunePackage rec { description = "ZeroMQ bindings for OCaml"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ akavel ]; - inherit (src.meta) homepage; + homepage = "https://engineering.issuu.com/ocaml-zmq/"; }; } diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index 6717e787f199..f6408933452c 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -2,7 +2,8 @@ buildDunePackage { pname = "zmq-lwt"; - inherit (zmq) version src useDune2 meta; + inherit (zmq) version src meta; + duneVersion = "3"; propagatedBuildInputs = [ zmq ocaml_lwt ]; }