From 759703846973b5f488e16649cbe6d70b88303b29 Mon Sep 17 00:00:00 2001 From: James LaChance Date: Sat, 30 May 2026 17:40:55 -0400 Subject: [PATCH 01/42] maintainers: add FatBoyXPC --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 828801264652..279f5477ab65 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8719,6 +8719,13 @@ githubId = 345808; name = "Jakub OkoĊ„ski"; }; + FatBoyXPC = { + name = "FatBoyXPC"; + email = "fatboyxpc@gmail.com"; + github = "FatBoyXPC"; + githubId = 744962; + keys = [ { fingerprint = "0E08 1B81 CBCA 1CF7 9568 A13F C4ED 3CA2 3211 8969"; } ]; + }; faukah = { github = "faukah"; name = "faukah"; From 3303f8a08cce2cb90f4a68ff29fe27bc37c494b6 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Sun, 31 May 2026 19:54:37 +0200 Subject: [PATCH 02/42] srsran: various fixes - set structuredAttrs - adjust repo, since it got renamed - adjust variable name for parameter to enable lte rates - remove 5g from description, since these parts have been moved to OCUDU (another project) - add myself to maintainers, since I'd like to support maintaining this package --- pkgs/by-name/sr/srsran/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index a49abe56173f..1a9388f38d43 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -24,11 +24,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "srsran"; version = "25_10"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "srsran"; - repo = "srsran"; - rev = "release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + repo = "srsRAN_4G"; + tag = "release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "sha256-DwQ4u17m8D5RqX3OIYSyeE5+51sLah1qchRcwlX5i0A="; }; @@ -68,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_WERROR=OFF" - (lib.cmakeBool "ENABLE_LTE_RATES" enableLteRates) + (lib.cmakeBool "USE_LTE_RATES" enableLteRates) (lib.cmakeBool "ENABLE_AVX" enableAvx) (lib.cmakeBool "ENABLE_AVX2" enableAvx2) (lib.cmakeBool "ENABLE_FMA" enableFma) @@ -81,9 +82,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.srslte.com/"; - description = "Open-source 4G and 5G software radio suite"; + changelog = "https://github.com/srsran/srsRAN_4G/releases/tag/${finalAttrs.src.tag}"; + description = "Open-source 4G software radio suite, including complete LTE UE, eNodeB and EPC applications"; license = lib.licenses.agpl3Plus; - platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ hexagonal-sun ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + hexagonal-sun + felbinger + ]; }; }) From 9aaffcdb9cc988dbfeb03b17dfee82465d69faa9 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 30 Jun 2026 15:46:57 -0700 Subject: [PATCH 03/42] olm: modernize slightly Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/ol/olm/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ol/olm/package.nix b/pkgs/by-name/ol/olm/package.nix index 37ed67e9fb2f..0d0b15ee291a 100644 --- a/pkgs/by-name/ol/olm/package.nix +++ b/pkgs/by-name/ol/olm/package.nix @@ -5,16 +5,19 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "olm"; version = "3.2.16"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = "olm"; - rev = version; - sha256 = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; + tag = finalAttrs.version; + hash = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; }; nativeBuildInputs = [ cmake ]; @@ -94,4 +97,4 @@ stdenv.mkDerivation rec { '' ]; }; -} +}) From 1714e644cbaf094fe399730521b8004a575dbb0f Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Thu, 2 Jul 2026 22:21:04 +0200 Subject: [PATCH 04/42] stremio-linux-shell: fix update script git-updater doesn't update `cargoHash`. --- pkgs/by-name/st/stremio-linux-shell/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index c93dffdd91e9..6cafbeee84d2 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, versionCheckHook, - gitUpdater, + nix-update-script, # nativeBuildInputs pkg-config, @@ -93,7 +93,9 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; }; meta = { From bc1876eff09be5463913f1e08b1abb115fdf1ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lima?= Date: Sat, 4 Jul 2026 00:01:35 +0100 Subject: [PATCH 05/42] t3code: move to unwrapped.nix --- pkgs/by-name/t3/t3code/package.nix | 257 +-------------------------- pkgs/by-name/t3/t3code/unwrapped.nix | 256 ++++++++++++++++++++++++++ 2 files changed, 257 insertions(+), 256 deletions(-) create mode 100644 pkgs/by-name/t3/t3code/unwrapped.nix diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix index 835c397f59ca..e4079e00f828 100644 --- a/pkgs/by-name/t3/t3code/package.nix +++ b/pkgs/by-name/t3/t3code/package.nix @@ -1,256 +1 @@ -{ - cctools, - copyDesktopItems, - electron_41, - fetchFromGitHub, - installShellFiles, - lib, - libicns, - makeBinaryWrapper, - makeDesktopItem, - nix-update-script, - node-gyp, - nodejs, - python3, - stdenv, - writeDarwinBundle, - xcbuild, - fetchPnpmDeps, - pnpm_10, - pnpmConfigHook, - pnpmBuildHook, - cacert, - enableAzureDevOps ? false, - azure-cli, - azure-cli-extensions, - enableBitbucket ? false, - bitbucket-cli, - enableClaude ? false, - claude-code, - enableCodex ? true, - codex, - enableCursor ? false, - code-cursor, - enableCursorCli ? false, - cursor-cli, - enableGitHub ? true, - gh, - enableGit ? true, - git, - enableGitLab ? false, - glab, - enableJujutsu ? false, - jujutsu, - enableOpencode ? false, - opencode, -}: - -stdenv.mkDerivation ( - finalAttrs: - let - appName = "T3 Code (Alpha)"; - electron = electron_41; - pnpm = pnpm_10; - desktopIcon = - if stdenv.hostPlatform.isDarwin then - "assets/prod/black-macos-1024.png" - else - "assets/prod/black-universal-1024.png"; - - runtimePackages = - lib.optionals enableAzureDevOps [ - azure-cli.withExtensions - [ azure-cli-extensions.azure-devops ] - ] - ++ lib.optionals enableBitbucket [ bitbucket-cli ] - ++ lib.optionals enableClaude [ claude-code ] - ++ lib.optionals enableCodex [ codex ] - ++ lib.optionals enableCursor [ code-cursor ] - ++ lib.optionals enableCursorCli [ cursor-cli ] - ++ lib.optionals enableGitHub [ gh ] - ++ lib.optionals enableGit [ git ] - ++ lib.optionals enableGitLab [ glab ] - ++ lib.optionals enableJujutsu [ jujutsu ] - ++ lib.optionals enableOpencode [ opencode ]; - - runtimePathWrapperArgs = lib.optionalString (runtimePackages != [ ]) '' - \ - --prefix PATH : ${lib.makeBinPath runtimePackages} - ''; - in - { - pname = "t3code"; - version = "0.0.28"; - strictDeps = true; - __structuredAttrs = true; - - src = fetchFromGitHub { - owner = "pingdotgg"; - repo = "t3code"; - tag = "v${finalAttrs.version}"; - hash = "sha256-InVrw9L281QSSPrHSiZuivmb+FkYEd6FkHwHIAAxmGk="; - }; - - postPatch = '' - substituteInPlace apps/web/vite.config.ts \ - --replace-fail 'const host = process.env.HOST?.trim() || "localhost";' \ - 'const host = process.env.HOST?.trim() || "127.0.0.1";' - ''; - - nativeBuildInputs = [ - installShellFiles - makeBinaryWrapper - node-gyp - nodejs - python3 - pnpmConfigHook - pnpmBuildHook - pnpm - cacert - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools.libtool - libicns - writeDarwinBundle - xcbuild - ]; - - pnpmWorkspaces = [ - # `...` suffix is used to also include other workspace packages that are - # directly or indirectly depended on by the listed packages, such as - # `@t3tools/contracts` and `@t3tools/shared`. - "@t3tools/monorepo" - "t3..." - "@t3tools/desktop..." - "@t3tools/scripts..." - ]; - - pnpmDeps = fetchPnpmDeps { - inherit pnpm; - inherit (finalAttrs) - pname - version - src - pnpmWorkspaces - ; - - fetcherVersion = 4; - hash = "sha256-+JqW/iI0wdRPxyL7y6ggD/+AvwwZXs9+fSUtG/SgW9s="; - }; - - preBuild = '' - node scripts/update-release-package-versions.ts ${finalAttrs.version} - - export npm_config_nodedir=${nodejs} - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - # Exclude the `@t3tools/monorepo` workspace from the pending rebuild since - # `vp config` needs git - pnpm rebuild --pending "''${pnpmInstallFlags[@]}" --filter '!@t3tools/monorepo' - ''; - - pnpmBuildScript = "build:desktop"; - - postBuild = '' - pnpm vp cache clean - ''; - - # Many dependencies vendors many prebuilt native artifacts for non-host - # platforms, and some of those binaries are statically linked. Let fixup - # handle wrappers, shebangs, and stripping, but skip patchelf on the - # vendored tree. - dontPatchELF = true; - # The tmpdir audit hook also shells out to patchelf while scanning every - # vendored ELF for leaked build paths. That produces spurious warnings on - # some dependencies' static foreign-platform binaries. - noAuditTmpdir = true; - - installPhase = '' - runHook preInstall - - mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server - cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code - cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server - cp --recursive --no-preserve=mode \ - apps/desktop/{package.json,node_modules,dist-electron} \ - "$out"/libexec/t3code/apps/desktop - - mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources - install --mode=444 ${desktopIcon} \ - "$out"/libexec/t3code/apps/desktop/prod-resources/icon.png - - find "$out"/libexec/t3code -xtype l -delete - - makeWrapper ${lib.getExe nodejs} "$out"/bin/t3 \ - --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs ${runtimePathWrapperArgs} - - makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \ - --add-flags "$out"/libexec/t3code/apps/desktop \ - --inherit-argv0 ${runtimePathWrapperArgs} - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # node-pty tries to chmod this helper at runtime, but the Nix store is - # immutable by then. - find "$out"/libexec/t3code \ - -path '*/node-pty/prebuilds/darwin-*/spawn-helper' \ - -exec chmod 755 {} + - - mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources} - png2icns \ - "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \ - ${desktopIcon} - - # writeDarwinBundle is a shebangless bash script; run it explicitly via - # stdenv.shell to avoid Darwin's intermittent ENOEXEC fallback issues. - ${stdenv.shell} ${lib.getExe writeDarwinBundle} \ - "$out" "${appName}" t3code-desktop t3code - '' - + '' - mkdir --parents \ - "$out"/share/icons/hicolor/scalable/apps - install --mode=444 ${desktopIcon} \ - "$out"/share/icons/t3code.png - install --mode=444 assets/prod/logo.svg \ - "$out"/share/icons/hicolor/scalable/apps/t3code.svg - - runHook postInstall - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - for shell in bash fish zsh; do - installShellCompletion --cmd t3 --"$shell" <("$out/bin/t3" --completions "$shell") - done - ''; - - desktopItems = [ - (makeDesktopItem { - name = "t3code"; - desktopName = appName; - comment = "Minimal web GUI for coding agents"; - exec = "t3code-desktop %U"; - terminal = false; - icon = "t3code"; - startupWMClass = "t3code"; - categories = [ "Development" ]; - }) - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Minimal web GUI for coding agents"; - homepage = "https://t3.codes"; - downloadPage = "https://t3.codes/download"; - changelog = "https://github.com/pingdotgg/t3code/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - iamanaws - qweered - ]; - mainProgram = "t3code-desktop"; - inherit (nodejs.meta) platforms; - }; - } -) +import ./unwrapped.nix diff --git a/pkgs/by-name/t3/t3code/unwrapped.nix b/pkgs/by-name/t3/t3code/unwrapped.nix new file mode 100644 index 000000000000..835c397f59ca --- /dev/null +++ b/pkgs/by-name/t3/t3code/unwrapped.nix @@ -0,0 +1,256 @@ +{ + cctools, + copyDesktopItems, + electron_41, + fetchFromGitHub, + installShellFiles, + lib, + libicns, + makeBinaryWrapper, + makeDesktopItem, + nix-update-script, + node-gyp, + nodejs, + python3, + stdenv, + writeDarwinBundle, + xcbuild, + fetchPnpmDeps, + pnpm_10, + pnpmConfigHook, + pnpmBuildHook, + cacert, + enableAzureDevOps ? false, + azure-cli, + azure-cli-extensions, + enableBitbucket ? false, + bitbucket-cli, + enableClaude ? false, + claude-code, + enableCodex ? true, + codex, + enableCursor ? false, + code-cursor, + enableCursorCli ? false, + cursor-cli, + enableGitHub ? true, + gh, + enableGit ? true, + git, + enableGitLab ? false, + glab, + enableJujutsu ? false, + jujutsu, + enableOpencode ? false, + opencode, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + appName = "T3 Code (Alpha)"; + electron = electron_41; + pnpm = pnpm_10; + desktopIcon = + if stdenv.hostPlatform.isDarwin then + "assets/prod/black-macos-1024.png" + else + "assets/prod/black-universal-1024.png"; + + runtimePackages = + lib.optionals enableAzureDevOps [ + azure-cli.withExtensions + [ azure-cli-extensions.azure-devops ] + ] + ++ lib.optionals enableBitbucket [ bitbucket-cli ] + ++ lib.optionals enableClaude [ claude-code ] + ++ lib.optionals enableCodex [ codex ] + ++ lib.optionals enableCursor [ code-cursor ] + ++ lib.optionals enableCursorCli [ cursor-cli ] + ++ lib.optionals enableGitHub [ gh ] + ++ lib.optionals enableGit [ git ] + ++ lib.optionals enableGitLab [ glab ] + ++ lib.optionals enableJujutsu [ jujutsu ] + ++ lib.optionals enableOpencode [ opencode ]; + + runtimePathWrapperArgs = lib.optionalString (runtimePackages != [ ]) '' + \ + --prefix PATH : ${lib.makeBinPath runtimePackages} + ''; + in + { + pname = "t3code"; + version = "0.0.28"; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "pingdotgg"; + repo = "t3code"; + tag = "v${finalAttrs.version}"; + hash = "sha256-InVrw9L281QSSPrHSiZuivmb+FkYEd6FkHwHIAAxmGk="; + }; + + postPatch = '' + substituteInPlace apps/web/vite.config.ts \ + --replace-fail 'const host = process.env.HOST?.trim() || "localhost";' \ + 'const host = process.env.HOST?.trim() || "127.0.0.1";' + ''; + + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + node-gyp + nodejs + python3 + pnpmConfigHook + pnpmBuildHook + pnpm + cacert + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools.libtool + libicns + writeDarwinBundle + xcbuild + ]; + + pnpmWorkspaces = [ + # `...` suffix is used to also include other workspace packages that are + # directly or indirectly depended on by the listed packages, such as + # `@t3tools/contracts` and `@t3tools/shared`. + "@t3tools/monorepo" + "t3..." + "@t3tools/desktop..." + "@t3tools/scripts..." + ]; + + pnpmDeps = fetchPnpmDeps { + inherit pnpm; + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + + fetcherVersion = 4; + hash = "sha256-+JqW/iI0wdRPxyL7y6ggD/+AvwwZXs9+fSUtG/SgW9s="; + }; + + preBuild = '' + node scripts/update-release-package-versions.ts ${finalAttrs.version} + + export npm_config_nodedir=${nodejs} + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + # Exclude the `@t3tools/monorepo` workspace from the pending rebuild since + # `vp config` needs git + pnpm rebuild --pending "''${pnpmInstallFlags[@]}" --filter '!@t3tools/monorepo' + ''; + + pnpmBuildScript = "build:desktop"; + + postBuild = '' + pnpm vp cache clean + ''; + + # Many dependencies vendors many prebuilt native artifacts for non-host + # platforms, and some of those binaries are statically linked. Let fixup + # handle wrappers, shebangs, and stripping, but skip patchelf on the + # vendored tree. + dontPatchELF = true; + # The tmpdir audit hook also shells out to patchelf while scanning every + # vendored ELF for leaked build paths. That produces spurious warnings on + # some dependencies' static foreign-platform binaries. + noAuditTmpdir = true; + + installPhase = '' + runHook preInstall + + mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server + cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code + cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server + cp --recursive --no-preserve=mode \ + apps/desktop/{package.json,node_modules,dist-electron} \ + "$out"/libexec/t3code/apps/desktop + + mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources + install --mode=444 ${desktopIcon} \ + "$out"/libexec/t3code/apps/desktop/prod-resources/icon.png + + find "$out"/libexec/t3code -xtype l -delete + + makeWrapper ${lib.getExe nodejs} "$out"/bin/t3 \ + --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs ${runtimePathWrapperArgs} + + makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \ + --add-flags "$out"/libexec/t3code/apps/desktop \ + --inherit-argv0 ${runtimePathWrapperArgs} + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # node-pty tries to chmod this helper at runtime, but the Nix store is + # immutable by then. + find "$out"/libexec/t3code \ + -path '*/node-pty/prebuilds/darwin-*/spawn-helper' \ + -exec chmod 755 {} + + + mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources} + png2icns \ + "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \ + ${desktopIcon} + + # writeDarwinBundle is a shebangless bash script; run it explicitly via + # stdenv.shell to avoid Darwin's intermittent ENOEXEC fallback issues. + ${stdenv.shell} ${lib.getExe writeDarwinBundle} \ + "$out" "${appName}" t3code-desktop t3code + '' + + '' + mkdir --parents \ + "$out"/share/icons/hicolor/scalable/apps + install --mode=444 ${desktopIcon} \ + "$out"/share/icons/t3code.png + install --mode=444 assets/prod/logo.svg \ + "$out"/share/icons/hicolor/scalable/apps/t3code.svg + + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd t3 --"$shell" <("$out/bin/t3" --completions "$shell") + done + ''; + + desktopItems = [ + (makeDesktopItem { + name = "t3code"; + desktopName = appName; + comment = "Minimal web GUI for coding agents"; + exec = "t3code-desktop %U"; + terminal = false; + icon = "t3code"; + startupWMClass = "t3code"; + categories = [ "Development" ]; + }) + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Minimal web GUI for coding agents"; + homepage = "https://t3.codes"; + downloadPage = "https://t3.codes/download"; + changelog = "https://github.com/pingdotgg/t3code/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + iamanaws + qweered + ]; + mainProgram = "t3code-desktop"; + inherit (nodejs.meta) platforms; + }; + } +) From d9af9a4312052aa9b64522ff4cab50dede5530cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lima?= Date: Sat, 4 Jul 2026 00:06:12 +0100 Subject: [PATCH 06/42] t3code: split into standalone wrapper --- pkgs/by-name/t3/t3code/package.nix | 85 +++++++++++++++++++++++++++- pkgs/by-name/t3/t3code/unwrapped.nix | 54 +++--------------- 2 files changed, 91 insertions(+), 48 deletions(-) diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix index e4079e00f828..6352c9047ff7 100644 --- a/pkgs/by-name/t3/t3code/package.nix +++ b/pkgs/by-name/t3/t3code/package.nix @@ -1 +1,84 @@ -import ./unwrapped.nix +{ + lib, + callPackage, + symlinkJoin, + makeBinaryWrapper, + enableAzureDevOps ? false, + azure-cli, + azure-cli-extensions, + enableBitbucket ? false, + bitbucket-cli, + enableClaude ? false, + claude-code, + enableCodex ? true, + codex, + enableCursor ? false, + code-cursor, + enableCursorCli ? false, + cursor-cli, + enableGitHub ? true, + gh, + enableGit ? true, + git, + enableGitLab ? false, + glab, + enableJujutsu ? false, + jujutsu, + enableOpencode ? false, + opencode, + t3code-unwrapped ? callPackage ./unwrapped.nix { }, +}: + +let + runtimePackages = + lib.optionals enableAzureDevOps [ + (azure-cli.withExtensions [ azure-cli-extensions.azure-devops ]) + ] + ++ lib.optionals enableBitbucket [ bitbucket-cli ] + ++ lib.optionals enableClaude [ claude-code ] + ++ lib.optionals enableCodex [ codex ] + ++ lib.optionals enableCursor [ code-cursor ] + ++ lib.optionals enableCursorCli [ cursor-cli ] + ++ lib.optionals enableGitHub [ gh ] + ++ lib.optionals enableGit [ git ] + ++ lib.optionals enableGitLab [ glab ] + ++ lib.optionals enableJujutsu [ jujutsu ] + ++ lib.optionals enableOpencode [ opencode ]; + +in +symlinkJoin { + pname = "t3code"; + inherit (t3code-unwrapped) version; + __structuredAttrs = true; + strictDeps = true; + + paths = [ t3code-unwrapped ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = lib.optionalString (runtimePackages != [ ]) '' + for program in "$out/bin"/*; do + wrapProgram "$program" \ + --prefix PATH : "${lib.makeBinPath runtimePackages}" + done + ''; + + passthru = { + unwrapped = t3code-unwrapped; + } + // t3code-unwrapped.passthru; + + meta = { + # Manually inherit so that pos works + inherit (t3code-unwrapped.meta) + description + homepage + downloadPage + changelog + license + maintainers + mainProgram + platforms + ; + }; +} diff --git a/pkgs/by-name/t3/t3code/unwrapped.nix b/pkgs/by-name/t3/t3code/unwrapped.nix index 835c397f59ca..eddfbebb6874 100644 --- a/pkgs/by-name/t3/t3code/unwrapped.nix +++ b/pkgs/by-name/t3/t3code/unwrapped.nix @@ -20,29 +20,6 @@ pnpmConfigHook, pnpmBuildHook, cacert, - enableAzureDevOps ? false, - azure-cli, - azure-cli-extensions, - enableBitbucket ? false, - bitbucket-cli, - enableClaude ? false, - claude-code, - enableCodex ? true, - codex, - enableCursor ? false, - code-cursor, - enableCursorCli ? false, - cursor-cli, - enableGitHub ? true, - gh, - enableGit ? true, - git, - enableGitLab ? false, - glab, - enableJujutsu ? false, - jujutsu, - enableOpencode ? false, - opencode, }: stdenv.mkDerivation ( @@ -57,29 +34,9 @@ stdenv.mkDerivation ( else "assets/prod/black-universal-1024.png"; - runtimePackages = - lib.optionals enableAzureDevOps [ - azure-cli.withExtensions - [ azure-cli-extensions.azure-devops ] - ] - ++ lib.optionals enableBitbucket [ bitbucket-cli ] - ++ lib.optionals enableClaude [ claude-code ] - ++ lib.optionals enableCodex [ codex ] - ++ lib.optionals enableCursor [ code-cursor ] - ++ lib.optionals enableCursorCli [ cursor-cli ] - ++ lib.optionals enableGitHub [ gh ] - ++ lib.optionals enableGit [ git ] - ++ lib.optionals enableGitLab [ glab ] - ++ lib.optionals enableJujutsu [ jujutsu ] - ++ lib.optionals enableOpencode [ opencode ]; - - runtimePathWrapperArgs = lib.optionalString (runtimePackages != [ ]) '' - \ - --prefix PATH : ${lib.makeBinPath runtimePackages} - ''; in { - pname = "t3code"; + pname = "t3code-unwrapped"; version = "0.0.28"; strictDeps = true; __structuredAttrs = true; @@ -182,11 +139,11 @@ stdenv.mkDerivation ( find "$out"/libexec/t3code -xtype l -delete makeWrapper ${lib.getExe nodejs} "$out"/bin/t3 \ - --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs ${runtimePathWrapperArgs} + --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \ --add-flags "$out"/libexec/t3code/apps/desktop \ - --inherit-argv0 ${runtimePathWrapperArgs} + --inherit-argv0 '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # node-pty tries to chmod this helper at runtime, but the Nix store is @@ -236,7 +193,10 @@ stdenv.mkDerivation ( ]; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + attrPath = "t3code.unwrapped"; + extraArgs = [ "--use-github-releases" ]; + }; }; meta = { From 4bc82db07926f2d4eabb965461409f9208dc6c5f Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Thu, 2 Jul 2026 22:23:20 +0200 Subject: [PATCH 07/42] stremio-linux-shell: 1.0.2 -> 1.1.1 Changelog: - https://github.com/Stremio/stremio-linux-shell/releases/tag/v1.0.3 - https://github.com/Stremio/stremio-linux-shell/releases/tag/v1.1.0 - https://github.com/Stremio/stremio-linux-shell/releases/tag/v1.1.1 Diff: https://github.com/Stremio/stremio-linux-shell/compare/v1.0.2...v1.1.1 --- .../st/stremio-linux-shell/out-path.patch | 33 +++++++++++++++++++ .../st/stremio-linux-shell/package.nix | 17 +++++----- 2 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/st/stremio-linux-shell/out-path.patch diff --git a/pkgs/by-name/st/stremio-linux-shell/out-path.patch b/pkgs/by-name/st/stremio-linux-shell/out-path.patch new file mode 100644 index 000000000000..537098321f45 --- /dev/null +++ b/pkgs/by-name/st/stremio-linux-shell/out-path.patch @@ -0,0 +1,33 @@ +diff --git a/build.rs b/build.rs +index aa2bec5..f37a94d 100644 +--- a/build.rs ++++ b/build.rs +@@ -46,7 +46,7 @@ fn setup_po() -> Result<()> { + fn setup_schemas(filename: &str) -> Result<()> { + println!("cargo:rerun-if-changed={DATA_DIR}"); + +- let out_dir = dirs::data_dir().expect("Failed to get data dir"); ++ let out_dir = std::path::PathBuf::from("@out@/share"); + let out_dir = out_dir.join("glib-2.0/schemas"); + + fs::create_dir_all(&out_dir)?; +diff --git a/data/com.stremio.Stremio.service b/data/com.stremio.Stremio.service +index 7cfb139..7491969 100644 +--- a/data/com.stremio.Stremio.service ++++ b/data/com.stremio.Stremio.service +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=com.stremio.Stremio +-Exec=/app/bin/stremio --gapplication-service ++Exec=@out@/bin/stremio --gapplication-service +diff --git a/data/stremio.sh b/data/stremio.sh +index 161bada..37373b0 100644 +--- a/data/stremio.sh ++++ b/data/stremio.sh +@@ -5,4 +5,4 @@ if ls /dev/nvidia0 &>/dev/null 2>&1; then + export GSK_RENDERER=opengl + fi + +-exec /app/libexec/stremio/stremio "$@" +\ No newline at end of file ++exec @out@/libexec/stremio/stremio "$@" diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index 6cafbeee84d2..37de914a75a8 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stremio-linux-shell"; - version = "1.0.2"; + version = "1.1.1"; strictDeps = true; __structuredAttrs = true; @@ -35,17 +35,18 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Stremio"; repo = "stremio-linux-shell"; tag = "v${finalAttrs.version}"; - hash = "sha256-NbzUAv/L8xzdepqn677nlROumjlliZIHzPXIToHHeTU="; + hash = "sha256-L4axAO+Ky0QKC/WiGvpvSAsqld60znknxbSnSDCxPnY="; }; - cargoHash = "sha256-yafkD7D0E+lbFV7MlLwQM4iWC8Glo/Tn2F+TFff6GoM="; + cargoHash = "sha256-fI3HplELOl0EG8JIZYnPi9Nm0K1F7eA13gIsP3AKTjQ="; + + patches = [ + ./out-path.patch + ]; postPatch = '' - substituteInPlace data/com.stremio.Stremio.service \ - --replace-fail "Exec=/app/bin/stremio" "Exec=$out/bin/stremio" - - substituteInPlace data/stremio.sh \ - --replace-fail "/app/libexec/stremio/stremio" "$out/libexec/stremio/stremio" + substituteInPlace data/com.stremio.Stremio.service data/stremio.sh build.rs \ + --subst-var out ''; nativeBuildInputs = [ From 6effa7d92700d98234307f571c3cde2b8e632b2a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 4 Jul 2026 10:39:33 +0200 Subject: [PATCH 08/42] stremio-linux-shell: install more files to match upstream packaging https://github.com/Stremio/stremio-linux-shell/blob/v1.1.1/flatpak/com.stremio.Stremio.Devel.json --- pkgs/by-name/st/stremio-linux-shell/out-path.patch | 13 +++++++++++-- pkgs/by-name/st/stremio-linux-shell/package.nix | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stremio-linux-shell/out-path.patch b/pkgs/by-name/st/stremio-linux-shell/out-path.patch index 537098321f45..db60b233ce0b 100644 --- a/pkgs/by-name/st/stremio-linux-shell/out-path.patch +++ b/pkgs/by-name/st/stremio-linux-shell/out-path.patch @@ -1,13 +1,22 @@ diff --git a/build.rs b/build.rs -index aa2bec5..f37a94d 100644 +index aa2bec5..d512a42 100644 --- a/build.rs +++ b/build.rs +@@ -26,7 +26,7 @@ fn setup_po() -> Result<()> { + && extension == "po" + && let Some(po_lang) = path.file_stem() + { +- let mo_dir = po_dir.join(po_lang).join("LC_MESSAGES"); ++ let mo_dir = Path::new("@out@/share/locale").join(po_lang).join("LC_MESSAGES"); + + fs::create_dir_all(&mo_dir)?; + @@ -46,7 +46,7 @@ fn setup_po() -> Result<()> { fn setup_schemas(filename: &str) -> Result<()> { println!("cargo:rerun-if-changed={DATA_DIR}"); - let out_dir = dirs::data_dir().expect("Failed to get data dir"); -+ let out_dir = std::path::PathBuf::from("@out@/share"); ++ let out_dir = Path::new("@out@/share"); let out_dir = out_dir.join("glib-2.0/schemas"); fs::create_dir_all(&out_dir)?; diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index 37de914a75a8..a2cf7b934ba5 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -68,9 +68,11 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' install -Dm644 data/icons/com.stremio.Stremio.svg $out/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg install -Dm644 data/com.stremio.Stremio.desktop $out/share/applications/com.stremio.Stremio.desktop + install -Dm644 data/com.stremio.Stremio.metainfo.xml $out/share/metainfo/com.stremio.Stremio.metainfo.xml install -Dm644 data/com.stremio.Stremio.service $out/share/dbus-1/services/com.stremio.Stremio.service install -Dm644 data/server.js $out/libexec/stremio/server.js install -Dm755 data/stremio.sh $out/bin/stremio + install -Dm644 LICENSE $out/share/licenses/stremio/LICENSE mv $out/bin/stremio-linux-shell $out/libexec/stremio/stremio ''; From 6f0e650ffcf4184fba3d0ba1b430d600941d9060 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 4 Jul 2026 18:19:25 +0200 Subject: [PATCH 09/42] stremio-linux-shell: add fazzi to maintainers --- pkgs/by-name/st/stremio-linux-shell/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index a2cf7b934ba5..ac47e8e875dd 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -116,7 +116,10 @@ rustPlatform.buildRustPackage (finalAttrs: { fromSource obfuscatedCode # server.js ]; - maintainers = with lib.maintainers; [ thunze ]; + maintainers = with lib.maintainers; [ + thunze + fazzi + ]; platforms = lib.platforms.linux; mainProgram = "stremio"; }; From 0a7b18c226ae3f9be2b22dcbaf327b0baaf5e307 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 18 Jun 2026 15:38:54 +0200 Subject: [PATCH 10/42] sdrangel: 7.22.9 -> 7.27.1 --- pkgs/by-name/sd/sdrangel/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 203ac01b72c9..0f1c5c85557a 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -12,7 +12,6 @@ dsdcc, faad2, fetchFromGitHub, - fetchpatch, fftwFloat, flac, glew, @@ -43,23 +42,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.22.9"; + version = "7.27.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; tag = "v${finalAttrs.version}"; - hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k="; + hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM="; }; - patches = [ - # Fix build with Qt 6.10, remove when the commit reaches a release - (fetchpatch { - url = "https://github.com/f4exb/sdrangel/commit/fd6a8d51f8c39fd31b4e864f528bf1921ebd4260.patch"; - hash = "sha256-S8LQbCTEgyEt1wByDsDMqqyQjK5HALtvUIODgQ1skSA="; - }) - ]; - nativeBuildInputs = [ cmake ninja From 2749226cd3d799334d7fd8f03a791c4d6f890301 Mon Sep 17 00:00:00 2001 From: lenny Date: Mon, 6 Jul 2026 19:00:00 +0200 Subject: [PATCH 11/42] domoticz: 2024.7 -> 2026.2 Changelog: https://github.com/domoticz/domoticz/blob/2026.2/History.txt --- pkgs/by-name/do/domoticz/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index beeeafccb3a0..54656440834f 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -20,27 +20,21 @@ cereal, minizip, versionCheckHook, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2024.7"; + version = "2026.2"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; tag = finalAttrs.version; - hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; + hash = "sha256-WJDNnzjmQe9Ap5EqmXEgrglIbGcLRRFBJgAHDvzswzo="; + fetchSubmodules = true; }; - patches = [ - # Boost 1.87 compatibility, remove once upgraded to 2025.1 - (fetchpatch { - url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch"; - hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E="; - }) - ]; - buildInputs = [ openssl python3 @@ -91,6 +85,8 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Home automation system"; longDescription = '' @@ -105,8 +101,5 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin mainProgram = "domoticz"; - knownVulnerabilities = [ - "CVE-2026-1001" - ]; }; }) From c8a05c561584af9653ea597ec5c808e3655d6464 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Mon, 6 Jul 2026 22:36:20 +0200 Subject: [PATCH 12/42] stremio-linux-shell: 1.1.1 -> 1.1.2 Changelog: https://github.com/Stremio/stremio-linux-shell/releases/tag/v1.1.2 Diff: https://github.com/Stremio/stremio-linux-shell/compare/v1.1.1...v1.1.2 --- pkgs/by-name/st/stremio-linux-shell/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index ac47e8e875dd..4a44bf0861f5 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stremio-linux-shell"; - version = "1.1.1"; + version = "1.1.2"; strictDeps = true; __structuredAttrs = true; @@ -35,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Stremio"; repo = "stremio-linux-shell"; tag = "v${finalAttrs.version}"; - hash = "sha256-L4axAO+Ky0QKC/WiGvpvSAsqld60znknxbSnSDCxPnY="; + hash = "sha256-jo+9KDX/a46jPTmYhiFNgp5fDKhoAsML/+m7u3ituEQ="; }; - cargoHash = "sha256-fI3HplELOl0EG8JIZYnPi9Nm0K1F7eA13gIsP3AKTjQ="; + cargoHash = "sha256-hZ9neZD+aB7bth4UTsWJXIKGSbo/c3wZRtfOIp7LvwY="; patches = [ ./out-path.patch From 9e5da930fd1d65ada7bf1f645355d74be1814bdd Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 18 Jun 2026 15:39:38 +0200 Subject: [PATCH 13/42] ggmorse: init at 0.1.0-unstable-2024-05-31 --- pkgs/by-name/gg/ggmorse/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/gg/ggmorse/package.nix diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix new file mode 100644 index 000000000000..51a4ce819e28 --- /dev/null +++ b/pkgs/by-name/gg/ggmorse/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "ggmorse"; + version = "0.1.0-unstable-2024-05-31"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "ggmorse"; + rev = "8fb433d6cd6a71940f51b5724663ec0c75bf0b62"; + hash = "sha256-6GhyPhzNNAx1DSomfIfejbnLTckKa7/+VUZhSaGvGtI="; + }; + + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.0)" \ + "cmake_minimum_required (VERSION 3.5)" + ''; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "GGMORSE_BUILD_EXAMPLES" false) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Morse code decoding library"; + homepage = "https://github.com/ggerganov/ggmorse"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.unix; + }; +} From dded642635658d66aef7c0e9ba6064625de1875d Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 17:03:50 +0100 Subject: [PATCH 14/42] inmarsatc: init at 0-unstable-2023-07-10 --- pkgs/by-name/in/inmarsatc/package.nix | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/in/inmarsatc/package.nix diff --git a/pkgs/by-name/in/inmarsatc/package.nix b/pkgs/by-name/in/inmarsatc/package.nix new file mode 100644 index 000000000000..c1ff54c4e6b3 --- /dev/null +++ b/pkgs/by-name/in/inmarsatc/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "inmarsatc"; + version = "0-unstable-2023-07-10"; + + src = fetchFromGitHub { + owner = "cropinghigh"; + repo = "inmarsatc"; + rev = "cda1242e79981d71cd8608e971c8dbc691942b10"; + hash = "sha256-UCmdHR9bSr1x4G0OP7n+o6pdS1thTl9hzH7YMykSiGw="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "C++ library with functions to receive Inmarsat-C signals"; + homepage = "https://github.com/cropinghigh/inmarsatc"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.linux; + }; +} From 561238d5e8f17dbbff399ce7d2a874b73b61beb6 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 16:37:01 +0100 Subject: [PATCH 15/42] sdrangel: add more optional dependencies --- pkgs/by-name/sd/sdrangel/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 0f1c5c85557a..b7556ca17be5 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -14,13 +14,17 @@ fetchFromGitHub, fftwFloat, flac, + ggmorse, glew, hackrf, hidapi, ffmpeg, + inmarsatc, libiio, + libogg, libopus, libpulseaudio, + libunwind, libusb1, limesuite, libbladeRF, @@ -30,6 +34,7 @@ pkg-config, qt6, qt6Packages, + rnnoise, rtl-sdr, serialdv, sdrplay, @@ -71,13 +76,16 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg fftwFloat flac + ggmorse glew hackrf hidapi libbladeRF libiio + libogg libopus libpulseaudio + libunwind libusb1 limesuite mbelib @@ -93,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qttools qt6Packages.qtwebsockets qt6Packages.qtwebengine + rnnoise rtl-sdr serialdv sgp4 @@ -100,7 +109,10 @@ stdenv.mkDerivation (finalAttrs: { uhd zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + inmarsatc + qt6Packages.qtwayland + ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ From 836c3d1d225cfff4936b0ebc7d64ca79927b277e Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 16:38:49 +0100 Subject: [PATCH 16/42] sdrangel: various refactors - enable `__structuredAttrs` && `strictDeps` - use `lib.cmake{Bool,Feature}` in `cmakeFlags` - add `nix-update-script`, --- pkgs/by-name/sd/sdrangel/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index b7556ca17be5..a93b8ddab524 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -43,6 +43,7 @@ uhd, zlib, withSDRplay ? false, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -56,6 +57,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM="; }; + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ cmake ninja @@ -116,14 +120,16 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ - "-DAPT_DIR=${aptdec}" - "-DDAB_DIR=${dab_lib}" - "-DSGP4_DIR=${sgp4}" - "-DSOAPYSDR_DIR=${soapysdr-with-plugins}" + (lib.cmakeFeature "APT_DIR" aptdec.outPath) + (lib.cmakeFeature "DAB_DIR" dab_lib.outPath) + (lib.cmakeFeature "SGP4_DIR" sgp4.outPath) + (lib.cmakeFeature "SOAPYSDR_DIR" soapysdr-with-plugins.outPath) + (lib.cmakeBool "ENABLE_QT6" true) "-Wno-dev" - "-DENABLE_QT6=ON" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Software defined radio (SDR) software"; homepage = "https://github.com/f4exb/sdrangel"; From 679bd0b4a6f30d900ddb92c330b26f3d8cf52f8c Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 22:55:57 +0100 Subject: [PATCH 17/42] sdrangel: fix macOS build by disabling qtwebengine & libunwind --- pkgs/by-name/sd/sdrangel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index a93b8ddab524..4322a0d654e4 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { libogg libopus libpulseaudio - libunwind libusb1 limesuite mbelib @@ -104,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qtspeech qt6Packages.qttools qt6Packages.qtwebsockets - qt6Packages.qtwebengine rnnoise rtl-sdr serialdv @@ -115,7 +113,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inmarsatc + libunwind qt6Packages.qtwayland + qt6Packages.qtwebengine ] ++ lib.optionals withSDRplay [ sdrplay ]; From 91d7056e9e0442e5e571107f430b44a006b526ac Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 8 Jul 2026 14:12:33 -0700 Subject: [PATCH 18/42] shogun: move to by-name/ --- .../machine-learning => by-name/sh}/shogun/eigen-3.4.patch | 0 .../sh}/shogun/fix-virtual-destruction.patch | 0 .../shogun/default.nix => by-name/sh/shogun/package.nix} | 4 ++-- .../sh}/shogun/svmlight-scrubber.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/eigen-3.4.patch (100%) rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/fix-virtual-destruction.patch (100%) rename pkgs/{applications/science/machine-learning/shogun/default.nix => by-name/sh/shogun/package.nix} (99%) rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/svmlight-scrubber.patch (100%) diff --git a/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch b/pkgs/by-name/sh/shogun/eigen-3.4.patch similarity index 100% rename from pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch rename to pkgs/by-name/sh/shogun/eigen-3.4.patch diff --git a/pkgs/applications/science/machine-learning/shogun/fix-virtual-destruction.patch b/pkgs/by-name/sh/shogun/fix-virtual-destruction.patch similarity index 100% rename from pkgs/applications/science/machine-learning/shogun/fix-virtual-destruction.patch rename to pkgs/by-name/sh/shogun/fix-virtual-destruction.patch diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/by-name/sh/shogun/package.nix similarity index 99% rename from pkgs/applications/science/machine-learning/shogun/default.nix rename to pkgs/by-name/sh/shogun/package.nix index fae5f8a00782..e7ad0d79e559 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/by-name/sh/shogun/package.nix @@ -15,7 +15,7 @@ lapack, glpk, # data - protobuf, + protobuf_21, json_c, libxml2, hdf5, @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { blas lapack glpk - protobuf + protobuf_21 json_c libxml2 hdf5 diff --git a/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch b/pkgs/by-name/sh/shogun/svmlight-scrubber.patch similarity index 100% rename from pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch rename to pkgs/by-name/sh/shogun/svmlight-scrubber.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc70e4476e16..18917a22d016 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9245,10 +9245,6 @@ with pkgs; scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { }); - shogun = callPackage ../applications/science/machine-learning/shogun { - protobuf = protobuf_21; - }; - inherit ({ softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { }; From 99f89bb27f3865b200b358ce1818a5293e79437b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jul 2026 10:51:49 +0000 Subject: [PATCH 19/42] webex: 46.4.0.34752 -> 46.6.1.35236 --- pkgs/by-name/we/webex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index aef406ccd310..adaabe200cab 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "46.4.0.34752"; + version = "46.6.1.35236"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260422175501/Webex_ubuntu.7z"; - sha256 = "8b0711259237ae1009c05b012d44c5fc4e222005bf26d9ac1b84af063719d09a"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260625094602/Webex_ubuntu.7z"; + sha256 = "2420fda7e86883d53751c38a358dc61b3b9a731e20abda8b84dfcd367ecfc67f"; }; nativeBuildInputs = [ From 8c330b58b16d4eef57310d6961ffbbb944d45f4b Mon Sep 17 00:00:00 2001 From: lenny Date: Sat, 11 Jul 2026 19:00:00 +0200 Subject: [PATCH 20/42] domoticz: add lenny to maintainers --- pkgs/by-name/do/domoticz/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index 54656440834f..41be930bfcea 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -94,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: { various devices like: lights, switches, various sensors/meters like temperature, rain, wind, UV, electra, gas, water and much more ''; - maintainers = with lib.maintainers; [ edcragg ]; + maintainers = with lib.maintainers; [ + edcragg + lenny + ]; homepage = "https://www.domoticz.com/"; changelog = "https://github.com/domoticz/domoticz/blob/${finalAttrs.version}/History.txt"; license = lib.licenses.gpl3Plus; From 46b1cdbb83904c613d396dcadc16cd82da3fdccc Mon Sep 17 00:00:00 2001 From: lenny Date: Sat, 11 Jul 2026 19:00:00 +0200 Subject: [PATCH 21/42] domoticz: Add release note about breaking changes since 2024.7 --- doc/release-notes/rl-2611.section.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 70c235970e54..f1ddbef73936 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -74,6 +74,7 @@ - Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds. - `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2). - `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10). +- `domoticz` has been updated from `2024.7` to `2026.x`, breaking third party applications and scripts using the old RType calls. Review the [release notes](https://github.com/domoticz/domoticz/blob/2026.2/History.txt#L398) for more information. ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} From 3bade317fdc455e5d4aa4e894fd8bea40eceba53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jul 2026 10:59:10 +0000 Subject: [PATCH 22/42] astal.source: 0-unstable-2026-06-21 -> 0-unstable-2026-07-03 --- pkgs/development/libraries/astal/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index 7e51dc43b61e..f1f35969bd49 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -7,15 +7,15 @@ let originalDrv = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "11842ae3045c1367fb3a62a2302dba0d9ccb4a33"; - hash = "sha256-FGZHls4eQJ8y3pvf5h3b83PfXlve3vD/Gj3g1qoAK6o="; + rev = "04454c22094401cc8e682cfe1f8ecc3194cac5f9"; + hash = "sha256-bXd034/ARs18ZQ7hWUAw9NwyfBmcKQws8DQHzwYp6jM="; }; in originalDrv.overrideAttrs ( final: prev: { name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name pname = "astal-source"; - version = "0-unstable-2026-06-21"; + version = "0-unstable-2026-07-03"; meta = prev.meta // { description = "Building blocks for creating custom desktop shells (source)"; From 66707db40b8d28851e439bea3d2be9dc92d6dcff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jul 2026 14:40:57 +0000 Subject: [PATCH 23/42] skills: 1.5.14 -> 1.5.16 --- pkgs/by-name/sk/skills/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index ab66664bd318..5be0cecd7181 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -14,20 +14,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "skills"; - version = "1.5.14"; + version = "1.5.16"; src = fetchFromGitHub { owner = "vercel-labs"; repo = "skills"; tag = "v${finalAttrs.version}"; - hash = "sha256-176EeM1VhNSBH1cYUUy3oLST21PbV0v+tCNglfM9+6Y="; + hash = "sha256-gL8uNkS3gsRGXIunIsYLYykLYs2c1gO9PFVTE69nWKU="; }; pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; inherit pnpm; - hash = "sha256-3GSa4ze859dRA4Yrxw8r3rwZKn7FMSjBMvpz1HTDobU="; + hash = "sha256-wntHp5UT21wD1myxj8EQafQis5QMuQ9U2PKiKg2jalw="; }; nativeBuildInputs = [ From ec457e97c96e0c307aff1160fb7cbef5c6a019ae Mon Sep 17 00:00:00 2001 From: wrench-exile-legacy Date: Sun, 12 Jul 2026 23:32:10 +0100 Subject: [PATCH 24/42] oh-my-posh: 29.20.0 -> 29.26.1 Diff: https://github.com/jandedobbeleer/oh-my-posh/compare/v29.20.0...v29.26.1 Changelog: https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v29.26.1 --- pkgs/by-name/oh/oh-my-posh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 0999756f48aa..87ea74ede309 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "oh-my-posh"; - version = "29.20.0"; + version = "29.26.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "oh-my-posh"; tag = "v${finalAttrs.version}"; - hash = "sha256-EzdrqeWM85hh8lPxrweSPezydICRFyOStgDlEq8g9+8="; + hash = "sha256-hE3L7emTk7MxzBUqSUDNKYiA2H1w9mcGhPYiR1OhYxg="; }; - vendorHash = "sha256-PAdk6nf750wL619W6nyt1Ne/eYYlVkewIhWirNi9rK8="; + vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ="; sourceRoot = "${finalAttrs.src.name}/src"; From 9a57e7f8313cf9c91f39c26a568bb150fcd33801 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Wed, 3 Jun 2026 07:49:48 -0500 Subject: [PATCH 25/42] openrct2: add `__structuredAttrs` and `strictDeps` attributes --- pkgs/by-name/op/openrct2/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index 96713155bebd..b0d3f000e098 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "openrct2"; version = "0.5.3"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; From 742c9ebf778df7e1ab66a5f55d18fe8e603b4c87 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Wed, 3 Jun 2026 07:50:34 -0500 Subject: [PATCH 26/42] openrct2: add `zstd` to `buildInputs` --- pkgs/by-name/op/openrct2/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index b0d3f000e098..309dffad52ec 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -32,6 +32,7 @@ speexdsp, versionCheckHook, zlib, + zstd, withDiscordRpc ? false, # Paths to RCT1 and RCT2 installs can be specified to have them added as a wrapped argument @@ -107,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { openssl speexdsp zlib + zstd ] ++ lib.optional withDiscordRpc discord-rpc; From 70143e77b975d5dd6b9910841bad7bb1e88e86ab Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Wed, 3 Jun 2026 07:52:24 -0500 Subject: [PATCH 27/42] openrct2: remove patch (issue fixed upstream) --- pkgs/by-name/op/openrct2/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index 309dffad52ec..be286fd2d175 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -128,12 +128,6 @@ stdenv.mkDerivation (finalAttrs: { unzip -o ${title-sequences} -d $sourceRoot/data/sequence ''; - # Fix blank changelog & contributors screen. See https://github.com/OpenRCT2/OpenRCT2/issues/16988 - postPatch = '' - substituteInPlace src/openrct2/platform/Platform.Linux.cpp \ - --replace-fail "/usr/share/doc/openrct2" "$out/share/doc/openrct2" - ''; - preConfigure = # Verify that the correct version of each third party repository is used. ( From 8e636ef9bd8f593ffa3973e61c4678024dbafe7c Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Wed, 3 Jun 2026 07:54:06 -0500 Subject: [PATCH 28/42] openrct2: refactor assets for `overrideAttrs` support --- pkgs/by-name/op/openrct2/package.nix | 77 ++++++++++++++-------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index be286fd2d175..0d783b61fa38 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -40,29 +40,6 @@ rct2Path ? null, }: -let - objects-version = "1.7.10"; - openmusic-version = "1.6.1"; - opensfx-version = "1.0.6"; - title-sequences-version = "0.4.26"; - - objects = fetchurl { - url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip"; - hash = "sha256-9IO+Jm3CIHe6hRe78y/+OIw1Q7LuWF4K+9QQLbRSgCE="; - }; - openmusic = fetchurl { - url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmusic-version}/openmusic.zip"; - hash = "sha256-mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE="; - }; - opensfx = fetchurl { - url = "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${opensfx-version}/opensound.zip"; - hash = "sha256-BrkPPhnCFnUt9EHVUbJqnj4bp3Vb3SECUEtzv5k2CL4="; - }; - title-sequences = fetchurl { - url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${title-sequences-version}/title-sequences.zip"; - hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg="; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "openrct2"; version = "0.5.3"; @@ -77,6 +54,34 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-my7fPBD5N0bO1yPaxwHUFqw6TvayQs10kcAX/NqPpIg="; }; + passthru = { + updateScript = ./update.sh; + + objects-version = "1.7.10"; + openmusic-version = "1.6.1"; + opensfx-version = "1.0.6"; + title-sequences-version = "0.4.26"; + + assets = { + objects = fetchurl { + url = "https://github.com/OpenRCT2/objects/releases/download/v${finalAttrs.passthru.objects-version}/objects.zip"; + hash = "sha256-9IO+Jm3CIHe6hRe78y/+OIw1Q7LuWF4K+9QQLbRSgCE="; + }; + openmusic = fetchurl { + url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${finalAttrs.passthru.openmusic-version}/openmusic.zip"; + hash = "sha256-mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE="; + }; + opensfx = fetchurl { + url = "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${finalAttrs.passthru.opensfx-version}/opensound.zip"; + hash = "sha256-BrkPPhnCFnUt9EHVUbJqnj4bp3Vb3SECUEtzv5k2CL4="; + }; + title-sequences = fetchurl { + url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${finalAttrs.passthru.title-sequences-version}/title-sequences.zip"; + hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg="; + }; + }; + }; + nativeBuildInputs = [ cmake pkg-config @@ -122,25 +127,21 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' mkdir -p $sourceRoot/data/{object,sequence} - unzip -o ${objects} -d $sourceRoot/data/object - unzip -o ${openmusic} -d $sourceRoot/data - unzip -o ${opensfx} -d $sourceRoot/data - unzip -o ${title-sequences} -d $sourceRoot/data/sequence + unzip -o ${finalAttrs.passthru.assets.objects} -d $sourceRoot/data/object + unzip -o ${finalAttrs.passthru.assets.openmusic} -d $sourceRoot/data + unzip -o ${finalAttrs.passthru.assets.opensfx} -d $sourceRoot/data + unzip -o ${finalAttrs.passthru.assets.title-sequences} -d $sourceRoot/data/sequence ''; preConfigure = # Verify that the correct version of each third party repository is used. ( - let - versionCheck = assetKey: url: '' - grep -qF '"${url}"' assets.json \ - || (echo "${assetKey} differs from expected version!"; exit 1) - ''; - in - (versionCheck "objects" objects.url) - + (versionCheck "openmusic" openmusic.url) - + (versionCheck "opensfx" opensfx.url) - + (versionCheck "title-sequences" title-sequences.url) + lib.concatStringsSep "\n" ( + lib.mapAttrsToList (assetName: asset: '' + grep -qF '"${asset.url}"' assets.json \ + || (echo "${assetName} differs from expected version!"; exit 1) + '') finalAttrs.passthru.assets + ) ); doInstallCheck = true; @@ -151,8 +152,6 @@ stdenv.mkDerivation (finalAttrs: { ${lib.optionalString (rct2Path != null) "--add-flags '--rct2-data-path=\"${rct2Path}\"'"} ''; - passthru.updateScript = ./update.sh; - meta = { description = "Open source re-implementation of RollerCoaster Tycoon 2"; longDescription = '' From 66b8bf79bd973f2024299b6113f2cf01806bf961 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Wed, 3 Jun 2026 07:55:34 -0500 Subject: [PATCH 29/42] openrct2: add `verifyAssets` argument for disabling asset version checks --- pkgs/by-name/op/openrct2/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index 0d783b61fa38..793a766a5e48 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -35,6 +35,7 @@ zstd, withDiscordRpc ? false, + verifyAssets ? true, # Paths to RCT1 and RCT2 installs can be specified to have them added as a wrapped argument rct1Path ? null, rct2Path ? null, @@ -135,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = # Verify that the correct version of each third party repository is used. - ( + lib.optionalString verifyAssets ( lib.concatStringsSep "\n" ( lib.mapAttrsToList (assetName: asset: '' grep -qF '"${asset.url}"' assets.json \ From 9b7cb71122aca97ef5108ab41728ffe374fe7819 Mon Sep 17 00:00:00 2001 From: eymeric Date: Mon, 13 Jul 2026 09:14:35 +0700 Subject: [PATCH 30/42] cockpit-zfs: 1.2.27-3 -> 1.2.30 --- pkgs/by-name/co/cockpit-zfs/package.nix | 14 ++++---------- .../by-name/co/cockpit-zfs/yarn-4.14-support.patch | 11 ----------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch diff --git a/pkgs/by-name/co/cockpit-zfs/package.nix b/pkgs/by-name/co/cockpit-zfs/package.nix index 99de320d99f9..5ead4c6b4786 100644 --- a/pkgs/by-name/co/cockpit-zfs/package.nix +++ b/pkgs/by-name/co/cockpit-zfs/package.nix @@ -46,28 +46,22 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit-zfs"; - version = "1.2.27-3"; + version = "1.2.30"; src = fetchFromGitHub { owner = "45Drives"; repo = "cockpit-zfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-7hx9FJxFN7xsozMvAb0fdRTX2hAcxtJc5wdgrs2PGJc="; + hash = "sha256-G24xNoKoBnlXxxyo9IJIoQW3PrktQxsx37/cX6QYfyE="; }; - patches = [ - # Remove after upstream updates to Yarn 4.14 - # https://github.com/45Drives/cockpit-zfs/blob/main/package.json#L13 - ./yarn-4.14-support.patch - ]; - missingHashes = ./missing-hashes.json; # Use buildPackages for cross-compilation support offlineCache = yarnBerryForBuild.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-Tdxe5bXN9psSrnUXL1f+1nh4WPzuvOI7j0I+VPU2/1s="; + inherit (finalAttrs) src missingHashes; + hash = "sha256-nm3iHf9Rm5JFKzH0HAvglkQPFIV6Fl1e9WvNdqevTug="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch b/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch deleted file mode 100644 index 2d23ed3e118c..000000000000 --- a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,6 +2,6 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10c0 - From ff7e147c187796bedbe06610a14bca5df5b9e190 Mon Sep 17 00:00:00 2001 From: James LaChance Date: Sat, 30 May 2026 17:01:03 -0400 Subject: [PATCH 31/42] zsh-artisan: init at 0-unstable-2015-12-08 --- pkgs/by-name/zs/zsh-artisan/package.nix | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/zs/zsh-artisan/package.nix diff --git a/pkgs/by-name/zs/zsh-artisan/package.nix b/pkgs/by-name/zs/zsh-artisan/package.nix new file mode 100644 index 000000000000..06ffdad5966d --- /dev/null +++ b/pkgs/by-name/zs/zsh-artisan/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation { + pname = "zsh-artisan"; + version = "0-unstable-2025-12-08"; + + src = fetchFromGitHub { + owner = "jessarcher"; + repo = "zsh-artisan"; + rev = "4063d53fd310f715c7a8fb7d4e133812ef0b3128"; + hash = "sha256-O0Tn9zQWR0i7UWJ9VtOvxjqpqz9Sj7aKogdHZSOATC0="; + }; + + __structuredAttrs = true; + strictDeps = true; + installPhase = '' + runHook preInstall + + install -D artisan.plugin.zsh --target-directory=$out/share/zsh-artisan + + runHook postInstall + ''; + + meta = { + description = "Laravel artisan plugin for zsh"; + longDescription = '' + Laravel artisan plugin for zsh to help you to run artisan from anywhere in the project tree, + with auto-completion, and it can automatically open files created by artisan! + ''; + homepage = "https://github.com/jessarcher/zsh-artisan"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.FatBoyXPC ]; + }; +} From edd245e447c67603743e7435b76bc8f0bc83f790 Mon Sep 17 00:00:00 2001 From: Mario <191101255+wariuccio@users.noreply.github.com> Date: Mon, 13 Jul 2026 08:22:09 +0100 Subject: [PATCH 32/42] zs: 0.4.1 -> 0.4.5 --- pkgs/by-name/zs/zs/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix index 1a07ada5be0d..1e4e4c56dab6 100644 --- a/pkgs/by-name/zs/zs/package.nix +++ b/pkgs/by-name/zs/zs/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "zs"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitea { domain = "git.mills.io"; owner = "prologic"; repo = "zs"; rev = finalAttrs.version; - hash = "sha256-V8+p19kvVh64yCreNVp4RVdkJkjrq8Q5VbjaJWekZHY="; + hash = "sha256-NYnr0s730u4ICppPVZAAHB753XVooZtSSKIAp+z98Gw="; }; - vendorHash = "sha256-KXcYTYO4wnWOup5uJ6T+XwthX5l2FL02JyOt1Nv51Sg="; + vendorHash = "sha256-21UukhXVVj1AO+HlTlEpHkf5zLHA6dapjrOriVQd1jM="; ldflags = [ "-w" @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { homepage = "https://git.mills.io/prologic/zs"; changelog = "https://git.mills.io/prologic/zs/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ wariuccio ]; mainProgram = "zs"; }; }) From a9fc3ca5506234f5b54e612faf71c1397ecaa260 Mon Sep 17 00:00:00 2001 From: Holiu618 <165534185+Holiu618@users.noreply.github.com> Date: Mon, 13 Jul 2026 16:51:08 +0800 Subject: [PATCH 33/42] git-spice: 0.30.1 -> 0.31.0 --- pkgs/by-name/gi/git-spice/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index fa9e5daae8a0..60e201062113 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-zqHTbsK/vIeNKfvIH8funMLD0ehercVkufIYcRZ7VD0="; + hash = "sha256-3VHT9/oCQaySWPAfnZYRxSsKCz8S8As685V3wvpqip8="; }; - vendorHash = "sha256-dCAgnfnwDudTUsQE/RapWslnz/MtefdlzqneRbWrLmc="; + vendorHash = "sha256-xcU0B+ju1f/JfNVKpXkIy5SO9rd3O9Nl0FizW3kVgI0="; subPackages = [ "." ]; @@ -31,7 +31,6 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" - "-w" "-X=main._version=${finalAttrs.version}" ]; From e518df93df50ff46071e787a32271c5b890ec9c0 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 13 Jul 2026 14:23:33 +0300 Subject: [PATCH 34/42] plezy: 2.8.0 -> 2.9.1 --- pkgs/by-name/pl/plezy/git-hashes.json | 8 +- pkgs/by-name/pl/plezy/package.nix | 14 +-- pkgs/by-name/pl/plezy/pubspec.lock.json | 86 +++++++++++-------- .../pl/plezy/replace-sentry-fork.patch | 32 ------- pkgs/by-name/pl/plezy/update.sh | 16 +--- 5 files changed, 61 insertions(+), 95 deletions(-) delete mode 100644 pkgs/by-name/pl/plezy/replace-sentry-fork.patch diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json index af3ee856e9f5..ff287f73ce93 100644 --- a/pkgs/by-name/pl/plezy/git-hashes.json +++ b/pkgs/by-name/pl/plezy/git-hashes.json @@ -3,9 +3,7 @@ "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", - "background_downloader": "sha256-VHi4g/S/kCxxaeHnDTc64oS6lMHMFiU31VqFqBmdmo8=", - "connectivity_plus": "sha256-PGt4eEp32+w4XMDVwB0Kjla1OSole4l/++Zs5PHXs/U=", - "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=", - "os_media_controls": "sha256-Xd1RdtmZbuWaljNXZ/rSInQF5/F06aPtr1uVrxIdhP8=", - "wakelock_plus": "sha256-89xs0sLNuoCqApFqwEY+SEk2DUqjHf8JsSd7dfxX3P0=" + "background_downloader": "sha256-y37tzAxOwql1193E+aTJOIi2B0gXLxL3azghEYzcRGA=", + "connectivity_plus": "sha256-sVUG5/6GF0Eu47BgUCkgbGi8w1ip5o0yQS00NnNjAGs=", + "os_media_controls": "sha256-UkrBz52dkdlSJ+UJwC2E7RhuSOcXzJx+dVo0JcW8pEY=" } diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 36952fbf6120..7f913444850a 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -27,13 +27,13 @@ let pname = "plezy"; - version = "2.8.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "edde746"; repo = "plezy"; tag = version; - hash = "sha256-NvBCh++teOB0uNyy71NmOFwCQvkg9/v9Rx+76UybLQo="; + hash = "sha256-Fc2KWx4byfrulWzOGm0WW6EUXMvV8uwmvVjoSgzQmuA="; }; simdutf = fetchurl { @@ -72,13 +72,7 @@ let gitHashes = lib.importJSON ./git-hashes.json; - # Upstream uses a sentry-dart fork that fetches sentry-native as a zip instead of via - # git clone. The PR was merged and reverted upstream (getsentry/sentry-dart#3630), so - # we use upstream since theres no actual meaningful difference - patches = [ - ./replace-sentry-fork.patch - ] - ++ lib.optionals use16kPagesizeWorkaround [ + patches = lib.optionals use16kPagesizeWorkaround [ ./16k-font-workaround.patch ]; @@ -152,7 +146,7 @@ let src = fetchurl { url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg"; - hash = "sha256-eN8CJ/yaV4wln6fN2lJqJnn+RvW+ZiD3oCDhjQjyBvU="; + hash = "sha256-jNwMukPYLTWBk1daanHtxYdJpZCB5I/hiKvFx4tL4sY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json index 55fe06f92542..46ae84a50b07 100644 --- a/pkgs/by-name/pl/plezy/pubspec.lock.json +++ b/pkgs/by-name/pl/plezy/pubspec.lock.json @@ -10,6 +10,16 @@ "source": "hosted", "version": "93.0.0" }, + "analysis_server_plugin": { + "dependency": "transitive", + "description": { + "name": "analysis_server_plugin", + "sha256": "5f3920acbd5765764ec9ef6c5bbdd102015424281232ee4fb4f5431c87abb4eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.7" + }, "analyzer": { "dependency": "transitive", "description": { @@ -108,12 +118,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859", - "resolved-ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859", + "ref": "021e2075260e324b7440a5c81b57bf0242d35020", + "resolved-ref": "021e2075260e324b7440a5c81b57bf0242d35020", "url": "https://github.com/edde746/background_downloader" }, "source": "git", - "version": "9.5.4" + "version": "9.5.5" }, "boolean_selector": { "dependency": "transitive", @@ -299,12 +309,12 @@ "dependency": "direct main", "description": { "path": "packages/connectivity_plus/connectivity_plus", - "ref": "2b614414ce95d920880765d07cbb9759699a4563", - "resolved-ref": "2b614414ce95d920880765d07cbb9759699a4563", - "url": "https://github.com/edde746/plus_plugins" + "ref": "bf04cdf66598dc3fca274b8b1db2b92b0bf6b73e", + "resolved-ref": "bf04cdf66598dc3fca274b8b1db2b92b0bf6b73e", + "url": "https://github.com/fluttercommunity/plus_plugins" }, "source": "git", - "version": "7.1.1" + "version": "7.2.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -390,11 +400,11 @@ "dependency": "direct dev", "description": { "name": "dart_code_linter", - "sha256": "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93", + "sha256": "44cce8527a2094201067b50aed97778930638cc43e8bb3cb0b40a90c36fb9c84", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.6" }, "dart_discord_presence": { "dependency": "direct main", @@ -873,13 +883,12 @@ "material_symbols_icons": { "dependency": "direct main", "description": { - "path": ".", - "ref": "1d8cd83", - "resolved-ref": "1d8cd8325db29691a01738a25f220dd3515bd1e2", - "url": "https://github.com/edde746/material_symbols_icons" + "name": "material_symbols_icons", + "sha256": "49c532dd0b74544e9d8d93ec0f821d52ec532e7c9263c889ebe71b1be4f34ba7", + "url": "https://pub.dev" }, - "source": "git", - "version": "4.2906.0" + "source": "hosted", + "version": "4.2951.0" }, "meta": { "dependency": "transitive", @@ -955,12 +964,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e", - "resolved-ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e", + "ref": "75556a968a4a1ebc42fbb8c31942c2418d4326e1", + "resolved-ref": "75556a968a4a1ebc42fbb8c31942c2418d4326e1", "url": "https://github.com/edde746/media_controls" }, "source": "git", - "version": "0.2.4" + "version": "0.3.0" }, "package_config": { "dependency": "transitive", @@ -1225,12 +1234,11 @@ "saf_util": { "dependency": "direct main", "description": { - "name": "saf_util", - "sha256": "0cf5fc462fc7e466e1d5608dd5a331d88d6dd6c7b01f62a305aaf469bf3309ea", - "url": "https://pub.dev" + "path": "packages/saf_util", + "relative": true }, - "source": "hosted", - "version": "2.0.0" + "source": "path", + "version": "3.1.0" }, "screen_retriever": { "dependency": "transitive", @@ -1286,11 +1294,11 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "288aee3d35f252ac0dc3a4b0accbbe7212fa2867604027f2cc5bc65334afd743", + "sha256": "09c573f98ff6c5e98d527f351f037eb8ea9ff684a6e9e84b2e91357144016254", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.16.0" + "version": "9.24.0" }, "sentry_dart_plugin": { "dependency": "direct dev", @@ -1306,11 +1314,11 @@ "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "f9e87d5895cc437902aa2b081727ee7e46524fe7cc2e1910f535480a3eeb8bed", + "sha256": "4a04b7e1901b8128df783b6d36d48706b07b0cd055e621517c998de87f5dafb9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.16.0" + "version": "9.24.0" }, "serial_csv": { "dependency": "transitive", @@ -1751,13 +1759,11 @@ "wakelock_plus": { "dependency": "direct main", "description": { - "path": "wakelock_plus", - "ref": "8595fee595c952b73d430f2eab05f2e0d858290e", - "resolved-ref": "8595fee595c952b73d430f2eab05f2e0d858290e", - "url": "https://github.com/edde746/wakelock_plus" + "path": "packages/wakelock_plus", + "relative": true }, - "source": "git", - "version": "1.4.0" + "source": "path", + "version": "1.5.2" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1833,11 +1839,11 @@ "dependency": "direct main", "description": { "name": "win_http", - "sha256": "a50a14f1bf32bc5c9b39add9baa01658b97146b21de25237810ca6b850a6704e", + "sha256": "ebc4d37e2c0e6800cc200e40d289d3bac22fc17d40fce3ae7909d49a20da77bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "window_manager": { "dependency": "direct main", @@ -1878,6 +1884,16 @@ }, "source": "hosted", "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" } }, "sdks": { diff --git a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch deleted file mode 100644 index f2ad98d1f153..000000000000 --- a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/pubspec.yaml -+++ b/pubspec.yaml -@@ -60,11 +60,7 @@ - git: - url: https://github.com/edde746/background_downloader - ref: b4d36f88bb365faaf308ff26be7ade49bbaec859 -- sentry_flutter: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/flutter -- ref: build/fetch-native-zip -+ sentry_flutter: 9.16.0 - auto_updater: - git: - url: https://github.com/edde746/auto_updater -@@ -110,16 +106,6 @@ - url: https://github.com/edde746/auto_updater - ref: 9e150f7 - path: packages/auto_updater_windows -- sentry: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/dart -- ref: build/fetch-native-zip -- sentry_flutter: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/flutter -- ref: build/fetch-native-zip - material_symbols_icons: - git: - url: https://github.com/edde746/material_symbols_icons diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh index 3791bc122fa0..6cba0df4c373 100755 --- a/pkgs/by-name/pl/plezy/update.sh +++ b/pkgs/by-name/pl/plezy/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter344 git +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go set -eou pipefail @@ -26,18 +26,8 @@ DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/ple DMG_SHA=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$DMG_URL")") sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix" -# Only here to handle the patched pubsec.yaml -workdir=$(mktemp -d) -trap 'rm -rf "$workdir"' EXIT - -curl --fail --silent --location "$GIT_SRC_URL" | tar -xz -C "$workdir" --strip-components=1 -patch -d "$workdir" -p1 < "$ROOT/replace-sentry-fork.patch" - -export PUB_CACHE="$workdir/.pub-cache" -flutter --no-version-check config --no-analytics >/dev/null -(cd "$workdir" && flutter --no-version-check pub get) - -yq eval --output-format=json --prettyPrint "$workdir/pubspec.lock" > "$ROOT/pubspec.lock.json" +curl --fail --silent --location "https://raw.githubusercontent.com/edde746/plezy/${latestVersion}/pubspec.lock" \ + | yq eval --output-format=json --prettyPrint > "$ROOT/pubspec.lock.json" python3 "$(dirname "$(readlink -f "$0")")/../../../development/compilers/dart/fetch-git-hashes.py" \ --input "$ROOT/pubspec.lock.json" \ From 3bb83122adf9d511c8f01afa48daae80916dca20 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 13 Jul 2026 16:48:39 +0300 Subject: [PATCH 35/42] plezy: add BatteredBunny to maintainers --- pkgs/by-name/pl/plezy/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 7f913444850a..17ef30c364d1 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -55,6 +55,7 @@ let maintainers = with lib.maintainers; [ mio miniharinn + BatteredBunny ]; platforms = lib.platforms.linux ++ [ "x86_64-darwin" From db491cd7129a237b070a65fe26e17865a7bb1ff3 Mon Sep 17 00:00:00 2001 From: lenny Date: Mon, 13 Jul 2026 19:00:00 +0200 Subject: [PATCH 36/42] domoticz: 2026.2 -> 2026.2-unstable-2026-07-09 An upstream dependency disappeared breaking the build. This was fixed upstream requiring us to update to an unstable commit. --- pkgs/by-name/do/domoticz/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index 41be930bfcea..5bbdf8dc17cd 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, makeWrapper, cmake, python3, @@ -20,18 +19,17 @@ cereal, minizip, versionCheckHook, - nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2026.2"; + version = "2026.2-unstable-2026-07-09"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; - tag = finalAttrs.version; - hash = "sha256-WJDNnzjmQe9Ap5EqmXEgrglIbGcLRRFBJgAHDvzswzo="; + rev = "7e12d1e5d7bf3f7d083ef31d5dd611d678f89d48"; # pinned due to removed dependency (see nixpkgs pr #539060) + hash = "sha256-+6EIEsgGTaLEPzBa/R5EYAxnYB3+cj54LGDJwutTQGA="; fetchSubmodules = true; }; @@ -81,12 +79,10 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ - versionCheckHook + # versionCheckHook # readd once we can move to a tagged release again ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; - meta = { description = "Home automation system"; longDescription = '' From d1c5dde9c639f48c9d8da9567cb0962213d3c362 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 4 Mar 2026 13:44:41 +0100 Subject: [PATCH 37/42] vmaware: init at 2.8.0 Co-authored-by: ners --- pkgs/by-name/vm/vmaware/package.nix | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/vm/vmaware/package.nix diff --git a/pkgs/by-name/vm/vmaware/package.nix b/pkgs/by-name/vm/vmaware/package.nix new file mode 100644 index 000000000000..1f99151f85bc --- /dev/null +++ b/pkgs/by-name/vm/vmaware/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vmaware"; + version = "2.8.0"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "kernelwernel"; + repo = "VMAware"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KPjIk5nm27RcxGg3owfLVt+b1sL0y90IPPgeGv7fTgQ="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform C++ library and CLI tool for virtual machine detection"; + homepage = "https://github.com/kernelwernel/VMAware"; + changelog = "https://github.com/kernelwernel/VMAware/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ patrickdag ]; + platforms = lib.platforms.linux; + mainProgram = "vmaware"; + }; +}) From 865cf8aee4f12d81645b3908110aa6dbcf5cf758 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jul 2026 19:10:12 +0000 Subject: [PATCH 38/42] sssnake: 0.3.2 -> 0.4.0 --- pkgs/by-name/ss/sssnake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix index 8ef9d6a4252f..827090d5de74 100644 --- a/pkgs/by-name/ss/sssnake/package.nix +++ b/pkgs/by-name/ss/sssnake/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sssnake"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "angeljumbo"; repo = "sssnake"; rev = "v${finalAttrs.version}"; - hash = "sha256-zkErOV6Az0kJdwyXzMCnVW1997zpAB79TBvf/41Igic="; + hash = "sha256-RU+yYT+GcCsk0lBisE2/4Y9zMVLA6dbN4n0ibAovav4="; }; postPatch = '' substituteInPlace makefile --replace '-lncursesw' '-lncursesw -D_XOPEN_SOURCE=500' From 174bd66b7677fa2dae76e6c3c4047125f5f35bb5 Mon Sep 17 00:00:00 2001 From: ethanbodzioney Date: Mon, 13 Jul 2026 15:15:12 -0400 Subject: [PATCH 39/42] sketchybar: fix darwin build --- pkgs/by-name/sk/sketchybar/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 68106fd82420..4d615ad3b9a8 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -5,6 +5,7 @@ nix-update-script, apple-sdk_15, versionCheckHook, + llvmPackages, }: let @@ -28,12 +29,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5tyc/yYzdV/3JTtujuj7le/14XkC7TlN/nZg7tOZsNg="; }; + nativeBuildInputs = [ + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld + ]; + buildInputs = [ apple-sdk_15 ]; makeFlags = [ target ]; + # TODO: Remove once #536365 reaches this branch + env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; + installPhase = '' runHook preInstall From d6efce881a22ca0c0b7de3ed00b4c0b08f6ce020 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 13 Jul 2026 22:59:39 +0200 Subject: [PATCH 40/42] incus-ui-canonical: Use stdenvNoCC A C compiler is not needed to build this package, so stdenvNoCC is enough. Signed-off-by: Felix Singer --- pkgs/by-name/in/incus-ui-canonical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index f3175515d1c4..98e384369006 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchurl, fetchFromGitHub, fetchYarnDeps, @@ -18,7 +18,7 @@ let hash = "sha256-f0vd/Xp/kBbZkg6CBM4cZPlwg5WUL/zv3mCAEmugzCE="; }; in -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; version = "0.21.4"; From dd2ea746ce040136d557c5f3ae8e6f5c5e59fe8c Mon Sep 17 00:00:00 2001 From: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com> Date: Sun, 5 Jul 2026 00:20:54 +0000 Subject: [PATCH 41/42] graphite-cli: fix darwin build The 1.8.6 bump (#527044) broke the package on darwin in two independent ways, unnoticed because the package is unfree and therefore never built by Hydra or ofborg: - postInstall generates shell completions by running $out/bin/gt, but gt tries to create ~/.config/graphite/aliases on startup and exits 1 with no output when HOME is not writable (as in nix builds, where HOME=/homeless-shelter). installShellCompletion then fails the build because the generated completion files are zero-size. Give the build a throwaway writable HOME. The Linux build is not affected because completions are generated through the buildFHSEnv wrapper, where / is a writable tmpfs. - dontFixup was only set on Linux, so on darwin fixupPhase ran strip -S on the binary. As the comment in this file already explains, the vercel/pkg virtual filesystem appended to the binary must not be modified; the stripped binary fails at runtime with "Pkg: Error reading from file." Skip fixup on all platforms. On Linux this is a no-op: the derivation is unchanged. Assisted-by: Devin (Ultra) Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com> --- pkgs/by-name/gr/graphite-cli/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index c9fe9e7f899d..af2cc83f569d 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -76,9 +76,10 @@ let dontConfigure = true; dontBuild = true; - # On Linux the binary is wrapped with buildFHSEnv; completions are - # generated there. Here we only need to skip fixup to avoid patchelf/strip. - dontFixup = stdenv.hostPlatform.isLinux; + # Skip fixup on all platforms: strip discards the vercel/pkg virtual + # filesystem appended to the binary (see the comment below), leaving a + # binary that fails at runtime with "Pkg: Error reading from file." + dontFixup = true; installPhase = '' runHook preInstall @@ -86,7 +87,13 @@ let runHook postInstall ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin shellCompletions; + # gt tries to create ~/.config/graphite/aliases on startup and exits 1 + # with no output when HOME is not writable, which would leave the + # completion files empty. + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + export HOME=$(mktemp -d) + ${shellCompletions} + ''; }; in # The binary is built with vercel/pkg, which appends a virtual filesystem to From 65e06c62fbf54ba323133da0a6cd31aa10bf93fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jul 2026 23:44:54 +0000 Subject: [PATCH 42/42] terraform-providers.tencentcloudstack_tencentcloud: 1.83.7 -> 1.83.10 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2f748aa730a1..c48d47e8b89c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1319,11 +1319,11 @@ "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-tADmls3GAmR3S5wdasoHrBYOtZTVXDS2alZD6Mzfo4M=", + "hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.83.7", + "rev": "v1.83.10", "spdx": "MPL-2.0", "vendorHash": null },