From cdd4e5b4f8aacff5120b8f6704f2b12dbd7ff7fe Mon Sep 17 00:00:00 2001 From: steinuil Date: Tue, 24 Jun 2025 22:06:42 +0200 Subject: [PATCH 01/11] google-cloud-sdk: fix gcloud alpha/beta commands --- pkgs/tools/admin/google-cloud-sdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index c9322945a596..33a5e9a92dbb 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -47,6 +47,7 @@ let pyopenssl crcmod numpy + grpcio ] ++ lib.optional (with-gce) google-compute-engine ); From b2c4e0a6cbbd4779f3041ea29b256008638d6658 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Jun 2025 12:51:10 +0000 Subject: [PATCH 02/11] gdevelop: 5.5.231 -> 5.5.233 --- pkgs/by-name/gd/gdevelop/darwin.nix | 2 +- pkgs/by-name/gd/gdevelop/linux.nix | 2 +- pkgs/by-name/gd/gdevelop/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index b9be44d4d918..e9d7fde12444 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-zvPum8vTEXS0LbwBpzGNmcsm3s7u2oAJBhGYvlV1PWw="; + hash = "sha256-R8RB88K8dymzQnfeZUypo24EkXzpDfcsosQg3gTo3WI="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index 8d32c18c0f52..aefa0d2a8235 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-RjpiIy4NqZ9QCevwWR6cKLobbsFjneq+Vhr/t0JfvgU="; + hash = "sha256-ZVQ5e7Ghj/wZDE0RvoH264KNxaHP6x5fxSWEbbYsa88="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 57a9427762bc..bfd24eea1908 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -5,7 +5,7 @@ ... }: let - version = "5.5.231"; + version = "5.5.233"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; From 268f3732e15850a9f99020bf9e29b34a6409e584 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Mon, 30 Jun 2025 13:37:37 -0400 Subject: [PATCH 03/11] ocaml-augeas: update download URLs for debian patches The current set of patches are not available at the old URLs, because the Debian package revision was updated. Switched the fetching strategy to pull directly from Salsa The patch contents have not changed --- pkgs/development/ocaml-modules/augeas/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/augeas/default.nix b/pkgs/development/ocaml-modules/augeas/default.nix index b06471a495d1..a4c74815ce01 100644 --- a/pkgs/development/ocaml-modules/augeas/default.nix +++ b/pkgs/development/ocaml-modules/augeas/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, - fetchDebianPatch, + fetchpatch, autoreconfHook, makeWrapper, pkg-config, @@ -22,16 +22,12 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchDebianPatch { - inherit pname version; - debianRevision = "1"; - patch = "0001-Use-ocamlopt-g-option.patch"; + (fetchpatch { + url = "https://salsa.debian.org/debian/ocaml-augeas/-/raw/07c2408a7e5a06cefe5d53a89fecaa8556a39b06/debian/patches/0001-Use-ocamlopt-g-option.patch"; hash = "sha256-EMd/EfWO2ni0AMonfS7G5FENpVVq0+q3gUPd4My+Upg="; }) - (fetchDebianPatch { - inherit pname version; - debianRevision = "1"; - patch = "0002-caml_named_value-returns-const-value-pointer-in-OCam.patch"; + (fetchpatch { + url = "https://salsa.debian.org/debian/ocaml-augeas/-/raw/07c2408a7e5a06cefe5d53a89fecaa8556a39b06/debian/patches/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch"; hash = "sha256-Y53UHwrTVeV3hnsvABmWxlPi2Fanm0Iy1OR8Zql5Ub8="; }) ]; From 6a960616eb42eff9d392d52abc0a339c55afd1a6 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 1 Jul 2025 20:33:05 +0800 Subject: [PATCH 04/11] qtchan: drop --- .../networking/browsers/qtchan/default.nix | 37 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/qtchan/default.nix diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix deleted file mode 100644 index 3e266f5f8712..000000000000 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - qmake, - qtbase, -}: - -mkDerivation rec { - pname = "qtchan"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "siavash119"; - repo = "qtchan"; - rev = "v${version}"; - sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll"; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase ]; - qmakeFlags = [ "CONFIG-=app_bundle" ]; - - installPhase = '' - mkdir -p $out/bin - cp qtchan $out/bin - ''; - - meta = with lib; { - description = "4chan browser in qt5"; - mainProgram = "qtchan"; - homepage = "https://github.com/siavash119/qtchan"; - license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a8751dcf4c0c..c4b893beb38a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1673,6 +1673,7 @@ mapAliases { qt515 = qt5; # Added 2022-11-24 qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17 qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 + qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01 qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaad152d625b..a9a4ff677b22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13567,8 +13567,6 @@ with pkgs; qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { }; - qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { }; - qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; From 0c14c02400f0682af37693ad3299c449ea29c1d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 17:36:25 +0000 Subject: [PATCH 05/11] stevenblack-blocklist: 3.15.48 -> 3.15.51 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index a0e7745f0ba3..f7aa71f359c0 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.15.48"; + version = "3.15.51"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-nUwtgfOf/JialxNHwTT9JAYZtdGZevVPKLwpLrU8T5A="; + hash = "sha256-NISp1TNEgoLn2sBglpoKfg/aiiLynNOrOWqTppkbDs0="; }; outputs = [ From bc0a16af78c2a84cf43070218b29718a1fd5379c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 18:50:13 +0000 Subject: [PATCH 06/11] terramate: 0.13.3 -> 0.14.0 --- pkgs/by-name/te/terramate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index eac92d3b138b..d85508b1c535 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-KPac6JyDnP2mVJSo3Ffzk3Nrzr9PrJCe4rNtl7uR+a8="; + hash = "sha256-op8mwCofnktV+kkvh4mO5tfLrynlxGbQzOxq6JR7HbE="; }; vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU="; From 137536d8a3e89ce5cf72524812ee3485abd1479d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 3 Jul 2025 00:54:33 +0200 Subject: [PATCH 07/11] python3Packages.jupyter-server-ydoc: 2.0.2 -> 2.1.0 --- .../python-modules/jupyter-server-ydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index fdf1a4cd95b6..3458a6569e3e 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "jupyter-server-ydoc"; - version = "2.0.2"; + version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "jupyter_server_ydoc"; inherit version; - hash = "sha256-Iu5y57yeLZ/emIIJLRdqyMpxAfsHj2/vTLcqgSlRCSg="; + hash = "sha256-tSa+aEqmIev9lywYpUynxhPGfy0FHPUteiaqCS9zWkY="; }; build-system = [ hatchling ]; From b0cf3c2825a88452344e74d76dec580cbd59c550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Jul 2025 00:39:57 +0000 Subject: [PATCH 08/11] framework-tool: 0.4.3 -> 0.4.5 --- pkgs/by-name/fr/framework-tool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index c90e1025f4cc..cb0c2985079c 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "framework-tool"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${version}"; - hash = "sha256-gO7ieyVQzK3BkNsy451WNtrx51jlzd6vhwJX8RDoj/o="; + hash = "sha256-WhdKU6vyOm5R9RInw9Fj8gELztLn4m5rFGgHbnItguU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fgDZgWQGQEN2dLJjghngqeOLDX+0joSiI6OigGC57Hc="; + cargoHash = "sha256-A7/Q4p26W0AzqlLguL2OJtmm7dAsBU/Yb636ScYXrPs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; From 85ff0772a36e603a04960883e4b1ffc73dd1557d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Jul 2025 01:46:39 +0000 Subject: [PATCH 09/11] brush: 0.2.18 -> 0.2.19 --- pkgs/by-name/br/brush/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix index 8c8b8d5ff7be..1c167ea3045f 100644 --- a/pkgs/by-name/br/brush/package.nix +++ b/pkgs/by-name/br/brush/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "brush"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "reubeno"; repo = "brush"; tag = "brush-shell-v${version}"; - hash = "sha256-lX8e2gqbZMbsdMD1ZUK0l5xlCq+NkzBDeZSMzrPX+zI="; + hash = "sha256-IwBPeOD4BNaeDWlZBWfixhrpMtPu3mcbCFVDMMa8UmY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qHbKbWzuOpoRVySZd/yeGnDNbFGb2fQmgz0ETcNLoVE="; + cargoHash = "sha256-Z2K+0q8sPsudMhw+IY4Aq+gt9bSPRau0Z6cwpi98c+s="; nativeInstallCheckInputs = [ versionCheckHook From 87376c58478108651348652ab071ff03716f9da5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Jul 2025 02:03:56 +0000 Subject: [PATCH 10/11] omnom: 0.4.0 -> 0.6.0 --- pkgs/by-name/om/omnom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 837c72984180..1b3b84c29b98 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -13,17 +13,17 @@ buildGoModule (finalAttrs: { pname = "omnom"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "asciimoo"; repo = "omnom"; tag = "v${finalAttrs.version}"; - hash = "sha256-xspzTRIYUJSdI2Z/FAS2ecLpEEmEVGIwlhjrS5Yxh2c="; + hash = "sha256-wFUKoM8xiuAfmBCQJ4BgX7gQ1FmU2yHSs/RkQI0WxI4="; fetchSubmodules = true; }; - vendorHash = "sha256-qOl6f83k91K7YNF7lBbL66lXb/XWbGHyXeN7ZTchsI8="; + vendorHash = "sha256-Ie486oAsgsOM5hDURD+1bfnGIUqkeW2bOaIDiwWWq+0="; passthru.updateScript = nix-update-script { }; From 83e1665c01249eb796e00ee8a1c25d962793e390 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Jul 2025 02:14:52 +0000 Subject: [PATCH 11/11] tfswitch: 1.4.5 -> 1.4.6 --- pkgs/by-name/tf/tfswitch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 29272bcd14ac..7dfc828476fb 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-hwAVnTvOXxLUCtCKNMvdS4MfscpMACIZHgJsJNqAJBE="; + sha256 = "sha256-KYie6nabNJDGNvs2vOQHl+ISEGNKwReHuDahMo1SmbM="; }; - vendorHash = "sha256-inMUSw75tLPAhJrcralzeib2Mo1H37CI7629Xopu/mA="; + vendorHash = "sha256-IXawIayV9RbWgoKKgnHAtr6RQrYGUBRF5CrQnPsrebc="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com