From 43ec7b801e04f26020f1cbc00db8db7e7b7380c7 Mon Sep 17 00:00:00 2001 From: mikaeladev Date: Tue, 21 Apr 2026 19:58:42 +0100 Subject: [PATCH 01/64] nvibrant: 1.1.0 -> 1.2.0-unstable-595.58.03 --- pkgs/by-name/nv/nvibrant/hatch_build.patch | 76 +++++++++++ pkgs/by-name/nv/nvibrant/package.nix | 152 ++++++++++++++++++--- 2 files changed, 209 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/nv/nvibrant/hatch_build.patch diff --git a/pkgs/by-name/nv/nvibrant/hatch_build.patch b/pkgs/by-name/nv/nvibrant/hatch_build.patch new file mode 100644 index 000000000000..efd8f524aaad --- /dev/null +++ b/pkgs/by-name/nv/nvibrant/hatch_build.patch @@ -0,0 +1,76 @@ +diff --git a/hatch_build.py b/hatch_build.py +index 036079a..fa2275e 100644 +--- a/hatch_build.py ++++ b/hatch_build.py +@@ -1,6 +1,5 @@ + import os + import subprocess +-import sys + from pathlib import Path + from tempfile import TemporaryDirectory + +@@ -58,28 +57,27 @@ class BuildHook(BuildHookInterface): + + # Configure the project + subprocess.check_call(( +- sys.executable, "-m", "mesonbuild.mesonmain", +- "setup", Dirs.build, ++ "meson", "setup", Dirs.build, + "--buildtype", "release", + "--reconfigure", "--wipe", + ), cwd=Dirs.repository) + + # Make binaries for all known driver version + for driver in subprocess.check_output( +- ("git", "tag"), cwd=Dirs.opengpu ++ ("cat", "./SOURCE_TAGS"), cwd=Dirs.opengpu + ).decode().strip().splitlines(): + + # Checkout driver version +- subprocess.check_call( +- ("git", "checkout", "-f", driver), +- cwd=Dirs.opengpu, +- ) ++ if driver != os.environ["OLDEST_DRIVER_VERSION"]: ++ subprocess.check_call( ++ ("git", "apply", f"./PATCHES/{driver}.patch"), ++ cwd=Dirs.opengpu, ++ ) + + # Compile an executable +- subprocess.check_call(( +- sys.executable, "-m", "ninja", +- "-C", Dirs.build, +- )) ++ subprocess.check_call( ++ ("ninja", "-C", Dirs.build) ++ ) + + # Find and vendor the binary for this version + binary = Dirs.build.joinpath("nvibrant") +@@ -90,25 +88,3 @@ class BuildHook(BuildHookInterface): + + # Include in the wheel + build["force_include"][str(target)] = f"nvibrant/resources/{target.name}" +- +- # Revert back main branch +- subprocess.check_call( +- ("git", "checkout", "-f", "main"), +- cwd=Dirs.opengpu +- ) +- +-# --------------------------------------------------------------------------- # +- +-if __name__ == '__main__': +- +- # Intended operation +- subprocess.check_call( +- ("git", "config", "advice.detachedHead", "false"), +- cwd=Dirs.opengpu, +- ) +- +- environ = os.environ.copy() +- subprocess.check_call( +- args=("uv", "build", "--wheel", "-o", Dirs.dist), +- cwd=Dirs.repository, +- ) diff --git a/pkgs/by-name/nv/nvibrant/package.nix b/pkgs/by-name/nv/nvibrant/package.nix index afabbff94736..dc0da3ee3f02 100644 --- a/pkgs/by-name/nv/nvibrant/package.nix +++ b/pkgs/by-name/nv/nvibrant/package.nix @@ -1,38 +1,152 @@ { lib, - stdenv, fetchFromGitHub, - meson, - ninja, - pkg-config, + python3Packages, + writeShellScript, + common-updater-scripts, + coreutils, + gitMinimal, }: -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "nvibrant"; - version = "1.1.0"; + version = finalAttrs.passthru._version; + pyproject = true; - src = fetchFromGitHub { - owner = "Tremeschin"; - repo = "nvibrant"; - rev = "v${finalAttrs.version}"; - hash = "sha256-RZIi1V3hcwZdaI84Nd0YSQOjDng9/ZDg7aqfTL7GJIU="; - fetchSubmodules = true; + passthru = { + nvibrantVersion = "1.2.0"; + + oldestDriverVersion = "515.43.04"; + latestDriverVersion = "595.58.03"; + + _version = lib.concatStringsSep "-" [ + finalAttrs.passthru.nvibrantVersion + "unstable" + finalAttrs.passthru.latestDriverVersion + ]; + + srcAttrs = { + nvibrant = fetchFromGitHub { + owner = "tremeschin"; + repo = "nvibrant"; + name = "nvibrant"; + tag = "v${finalAttrs.passthru.nvibrantVersion}"; + hash = "sha256-OQo+VGWz8LNpsCdXbJXWWCrnVE0+t4s220uJ+pTHVKs="; + }; + open-gpu = fetchFromGitHub { + owner = "nvidia"; + repo = "open-gpu-kernel-modules"; + name = "open-gpu"; + tag = finalAttrs.passthru.oldestDriverVersion; + hash = "sha256-pSVK5oVob4QBo18ULHnQfO3UrTcC5lDDrTR9ec9pDp8="; + + # since .git isn't deterministic, we can't use it to checkout tags in + # the build phase, so instead we generate patches for each version + # upgrade before .git is removed and apply them incrementally + fetchTags = true; + postCheckout = '' + cd $out + + while IFS= read -r tag; do + echo "adding $tag" + echo "$tag" >> SOURCE_TAGS + + if [[ "$tag" == ${finalAttrs.passthru.latestDriverVersion} ]]; then + echo 'reached end of known tags' + break + fi + done < <(git tag --sort v:refname) + + mkdir PATCHES + + prev_tag=${finalAttrs.passthru.oldestDriverVersion} + while IFS= read -r tag; do + if [ "$prev_tag" == "$tag" ]; then continue; fi + + echo "generating patch: $prev_tag -> $tag" + git diff --minimal --binary "$prev_tag" "$tag" \ + > "PATCHES/$tag.patch" + + prev_tag=$tag + done < SOURCE_TAGS + unset prev_tag + + rm -rf .git + ''; + }; + }; + + updateScript = writeShellScript "update-nvibrant" '' + set -euo pipefail + + export PATH="${ + lib.makeBinPath [ + common-updater-scripts + coreutils + gitMinimal + ] + }:$PATH" + + list_tags() { + git ls-remote --tags --sort v:refname --refs "$1" | + cut --delimiter=/ --field=3- + } + + readarray -t nvibrant_tags < <(list_tags \ + 'https://github.com/tremeschin/nvibrant.git') + + readarray -t open_gpu_tags < <(list_tags \ + 'https://github.com/nvidia/open-gpu-kernel-modules.git') + + update-source-version nvibrant "''${nvibrant_tags[-1]:1}" \ + --version-key=nvibrantVersion --source-key=srcAttrs.nvibrant \ + --ignore-same-hash --ignore-same-version + + update-source-version nvibrant "''${open_gpu_tags[0]}" \ + --version-key=oldestDriverVersion --source-key=srcAttrs.open-gpu \ + --ignore-same-hash --ignore-same-version + + update-source-version nvibrant "''${open_gpu_tags[-1]}" \ + --version-key=latestDriverVersion --source-key=srcAttrs.open-gpu \ + --ignore-same-hash --ignore-same-version + ''; }; - nativeBuildInputs = [ + srcs = lib.attrValues finalAttrs.passthru.srcAttrs; + sourceRoot = "."; + + postUnpack = '' + mv open-gpu nvibrant/ + cd nvibrant + ''; + + # replaces code that depends on .git and uses of python -m {ninja,meson} + patches = [ ./hatch_build.patch ]; + + configurePhase = '' + export OLDEST_DRIVER_VERSION=${finalAttrs.passthru.oldestDriverVersion} + ''; + + nativeBuildInputs = [ gitMinimal ]; + + build-system = with python3Packages; [ + hatchling meson ninja - pkg-config ]; - mesonBuildType = "release"; + dependencies = with python3Packages; [ + packaging + ]; - meta = with lib; { + meta = { description = "Configure NVIDIA's Digital Vibrance on Wayland"; homepage = "https://github.com/Tremeschin/nvibrant"; - license = licenses.gpl3Only; - maintainers = [ maintainers.mikaeladev ]; - platforms = [ "x86_64-linux" ]; mainProgram = "nvibrant"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + mikaeladev + ]; }; }) From 7abb526a1128d560a48555516732bb57b6e28612 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Apr 2026 07:05:10 +0000 Subject: [PATCH 02/64] kalamine: 0.38 -> 0.40 --- pkgs/by-name/ka/kalamine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix index 15c2eac4300d..fe95c6b5022e 100644 --- a/pkgs/by-name/ka/kalamine/package.nix +++ b/pkgs/by-name/ka/kalamine/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "kalamine"; - version = "0.38"; + version = "0.40"; pyproject = true; src = fetchFromGitHub { owner = "OneDeadKey"; repo = "kalamine"; rev = "v${finalAttrs.version}"; - hash = "sha256-eDOwoI7S0l48oOWWDaBbDlC0A8RtPEA+FDCHpPur0OQ="; + hash = "sha256-9R8N5p+VNuiqTl3a0SSmJEVg3Ol76nROf43GsdOdJL8="; }; nativeBuildInputs = [ From da6428688a8876444b3ecf6359e20e824a4f612b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Apr 2026 12:34:40 +0000 Subject: [PATCH 03/64] pig: 0.17.0 -> 0.18.0 --- pkgs/by-name/pi/pig/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pig/package.nix b/pkgs/by-name/pi/pig/package.nix index f1b78c038534..3a07d80b53d7 100644 --- a/pkgs/by-name/pi/pig/package.nix +++ b/pkgs/by-name/pi/pig/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pig"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { url = "mirror://apache/pig/pig-${finalAttrs.version}/pig-${finalAttrs.version}.tar.gz"; - sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd"; + sha256 = "sha256-aEWtuTajw7zHFFF2WVPK5BA+QQui9sWkfMm+yt4KQ0o="; }; From ab5c1033559b0f3eeb1f308d279d3e933aa037c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Apr 2026 15:09:51 +0000 Subject: [PATCH 04/64] nfdump: 1.7.7 -> 1.7.8 --- pkgs/by-name/nf/nfdump/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nf/nfdump/package.nix b/pkgs/by-name/nf/nfdump/package.nix index 1c3ffa6a1036..e73f16f62fdf 100644 --- a/pkgs/by-name/nf/nfdump/package.nix +++ b/pkgs/by-name/nf/nfdump/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nfdump"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; tag = "v${finalAttrs.version}"; - hash = "sha256-2CQ57OEKCOaRvuBX4GN2Gz/S7B6CUTpvArD84QqLZEw="; + hash = "sha256-7e3gV/yibVU76BUeGAlwVbOUgDmj63eh1p9g4MM8YoM="; }; nativeBuildInputs = [ From ed06d70391c77ec84b2b5aa63571a86a02650a5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 14:09:09 +0000 Subject: [PATCH 05/64] hypseus-singe: 2.11.7 -> 2.12.0 --- pkgs/by-name/hy/hypseus-singe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix index 87a042e3d807..3a63bf43a55c 100644 --- a/pkgs/by-name/hy/hypseus-singe/package.nix +++ b/pkgs/by-name/hy/hypseus-singe/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hypseus-singe"; - version = "2.11.7"; + version = "2.12.0"; src = fetchFromGitHub { owner = "DirtBagXon"; repo = "hypseus-singe"; tag = "v${finalAttrs.version}"; - hash = "sha256-/Jt4w6LQ/EdZ1kmXlu08clDu+uYRL/UlgEyxa+BXooM="; + hash = "sha256-H9ogg01Szp5ab8reFnL108QhnkqkHdBFZo6YziNMzms="; }; patches = [ ./use-shared-mpeg2.patch ]; From c435bf75a045dac0bdb6fb84476be3d2b61bce87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 May 2026 19:06:20 +0000 Subject: [PATCH 06/64] sonoscli: 0.1.0 -> 0.3.1 --- pkgs/by-name/so/sonoscli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonoscli/package.nix b/pkgs/by-name/so/sonoscli/package.nix index c4d1b94dd650..57a2b4f3aa93 100644 --- a/pkgs/by-name/so/sonoscli/package.nix +++ b/pkgs/by-name/so/sonoscli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "sonoscli"; - version = "0.1.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "steipete"; repo = "sonoscli"; tag = "v${finalAttrs.version}"; - hash = "sha256-9ouRJ0Rr+W5Kx9BltgW29Jo1Jq7Hb/un4XBkq+0in9o="; + hash = "sha256-q7YVZcEKBHAX5vcel24DNLHhx3t+V7jWOWS7mrUGHqQ="; }; - vendorHash = "sha256-hocnLCzWN8srQcO3BMNkd2lt0m54Qe7sqAhUxVZlz1k="; + vendorHash = "sha256-9jK3jKbFp+5WSQfMbNzwIB55bC5KScZOaFHItffTF00="; subPackages = [ "cmd/sonos" ]; From 682e1726ecb8bbac4a86508601fbbaff5b008ccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 May 2026 21:38:10 +0000 Subject: [PATCH 07/64] zarf: 0.75.0 -> 0.76.0 --- pkgs/by-name/za/zarf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix index 920f3935b2c7..b9942e5fc767 100644 --- a/pkgs/by-name/za/zarf/package.nix +++ b/pkgs/by-name/za/zarf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "zarf"; - version = "0.75.0"; + version = "0.76.0"; src = fetchFromGitHub { owner = "zarf-dev"; repo = "zarf"; tag = "v${finalAttrs.version}"; - hash = "sha256-gQWEKLtNvb61UddbVj7SbwOXHYQxzE2ve5xuuxv3dC8="; + hash = "sha256-IipisjgJZszgFZ+BfB81/Q5jpzpFc+rM6gyxr/nQ1dA="; }; - vendorHash = "sha256-djU3gNWDQtzCR0U+DNrcENQktrozjEN8/lDs53LeeGQ="; + vendorHash = "sha256-9l2fVCHhsZu8uJgAXucbSHbozNPi2Pbhh81IYYCMjM4="; proxyVendor = true; nativeBuildInputs = [ From db9f2233aa85c6f6bff255b29d5851ab2627ccd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 May 2026 02:11:52 +0000 Subject: [PATCH 08/64] niks3: 1.4.0 -> 1.6.0 --- pkgs/by-name/ni/niks3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/niks3/package.nix b/pkgs/by-name/ni/niks3/package.nix index d66a6a453120..74680e6952a7 100644 --- a/pkgs/by-name/ni/niks3/package.nix +++ b/pkgs/by-name/ni/niks3/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "niks3"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "niks3"; tag = "v${finalAttrs.version}"; - hash = "sha256-zskaX55kGzbFFO0UGwTsOpALEzPTSIycgbrQRurlVz8="; + hash = "sha256-S2nSP6YWUz8I2uRZuAY93FoAAUa9TiZetLzjBv1n5vk="; }; - vendorHash = "sha256-/3klr19Rfz4dZrv8cWPaClLw1FgKfgqnBaR7KCydfQE="; + vendorHash = "sha256-KJM0m9QrtU6nJMmR+GBaJDNf5DUzmsVySroKIq0cMsE="; subPackages = [ "cmd/niks3" From d71b7ec9899dc704f72bdae049e38c6bd2cebeba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 13:54:31 +0000 Subject: [PATCH 09/64] mtr-exporter: 0.6.0 -> 0.7.0 --- pkgs/by-name/mt/mtr-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix index 8ab9daa33484..0ba3b94baf45 100644 --- a/pkgs/by-name/mt/mtr-exporter/package.nix +++ b/pkgs/by-name/mt/mtr-exporter/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mtr-exporter"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mgumz"; repo = "mtr-exporter"; rev = finalAttrs.version; - hash = "sha256-GkTkL72ZdxeCMG24rjGx8vWt5GQqrTXNxTDpQ81ite8="; + hash = "sha256-X765/f6dnnu10dti22wXMr74MIGqOraTVVcOeQBAqeA="; }; vendorHash = null; From 5237717fc4641b7683bc0fa4756f88f89df8e332 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 06:27:01 +0000 Subject: [PATCH 10/64] copybara: 20260420 -> 20260525 --- pkgs/by-name/co/copybara/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 9c8f7cdde74b..de12e05cc463 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20260420"; + version = "20260525"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-0ddQZ5CtsV0trTi6+AhNA2KU9hQAedz47MpxvPK27cg="; + hash = "sha256-vldamyDTV1wccm01Jwiv0ftaIq0UGG91U0jZWuht+vs="; }; nativeBuildInputs = [ From a915689a458b3643016440c72992e8eeddc2c74c Mon Sep 17 00:00:00 2001 From: nelind Date: Thu, 28 May 2026 20:17:50 +0200 Subject: [PATCH 11/64] maintainers: add nelind --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0d7adf35896..f841bdf5b0e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19394,6 +19394,11 @@ githubId = 79978224; name = "winston"; }; + nelind = { + name = "Nel"; + github = "nelind3"; + githubId = 57587152; + }; nelsonjeppesen = { email = "nix@jeppesen.io"; github = "NelsonJeppesen"; From 3121282776683db0082acb42aa4729d1fef8922b Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 29 May 2026 09:35:52 +0200 Subject: [PATCH 12/64] incus-lts: backport 7.1 security fixes --- pkgs/by-name/in/incus/lts.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index a69ea11df4c5..830273a7c26f 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -79,6 +79,26 @@ import ./generic.nix { url = "https://github.com/lxc/incus/commit/5b29ecc164ef28239d2e2a874a7c871a2e419083.patch?full_index=1"; hash = "sha256-jpyJYjiZvRw/aOGsykEx8uotRBF7p1q5O08PVhyQtvk="; }) + (fetchpatch2 { + name = "incusd-storage_Fix-unsafe-access-to-backup-data.patch"; + url = "https://github.com/lxc/incus/commit/d71c5053a4c8318e6eb07337a7a4a07a6608ef73.patch?full_index=1"; + hash = "sha256-/mH0/KmX9sG8HZTcdk8MT+QZtNqZa934wcHptvdVtXM="; + }) + (fetchpatch2 { + name = "incusd-storage_Guard-nil-ExpiresAt-in-CreateCustomVolumeFromBackup.patch"; + url = "https://github.com/lxc/incus/commit/ab6b7dff0c770044875d9d26a6254a7075b4d00b.patch?full_index=1"; + hash = "sha256-d7VUetQzUTBq3GLYM1JKy2KDbBxOW5Lg7Di1/JPNzSE="; + }) + (fetchpatch2 { + name = "incusd-storage_Guard-nil-fields-in-createDependentVolumesFromBackup.patch"; + url = "https://github.com/lxc/incus/commit/98e64f0a6fcfdc9676eea0246418d490c53297bf.patch?full_index=1"; + hash = "sha256-+lB7eHsGZ/dW7aL4/wIWD4AF6t7s4QYfAld1bQOw2tQ="; + }) + (fetchpatch2 { + name = "incusd-storage-s3_Confine-multipart-uploads-with-os.Root.patch"; + url = "https://github.com/lxc/incus/commit/a6012422b45c86f3b1956788cff5d75c604ad838.patch?full_index=1"; + hash = "sha256-u3NLKE8Rh8i6HMbJ0KNhH7gbuwIpJ1SPqiyVoiuw9Sc="; + }) ]; nixUpdateExtraArgs = [ "--version-regex=^v(7\\.0\\.[0-9]+)$" From 9818bfe7942cba7b6a2f7c8cd486353ea317ae10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 13:21:58 +0000 Subject: [PATCH 13/64] python3Packages.cohere: 6.1.0 -> 7.0.1 --- pkgs/development/python-modules/cohere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index c1d4d8d169d2..52aab9ae7124 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "6.1.0"; + version = "7.0.1"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-be6vhTGXnf1/iaD13VYjey/to+HX28VfmYlUPE2eFT4="; + hash = "sha256-+zjMs6frZYNb5g7TFLwcUiBfWKpYqJBwBoMIcNkFt0U="; }; build-system = [ poetry-core ]; From fcba5839652976f3cbadc809ee13837d3de9cc68 Mon Sep 17 00:00:00 2001 From: whispers Date: Fri, 29 May 2026 14:21:46 -0400 Subject: [PATCH 14/64] gpx-viewer: migrate from libchamplain to libchamplain_libsoup3 These packages are API compatible, and libsoup 2.4 is insecure. --- pkgs/by-name/gp/gpx-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpx-viewer/package.nix b/pkgs/by-name/gp/gpx-viewer/package.nix index 4323b4e91ab5..a9e745ccd49e 100644 --- a/pkgs/by-name/gp/gpx-viewer/package.nix +++ b/pkgs/by-name/gp/gpx-viewer/package.nix @@ -9,7 +9,7 @@ vala, pkg-config, adwaita-icon-theme, - libchamplain, + libchamplain_libsoup3, gdl, wrapGAppsHook3, }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl - libchamplain + libchamplain_libsoup3 adwaita-icon-theme libxml2 ]; From ab0681845adb5ef7b1a0184361f03b05a520570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 29 May 2026 16:56:47 -0300 Subject: [PATCH 15/64] lxqt.lxqt-panel: 2.4.0 -> 2.4.1 Diff: https://github.com/lxqt/lxqt-panel/compare/2.4.0...2.4.1 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 9cbfd76e52ae..d343618bdfad 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxqt-panel"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-panel"; tag = finalAttrs.version; - hash = "sha256-6A22/zBeR04KQXfEMOHefNABB//qWhFSZ8c+6CA3Ni4="; + hash = "sha256-TExmFE02GDRWWHCzJNETSY5GbOXxxX1OFFrEe9krBqM="; }; nativeBuildInputs = [ From fdf0dd13ad4237b1d5e3b6452622f23243fad1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 May 2026 14:42:48 -0700 Subject: [PATCH 16/64] bitwarden-desktop: 2026.3.1 -> 2026.5.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2026.3.1...desktop-v2026.5.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2026.5.0 --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 625f84e55eff..dec25773ddc9 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -33,13 +33,13 @@ let in buildNpmPackage' rec { pname = "bitwarden-desktop"; - version = "2026.3.1"; + version = "2026.5.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U="; + hash = "sha256-R00wt5W4kKmFIODEaGoUqDwfGyHH/2PpiRaC8Gq3d88="; }; patches = [ @@ -85,7 +85,7 @@ buildNpmPackage' rec { npmWorkspace = "apps/desktop"; npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-1t4CSd1NDC1medTTFHSzX9ZkgHqPG2L//yjaloH47z0="; + npmDepsHash = "sha256-xmb3zwE8/nWpRlUOgTz2UhNRaUA8KW9sHQHA97pjjfg="; cargoDeps = rustPlatform.fetchCargoVendor { inherit @@ -95,7 +95,7 @@ buildNpmPackage' rec { cargoRoot patches ; - hash = "sha256-d9Iv7OekHOteH1lyAuyj/EzfU/KSCW6ATx83foOW3IE="; + hash = "sha256-phvk4t1JKfSYGzm/vm1rT8A0fACHJF/C0WiZ2Lk3cV0="; }; cargoRoot = "apps/desktop/desktop_native"; From 556d06edc30595359d51064822b2378a5ed4bc32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 00:53:19 +0000 Subject: [PATCH 17/64] matrix-tuwunel: 1.6.1 -> 1.7.0 --- pkgs/by-name/ma/matrix-tuwunel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index 57ee664c22b7..2ac745b9c1f2 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -89,16 +89,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-GIYG2fKiUSOx2aAumCZLrc4vuWj1UWJf8nXyuDdj1oI="; + hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ="; }; - cargoHash = "sha256-V8byPrtgUQPri36pNtgOEtTlblxMAm90cSf8fgmx4tA="; + cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY="; nativeBuildInputs = [ pkg-config From 6410e2ddba53eff8fd6531f82ce35cc4dee99d4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 03:02:34 +0000 Subject: [PATCH 18/64] typescript-go: 0-unstable-2026-05-20 -> 0-unstable-2026-05-29 --- pkgs/by-name/ty/typescript-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 5af243059b90..afb75b93425c 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -15,13 +15,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-05-29"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "2cf002eed790973677ee285b54bd1687ac2c76cb"; - hash = "sha256-ViKlU1J8VLjoxQlPpjpijVN4XR63IhZ5o+sO4nt2ZgQ="; + rev = "9a5877538d3a22ea428f045700aa27f75487dc62"; + hash = "sha256-kJp7QW6KRqlJDV+zezK5ruasGilW5HGWeu6FJbNHKfY="; fetchSubmodules = false; }; From a0f503ead50c91c27893d47662165fd35b2e3be2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 03:49:49 +0000 Subject: [PATCH 19/64] betterleaks: 1.3.0 -> 1.3.1 --- pkgs/by-name/be/betterleaks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix index ebac59bb6908..ba292d09094d 100644 --- a/pkgs/by-name/be/betterleaks/package.nix +++ b/pkgs/by-name/be/betterleaks/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "betterleaks"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "betterleaks"; repo = "betterleaks"; tag = "v${finalAttrs.version}"; - hash = "sha256-65ITYF3PFYuMXsAEEVOXVBlaZnM01w/BpOdCD0LW5Y4="; + hash = "sha256-bPrOp5PP5BxkSOA7wUmq/bbVPg+bwymGQ0rl8PvPSAE="; }; vendorHash = "sha256-RStdC7M0+bPNXwaATxkMOBGf1OrT0pqlNPTJ7TCelfk="; From 47bdf7e849c1c0d60c7dfafe6fb5f20d138e618f Mon Sep 17 00:00:00 2001 From: Marc Bornand Date: Sat, 30 May 2026 10:19:07 +0200 Subject: [PATCH 20/64] hyprpaper: remove pcre --- pkgs/by-name/hy/hyprpaper/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index b1d4bf5ed9c2..5ff9377d6f03 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -27,7 +27,6 @@ libwebp, libxdmcp, pango, - pcre, pcre2, wayland, wayland-protocols, @@ -80,7 +79,6 @@ gcc15Stdenv.mkDerivation (finalAttrs: { libwebp libxdmcp pango - pcre pcre2 wayland wayland-protocols From e3299996a7916f28ed1ae5f063d946a7c01fb421 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 08:24:01 +0000 Subject: [PATCH 21/64] zapzap: 6.4.2 -> 6.5.0.0.1 --- pkgs/by-name/za/zapzap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 3f92945230eb..e58289fcc58e 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zapzap"; - version = "6.4.2"; + version = "6.5.0.0.1"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = finalAttrs.version; - hash = "sha256-3wDOqEODaOIGs9ktwbHZ0vrM7rz+oWTDnuAb5coetGY="; + hash = "sha256-rUIM7Mn4ctBr3kfwHHnr1a7tuPc5aKEJCnwfHe92thA="; }; nativeBuildInputs = [ From 2d9ed09301147ac8a5093a19cb27eff77b601cd2 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 20 May 2026 18:43:07 +0400 Subject: [PATCH 22/64] ralphex: init at 1.3.2 --- pkgs/by-name/ra/ralphex/package.nix | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/ra/ralphex/package.nix diff --git a/pkgs/by-name/ra/ralphex/package.nix b/pkgs/by-name/ra/ralphex/package.nix new file mode 100644 index 000000000000..02db0fb8a887 --- /dev/null +++ b/pkgs/by-name/ra/ralphex/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + installShellFiles, + writableTmpDirAsHomeHook, +}: + +buildGoModule (finalAttrs: { + pname = "ralphex"; + version = "1.3.2"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "umputun"; + repo = "ralphex"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4+U2m6dPH4u5RCt1eIeR1PMU90hDD13mmu+2bXnF7D0="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X main.revision=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + nativeCheckInputs = [ + git + writableTmpDirAsHomeHook + ]; + + __darwinAllowLocalNetworking = true; + + postInstall = '' + installShellCompletion completions/* + ''; + + meta = { + description = "Extended Ralph loop for autonomous AI-driven plan execution"; + homepage = "https://ralphex.com/"; + license = lib.licenses.mit; + mainProgram = "ralphex"; + maintainers = [ lib.maintainers.sikmir ]; + }; +}) From e7692596f2abf5d6a416be8d92d13bb72612e838 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:58:21 +0530 Subject: [PATCH 23/64] kbdVlock: remove redundant pkgs in path Signed-off-by: phanirithvij --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b9a43a312e0..cb06e3abd304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2558,7 +2558,7 @@ with pkgs; kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; - kbdVlock = callPackage ../../pkgs/by-name/kb/kbd/package.nix { withVlock = true; }; + kbdVlock = callPackage ../by-name/kb/kbd/package.nix { withVlock = true; }; keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; @@ -11647,7 +11647,7 @@ with pkgs; discord-development ; - torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { }; + torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { }; nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { }; From 61140bb1961ed610024769eef82061887d599608 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:55:09 +0530 Subject: [PATCH 24/64] rrsync: migrate to by-name Signed-off-by: phanirithvij --- .../sync/rsync/rrsync.nix => by-name/rr/rrsync/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/networking/sync/rsync/rrsync.nix => by-name/rr/rrsync/package.nix} (100%) diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/by-name/rr/rrsync/package.nix similarity index 100% rename from pkgs/applications/networking/sync/rsync/rrsync.nix rename to pkgs/by-name/rr/rrsync/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb06e3abd304..a6f53ad26684 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9844,7 +9844,6 @@ with pkgs; rstudio-server = rstudio.override { server = true; }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or { }); - rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix { }; inherit (callPackages ../applications/radio/rtl-sdr { }) rtl-sdr-librtlsdr From c99417ee25b457d6acb1bd6435a61f457aadd55a Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:56:14 +0530 Subject: [PATCH 25/64] rsync: migrate to by-name Signed-off-by: phanirithvij --- .../rsync/fix-tests-in-darwin-sandbox.patch | 0 .../rs/rsync/package.nix} | 24 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 15 insertions(+), 11 deletions(-) rename pkgs/{applications/networking/sync => by-name/rs}/rsync/fix-tests-in-darwin-sandbox.patch (100%) rename pkgs/{applications/networking/sync/rsync/default.nix => by-name/rs/rsync/package.nix} (83%) diff --git a/pkgs/applications/networking/sync/rsync/fix-tests-in-darwin-sandbox.patch b/pkgs/by-name/rs/rsync/fix-tests-in-darwin-sandbox.patch similarity index 100% rename from pkgs/applications/networking/sync/rsync/fix-tests-in-darwin-sandbox.patch rename to pkgs/by-name/rs/rsync/fix-tests-in-darwin-sandbox.patch diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/by-name/rs/rsync/package.nix similarity index 83% rename from pkgs/applications/networking/sync/rsync/default.nix rename to pkgs/by-name/rs/rsync/package.nix index ddfb056d101c..90380b486916 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/by-name/rs/rsync/package.nix @@ -3,31 +3,37 @@ stdenv, fetchpatch, fetchurl, + updateAutotoolsGnuConfigScriptsHook, perl, + libiconv, zlib, popt, - enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, + + config, + + enableACLs ? config.rsync.enableACLs or (lib.meta.availableOn stdenv.hostPlatform acl), acl, - enableLZ4 ? true, + enableLZ4 ? config.rsync.enableLZ4 or true, lz4, - enableOpenSSL ? true, + enableOpenSSL ? config.rsync.enableOpenSSL or true, openssl, - enableXXHash ? true, + enableXXHash ? config.rsync.enableXXHash or true, xxhash, - enableZstd ? true, + enableZstd ? config.rsync.enableZstd or true, zstd, + nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rsync"; version = "3.4.1"; src = fetchurl { # signed with key 9FEF 112D CE19 A0DC 7E88 2CB8 1BB2 4997 A853 5F6F - url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; + url = "mirror://samba/rsync/src/rsync-${finalAttrs.version}.tar.gz"; hash = "sha256-KSS8s6Hti1UfwQH3QLnw/gogKxFQJ2R89phQ1l/YjFI="; }; @@ -95,8 +101,8 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; identifiers.cpeParts = { vendor = "samba"; - inherit version; + inherit (finalAttrs) version; update = "-"; }; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6f53ad26684..52e35d5ba0fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9843,8 +9843,6 @@ with pkgs; rstudio-server = rstudio.override { server = true; }; - rsync = callPackage ../applications/networking/sync/rsync (config.rsync or { }); - inherit (callPackages ../applications/radio/rtl-sdr { }) rtl-sdr-librtlsdr rtl-sdr-osmocom From f7b5010a15d0717d0fe64e0e382084fc90168f3a Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:55:39 +0530 Subject: [PATCH 26/64] lysncd: migrate to by-name Signed-off-by: phanirithvij --- .../ls/lsyncd/package.nix} | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 11 insertions(+), 12 deletions(-) rename pkgs/{applications/networking/sync/lsyncd/default.nix => by-name/ls/lsyncd/package.nix} (82%) diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/by-name/ls/lsyncd/package.nix similarity index 82% rename from pkgs/applications/networking/sync/lsyncd/default.nix rename to pkgs/by-name/ls/lsyncd/package.nix index a18048f3fdcd..90c0306b15f9 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/by-name/ls/lsyncd/package.nix @@ -2,10 +2,12 @@ lib, stdenv, fetchFromGitHub, + cmake, - lua, pkg-config, + rsync, + lua5_2_compat, asciidoc, libxml2, docbook_xml_dtd_45, @@ -17,14 +19,14 @@ let xnu = darwin.sourceRelease "xnu"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lsyncd"; version = "2.3.1"; src = fetchFromGitHub { - owner = "axkibe"; + owner = "lsyncd"; repo = "lsyncd"; - rev = "release-${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QBmvS1HGF3VWS+5aLgDr9AmUfEsuSz+DTFIeql2XHH4="; }; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { ''; # Special flags needed on Darwin: - # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 + # https://github.com/lsyncd/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" @@ -47,9 +49,10 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ rsync - lua + lua5_2_compat asciidoc libxml2 docbook_xml_dtd_45 @@ -58,11 +61,11 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "https://github.com/axkibe/lsyncd"; + homepage = "https://github.com/lsyncd/lsyncd"; description = "Utility that synchronizes local directories with remote targets"; mainProgram = "lsyncd"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bobvanderlinden ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e35d5ba0fa..6efbc06c786f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2583,10 +2583,6 @@ with pkgs; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; - lsyncd = callPackage ../applications/networking/sync/lsyncd { - lua = lua5_2_compat; - }; - lagrange-tui = lagrange.override { enableTUI = true; }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; From 2f2bab306e0ba4edd35ac66a47d5b5392376d07d Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 22:19:08 +0530 Subject: [PATCH 27/64] syncthing: migrate to by-name Signed-off-by: phanirithvij --- .../networking/syncthing/default.nix | 151 ------------------ .../sy/syncthing-discovery/package.nix | 10 ++ pkgs/by-name/sy/syncthing-relay/package.nix | 19 +++ pkgs/by-name/sy/syncthing/package.nix | 126 +++++++++++++++ pkgs/top-level/all-packages.nix | 9 -- 5 files changed, 155 insertions(+), 160 deletions(-) delete mode 100644 pkgs/applications/networking/syncthing/default.nix create mode 100644 pkgs/by-name/sy/syncthing-discovery/package.nix create mode 100644 pkgs/by-name/sy/syncthing-relay/package.nix create mode 100644 pkgs/by-name/sy/syncthing/package.nix diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix deleted file mode 100644 index e9c3104bbfa0..000000000000 --- a/pkgs/applications/networking/syncthing/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ - pkgsBuildBuild, - go, - buildGoModule, - stdenv, - lib, - fetchFromGitHub, - nixosTests, - autoSignDarwinBinariesHook, - nix-update-script, -}: - -let - common = - { - stname, - target, - postInstall ? "", - }: - buildGoModule rec { - pname = stname; - version = "2.0.15"; - - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - tag = "v${version}"; - hash = "sha256-v77ovjV+UoCRA1GteP+HDqC8dsRvtOhFX/IkSgSIf8Y="; - }; - - vendorHash = "sha256-boYTLgvH+iWlh3y3Z0LPvSVGEget3X94AthtJKphhCw="; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # Recent versions of macOS seem to require binaries to be signed when - # run from Launch Agents/Daemons, even on x86 devices where it has a - # more lax code signing policy compared to Apple Silicon. So just sign - # the binaries on both architectures to make it possible for launchd to - # auto-start Syncthing at login. - autoSignDarwinBinariesHook - ]; - - doCheck = false; - - env = { - BUILD_USER = "nix"; - BUILD_HOST = "nix"; - }; - - buildPhase = '' - runHook preBuild - ( - export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD - go build build.go - go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto - ) - ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dm755 ${target} $out/bin/${target} - runHook postInstall - ''; - - inherit postInstall; - - passthru = { - tests = { - inherit (nixosTests) - syncthing - syncthing-folders - syncthing-guiPassword - syncthing-guiPasswordFile - syncthing-init - syncthing-no-settings - syncthing-relay - ; - }; - updateScript = nix-update-script { }; - }; - - meta = { - homepage = "https://syncthing.net/"; - description = "Open Source Continuous File Synchronization"; - changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - joko - peterhoeg - ]; - mainProgram = target; - platforms = lib.platforms.unix; - }; - }; - -in -{ - syncthing = common { - stname = "syncthing"; - target = "syncthing"; - - postInstall = '' - # This installs man pages in the correct directory according to the suffix - # on the filename - for mf in man/*.[1-9]; do - mantype="$(echo "$mf" | awk -F"." '{print $NF}')" - mandir="$out/share/man/man$mantype" - install -Dm644 "$mf" "$mandir/$(basename "$mf")" - done - - install -Dm644 etc/linux-desktop/syncthing-ui.desktop $out/share/applications/syncthing-ui.desktop - install -Dm644 assets/logo-32.png $out/share/icons/hicolor/32x32/apps/syncthing.png - install -Dm644 assets/logo-64.png $out/share/icons/hicolor/64x64/apps/syncthing.png - install -Dm644 assets/logo-128.png $out/share/icons/hicolor/128x128/apps/syncthing.png - install -Dm644 assets/logo-256.png $out/share/icons/hicolor/256x256/apps/syncthing.png - install -Dm644 assets/logo-512.png $out/share/icons/hicolor/512x512/apps/syncthing.png - install -Dm644 assets/logo-only.svg $out/share/icons/hicolor/scalable/apps/syncthing.svg - - '' - + lib.optionalString (stdenv.hostPlatform.isLinux) '' - mkdir -p $out/lib/systemd/{system,user} - - substitute etc/linux-systemd/system/syncthing@.service \ - $out/lib/systemd/system/syncthing@.service \ - --replace-fail /usr/bin/syncthing $out/bin/syncthing - - substitute etc/linux-systemd/user/syncthing.service \ - $out/lib/systemd/user/syncthing.service \ - --replace-fail /usr/bin/syncthing $out/bin/syncthing - ''; - }; - - syncthing-discovery = common { - stname = "syncthing-discovery"; - target = "stdiscosrv"; - }; - - syncthing-relay = common { - stname = "syncthing-relay"; - target = "strelaysrv"; - - postInstall = lib.optionalString (stdenv.hostPlatform.isLinux) '' - mkdir -p $out/lib/systemd/system - - substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ - $out/lib/systemd/system/strelaysrv.service \ - --replace-fail /usr/bin/strelaysrv $out/bin/strelaysrv - ''; - }; -} diff --git a/pkgs/by-name/sy/syncthing-discovery/package.nix b/pkgs/by-name/sy/syncthing-discovery/package.nix new file mode 100644 index 000000000000..48522ee5f083 --- /dev/null +++ b/pkgs/by-name/sy/syncthing-discovery/package.nix @@ -0,0 +1,10 @@ +{ + syncthing, +}: +(syncthing.override { + target = "stdiscosrv"; +}).overrideAttrs + { + pname = "syncthing-discovery"; + postInstall = ""; + } diff --git a/pkgs/by-name/sy/syncthing-relay/package.nix b/pkgs/by-name/sy/syncthing-relay/package.nix new file mode 100644 index 000000000000..e03fdff2a435 --- /dev/null +++ b/pkgs/by-name/sy/syncthing-relay/package.nix @@ -0,0 +1,19 @@ +{ + lib, + stdenv, + syncthing, +}: + +(syncthing.override { + target = "strelaysrv"; +}).overrideAttrs + { + pname = "syncthing-relay"; + postInstall = lib.optionalString (stdenv.hostPlatform.isLinux) '' + mkdir -p $out/lib/systemd/system + + substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ + $out/lib/systemd/system/strelaysrv.service \ + --replace-fail /usr/bin/strelaysrv $out/bin/strelaysrv + ''; + } diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix new file mode 100644 index 000000000000..de32f29866a9 --- /dev/null +++ b/pkgs/by-name/sy/syncthing/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + pkgsBuildBuild, + + go, + darwin, + nixosTests, + + nix-update-script, + + target ? "syncthing", +}: + +assert builtins.elem target [ + "syncthing" + "stdiscosrv" # syncthing-discovery + "strelaysrv" # syncthing-relay +]; + +buildGoModule (finalAttrs: { + pname = "syncthing"; + version = "2.0.15"; + + src = fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing"; + tag = "v${finalAttrs.version}"; + hash = "sha256-v77ovjV+UoCRA1GteP+HDqC8dsRvtOhFX/IkSgSIf8Y="; + }; + + vendorHash = "sha256-boYTLgvH+iWlh3y3Z0LPvSVGEget3X94AthtJKphhCw="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + # Recent versions of macOS seem to require binaries to be signed when + # run from Launch Agents/Daemons, even on x86 devices where it has a + # more lax code signing policy compared to Apple Silicon. So just sign + # the binaries on both architectures to make it possible for launchd to + # auto-start Syncthing at login. + darwin.autoSignDarwinBinariesHook + ]; + + doCheck = false; + + env = { + BUILD_USER = "nix"; + BUILD_HOST = "nix"; + }; + + buildPhase = '' + runHook preBuild + ( + export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD + go build build.go + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto + ) + ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${finalAttrs.version} build ${target} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 ${target} $out/bin/${target} + runHook postInstall + ''; + + postInstall = '' + # This installs man pages in the correct directory according to the suffix + # on the filename + for mf in man/*.[1-9]; do + mantype="$(echo "$mf" | awk -F"." '{print $NF}')" + mandir="$out/share/man/man$mantype" + install -Dm644 "$mf" "$mandir/$(basename "$mf")" + done + + install -Dm644 etc/linux-desktop/syncthing-ui.desktop $out/share/applications/syncthing-ui.desktop + install -Dm644 assets/logo-32.png $out/share/icons/hicolor/32x32/apps/syncthing.png + install -Dm644 assets/logo-64.png $out/share/icons/hicolor/64x64/apps/syncthing.png + install -Dm644 assets/logo-128.png $out/share/icons/hicolor/128x128/apps/syncthing.png + install -Dm644 assets/logo-256.png $out/share/icons/hicolor/256x256/apps/syncthing.png + install -Dm644 assets/logo-512.png $out/share/icons/hicolor/512x512/apps/syncthing.png + install -Dm644 assets/logo-only.svg $out/share/icons/hicolor/scalable/apps/syncthing.svg + + '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' + mkdir -p $out/lib/systemd/{system,user} + + substitute etc/linux-systemd/system/syncthing@.service \ + $out/lib/systemd/system/syncthing@.service \ + --replace-fail /usr/bin/syncthing $out/bin/syncthing + + substitute etc/linux-systemd/user/syncthing.service \ + $out/lib/systemd/user/syncthing.service \ + --replace-fail /usr/bin/syncthing $out/bin/syncthing + ''; + + passthru = { + tests = { + inherit (nixosTests) + syncthing + syncthing-folders + syncthing-guiPassword + syncthing-guiPasswordFile + syncthing-init + syncthing-no-settings + syncthing-relay + ; + }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://syncthing.net/"; + description = "Open Source Continuous File Synchronization"; + changelog = "https://github.com/syncthing/syncthing/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + joko + peterhoeg + ]; + mainProgram = target; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6efbc06c786f..689e1cdd331f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9937,15 +9937,6 @@ with pkgs; waylandSupport = true; }; - inherit - (callPackages ../applications/networking/syncthing { - inherit (darwin) autoSignDarwinBinariesHook; - }) - syncthing - syncthing-discovery - syncthing-relay - ; - synergyWithoutGUI = synergy.override { withGUI = false; }; tabbed = callPackage ../applications/window-managers/tabbed { From dc3e5a21f8123be69be5ce8cee480abbfd0906fa Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 23:51:38 +0530 Subject: [PATCH 28/64] snapcast: migrate to by-name Signed-off-by: phanirithvij --- .../snapcast/default.nix => by-name/sn/snapcast/package.nix} | 3 ++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) rename pkgs/{applications/audio/snapcast/default.nix => by-name/sn/snapcast/package.nix} (95%) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/by-name/sn/snapcast/package.nix similarity index 95% rename from pkgs/applications/audio/snapcast/default.nix rename to pkgs/by-name/sn/snapcast/package.nix index 2f13d996edb1..e9316533edd8 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/by-name/sn/snapcast/package.nix @@ -16,7 +16,8 @@ soxr, aixlog, popl, - pulseaudioSupport ? false, + config, + pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, pipewireSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, pipewire, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 689e1cdd331f..79e2cd29eb4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3155,10 +3155,6 @@ with pkgs; # aka., pgp-tools - snapcast = callPackage ../applications/audio/snapcast { - pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; - }; - specup = haskellPackages.specup.bin; spglib = callPackage ../development/libraries/spglib { From 8fc99ff7a4ff7a01e8541358f8505b30b7d6652e Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 12 May 2026 01:07:56 +0530 Subject: [PATCH 29/64] ladspaPlugins: migrate to by-name Signed-off-by: phanirithvij --- .../default.nix => by-name/la/ladspaPlugins/package.nix} | 5 +++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{applications/audio/ladspa-plugins/default.nix => by-name/la/ladspaPlugins/package.nix} (96%) diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/by-name/la/ladspaPlugins/package.nix similarity index 96% rename from pkgs/applications/audio/ladspa-plugins/default.nix rename to pkgs/by-name/la/ladspaPlugins/package.nix index 5f44a883a95a..4f61faacdab6 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/by-name/la/ladspaPlugins/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, automake, - fftw, + fftwSinglePrec, ladspa-header, libxml2, pkg-config, @@ -39,8 +39,9 @@ stdenv.mkDerivation (finalAttrs: { perlPackages.perl perlPackages.XMLParser ]; + buildInputs = [ - fftw + fftwSinglePrec ladspa-header libxml2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79e2cd29eb4a..ab03ed046e40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9426,10 +9426,6 @@ with pkgs; callPackage ../applications/networking/cluster/helm/plugins { } ); - ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { - fftw = fftwSinglePrec; - }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; From b310447bfc91c12308f92176ec37a8fdd1dd9192 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 12 May 2026 01:59:44 +0530 Subject: [PATCH 30/64] sail-riscv: migrate to by-name Signed-off-by: phanirithvij --- .../sa/sail-riscv/package.nix} | 22 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 12 insertions(+), 14 deletions(-) rename pkgs/{applications/virtualization/sail-riscv/default.nix => by-name/sa/sail-riscv/package.nix} (86%) diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/by-name/sa/sail-riscv/package.nix similarity index 86% rename from pkgs/applications/virtualization/sail-riscv/default.nix rename to pkgs/by-name/sa/sail-riscv/package.nix index c44d674fa7e4..a27b9c4e0ca5 100644 --- a/pkgs/applications/virtualization/sail-riscv/default.nix +++ b/pkgs/by-name/sa/sail-riscv/package.nix @@ -1,23 +1,25 @@ { + lib, stdenv, fetchFromGitHub, - lib, - cmake, - gmp, - pkg-config, - sail, - ninja, + z3, + cmake, + ninja, + pkg-config, + ocamlPackages, + + gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sail-riscv"; version = "0.8"; src = fetchFromGitHub { owner = "riscv"; repo = "sail-riscv"; - rev = version; + rev = finalAttrs.version; hash = "sha256-50ATe3DQcdyNOqP85mEMyEwxzpBOplzRN9ulaJNo9zo="; }; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { cmake pkg-config ninja - sail + ocamlPackages.sail ]; buildInputs = [ gmp @@ -42,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab03ed046e40..4712246738cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11479,10 +11479,6 @@ with pkgs; waylandSupport = true; }; - sail-riscv = callPackage ../applications/virtualization/sail-riscv { - inherit (ocamlPackages) sail; - }; - mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { }; From c01c964d048c188299ab37079e7cf4704aa98f09 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 12 May 2026 00:05:32 +0530 Subject: [PATCH 31/64] various: use finalAttrs Signed-off-by: phanirithvij --- pkgs/by-name/an/antimicrox/package.nix | 11 ++++++----- pkgs/by-name/ma/makehuman/package.nix | 16 ++++++++-------- pkgs/by-name/qm/qmediathekview/package.nix | 8 ++++---- pkgs/by-name/qs/qsudo/package.nix | 8 ++++---- pkgs/by-name/qt/qtemu/package.nix | 6 +++--- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/an/antimicrox/package.nix b/pkgs/by-name/an/antimicrox/package.nix index 207eb187851b..dfbd5289ba25 100644 --- a/pkgs/by-name/an/antimicrox/package.nix +++ b/pkgs/by-name/an/antimicrox/package.nix @@ -12,14 +12,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "antimicrox"; version = "3.5.1"; src = fetchFromGitHub { owner = "AntiMicroX"; - repo = pname; - rev = version; + repo = "antimicrox"; + rev = finalAttrs.version; sha256 = "sha256-ZIHhgyOpabWkdFZoha/Hj/1d8/b6qVolE6dn0xAFZVw="; }; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { udevCheckHook libsForQt5.wrapQtAppsHook ]; + buildInputs = [ SDL2 libsForQt5.qttools @@ -46,10 +47,10 @@ stdenv.mkDerivation rec { meta = { description = "GUI for mapping keyboard and mouse controls to a gamepad"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; maintainers = [ ]; license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux; mainProgram = "antimicrox"; }; -} +}) diff --git a/pkgs/by-name/ma/makehuman/package.nix b/pkgs/by-name/ma/makehuman/package.nix index e5a56d273542..103f021ef60b 100644 --- a/pkgs/by-name/ma/makehuman/package.nix +++ b/pkgs/by-name/ma/makehuman/package.nix @@ -15,27 +15,27 @@ let ]; python = python3.withPackages (pkgs: pydeps); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "makehuman"; version = "1.3.0"; source = fetchFromGitHub { owner = "makehumancommunity"; repo = "makehuman"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4="; - name = "${pname}-source"; + name = "makehuman-source"; }; assets = fetchFromGitHub { owner = "makehumancommunity"; repo = "makehuman-assets"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jd2A0PAHVdFMnDLq4Mu5wsK/E6A4QpKjUyv66ix1Gbo="; - name = "${pname}-assets-source"; + name = "makehuman-assets-source"; }; - srcs = [ + srcs = with finalAttrs; [ source assets ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = pydeps; - finalSource = "${pname}-final"; + finalSource = "makehuman-final"; postUnpack = '' mkdir -p $finalSource @@ -108,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ elisesouche ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qm/qmediathekview/package.nix b/pkgs/by-name/qm/qmediathekview/package.nix index e83a58bf02d1..e23be092fe02 100644 --- a/pkgs/by-name/qm/qmediathekview/package.nix +++ b/pkgs/by-name/qm/qmediathekview/package.nix @@ -8,14 +8,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "QMediathekView"; version = "0.2.1"; src = fetchFromGitHub { owner = "adamreichold"; repo = "QMediathekView"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6"; }; @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { meta = { description = "Alternative Qt-based front-end for the database maintained by the MediathekView project"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dotlambda ]; broken = stdenv.hostPlatform.isAarch64; mainProgram = "QMediathekView"; }; -} +}) diff --git a/pkgs/by-name/qs/qsudo/package.nix b/pkgs/by-name/qs/qsudo/package.nix index 4fd3e778845b..8664489fd033 100644 --- a/pkgs/by-name/qs/qsudo/package.nix +++ b/pkgs/by-name/qs/qsudo/package.nix @@ -6,18 +6,18 @@ sudo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qsudo"; version = "2020.03.27"; src = fetchFromGitHub { owner = "project-trident"; repo = "qsudo"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl"; }; - sourceRoot = "${src.name}/src-qt5"; + sourceRoot = "${finalAttrs.src.name}/src-qt5"; nativeBuildInputs = [ libsForQt5.qmake @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/qt/qtemu/package.nix b/pkgs/by-name/qt/qtemu/package.nix index 183144ae0bd4..8d6abd65e517 100644 --- a/pkgs/by-name/qt/qtemu/package.nix +++ b/pkgs/by-name/qt/qtemu/package.nix @@ -7,14 +7,14 @@ qemu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtemu"; version = "2.1"; src = fetchFromGitLab { owner = "qtemu"; repo = "gui"; - rev = version; + rev = finalAttrs.version; sha256 = "1555178mkfw0gwmw8bsxmg4339j2ifp0yb4b2f39nxh9hwshg07j"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ romildo ]; mainProgram = "qtemu"; }; -} +}) From ebb943a800310903ea8fc60bacdc99d732a343a3 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 30 May 2026 16:05:41 +0530 Subject: [PATCH 32/64] makehuman: mark broken Signed-off-by: phanirithvij --- pkgs/by-name/ma/makehuman/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ma/makehuman/package.nix b/pkgs/by-name/ma/makehuman/package.nix index 103f021ef60b..07aab7fe5956 100644 --- a/pkgs/by-name/ma/makehuman/package.nix +++ b/pkgs/by-name/ma/makehuman/package.nix @@ -107,5 +107,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "makehuman"; maintainers = with lib.maintainers; [ elisesouche ]; platforms = lib.platforms.all; + broken = true; # Added 2026-05-12 }; }) From 9f9e5cecda8417f2ff603306b9d20d144c8e8e09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 13:33:15 +0200 Subject: [PATCH 33/64] orcaslicer: drop unused pcre dependency --- pkgs/by-name/or/orca-slicer/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index c1880e18077a..cd4b0d4ff2d9 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -35,7 +35,6 @@ opencascade-occt_7_6, openvdb, opencv, - pcre, systemd, onetbb, webkitgtk_4_1, @@ -124,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { nlopt opencascade-occt_7_6 openvdb - pcre onetbb webkitgtk_4_1 wxGTK' From fb7fb476cfc5bebc923e78017489ebe5fe0534b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 11:33:35 +0000 Subject: [PATCH 34/64] cargo-edit: 0.13.10 -> 0.13.11 --- pkgs/by-name/ca/cargo-edit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix index f851fb4bfe35..314d7c62b8ec 100644 --- a/pkgs/by-name/ca/cargo-edit/package.nix +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-edit"; - version = "0.13.10"; + version = "0.13.11"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${finalAttrs.version}"; - hash = "sha256-9CmbOIRHgYlc/bAN8BS5NyzfgRIzyneh/LC/sZFZUuo="; + hash = "sha256-u4mjbIs9rLZOZ4MUITc4QYnfEcTyZT5aXt6U7fwefoo="; }; - cargoHash = "sha256-O1tY0RVH4FHr7kWJ8+BUyD7LzzqlaObO0dHwrsX2biQ="; + cargoHash = "sha256-1PCncmiY+olGGMOT2AfIbGY5sup4ysPVqdBmuecDWk0="; nativeBuildInputs = [ pkg-config ]; From 2b4a48d5456349bf07fccd8693b6565f205f2c91 Mon Sep 17 00:00:00 2001 From: yaya Date: Sat, 30 May 2026 14:21:21 +0200 Subject: [PATCH 35/64] .github/ISSUE_TEMPLATE: Mark 26.05 stable --- .github/ISSUE_TEMPLATE/01_bug_report.yml | 3 +-- .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml | 3 +-- .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml | 3 +-- .github/ISSUE_TEMPLATE/04_build_failure.yml | 3 +-- .github/ISSUE_TEMPLATE/05_update_request.yml | 3 +-- .github/ISSUE_TEMPLATE/06_module_request.yml | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml index ec937beafd96..216cc6516ffd 100644 --- a/.github/ISSUE_TEMPLATE/01_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml @@ -36,8 +36,7 @@ body: options: - "Please select a version." - "- Unstable (26.11)" - - "- Beta (26.05)" - - "- Stable (25.11)" + - "- Stable (26.05)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml index 8f3eef22f07f..ad309af0b1ca 100644 --- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml +++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml @@ -36,8 +36,7 @@ body: options: - "Please select a version." - "- Unstable (26.11)" - - "- Beta (26.05)" - - "- Stable (25.11)" + - "- Stable (26.05)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml index 762bf654fcd1..4e084dde3246 100644 --- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml +++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml @@ -36,8 +36,7 @@ body: options: - "Please select a version." - "- Unstable (26.11)" - - "- Beta (26.05)" - - "- Stable (25.11)" + - "- Stable (26.05)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index 54713cbd6c14..e095322c2e82 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml @@ -38,8 +38,7 @@ body: options: - "Please select a version." - "- Unstable (26.11)" - - "- Beta (26.05)" - - "- Stable (25.11)" + - "- Stable (26.05)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml index 9af0700f6be1..eb1df4997de5 100644 --- a/.github/ISSUE_TEMPLATE/05_update_request.yml +++ b/.github/ISSUE_TEMPLATE/05_update_request.yml @@ -38,8 +38,7 @@ body: options: - "Please select a version." - "- Unstable (26.11)" - - "- Beta (26.05)" - - "- Stable (25.11)" + - "- Stable (26.05)" default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml index 5590c0e68606..08fa364f751a 100644 --- a/.github/ISSUE_TEMPLATE/06_module_request.yml +++ b/.github/ISSUE_TEMPLATE/06_module_request.yml @@ -36,8 +36,7 @@ body: options: - "Please select a version." - "- Unstable (26.11)" - - "- Beta (26.05)" - - "- Stable (25.11)" + - "- Stable (26.05)" default: 0 validations: required: true From 123a2dedb2a8d201ad9585bc24c19fb437ca8c14 Mon Sep 17 00:00:00 2001 From: yaya Date: Sat, 30 May 2026 14:24:24 +0200 Subject: [PATCH 36/64] Release 26.05 --- doc/release-notes/rl-2605.section.md | 2 +- nixos/doc/manual/release-notes/rl-2605.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 13451b77d66c..c12f855330ff 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Nixpkgs 26.05 ("Yarara", 2026.05/??) {#sec-nixpkgs-release-26.05} +# Nixpkgs 26.05 ("Yarara", 2026.05/30) {#sec-nixpkgs-release-26.05} ## Highlights {#sec-nixpkgs-release-26.05-highlights} diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index e7bbe1501de4..e99c5ae298d6 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Release 26.05 ("Yarara", 2026.05/??) {#sec-release-26.05} +# Release 26.05 ("Yarara", 2026.05/30) {#sec-release-26.05} ## Highlights {#sec-release-26.05-highlights} From 2c190b59c1620c23eeec46e9c86a6e1636ae56c2 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 30 May 2026 17:56:22 +0530 Subject: [PATCH 37/64] various: use fetchFromCodeberg Signed-off-by: phanirithvij --- pkgs/by-name/aw/awww/package.nix | 5 ++--- pkgs/by-name/cr/cropgui/package.nix | 5 ++--- pkgs/by-name/ga/gamepad-mirror/package.nix | 5 ++--- pkgs/by-name/gi/git-pages/package.nix | 5 ++--- pkgs/by-name/hi/hittekaart/package.nix | 5 ++--- pkgs/by-name/nu/nu-lint/package.nix | 5 ++--- pkgs/by-name/se/searchix/package.nix | 5 ++--- pkgs/by-name/to/tonearm/package.nix | 5 ++--- .../python-modules/dramatiq-eager-broker/default.nix | 5 ++--- pkgs/development/python-modules/rpatool/default.nix | 5 ++--- 10 files changed, 20 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/aw/awww/package.nix b/pkgs/by-name/aw/awww/package.nix index b3fe1dbc5ffc..c5990b3e2554 100644 --- a/pkgs/by-name/aw/awww/package.nix +++ b/pkgs/by-name/aw/awww/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, pkg-config, lz4, @@ -17,8 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "awww"; version = "0.12.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "LGFae"; repo = "awww"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/cr/cropgui/package.nix b/pkgs/by-name/cr/cropgui/package.nix index faf9579e5749..5b33a74447d0 100644 --- a/pkgs/by-name/cr/cropgui/package.nix +++ b/pkgs/by-name/cr/cropgui/package.nix @@ -1,7 +1,7 @@ { lib, python3Packages, - fetchFromGitea, + fetchFromCodeberg, makeWrapper, libjpeg, exiftool, @@ -11,8 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cropgui"; version = "0.9"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jepler"; repo = "cropgui"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ga/gamepad-mirror/package.nix b/pkgs/by-name/ga/gamepad-mirror/package.nix index a21f41375c82..cdde9f088a02 100644 --- a/pkgs/by-name/ga/gamepad-mirror/package.nix +++ b/pkgs/by-name/ga/gamepad-mirror/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, appstream, cmake, desktop-file-utils, @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gamepad-mirror"; version = "0.3-unstable-2025-10-18"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "vendillah"; repo = "GamepadMirror"; rev = "aa86d55f21b4d206eab61d0bf7cd9ccafc8aa607"; diff --git a/pkgs/by-name/gi/git-pages/package.nix b/pkgs/by-name/gi/git-pages/package.nix index 6a09f5364b6f..eae85b985d4d 100644 --- a/pkgs/by-name/gi/git-pages/package.nix +++ b/pkgs/by-name/gi/git-pages/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, versionCheckHook, }: @@ -11,8 +11,7 @@ buildGoModule (finalAttrs: { version = "0.9.0"; __structuredAttrs = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "git-pages"; repo = "git-pages"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/hi/hittekaart/package.nix b/pkgs/by-name/hi/hittekaart/package.nix index 4dac740a9750..068e298cc28f 100644 --- a/pkgs/by-name/hi/hittekaart/package.nix +++ b/pkgs/by-name/hi/hittekaart/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, python3, sqlite, }: @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hittekaart"; version = "0.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dunj3"; repo = "hittekaart"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/nu/nu-lint/package.nix b/pkgs/by-name/nu/nu-lint/package.nix index 0eb1c2fbacc5..751b4c996a02 100644 --- a/pkgs/by-name/nu/nu-lint/package.nix +++ b/pkgs/by-name/nu/nu-lint/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, nix-update-script, versionCheckHook, @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu-lint"; version = "1.1.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "wvhulle"; repo = "nu-lint"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/se/searchix/package.nix b/pkgs/by-name/se/searchix/package.nix index 00ee01703911..a7ea4cf31759 100644 --- a/pkgs/by-name/se/searchix/package.nix +++ b/pkgs/by-name/se/searchix/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, fetchFromGitHub, versionCheckHook, nix-update-script, @@ -20,8 +20,7 @@ buildGoModule (finalAttrs: { pname = "searchix"; version = "0.4.8"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "alinnow"; repo = "searchix"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/to/tonearm/package.nix b/pkgs/by-name/to/tonearm/package.nix index d63aa6788920..8a9b1fe44c04 100644 --- a/pkgs/by-name/to/tonearm/package.nix +++ b/pkgs/by-name/to/tonearm/package.nix @@ -2,7 +2,7 @@ buildGo126Module, cairo, copyDesktopItems, - fetchFromGitea, + fetchFromCodeberg, gdk-pixbuf, glib, glib-networking, @@ -41,8 +41,7 @@ in buildGo126Module (finalAttrs: { pname = "tonearm"; version = "1.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dergs"; repo = "Tonearm"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/dramatiq-eager-broker/default.nix b/pkgs/development/python-modules/dramatiq-eager-broker/default.nix index ae93a5c9535c..9a441bca8c99 100644 --- a/pkgs/development/python-modules/dramatiq-eager-broker/default.nix +++ b/pkgs/development/python-modules/dramatiq-eager-broker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, uv-build, dramatiq, pytestCheckHook, @@ -13,8 +13,7 @@ buildPythonPackage rec { pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "yaal"; repo = "dramatiq-eager-broker"; tag = version; diff --git a/pkgs/development/python-modules/rpatool/default.nix b/pkgs/development/python-modules/rpatool/default.nix index 6d689a5dd2a5..0c77d9aaeed3 100644 --- a/pkgs/development/python-modules/rpatool/default.nix +++ b/pkgs/development/python-modules/rpatool/default.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, buildPythonPackage, setuptools, }: @@ -9,8 +9,7 @@ buildPythonPackage rec { pname = "rpatool"; version = "1.0.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "shiz"; repo = "rpatool"; tag = "v${version}"; From 4b8c574878fa9f20a0e6e4118320b1446b3cea6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 12:40:52 +0000 Subject: [PATCH 38/64] python3Packages.django-js-reverse: 0.10.2 -> 1.0.0 --- pkgs/development/python-modules/django-js-reverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 46f066f3246d..8d7afdfecddc 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "django-js-reverse"; - version = "0.10.2"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "vintasoftware"; repo = "django-js-reverse"; tag = "v${finalAttrs.version}"; - hash = "sha256-0S1g8tLWaJVV2QGPeiBOevhz9f0ueINxA9HOcnXuyYg="; + hash = "sha256-XpHQXZuIRl6qBDmbFX/IhHxwrOiMiiiTIF5x3W13kGA="; }; build-system = [ setuptools ]; From 2002ce930b7ce6f10ac45945e2718c86faf6a5f9 Mon Sep 17 00:00:00 2001 From: yaya Date: Sat, 30 May 2026 14:37:49 +0200 Subject: [PATCH 39/64] Revert "Release 26.05" We messed up the commit message. This is too embarrassing to leave it be. On a second thought, this commit message is even more embarrassing. --- doc/release-notes/rl-2605.section.md | 2 +- nixos/doc/manual/release-notes/rl-2605.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index a4a436186729..5c23a9945f06 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Nixpkgs 26.05 ("Yarara", 2026.05/30) {#sec-nixpkgs-release-26.05} +# Nixpkgs 26.05 ("Yarara", 2026.05/??) {#sec-nixpkgs-release-26.05} ## Highlights {#sec-nixpkgs-release-26.05-highlights} diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 70c6cdd2d0d6..8c80dfad5d98 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Release 26.05 ("Yarara", 2026.05/30) {#sec-release-26.05} +# Release 26.05 ("Yarara", 2026.05/??) {#sec-release-26.05} ## Highlights {#sec-release-26.05-highlights} From 5142ac72496fe5938b04a25ebbeea840dc549fd7 Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Sun, 1 Mar 2026 16:30:30 +0800 Subject: [PATCH 40/64] t-lang: init at 0.3.1 --- pkgs/by-name/t-/t-lang/package.nix | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/t-/t-lang/package.nix diff --git a/pkgs/by-name/t-/t-lang/package.nix b/pkgs/by-name/t-/t-lang/package.nix new file mode 100644 index 000000000000..c0084be3619a --- /dev/null +++ b/pkgs/by-name/t-/t-lang/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "t-lang"; + version = "0.3.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "alecthomas"; + repo = "t"; + tag = "v${finalAttrs.version}"; + hash = "sha256-J/lQ5x72Z6yv/F0+n9tMLsIP4ojrbZKuUajPlvMnBsU="; + }; + + cargoHash = "sha256-86T8rOKXx6agZw6xu10YVCgP+dyuodCW1ZZlimQFcFk="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Text processing language and utility"; + longDescription = '' + T is a concise language for manipulating text, replacing common usage + patterns of Unix utilities like grep, sed, cut, awk, sort, and uniq. + ''; + homepage = "https://github.com/alecthomas/t"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ chillcicada ]; + mainProgram = "t"; + }; +}) From c6e2474b784130540a1e9abb1f963049a2b0114b Mon Sep 17 00:00:00 2001 From: yaya Date: Sat, 30 May 2026 14:24:24 +0200 Subject: [PATCH 41/64] Release NixOS 26.05 --- doc/release-notes/rl-2605.section.md | 2 +- nixos/doc/manual/release-notes/rl-2605.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 5c23a9945f06..a4a436186729 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Nixpkgs 26.05 ("Yarara", 2026.05/??) {#sec-nixpkgs-release-26.05} +# Nixpkgs 26.05 ("Yarara", 2026.05/30) {#sec-nixpkgs-release-26.05} ## Highlights {#sec-nixpkgs-release-26.05-highlights} diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 8c80dfad5d98..70c6cdd2d0d6 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -1,4 +1,4 @@ -# Release 26.05 ("Yarara", 2026.05/??) {#sec-release-26.05} +# Release 26.05 ("Yarara", 2026.05/30) {#sec-release-26.05} ## Highlights {#sec-release-26.05-highlights} From 2dcfdcea300dfa1aced06bda2c231ee5e4d21904 Mon Sep 17 00:00:00 2001 From: nelind Date: Thu, 28 May 2026 21:21:45 +0200 Subject: [PATCH 42/64] tranquil-pds: init at 0.6.3 --- pkgs/by-name/tr/tranquil-pds/package.nix | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/tr/tranquil-pds/package.nix diff --git a/pkgs/by-name/tr/tranquil-pds/package.nix b/pkgs/by-name/tr/tranquil-pds/package.nix new file mode 100644 index 000000000000..8832b2768c8c --- /dev/null +++ b/pkgs/by-name/tr/tranquil-pds/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchgit, + rustPlatform, + pkg-config, + openssl, + protobuf, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tranquil-pds"; + version = "0.6.3"; + + src = fetchgit { + url = "https://tangled.org/tranquil.farm/tranquil-pds"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TORNOFPlbCt4QWNd+bmxkShTUvT/5ynOj+UBYITAhg8="; + }; + + cargoHash = "sha256-tQk9WQZmaG2XEx5gocPhYd8fZ2cikvduhln5h/w+WZA="; + + __structuredAttrs = true; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + buildInputs = [ + openssl + ]; + + # the tranquil test suite has shown itself virtually impossible to complete on most hardware thus stopping reviews. + # disable the check phase for now + doCheck = false; + + meta = { + description = "Tranquil ATProto Personal Data Server implementation written in Rust"; + homepage = "https://tangled.org/tranquil.farm/tranquil-pds"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ nelind ]; + mainProgram = "tranquil-server"; + }; +}) From 6e51e9a041e66d04bc01cae4f7df159f9a85d785 Mon Sep 17 00:00:00 2001 From: nelind Date: Thu, 28 May 2026 23:13:28 +0200 Subject: [PATCH 43/64] tranquil-pds-frontend: init at 0.6.3 --- .../tr/tranquil-pds-frontend/package.nix | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/tr/tranquil-pds-frontend/package.nix diff --git a/pkgs/by-name/tr/tranquil-pds-frontend/package.nix b/pkgs/by-name/tr/tranquil-pds-frontend/package.nix new file mode 100644 index 000000000000..ced153fb08dd --- /dev/null +++ b/pkgs/by-name/tr/tranquil-pds-frontend/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenvNoCC, + fetchgit, + nodejs, + pnpm, + pnpmConfigHook, + fetchPnpmDeps, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tranquil-frontend"; + version = "0.6.3"; + + src = fetchgit { + url = "https://tangled.org/tranquil.farm/tranquil-pds"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TORNOFPlbCt4QWNd+bmxkShTUvT/5ynOj+UBYITAhg8="; + }; + sourceRoot = "${finalAttrs.src.name}/frontend"; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-qbmIAvE/3u/NB5x9bERCGQqwiDLkzjff3QchgR+ZDFs="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + pnpm + nodejs + pnpmConfigHook + ]; + + buildPhase = '' + runHook preBuild + pnpm build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -r ./dist $out + runHook postInstall + ''; + + meta = { + description = "First party frontend for the Tranquil PDS implementation"; + homepage = "https://tangled.org/tranquil.farm/tranquil-pds"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ nelind ]; + }; +}) From 564795482d23fccd39f39762ec2fa66ce7003c0d Mon Sep 17 00:00:00 2001 From: nelind Date: Thu, 28 May 2026 23:26:25 +0200 Subject: [PATCH 44/64] nixos/tranquil-pds: init module --- .../manual/release-notes/rl-2611.section.md | 2 +- nixos/modules/module-list.nix | 1 + .../services/web-apps/tranquil-pds.nix | 251 ++++++++++++++++++ 3 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/web-apps/tranquil-pds.nix diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 17f5f67082f9..f029f3e9032f 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -10,7 +10,7 @@ -- Create the first release note entry in this section! +- [tranquil](https://tangled.org/tranquil.farm/tranquil-pds) is an ATProto PDS (personal data server) implementation in Rust. A featureful, spec conscious and community driven alternative to the Bluesky reference implementation PDS. Available as [services.tranquil-pds](#opt-services.tranquil-pds.enable). ## Backward Incompatibilities {#sec-release-26.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c57b627e875c..0f210da5046d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1792,6 +1792,7 @@ ./services/web-apps/suwayomi-server.nix ./services/web-apps/szurubooru.nix ./services/web-apps/tabbyapi.nix + ./services/web-apps/tranquil-pds.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix ./services/web-apps/tuliprox.nix diff --git a/nixos/modules/services/web-apps/tranquil-pds.nix b/nixos/modules/services/web-apps/tranquil-pds.nix new file mode 100644 index 000000000000..b3a5b2fb6fdc --- /dev/null +++ b/nixos/modules/services/web-apps/tranquil-pds.nix @@ -0,0 +1,251 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.services.tranquil-pds; + + inherit (lib) types mkPackageOption mkOption; + + settingsFormat = pkgs.formats.toml { }; +in +{ + options.services.tranquil-pds = { + enable = lib.mkEnableOption "tranquil-pds AT Protocol personal data server"; + + package = mkPackageOption pkgs "tranquil-pds" { }; + + user = mkOption { + type = types.str; + default = "tranquil-pds"; + description = "User under which tranquil-pds runs"; + }; + + group = mkOption { + type = types.str; + default = "tranquil-pds"; + description = "Group under which tranquil-pds runs"; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/tranquil-pds"; + description = "Working directory for tranquil-pds. Also expected to be used for data (blobs)"; + }; + + environmentFiles = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + File to load environment variables from. Loaded variables override + values set in {option}`environment`. + + Use it to set values of `JWT_SECRET`, `DPOP_SECRET` and `MASTER_KEY`. + + Generate these with: + ``` + openssl rand -base64 48 + ``` + ''; + }; + + database.createLocally = mkOption { + type = types.bool; + default = false; + description = '' + Create the postgres database and user on the local host. + ''; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options = { + server = { + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Host for tranquil-pds to listen on"; + }; + + port = mkOption { + type = types.int; + default = 3000; + description = "Port for tranquil-pds to listen on"; + }; + + hostname = mkOption { + type = types.str; + default = ""; + example = "pds.example.com"; + description = "The public-facing hostname of the PDS"; + }; + + max_blob_size = mkOption { + type = types.int; + default = 10737418240; # 10 GiB + description = "Maximum allowed blob size in bytes."; + }; + }; + + frontend = { + enabled = + lib.mkEnableOption "serving the frontend from the backend. Disable to serve the frontend manually" + // { + default = true; + }; + + dir = mkPackageOption pkgs "tranquil-pds-frontend" { }; + }; + + storage = { + path = mkOption { + type = types.path; + default = "${cfg.dataDir}/blobs"; + defaultText = "\${cfg.dataDir}/blobs"; + description = "Directory for storing blobs"; + }; + }; + tranquil_store = { + data_dir = mkOption { + type = types.path; + default = "${cfg.dataDir}/store"; + defaultText = "\${cfg.dataDir}/store"; + description = "Directory for tranquil-store files"; + }; + }; + }; + }; + + description = '' + Configuration options to set for the service. Secrets should be + specified using {option}`environmentFile`. + + Refer to + for available configuration options. + ''; + }; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + (lib.mkIf cfg.database.createLocally { + services.postgresql = { + enable = true; + ensureDatabases = [ cfg.user ]; + ensureUsers = [ + { + name = cfg.user; + ensureDBOwnership = true; + } + ]; + }; + + services.tranquil-pds.settings.database.url = + lib.mkDefault "postgresql:///${cfg.user}?host=/run/postgresql"; + + systemd.services.tranquil-pds = { + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + }; + }) + + { + users.users.${cfg.user} = { + isSystemUser = true; + inherit (cfg) group; + home = cfg.dataDir; + }; + + users.groups.${cfg.group} = { }; + + systemd.tmpfiles.settings."tranquil-pds" = + lib.genAttrs + [ + cfg.dataDir + cfg.settings.storage.path + cfg.settings.tranquil_store.data_dir + ] + (_: { + d = { + mode = "0750"; + inherit (cfg) user group; + }; + }); + + environment.etc = { + "tranquil-pds/config.toml".source = + let + conf = settingsFormat.generate "tranquil-pds.toml" cfg.settings; + in + pkgs.runCommandLocal "validated-tranquil-config" { nativeBuildInputs = [ cfg.package ]; } '' + tranquil-server --config ${conf} validate --ignore-secrets + ln -s ${conf} $out + ''; + }; + + systemd.services.tranquil-pds = { + description = "Tranquil PDS - ATProtocol Personal Data Server"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + UMask = "0077"; + ExecStart = lib.getExe cfg.package; + Restart = "on-failure"; + RestartSec = 5; + + WorkingDirectory = cfg.dataDir; + StateDirectory = "tranquil-pds"; + ReadWritePaths = [ + cfg.settings.storage.path + ]; + + EnvironmentFile = cfg.environmentFiles; + + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + ProtectProc = "invisible"; + ProcSubset = "pid"; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + ]; + SystemCallArchitectures = "native"; + }; + }; + } + ] + ); + + meta.maintainers = with lib.maintainers; [ nelind ]; +} From 46a9ac2071509a64184bbbd90c4b5560eae8fd19 Mon Sep 17 00:00:00 2001 From: nelind Date: Thu, 28 May 2026 23:45:41 +0200 Subject: [PATCH 45/64] nixosTests.tranquil-pds: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/tranquil-pds.nix | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 nixos/tests/tranquil-pds.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f9ecf72845ed..f54b828b2f8b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1707,6 +1707,7 @@ in tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { }; traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix; trafficserver = runTest ./trafficserver.nix; + tranquil-pds = runTest ./tranquil-pds.nix; transfer-sh = runTest ./transfer-sh.nix; transmission_4 = runTest ./transmission.nix; trezord = runTest ./trezord.nix; diff --git a/nixos/tests/tranquil-pds.nix b/nixos/tests/tranquil-pds.nix new file mode 100644 index 000000000000..db24c899b858 --- /dev/null +++ b/nixos/tests/tranquil-pds.nix @@ -0,0 +1,35 @@ +{ lib, ... }: +{ + name = "tranquil-pds"; + + nodes.machine = + { pkgs, ... }: + { + services.tranquil-pds = { + enable = true; + database.createLocally = true; + + settings = { + server = { + hostname = "pds"; + port = 8080; + }; + + secrets = { + allow_insecure = true; + jwt_secret = "test-jwt-secret-must-be-32-chars-long"; + dpop_secret = "test-dpop-secret-must-be-32-chars-long"; + master_key = "test-master-key-must-be-32-chars-long"; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("tranquil-pds.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://localhost:8080") + ''; + + meta.maintainers = with lib.maintainers; [ nelind ]; +} From 0b8e37fa0f402d5f3abfacf250b64a774346104b Mon Sep 17 00:00:00 2001 From: nelind Date: Fri, 29 May 2026 00:22:59 +0200 Subject: [PATCH 46/64] tranquil-pds: add nixos test to passthru --- pkgs/by-name/tr/tranquil-pds/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/tr/tranquil-pds/package.nix b/pkgs/by-name/tr/tranquil-pds/package.nix index 8832b2768c8c..9d274810bc64 100644 --- a/pkgs/by-name/tr/tranquil-pds/package.nix +++ b/pkgs/by-name/tr/tranquil-pds/package.nix @@ -5,6 +5,7 @@ pkg-config, openssl, protobuf, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -34,6 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # disable the check phase for now doCheck = false; + passthru.tests = { inherit (nixosTests) tranquil-pds; }; + meta = { description = "Tranquil ATProto Personal Data Server implementation written in Rust"; homepage = "https://tangled.org/tranquil.farm/tranquil-pds"; From 942d62da1c83f10178362f315f849b067acdf4cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 13:38:44 +0000 Subject: [PATCH 47/64] neowall: 0.4.6 -> 0.4.7 --- pkgs/by-name/ne/neowall/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix index 01e133723568..fa02765dcdf6 100644 --- a/pkgs/by-name/ne/neowall/package.nix +++ b/pkgs/by-name/ne/neowall/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "neowall"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "1ay1"; repo = "neowall"; tag = "v${finalAttrs.version}"; - hash = "sha256-esI7m5V6ISpoXllLNjb52TdVMKel4FKOKPa40n3rofo="; + hash = "sha256-QtPxt0NS2u5DXNLT8XjBiPb2Jy73Pk2QO+itFCJ/9cU="; }; nativeBuildInputs = [ From 48edc9f66de785d7950be097172f70429708d604 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 30 May 2026 15:49:01 +0200 Subject: [PATCH 48/64] perlPackages.CryptX: 0.088 -> 0.089 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 78b55a3f2817..30978cf9c705 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7965,10 +7965,10 @@ with self; CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.088"; + version = "0.089"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.088.tar.gz"; - hash = "sha256-kUn4t0JjRWbpgbmUn7fZs/Qa7zbvBOziG1HPNRU8SUA="; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.089.tar.gz"; + hash = "sha256-8Od8few5ZxqFnzjfJdK/8wARvPVfLZ0PIMJrekR8n7Q="; }; meta = { description = "Cryptographic toolkit"; From 660bbd3662793e4ad5e7f5889d244803ebe6d86c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 14:10:13 +0000 Subject: [PATCH 49/64] git-branchless: 0.11.0 -> 0.11.1 --- pkgs/by-name/gi/git-branchless/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix index 2dda6ddcc832..9cf02b75ac7b 100644 --- a/pkgs/by-name/gi/git-branchless/package.nix +++ b/pkgs/by-name/gi/git-branchless/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-branchless"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${finalAttrs.version}"; - hash = "sha256-mxZLS39/QNDSR3RZsG17Sd+ses3IEqtbqIMASxOpzmo="; + hash = "sha256-V769kYbmUe6JtVoo83ejxUsegyiBh07tMYPVhJiFNgs="; }; - cargoHash = "sha256-bAZ0M3/RD3L+x0Xb+n6XPn0wRj+bQkoOmErSDuOHIRw="; + cargoHash = "sha256-5uygCOzPNqHjKJfq2LFTfaRT/N++/AY/PwlBJ8j8QwM="; nativeBuildInputs = [ pkg-config ]; From 7120192808393c57284df8fd54fbacf63139e834 Mon Sep 17 00:00:00 2001 From: whispers Date: Fri, 29 May 2026 14:27:36 -0400 Subject: [PATCH 50/64] libchamplain: remove libsoup 2.4 variant `libchamplain` has referred to the version that links to libsoup 2.4 by default, and has thus been marked insecure for quite some time. All of the (few) dependents support building with the libsoup 3 version, so we drop the insecure version entirely. --- .../{libchamplain => libchamplain_libsoup3}/package.nix | 8 +++----- pkgs/by-name/li/lifeograph/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/by-name/li/{libchamplain => libchamplain_libsoup3}/package.nix (91%) diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain_libsoup3/package.nix similarity index 91% rename from pkgs/by-name/li/libchamplain/package.nix rename to pkgs/by-name/li/libchamplain_libsoup3/package.nix index 547aa3902c56..0f1449b98c9a 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain_libsoup3/package.nix @@ -15,10 +15,8 @@ sqlite, gnome, clutter-gtk, - libsoup_2_4, libsoup_3, gobject-introspection, # , libmemphis - withLibsoup3 ? false, }: stdenv.mkDerivation rec { @@ -51,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite - (if withLibsoup3 then libsoup_3 else libsoup_2_4) + libsoup_3 ]; propagatedBuildInputs = [ @@ -64,7 +62,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform)) "-Dvapi=true" - (lib.mesonBool "libsoup3" withLibsoup3) + (lib.mesonBool "libsoup3" true) ]; passthru = { @@ -89,7 +87,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - teams = lib.optionals withLibsoup3 [ + teams = [ lib.teams.gnome lib.teams.pantheon ]; diff --git a/pkgs/by-name/li/lifeograph/package.nix b/pkgs/by-name/li/lifeograph/package.nix index 2e0d441dd900..5542cc8815ce 100644 --- a/pkgs/by-name/li/lifeograph/package.nix +++ b/pkgs/by-name/li/lifeograph/package.nix @@ -8,7 +8,7 @@ wrapGAppsHook4, enchant, gtkmm4, - libchamplain, + libchamplain_libsoup3, libgcrypt, shared-mime-info, libshumate, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt enchant gtkmm4 - (libchamplain.override { withLibsoup3 = true; }) + libchamplain_libsoup3 libshumate ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4c509b845b..5f135c716fcb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1108,6 +1108,7 @@ mapAliases { libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27 libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27 libcef = throw "'libcef' has been removed, as no packages depend on it"; # Added 2025-11-06 + libchamplain = throw "'libchamplain' has been removed due to reliance on insecure libsoup 2.4. Consider using 'libchamplain_libsoup3' instead"; # Added 2026-05-29 libdbiDrivers = warnAlias "'libdbiDrivers' has been renamed to 'libdbi-drivers'" libdbi-drivers; # Added 2026-02-08 libdbiDriversBase = warnAlias "'libdbiDriversBase' has been renamed to 'libdbi-drivers-base'" libdbi-drivers-base; # Added 2026-02-08 libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 830b6b0ce329..4ef70e0d4c57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6432,8 +6432,6 @@ with pkgs; else pkgs.libcanberra-gtk2; - libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; - libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { }; libdbi-drivers-base = libdbi-drivers.override { From cb65c8cae2edf1df502ff07d505503ee29afe56a Mon Sep 17 00:00:00 2001 From: whispers Date: Fri, 29 May 2026 22:22:29 -0400 Subject: [PATCH 51/64] librest: drop unused 0.8 release, rename from librest_1_0 `librest` in Nixpkgs currently refers to the old 0.8 release. The current release version is 0.10, which is in Nixpkgs as `librest_1_0` (since both needed to coexist for some time while dependents were migrated). Since the old librest version was dependent on insecure libraries (libsoup 2.4) and has no in-tree dependents, we drop it. We also rename `librest_1_0` to `librest`, as that's the most straightforward name, and migrate it to `pkgs/by-name` for cleanliness. --- doc/release-notes/rl-2611.section.md | 2 + pkgs/by-name/gn/gnome-maps/package.nix | 4 +- .../gn/gnome-online-accounts/package.nix | 4 +- pkgs/by-name/gr/grilo-plugins/package.nix | 4 +- pkgs/by-name/li/libgovirt/package.nix | 4 +- .../li/librest/package.nix} | 7 +- .../development/libraries/librest/default.nix | 77 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 9 files changed, 14 insertions(+), 93 deletions(-) rename pkgs/{development/libraries/librest/1.0.nix => by-name/li/librest/package.nix} (93%) delete mode 100644 pkgs/development/libraries/librest/default.nix diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 7aa7fd8f5b6c..b25956c13327 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,6 +15,8 @@ - `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree). +- `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. + ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index c44e9313cb15..6d57cc4ee73d 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -12,7 +12,7 @@ gtk4, gobject-introspection, gdk-pixbuf, - librest_1_0, + librest, libgweather, geoclue2, wrapGAppsHook4, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { libshumate libgweather libadwaita - librest_1_0 + librest libsecret libsoup_3 ]; diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 5057c8686831..f30a4e5074c3 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -13,7 +13,7 @@ json-glib, keyutils, libadwaita, - librest_1_0, + librest, libxml2, libsecret, gobject-introspection, @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { gvfs # OwnCloud, Google Drive json-glib libkrb5 - librest_1_0 + librest libxml2 libsecret libsoup_3 diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix index 2a42cab78ecf..9369fcda147d 100644 --- a/pkgs/by-name/gr/grilo-plugins/package.nix +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -14,7 +14,7 @@ libarchive, libdmapsharing, libsoup_3, - librest_1_0, + librest, gnome, libxml2, lua5_4, @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libarchive libdmapsharing libsoup_3 - librest_1_0 + librest gmime gom json-glib diff --git a/pkgs/by-name/li/libgovirt/package.nix b/pkgs/by-name/li/libgovirt/package.nix index 6fc3b73ee788..649c4f1149e4 100644 --- a/pkgs/by-name/li/libgovirt/package.nix +++ b/pkgs/by-name/li/libgovirt/package.nix @@ -8,7 +8,7 @@ gobject-introspection, ninja, glib, - librest_1_0, + librest, }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - librest_1_0 + librest ]; passthru = { diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/by-name/li/librest/package.nix similarity index 93% rename from pkgs/development/libraries/librest/1.0.nix rename to pkgs/by-name/li/librest/package.nix index 4510f999c27f..ea8ad63afad8 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/by-name/li/librest/package.nix @@ -14,7 +14,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librest"; version = "0.10.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/librest/${lib.versions.majorMinor version}/librest-${version}.tar.xz"; + url = "mirror://gnome/sources/librest/${lib.versions.majorMinor finalAttrs.version}/librest-${finalAttrs.version}.tar.xz"; sha256 = "e2y5Ers6Is+n3PAFkl3LYogwJNsMCQmUhufWhRGFybg="; }; @@ -64,7 +64,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "librest"; - attrPath = "librest_1_0"; versionPolicy = "odd-unstable"; }; }; @@ -76,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix deleted file mode 100644 index ac64dc7d13f9..000000000000 --- a/pkgs/development/libraries/librest/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - libsoup_2_4, - libxml2, - gobject-introspection, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_412, - gnome, -}: - -stdenv.mkDerivation rec { - pname = "rest"; - version = "0.8.1"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/rest/${lib.versions.majorMinor version}/rest-${version}.tar.xz"; - sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; - }; - - nativeBuildInputs = [ - pkg-config - gobject-introspection - ] - ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - ]; - - propagatedBuildInputs = [ - glib - libsoup_2_4 - libxml2 - ]; - - strictDeps = true; - - configureFlags = [ - (lib.enableFeature (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "gtk-doc") - # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. - "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" - ]; - - postPatch = '' - # pkg-config doesn't look in $PATH if strictDeps is on - substituteInPlace ./configure \ - --replace-fail 'have_gtk_doc=no' "echo gtk-doc is present" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "rest"; - attrPath = "librest"; - versionPolicy = "odd-unstable"; - freeze = true; - }; - }; - - meta = { - description = "Helper library for RESTful services"; - homepage = "https://gitlab.gnome.org/GNOME/librest"; - license = lib.licenses.lgpl21Only; - platforms = lib.platforms.unix; - teams = [ lib.teams.gnome ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4c509b845b..584fe653a6ba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1159,6 +1159,7 @@ mapAliases { libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30 libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30 libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30 + librest_1_0 = warnAlias "'librest_1_0' has been renamed to/replaced by 'librest'" librest; # Added 2026-05-30 librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27 librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27 libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b248a673f435..b067f3e88c53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2742,10 +2742,6 @@ with pkgs; libportal-qt5 = libportal.override { variant = "qt5"; }; libportal-qt6 = libportal.override { variant = "qt6"; }; - librest = callPackage ../development/libraries/librest { }; - - librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { }; - licensee = callPackage ../tools/package-management/licensee { }; linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { }; From 0b223c0f6d11cd3b990d90688627f02a6df6dfde Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 10:41:08 -0400 Subject: [PATCH 52/64] {johnny-reborn,johnny-reborn-engine}: move to by-name --- .../jo/johnny-reborn-engine/package.nix} | 0 .../with-data.nix => by-name/jo/johnny-reborn/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{applications/misc/johnny-reborn/default.nix => by-name/jo/johnny-reborn-engine/package.nix} (100%) rename pkgs/{applications/misc/johnny-reborn/with-data.nix => by-name/jo/johnny-reborn/package.nix} (100%) diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/by-name/jo/johnny-reborn-engine/package.nix similarity index 100% rename from pkgs/applications/misc/johnny-reborn/default.nix rename to pkgs/by-name/jo/johnny-reborn-engine/package.nix diff --git a/pkgs/applications/misc/johnny-reborn/with-data.nix b/pkgs/by-name/jo/johnny-reborn/package.nix similarity index 100% rename from pkgs/applications/misc/johnny-reborn/with-data.nix rename to pkgs/by-name/jo/johnny-reborn/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..bcba3700c1bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1353,10 +1353,6 @@ with pkgs; inherit lib udisks python3; }; - johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { }; - - johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { }; - ### APPLICATIONS/TERMINAL-EMULATORS mlterm-wayland = mlterm.override { From fc3ed109c13d46711b2ec9780f3053a21c7d51ff Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 10:46:06 -0400 Subject: [PATCH 53/64] {rxvt-unicode,rxvt-unicode-unwrapped}: move to by-name --- .../rx/rxvt-unicode-unwrapped/package.nix} | 0 .../rxvt-unicode-unwrapped}/patches/256-color-resources.patch | 0 .../rx/rxvt-unicode-unwrapped}/patches/9.06-font-width.patch | 0 .../rx/rxvt-unicode-unwrapped}/patches/makefile-phony.patch | 0 .../wrapper.nix => by-name/rx/rxvt-unicode/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 6 files changed, 4 deletions(-) rename pkgs/{applications/terminal-emulators/rxvt-unicode/default.nix => by-name/rx/rxvt-unicode-unwrapped/package.nix} (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode => by-name/rx/rxvt-unicode-unwrapped}/patches/256-color-resources.patch (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode => by-name/rx/rxvt-unicode-unwrapped}/patches/9.06-font-width.patch (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode => by-name/rx/rxvt-unicode-unwrapped}/patches/makefile-phony.patch (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode/wrapper.nix => by-name/rx/rxvt-unicode/package.nix} (100%) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/by-name/rx/rxvt-unicode-unwrapped/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/default.nix rename to pkgs/by-name/rx/rxvt-unicode-unwrapped/package.nix diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch b/pkgs/by-name/rx/rxvt-unicode-unwrapped/patches/256-color-resources.patch similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch rename to pkgs/by-name/rx/rxvt-unicode-unwrapped/patches/256-color-resources.patch diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch b/pkgs/by-name/rx/rxvt-unicode-unwrapped/patches/9.06-font-width.patch similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch rename to pkgs/by-name/rx/rxvt-unicode-unwrapped/patches/9.06-font-width.patch diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch b/pkgs/by-name/rx/rxvt-unicode-unwrapped/patches/makefile-phony.patch similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch rename to pkgs/by-name/rx/rxvt-unicode-unwrapped/patches/makefile-phony.patch diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/by-name/rx/rxvt-unicode/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix rename to pkgs/by-name/rx/rxvt-unicode/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..c08bece2c8f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1363,8 +1363,6 @@ with pkgs; enableX11 = false; }; - rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; - rxvt-unicode-emoji = rxvt-unicode.override { rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji; }; @@ -1375,8 +1373,6 @@ with pkgs; } ); - rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; - rxvt-unicode-unwrapped-emoji = rxvt-unicode-unwrapped.override { emojiSupport = true; }; From a2e905224c8db85037d7720854a0c3c141f3ea95 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 May 2026 10:33:53 -0500 Subject: [PATCH 54/64] firefox/wrapper: quote is-packaged-app path The unquoted $out/${libDir}/is-packaged-app path word-splits on applicationNames containing spaces (e.g. "Firefox Developer Edition"), breaking the Darwin build for firefox-devedition and similar variants. Regression from 1da3ca73732263dc0473f0d64ccdfa810eaa1fac. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 82996d28429a..149a3f13e54d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -413,7 +413,7 @@ let done # Disable update checks - touch $out/${libDir}/is-packaged-app + touch "$out/${libDir}/is-packaged-app" cd "$out" From a97d406096d5181c21db3d30f47a0123edf4de3f Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 11:34:16 -0400 Subject: [PATCH 55/64] autodock-vina: move to by-name --- .../default.nix => by-name/au/autodock-vina/package.nix} | 0 .../chemistry => by-name/au}/autodock-vina/python-bindings.nix | 0 pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/science/chemistry/autodock-vina/default.nix => by-name/au/autodock-vina/package.nix} (100%) rename pkgs/{applications/science/chemistry => by-name/au}/autodock-vina/python-bindings.nix (100%) diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/by-name/au/autodock-vina/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/autodock-vina/default.nix rename to pkgs/by-name/au/autodock-vina/package.nix diff --git a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/pkgs/by-name/au/autodock-vina/python-bindings.nix similarity index 100% rename from pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix rename to pkgs/by-name/au/autodock-vina/python-bindings.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..6f0f4456983b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10814,8 +10814,6 @@ with pkgs; scalapack = scalapack-ilp64; }; - autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { }; - pdb2pqr = with python3Packages; toPythonApplication pdb2pqr; quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe7934517d71..47db72e8d5be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21124,7 +21124,7 @@ self: super: with self; { vilfo-api-client = callPackage ../development/python-modules/vilfo-api-client { }; - vina = callPackage ../applications/science/chemistry/autodock-vina/python-bindings.nix { }; + vina = callPackage ../by-name/au/autodock-vina/python-bindings.nix { }; vincenty = callPackage ../development/python-modules/vincenty { }; From 7268f0cf39a750eb88971f671866e02af374f3b9 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 11:41:53 -0400 Subject: [PATCH 56/64] {arduino-core,arduino-core-unwrapped}: move to by-name --- .../ar/arduino-core-unwrapped}/downloads.nix | 0 .../ar/arduino-core-unwrapped/package.nix} | 0 .../chrootenv.nix => by-name/ar/arduino-core/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 4 files changed, 3 deletions(-) rename pkgs/{development/embedded/arduino/arduino-core => by-name/ar/arduino-core-unwrapped}/downloads.nix (100%) rename pkgs/{development/embedded/arduino/arduino-core/default.nix => by-name/ar/arduino-core-unwrapped/package.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-core/chrootenv.nix => by-name/ar/arduino-core/package.nix} (100%) diff --git a/pkgs/development/embedded/arduino/arduino-core/downloads.nix b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-core/downloads.nix rename to pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/by-name/ar/arduino-core-unwrapped/package.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-core/default.nix rename to pkgs/by-name/ar/arduino-core-unwrapped/package.nix diff --git a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix b/pkgs/by-name/ar/arduino-core/package.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-core/chrootenv.nix rename to pkgs/by-name/ar/arduino-core/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..f5cda6c4a233 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1415,9 +1415,6 @@ with pkgs; arduino = arduino-core.override { withGui = true; }; - arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; - arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; - arpack-mpi = arpack.override { useMpi = true; }; authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); From 69e62efb88ebb0fa3aeda9c2efa045df9513ecaf Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 11:56:50 -0400 Subject: [PATCH 57/64] rofi-pass: move to by-name --- .../pass/rofi-pass.nix => by-name/ro/rofi-pass/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{tools/security/pass/rofi-pass.nix => by-name/ro/rofi-pass/package.nix} (100%) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/by-name/ro/rofi-pass/package.nix similarity index 100% rename from pkgs/tools/security/pass/rofi-pass.nix rename to pkgs/by-name/ro/rofi-pass/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..fc5d3bfd12a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9814,7 +9814,6 @@ with pkgs; ; rke2 = rke2_stable; - rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; rofi-pass-wayland = rofi-pass.override { backend = "wayland"; }; From 52aa559ef3d1186497da48ee5e13ff6cf8097d47 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 12:21:54 -0400 Subject: [PATCH 58/64] collectd{,-data}: move to by-name --- .../data.nix => by-name/co/collectd-data/package.nix} | 0 .../collectd/default.nix => by-name/co/collectd/package.nix} | 0 pkgs/{tools/system => by-name/co}/collectd/plugins.nix | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 4 deletions(-) rename pkgs/{tools/system/collectd/data.nix => by-name/co/collectd-data/package.nix} (100%) rename pkgs/{tools/system/collectd/default.nix => by-name/co/collectd/package.nix} (100%) rename pkgs/{tools/system => by-name/co}/collectd/plugins.nix (100%) diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/by-name/co/collectd-data/package.nix similarity index 100% rename from pkgs/tools/system/collectd/data.nix rename to pkgs/by-name/co/collectd-data/package.nix diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/by-name/co/collectd/package.nix similarity index 100% rename from pkgs/tools/system/collectd/default.nix rename to pkgs/by-name/co/collectd/package.nix diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/by-name/co/collectd/plugins.nix similarity index 100% rename from pkgs/tools/system/collectd/plugins.nix rename to pkgs/by-name/co/collectd/plugins.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..2bdd3980bbed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1963,10 +1963,6 @@ with pkgs; enableWispr = false; }; - collectd = callPackage ../tools/system/collectd { }; - - collectd-data = callPackage ../tools/system/collectd/data.nix { }; - unify = with python3Packages; toPythonApplication unify; inherit (import ../development/libraries/libsbsms pkgs) From c9c32344ae6db87bf26a494db3a9c7be1b48980a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 30 May 2026 18:35:19 +0200 Subject: [PATCH 59/64] teams-for-linux: factor out electron pin --- pkgs/by-name/te/teams-for-linux/package.nix | 9 ++++++--- 1 file changed, 6 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 c22e64e47c21..d6c919d4c068 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -13,6 +13,9 @@ which, }: +let + electron = electron_41; +in buildNpmPackage rec { pname = "teams-for-linux"; version = "2.11.1"; @@ -46,7 +49,7 @@ buildNpmPackage rec { runHook preBuild electron_dist="$(mktemp -d)" - cp -r ${electron_41.dist}/. "$electron_dist" + cp -r ${electron.dist}/. "$electron_dist" chmod -R u+w "$electron_dist" npm exec electron-builder -- \ @@ -54,7 +57,7 @@ buildNpmPackage rec { -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ -c.electronDist="$electron_dist" \ - -c.electronVersion=${electron_41.version} \ + -c.electronVersion=${electron.version} \ -c.mac.identity=null runHook postBuild @@ -76,7 +79,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_41}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils From f755b8040636238fd91eb23e99f50917c6857b96 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 30 May 2026 18:35:33 +0200 Subject: [PATCH 60/64] winboat: factor out electron pin --- pkgs/by-name/wi/winboat/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/winboat/package.nix b/pkgs/by-name/wi/winboat/package.nix index c3d3efa6a501..b5e900bb92f6 100644 --- a/pkgs/by-name/wi/winboat/package.nix +++ b/pkgs/by-name/wi/winboat/package.nix @@ -16,6 +16,9 @@ nix-update-script, }: +let + electron = electron_40; +in buildNpmPackage (finalAttrs: { pname = "winboat"; version = "0.9.0"; @@ -59,8 +62,8 @@ buildNpmPackage (finalAttrs: { node scripts/build.ts npm exec electron-builder --linux -- \ --dir \ - -c.electronDist=${electron_40.dist} \ - -c.electronVersion=${electron_40.version} + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} ''; installPhase = '' @@ -81,7 +84,7 @@ buildNpmPackage (finalAttrs: { ln -sf $out/share/winboat/resources/data $out/share/winboat/data ln -sf $out/share/winboat/resources/guest_server $out/share/winboat/guest_server - makeWrapper ${electron_40}/bin/electron $out/bin/winboat \ + makeWrapper ${electron}/bin/electron $out/bin/winboat \ --add-flag "$out/share/winboat/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --suffix PATH : ${ From f79a944433c6086f6d418ab1382588623ab1f822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 16:59:13 +0000 Subject: [PATCH 61/64] uutils-coreutils-noprefix: 0.8.0 -> 0.9.0 --- pkgs/by-name/uu/uutils-coreutils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 7d41c40b9c72..97c4c1b90a42 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -21,13 +21,13 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux; stdenv.mkDerivation (finalAttrs: { pname = "uutils-coreutils"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; tag = finalAttrs.version; - hash = "sha256-nH0WtsVP1uwPvimpGnmWx5v0VButIFJu9K5wXsiC4cA="; + hash = "sha256-g+RuVQr7CNtF9eqEJb3dlgfgPO3aRwWgXWPniNmhXeA="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-FMTzMgXcAg9dk7dfYG7lTOHYJxN3YHjf0R96LS7W3FI="; + hash = "sha256-WoPqxO1TBt4eCOR3tlzuoXqH9u/mTHR5Dr/WnKLxyYM="; }; buildInputs = From 76fa7a983c807c4d5cfb631d17bfaa2eb515fadf Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 13:04:42 -0400 Subject: [PATCH 62/64] {firehol,iprange}: move to by-name --- .../networking => by-name/fi}/firehol/firehol-ping6.patch | 0 .../fi}/firehol/firehol-sysconfdir.patch | 0 .../fi}/firehol/firehol-uname-command.patch | 0 .../firehol/default.nix => by-name/fi/firehol/package.nix} | 0 .../firehol/iprange.nix => by-name/ip/iprange/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 6 files changed, 4 deletions(-) rename pkgs/{applications/networking => by-name/fi}/firehol/firehol-ping6.patch (100%) rename pkgs/{applications/networking => by-name/fi}/firehol/firehol-sysconfdir.patch (100%) rename pkgs/{applications/networking => by-name/fi}/firehol/firehol-uname-command.patch (100%) rename pkgs/{applications/networking/firehol/default.nix => by-name/fi/firehol/package.nix} (100%) rename pkgs/{applications/networking/firehol/iprange.nix => by-name/ip/iprange/package.nix} (100%) diff --git a/pkgs/applications/networking/firehol/firehol-ping6.patch b/pkgs/by-name/fi/firehol/firehol-ping6.patch similarity index 100% rename from pkgs/applications/networking/firehol/firehol-ping6.patch rename to pkgs/by-name/fi/firehol/firehol-ping6.patch diff --git a/pkgs/applications/networking/firehol/firehol-sysconfdir.patch b/pkgs/by-name/fi/firehol/firehol-sysconfdir.patch similarity index 100% rename from pkgs/applications/networking/firehol/firehol-sysconfdir.patch rename to pkgs/by-name/fi/firehol/firehol-sysconfdir.patch diff --git a/pkgs/applications/networking/firehol/firehol-uname-command.patch b/pkgs/by-name/fi/firehol/firehol-uname-command.patch similarity index 100% rename from pkgs/applications/networking/firehol/firehol-uname-command.patch rename to pkgs/by-name/fi/firehol/firehol-uname-command.patch diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/by-name/fi/firehol/package.nix similarity index 100% rename from pkgs/applications/networking/firehol/default.nix rename to pkgs/by-name/fi/firehol/package.nix diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/by-name/ip/iprange/package.nix similarity index 100% rename from pkgs/applications/networking/firehol/iprange.nix rename to pkgs/by-name/ip/iprange/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..2a45f25a0b4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,10 +2228,6 @@ with pkgs; buildProduct = "daemon"; }; - iprange = callPackage ../applications/networking/firehol/iprange.nix { }; - - firehol = callPackage ../applications/networking/firehol { }; - fluentd = callPackage ../tools/misc/fluentd { }; fpm = callPackage ../tools/package-management/fpm { }; From fefc9af5ddf3997b27f9e60b83a8a799145ca6c3 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 11:09:56 -0400 Subject: [PATCH 63/64] xdg-desktop-portal: move to by-name Co-authored-by: Jan Tojnar --- .../xd}/xdg-desktop-portal/fix-icon-validation.patch | 0 .../xd}/xdg-desktop-portal/fix-sound-validation.patch | 0 .../xd}/xdg-desktop-portal/installed-tests-path.patch | 0 .../xd}/xdg-desktop-portal/nix-pkgdatadir-env.patch | 0 .../default.nix => by-name/xd/xdg-desktop-portal/package.nix} | 3 ++- .../xd}/xdg-desktop-portal/trash-test.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/fix-icon-validation.patch (100%) rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/fix-sound-validation.patch (100%) rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/installed-tests-path.patch (100%) rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/nix-pkgdatadir-env.patch (100%) rename pkgs/{development/libraries/xdg-desktop-portal/default.nix => by-name/xd/xdg-desktop-portal/package.nix} (97%) rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/trash-test.patch (100%) diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/by-name/xd/xdg-desktop-portal/fix-icon-validation.patch similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch rename to pkgs/by-name/xd/xdg-desktop-portal/fix-icon-validation.patch diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/by-name/xd/xdg-desktop-portal/fix-sound-validation.patch similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch rename to pkgs/by-name/xd/xdg-desktop-portal/fix-sound-validation.patch diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch b/pkgs/by-name/xd/xdg-desktop-portal/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch rename to pkgs/by-name/xd/xdg-desktop-portal/installed-tests-path.patch diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch rename to pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/by-name/xd/xdg-desktop-portal/package.nix similarity index 97% rename from pkgs/development/libraries/xdg-desktop-portal/default.nix rename to pkgs/by-name/xd/xdg-desktop-portal/package.nix index 31c4fa4a8685..fc618622942a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal/package.nix @@ -28,6 +28,7 @@ gst_all_1, libgudev, umockdev, + zynaddsubfx, replaceVars, enableGeoLocation ? true, enableSystemd ? true, @@ -193,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { installedTests = nixosTests.installed-tests.xdg-desktop-portal; validate-icon = runCommand "test-icon-validation" { } '' - ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../by-name/zy/zynaddsubfx/ZynLogo.svg} > "$out" + ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${finalAttrs.src}/doc/website/favicon.svg > "$out" grep format=svg "$out" ''; }; diff --git a/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch b/pkgs/by-name/xd/xdg-desktop-portal/trash-test.patch similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal/trash-test.patch rename to pkgs/by-name/xd/xdg-desktop-portal/trash-test.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..9ad1eac1c4e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10292,8 +10292,6 @@ with pkgs; gbmSupport = true; }; - xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; - xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { From 5af0c6d30db3c0b2580d92fa635d37c71f652c5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 20:07:40 +0200 Subject: [PATCH 64/64] Revert "mediawiki: do not clear session cache on every start" --- .../me/mediawiki/keep-session-object-cache.diff | 13 ------------- pkgs/by-name/me/mediawiki/package.nix | 6 ------ 2 files changed, 19 deletions(-) delete mode 100644 pkgs/by-name/me/mediawiki/keep-session-object-cache.diff diff --git a/pkgs/by-name/me/mediawiki/keep-session-object-cache.diff b/pkgs/by-name/me/mediawiki/keep-session-object-cache.diff deleted file mode 100644 index 9d7f078b3ada..000000000000 --- a/pkgs/by-name/me/mediawiki/keep-session-object-cache.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/includes/Installer/DatabaseUpdater.php b/includes/Installer/DatabaseUpdater.php -index 8ed996b9dee..733a3210096 100644 ---- a/includes/Installer/DatabaseUpdater.php -+++ b/includes/Installer/DatabaseUpdater.php -@@ -1380,7 +1380,7 @@ public function purgeCache() { - // ObjectCache - $this->db->newDeleteQueryBuilder() - ->deleteFrom( 'objectcache' ) -- ->where( ISQLPlatform::ALL_ROWS ) -+ ->where( "keyname NOT LIKE '%:MWSession:%'" ) - ->caller( __METHOD__ ) - ->execute(); - diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 9d81a3ccb17b..137a750715aa 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -14,12 +14,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk="; }; - patches = [ - # NixOS runs the update script on every start as we might need to run some migrations. - # Normally this clears all active sessions, for usability we do not do that. - ./keep-session-object-cache.diff - ]; - postPatch = '' substituteInPlace includes/installer/CliInstaller.php \ --replace-fail '$vars = Installer::getExistingLocalSettings();' '$vars = null;'