From 161b844662461bec2a8348dc4750f45e7e1a79e3 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:58:21 +0530 Subject: [PATCH 01/10] kbdVlock: remove redundant pkgs in path Signed-off-by: phanirithvij (cherry picked from commit e7692596f2abf5d6a416be8d92d13bb72612e838) --- 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 af8a29ee7200..d7204ea8546b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2540,7 +2540,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 { }; @@ -11727,7 +11727,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 c3df325a3c63d286629d3a30ed8ad13801073487 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:55:09 +0530 Subject: [PATCH 02/10] rrsync: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit 61140bb1961ed610024769eef82061887d599608) --- .../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 d7204ea8546b..20e7fc3719a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9891,7 +9891,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 94aa1c85e90bc1fe0f70ff8be3e7f678d3526902 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:56:14 +0530 Subject: [PATCH 03/10] rsync: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit c99417ee25b457d6acb1bd6435a61f457aadd55a) --- .../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 20e7fc3719a0..76e878666d12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9890,8 +9890,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 d63f61466011c26bf206a77035ff2b4bf6148d0b Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 21:55:39 +0530 Subject: [PATCH 04/10] lysncd: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit f7b5010a15d0717d0fe64e0e382084fc90168f3a) --- .../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 76e878666d12..487e2fe6f431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2565,10 +2565,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 1211e26c99f08bb24eb58119b4a3578e193cd43d Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 22:19:08 +0530 Subject: [PATCH 05/10] syncthing: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit 2f2bab306e0ba4edd35ac66a47d5b5392376d07d) --- .../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 487e2fe6f431..4ef6a63dac23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9984,15 +9984,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 500de9e89c4fa9ed2bbebef76afc0635cd90d553 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 11 May 2026 23:51:38 +0530 Subject: [PATCH 06/10] snapcast: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit dc3e5a21f8123be69be5ce8cee480abbfd0906fa) --- .../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 4ef6a63dac23..09c85aeb5a19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3149,10 +3149,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 9c964793b04756f504effd936abbbb778dff12ac Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 12 May 2026 01:07:56 +0530 Subject: [PATCH 07/10] ladspaPlugins: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit 8fc99ff7a4ff7a01e8541358f8505b30b7d6652e) --- .../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 09c85aeb5a19..7d7d9d566c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9466,10 +9466,6 @@ with pkgs; callPackage ../applications/networking/cluster/helm/plugins { } ); - ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { - fftw = fftwSinglePrec; - }; - libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; From 80a36c0cd555f50ec48f08289fd9bf6729307909 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 12 May 2026 01:59:44 +0530 Subject: [PATCH 08/10] sail-riscv: migrate to by-name Signed-off-by: phanirithvij (cherry picked from commit b310447bfc91c12308f92176ec37a8fdd1dd9192) --- .../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 7d7d9d566c6d..b220447e0438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11559,10 +11559,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 8ac2eaa11d74c42d39054c4fe4f916167bdc6af6 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 12 May 2026 00:05:32 +0530 Subject: [PATCH 09/10] various: use finalAttrs Signed-off-by: phanirithvij (cherry picked from commit c01c964d048c188299ab37079e7cf4704aa98f09) --- 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 4fccc551cb06a091c061fe03a81c4d80db7a7c28 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 30 May 2026 16:05:41 +0530 Subject: [PATCH 10/10] makehuman: mark broken Signed-off-by: phanirithvij (cherry picked from commit ebb943a800310903ea8fc60bacdc99d732a343a3) --- 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 }; })