From 7ba0b38f6ff3969ccad91f48c78dafbca584238f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Jul 2025 05:43:13 +0000 Subject: [PATCH 01/61] python3Packages.python-gitlab: 6.1.0 -> 6.2.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index fb351f79bb97..d55bd12447c4 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-Bi1pQ2mbCbzkD3J/DQkGoLJUykVVk/gXRbsaNSU17nc="; + hash = "sha256-uIx5zqZd0kJZIsgpcw6pWCftcTLYabhTK5CoxxmcwaY="; }; build-system = [ setuptools ]; From 5a3155ec8617e838d83ad84a5d1ba5c6dcd20851 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 02/61] llvmPackages_13.*: unpin GCC This was added to LLVM 6, 8, 9, 10, 13, and 14 (but no others) in 695fe131c264a3cc244c9b07c71335f07bb92452, and then I guess gradually got removed from all of them except 13. Anyway, I successfully built `llvmPackages_13.stdenv` with the default GCC. --- pkgs/development/compilers/llvm/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 41c1db1c66eb..49c1e4950e20 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -5,7 +5,6 @@ buildPackages, targetPackages, stdenv, - gcc12Stdenv, pkgs, recurseIntoAttrs, # This is the default binutils, but with *this* version of LLD rather @@ -81,13 +80,6 @@ let ; } // packageSetArgs # Allow overrides. - // { - stdenv = - if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then - gcc12Stdenv - else - stdenv; # does not build with gcc13 - } ) ) ); From 02e8fd8d9d71cede13e5a298d7a40924c720a069 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Thu, 14 Aug 2025 09:49:49 +0200 Subject: [PATCH 03/61] gemini-cli: 0.1.18 -> 0.1.21 --- pkgs/by-name/ge/gemini-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index c39edbfc02ae..6e9978ddd571 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -8,13 +8,13 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.1.18"; + version = "0.1.21"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-vO70olSAG6NaZjyERU22lc8MbVivyJFieGcy0xOErrc="; + hash = "sha256-eS83Uwp6LzyQuIx2jirXnJ6Xb2XEaAKLnS9PMKTIvyI="; }; patches = [ @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { }) ]; - npmDepsHash = "sha256-8dn0i2laR4LFZk/sFDdvblvrHSnraGcLl3WAthCOKc0="; + npmDepsHash = "sha256-5pFnxZFhVNxYLPJClYq+pe4wAX5623Y3hFj8lIq00+E="; preConfigure = '' mkdir -p packages/generated From 380fdf58b81cfecddf8444f7649a387921c2ecdc Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Thu, 14 Aug 2025 10:05:15 +0200 Subject: [PATCH 04/61] gemini-cli: add taranarmo as maintainer --- pkgs/by-name/ge/gemini-cli/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 6e9978ddd571..515729bdab2d 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -59,7 +59,10 @@ buildNpmPackage (finalAttrs: { description = "AI agent that brings the power of Gemini directly into your terminal"; homepage = "https://github.com/google-gemini/gemini-cli"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ donteatoreo ]; + maintainers = with lib.maintainers; [ + donteatoreo + taranarmo + ]; platforms = lib.platforms.all; mainProgram = "gemini"; }; From 8e0e82f023ad613deb3d153d1a612cfb3c667dd3 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Thu, 14 Aug 2025 10:15:02 +0200 Subject: [PATCH 05/61] gemini-cli: make patch vendored --- pkgs/by-name/ge/gemini-cli/package.nix | 8 +-- .../restore-missing-dependencies-fields.patch | 69 +++++++++++++++++++ 2 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 515729bdab2d..5526698a89ab 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -2,7 +2,6 @@ lib, buildNpmPackage, fetchFromGitHub, - fetchpatch, gitUpdater, }: @@ -18,11 +17,8 @@ buildNpmPackage (finalAttrs: { }; patches = [ - (fetchpatch { - url = "https://github.com/google-gemini/gemini-cli/pull/5336/commits/c1aef417d559237bf4d147c584449b74d6fbc1f8.patch"; - name = "restore-missing-dependencies-fields.patch"; - hash = "sha256-euRoLpbv075KIpYF9QPMba5FxG4+h/kxwLRetaay33s="; - }) + # FIXME: remove once https://github.com/google-gemini/gemini-cli/pull/5336 is merged + ./restore-missing-dependencies-fields.patch ]; npmDepsHash = "sha256-5pFnxZFhVNxYLPJClYq+pe4wAX5623Y3hFj8lIq00+E="; diff --git a/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch b/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch new file mode 100644 index 000000000000..ed50554e645e --- /dev/null +++ b/pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch @@ -0,0 +1,69 @@ +From c1aef417d559237bf4d147c584449b74d6fbc1f8 Mon Sep 17 00:00:00 2001 +From: ljxfstorm +Date: Fri, 1 Aug 2025 10:23:11 +0800 +Subject: [PATCH] build(deps): restore missing `resolved` and `integrity` of + some dependencies + +--- + package-lock.json | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/package-lock.json b/package-lock.json +index 3938c5e32b..99590b8a9b 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -11738,6 +11738,8 @@ + }, + "packages/cli/node_modules/@testing-library/dom": { + "version": "10.4.0", ++ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz", ++ "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==", + "dev": true, + "license": "MIT", + "peer": true, +@@ -11773,6 +11775,8 @@ + }, + "packages/cli/node_modules/@testing-library/react": { + "version": "16.3.0", ++ "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz", ++ "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -11824,6 +11828,8 @@ + }, + "packages/cli/node_modules/aria-query": { + "version": "5.3.0", ++ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", ++ "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dev": true, + "license": "Apache-2.0", + "peer": true, +@@ -11833,6 +11839,8 @@ + }, + "packages/cli/node_modules/emoji-regex": { + "version": "10.4.0", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", ++ "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "license": "MIT" + }, + "packages/cli/node_modules/react-is": { +@@ -11845,6 +11853,8 @@ + }, + "packages/cli/node_modules/string-width": { + "version": "7.2.0", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", ++ "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", +@@ -11942,6 +11952,8 @@ + }, + "packages/core/node_modules/ignore": { + "version": "7.0.5", ++ "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", ++ "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "license": "MIT", + "engines": { + "node": ">= 4" + From 3d535ba7ffa84569205cf2ba4d0bec72408c3e8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Aug 2025 22:05:32 +0000 Subject: [PATCH 06/61] gruvbox-gtk-theme: 0-unstable-2025-07-28 -> 0-unstable-2025-08-13 --- 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 ceb7793e9f00..1c4a6c3f34a1 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-28"; + version = "0-unstable-2025-08-13"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "39aed8f4d09d5ac75162adea1a64212ad4ef9ade"; - hash = "sha256-Q2XwcYMz/GsFyd5kjj7OYwa724OUxw8w+nhTBkWo3Z0="; + rev = "f9f56cb51ba06d27f5ee8e7b88e20b0b4de6bf4c"; + hash = "sha256-gKJQ2TTh0MJB0SULA2ND8gvZ/YlC1dSxCOr0K2X4So0="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 833601aea125019f0581262555b80bc4edff12b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 06:48:48 +0000 Subject: [PATCH 07/61] dwm: 6.5 -> 6.6 --- pkgs/by-name/dw/dwm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix index 939bc608f40b..98bcd4190a00 100644 --- a/pkgs/by-name/dw/dwm/package.nix +++ b/pkgs/by-name/dw/dwm/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwm"; - version = "6.5"; + version = "6.6"; src = fetchzip { url = "https://dl.suckless.org/dwm/dwm-${finalAttrs.version}.tar.gz"; - hash = "sha256-Cc4B8evvuRxOjbeOhg3oAs3Nxi/msxWg950/eiq536w="; + hash = "sha256-fD97OpObSOBTAMc3teejS0u2h4hCkMVYJrNZ6F4IaFs="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config; From c73e8bcae340f8dae0e1eee9470ce58bd4bd24b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 11:32:32 +0000 Subject: [PATCH 08/61] xdp-tools: 1.5.5 -> 1.5.6 --- pkgs/by-name/xd/xdp-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix index 5fef58f3756d..06b08b520864 100644 --- a/pkgs/by-name/xd/xdp-tools/package.nix +++ b/pkgs/by-name/xd/xdp-tools/package.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - hash = "sha256-dK+ZpD1wv20iU51dsMUiW/Z9jojuwC8P3rrjU3LEB1Y="; + hash = "sha256-ztIatDNp0RXUpNsSoNWGj/kHNsCOlI6mqZvaQdlGbtQ="; }; outputs = [ From ebcdb9cbc239df3c802528c95d7770dd8852b5a1 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Thu, 14 Aug 2025 22:03:43 -0500 Subject: [PATCH 09/61] dendrite: 0.14.1 -> 0.15.2 Dendrite 0.15.0 is a security release supporting [room version 12](https://matrix.org/blog/2025/08/security-release/). It also added support for [MSC4163](https://github.com/matrix-org/matrix-spec-proposals/pull/4163) and [MSC3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967). Dendrite 0.15.1 and 2 are a bug fix releases on top of that. Full details can be found on dendrite's [changelog](https://github.com/element-hq/dendrite/blob/main/CHANGES.md). --- pkgs/by-name/de/dendrite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix index 722907bd4493..7406ef430178 100644 --- a/pkgs/by-name/de/dendrite/package.nix +++ b/pkgs/by-name/de/dendrite/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.14.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "element-hq"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-b/kybHF9WcP88kQuG7LB0/pgflYUeWNqEHfUyKfUCIU="; + hash = "sha256-VxQ5fuGzkEL371TmnDQ0wNqqmfzupmsTX/v+eFthj8E="; }; - vendorHash = "sha256-380xuwMD9gxrjUsLfO8R08wruyWZwjRhiIDmSc/FGwA="; + vendorHash = "sha256-QUztOoOesECAhwh4whzvrc43rJxjtPaEICUHno2DId0="; subPackages = [ # The server From 09dc51c11dadcb5738a90b500a7a4c80bb3b9236 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Aug 2025 06:42:04 +0000 Subject: [PATCH 10/61] apko: 0.30.2 -> 0.30.4 https://github.com/chainguard-dev/apko/releases/tag/v0.30.4 https://github.com/chainguard-dev/apko/releases/tag/v0.30.3 diff: https://github.com/chainguard-dev/apko/compare/v0.30.2...v0.30.4 Co-authored-by: emilylange --- pkgs/by-name/ap/apko/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 2c904c78dd01..bc9a0721a802 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.2"; + version = "0.30.4"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-5d/92BrrKfDGtIVp3AAg0cfKooaJH9YtDgmO635gZc4="; + hash = "sha256-4bmfHgtxaoXyx6GAUTtdNr47/Weol4KqO4fnonOCkEM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-jHvImL22IYaeYhhedN+C/AfJAFkCFN1UqKZOBsNhQnA="; + vendorHash = "sha256-snyfsRyNOx6bsz506Nde2ofcBgVQOlNvYGuwFoHKOzI="; nativeBuildInputs = [ installShellFiles ]; From e69f11b7979cb54a5bd3a4b11b8e85cbffa732f2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 15 Aug 2025 20:03:52 +0300 Subject: [PATCH 11/61] nixos/tests/prosody: fix test prosody-mysql --- nixos/tests/xmpp/prosody-mysql.nix | 71 +++++++++------------- pkgs/development/lua-modules/overrides.nix | 2 +- 2 files changed, 31 insertions(+), 42 deletions(-) diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix index abb6db37e76a..a4c7089d5bc0 100644 --- a/nixos/tests/xmpp/prosody-mysql.nix +++ b/nixos/tests/xmpp/prosody-mysql.nix @@ -2,37 +2,28 @@ let cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500 + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -days 365 \ + -subj '/C=GB/CN=example.com' -addext "subjectAltName = DNS:example.com,DNS:uploads.example.com,DNS:conference.example.com" mkdir -p $out cp key.pem cert.pem $out ''; + # Creates and set password for the 2 xmpp test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. createUsers = pkgs: - pkgs.writeScriptBin "create-prosody-users" '' - #!${pkgs.bash}/bin/bash + pkgs.writeShellScriptBin "create-prosody-users" '' set -e - - # Creates and set password for the 2 xmpp test users. - # - # Doing that in a bash script instead of doing that in the test - # script allow us to easily provision the users when running that - # test interactively. - prosodyctl register cthon98 example.com nothunter2 prosodyctl register azurediamond example.com hunter2 ''; + # Deletes the test users. delUsers = pkgs: - pkgs.writeScriptBin "delete-prosody-users" '' - #!${pkgs.bash}/bin/bash + pkgs.writeShellScriptBin "delete-prosody-users" '' set -e - - # Deletes the test users. - # - # Doing that in a bash script instead of doing that in the test - # script allow us to easily provision the users when running that - # test interactively. - prosodyctl deluser cthon98@example.com prosodyctl deluser azurediamond@example.com ''; @@ -49,20 +40,20 @@ import ../make-test-python.nix { }: { security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; - console.keyMap = "fr-bepo"; networking.extraHosts = '' - ${nodes.server.config.networking.primaryIPAddress} example.com - ${nodes.server.config.networking.primaryIPAddress} conference.example.com - ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ${nodes.server.networking.primaryIPAddress} example.com + ${nodes.server.networking.primaryIPAddress} conference.example.com + ${nodes.server.networking.primaryIPAddress} uploads.example.com ''; environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { - connectTo = nodes.server.config.networking.primaryIPAddress; + connectTo = nodes.server.networking.primaryIPAddress; }) ]; }; + server = - { config, pkgs, ... }: + { nodes, pkgs, ... }: { nixpkgs.overlays = [ (self: super: { @@ -72,11 +63,10 @@ import ../make-test-python.nix { }) ]; security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; - console.keyMap = "fr-bepo"; networking.extraHosts = '' - ${config.networking.primaryIPAddress} example.com - ${config.networking.primaryIPAddress} conference.example.com - ${config.networking.primaryIPAddress} uploads.example.com + ${nodes.server.networking.primaryIPAddress} example.com + ${nodes.server.networking.primaryIPAddress} conference.example.com + ${nodes.server.networking.primaryIPAddress} uploads.example.com ''; networking.firewall.enable = false; environment.systemPackages = [ @@ -98,7 +88,7 @@ import ../make-test-python.nix { domain = "conference.example.com"; } ]; - uploadHttp = { + httpFileShare = { domain = "uploads.example.com"; }; extraConfig = '' @@ -131,16 +121,15 @@ import ../make-test-python.nix { }; }; - testScript = - { nodes, ... }: - '' - # Check with mysql storage - mysql.wait_for_unit("mysql.service") - server.wait_for_unit("prosody.service") - server.succeed('prosodyctl status | grep "Prosody is running"') + testScript = _: '' + # Check with mysql storage + start_all() + mysql.wait_for_unit("mysql.service") + server.wait_for_unit("prosody.service") + server.succeed('prosodyctl status | grep "Prosody is running"') - server.succeed("create-prosody-users") - client.succeed("send-message") - server.succeed("delete-prosody-users") - ''; + server.succeed("create-prosody-users") + client.succeed("send-message") + server.succeed("delete-prosody-users") + ''; } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cc1185c66c46..0ccae9ada8ef 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -453,7 +453,7 @@ in luarocksConfig = lib.recursiveUpdate oa.luarocksConfig { variables = { MYSQL_INCDIR = "${lib.getDev libmysqlclient}/include/"; - MYSQL_LIBDIR = "${lib.getLib libmysqlclient}/lib/"; + MYSQL_LIBDIR = "${lib.getLib libmysqlclient}/lib//mysql/"; }; }; buildInputs = oa.buildInputs ++ [ From 2fa539d70dc9397353f5ea619eacdda939b1ff08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 17:18:40 +0000 Subject: [PATCH 12/61] wasm-tools: 1.236.0 -> 1.236.1 --- pkgs/by-name/wa/wasm-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 1cbd7b8ba265..b863092bd74a 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.236.0"; + version = "1.236.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${version}"; - hash = "sha256-gw5LIfbrJojsK7g8sMLBGXKJbME8MMtLm1ytVR1Zbmo="; + hash = "sha256-kg8I74i5MlsrmFGeHMFDs+FyuCNqNwj8buJE/apRMkg="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-/ixFvNTh1loXd3CPzNzGMGDbQPnGUtp/XaoK/7dW48Q="; + cargoHash = "sha256-5QUYWhWfmvvmHxlpPNT3nQmRb2D17XGkcHTzwvdjh6g="; cargoBuildFlags = [ "--package" "wasm-tools" From 776601b613cbaf3c6d4e83b22a15253880bac7dc Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 15 Aug 2025 21:11:54 +0300 Subject: [PATCH 13/61] radare2: 5.9.8 -> 6.0.2 --- .../tools/analysis/radare2/default.nix | 140 ++++++++++-------- 1 file changed, 76 insertions(+), 64 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0ba38fb56811..5c882963c30a 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -3,82 +3,73 @@ stdenv, fetchFromGitHub, buildPackages, - pkg-config, - meson, - ninja, - libusb-compat-0_1, - readline, - libewf, - perl, - zlib, - openssl, - libuv, + capstone, file, - libzip, - xxHash, gtk2, - vte, gtkdialog, - python3, - ruby, + libewf, + libusb-compat-0_1, + libuv, + libzip, lua, lz4, - capstone, + meson, + ninja, + openssl, + perl, + pkg-config, + python3, + readline, + ruby, + vte, + xxHash, + zlib, useX11 ? false, rubyBindings ? false, luaBindings ? false, }: - let - # NOTE: Check these revision changes when updating the package. - # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L25-L26 - arm64 = fetchFromGitHub { - owner = "radareorg"; - repo = "vector35-arch-arm64"; - rev = "55d73c6bbb94448a5c615933179e73ac618cf876"; - hash = "sha256-pZxxp5xDg8mgkGEx7LaBSoKxNPyggFYA4um9YaO20LU="; + binaryninja = fetchFromGitHub { + owner = "Vector35"; + repo = "binaryninja-api"; + rev = "c40a5f04deec68d388b2072dc42b29141089f9ce"; # https://github.com/radareorg/radare2/blob/master/subprojects/binaryninja.wrap + hash = "sha256-IfuGgwVI51urQxhaYkYsE45NkScgxKmmEBV6Pllhwmo="; }; - armv7 = fetchFromGitHub { - owner = "radareorg"; - repo = "vector35-arch-armv7"; - rev = "f270a6cc99644cb8e76055b6fa632b25abd26024"; - hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk="; + + sdb = fetchFromGitHub { + owner = "radare"; + repo = "sdb"; + tag = "2.2.0"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap + hash = "sha256-S/aL3F6+Z/rqelfIJaZaBF1IxSmhA1qE9ahFvKARoaE="; + }; + + qjs = fetchFromGitHub { + owner = "quickjs-ng"; + repo = "quickjs"; + rev = "7238ee64dbc2fbdea044555cda8cda78785a93ed"; # https://github.com/radareorg/radare2/blob/master/subprojects/qjs.wrap + hash = "sha256-1ZeLCTmbrlRrZB9El3L497gt3QUA5GIScrFVIBkxA88="; }; in stdenv.mkDerivation (finalAttrs: { pname = "radare2"; - version = "5.9.8"; + version = "6.0.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; tag = finalAttrs.version; - hash = "sha256-XSnv0yWEPlXHUPjf1Qu50AN3Gvgr0o6Q4e0dOyRdO9A="; + hash = "sha256-uCMf+pNqyjRLeNJlE8Kk6PQCIRBjidO/XGHeNV/F1lA="; }; - preBuild = '' - pushd ../libr/arch/p/arm/v35 - cp -r ${arm64} arch-arm64 - chmod -R +w arch-arm64 - - cp -r ${armv7} arch-armv7 - chmod -R +w arch-armv7 - popd - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib - ''; - mesonFlags = [ - "-Dr2_gittap=${finalAttrs.version}" - "-Duse_sys_capstone=true" - "-Duse_sys_lz4=true" - "-Duse_sys_magic=true" - "-Duse_sys_openssl=true" - "-Duse_sys_xxhash=true" - "-Duse_sys_zip=true" - "-Duse_sys_zlib=true" + (lib.mesonOption "use_sys_capstone" "true") + (lib.mesonOption "use_sys_lz4" "true") + (lib.mesonOption "use_sys_magic" "true") + (lib.mesonOption "use_sys_openssl" "true") + (lib.mesonOption "use_sys_xxhash" "true") + (lib.mesonOption "use_sys_zip" "true") + (lib.mesonOption "use_sys_zlib" "true") + (lib.mesonOption "r2_gittap" finalAttrs.version) ]; enableParallelBuilding = true; @@ -97,14 +88,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ capstone file - readline - libusb-compat-0_1 libewf - perl - zlib - openssl + libusb-compat-0_1 libuv lz4 + openssl + perl + readline + zlib ] ++ lib.optionals useX11 [ gtkdialog @@ -121,7 +112,28 @@ stdenv.mkDerivation (finalAttrs: { xxHash ]; - meta = with lib; { + postUnpack = '' + pushd $sourceRoot/subprojects + + cp -r ${binaryninja} binaryninja + chmod -R +w binaryninja + cp packagefiles/binaryninja/meson.build binaryninja + + cp -r ${sdb} sdb + chmod -R +w sdb + + cp -r ${qjs} qjs + chmod -R +w qjs + cp packagefiles/qjs/meson.build qjs + + popd + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib + ''; + + meta = { description = "UNIX-like reverse engineering framework and command-line toolset"; longDescription = '' r2 is a complete rewrite of radare. It provides a set of libraries, tools @@ -140,18 +152,18 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://radare.org"; changelog = "https://github.com/radareorg/radare2/releases/tag/${finalAttrs.version}"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ + arkivm azahi - raskin makefu mic92 - arkivm + raskin ]; mainProgram = "radare2"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) From 5ef0d02b1d785f6da1b49cc4ae8d698f2067e0de Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 15 Aug 2025 21:12:21 +0300 Subject: [PATCH 14/61] iaito: 5.9.9 -> 6.0.0 --- pkgs/tools/security/iaito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index 6bb5cd1ddebb..c4fbb6987fc4 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/pkgs/tools/security/iaito/default.nix @@ -14,13 +14,13 @@ let pname = "iaito"; - version = "5.9.9"; + version = "6.0.0"; main_src = fetchFromGitHub rec { owner = "radareorg"; repo = pname; tag = version; - hash = "sha256-y8Mfd7BmnMFJ9mpGKVL3i4VRxrzJ1gXaSsUQIFB9Wd4="; + hash = "sha256-bwGKHc2jlf1C/25CEoDUCLr6zOhAJES7+PvcGVyO8To="; name = repo; }; From 564dd29eeeb2bf1998faeaed4a50b26ca7baaf6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 19:04:25 +0000 Subject: [PATCH 15/61] terragrunt: 0.84.1 -> 0.85.0 --- pkgs/by-name/te/terragrunt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 1f8b6a5e4da0..d3d33ccab881 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "0.84.1"; + version = "0.85.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-fdKw0hNUKhOz/L0/ozkZPP/6z+C4i3UIGM2lX3/szr4="; + hash = "sha256-ey3Qbwg036OzWYfw/0lso3CentUXGF0/NB/w3ss3Dp0="; }; nativeBuildInputs = [ From c2e7fa51fc6865de0d326720dee7ab13149c958a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 20:45:00 +0000 Subject: [PATCH 16/61] aliae: 0.26.5 -> 0.26.6 --- pkgs/by-name/al/aliae/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index eed27dad9603..28c0419b5694 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "aliae"; - version = "0.26.5"; + version = "0.26.6"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; tag = "v${version}"; - hash = "sha256-F5OteK1D0MCNyiZG6iz3vawkx74WJKst2Yr6ca8TYZw="; + hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY="; }; - vendorHash = "sha256-TsJU1oAc1T+VdUYzrcyflTPYJhG6sPjFNZ7bZKk1KdM="; + vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4="; sourceRoot = "${src.name}/src"; From 12011af9d57b688ad07fff733ac718edeaf8467b Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 17/61] bazel_6: unpin GCC --- pkgs/top-level/all-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3c60cda341a..c782ed75601f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6813,13 +6813,7 @@ with pkgs; inherit (darwin) sigtool; buildJdk = jdk11_headless; runJdk = jdk11_headless; - stdenv = - if stdenv.cc.isClang then - llvmPackages_17.stdenv - else if stdenv.cc.isGNU then - gcc12Stdenv - else - stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv; bazel_self = bazel_6; }; From 2844e6aff46e820eb6902fb2a513e1a500273ef5 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 18/61] texlive: unpin GCC Seems to build fine with the default now. --- pkgs/tools/typesetting/tex/texlive/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 36435d58ff42..0e59e542ae4d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,8 +5,7 @@ */ { lib, - #, stdenv - gcc12Stdenv, + stdenv, fetchpatch, fetchurl, runCommand, @@ -45,9 +44,6 @@ recurseIntoAttrs, nixfmt, }: -let - stdenv = gcc12Stdenv; -in let # various binaries (compiled) bin = callPackage ./bin.nix { From 04f072b56a2cdd9c0648bc785ffde9999ed311d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 09:57:13 +0000 Subject: [PATCH 19/61] microsoft-edge: 139.0.3405.86 -> 139.0.3405.102 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index a0de5f803673..5a0971829d4b 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -178,11 +178,11 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "139.0.3405.86"; + version = "139.0.3405.102"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-S1/RUSwRQsBQno/I31xjw1CGs0tJpl5HRatat+wOqmE="; + hash = "sha256-rY6Q3sMIAGX/ZKOVvwSl6cxq24SB1PiCn7b1pMXMeps="; }; # With strictDeps on, some shebangs were not being patched correctly From 011a435bd281c2abd5e24b57b82d630111b548d8 Mon Sep 17 00:00:00 2001 From: m3l6h <8094643+M3L6H@users.noreply.github.com> Date: Sat, 16 Aug 2025 06:16:41 -0500 Subject: [PATCH 20/61] (vimPlugins.nvzone-volt): fix pname The nvzone plugins were named with an `nvzone` prefix due to how generic the individual plugins are: https://github.com/NixOS/nixpkgs/pull/357120 This caused their pnames to also have an `nvzone` prefix. However, plugin managers like Lazy.nvim expect pname to match the name of the git repository, hence the override of pname in this commit. --- pkgs/applications/editors/vim/plugins/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index eca499288cb4..7fa406a6a28c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2786,6 +2786,11 @@ in dependencies = [ self.nvzone-volt ]; }; + nvzone-volt = super.nvzone-volt.overrideAttrs { + # Plugin managers like Lazy.nvim expect pname to match the name of the git repository + pname = "volt"; + }; + obsidian-nvim = super.obsidian-nvim.overrideAttrs { checkInputs = with self; [ # Optional pickers From 3c7d67da23cdac5f1557dc3b20b751b125b5b1bc Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 16 Aug 2025 02:29:43 +0100 Subject: [PATCH 21/61] lib: deprecate `fromHexString` on dodgy inputs See . --- lib/tests/misc.nix | 28 +++++++--------------------- lib/trivial.nix | 19 +++++++++++++------ 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index ce07750d7ca0..6b9767fbc5d4 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -386,35 +386,21 @@ runTests { expected = 9223372036854775807; }; + testFromHexStringLeadingZeroes = { + expr = fromHexString "00ffffffffffffff"; + expected = 72057594037927935; + }; + testFromHexStringWithPrefix = { - expr = fromHexString "0Xf"; + expr = fromHexString "0xf"; expected = 15; }; - # FIXME: This might be bad and should potentially be deprecated. - testFromHexStringQuestionableMixedCase = { + testFromHexStringMixedCase = { expr = fromHexString "eEeEe"; expected = 978670; }; - # FIXME: This is probably bad and should potentially be deprecated. - testFromHexStringQuestionableUnderscore = { - expr = fromHexString "F_f"; - expected = 255; - }; - - # FIXME: This is definitely bad and should be deprecated. - testFromHexStringBadComment = { - expr = fromHexString "0 # oops"; - expected = 0; - }; - - # FIXME: Oh my god. - testFromHexStringAwfulInjection = { - expr = fromHexString "1\nwhoops = {}"; - expected = 1; - }; - testToBaseDigits = { expr = toBaseDigits 2 6; expected = [ diff --git a/lib/trivial.nix b/lib/trivial.nix index d1887f6a3ce4..7e4c5f549ee7 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1119,14 +1119,21 @@ in ``` */ fromHexString = - value: + str: let - noPrefix = lib.strings.removePrefix "0x" (lib.strings.toLower value); + match = builtins.match "(0x)?([0-7]?[0-9A-Fa-f]{1,15})" str; in - let - parsed = builtins.fromTOML "v=0x${noPrefix}"; - in - parsed.v; + if match != null then + (builtins.fromTOML "v=0x${builtins.elemAt match 1}").v + else + # TODO: Turn this into a `throw` in 26.05. + assert lib.warn "fromHexString: ${ + lib.generators.toPretty { } str + } is not a valid input and will be rejected in 26.05" true; + let + noPrefix = lib.strings.removePrefix "0x" (lib.strings.toLower str); + in + (builtins.fromTOML "v=0x${noPrefix}").v; /** Convert the given positive integer to a string of its hexadecimal From 4f8978dc07418b89e80edbd7388e4e6578cb240d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 16 Aug 2025 10:05:35 -0500 Subject: [PATCH 22/61] teams-for-linux: 2.1.4 -> 2.3.0 https: //github.com/IsmaelMartinez/teams-for-linux/releases/tag/v2.3.0 Signed-off-by: Austin Horstman --- pkgs/by-name/te/teams-for-linux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index a6a35e113194..bf4264e540b4 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.1.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-wzw7GXKehQCYX2RDH5G/SqhBSziVPnXiaPiLrhC2Dfc="; + hash = "sha256-wbkjLPaQFfAQmWtWVZ5U6PslaO7XvuuvU1yjlgaiKwQ="; }; - npmDepsHash = "sha256-PWWEFbenAXuYKwFN+C+pQumrYJqgtfAt9EzEiaMddhQ="; + npmDepsHash = "sha256-OesAv8y2FWWJsNS4ms/B65cbJ7jEwnuQLVUb8zm1oSQ="; nativeBuildInputs = [ makeWrapper From d96a97a70bdd5ba91a2a97fa8997e938596781fa Mon Sep 17 00:00:00 2001 From: Michael Hollingworth <8094643+M3L6H@users.noreply.github.com> Date: Sat, 16 Aug 2025 10:34:28 -0500 Subject: [PATCH 23/61] (vimPlugins.nvzone-typr): fix name The nvzone plugins were named with an `nvzone` prefix due to how generic the individual plugins are: NixOS#357120 This caused their pnames to also have an `nvzone` prefix. However, plugin managers like Lazy.nvim expect pname to match the name of the git repository, hence the override of pname in this commit. --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 7fa406a6a28c..aed405dc3cab 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2783,6 +2783,8 @@ in }; nvzone-typr = super.nvzone-typr.overrideAttrs { + # Plugin managers like Lazy.nvim expect pname to maych the name of the git repository + pname = "typr"; dependencies = [ self.nvzone-volt ]; }; From 4ba04bf8d1314c6dc0e126122aaed036f6a67b1c Mon Sep 17 00:00:00 2001 From: Michael Hollingworth <8094643+M3L6H@users.noreply.github.com> Date: Sat, 16 Aug 2025 10:36:37 -0500 Subject: [PATCH 24/61] (vimPlugins.nvzone-menu): fix pname The nvzone plugins were named with an `nvzone` prefix due to how generic the individual plugins are: NixOS#357120 This caused their pnames to also have an `nvzone` prefix. However, plugin managers like Lazy.nvim expect pname to match the name of the git repository, hence the override of pname in this commit. --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index aed405dc3cab..7b96574d6ae7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2767,6 +2767,8 @@ in }; nvzone-menu = super.nvzone-menu.overrideAttrs { + # Plugin managers like Lazy.nvim expect pname to match the name of the git repository + pname = "menu"; checkInputs = with self; [ # Optional integrations nvim-tree-lua From 73d909b04f542bf5b51927e9366c88990862453f Mon Sep 17 00:00:00 2001 From: Michael Hollingworth <8094643+M3L6H@users.noreply.github.com> Date: Sat, 16 Aug 2025 10:38:10 -0500 Subject: [PATCH 25/61] (vimPlugins.nvzone-minty): fix pname The nvzone plugins were named with an `nvzone` prefix due to how generic the individual plugins are: NixOS#357120 This caused their pnames to also have an `nvzone` prefix. However, plugin managers like Lazy.nvim expect pname to match the name of the git repository, hence the override of pname in this commit. --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 7b96574d6ae7..07904e06871f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2781,11 +2781,13 @@ in }; nvzone-minty = super.nvzone-minty.overrideAttrs { + # Plugin managers like Lazy.nvim expect pname to match the name of the git repository + pname = "minty"; dependencies = [ self.nvzone-volt ]; }; nvzone-typr = super.nvzone-typr.overrideAttrs { - # Plugin managers like Lazy.nvim expect pname to maych the name of the git repository + # Plugin managers like Lazy.nvim expect pname to match the name of the git repository pname = "typr"; dependencies = [ self.nvzone-volt ]; }; From 23f20a0ba3bfaa683bdd5edb852a9377db8c9438 Mon Sep 17 00:00:00 2001 From: sarahec Date: Sat, 16 Aug 2025 16:56:55 +0000 Subject: [PATCH 26/61] python312Packages.plotly: 6.2.0 -> 6.3.0 changelog: https://github.com/plotly/plotly.py/releases/tag/v6.3.0 diff: plotly/plotly.py@v6.2.0...v6.3.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 11cc72fa65c8..ed023d9f8389 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "plotly"; - version = "6.2.0"; + version = "6.3.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; tag = "v${version}"; - hash = "sha256-Vfj5jG0AkBjivExOx7oMoocTopWl0yMc1INpEbtlgTc="; + hash = "sha256-s+kWJy/dOqlNqRD/Ytxy/SSRsFJvp13jSvPMd0LQliQ="; }; postPatch = '' From 972b813d2654ad6872edc596e69c148da9a1727a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 16 Aug 2025 22:59:05 +0200 Subject: [PATCH 27/61] nvitop: 1.5.2 -> 1.5.3 Diff: https://github.com/XuehaiPan/nvitop/compare/v1.5.2...v1.5.3 Changelog: https://github.com/XuehaiPan/nvitop/releases/tag/v1.5.3 --- pkgs/by-name/nv/nvitop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index d5d6bc310a66..bfbbaf2659e7 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; tag = "v${version}"; - hash = "sha256-kUlKb5L8dzT4ESi0rO2v0kQILjnVy+zcoePwqckyfbk="; + hash = "sha256-cqRvjK3q9fm5HPnZFGSV59FPnAdLkeq/D5wSR5ke7Ok="; }; build-system = with python3Packages; [ setuptools ]; From 8e3491d2c36fa58d5237759906ca65b23bea5171 Mon Sep 17 00:00:00 2001 From: eymeric Date: Sun, 27 Jul 2025 11:40:14 +0200 Subject: [PATCH 28/61] netdata: 2.5.3 -> 2.6.2 Co-authored-by: Ryan Horiguchi --- pkgs/tools/system/netdata/default.nix | 73 +++++++++++++++++++-------- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index d795ce8c6076..9c9a2c6ea299 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -47,24 +47,25 @@ withDBengine ? true, withDebug ? false, withEbpf ? false, - withIpmi ? (stdenv.hostPlatform.isLinux), + withIpmi ? stdenv.hostPlatform.isLinux, withLibbacktrace ? true, - withNdsudo ? false, - withNetfilter ? (stdenv.hostPlatform.isLinux), - withNetworkViewer ? (stdenv.hostPlatform.isLinux), - withSsl ? true, - withSystemdJournal ? (stdenv.hostPlatform.isLinux), withML ? true, + withNdsudo ? false, + withNetfilter ? stdenv.hostPlatform.isLinux, + withNetworkViewer ? stdenv.hostPlatform.isLinux, + withSsl ? true, + withSystemdJournal ? stdenv.hostPlatform.isLinux, + withSystemdUnits ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { - version = "2.5.3"; + version = "2.6.2"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-OdH6cQ2dYvbeLh9ljaqmdr02VN2qbvNUXbPNCEkNzxc="; + hash = "sha256-XtU+oGynAnpwWTinwXVjtRYsTwIyAhkiRqY9CaOo7B0="; fetchSubmodules = true; }; @@ -119,7 +120,8 @@ stdenv.mkDerivation (finalAttrs: { libnetfilter_acct ] ++ lib.optionals withSsl [ openssl ] - ++ lib.optionals withSystemdJournal [ systemd ]; + ++ lib.optionals withSystemdJournal [ systemd ] + ++ lib.optionals withSystemdUnits [ systemd ]; patches = [ # Allow ndsudo to use non-hardcoded `PATH` @@ -166,24 +168,28 @@ stdenv.mkDerivation (finalAttrs: { $out/libexec/netdata/plugins.d/slabinfo.plugin.org mv $out/libexec/netdata/plugins.d/debugfs.plugin \ $out/libexec/netdata/plugins.d/debugfs.plugin.org - ${lib.optionalString withSystemdJournal '' - mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ - $out/libexec/netdata/plugins.d/systemd-journal.plugin.org - ''} ${lib.optionalString withIpmi '' mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ $out/libexec/netdata/plugins.d/freeipmi.plugin.org ''} - ${lib.optionalString withNetworkViewer '' - mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ - $out/libexec/netdata/plugins.d/network-viewer.plugin.org - ''} ${lib.optionalString withNdsudo '' mv $out/libexec/netdata/plugins.d/ndsudo \ $out/libexec/netdata/plugins.d/ndsudo.org ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo ''} + ${lib.optionalString withNetworkViewer '' + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ + $out/libexec/netdata/plugins.d/network-viewer.plugin.org + ''} + ${lib.optionalString withSystemdJournal '' + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org + ''} + ${lib.optionalString withSystemdUnits '' + mv $out/libexec/netdata/plugins.d/systemd-units.plugin \ + $out/libexec/netdata/plugins.d/systemd-units.plugin.org + ''} ''; preConfigure = '' @@ -194,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ --replace-fail \ 'GOPROXY=https://proxy.golang.org' \ - 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}' + 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules},file://${finalAttrs.passthru.nd-mcp}' # Prevent the path to be caught into the Nix store path. substituteInPlace CMakeLists.txt \ @@ -222,13 +228,14 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus) (lib.cmakeBool "ENABLE_JEMALLOC" true) (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace) + (lib.cmakeBool "ENABLE_ML" withML) (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) + (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits) (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) - (lib.cmakeBool "ENABLE_ML" withML) # Suggested by upstream. "-G Ninja" ] @@ -252,6 +259,32 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru = rec { + nd-mcp = + (buildGoModule { + pname = "nd-mcp"; + version = finalAttrs.version; + inherit (finalAttrs) src; + + sourceRoot = "${finalAttrs.src.name}/src/web/mcp/bridges/stdio-golang"; + + vendorHash = "sha256-6JfHrBloJQ5wHyogIPTVDZjlITWZXbsv2m2lMlQmBUY="; + + proxyVendor = true; + doCheck = false; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Netdata Model Context Protocol (MCP) Integration"; + license = lib.licenses.gpl3Only; + }; + }).goModules; + netdata-go-modules = (buildGoModule { pname = "netdata-go-plugins"; @@ -259,7 +292,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-N03IGTtF78PCo4kf0Sdtzv6f8z47ohg8g3YIXtINRjU="; + vendorHash = "sha256-aOFmfBcBjnTfFHfMNemSJHbnMnhBojYrGe21zDxPxME="; doCheck = false; proxyVendor = true; From c2f81c1b2af211b51596737e8bc7f70bcac5939e Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 29/61] dmd: unpin GCC Seems to build fine with the default GCC. --- pkgs/top-level/all-packages.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c782ed75601f..1d3486cd8025 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2751,15 +2751,6 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; - dmd = callPackage ../by-name/dm/dmd/package.nix ( - { - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123 - stdenv = gcc11Stdenv; - } - ); - dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; From 29b6e7097f50955f49a81d2665fb21c94c43df19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 17 Aug 2025 00:09:14 +0200 Subject: [PATCH 30/61] citrix_workspace: switch to libxml2_13 --- .../remote/citrix-workspace/generic.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index bbfd19e15745..46ed77495f2e 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -40,7 +40,7 @@ libsecret, libsoup_2_4, libvorbis, - libxml2, + libxml2_13, llvmPackages, more, nspr, @@ -90,19 +90,6 @@ let ''; }; - libxml2' = libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-6021" - ]; - }; - }); - in stdenv.mkDerivation rec { @@ -174,7 +161,7 @@ stdenv.mkDerivation rec { libsecret libsoup_2_4 libvorbis - libxml2' + libxml2_13 llvmPackages.libunwind nspr nss From 3ba3a7a5f237aa58e90bb3e832b368137bb7a1e9 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 17 Aug 2025 00:57:51 +0100 Subject: [PATCH 31/61] amdvlk: disable ray tracing support for `i686-linux` --- pkgs/by-name/am/amdvlk/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index d743655d1eba..8b6d97d3bcae 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -85,6 +85,20 @@ stdenv.mkDerivation (finalAttrs: { cmakeDir = "../drivers/xgl"; + cmakeFlags = [ + # There is some incredibly cursed issue with + # `directx-shader-compiler` flagging up compiler errors only on + # `i686-linux` and only when it has been compiled with a recent + # GCC. Since few 32‐bit games are going to use ray tracing anyway, + # we just disable it for now. Arch has done this since 2022. + # + # See: + # * + # * + # * + (lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit))) + ]; + installPhase = '' runHook preInstall From 0a7836def9b2d9d863b25a9532e16a167b844193 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 32/61] directx-shader-compiler: unpin GCC Seems to build fine now. --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d3486cd8025..78df92f7e61b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10018,10 +10018,7 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; - directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { - # https://github.com/NixOS/nixpkgs/issues/216294 - stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv; - }; + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { }; dodgy = with python3Packages; toPythonApplication dodgy; From 5b6ae0b1b4fc02e8daa7a79ab34ebeb5937e1c4e Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 33/61] python313Packages.itk: bump GCC to 13 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb1a3d6e0f12..c3010bcfc31b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7227,7 +7227,7 @@ self: super: with self; { enablePython = true; enableRtk = false; stdenv = - if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv else stdenv; + if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc13Stdenv else stdenv; } ); From 3d3e80e3309ade2152f1f4375a23ead6eb7932d8 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 34/61] falcon: unstable-2018-10-23 -> 0-unstable-2023-11-19 Fixes the build with the default GCC. --- pkgs/development/interpreters/falcon/default.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 4acd72081967..ac78505923ac 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -11,19 +11,15 @@ stdenv.mkDerivation { pname = "falcon"; - version = "unstable-2018-10-23"; + version = "0-unstable-2023-11-19"; src = fetchFromGitHub { owner = "falconpl"; repo = "falcon"; - rev = "637e2d5cd950a874496042993c02ab7d17c1b688"; - sha256 = "iCyvvZJjXb1CR396EJ6GiP6d4e7iAc6QQlAOQoAfehg="; + rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808"; + hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs="; }; - # -Wnarrowing is enabled by default in recent GCC versions, - # causing compilation to fail. - env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - nativeBuildInputs = [ cmake pkg-config @@ -39,5 +35,6 @@ stdenv.mkDerivation { license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + broken = stdenv.cc.isClang; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78df92f7e61b..ff5fb126d395 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5475,9 +5475,7 @@ with pkgs; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; - falcon = callPackage ../development/interpreters/falcon { - stdenv = gcc10Stdenv; - }; + falcon = callPackage ../development/interpreters/falcon { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { }); From 177adfa166396fd5073c6f66563ef8f88ad5fd30 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH 35/61] =?UTF-8?q?chow-tape-model:=20patch=20for=20GCC=20?= =?UTF-8?q?=E2=89=A5=2012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ch/chow-tape-model/fix-juce-gcc-12.patch | 14 ++++++++++++++ pkgs/by-name/ch/chow-tape-model/package.nix | 12 ++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch diff --git a/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch b/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch new file mode 100644 index 000000000000..3f18f07d4012 --- /dev/null +++ b/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch @@ -0,0 +1,14 @@ +Submodule Plugin/modules/JUCE contains modified content +diff --git a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h +index 06c0a729d..119f146b8 100644 +--- a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h ++++ b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h +@@ -23,6 +23,8 @@ + ============================================================================== + */ + ++#include ++ + namespace juce + { + diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 75da391e7914..b9f5a5eb3a3a 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -32,14 +32,9 @@ pkg-config, python3, sqlite, - gcc11Stdenv, + stdenv, webkitgtk_4_0, }: -let - # JUCE version in submodules is incompatible with GCC12 - # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 - stdenv = gcc11Stdenv; -in stdenv.mkDerivation (finalAttrs: { pname = "chow-tape-model"; version = "2.11.4"; @@ -52,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix the old JUCE submodule for GCC ≥ 12 + ./fix-juce-gcc-12.patch + ]; + nativeBuildInputs = [ pkg-config cmake From cc4935fd3eeb7b0b2fc08f4c3553222e10c5fe36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 03:27:59 +0000 Subject: [PATCH 36/61] e16: 1.0.30 -> 1.0.31 --- pkgs/by-name/e1/e16/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/e1/e16/package.nix b/pkgs/by-name/e1/e16/package.nix index 7036c2db6510..fde076194437 100644 --- a/pkgs/by-name/e1/e16/package.nix +++ b/pkgs/by-name/e1/e16/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.30"; + version = "1.0.31"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-JKBmBgC5cN4XO03r0NR78Ly9tpI733/sUEPL0GLU5B0="; + hash = "sha256-ZQTsIy/BiO/xUiCu+bc2n406F0unAinxyYLjVRfUSiQ="; }; nativeBuildInputs = [ From 3f4a4648bd10e3b64fb00563637489e85dff89a5 Mon Sep 17 00:00:00 2001 From: seven_bear <26707756+yueneiqi@users.noreply.github.com> Date: Thu, 14 Aug 2025 12:15:58 +0000 Subject: [PATCH 37/61] collectl: init at 4.3.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add collectl 4.3.20.1 performance monitoring tool for Linux systems - Add test suite for configuration functionality - Include patches for external tool handling and install script fixes - Document --config option in package metadata - Add maintainer entry for seven_bear 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- maintainers/maintainer-list.nix | 6 + ...01-scripts-external-executable-calls.patch | 444 ++++++++++++++++++ .../co/collectl/0002-fix-install-script.patch | 133 ++++++ pkgs/by-name/co/collectl/package.nix | 126 +++++ pkgs/by-name/co/collectl/test.nix | 44 ++ 5 files changed, 753 insertions(+) create mode 100644 pkgs/by-name/co/collectl/0001-scripts-external-executable-calls.patch create mode 100644 pkgs/by-name/co/collectl/0002-fix-install-script.patch create mode 100644 pkgs/by-name/co/collectl/package.nix create mode 100644 pkgs/by-name/co/collectl/test.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 62c4961e2077..6c1990d0ffa2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23008,6 +23008,12 @@ githubId = 2049686; name = "Sebastián Estrella"; }; + seven_bear = { + name = "Edmond Freeman"; + email = "edmondfreeman7@gmail.com"; + github = "yueneiqi"; + githubId = 26707756; + }; seylerius = { name = "Sable Seyler"; email = "sable@seyleri.us"; diff --git a/pkgs/by-name/co/collectl/0001-scripts-external-executable-calls.patch b/pkgs/by-name/co/collectl/0001-scripts-external-executable-calls.patch new file mode 100644 index 000000000000..bfd75ba0627b --- /dev/null +++ b/pkgs/by-name/co/collectl/0001-scripts-external-executable-calls.patch @@ -0,0 +1,444 @@ +Processing diff for: collectl.conf +--- a/collectl.conf 2025-08-14 08:42:24.434419733 +0000 ++++ b/collectl.conf 2025-08-16 07:56:13.806350456 +0000 +@@ -43,7 +43,7 @@ + #Ps = /bin/ps + #Rpm = /bin/rpm + #Lspci = /sbin/lspci +-#Lctl = /usr/sbin/lctl ++#Lctl = /usr/sbin/lctl # disabled since collectl 4.0.4 + + # I n f i n i b a n d S u p p o r t + +@@ -55,10 +55,11 @@ + # variable below. PQuery for OFED, PCounter for get_pcounter calls and + # VStat for ALL non-ofed access of any kind. + # can disable either by commenting out the reference to VStat/PQuery below. +-PQuery = /usr/sbin/perfquery:/usr/bin/perfquery:/usr/local/ofed/bin/perfquery +-PCounter = /usr/mellanox/bin/get_pcounter +-VStat = /usr/mellanox/bin/vstat:/usr/bin/vstat +-OfedInfo = /usr/bin/ofed_info:/usr/local/ofed/bin/ofed_info ++# Disable the Infiniband support by default ++# PQuery = /usr/sbin/perfquery:/usr/bin/perfquery:/usr/local/ofed/bin/perfquery ++# PCounter = /usr/mellanox/bin/get_pcounter ++# VStat = /usr/mellanox/bin/vstat:/usr/bin/vstat ++# OfedInfo = /usr/bin/ofed_info:/usr/local/ofed/bin/ofed_info + + # D e f a u l t s + +@@ -116,7 +117,7 @@ + # size, comment out the Resize line and uncomment TermHeight, setting it to + # what you want. + #TermHeight = 24 +-Resize=/usr/bin/resize:/usr/X11R6/bin/resize ++Resize=@resize@ + + # To turn off Time:HiRes/glibc incompatibility checking, the following + # should be enabled and set to 0 +@@ -125,7 +126,7 @@ + # These control environmental monitoring and to use it you MUST have ipmitool + # installed (see http://ipmitool.sourceforge.net/). If not in the path shown + # below, you must change it. +-Ipmitool = /usr/bin/ipmitool:/usr/local/bin/ipmitool:/opt/hptc/sbin/ipmitool ++Ipmitool = @ipmitool@ + IpmiCache = /var/run/collectl-ipmicache + IpmiTypes = fan,temp,current + +Processing diff for: collectl +--- a/collectl 2025-08-14 08:42:24.434419733 +0000 ++++ b/collectl 2025-08-16 09:25:20.238548613 +0000 +@@ -69,14 +69,14 @@ + use IO::Select; + use Cwd 'abs_path'; + +-$Cat= '/bin/cat'; +-$Grep= '/bin/grep'; +-$Egrep= '/bin/egrep'; +-$Ps= '/bin/ps'; +-$Rpm= '/bin/rpm'; +-$Lspci= '/sbin/lspci'; +-$Lctl= '/usr/sbin/lctl'; +-$Dmidecode= '/usr/sbin/dmidecode'; ++$Cat= '@cat@'; ++$Grep= '@grep@'; ++$Egrep= '@egrep@'; ++$Ps= '@ps@'; ++$Rpm= '@rpm@'; ++$Lspci= '@lspci@'; ++$Lctl= '/usr/sbin/lctl'; # disabled since collectl 4.0.4 ++$Dmidecode= '@dmidecode@'; + + %TopProcTypes=qw(vsz '' rss '' syst '' usrt '' time '' accum '' rkb '' wkb '' iokb '' + rkbc '' wkbc '' iokbc '' ioall '' rsys '' wsys '' iosys '' +@@ -108,7 +108,7 @@ + $syslogFlag=(eval {require "Sys/Syslog.pm" or die}) ? 1 : 0; + + # Always nice to know if we're root +-$rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0; ++$rootFlag=(!$PcFlag && `@whoami@`=~/root/) ? 1 : 0; + $SrcArch= $Config{"archname"}; + + $Version= '4.3.20'; +@@ -126,15 +126,15 @@ + # we're in the background. We also need to know if STDOUT connected to a terminal. + if (!$PcFlag) + { +- $MyDir=`pwd`; +- $Cat= 'cat'; ++ $MyDir=`@pwd@`; ++ $Cat= '@cat@'; + $Sep= '/'; + $backFlag=(getpgrp()!=tcgetpgrp(0)) ? 1 : 0; + $termFlag= (-t STDOUT) ? 1 : 0; + } + else + { +- $MyDir=`cd`; ++ $MyDir=`@cd@`; + $Cat= 'type'; + $Sep= '\\'; + $backFlag=0; +@@ -148,7 +148,7 @@ + # which was recorded with the data file and WILL override in playback mode. + # We also need our host name before calling initRecord() so we can log it at + # startup as well as for naming the logfile. +-$myHost=($PcFlag) ? `hostname` : `/bin/hostname`; ++$myHost=($PcFlag) ? `@hostname@` : `@hostname@`; + $myHost=(split(/\./, $myHost))[0]; + chomp $myHost; + $Host=$myHost; +@@ -509,12 +509,12 @@ + + if ($runasUser!~/^\d+$/) + { +- $runasUid=(split(/:/, `grep ^$runasUser: /etc/passwd`))[2]; ++ $runasUid=(split(/:/, `@grep@ ^$runasUser: /etc/passwd`))[2]; + error("can't find '$runasUser' in /etc/passwd. Consider UID.") if !defined($runasUid); + } + if (defined($runasGroup) && $runasGroup!~/^\d+$/) + { +- $runasGid=(split(/:/, `grep ^$runasGroup: /etc/group`))[2]; ++ $runasGid=(split(/:/, `@grep@ ^$runasGroup: /etc/group`))[2]; + error("can't find '$runasGroup' in /etc/group. Consider GID.") if !defined($runasGid); + } + $runasUid=$runasUser if $runasUser=~/^\d+/; +@@ -1167,19 +1167,19 @@ + if (!$PcFlag) + { + # This matches THIS host, but in playback mode will be reset to the target +- $Kernel=`uname -r`; ++ $Kernel=`@uname@ -r`; + chomp $Kernel; + error("collectl no longer supports 2.4 kernels") if $Kernel=~/^2\.4/; + +- $LocalTimeZone=`date +%z`; ++ $LocalTimeZone=`@date@ +%z`; + chomp $LocalTimeZone; + + # Some distros put lspci in /usr/sbin and others in /usr/bin, so take one last look in + # those before complaining, but only if in record mode AND only if looking at interconnects + if (!-e $Lspci && $playback eq '' && $subsys=~/x/i) + { +- $Lspci=(-e '/usr/sbin/lspci') ? '/usr/sbin/lspci' : '/usr/bin/lspci'; +- if (!-e "/usr/sbin/lspci" && !-e "/usr/bin/lspci") ++ $Lspci='@lspci@'; ++ if (!-e "@lspci@") + { + pushmsg('W', "-sx disabled because 'lspci' not in $Lspci or '/usr/sbin' or '/usr/bin'"); + pushmsg('W', "If somewhere else, move it or define in collectl.conf"); +@@ -1274,7 +1274,7 @@ + # it further on so not to worry, but at least record a warning. + $pid=`$Cat $PidFile`; + chomp $pid; +- @ps=`ps axo pid,command`; ++ @ps=`@ps@ axo pid,command`; + foreach my $line (@ps) + { + $line=~s/^\s+//; # trim leading whitespace for short pids +@@ -1551,14 +1551,14 @@ + } + + # if -N, set priority to 20 +-`renice 20 $$` if $niceFlag; ++`@renice@ 20 $$` if $niceFlag; + + # Couldn't find anywhere else to put this one... + error("-sT only works with -P for now (too much data)") + if $TFlag && !$plotFlag; + + # get parent pid so we can check later to see it still there +-$stat=`cat /proc/$$/stat`; ++$stat=`@cat@ /proc/$$/stat`; + $myPpid=(split(/\s+/, $stat))[3]; + + ############################### +@@ -2311,7 +2311,7 @@ + printBriefCounters('T'); + } + +- `stty echo` if !$PcFlag && $termFlag && !$backFlag; # in brief mode, we turned it off ++ `@stty@ echo` if !$PcFlag && $termFlag && !$backFlag; # in brief mode, we turned it off + my $temp=(!$msgFlag) ? ' Try again with -m.' : ''; + print "No files selected contain the selected data.$temp\n" if !$numProcessed; + exit(0); +@@ -2453,7 +2453,7 @@ + open STDIN, '/dev/null' or logmsg("F", "Can't read /dev/null: $!"); + open STDOUT, '>/dev/null' or logmsg("F", "Can't write to /dev/null: $!"); + open STDERR, '>/dev/null' or logmsg("F", "Can't write to /dev/null: $!"); +- `echo $$ > $PidFile`; ++ `@echo@ $$ > $PidFile`; + + # Now that we're set up to start, if '--runas' has been sprecified we need to do a + # few things that require privs before actually changing our UID. Also note the +@@ -2469,8 +2469,8 @@ + $logname=(-d $filename) ? $filename : dirname($filename); + $logname.="/$myHost-collectl-$yymm.log"; + +- `chown $runasUid $logname`; +- `chgrp $runasGid $logname` if defined($runasGid); ++ `@chown@ $runasUid $logname`; ++ `@chgrp@ $runasGid $logname` if defined($runasGid); + + # now we can change our process's ownership taking care to do the group first + # since we won't be able to change anything once we change our UID. +@@ -3244,7 +3244,7 @@ + # close logs cleanly and turn echo back on because when 'brief' we turned it off. + closeLogs($subsys); + unlink $PidFile if $daemonFlag; +-`stty echo` if !$PcFlag && $termFlag && !$backFlag; ++`@stty@ echo` if !$PcFlag && $termFlag && !$backFlag; + + # clean up when in pure top mode + if ($numTop && !$topVertFlag) +@@ -4350,7 +4350,7 @@ + if (!-e $temp) + { + logmsg('W', "Creating directory '$temp'"); +- `mkdir $temp`; ++ `@mkdir@ $temp`; + } + + # track number of times same file processed, primarily for options 'a/c'. in +@@ -5363,7 +5363,7 @@ + + # build up the search list being extra neat and leaving + # off possible duplicate /etc +- $configFile="$BinDir/$ConfigFile;$etcDir/$ConfigFile"; ++ $configFile="$BinDir/../etc/$ConfigFile;$etcDir/$ConfigFile"; + $configFile.=";/etc/$ConfigFile" if $etcDir ne '/etc'; + } + print "Config File Search Path: $configFile\n" if $debug & 1; +@@ -5789,7 +5789,7 @@ + # what gets stored in /proc/XXX/stat and to make sure we look at the same + # values dynamically as well as staticly, we better pull cmd from the stat + # file itself. +- @ps=`ps axo pid,ppid,uid,comm,user`; ++ @ps=`@ps@ axo pid,ppid,uid,comm,user`; + my $firstFilePass=1; + foreach $process (@ps) + { +@@ -6228,7 +6228,7 @@ + $briefFlag=0; + $verboseFlag=1; + intervalPrint(time); +- `stty echo` if !$PcFlag && $termFlag && !$backFlag; ++ `@stty@ echo` if !$PcFlag && $termFlag && !$backFlag; + } + + sub error +@@ -6241,7 +6241,7 @@ + # printText() will try to send error over socket and we want it local. + $sockFlag=0 if $serverFlag; + +- `stty echo` if !$PcFlag && $termFlag && !$backFlag; ++ `@stty@ echo` if !$PcFlag && $termFlag && !$backFlag; + logmsg("F", "Error: $text") if $daemonFlag; + + # we can only call printText() when formatit loaded. +Processing diff for: colmux +--- a/colmux 2025-08-14 08:42:24.438419919 +0000 ++++ b/colmux 2025-08-15 07:38:22.003168089 +0000 +@@ -78,7 +78,7 @@ + my $License="colmux may be copied only under the terms of either the Artistic License\n"; + $License.= "or the GNU General Public License, which may be found in the source kit"; + +-my $Ping='/bin/ping'; ++my $Ping='@ping@'; + my $ResizePath='/usr/bin/resize:/usr/X11R6/bin/resize'; + my $Route='/sbin/route'; + my $Ifconfig='/sbin/ifconfig'; +@@ -235,7 +235,7 @@ + $Collectl="sudo $Collectl" if $sudoFlag; + + # ok if host not in known_hosts and when not debugging be sure to turn off motd +-my $Ssh='/usr/bin/ssh -o StrictHostKeyChecking=no -o BatchMode=yes'; ++my $Ssh='@ssh@ -o StrictHostKeyChecking=no -o BatchMode=yes'; + $Ssh.=" -o ServerAliveInterval=$keepalive" if $keepalive ne ''; + $Ssh.=" -q" unless $debug; + +@@ -357,7 +357,7 @@ + # See if any host specs contain 'username@' & reset 'localhost' and + # adjust maximum hostname length if necessary. + my $hostlen=$hostWidth; +-my $myhost=`hostname`; ++my $myhost=`@hostname@`; + chomp $myhost; + + my (%usernames, %sshswitch, %aliases); +@@ -510,7 +510,7 @@ + $line=~s/^\s+//; # can have leading space + my $pid=(split(/\s+/, $line))[0]; + print "Killing ssh with pid: $pid\n" if $debug & 1; +- `kill $pid`; ++ `@kill@ $pid`; + } + sleep 1; # wait a tad for ssh in thread to exit + close PS; +@@ -983,7 +983,7 @@ + $line=~s/^\s+//; + my $pid=(split(/\s+/, $line))[0]; + print "Killing ssh with pid: $pid\n" if $debug & 1; +- `kill $pid`; ++ `@kill@ $pid`; + } + } + +@@ -1179,7 +1179,7 @@ + foreach my $host (keys %files) + { + print "Killing pid $files{$host}->{pid} for '$host'\n" if $debug & 1; +- `kill -9 $files{$host}->{pid}`; ++ `@kill@ -9 $files{$host}->{pid}`; + #close $files{$host}->{fd} or error("Failed to close playback file for '$host'"); + } + +Processing diff for: formatit.ph +--- a/formatit.ph 2025-08-14 08:42:24.438419919 +0000 ++++ b/formatit.ph 2025-08-15 07:18:19.548190580 +0000 +@@ -20,19 +20,19 @@ + $rawPFlag=0; # always 0 when no files involved + + # In some case, we need to know if we're root. +- $rootFlag=`whoami`; ++ $rootFlag=`@whoami@`; + $rootFlag=($rootFlag=~/root/) ? 1 : 0; + + # be sure to remove domain portion if present. also note we keep the hostname in + # two formats, one in it's unaltered form (at least needed by lustre directory + # parsing) as well as all lc because it displays nicer. +- $Host=`hostname`; ++ $Host=`@hostname@`; + chomp $Host; + $Host=(split(/\./, $Host))[0]; + $HostLC=lc($Host); + + # when was system booted? +- $uptime=(split(/\s+/, `cat /proc/uptime`))[0]; ++ $uptime=(split(/\s+/, `@cat@ /proc/uptime`))[0]; + $boottime=time-$uptime; + + $Distro=cat('/etc/redhat-release') if -e '/etc/redhat-release'; +@@ -83,11 +83,11 @@ + if ($subsys=~/y/i && $slabinfoFlag || $slubinfoFlag) + { + $message=''; +- $message='/proc/slabinfo' if $slabinfoFlag && !(eval {`cat /proc/slabinfo 2>/dev/null` or die}); +- $message='/sys/slab' if $slubinfoFlag && !(eval {`cat /proc/slubinfo 2>/dev/null` or die}); ++ $message='/proc/slabinfo' if $slabinfoFlag && !(eval {`@cat@ /proc/slabinfo 2>/dev/null` or die}); ++ $message='/sys/slab' if $slubinfoFlag && !(eval {`@cat@ /proc/slubinfo 2>/dev/null` or die}); + if ($message ne '') + { +- my $whoami=`whoami`; ++ my $whoami=`@whoami@`; + chomp $whoami; + disableSubsys('y', "/proc/slabinfo is not readable by $whoami"); + $interval=~s/(^\d*):\d+/$1:/ if $subsys!~/z/i; # remove int2 if not needed or we'll get error +@@ -132,7 +132,7 @@ + + for (my $i=1; $i<$NumCpus; $i++) + { +- my $online=`cat /sys/devices/system/cpu/cpu$i/online`; ++ my $online=`@cat@ /sys/devices/system/cpu/cpu$i/online`; + chomp $online; + + $cpuEnabled[$i]=$online; +@@ -266,7 +266,7 @@ + $ibSpeed='??'; + if (-e '/sys/class/infiniband') + { +- $line=`cat /sys/class/infiniband/*/ports/1/rate 2>&1`; ++ $line=`@cat@ /sys/class/infiniband/*/ports/1/rate 2>&1`; + if ($line=~/\s*(\d+)\s+(\S)/) + { + $ibSpeed=$1; +@@ -669,7 +669,7 @@ + { + # Get Luster and SFS Versions before looking at any data structures in the + # 'lustreCheck' routines because things change over time +- $temp=`cat /proc/fs/lustre/version | grep lustre 2>/dev/null`; ++ $temp=`@cat@ /proc/fs/lustre/version | grep lustre 2>/dev/null`; + $temp=~/lustre: (\d+.*)/; + $cfsVersion=$1; + $sfsVersion=''; +@@ -716,7 +716,7 @@ + # The first step is to build up a hash of the sizes of all the + # existing partitions. Since we're only doing this once, a 'cat's + # overhead should be minimal +- @partitions=`cat /proc/partitions`; ++ @partitions=`@cat@ /proc/partitions`; + foreach $part (@partitions) + { + # ignore blank lines and header +@@ -778,7 +778,7 @@ + $temp=`head -n 1 /proc/slabinfo`; + $temp=~/(\d+\.\d+)/; + $SlabVersion=$1; +- $NumSlabs=`cat /proc/slabinfo | wc -l`*1; ++ $NumSlabs=`@cat@ /proc/slabinfo | wc -l`*1; + chomp $NumSlabs; + $NumSlabs-=2; + +@@ -4127,7 +4127,7 @@ + $netSpeeds{$netName}='??'; + if ($line ne '') + { +- $speed=`cat $line 2>&1`; ++ $speed=`@cat@ $line 2>&1`; + chomp $speed; + $line=~/.*\/(\S+)\/speed/; + my $netName=$1; +Processing diff for: graphite.ph +--- a/graphite.ph 2025-08-14 08:42:24.442420106 +0000 ++++ b/graphite.ph 2025-08-14 08:44:07.351625049 +0000 +@@ -117,7 +117,7 @@ + # behavior for -f logs matches that of -A + $rawtooFlag=1 if $filename ne '' && !$plotFlag; + +- $graphiteMyHost=(!$graphiteFqdnFlag) ? `hostname` : `hostname -f`; ++ $graphiteMyHost=(!$graphiteFqdnFlag) ? `@hostname@` : `@hostname@ -f`; + chomp $graphiteMyHost; + $graphiteMyHost =~ s/\./$graphiteEscape/g if $graphiteEscape ne ''; + +Processing diff for: vmsum.ph +--- a/vmsum.ph 2025-08-14 08:42:24.442420106 +0000 ++++ b/vmsum.ph 2025-08-14 08:44:24.184414112 +0000 +@@ -20,8 +20,8 @@ + my $oneMB=1024*1024; + my ($debug, $helpFlag, $instMin, $versionFlag, $zeroFlag); + +-my $Ssh= '/usr/bin/ssh'; +-my $Ping='/bin/ping'; ++my $Ssh= '@ssh@'; ++my $Ping='@ping@'; + my $PingTimeout=1; + + # these control writing the vm text file +@@ -32,7 +32,7 @@ + + my $lexprFlag=0; + my $noNetMsg=''; # if not null, problem with n/w stats (very rare) +-my $hostname=`hostname`; ++my $hostname=`@hostname@`; + chomp $hostname; + + sub vmsumInit diff --git a/pkgs/by-name/co/collectl/0002-fix-install-script.patch b/pkgs/by-name/co/collectl/0002-fix-install-script.patch new file mode 100644 index 000000000000..9cff661782ef --- /dev/null +++ b/pkgs/by-name/co/collectl/0002-fix-install-script.patch @@ -0,0 +1,133 @@ +--- a/INSTALL 2025-08-14 08:46:43.845548078 +0000 ++++ b/INSTALL 2025-08-14 08:50:33.771706783 +0000 +@@ -1,28 +1,29 @@ + #!/bin/sh + +-DESTDIR=${DESTDIR:="/"} ++# Use Nix output directory instead of system paths ++DESTDIR=${out} + +-BINDIR=$DESTDIR/usr/bin +-DOCDIR=$DESTDIR/usr/share/doc/collectl +-SHRDIR=$DESTDIR/usr/share/collectl +-MANDIR=$DESTDIR/usr/share/man/man1 +-SYSDDIR=$DESTDIR/usr/lib/systemd/system +-ETCDIR=$DESTDIR/etc +-INITDIR=$ETCDIR/init.d ++BINDIR=$out/bin ++DOCDIR=$out/share/doc/collectl ++SHRDIR=$out/share/collectl ++MANDIR=$out/share/man/man1 ++SYSDDIR=$out/lib/systemd/system ++ETCDIR=$out/etc ++INITDIR=$out/etc/init.d + + mkdir -p $BINDIR + mkdir -p $DOCDIR + mkdir -p $SHRDIR + mkdir -p $ETCDIR + mkdir -p $MANDIR +-mkdir -p $INITDIR ++# Skip init.d creation for Nix + mkdir -p $SHRDIR/util + mkdir -p $DESTDIR/var/log/collectl + + cp collectl colmux $BINDIR + cp collectl.conf $ETCDIR + cp man1/* $MANDIR +-cp initd/* $INITDIR ++# Skip init scripts for Nix + + cp docs/* $DOCDIR + cp GPL ARTISTIC COPYING $DOCDIR +@@ -42,87 +43,12 @@ + # Force in case redoing the install and files already zipped + gzip -f $MANDIR/collectl* + +-chmod 755 $INITDIR/collectl* ++# Skip chmod on init scripts for Nix + chmod 444 $ETCDIR/collectl.conf + chmod 755 $BINDIR/collectl + chmod 444 $DOCDIR/ARTISTIC $DOCDIR/COPYING $DOCDIR/GPL + chmod 444 $SHRDIR/*ph + chmod 755 $SHRDIR/util/* + +-# remove any stale versions in case the names/numbers used have changed. +-# on new ROCKS installion 'rm' isn't there yet! [thanks roy] +-if [ -x /bin/rm ] ; then +- /bin/rm -f $INITDIR/rc*.d/*collectl +- /bin/rm -f $ETCDIR/rc.d/rc*.d/*collectl +-fi +- +-# only if systemd is supported +-if [ -d $SYSDDIR ]; then +- cp service/collectl.service $SYSDDIR +-fi +- +-# Try and decide which distro this is based on distro specific files. +-distro=1 +-if [ -f /sbin/yast ]; then +- distro=2 +- mv -f $INITDIR/collectl-suse $INITDIR/collectl +- rm -f $INITDIR/collectl-debian +- rm -f $INITDIR/collectl-generic +-fi +- +-# debian +-if [ -f /usr/sbin/update-rc.d ]; then +- distro=3 +- mv -f $INITDIR/collectl-debian $INITDIR/collectl +- rm -f $INITDIR/collectl-suse +- rm -f $INITDIR/collectl-generic +- +- # only if we're installing under / +- [ "$DESTDIR" = "/" ] && update-rc.d collectl defaults +-fi +- +-# redhat +-if [ -f /etc/redhat-release ]; then +- distro=4 +- rm -f $INITDIR/collectl-suse +- rm -f $INITDIR/collectl-debian +- rm -f $INITDIR/collectl-generic +- if [ -f /usr/sbin/chkconfig ]; then +- [ "$DESTDIR" = "/" ] && chkconfig --add collectl +- fi +-# Not needed for RHEL8 and higher +-fi +- +-# gentoo +-if [ -f $ETCDIR/gentoo-release ]; then +- distro=5 +- mv -f $INITDIR/collectl-generic $INITDIR/collectl +- rm -f $INITDIR/collectl-suse +- rm -f $INITDIR/collectl-debian +- [ "$DESTDIR" = "/" ] && rc-update -a collectl default +-fi +- +-# Generic Distros +-# If /etc/init.d doesn't exist and/or there's no way to use chkconfig or +-# rc-update you're going to have to add some custom code below... +-if [ ${distro} = 1 ]; then +- +- mv -f $INITDIR/collectl-generic $INITDIR/collectl +- rm -f $INITDIR/collectl-suse +- rm -f $INITDIR/collectl-debian +- +- # If in not installing under / there's nothing extra do +- [ $DESTDIR != "/" ] && exit 0 +- +- # figure out how to handle reboots +- if [ -f /sbin/chkconfig ]; then +- chkconfig --add collectl +- elif [ -f /sbin/rc-update ]; then +- rc-update -a collectl default +-# RHEL9 has no chkconfig +- elif [ -f /usr/bin/systemctl ]; then +- systemctl enable collectl +- else +- echo "could not figure out how to enable restarting across reboots" +- fi +-fi ++# Skip all distro-specific service installation for Nix ++# Nix manages services differently through NixOS modules diff --git a/pkgs/by-name/co/collectl/package.nix b/pkgs/by-name/co/collectl/package.nix new file mode 100644 index 000000000000..df630fdd4d7d --- /dev/null +++ b/pkgs/by-name/co/collectl/package.nix @@ -0,0 +1,126 @@ +{ + callPackage, + lib, + stdenv, + fetchFromGitHub, + replaceVars, + + # Runtime dependencies + coreutils, + dmidecode, + gnugrep, + inetutils, + openssh, + pciutils, + perl, + procps, + rpm, + util-linux, + xterm, + + # Dependencies + ipmitool, +}: + +let + inherit (lib) getExe getExe' genAttrs; + + # Define tool dependencies for script patches + scriptDeps = + let + mkTools = pkg: tools: genAttrs tools (tool: getExe' pkg tool); + in + # Tools from various packages + (mkTools coreutils [ + "cat" + "whoami" + "pwd" + "uname" + "date" + "mkdir" + "chown" + "chgrp" + "echo" + "kill" + "cd" + "stty" + ]) + // (mkTools util-linux [ "renice" ]) + // (mkTools gnugrep [ + "grep" + "egrep" + ]) + // (mkTools inetutils [ + "hostname" + "ping" + ]) + // (mkTools procps [ "ps" ]) + // (mkTools pciutils [ "lspci" ]) + // (mkTools xterm [ "resize" ]) + // (mkTools dmidecode [ "dmidecode" ]) + // (mkTools rpm [ "rpm" ]) + // { + # Single-tool packages + ssh = getExe openssh; + ipmitool = getExe ipmitool; + }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "collectl"; + version = "4.3.20.1"; + + src = fetchFromGitHub { + owner = "sharkcz"; + repo = "collectl"; + rev = finalAttrs.version; + hash = "sha256-OJGCuxWvoId1cQ5Ugiav5/T/NzddwhM+gG3s0BnYYz0="; + }; + + strictDeps = true; + + patches = [ + (replaceVars ./0001-scripts-external-executable-calls.patch scriptDeps) + ./0002-fix-install-script.patch + ]; + + buildInputs = [ + perl + dmidecode + ipmitool + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + bash ./INSTALL + + runHook postInstall + ''; + + passthru.tests.run = callPackage ./test.nix { }; + + meta = { + description = "Performance monitoring tool for Linux systems"; + longDescription = '' + Collectl is a light-weight performance monitoring tool capable of reporting + interactively as well as logging to disk. It reports statistics on cpu, disk, + infiniband, lustre, memory, network, nfs, process, quadrics, slabs and more + in easy to read format. + + The `--config` option allows specifying a custom configuration file path, + overriding the default configuration file in the package's etc directory. + ''; + homepage = "https://github.com/sharkcz/collectl"; + downloadPage = "https://github.com/sharkcz/collectl/releases"; + license = with lib.licenses; [ + artistic1 + gpl1Plus + ]; + maintainers = with lib.maintainers; [ seven_bear ]; + platforms = lib.platforms.linux; + mainProgram = "collectl"; + }; +}) diff --git a/pkgs/by-name/co/collectl/test.nix b/pkgs/by-name/co/collectl/test.nix new file mode 100644 index 000000000000..b2bf2fdfd3bf --- /dev/null +++ b/pkgs/by-name/co/collectl/test.nix @@ -0,0 +1,44 @@ +{ + runCommand, + collectl, + coreutils, +}: + +runCommand "collectl-test" + { + nativeBuildInputs = [ + collectl + coreutils + ]; + meta.timeout = 60; + } + '' + # Test basic functionality - limit to 5 seconds to avoid hanging + timeout 5s collectl -c1 >/dev/null || true + + # Test that explicit config file option still works with original config + timeout 5s collectl --config ${collectl}/etc/collectl.conf -c1 >/dev/null || true + + # Test custom config file path override + custom_config_path=$(mktemp) + cp ${collectl}/etc/collectl.conf "$custom_config_path" + + # Test that collectl uses the custom config file path + config_output=$(timeout 5s collectl --config "$custom_config_path" -c1 -d1 2>&1 | grep -i "Config File Search Path:" | head -1) + expected_output="Config File Search Path: $custom_config_path" + + if [ "$config_output" = "$expected_output" ]; then + echo "✓ Custom config file path test passed" + else + echo "✗ Custom config file path test failed" + echo "Expected: $expected_output" + echo "Got: $config_output" + exit 1 + fi + + # Cleanup + rm -f "$custom_config_path" + + # Signal success + touch $out + '' From cffd4bdfa7f6bfde153b8f7b44f68392b82b99d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 06:50:00 +0000 Subject: [PATCH 38/61] gollama: v1.35.1 -> v1.35.3 --- pkgs/by-name/go/gollama/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index ba0c87e2002b..824754f4963f 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gollama"; - version = "v1.35.1"; + version = "v1.35.3"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; tag = "v${version}"; - hash = "sha256-fiCfkCxj/7XTmlqxLwZqnv+tRDF6RC412RthAcpHUUA="; + hash = "sha256-k2SGcsWQi2jC3W2ZO8KXY+WUyh7n7qonLr6BLKZXzdY="; }; - vendorHash = "sha256-O9uv/oXZKr9060woz/RQ8UEPdbW4Z8vnhXIQXm+ljQ4="; + vendorHash = "sha256-hZx4AsPnlFmJGms0vRKgBV/4Ea8uvHaNc0zNehs2RB8="; doCheck = false; From e2881bf54c92d3e20ff687cd1a90a765c04af7d7 Mon Sep 17 00:00:00 2001 From: Majitelll Date: Wed, 13 Aug 2025 20:57:48 +0200 Subject: [PATCH 39/61] _010editor: 15.0.2 -> 16.0 --- pkgs/by-name/_0/_010editor/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index 2535cda85495..feddc26b9a9f 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "010editor"; - version = "15.0.2"; + version = "16.0"; src = if stdenv.hostPlatform.isLinux then fetchzip { url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz"; - hash = "sha256-oXwC4criDox8rac7mnJroqxMNKU7k+y7JQqc88XoRFc="; + hash = "sha256-DK+AIk90AC/KjZR0yBMHaRF7ajuX+UvT8rqDVdL678M="; } else fetchurl { url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg"; - hash = "sha256-RZtFV3AbE5KfzW18usW0FS/AnX8Uets/RkVayBAODQ4="; + hash = "sha256-TWatSVqm9a+bVLXtJjiWAtkcB7qZqoeJ7Gmr62XUVz4="; }; sourceRoot = "."; @@ -53,13 +53,14 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/Applications cp -R *.app $out/Applications ''; + linuxInstall = '' mkdir -p $out/opt && cp -ar source/* $out/opt - # Unset wrapped QT plugins since they're already included in the package, - # else the program crashes because of the conflict + # Use makeWrapper to clean environment and force xcb makeWrapper $out/opt/010editor $out/bin/010editor \ - --unset QT_PLUGIN_PATH + --unset QT_PLUGIN_PATH \ + --set QT_QPA_PLATFORM xcb # Copy the icon and generated desktop file install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png @@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { exec = "010editor %f"; icon = "010"; desktopName = "010 Editor"; - genericName = "Text and hex edtior"; + genericName = "Text and hex editor"; categories = [ "Development" ]; mimeTypes = [ "text/html" From 55470e8533b2dd03808c2309e3b3cd6cf80ac95d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 09:01:15 +0000 Subject: [PATCH 40/61] vscode-extensions.shd101wyy.markdown-preview-enhanced: 0.8.18 -> 0.8.19 --- 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 8b439517c520..6661f1c40587 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4270,8 +4270,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.18"; - hash = "sha256-BHLFlhcIXm3mvmjDPu3fuzpJIGHQvT/RDBEE/QFoRvU="; + version = "0.8.19"; + hash = "sha256-F87YInLUkPUpB2oifCCq1xWD41LUdqg8cusGw2wEYg0="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; From a0744080e3b2355c3c1cd6088e0b082ac380af11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 09:29:18 +0000 Subject: [PATCH 41/61] vscode-extensions.mshr-h.veriloghdl: 1.16.0 -> 1.16.1 --- 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 8b439517c520..0e4ca92ff1a8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3560,8 +3560,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.16.0"; - hash = "sha256-5C9SggdZ3gtYdQhpPFG4wme98b3VgKicXUpPn84gYb4="; + version = "1.16.1"; + hash = "sha256-GsUNvBUlGZ5gRk6GnAfT0eUKHK+D+cPtdAhuYtxe3w8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; From d409f35e5874fdc2995747c895693d915cf45d5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 10:31:40 +0000 Subject: [PATCH 42/61] emcee: 0.5.1 -> 0.6.1 --- pkgs/by-name/em/emcee/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix index b90cae2488f7..4103455faf72 100644 --- a/pkgs/by-name/em/emcee/package.nix +++ b/pkgs/by-name/em/emcee/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "emcee"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "loopwork-ai"; repo = "emcee"; tag = "v${finalAttrs.version}"; - hash = "sha256-ri/4Xxc6QgGqsARI5c2JjVeEe5lOmi/c+B3+vUvW6ow="; + hash = "sha256-k8W3kCVF1WuX5nYX75HvfMlxpEcVbuX2lZKlLOf1qGI="; }; - vendorHash = "sha256-B8shxh1fLdIR7TN0mSugu9wFNShmrb1WBzCArHVVnoU="; + vendorHash = "sha256-e8LPcKue7rhAh03uCRG0VTcwwyj3kDOBoeo3t7Hwvi0="; ldflags = [ "-X main.version=${finalAttrs.version}" From 802b12f0fac00e5ef61cd7c3aa4844462a3976a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 10:59:15 +0000 Subject: [PATCH 43/61] home-assistant-custom-components.xiaomi_gateway3: 4.0.8 -> 4.1.0 --- .../custom-components/xiaomi_gateway3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix index 7c39fd05c5ed..f63dc9165b82 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "AlexxIT"; domain = "xiaomi_gateway3"; - version = "4.0.8"; + version = "4.1.0"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "XiaomiGateway3"; rev = "v${version}"; - hash = "sha256-VvuvOUldhmROTs1+YbCT7++VJ71GgGKRbHjqZxQQY0w="; + hash = "sha256-fpMrp8iVO1Gmj0c80qRr3yfdZ3fl+DOiEi1vF1GZwXU="; }; dependencies = [ zigpy ]; From 88d29d1a2802a50af1f62c6dfbbe7ffc405ce947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 11:39:03 +0000 Subject: [PATCH 44/61] python3Packages.xmpppy: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/xmpppy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 652eb92f2c00..53617981f9c9 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xmpppy"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; src = fetchFromGitHub { owner = "xmpppy"; repo = "xmpppy"; tag = version; - hash = "sha256-SnzIjEWSCdiCtD8bmPTH02JprmZhrABB4HCqtt2RBuk="; + hash = "sha256-lemHFPb1oQGL3O5lHOBsyEqTAzKmZ0khBHL73gXh8PA="; }; dependencies = [ six ]; From cd125035979d30c2412f41eee23289d2c1f4f841 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 11:40:18 +0000 Subject: [PATCH 45/61] stackit-cli: 0.38.0 -> 0.39.1 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index c553536de21f..b60c4f2bfa69 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-i6UOgD3C0nq6Z3Gdki8YOZotU1CbC14Jx8d9B1LV7Hk="; + hash = "sha256-6Y71KglFPfecbrXwczsrEdoVECOP8C/Mt021H6nQrvE="; }; - vendorHash = "sha256-qzNd1wn3N+EPjXO1gFYKtVNdGwd2D/jf6oJFvloR7HY="; + vendorHash = "sha256-Vz8jcbp3HzzgfzHFeEYPeGg0lmElPbm2hpHWNVhTQa0="; subPackages = [ "." ]; From 114abf2c40aef6835af604309d60489db12afd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 17 Aug 2025 14:01:11 +0200 Subject: [PATCH 46/61] plex-desktop: switch to libxml2_13 that has patches for 5 CVEs --- pkgs/by-name/pl/plex-desktop/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index 13b35878c96d..25b8c50fbe13 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -12,6 +12,7 @@ libpulseaudio, libva, libxkbcommon, + libxml2_13, makeShellWrapper, minizip, nss, @@ -59,6 +60,7 @@ let libpulseaudio libva libxkbcommon + libxml2_13 minizip nss stdenv.cc.cc @@ -116,7 +118,6 @@ let cp usr/lib/x86_64-linux-gnu/libtiff.so.5 $out/lib/libtiff.so.5 cp usr/lib/x86_64-linux-gnu/libwebp.so.6 $out/lib/libwebp.so.6 cp usr/lib/x86_64-linux-gnu/libxkbfile.so.1.0.2 $out/lib/libxkbfile.so.1 - cp usr/lib/x86_64-linux-gnu/libxml2.so.2 $out/lib/libxml2.so.2 cp usr/lib/x86_64-linux-gnu/libxslt.so.1.1.34 $out/lib/libxslt.so.1 runHook postInstall From db6926cd484d6017191623e149ae71df4cd99a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 17 Aug 2025 14:04:20 +0200 Subject: [PATCH 47/61] plex-desktop: move libedit to buildInputs --- pkgs/by-name/pl/plex-desktop/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index 25b8c50fbe13..6dae4b0a9212 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -57,6 +57,7 @@ let buildInputs = [ elfutils ffmpeg_6-headless + libedit libpulseaudio libva libxkbcommon @@ -106,8 +107,6 @@ let rm $out/lib/libdrm.so* rm $out/lib/libdrm* - ln -s ${libedit}/lib/libedit.so.0 $out/lib/libedit.so.2 - # Keep dependencies where the version from nixpkgs is higher. cp usr/lib/x86_64-linux-gnu/libasound.so.2 $out/lib/libasound.so.2 cp usr/lib/x86_64-linux-gnu/libjbig.so.0 $out/lib/libjbig.so.0 From fc93ef2dba9dff7f2a7b5badecc5e3a255c2e8f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Aug 2025 14:40:28 +0200 Subject: [PATCH 48/61] home-assistant: put asyncio in debug mode during tests This is the condition upstream runs tests under. --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 25ede542e50f..17410219fc5e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -541,6 +541,7 @@ python.pkgs.buildPythonApplication rec { preCheck = '' export HOME="$TEMPDIR" + export PYTHONASYNCIODEBUG=1 # the tests require the existance of a media dir mkdir "$NIX_BUILD_TOP"/media From e1331c41a199897c17298c1889f3ebc89f93bd8b Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 16 Aug 2025 12:22:26 +0530 Subject: [PATCH 49/61] lact: 0.8.0 -> 0.8.1 Remove merged patches Updated postPatch according to the changelog: https://github.com/ilya-zlobintsev/LACT/compare/v0.8.0...v0.8.1 --- pkgs/by-name/la/lact/package.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix index 15285c29188f..b72bf30fdbf1 100644 --- a/pkgs/by-name/la/lact/package.nix +++ b/pkgs/by-name/la/lact/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pkg-config, wrapGAppsHook4, + bashNonInteractive, gdk-pixbuf, gtk4, libdrm, @@ -18,21 +19,20 @@ hwdata, fuse3, autoAddDriverRunpath, - fetchpatch, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lact"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; tag = "v${finalAttrs.version}"; - hash = "sha256-HsDVz9Wd1WoGWIB4Cs/GsvC7RDyHAeXfFGXZDWEmo/c="; + hash = "sha256-bgMQTiNeJR6zPTy/YpQ0oI1oGBzCf+VtBUn6pgADZAY="; }; - cargoHash = "sha256-fgF7gOXxB9sQqA5H1hw6A0Fb5tTBPySAbSxVhcKVhcM="; + cargoHash = "sha256-VxyYnX6AW+AS4NOB1XZXi2Dyrf4rtJzKHXMYwgLY6pQ="; nativeBuildInputs = [ pkg-config @@ -68,14 +68,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ); - patches = [ - (fetchpatch { - name = "fix-tests::snapshot_everything-due-to-outdated-hwdata-649.patch"; - url = "https://github.com/ilya-zlobintsev/LACT/commit/c9a59e48a36d590d7522c22bd15a8f9208bef0ee.patch"; - hash = "sha256-Ehq8vRosqyqpRPeabkdpBHBF6ONqSJHOeq3AXw8PXPU="; - }) - ]; - postPatch = '' substituteInPlace lact-daemon/src/system.rs \ --replace-fail 'Command::new("uname")' 'Command::new("${coreutils}/bin/uname")' @@ -83,9 +75,15 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace lact-daemon/src/server/handler.rs \ --replace-fail 'run_command("journalctl",' 'run_command("${systemdMinimal}/bin/journalctl",' + substituteInPlace lact-daemon/src/server/handler.rs \ + --replace-fail 'Command::new("sh")' 'Command::new("${bashNonInteractive}/bin/bash")' + substituteInPlace lact-daemon/src/server/vulkan.rs \ --replace-fail 'Command::new("vulkaninfo")' 'Command::new("${vulkan-tools}/bin/vulkaninfo")' + substituteInPlace lact-daemon/src/socket.rs \ + --replace-fail 'run_command("chown"' 'run_command("${coreutils}/bin/chown"' + substituteInPlace res/lactd.service \ --replace-fail ExecStart={lact,$out/bin/lact} From d18e52135cc9f84740cd888254321a9b7cb25d96 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 16 Aug 2025 12:34:16 +0530 Subject: [PATCH 50/61] lact: don't patch desktop files This is not a common practice in Nixpkgs and should be avoided. --- pkgs/by-name/la/lact/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix index b72bf30fdbf1..f54ef55f417b 100644 --- a/pkgs/by-name/la/lact/package.nix +++ b/pkgs/by-name/la/lact/package.nix @@ -87,9 +87,6 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace res/lactd.service \ --replace-fail ExecStart={lact,$out/bin/lact} - substituteInPlace res/io.github.ilya_zlobintsev.LACT.desktop \ - --replace-fail Exec={lact,$out/bin/lact} - # read() looks for the database in /usr/share so we use read_from_file() instead substituteInPlace lact-daemon/src/server/handler.rs \ --replace-fail 'Database::read()' 'Database::read_from_file("${hwdata}/share/hwdata/pci.ids")' From 39f910f37fb0fab9cbe717a165ca0da0d1791363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 12:57:47 +0000 Subject: [PATCH 51/61] python3Packages.ingredient-parser-nlp: 2.1.1 -> 2.2.0 --- .../python-modules/ingredient-parser-nlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix index cc871d9e9842..18a8c836ac2f 100644 --- a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix +++ b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "ingredient-parser-nlp"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "strangetom"; repo = "ingredient-parser"; tag = version; - hash = "sha256-rmCM3KmsCGrKX5AvfIinkL689+miXII9meGAYQxSqEk="; + hash = "sha256-vv7sNRG2GH1uYy1UMpIx6yGLMIFrFN+dggpoqzhRFRg="; }; build-system = [ setuptools ]; From e645dcfbdd894c33fa404a7475bcf609b1be89c7 Mon Sep 17 00:00:00 2001 From: NilaTheDragon Date: Sun, 17 Aug 2025 15:19:29 +0200 Subject: [PATCH 52/61] protonvpn-gui: fix desktop item StartupWMClass --- pkgs/applications/networking/protonvpn-gui/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 6a998264ead7..ff0a4a90ad2d 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -66,7 +66,10 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/{applications,pixmaps} - install -Dm 644 ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications + + # Fix the desktop file to correctly identify the wrapped app and show the icon during runtime + substitute ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications/protonvpn-app.desktop \ + --replace-fail "StartupWMClass=protonvpn-app" "StartupWMClass=.protonvpn-app-wrapped" install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps ''; From cb57fa53b564a03ad2987905eb6302f3906d759f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 13:28:17 +0000 Subject: [PATCH 53/61] flexget: 3.17.6 -> 3.17.11 --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 3204141dc930..6164198162e2 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.17.6"; + version = "3.17.11"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-E0ytB30tiJgmdfpJ+KCy67enqmfZT7HjoZHlqtRQWsQ="; + hash = "sha256-Qfq6TXSNAnIq8m3I7noFe6pIq6PmUTQKUjN+ZC4NxyU="; }; pythonRelaxDeps = true; From 7de15b22ca9e904f2ca8e6e79e008e81faf4ecb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 13:48:32 +0000 Subject: [PATCH 54/61] gramps: 6.0.3 -> 6.0.4 --- pkgs/by-name/gr/gramps/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gramps/package.nix b/pkgs/by-name/gr/gramps/package.nix index 970e84a93218..b25b5dfb24ae 100644 --- a/pkgs/by-name/gr/gramps/package.nix +++ b/pkgs/by-name/gr/gramps/package.nix @@ -23,7 +23,7 @@ }: python3Packages.buildPythonApplication rec { - version = "6.0.3"; + version = "6.0.4"; pname = "gramps"; pyproject = true; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; tag = "v${version}"; - hash = "sha256-dmokrAN6ZC7guMYHifNifL9rXqZPW+Z5LudQhIUxMs8="; + hash = "sha256-MBsc4YMbCvzRG6+7/cGQpx7iYvQAdqWYrIMEpf1A7ew="; }; patches = [ @@ -113,7 +113,7 @@ python3Packages.buildPythonApplication rec { pinpox tomasajt ]; - changelog = "https://github.com/gramps-project/gramps/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/gramps-project/gramps/blob/${src.tag}/ChangeLog"; longDescription = '' Every person has their own story but they are also part of a collective family history. Gramps gives you the ability to record the many details of From 67d5342a67f54b0f8398f78a2c3cc07d581e5138 Mon Sep 17 00:00:00 2001 From: thattemperature <2719023332@qq.com> Date: Sun, 17 Aug 2025 14:19:11 +0800 Subject: [PATCH 55/61] emacsPackages.eaf-map: init at 0-unstable-2025-07-04 --- .../manual-packages/eaf-map/package.nix | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix new file mode 100644 index 000000000000..7ebc0892b941 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix @@ -0,0 +1,75 @@ +{ + # Basic + lib, + melpaBuild, + fetchFromGitHub, + # Java Script dependency + nodejs, + fetchNpmDeps, + npmHooks, + # Updater + nix-update-script, +}: + +melpaBuild (finalAttrs: { + + pname = "eaf-map"; + version = "0-unstable-2025-07-04"; + + src = fetchFromGitHub { + owner = "emacs-eaf"; + repo = "eaf-map"; + rev = "667865a9422ec71e3518833e1a13806d4f03adfb"; + hash = "sha256-UgHIzYu/K1NzTDvUn2JkEmiyDEBT9JDmlvp6xG7Nv5k="; + }; + + env.npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-npm-deps"; + inherit (finalAttrs) src; + hash = "sha256-prxCFrKvC2dG9BgO3LIKDCFzjn9vFegpvuMy4Eg6Ghs="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + postBuild = '' + npm run build + ''; + + files = '' + ("*.el" + "*.py" + "*.js" + "src") + ''; + + postInstall = '' + LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion} + touch node_modules/.nosearch + cp -r node_modules $LISPDIR/ + cp -r dist $LISPDIR/ + ''; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + eafPythonDeps = + ps: with ps; [ + numpy + pycurl + python-tsp + ]; + eafOtherDeps = [ ]; + }; + + meta = { + description = "OpenStreetMap application for the EAF"; + homepage = "https://github.com/emacs-eaf/eaf-map"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + thattemperature + ]; + }; + +}) From a68f5e9ad3548bcf873b22455682b058607c4bd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 15:48:52 +0000 Subject: [PATCH 56/61] aquamarine: 0.9.2 -> 0.9.3 --- pkgs/by-name/aq/aquamarine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 32fed9fde306..d476179ddea4 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; tag = "v${finalAttrs.version}"; - hash = "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM="; + hash = "sha256-ZIa0peLluZ0AVT0f6bMW+bRCIxMRUVlN798PE4iHRAw="; }; nativeBuildInputs = [ From 4b0ccb082209763f5243afaf0cda951a23d78756 Mon Sep 17 00:00:00 2001 From: mannerbund Date: Fri, 15 Aug 2025 21:29:36 +0300 Subject: [PATCH 57/61] maintainers: add mannerbund --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 143f1b068096..16e01024e300 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15454,6 +15454,12 @@ githubId = 1189862; name = "Valter Nazianzeno"; }; + mannerbund = { + email = "apostalimus@gmail.com"; + github = "mannerbund"; + githubId = 110305316; + name = "mannerbund"; + }; manojkarthick = { email = "smanojkarthick@gmail.com"; github = "manojkarthick"; From d8fbefa0196ca295d8b1566a4409961c7816e432 Mon Sep 17 00:00:00 2001 From: mannerbund Date: Fri, 15 Aug 2025 16:21:32 +0300 Subject: [PATCH 58/61] emacsPackages.eglot-booster: init at 0-unstable-2025-07-16 --- .../manual-packages/eglot-booster/package.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/eglot-booster/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eglot-booster/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eglot-booster/package.nix new file mode 100644 index 000000000000..e11936f7e5a3 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eglot-booster/package.nix @@ -0,0 +1,27 @@ +{ + lib, + melpaBuild, + fetchFromGitHub, + unstableGitUpdater, +}: + +melpaBuild { + pname = "eglot-booster"; + version = "0-unstable-2025-07-16"; + + src = fetchFromGitHub { + owner = "jdtsmith"; + repo = "eglot-booster"; + rev = "cab7803c4f0adc7fff9da6680f90110674bb7a22"; + hash = "sha256-xUBQrQpw+JZxcqT1fy/8C2tjKwa7sLFHXamBm45Fa4Y="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/jdtsmith/eglot-booster"; + description = "Boost eglot using lsp-booster"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ mannerbund ]; + }; +} From b222b8cf96b91eeaf6c43c2d9f0dd35eca481201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 17 Aug 2025 11:07:05 -0600 Subject: [PATCH 59/61] enblend-enfuse: add libjpeg dependency --- pkgs/by-name/en/enblend-enfuse/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/en/enblend-enfuse/package.nix b/pkgs/by-name/en/enblend-enfuse/package.nix index 931359afb433..a7d013ea5c74 100644 --- a/pkgs/by-name/en/enblend-enfuse/package.nix +++ b/pkgs/by-name/en/enblend-enfuse/package.nix @@ -8,6 +8,7 @@ glew, gsl, lcms2, + libjpeg, libpng, libtiff, libGLU, @@ -35,6 +36,7 @@ stdenv.mkDerivation { glew gsl lcms2 + libjpeg libpng libtiff libGLU From fa73d759265c26512d35e64177b0e17356e03788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 17 Aug 2025 11:11:26 -0600 Subject: [PATCH 60/61] gnome-disk-utility: lexicographically sort dependencies --- .../by-name/gn/gnome-disk-utility/package.nix | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 6a61d64e49f6..34a73d1d48bd 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -1,31 +1,31 @@ { lib, stdenv, - gettext, fetchurl, - pkg-config, - udisks2, - libhandy, - libsecret, - libdvdread, - meson, - ninja, - gtk3, + adwaita-icon-theme, + desktop-file-utils, + docbook-xsl-nons, + gettext, glib, - wrapGAppsHook3, - libnotify, - itstool, gnome, gnome-settings-daemon, - adwaita-icon-theme, - libxml2, gsettings-desktop-schemas, + gtk3, + itstool, libcanberra-gtk3, - libxslt, - docbook-xsl-nons, - desktop-file-utils, + libdvdread, + libhandy, + libnotify, libpwquality, + libsecret, + libxml2, + libxslt, + meson, + ninja, + pkg-config, systemd, + udisks2, + wrapGAppsHook3, }: stdenv.mkDerivation rec { @@ -38,32 +38,32 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + desktop-file-utils + docbook-xsl-nons + gettext + itstool + libxml2 + libxslt meson ninja pkg-config - gettext - itstool - libxslt - docbook-xsl-nons - desktop-file-utils wrapGAppsHook3 - libxml2 ]; buildInputs = [ - gtk3 - glib - libhandy - libsecret - libpwquality - libnotify - libdvdread - libcanberra-gtk3 - udisks2 adwaita-icon-theme - systemd + glib gnome-settings-daemon gsettings-desktop-schemas + gtk3 + libcanberra-gtk3 + libdvdread + libhandy + libnotify + libpwquality + libsecret + systemd + udisks2 ]; passthru = { From 82f10c1b336672616fe29dd4b71fcef10b3abd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 17 Aug 2025 11:12:39 -0600 Subject: [PATCH 61/61] gnome-disk-utility: add xz dependency --- pkgs/by-name/gn/gnome-disk-utility/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 34a73d1d48bd..5231521e2431 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -26,6 +26,7 @@ systemd, udisks2, wrapGAppsHook3, + xz, }: stdenv.mkDerivation rec { @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { libsecret systemd udisks2 + xz ]; passthru = {