From 297dac57387f61857c5dd8159d100b7466f70ecb Mon Sep 17 00:00:00 2001 From: iamanaws <78835633+Iamanaws@users.noreply.github.com> Date: Wed, 26 Feb 2025 19:52:09 -0800 Subject: [PATCH 01/25] mongodb-atlas-cli: merge with previous init pr - update homepage - add changelog --- pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix index 949160710bda..faf0045737d3 100644 --- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -1,7 +1,8 @@ { + stdenv, + fetchFromGitHub, lib, buildGoModule, - fetchFromGitHub, installShellFiles, nix-update-script, testers, @@ -12,15 +13,15 @@ buildGoModule rec { pname = "mongodb-atlas-cli"; version = "1.46.2"; - vendorHash = "sha256-z42tJJD/iK9GDnYxdeMYogaMviGABizxX9fdWL8vVik="; - src = fetchFromGitHub { owner = "mongodb"; repo = "mongodb-atlas-cli"; - rev = "refs/tags/atlascli/v${version}"; - sha256 = "sha256-yg6GSG4TXPj4n8s4TK/i7NveJXMAQczONSrLn39PKVI="; + tag = "refs/tags/atlascli/v${version}"; + hash = "sha256-yg6GSG4TXPj4n8s4TK/i7NveJXMAQczONSrLn39PKVI="; }; + vendorHash = "sha256-z42tJJD/iK9GDnYxdeMYogaMviGABizxX9fdWL8vVik="; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ @@ -30,7 +31,9 @@ buildGoModule rec { "-X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.Version=v${version}" ]; - postInstall = '' + subPackages = [ "cmd/atlas" ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd atlas \ --bash <($out/bin/atlas completion bash) \ --fish <($out/bin/atlas completion fish) \ @@ -48,10 +51,14 @@ buildGoModule rec { }; meta = { - homepage = "https://www.mongodb.com/try/download/shell"; description = "CLI utility to manage MongoDB Atlas from the terminal"; - maintainers = with lib.maintainers; [ aduh95 ]; + homepage = "https://github.com/mongodb/mongodb-atlas-cli"; + changelog = "https://www.mongodb.com/docs/atlas/cli/current/atlas-cli-changelog/#atlas-cli-${version}"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + aduh95 + iamanaws + ]; mainProgram = "atlas"; }; } From 6c9c7342a8394d120fad1b43a55899a23d2d0a85 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 4 Jun 2025 13:27:37 +0300 Subject: [PATCH 02/25] evil-helix: use lambda instead of rec attrs --- pkgs/by-name/ev/evil-helix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index 4bef9ecc3d47..074219d0c704 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -7,14 +7,14 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (final: { pname = "evil-helix"; version = "20250601"; src = fetchFromGitHub { owner = "usagi-flow"; repo = "evil-helix"; - rev = "release-${version}"; + tag = "release-${final.version}"; hash = "sha256-bsl9ltPXEhkcnnHFAXQMyBCh1qd+UBV0XK2EcJOe+eg="; }; @@ -50,4 +50,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "hx"; maintainers = with lib.maintainers; [ thiagokokada ]; }; -} +}) From 122adcf55abee4de61f60d6b0c1674775e26bc79 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 4 Jun 2025 13:27:52 +0300 Subject: [PATCH 03/25] helix: use lambda instead of rec attrs --- pkgs/by-name/he/helix/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index b26a4d913e47..c041b78f6622 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -8,14 +8,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (final: { pname = "helix"; version = "25.07.1"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { - url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; + url = "https://github.com/helix-editor/helix/releases/download/${final.version}/helix-${final.version}-source.tar.xz"; hash = "sha256-Pj/lfcQXRWqBOTTWt6+Gk61F9F1UmeCYr+26hGdG974="; stripRoot = false; }; @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Post-modern modal text editor"; homepage = "https://helix-editor.com"; - changelog = "https://github.com/helix-editor/helix/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/helix-editor/helix/blob/${final.version}/CHANGELOG.md"; license = lib.licenses.mpl20; mainProgram = "hx"; maintainers = with lib.maintainers; [ @@ -65,4 +65,4 @@ rustPlatform.buildRustPackage rec { zowoq ]; }; -} +}) From c2e3bcd53aa8717061b3a6dd8697b87327606e6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Jul 2025 01:09:19 +0000 Subject: [PATCH 04/25] debianutils: 5.23.1 -> 5.23.2 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 451fc60a76bd..81c33f25712a 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.23.1"; + version = "5.23.2"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-kQFl57kusyL3kGG9pJ8j2AsKBH4245xiPoDUYHjjv1g="; + hash = "sha256-28pl0uua4gX65uZP1td87HfojKLvkjJbo8KPqpgg/0g="; }; nativeBuildInputs = [ From 188a82889e1caee540600a78c1461ee36bd5bf41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Aug 2025 02:35:46 +0000 Subject: [PATCH 05/25] wt: 4.11.4 -> 4.12.0 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index e88e45afdbf3..4f5580fac787 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -79,7 +79,7 @@ let in { wt4 = generic { - version = "4.11.4"; - sha256 = "sha256-ynmOUONHo8VTq8nmD+/SpDPR7bHILw8mArvY2DZJ5Hk="; + version = "4.12.0"; + sha256 = "sha256-/SM/iTp/TQU8nq647UAHexFb3S5n6pk3lDkra3AEjis="; }; } From b715e02c9001bf02ec5fbbe38a148525b364fc95 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:20:31 +0800 Subject: [PATCH 06/25] weaver: use finalAttrs.finalPackage in testers.testVersion --- pkgs/by-name/we/weaver/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index fa97b542f719..e7196b87d103 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, testers, - weaver, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -25,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; passthru.tests.version = testers.testVersion { - package = weaver; + package = finalAttrs.finalPackage; }; meta = { From 28ceb089dc75ea40fdea50916a8e1ec83b6577a2 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:20:45 +0800 Subject: [PATCH 07/25] vsce: use finalAttrs.finalPackage in testers.testVersion --- pkgs/by-name/vs/vsce/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 764e7a0fa712..2ba7ff9a0144 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -6,7 +6,6 @@ libsecret, python3, testers, - vsce, nix-update-script, }: @@ -39,7 +38,7 @@ buildNpmPackage (finalAttrs: { passthru = { tests.version = testers.testVersion { - package = vsce; + package = finalAttrs.finalPackage; }; updateScript = nix-update-script { extraArgs = [ From d5319099eab936b60b0606c6a94c536d754bd5ac Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:21:16 +0800 Subject: [PATCH 08/25] okteto: use finalAttrs.finalPackage in testers.testVersion --- pkgs/by-name/ok/okteto/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 5f3163b13eae..f11f3082f371 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, testers, - okteto, }: buildGoModule (finalAttrs: { @@ -74,7 +73,7 @@ buildGoModule (finalAttrs: { ''; passthru.tests.version = testers.testVersion { - package = okteto; + package = finalAttrs.finalPackage; command = "HOME=\"$(mktemp -d)\" okteto version"; }; From e18784610dc623ef5ad6c74939225f7efca3378a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Aug 2025 15:21:41 +0800 Subject: [PATCH 09/25] harbor-cli: use finalAttrs.finalPackage in testers.testVersion --- pkgs/by-name/ha/harbor-cli/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index f377959cb7b3..f8d0e38c672f 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -4,7 +4,6 @@ buildGoModule, fetchFromGitHub, testers, - harbor-cli, installShellFiles, }: @@ -46,7 +45,7 @@ buildGoModule (finalAttrs: { ''; passthru.tests.version = testers.testVersion { - package = harbor-cli; + package = finalAttrs.finalPackage; command = "HOME=\"$(mktemp -d)\" harbor version"; }; From 23a30037a4ffc3d22913542505007b035c04361f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 5 Aug 2025 14:28:52 +0000 Subject: [PATCH 10/25] jalv-qt: move override out of top-level to reduce thunks --- pkgs/by-name/ja/jalv-qt/package.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ja/jalv-qt/package.nix diff --git a/pkgs/by-name/ja/jalv-qt/package.nix b/pkgs/by-name/ja/jalv-qt/package.nix new file mode 100644 index 000000000000..ee809682e2e1 --- /dev/null +++ b/pkgs/by-name/ja/jalv-qt/package.nix @@ -0,0 +1,7 @@ +{ + jalv, +}: + +jalv.override { + useQt = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f64bfcdaa731..c824b983bb8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12577,8 +12577,6 @@ with pkgs; jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; - jalv-qt = jalv.override { useQt = true; }; - js8call = qt5.callPackage ../applications/radio/js8call { }; jwm = callPackage ../applications/window-managers/jwm { }; From 85c3cf422c998920a8a3c87ddb5a29ec46995fee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 20:22:47 +0000 Subject: [PATCH 11/25] libkqueue: 2.6.2 -> 2.6.3 --- pkgs/by-name/li/libkqueue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libkqueue/package.nix b/pkgs/by-name/li/libkqueue/package.nix index 68dc890b7082..639638d9a9a9 100644 --- a/pkgs/by-name/li/libkqueue/package.nix +++ b/pkgs/by-name/li/libkqueue/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libkqueue"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "mheily"; repo = "libkqueue"; rev = "v${version}"; - sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk="; + sha256 = "sha256-q9ycYeo8BriD9bZEozjkdHUg2xntQUZwbYX7d1IZPzk="; }; nativeBuildInputs = [ cmake ]; From d2a4d6c912390b7767cd5057186cd582385ee228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 21:08:59 +0000 Subject: [PATCH 12/25] gruvbox-gtk-theme: 0-unstable-2025-07-21 -> 0-unstable-2025-07-28 --- pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 146a7e839b1f..ceb7793e9f00 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2025-07-21"; + version = "0-unstable-2025-07-28"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "b1cfcc8a3b461f227c8a89dee17a80ed8f6656f4"; - hash = "sha256-QFXaAtgH30aP1+/rNobntTAMfwh+AAb26FyZgElVdC4="; + rev = "39aed8f4d09d5ac75162adea1a64212ad4ef9ade"; + hash = "sha256-Q2XwcYMz/GsFyd5kjj7OYwa724OUxw8w+nhTBkWo3Z0="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From c03ad93486f3e8318826030225a54d9d25221b89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 22:36:25 +0000 Subject: [PATCH 13/25] python3Packages.langgraph-prebuilt: 0.6.1 -> 0.6.3 --- .../development/python-modules/langgraph-prebuilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix index c3f4e850bcde..e866d965871e 100644 --- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix +++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix @@ -31,14 +31,14 @@ # It exists so the langgraph team can iterate on it without having to rebuild langgraph. buildPythonPackage rec { pname = "langgraph-prebuilt"; - version = "0.6.1"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "prebuilt==${version}"; - hash = "sha256-8mubZSV1CDgYzykKaaWqn04yJldAgdGmgZDm54towWc="; + hash = "sha256-bASxPjOElhJhOAc0XiSqZ+i+dKETYi1KTFgamlJHA9Y="; }; sourceRoot = "${src.name}/libs/prebuilt"; From 4f9d0bd2847a8de448cfbdbf0c02f67072f6966e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 7 Aug 2025 13:21:09 +0000 Subject: [PATCH 14/25] ipe: migrate to by-name ipe: refactor package definitions ghostscript: migrate to by-name --- pkgs/by-name/gh/ghostscriptX/package.nix | 8 +++++ .../gh/ghostscript_headless/package.nix | 8 +++++ .../ip/ipe/package.nix} | 32 +++++++++---------- pkgs/top-level/all-packages.nix | 15 --------- 4 files changed, 32 insertions(+), 31 deletions(-) create mode 100644 pkgs/by-name/gh/ghostscriptX/package.nix create mode 100644 pkgs/by-name/gh/ghostscript_headless/package.nix rename pkgs/{applications/graphics/ipe/default.nix => by-name/ip/ipe/package.nix} (81%) diff --git a/pkgs/by-name/gh/ghostscriptX/package.nix b/pkgs/by-name/gh/ghostscriptX/package.nix new file mode 100644 index 000000000000..e49be1ba159f --- /dev/null +++ b/pkgs/by-name/gh/ghostscriptX/package.nix @@ -0,0 +1,8 @@ +{ + ghostscript, +}: + +ghostscript.override { + cupsSupport = true; + x11Support = true; +} diff --git a/pkgs/by-name/gh/ghostscript_headless/package.nix b/pkgs/by-name/gh/ghostscript_headless/package.nix new file mode 100644 index 000000000000..1cd90e6802ae --- /dev/null +++ b/pkgs/by-name/gh/ghostscript_headless/package.nix @@ -0,0 +1,8 @@ +{ + ghostscript, +}: + +ghostscript.override { + cupsSupport = false; + x11Support = false; +} diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/by-name/ip/ipe/package.nix similarity index 81% rename from pkgs/applications/graphics/ipe/default.nix rename to pkgs/by-name/ip/ipe/package.nix index f34826525fce..e72d1455778e 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/by-name/ip/ipe/package.nix @@ -7,53 +7,53 @@ copyDesktopItems, cairo, freetype, - ghostscript, + ghostscriptX, gsl, libjpeg, libpng, libspiro, lua5, - qtbase, - qtsvg, + qt6Packages, texliveSmall, qhull, - wrapQtAppsHook, zlib, withTeXLive ? true, withQVoronoi ? false, buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ipe"; version = "7.2.30"; src = fetchFromGitHub { owner = "otfried"; repo = "ipe"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE="; }; nativeBuildInputs = [ pkg-config copyDesktopItems - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ cairo freetype - ghostscript + ghostscriptX gsl libjpeg libpng libspiro lua5 + ] + ++ (with qt6Packages; [ qtbase qtsvg zlib - ] + ]) ++ (lib.optionals withTeXLive [ texliveSmall ]) @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = pname; + name = "ipe"; desktopName = "Ipe"; genericName = "Drawing editor"; comment = "A drawing editor for creating figures in PDF format"; @@ -100,19 +100,19 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/share/ipe/${version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png + ln -s $out/share/ipe/${finalAttrs.version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png ''; - meta = with lib; { + meta = { description = "Editor for drawing figures"; homepage = "http://ipe.otfried.org"; # https not available - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; - maintainers = with maintainers; [ ttuegel ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2187a7fa3929..8459278e5b7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12513,11 +12513,6 @@ with pkgs; lua = lua5_1; }; - ipe = qt6Packages.callPackage ../applications/graphics/ipe { - ghostscript = ghostscriptX; - lua5 = lua5_3; - }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; jabcode = callPackage ../development/libraries/jabcode { }; @@ -15564,16 +15559,6 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - ghostscriptX = ghostscript.override { - cupsSupport = true; - x11Support = true; - }; - - ghostscript_headless = ghostscript.override { - cupsSupport = false; - x11Support = false; - }; - gnuk = callPackage ../misc/gnuk { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; From 43744d55b9b25021d393525f4ed107d8ec50c4c7 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Thu, 7 Aug 2025 18:58:06 -0400 Subject: [PATCH 15/25] code-cursor: 1.3.9 -> 1.4.2 --- pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index c80f1fa3d25e..2f397b73d9b3 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/x64/Cursor-1.3.9-x86_64.AppImage"; - hash = "sha256-0kkTL6ZCnLxGBQSVoZ7UEOBNtTZVQolVAk/2McCV0Rw="; + url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/linux/x64/Cursor-1.4.2-x86_64.AppImage"; + hash = "sha256-WMZA0CjApcSTup4FLIxxaO7hMMZrJPawYsfCXnFK4EE="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/arm64/Cursor-1.3.9-aarch64.AppImage"; - hash = "sha256-5g26fm+tpm8xQTutygI20TcUHL08gKlG0uZSHixK2Ao="; + url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/linux/arm64/Cursor-1.4.2-aarch64.AppImage"; + hash = "sha256-JuEu+QVz6b0iEz711mQSZ1UyVqFeFk6knQEjZxGr3+g="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-IJV35JNpoUybArz2NhvX8IzDUmvzN+GVq/MyDtXgVeI="; + url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-TvPNU9GSNBvksEvwLcpirUu/rSc67bf00Usp+2T71lk="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-TYdv8UKoBtv0WUHWBqJtpG9vHDkEBBPLS/7BZhdxR1M="; + url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-AmNTIXQXdhnu31L5gtYGNFmICvGJkPRiz3yJJ0yw4kM="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.3.9"; + version = "1.4.2"; pname = "cursor"; # You can find the current VSCode version in the About dialog: From 16dd98c1367b53dcc73762ba734d180d3a08ac0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 11:38:23 +0000 Subject: [PATCH 16/25] python3Packages.debugpy: 1.8.15 -> 1.8.16 --- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 82f85aaecfc8..efc9bf09d4d4 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.15"; + version = "1.8.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; tag = "v${version}"; - hash = "sha256-neo7A+bjAhuvqYY4YA3O0v5aWUKV91mqajI8gpY0QYs="; + hash = "sha256-11P2L3/ePoKrqO2G65XJeDEB6lsC8h7oRyXzGRz18tg="; }; patches = [ From bfa19339391ccb59972b8874b13644253a145c66 Mon Sep 17 00:00:00 2001 From: GDBlaster <65135527+GDBlaster@users.noreply.github.com> Date: Thu, 7 Aug 2025 10:36:05 +0200 Subject: [PATCH 17/25] nh: Delay run on boot so clean service doesnt make the boot process wait for it Fix formatting Co-authored-by: Acid Bong changed target to multi-user --- nixos/modules/programs/nh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/nh.nix b/nixos/modules/programs/nh.nix index fd9229bd71d1..f50e7a9dcea9 100644 --- a/nixos/modules/programs/nh.nix +++ b/nixos/modules/programs/nh.nix @@ -99,6 +99,7 @@ in script = "exec ${lib.getExe cfg.package} clean all ${cfg.clean.extraArgs}"; startAt = cfg.clean.dates; path = [ config.nix.package ]; + after = [ "multi-user.target" ]; serviceConfig.Type = "oneshot"; }; From 4ce19d45cc8fe78acffcda39a850cac2dcdf45b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 16:56:06 +0000 Subject: [PATCH 18/25] emmylua-doc-cli: 0.10.0 -> 0.11.0 --- pkgs/by-name/em/emmylua-doc-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index 740ede7c14f1..03d11fdd46f0 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-Fvg3G0C/YECDEWZ4mDC5b8qocWvyDJ9KdLYNtwIu0+I="; + hash = "sha256-HbjGOvK/b7SyhNF/Jff0SgJdOfSbzjkDkqQwuflOABA="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-MIGYx1qMxsCCq3QkFeOuKbM4w/sJ2K0T+SRIDJQjf/8="; + cargoHash = "sha256-3x71VNWCTFb75STx8w/T++dLo1s2FwNhFm+lyZHS7qI="; nativeInstallCheckInputs = [ versionCheckHook From bf04c362e6b43b169949d976276b50cc8b9d4f44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 20:27:31 +0000 Subject: [PATCH 19/25] viceroy: 0.13.0 -> 0.14.0 --- pkgs/by-name/vi/viceroy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix index dbe58483f865..c449d32cbaac 100644 --- a/pkgs/by-name/vi/viceroy/package.nix +++ b/pkgs/by-name/vi/viceroy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "fastly"; repo = "viceroy"; rev = "v${version}"; - hash = "sha256-DeViAqL+7mta/wH7rLyltOCtHCTFXZczn2vAL1k+R2Y="; + hash = "sha256-DHA0nfTDq40qoNnD9ZgLtouKEzi9jFUCowMCoBdnqNU="; }; - cargoHash = "sha256-LBJD1w8/jLw5xYdHxR+EM2Cb4eVFpRw+M/K7K4Z0OUw="; + cargoHash = "sha256-f4F6MNJaLJiwY7ZkqrbrDXGufrb/aO3WgMmE7gRGvdQ="; cargoTestFlags = [ "--package viceroy-lib" From 4a4d122bb77040078aa983ecdff80c5f3bb42c9a Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 8 Aug 2025 22:49:51 +0200 Subject: [PATCH 20/25] conduwuit: drop Upstream has deleted their repository for good (after previously archiving it), so it's time we remove this already deprecated package. --- doc/release-notes/rl-2511.section.md | 2 + pkgs/by-name/co/conduwuit/package.nix | 100 -------------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 pkgs/by-name/co/conduwuit/package.nix diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index e67729917c77..68f68cb4e64f 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -26,6 +26,8 @@ - `mx-puppet-discord` was removed from nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree. +- `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible. + - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67). - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env". diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix deleted file mode 100644 index e3661b94e53e..000000000000 --- a/pkgs/by-name/co/conduwuit/package.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - bzip2, - zstd, - stdenv, - rocksdb, - nix-update-script, - testers, - conduwuit, - # upstream conduwuit enables jemalloc by default, so we follow suit - enableJemalloc ? true, - rust-jemalloc-sys, - enableLiburing ? stdenv.hostPlatform.isLinux, - liburing, -}: -let - rust-jemalloc-sys' = rust-jemalloc-sys.override { - unprefixed = !stdenv.hostPlatform.isDarwin; - }; - rocksdb' = rocksdb.override { - inherit enableLiburing; - # rocksdb does not support prefixed jemalloc, which is required on darwin - enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; - jemalloc = rust-jemalloc-sys'; - }; -in -rustPlatform.buildRustPackage rec { - pname = "conduwuit"; - version = "0.4.6"; - - src = fetchFromGitHub { - owner = "girlbossceo"; - repo = "conduwuit"; - rev = "v${version}"; - hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE="; - }; - - cargoHash = "sha256-L0UvJ5ZyEk/hZobkB21u6cfPCeRwhDl+07aWcQEOgYw="; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = [ - bzip2 - zstd - ] - ++ lib.optional enableJemalloc rust-jemalloc-sys' - ++ lib.optional enableLiburing liburing; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include"; - ROCKSDB_LIB_DIR = "${rocksdb'}/lib"; - }; - - buildNoDefaultFeatures = true; - # See https://github.com/girlbossceo/conduwuit/blob/main/src/main/Cargo.toml - # for available features. - # We enable all default features except jemalloc and io_uring, which - # we guard behind our own (default-enabled) flags. - buildFeatures = [ - "brotli_compression" - "element_hacks" - "gzip_compression" - "release_max_log_level" - "sentry_telemetry" - "systemd" - "zstd_compression" - ] - ++ lib.optional enableJemalloc "jemalloc" - ++ lib.optional enableLiburing "io_uring"; - - passthru = { - updateScript = nix-update-script { }; - tests = { - version = testers.testVersion { - inherit version; - package = conduwuit; - }; - }; - }; - - meta = { - description = "Matrix homeserver written in Rust, forked from conduit"; - homepage = "https://conduwuit.puppyirl.gay/"; - changelog = "https://github.com/girlbossceo/conduwuit/releases/tag/v${version}"; - license = lib.licenses.asl20; - knownVulnerabilities = [ - "On April 11, 2025, the conduwuit project officially ceased development" - ]; - maintainers = with lib.maintainers; [ niklaskorz ]; - # Not a typo, conduwuit is a drop-in replacement for conduit. - mainProgram = "conduit"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2bcd0d4e169d..003462e80623 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -487,6 +487,7 @@ mapAliases { codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 + conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 From cb18829c07484f56b9b37b59d322c58005d40762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 23:00:55 +0000 Subject: [PATCH 21/25] vscode-extensions.coder.coder-remote: 1.9.2 -> 1.10.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 25c542dd9985..185f48bfdd96 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1020,8 +1020,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.9.2"; - hash = "sha256-klI3OMYu5FL3/c4jBzgy8SmxJI5nGRK5k9bZrEtm5+0="; + version = "1.10.0"; + hash = "sha256-DMlWWJQNHJDBio71DkSl10/8KvuQxUQDIm0FJS1iEWQ="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; From f0c856e7125c61a7198f639a8ccb3dc32911cbaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 23:05:35 +0000 Subject: [PATCH 22/25] vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 0.16.1 -> 0.18.3 --- .../ms-windows-ai-studio.windows-ai-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 24a51005578c..8fbf3af493e6 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.16.1"; - hash = "sha256-uhAUSXB7ULNmkRSHqfbo3T3AZ3TiUaIqEZL4YwkWxtY="; + version = "0.18.3"; + hash = "sha256-F9anvTj8oNN9TaAWcRvZVTcgREyCqeVLRtnIo7XNHXk="; }; meta = { From 4a9be786e85a71916dc2ebc7cf1c3f4a8eed3ed3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Aug 2025 00:53:33 +0000 Subject: [PATCH 23/25] vscode-extensions.amazonwebservices.amazon-q-vscode: 1.85.0 -> 1.88.0 --- .../extensions/amazonwebservices.amazon-q-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 9fecad5b302e..4a908685ec8d 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.85.0"; - hash = "sha256-AIZMj1v0zj9ZU5yV2MQhyqgT+1l20XPIb6LY7UREdb4="; + version = "1.88.0"; + hash = "sha256-4utsGujCTUcfHbdHo7FOIT/MPo+bZ1GxyZxaRkt+/xk="; }; meta = { From 8b39dd562cbb1f72190f1f34ef5e82d783775ff5 Mon Sep 17 00:00:00 2001 From: Jost Alemann <58050402+ddogfoodd@users.noreply.github.com> Date: Sat, 9 Aug 2025 03:45:43 +0200 Subject: [PATCH 24/25] harper: 0.55.0 -> 0.56.0; add myself as maintainer (#431594) * harper: 0.55.0 -> 0.56.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.56.0 Diff: https://github.com/Automattic/harper/compare/v0.55.0...v0.56.0 * add ddogfoodd as maintainer --- pkgs/by-name/ha/harper/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 9b924b8c89c7..23d2a3671884 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-lqN6TW78jCfn8HUBrkf7R7FV8iFEAoeycBVsUgggZHw="; + hash = "sha256-Ih3L+wLISnoiurqPTSQns9IBuxIJCjLbS0OQjtc3n8Q="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-befFgoP1bZSH9hqrLs9MCK2YkwJb4kK4h09I5y6qmzM="; + cargoHash = "sha256-Ir7EDjN1+cFOc0Sm59LPmChbDwCuF6f17vg+5vwjEoo="; passthru.updateScript = nix-update-script { }; @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ pbsds sumnerevans + ddogfoodd ]; mainProgram = "harper-ls"; }; From 9e8df3a7a2bd746c2f2658ca8fafe6432cc06758 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Aug 2025 01:57:58 +0000 Subject: [PATCH 25/25] postfix-tlspol: 1.8.12 -> 1.8.13 --- pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index f40760c639b8..0e5224de0375 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.12"; + version = "1.8.13"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-OBGBjbLnyDKz/UK5th1k/gfxHjBGxyWQKgiXuuJNf8Q="; + hash = "sha256-ff+tQb3GfWYt+u7idQf/mTN8uSkkbWLfxlq+1m1gfyc="; }; vendorHash = null;