From a6fc69fe4069e804f66e01b02e382f39963bcfd2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 19 May 2026 10:16:51 -0400 Subject: [PATCH 001/133] buildRustCrate: add devDependencies parameter for buildTests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cargo links [dev-dependencies] only when building test or bench targets. buildRustCrate models normal deps (`dependencies`) and build-script deps (`buildDependencies`) but has no equivalent: callers that set `buildTests = true` for a crate with dev-deps must compute the dev-dep set themselves and splice it into `dependencies` via .override. Add a `devDependencies` parameter that is appended to the linked dependency list only when `buildTests = true`. The append happens at the single point where `dependencies` is normalized, so it threads through to the --extern flags, the deps directory in configurePhase, the metadata hash, and propagated build inputs without further changes. When `buildTests = false` the parameter is dropped, so existing lib/bin derivations are byte-identical to before — no rebuilds for users that don't pass it. Includes a test case in build-rust-crate/test that fails without the change (`can't find crate for dev_dep`). --- .../rust/build-rust-crate/default.nix | 15 ++++++++++++- .../rust/build-rust-crate/test/default.nix | 21 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index af1ec421da9b..e3dbde5d2f16 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -198,6 +198,13 @@ lib.makeOverridable # Rust build dependencies, i.e. other libraries that were built # with buildRustCrate and are used by a build script. buildDependencies, + # Rust dev-dependencies, i.e. other libraries that were built + # with buildRustCrate and are linked only when `buildTests = true`. + # Mirrors Cargo's `[dev-dependencies]`: ignored for the regular + # lib/bin build, appended to `dependencies` for the test build. + # + # Default: [] + devDependencies, # Specify the "extern" name of a library if it differs from the library target. # See above for an extended explanation. # @@ -323,6 +330,7 @@ lib.makeOverridable crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: { }) crateOverrides crate_); dependencies_ = dependencies; buildDependencies_ = buildDependencies; + devDependencies_ = devDependencies; processedAttrs = [ "src" "propagatedBuildInputs" @@ -334,6 +342,7 @@ lib.makeOverridable "libPath" "buildDependencies" "dependencies" + "devDependencies" "features" "crateRenames" "crateName" @@ -421,7 +430,10 @@ lib.makeOverridable ++ (crate.buildInputs or [ ]) ++ buildInputs_ ++ completePropagatedBuildInputs; - dependencies = map lib.getLib dependencies_; + # Dev-dependencies are only linked when building tests, mirroring + # Cargo. When buildTests is false this is a no-op, so the metadata + # hash and store path of normal lib/bin builds are unchanged. + dependencies = map lib.getLib (dependencies_ ++ lib.optionals buildTests_ devDependencies_); buildDependencies = map lib.getLib buildDependencies_; completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); @@ -617,6 +629,7 @@ lib.makeOverridable postInstall = crate_.postInstall or ""; dependencies = crate_.dependencies or [ ]; buildDependencies = crate_.buildDependencies or [ ]; + devDependencies = crate_.devDependencies or [ ]; crateRenames = crate_.crateRenames or { }; buildTests = crate_.buildTests or false; } diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 75a483a0096f..13c52a44c079 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -404,6 +404,27 @@ rec { "test something ... ok" ]; }; + rustLibTestsWithDevDependency = + let + devDep = mkHostCrate { + crateName = "dev-dep"; + src = mkLib "src/lib.rs"; + }; + in + { + src = mkFile "src/lib.rs" '' + #[cfg(test)] + mod tests { + #[test] + fn uses_dev_dep() { + assert_eq!(dev_dep::test(), 23); + } + } + ''; + devDependencies = [ devDep ]; + buildTests = true; + expectedTestOutputs = [ "test tests::uses_dev_dep ... ok" ]; + }; rustBinTestsCombined = { src = symlinkJoin { name = "rust-bin-tests-combined"; From a53ede53dc8f3e9299c6a8db9344bfa01da7c1f3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 19 May 2026 10:14:34 -0400 Subject: [PATCH 002/133] buildRustCrate: remap crate source root to /- MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit buildRustCrate passes `--remap-path-prefix=$NIX_BUILD_TOP=/` so the sandbox build directory is not embedded in compiled artifacts. The resulting source path is `/$sourceRoot/src/...` — which works out to `/-/src/...` only because fetchCrate happens to unpack to a directory named after the crate. When `src` is supplied directly — `lib.fileset.toSource` (always `source`), `lib.cleanSource ./.`, a flake's `self`, or any `-source` store path — stdenv unpacks to `$NIX_BUILD_TOP/source/`, so every such crate ends up with `/source/src/lib.rs`. The crate identity is gone from panic backtraces, `file!()` expansions, debuginfo, and llvm-cov coverage maps. Workspace builds via crate2nix that source each member with a fileset see all members collapse to the same prefix, making per-crate coverage and backtrace attribution impossible without a per-crate remap override. Add a second, more specific remap of `$NIX_BUILD_TOP/$sourceRoot` to `/-`. rustc applies `--remap-path-prefix` flags last-match-wins, so this prefix wins for everything under the source root — which in a buildRustCrate build is effectively everything that would otherwise embed a sandbox path, including `OUT_DIR` (placed at `$sourceRoot/target/build/` by configure-crate.nix). The broader `$NIX_BUILD_TOP=/` remap stays as a fallback for any path outside `$sourceRoot`. This is safe with respect to the original remap's purpose: - Reproducibility: still maps the per-build sandbox path to a fixed, build-independent string. `crateName` and `version` are already derivation inputs, so the result is deterministic. - Closure size: still no store paths in the embedded strings. - fetchCrate sources: `$sourceRoot` is `-` there, so the new remap rewrites `/-` to itself — the output is byte-for-byte identical. Only custom-`src` crates change, and they change from a degenerate `/source/...` to the same shape fetchCrate crates already had. - The remap only affects path *strings* embedded in output (DWARF `DW_AT_comp_dir`/`DW_AT_name`, `file!()`, `Location::file()`, LLVM coverage filename tables). It does not change which files are read or compiled. Users who depend on the old `/source/...` prefix can restore it via `extraRustcOpts`, which is appended after these flags and therefore wins under last-match-wins. --- .../rust/build-rust-crate/build-crate.nix | 15 +++++++++++++++ .../rust/build-rust-crate/default.nix | 1 + 2 files changed, 16 insertions(+) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index d5b7166207fa..4a337ddc2218 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -9,6 +9,7 @@ { crateName, + version, dependencies, crateFeatures, crateRenames, @@ -32,6 +33,20 @@ let (if release then "-C opt-level=3" else "-C debuginfo=2") "-C codegen-units=${toString codegenUnits}" "--remap-path-prefix=$NIX_BUILD_TOP=/" + # Map the unpacked source root to a stable, crate-identifying path. + # Sources from fetchCrate unpack to $NIX_BUILD_TOP/-, + # so the prefix above already yields /-/src/... and + # this remap is a no-op for them. Sources supplied via a custom `src` + # (lib.fileset.toSource, lib.cleanSource, a flake's `self`) all unpack to + # a fixed basename like `source`, so without this every such crate + # collapses to /source/src/... — losing crate identity in panic + # backtraces, file!() expansions, debuginfo, and coverage maps. rustc + # applies remaps last-match-wins, so this more-specific prefix wins + # for everything under the source root (including OUT_DIR, which + # configure-crate.nix places at $sourceRoot/target/build/); the + # broader $NIX_BUILD_TOP remap above remains as a fallback for any + # path that happens to fall outside $sourceRoot. + "--remap-path-prefix=$NIX_BUILD_TOP/$sourceRoot=/${crateName}-${version}" # When the rust-src component is present (common with rust-overlay # toolchains), rustc unvirtualises libstd source paths. Panic # locations from monomorphised generic std code then embed the diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index af1ec421da9b..799d8daec8b8 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -543,6 +543,7 @@ lib.makeOverridable buildPhase = buildCrate { inherit crateName + version dependencies crateFeatures crateRenames From 735734474f74eb294aeb2e530ce36f83cec8b895 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 19 May 2026 10:17:59 -0400 Subject: [PATCH 003/133] buildRustCrate: add useClippy parameter to lint with clippy-driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit buildRustCrate calls rustc directly, so there is no built-in equivalent of `cargo clippy`. The capLints doc already hints at the existing workaround — overriding the `rust` attribute with a wrapper script that sniffs argv for build_script_build and routes everything else to clippy-driver. That works because clippy-driver IS rustc internally (rustc_driver plus lint passes) and produces compatible rlibs and metadata, but the wrapper is fragile and every downstream reinvents it. Add a `useClippy` boolean (default false) that swaps the lib/bin/test compilation to clippy-driver while keeping plain rustc for build.rs — the same lib-vs-build-script split as extraRustcOptsForBuildRs, since build scripts are typically auto-generated and clippy noise there is not actionable. The clippy-driver binary comes from a new `clippy` parameter, auto-filled from pkgs.clippy by callPackage and overridable alongside `rust` for toolchain bundles that ship their own. Implemented by introducing a RUSTC_DRIVER shell variable in build-crate.nix that lib.sh's build_lib/build_bin consume; the build_script_build path in configure-crate.nix never sees it. Note that the default `capLints = "allow"` cap suppresses clippy lints along with everything else, so `useClippy` is usually paired with `capLints = "warn"` and `-W clippy::*`/`-D warnings` flags via extraRustcOpts. Documented in the manual. Test fixtures cover the three load-bearing properties: a denied clippy lint fails the build (proving clippy-driver ran), the default capLints silences clippy lints just like rustc lints, and an rlib emitted by clippy-driver is link-compatible with a plain-rustc dependent. --- doc/languages-frameworks/rust.section.md | 31 ++++++++- .../rust/build-rust-crate/build-crate.nix | 2 + .../rust/build-rust-crate/default.nix | 30 ++++++++ .../rust/build-rust-crate/lib.sh | 4 +- .../rust/build-rust-crate/test/default.nix | 69 +++++++++++++++++++ 5 files changed, 132 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index d7bb32d856af..87d916cb4a12 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -876,8 +876,7 @@ general. A number of other parameters can be overridden: empty, or `"forbid"` (no cap) when `lints` is set. Because `rustc` only honours the first `--cap-lints` it receives, this cannot be changed via `extraRustcOpts`; use this attribute instead. Useful - when overriding the `rust` attribute to point at `clippy-driver`, - since clippy lints are also capped by this flag: + with `useClippy`, since clippy lints are also capped by this flag: ```nix (hello { }).override { capLints = "warn"; } @@ -903,6 +902,34 @@ general. A number of other parameters can be overridden: } ``` +- Whether to compile the crate with `clippy-driver` instead of `rustc`. + Build scripts (`build.rs`) keep plain `rustc`. The default `capLints` + of `"allow"` suppresses all lints including clippy's, so this is + usually paired with `capLints` and lint flags via `extraRustcOpts`: + + ```nix + (hello { }).override { + useClippy = true; + capLints = "warn"; + extraRustcOpts = [ + "-Dwarnings" + "-Wclippy::all" + ]; + } + ``` + + When using a Rust toolchain that bundles its own `clippy-driver` + (rust-overlay, Fenix), pass it via `clippy` so the sysroot matches: + + ```nix + (hello { }).override { + rust = myToolchain; + clippy = myToolchain; + useClippy = true; + capLints = "warn"; + } + ``` + - Phases, just like in any other derivation, can be specified using the following attributes: `preUnpack`, `postUnpack`, `prePatch`, `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate, diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index d5b7166207fa..9c2005907275 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -25,6 +25,7 @@ buildTests, codegenUnits, capLints, + useClippy, }: let @@ -94,6 +95,7 @@ in runHook preBuild # configure & source common build functions + RUSTC_DRIVER="${if useClippy then "clippy-driver" else "rustc"}" LIB_RUSTC_OPTS="${libRustcOpts}" BIN_RUSTC_OPTS="${binRustcOpts}" LIB_EXT="${stdenv.hostPlatform.extensions.library}" diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index af1ec421da9b..bf2a6af10fa9 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -12,6 +12,7 @@ pkgsBuildBuild, rustc, cargo, + clippy, jq, libiconv, # Controls codegen parallelization for all crates. @@ -163,6 +164,31 @@ lib.makeOverridable # # Default: pkgs.cargo cargo ? cargo, + # Whether to compile the crate's library, binary, and test targets with + # `clippy-driver` instead of `rustc`. Build scripts (`build.rs`) keep + # plain `rustc` — they are typically auto-generated and clippy findings + # there are not actionable. + # + # `clippy-driver` wraps `rustc_driver` with extra lint passes and emits + # link-compatible `.rlib`/`.rmeta`, so dependency crates built with plain + # `rustc` are still usable; only the crate being linted needs this flag. + # + # Note that the default `capLints` of `"allow"` suppresses ALL lints, + # including clippy's. Set `capLints = "warn"` (or `"forbid"`) or supply + # a `lints` table — otherwise `useClippy` is a silent no-op. Lint flags + # such as `-D warnings` or `-W clippy::pedantic` go through the regular + # `extraRustcOpts` (clippy-driver forwards rustc flags unchanged). + # + # Example: true + # Default: false + useClippy, + # The clippy package providing `clippy-driver`. Only consulted when + # `useClippy = true`. Override this together with `rust` when using a + # toolchain (rust-overlay, Fenix) that bundles its own `clippy-driver`, + # so the sysroot matches. + # + # Default: pkgs.clippy + clippy ? clippy, # Whether to build a release version (`true`) or a debug # version (`false`). Debug versions are faster to build # but might be much slower at runtime. @@ -412,6 +438,7 @@ lib.makeOverridable cargo jq ] + ++ lib.optional useClippy clippy ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) @@ -559,6 +586,7 @@ lib.makeOverridable buildTests codegenUnits capLints + useClippy ; }; dontStrip = !release; @@ -594,6 +622,8 @@ lib.makeOverridable { rust = crate_.rust or rustc; cargo = crate_.cargo or cargo; + useClippy = crate_.useClippy or false; + clippy = crate_.clippy or clippy; release = crate_.release or true; verbose = crate_.verbose or true; extraRustcOpts = [ ]; diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 4d736302a0c9..28a705c7ce6a 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -10,7 +10,7 @@ build_lib() { lib_src=$1 echo_build_heading $lib_src ${libName} - noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \ + noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \ --crate-name $CRATE_NAME \ $lib_src \ --out-dir target/lib \ @@ -42,7 +42,7 @@ build_bin() { main_file=$2 fi echo_build_heading $crate_name $main_file - noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \ + noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \ --crate-name $crate_name_ \ $main_file \ --crate-type bin \ diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 75a483a0096f..003e7cafce7b 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1042,6 +1042,75 @@ rec { touch $out ''; + # `useClippy = true` plus a denied clippy lint should fail the build, + # proving clippy-driver (not plain rustc) compiled the crate. The + # `clippy::` prefix in the diagnostic is the fingerprint: rustc has no + # such lint group. + useClippyDenyFails = + let + crate = mkHostCrate { + crateName = "useClippyDenyFails"; + useClippy = true; + lints.clippy.eq_op = "deny"; + src = mkFile "src/lib.rs" '' + pub fn check() -> bool { + 1 == 1 + } + ''; + }; + failed = testers.testBuildFailure crate; + in + runCommand "assert-useClippyDenyFails" { inherit failed; } '' + grep -q 'clippy::eq.op' "$failed/testBuildFailure.log" + grep -q 'equal expressions' "$failed/testBuildFailure.log" + touch $out + ''; + + # `useClippy = true` with the default `capLints` (which resolves to + # `"allow"` when `lints` is empty) must still build: the cap silences + # clippy lints just like rustc lints. Same source as the failing test + # above — only the `lints` table differs. + useClippyDefaultCapAllows = mkHostCrate { + crateName = "useClippyDefaultCapAllows"; + useClippy = true; + src = mkFile "src/lib.rs" '' + pub fn check() -> bool { + 1 == 1 + } + ''; + }; + + # A library compiled by clippy-driver must produce an `.rlib` that a + # plain-rustc dependent can link against and run. This is the property + # that makes `useClippy` safe to flip per-crate. + useClippyRlibLinkCompat = + let + libCrate = mkHostCrate { + crateName = "clippylib"; + useClippy = true; + src = mkFile "src/lib.rs" '' + pub fn test() -> i32 { + 23 + } + ''; + }; + binCrate = mkHostCrate { + crateName = "clippybin"; + dependencies = [ libCrate ]; + src = mkBinExtern "src/main.rs" "clippylib"; + }; + in + runCommand "run-useClippyRlibLinkCompat" { nativeBuildInputs = [ binCrate ]; } ( + if stdenv.hostPlatform == stdenv.buildPlatform then + '' + ${binCrate}/bin/clippybin && touch $out + '' + else + '' + test -x '${binCrate}/bin/clippybin' && touch $out + '' + ); + rcgenTest = let pkg = rcgenCrates.rootCrate.build; From 1729f540beec604599347964410ce0cab06374c7 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 31 May 2026 15:17:12 -0400 Subject: [PATCH 004/133] buildRustCrate: prevent pulling in two rustc variants With the addition of `remap-path-prefix` to buildRustCrate, we now can pull in two rustc variants when cross compiling, since the rustc that is string-interpolated for passing the remap flag is not pulled from the proper package-set. Depending on the host platform used, this rustc variant may not even build. In order to only pull in one variant, and to properly mask the rustc used for building with the remap-path-prefix flag, rustc is passed explicitly from pkgsBuildHost. --- .../rust/build-rust-crate/default.nix | 2 -- pkgs/top-level/all-packages.nix | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 0903096ed281..8ba8bcdb1a35 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -155,8 +155,6 @@ crate_: lib.makeOverridable ( # The rust compiler to use. - # - # Default: pkgs.rustc { rust ? rustc, # The cargo package to use for getting some metadata. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab5fbbc4ea45..81a5d2c6d34e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4401,11 +4401,20 @@ with pkgs; ); in callPackage ../build-support/rust/build-rust-crate ( - { } - // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { + lib.optionalAttrs (stdenv.hostPlatform.libc == null) { stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. } - // lib.optionalAttrs targetAlreadyIncluded { inherit (pkgsBuildBuild) rustc cargo; } # Optimization. + // ( + if targetAlreadyIncluded then + # Optimization + { + inherit (pkgsBuildBuild) rustc cargo; + } + else + { + inherit (pkgsBuildHost) rustc cargo; + } + ) ); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; From 91a8fdcdd68b67fcb316b2121ff723aa8902eb55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jun 2026 02:30:04 +0000 Subject: [PATCH 005/133] min-ed-launcher: 0.12.2 -> 0.13.0 --- pkgs/by-name/mi/min-ed-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix index 4371bc758479..4d5a8583cdc1 100644 --- a/pkgs/by-name/mi/min-ed-launcher/package.nix +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -6,13 +6,13 @@ }: buildDotnetModule rec { pname = "min-ed-launcher"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "rfvgyhn"; repo = "min-ed-launcher"; tag = "v${version}"; - hash = "sha256-jx8R/8mWuluD7ub8J3UqiP4A8k1npBgZpqRti3mhBrM="; + hash = "sha256-blqGq6PORBEtCLO007TR3xJ6UXX8nFSOIoFh8Dc/5B8="; leaveDotGit = true; # During build the current commit is appended to the version }; From 8b6cd28599b2b9add14ad7e066e65e24a0e4b824 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Mon, 1 Jun 2026 09:18:12 +0200 Subject: [PATCH 006/133] maven_4: init at 4.0.0-rc-5 Package Maven 4 as a standalone derivation that can be customized independently of maven. It defaults to jdk25_headless (the JDK can be overridden via that argument), exposed through a local jdk_headless binding so future JDK bumps are a one-line change. maven exposes its package builder as the mkBuildMavenPackage passthru function, which maven_4 reuses to provide its own buildMavenPackage without duplicating build-maven-package.nix. The version tests passthru is exposed as well. buildMaven is intentionally not exposed as it is semi-deprecated. The dependency FOD deletes the .meta directory during cleanup: Maven Resolver 2.0.11+ writes machine- and time-dependent files there, which would otherwise break the fixed-output derivation's hash. A section about maven_4 is added to the Maven manual. Assisted-by: Claude Code (Claude Opus 4.8) --- doc/languages-frameworks/maven.section.md | 53 ++++++++++++ doc/redirects.json | 3 + pkgs/by-name/ma/maven/build-maven-package.nix | 1 + pkgs/by-name/ma/maven/package.nix | 19 +++-- pkgs/by-name/ma/maven_4/package.nix | 82 +++++++++++++++++++ 5 files changed, 153 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/ma/maven_4/package.nix diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index daae60efc3e8..e769b38ee744 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -174,6 +174,59 @@ To make sure that your package does not add extra manual effort when upgrading M ``` +## Maven 4 {#maven-4} + +Alongside the default `maven` package (the latest Maven 3 release), nixpkgs ships `maven_4`, which packages the [Maven 4](https://maven.apache.org/whatsnewinmaven4.html) release line. + +`maven_4` is a standalone derivation and can be used as a drop-in replacement wherever `maven` is used, for example to build a project with the latest Maven 4: + +```nix +{ + lib, + fetchFromGitHub, + jre, + makeWrapper, + maven_4, +}: + +maven_4.buildMavenPackage (finalAttrs: { + pname = "jd-cli"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "intoolswetrust"; + repo = "jd-cli"; + tag = "jd-cli-${finalAttrs.version}"; + hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; + }; + + mvnHash = ""; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/jd-cli + install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli + + makeWrapper ${jre}/bin/java $out/bin/jd-cli \ + --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + + runHook postInstall + ''; + + meta = { + description = "Simple command line wrapper around JD Core Java Decompiler project"; + homepage = "https://github.com/intoolswetrust/jd-cli"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ majiir ]; + }; +}) +``` + +`maven_4` exposes the same `buildMavenPackage` helper as `maven` (see [](#maven-buildmavenpackage)), so all of the patterns documented above apply equally. Note that the Maven dependencies resolved by Maven 4 differ from those resolved by Maven 3, so `mvnHash` must be recomputed when switching between the two. + ## Manually using `mvn2nix` {#maven-mvn2nix} ::: {.warning} This way is no longer recommended; see [](#maven-buildmavenpackage) for the simpler and preferred way. diff --git a/doc/redirects.json b/doc/redirects.json index 51cb45eaaad8..6223a8ff6dca 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -3942,6 +3942,9 @@ "maven": [ "index.html#maven" ], + "maven-4": [ + "index.html#maven-4" + ], "maven-buildmavenpackage": [ "index.html#maven-buildmavenpackage" ], diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index f737507ddb73..9c83430a49be 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -112,6 +112,7 @@ let -o -name resolver-status.properties \ -o -name _remote.repositories \) \ -delete + rm -rf $out/.m2/.meta runHook postInstall ''; diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index a8379d4f5a97..fbdaaa80885f 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -47,17 +47,26 @@ stdenvNoCC.mkDerivation (finalAttrs: { // { overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs); }; + + # Exposed so other Maven versions (e.g. maven_4) can reuse the builder + # without duplicating build-maven-package.nix. + mkBuildMavenPackage = + maven: + makeOverridableMavenPackage ( + callPackage ./build-maven-package.nix { + inherit maven; + } + ); in { buildMaven = callPackage ./build-maven.nix { maven = finalAttrs.finalPackage; }; - buildMavenPackage = makeOverridableMavenPackage ( - callPackage ./build-maven-package.nix { - maven = finalAttrs.finalPackage; - } - ); + inherit mkBuildMavenPackage; + + buildMavenPackage = mkBuildMavenPackage finalAttrs.finalPackage; + tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/ma/maven_4/package.nix b/pkgs/by-name/ma/maven_4/package.nix new file mode 100644 index 000000000000..9a9b151302f7 --- /dev/null +++ b/pkgs/by-name/ma/maven_4/package.nix @@ -0,0 +1,82 @@ +{ + lib, + fetchurl, + jdk25_headless, + makeWrapper, + maven, + stdenvNoCC, + testers, +}: +let + # Maven 4 defaults to the latest LTS JDK. Bump this binding to change it. + jdk_headless = jdk25_headless; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "maven"; + version = "4.0.0-rc-5"; + + src = fetchurl { + url = "mirror://apache/maven/maven-4/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-7OalyZ09BBx25/7RgU656jogoSC8s8I1pz0sTo2xbKE="; + }; + + sourceRoot = "."; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/maven + cp -r apache-maven-${finalAttrs.version}/* $out/maven + + makeWrapper $out/maven/bin/mvn $out/bin/mvn \ + --set-default JAVA_HOME "${jdk_headless}" + makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \ + --set-default JAVA_HOME "${jdk_headless}" + + runHook postInstall + ''; + + passthru = { + # Reuse maven's builder so build-maven-package.nix is not duplicated. + buildMavenPackage = maven.mkBuildMavenPackage finalAttrs.finalPackage; + + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = '' + env MAVEN_OPTS="-Dmaven.repo.local=$TMPDIR/m2" \ + mvn --version + ''; + }; + }; + }; + + meta = { + homepage = "https://maven.apache.org/"; + description = "Build automation tool (used primarily for Java projects)"; + longDescription = '' + Apache Maven is a software project management and comprehension + tool. Based on the concept of a project object model (POM), Maven can + manage a project's build, reporting and documentation from a central piece + of information. + ''; + changelog = "https://maven.apache.org/docs/${finalAttrs.version}/release-notes.html"; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = lib.licenses.asl20; + mainProgram = "mvn"; + maintainers = with lib.maintainers; [ + tricktron + britter + ]; + teams = [ lib.teams.java ]; + inherit (jdk_headless.meta) platforms; + }; +}) From a27f7bdd24dcbcc907062289a1daced4eb333078 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 8 Jun 2026 02:39:33 +0300 Subject: [PATCH 007/133] esbuild_netlify: remove Netlify's esbuild fork was pinned at 0.14.39 (2022), is abandoned upstream, and is no longer referenced by netlify-cli, which builds with the regular npm-bundled esbuild. The package had zero remaining consumers. Add a throw alias directing users to 'esbuild'. Assisted-by: claude-code with claude-opus-4-8[1m]-high --- pkgs/by-name/es/esbuild_netlify/package.nix | 34 --------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/by-name/es/esbuild_netlify/package.nix diff --git a/pkgs/by-name/es/esbuild_netlify/package.nix b/pkgs/by-name/es/esbuild_netlify/package.nix deleted file mode 100644 index d0d18dbf5af8..000000000000 --- a/pkgs/by-name/es/esbuild_netlify/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - netlify-cli, -}: - -buildGoModule { - pname = "esbuild"; - version = "0.14.39"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "5faa7ad54c99a953d05c06819298d2b6f8c82d80"; - sha256 = "pYiwGjgFMclPYTW0Qml7Pr/knT1gywUAGANra5aojYM="; - }; - - vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; - - passthru = { - tests = { - inherit netlify-cli; - }; - }; - - meta = { - description = "Fork of esbuild maintained by netlify"; - homepage = "https://github.com/netlify/esbuild"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roberth ]; - mainProgram = "esbuild"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e048b8ad382d..59c4b563ded2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -705,6 +705,7 @@ mapAliases { erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02 erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01 esbuild-config = throw "'esbuild-config' has been removed as it has been unmaintained upstream since September 2022"; # Added 2026-02-07 + esbuild_netlify = throw "'esbuild_netlify' has been removed, as the netlify esbuild fork is abandoned upstream and no longer used by netlify-cli; use 'esbuild' instead"; # Added 2026-06-08 etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08 ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28 ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31 From 8dd574b98ee3b15a80c9a22f84bfd31db93dc22f Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Mon, 8 Jun 2026 13:29:53 +0300 Subject: [PATCH 008/133] stats: fix app bundle signing --- pkgs/by-name/st/stats/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index ab288d597aed..0da129d80fcb 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -2,11 +2,11 @@ lib, swiftPackages, fetchFromGitHub, - darwin, leveldb, perl, actool, makeWrapper, + rcodesign, nix-update-script, }: @@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { swift perl actool - darwin.autoSignDarwinBinariesHook makeWrapper + rcodesign ]; buildInputs = [ leveldb ]; @@ -333,6 +333,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postFixup = '' + # Stats is an app bundle with nested frameworks, so sign the bundle to + # generate sealed resources instead of signing only the Mach-O files + ${lib.getExe rcodesign} sign "$out/Applications/Stats.app" + ''; + passthru.updateScript = nix-update-script { }; meta = { From 03f4820c62802998527881846d5d850c93858932 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 29 Apr 2026 16:44:21 +0200 Subject: [PATCH 009/133] rebuilderd: 0.25.0 -> 0.27.0 https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0 https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0 --- doc/release-notes/rl-2611.section.md | 2 ++ pkgs/by-name/re/rebuilderd/package.nix | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 20aa808653cd..8187ed786ec0 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -43,6 +43,8 @@ [pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the manual for details. +- `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0) + ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index bd2880e22895..61642d6fc678 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -7,6 +7,7 @@ installShellFiles, scdoc, bzip2, + cacert, openssl, sqlite, xz, @@ -20,13 +21,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebuilderd"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = "rebuilderd"; tag = "v${finalAttrs.version}"; - hash = "sha256-BuL9s3ewZ1NvR9GG51TVrAncB0PR78Wuw8by+loSP8Q="; + hash = "sha256-f+WfmkV0P4VfaOXxX3t5t9g/uJYCh2A587HEq9OK5QU="; }; postPatch = '' @@ -40,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/bin/echo' 'echo' ''; - cargoHash = "sha256-4M5uWgksYsV8PGe0zn9ADv06q3Ga/GVoQ8HjS7GCnwo="; + cargoHash = "sha256-se5u7+SF3fW5WqdUA3qmztUw5oPa0YXbgOp9GIVOQu0="; nativeBuildInputs = [ pkg-config @@ -80,6 +81,12 @@ rustPlatform.buildRustPackage (finalAttrs: { done ''; + preCheck = '' + export SSL_CERT_FILE=${cacert.out}/etc/ssl/certs/ca-bundle.crt + ''; + + __darwinAllowLocalNetworking = true; + checkFlags = [ # Failing tests "--skip=decompress::tests::decompress_bzip2_compression" From 178bbe85ef6baa482641372d8b69abfd4b6cb390 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jun 2026 13:25:29 +0000 Subject: [PATCH 010/133] pv: 1.10.5 -> 1.11.0 --- pkgs/by-name/pv/pv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index 9bfb87160eef..621925dcb881 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.10.5"; + version = "1.11.0"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-qyG0+GYigGRragLhufCWeQkY+JyVK74NBv73XTtS+xU="; + hash = "sha256-/ALJ/CuCsgqSzI2Y+ES+Y/IqvZh1Go5KvIdeHYA2Yus="; }; meta = { From 3716f2e81194c721ab1b07a90ba34b485e95fccc Mon Sep 17 00:00:00 2001 From: Edgar Pireyn Date: Mon, 6 Apr 2026 18:19:55 +0200 Subject: [PATCH 011/133] nixos/frp: add 'extraConfig' option This feature allows for unparsable settings (by nix) to be used, such as Go templates. It is needed to configure port ranges (https://github.com/fatedier/frp?tab=readme-ov-file#port-range-mapping). --- nixos/modules/services/networking/frp.nix | 33 +++++++++++++++++++- nixos/tests/frp.nix | 37 ++++++++++++++++++++--- 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix index f43a102d741d..0cb5b00fd350 100644 --- a/nixos/modules/services/networking/frp.nix +++ b/nixos/modules/services/networking/frp.nix @@ -76,6 +76,26 @@ in ]; }; }; + + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = '' + Extra frp TOML configuration included at the end of the generated configuration file. + Especially useful for [port range mapping]. + + [port range mapping]: https://github.com/fatedier/frp#port-range-mapping + ''; + example = '' + {{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }} + [[proxies]] + name = "tcp-{{ $v.First }}" + type = "tcp" + localPort = {{ $v.First }} + remotePort = {{ $v.Second }} + {{- end }} + ''; + }; }; } ); @@ -94,7 +114,18 @@ in instance: options: let serviceName = "frp" + lib.optionalString (instance != "") ("-" + instance); - configFile = settingsFormat.generate "${serviceName}.toml" options.settings; + baseConfigFile = settingsFormat.generate "${serviceName}-base.toml" options.settings; + configFile = + if options.extraConfig == "" then + baseConfigFile + else + pkgs.writeText "${serviceName}.toml" '' + # Nixos Module settings + ${builtins.readFile baseConfigFile} + + # Nixos Module extraConfig + ${options.extraConfig} + ''; isClient = (options.role == "client"); isServer = (options.role == "server"); serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix index 48c4e2bc842c..1d71767f33d5 100644 --- a/nixos/tests/frp.nix +++ b/nixos/tests/frp.nix @@ -9,6 +9,7 @@ let name = "secrets"; text = "token=${token}"; }; + portRange = 6003; in { name = "frp"; @@ -56,14 +57,25 @@ in services.httpd = { enable = true; adminAddr = "admin@example.com"; - virtualHosts."test-appication" = + virtualHosts = let testdir = pkgs.writeTextDir "web/index.php" " Date: Sat, 13 Jun 2026 22:52:16 +0200 Subject: [PATCH 012/133] nixos/frp: add self to maintainers --- nixos/modules/services/networking/frp.nix | 5 ++++- nixos/tests/frp.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix index 0cb5b00fd350..fa636bbe06fc 100644 --- a/nixos/modules/services/networking/frp.nix +++ b/nixos/modules/services/networking/frp.nix @@ -175,5 +175,8 @@ in ) enabledInstances; }; - meta.maintainers = with lib.maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ + zaldnoay + epireyn + ]; } diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix index 1d71767f33d5..00982a6e05bf 100644 --- a/nixos/tests/frp.nix +++ b/nixos/tests/frp.nix @@ -13,7 +13,10 @@ let in { name = "frp"; - meta.maintainers = with lib.maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ + zaldnoay + epireyn + ]; nodes = { frps = { networking = { From 4f5042c837f8379b29ec8ec06ee9047da22b821c Mon Sep 17 00:00:00 2001 From: Ian Mitchell Date: Tue, 9 Jun 2026 11:20:56 -0400 Subject: [PATCH 013/133] supercollider: re-enable QtWebEngine Qt WebEngine is a major component of the SuperCollider language, especially because it powers the user documentation system, which contains all of the helpfiles for the user's local system that may not be in the online SuperCollider documentation browser (see ). WebEngine has potential security vulnerabilities (see below)---which was why WebEngine was removed in PR #480196---however, the documentation browser in SC is not used for anything other than browsing local documentation, which minimizes the potential harms from WebEngine. Potential security problems with Qt6 WebEngine can be found at the following: * https://doc.qt.io/qt-6//qtwebengine-security.html * (for FreeBSD) https://www.vuxml.org/freebsd/pkg-qt6-webengine.html Security-conscious users may wish to not use QtWebEngine, and so there is an included option to disable it with the `useQtWebEngine` option. --- pkgs/development/interpreters/supercollider/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 078b6782a3d0..6b73cdf7f5f3 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -16,6 +16,7 @@ libxt, readline, useSCEL ? false, + useQtWebEngine ? true, emacs, gitUpdater, supercollider-with-plugins, @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { qt6.qtbase qt6.qtwebsockets qt6.qtwayland + qt6.qtwebengine readline ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; @@ -74,7 +76,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSC_WII=OFF" "-DSC_EL=${if useSCEL then "ON" else "OFF"}" - (lib.cmakeBool "SC_USE_QTWEBENGINE" false) + (lib.cmakeBool "SC_USE_QTWEBENGINE" useQtWebEngine) ]; passthru = { From cfa8792facbc716f48aaac385a242a4fa878236f Mon Sep 17 00:00:00 2001 From: Ian Mitchell Date: Sat, 13 Jun 2026 00:34:21 -0400 Subject: [PATCH 014/133] supercolliderPlugins: fix FFTW3F-INCLUDE-DIR build error sc3-plugins requires the `fftw3F` (or `fftw3Float`) package, due to its UGens utilizing the library. Without including `fftw3Float` in the `buildInput` variable, sc3-plugins will not compile. --- .../interpreters/supercollider/plugins/sc3-plugins.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index a3203e87bc06..f13f8feb1c17 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -6,6 +6,7 @@ cmake, supercollider, fftw, + fftwFloat, gitUpdater, }: @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ supercollider fftw + fftwFloat # builds without this will return an error message about no FFTW3F-INCLUDE-DIR ]; cmakeFlags = [ From 1e68037f555f4f7c1dbe5f5bb36bc0ee9e3da451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 04:36:09 +0000 Subject: [PATCH 015/133] worktrunk: 0.56.0 -> 0.58.0 --- pkgs/by-name/wo/worktrunk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wo/worktrunk/package.nix b/pkgs/by-name/wo/worktrunk/package.nix index 1ba94bcf30db..ffd9ddfba56c 100644 --- a/pkgs/by-name/wo/worktrunk/package.nix +++ b/pkgs/by-name/wo/worktrunk/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "worktrunk"; - version = "0.56.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "max-sixty"; repo = "worktrunk"; tag = "v${finalAttrs.version}"; - hash = "sha256-6Soz41fyieWczJBNiv50UGUVMsvVej/1pMX3iPnvXg8="; + hash = "sha256-yjya7J35wXZoT2CCZhH2Qhgu6vjFzH3pHinMCiyMhe4="; }; - cargoHash = "sha256-NKjbn8RVtHWv/DqcQ/HqvvhKr9jAyisElD0OYyYbVAg="; + cargoHash = "sha256-IrYjEjorYEnIhEPskAqqr9O4yf1GXJFh/TDhSWZiBZk="; cargoBuildFlags = [ "--package=worktrunk" ]; From a2d77db044a5b03d0d3982efbc1aebb04cc2eb52 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 9 Jun 2026 19:53:17 -0300 Subject: [PATCH 016/133] lessc: 4.6.3 -> 4.6.6 --- pkgs/by-name/le/lessc/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix index 494657523c3d..85f1be5795e5 100644 --- a/pkgs/by-name/le/lessc/package.nix +++ b/pkgs/by-name/le/lessc/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm_9, + pnpm_11, pnpmConfigHook, callPackage, testers, @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lessc"; - version = "4.6.3"; + version = "4.6.6"; src = fetchFromGitHub { owner = "less"; repo = "less.js"; tag = "v${finalAttrs.version}"; - hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ="; + hash = "sha256-onTaVj69LYeYnywYXSC0I3ewF4rT0LAlRI61NEroLvc="; }; pnpmDeps = fetchPnpmDeps { @@ -32,16 +32,16 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-tlms2b0aodWkI+btdmCnwSDgsURekaBdiI8IZ/iMVnI="; }; strictDeps = true; nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_11 nodejs ]; From 6c82a20bbc25aff4efb81cfa192e58ae9b5502e6 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 12 Jun 2026 01:03:59 +0200 Subject: [PATCH 017/133] silver-searcher-ng: init at 2.2.0 This partially reverts commit 6d2532593145aa9a1f8191ee9f9b8e9784852d69. --- .../silver-searcher-ng/bash-completion.patch | 5 ++ .../by-name/si/silver-searcher-ng/package.nix | 55 +++++++++++++++++++ pkgs/top-level/aliases.nix | 2 +- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/si/silver-searcher-ng/bash-completion.patch create mode 100644 pkgs/by-name/si/silver-searcher-ng/package.nix diff --git a/pkgs/by-name/si/silver-searcher-ng/bash-completion.patch b/pkgs/by-name/si/silver-searcher-ng/bash-completion.patch new file mode 100644 index 000000000000..30e8c72389b7 --- /dev/null +++ b/pkgs/by-name/si/silver-searcher-ng/bash-completion.patch @@ -0,0 +1,5 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -9 +9 @@ +-bashcompdir = $(pkgdatadir)/completions ++bashcompdir = $(datadir)/bash-completion/completions diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix new file mode 100644 index 000000000000..20da881e8d2e --- /dev/null +++ b/pkgs/by-name/si/silver-searcher-ng/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + pcre, + zlib, + xz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "silver-searcher-ng"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "silver-searcher"; + repo = "silver-searcher-ng"; + rev = finalAttrs.version; + sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; + }; + + patches = [ ./bash-completion.patch ]; + + env = { + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of + # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here + # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 + NIX_CFLAGS_COMPILE = "-fcommon"; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + NIX_LDFLAGS = "-lgcc_s"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + pcre + zlib + xz + ]; + + meta = { + homepage = "https://github.com/silver-searcher/silver-searcher-ng"; + description = "Code-searching tool similar to ack, but faster"; + maintainers = with lib.maintainers; [ timschumi ]; + mainProgram = "ag"; + platforms = lib.platforms.all; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 860584e73a64..464abee85119 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1974,7 +1974,7 @@ mapAliases { sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signal-desktop-bin = throw "'signal-desktop-bin' has been replaced by 'signal-desktop' which is built from source"; # Added 2026-03-02 signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27 - silver-searcher = throw "'silver-searcher' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library"; + silver-searcher = throw "'silver-searcher' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library. Consider using 'silver-searcher-ng', which is a fork with support for PCRE2."; simpleBluez = warnAlias "'simpleBluez' has been renamed to 'simplebluez'" simplebluez; # Added 2026-02-18 simpleDBus = warnAlias "'simpleDBus' has been renamed to 'simpledbus'" simpledbus; # Added 2026-02-12 simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17 From 67919be717e87cfea39f4d3010a9f05c3a3de0bb Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 12 Jun 2026 01:06:38 +0200 Subject: [PATCH 018/133] silver-searcher-ng: 2.2.0 -> 3.0.0 --- pkgs/by-name/si/silver-searcher-ng/package.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix index 20da881e8d2e..33885543ab23 100644 --- a/pkgs/by-name/si/silver-searcher-ng/package.nix +++ b/pkgs/by-name/si/silver-searcher-ng/package.nix @@ -4,33 +4,25 @@ fetchFromGitHub, autoreconfHook, pkg-config, - pcre, + pcre2, zlib, xz, }: stdenv.mkDerivation (finalAttrs: { pname = "silver-searcher-ng"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "silver-searcher"; repo = "silver-searcher-ng"; rev = finalAttrs.version; - sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; + hash = "sha256-IiVFbS9XGmqcGN4NRXFC07cV6bGKDs9C2y5XxJKdvFk="; }; patches = [ ./bash-completion.patch ]; - env = { - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of - # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here - # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 - NIX_CFLAGS_COMPILE = "-fcommon"; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { NIX_LDFLAGS = "-lgcc_s"; }; @@ -39,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; buildInputs = [ - pcre + pcre2 zlib xz ]; From b4cf3a59449aa3f0fde388c73fe57fac2af21b6b Mon Sep 17 00:00:00 2001 From: Dan Xin Date: Sun, 14 Jun 2026 14:10:16 +0800 Subject: [PATCH 019/133] pijul: 1.0.0-beta.11 -> 1.0.0-beta.14 Signed-off-by: Dan Xin --- .../fix-rand-0.9-sanakirja-imports.patch | 19 ------------------- pkgs/by-name/pi/pijul/package.nix | 11 ++++++----- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch diff --git a/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch b/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch deleted file mode 100644 index 17f34d5d3f43..000000000000 --- a/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/commands/git.rs -+++ b/src/commands/git.rs -@@ -1,6 +1,7 @@ - use anyhow::bail; - use clap::{Parser, ValueHint}; - use libpijul::pristine::*; -+use ::sanakirja::RootPageMut as _; - use libpijul::*; - use log::{debug, error, info, trace}; - use std::collections::{BTreeMap, BTreeSet, HashSet}; -@@ -564,7 +565,7 @@ - tmp_path.pop(); - use rand::Rng; - let s: String = rand::thread_rng() -- .sample_iter(&rand::distributions::Alphanumeric) -+ .sample_iter(&rand::distr::Alphanumeric) - .take(30) - .map(|x| x as char) - .collect(); diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 7252cb7eec97..6cec25019d44 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -14,18 +14,19 @@ }: rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + pname = "pijul"; - version = "1.0.0-beta.11"; + version = "1.0.0-beta.14"; src = fetchCrate { inherit (finalAttrs) version pname; - hash = "sha256-+rMMqo2LBYlCFQJv8WFCSEJgDUbMi8DnVDKXIWm3tIk="; + hash = "sha256-Ex8fCIcif2lmZ3ytLARwgGzEeq6GB2NDvwd96niDKbQ="; }; - cargoHash = "sha256-IhArTiReUdj49bA+XseQpOiszK801xX5LdLj8vXD8rs="; - - patches = [ ./fix-rand-0.9-sanakirja-imports.patch ]; + cargoHash = "sha256-yPzDzfD+QdhAXdyvzDV1z9HDe1mwF9cRCsliejr8H88="; + # Tests require a TTY, which the Nix sandbox does not provide. doCheck = false; nativeBuildInputs = [ installShellFiles From b2aade9cfd92fb4750e41f7d3f573407eab38cf1 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 12 Jun 2026 01:08:26 +0200 Subject: [PATCH 020/133] silver-searcher-ng: run upstream tests --- pkgs/by-name/si/silver-searcher-ng/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix index 33885543ab23..ba71da4ed9a8 100644 --- a/pkgs/by-name/si/silver-searcher-ng/package.nix +++ b/pkgs/by-name/si/silver-searcher-ng/package.nix @@ -3,8 +3,10 @@ stdenv, fetchFromGitHub, autoreconfHook, + git, pkg-config, pcre2, + python3Packages, zlib, xz, }: @@ -30,12 +32,26 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook pkg-config ]; + buildInputs = [ pcre2 zlib xz ]; + doCheck = true; + nativeCheckInputs = [ + python3Packages.cram + git + ]; + checkPhase = '' + runHook preCheck + + make test + + runHook postCheck + ''; + meta = { homepage = "https://github.com/silver-searcher/silver-searcher-ng"; description = "Code-searching tool similar to ack, but faster"; From 8e079e0225f26cedfeaf53f6cd52e67f9b87ab4f Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 14 Jun 2026 20:13:24 +0200 Subject: [PATCH 021/133] silver-searcher-ng: enable recommended packaging attributes --- pkgs/by-name/si/silver-searcher-ng/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix index ba71da4ed9a8..e0f76f7aad0a 100644 --- a/pkgs/by-name/si/silver-searcher-ng/package.nix +++ b/pkgs/by-name/si/silver-searcher-ng/package.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; + strictDeps = true; + __structuredAttrs = true; + meta = { homepage = "https://github.com/silver-searcher/silver-searcher-ng"; description = "Code-searching tool similar to ack, but faster"; From 887c92037cff38470e37b0de92c3a691fd2b6261 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 18:29:26 +0000 Subject: [PATCH 022/133] drawterm: 0-unstable-2026-05-26 -> 0-unstable-2026-06-06 --- pkgs/by-name/dr/drawterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 58e89e83ca24..9c11d57015bf 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2026-05-26"; + version = "0-unstable-2026-06-06"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "0385fd3dc0343c4c882096c60558b01f61260736"; - hash = "sha256-OiGliIVMUpFaNkMn15qaYdBsU429Q0RUw68lqTOu880="; + rev = "3fdee4c284c98c84a85b2c9101aab7bbebf3dfbf"; + hash = "sha256-GUc69wONBOtVKjIJu+zgsUdUADWXUJlh3Fl7W0Ub99k="; }; enableParallelBuilding = true; From 5f361c1f340f03a7045ec889477f6b53c7400e5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 04:29:18 +0000 Subject: [PATCH 023/133] codebuff: 1.0.680 -> 1.0.681 --- pkgs/by-name/co/codebuff/package-lock.json | 8 ++++---- pkgs/by-name/co/codebuff/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 1de7560f441a..5cf1e70b7750 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.680" + "codebuff": "^1.0.681" } }, "node_modules/@isaacs/fs-minipass": { @@ -30,9 +30,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.680", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.680.tgz", - "integrity": "sha512-+HrrSchE7wsAQNcq5yJfL4YygOf+ng3T9S3yF+FZFVfnT29KVXSoar5mdRmzsVFNGjHZKc9I+kqt0dEO01G9Ow==", + "version": "1.0.681", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.681.tgz", + "integrity": "sha512-xRj1kKCvXA522IiomLVV0EyORdsjjS4T/shLVeoTrdM9MNZRqrCcm/b9bsiTIzwlYz4oQFgBfmWeHapKKPjh7A==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index d29736373447..e8543c35f756 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "codebuff"; - version = "1.0.680"; + version = "1.0.681"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz"; - hash = "sha256-glsZk5q+Qd2NbMk/jIXklCHf9MSSqkMN67d7k1fuzlk="; + hash = "sha256-tkQ8MOkQk4vaS9PFqlFBV6unEgysXcwHrKGgxfe60fM="; }; strictDeps = true; - npmDepsHash = "sha256-+HZN4oal+Bn7uKfWrWd/eDRvuAPvRKlGO4ThFamNZCI="; + npmDepsHash = "sha256-KB0QCfpGP32O5dU+/2dOEmX87iclJrZudIkTNp9ZxSw="; postPatch = '' cp ${./package-lock.json} package-lock.json From a1437743ad033be195d83f92fd8ca29d3c92c535 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Mon, 15 Jun 2026 07:16:09 +0000 Subject: [PATCH 024/133] ec2-metadata-mock: 1.12.0 -> 1.13.0 --- pkgs/by-name/ec/ec2-metadata-mock/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ec/ec2-metadata-mock/package.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix index 9b278f4ec48d..e95085dbe2ab 100644 --- a/pkgs/by-name/ec/ec2-metadata-mock/package.nix +++ b/pkgs/by-name/ec/ec2-metadata-mock/package.nix @@ -6,20 +6,18 @@ buildGoModule (finalAttrs: { pname = "ec2-metadata-mock"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y="; + hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8="; }; - vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c="; + vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU="; - postInstall = '' - mv $out/bin/{cmd,ec2-metadata-mock} - ''; + subPackages = [ "cmd/ec2-metadata-mock" ]; meta = { description = "Amazon EC2 Metadata Mock"; From 3587874e51753c90bc50ace422d0486233ef59a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 14:10:14 +0000 Subject: [PATCH 025/133] signalbackup-tools: 20260603-1 -> 20260615 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 11366c865466..aafc51dbd2a3 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260603-1"; + version = "20260615"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-Y4RxuDVb9nkAMzTmasznCNsO31jxpDDd2eG9l04bGDg="; + hash = "sha256-T/LMv2HbdGo8OViAz2/QFiBXSLqDpkXH5XMvA6H7I70="; }; nativeBuildInputs = [ From 4a3079eda3efa38d80f83c9e459b8d3923ee4219 Mon Sep 17 00:00:00 2001 From: Sam Pointon Date: Mon, 15 Jun 2026 14:31:00 +0100 Subject: [PATCH 026/133] systems: set rust.platform.env as rustc does rustc allows code to perform compile-time tests against target_env [0], which is a function of the target triple. There isn't provision in Nixpkgs for learning target_env, however. That doesn't affect rustc's evaluation of cfg guards in Rust code - rustc knows perfectly well what target_env is - but it _does_ affect the env vars passed to a build script set by buildRustCrate, which is presently hard-coded to gnu, and also affects any Nix code looking to branch on target_env. Being able to access target_env is very relevant to, for example, WASI as (using Rust terminology) wasm32-wasip1 and wasm32-wasip2 differ only by target_env, with identical target_arch and target_os values. Properly reflecting target_env may also fix some random musl issues if you're a bit lucky. This commit adds a new attr, rust.platform.env, which reflects the target_env that rustc will set for the target, and wires it up in buildRustCrate. In isolation, this change mostly only affects build scripts checking target_env, but crate2nix will greatly benefit from being able to accurately resolve the dep graph (which can also vary depending on target_env). The target triple -> target_env function resists Kolmogorov compression: it's irregular and, though there are some patterns, there are lots of special cases. So, I have done the stupidest possible thing and scraped out all of the targets with non-empty target_env values and dumped that into an attrset. This attrset will progressively get out of date as rustc adds new platforms, but updating it should be simple enough - I've included the generation script as a comment. There are some other configuration options not being reflected in Nix. I have left those alone, but, in the future, maybe this can be extended to just dumping all of them into an attrset and then reflecting them in rust.platform. It might even make sense to convert the existing code producing rust.platform to just looking up from an attrset and to 'do what rustc does'. I would have liked to have added a test targetting a platform with a non-empty non-GNU target_env, but all of the yaks were quite hairy. Fixes https://github.com/NixOS/nixpkgs/issues/436832 [0]: https://doc.rust-lang.org/reference/conditional-compilation.html#r-cfg.target_env --- lib/systems/default.nix | 11 ++ lib/systems/rustc-target-env.nix | 160 ++++++++++++++++++ .../rust/build-rust-crate/configure-crate.nix | 2 +- .../rust/build-rust-crate/test/default.nix | 60 +++++++ 4 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 lib/systems/rustc-target-env.nix diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 53c095711aef..72fe1f549cf3 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -23,6 +23,7 @@ let platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; architectures = import ./architectures.nix { inherit lib; }; + rustc-target-env = import ./rustc-target-env.nix; /** Elaborated systems contain functions, which means that they don't satisfy @@ -449,6 +450,16 @@ let else final.parsed.cpu.name; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_env + # Accomodate system definitions written before Nixpkgs learned about target_env. + env = + if rust ? platform.env then + rust.platform.env + else if rustc-target-env ? ${final.rust.rustcTargetSpec} then + rustc-target-env.${final.rust.rustcTargetSpec} + else + ""; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os os = if rust ? platform then diff --git a/lib/systems/rustc-target-env.nix b/lib/systems/rustc-target-env.nix new file mode 100644 index 000000000000..a0bb0b66dc9c --- /dev/null +++ b/lib/systems/rustc-target-env.nix @@ -0,0 +1,160 @@ +# As of rustc 1.96.0. Empty `target_env` values are omitted. +# +# Generation script: +# #!/bin/bash +# rustc --print target-list | while read -r target ; do +# env=$(rustc --print cfg --target "$target" | grep '^target_env=' | sed 's/# ^target_env="//;s/"$//') +# [[ -z "$env" ]] && continue +# printf ' %s = "%s";\n' "$target" "$env" +# done +{ + aarch64-apple-ios-macabi = "macabi"; + aarch64-apple-ios-sim = "sim"; + aarch64-apple-tvos-sim = "sim"; + aarch64-apple-visionos-sim = "sim"; + aarch64-apple-watchos-sim = "sim"; + aarch64-pc-windows-gnullvm = "gnu"; + aarch64-pc-windows-msvc = "msvc"; + aarch64-unknown-linux-gnu = "gnu"; + aarch64-unknown-linux-gnu_ilp32 = "gnu"; + aarch64-unknown-linux-musl = "musl"; + aarch64-unknown-linux-ohos = "ohos"; + aarch64-unknown-managarm-mlibc = "mlibc"; + aarch64-unknown-nto-qnx700 = "nto70"; + aarch64-unknown-nto-qnx710 = "nto71"; + aarch64-unknown-nto-qnx710_iosock = "nto71_iosock"; + aarch64-unknown-nto-qnx800 = "nto80"; + aarch64-unknown-redox = "relibc"; + aarch64-uwp-windows-msvc = "msvc"; + aarch64-wrs-vxworks = "gnu"; + aarch64_be-unknown-linux-gnu = "gnu"; + aarch64_be-unknown-linux-gnu_ilp32 = "gnu"; + aarch64_be-unknown-linux-musl = "musl"; + arm-unknown-linux-gnueabi = "gnu"; + arm-unknown-linux-gnueabihf = "gnu"; + arm-unknown-linux-musleabi = "musl"; + arm-unknown-linux-musleabihf = "musl"; + arm64ec-pc-windows-msvc = "msvc"; + armeb-unknown-linux-gnueabi = "gnu"; + armv4t-unknown-linux-gnueabi = "gnu"; + armv5te-unknown-linux-gnueabi = "gnu"; + armv5te-unknown-linux-musleabi = "musl"; + armv5te-unknown-linux-uclibceabi = "uclibc"; + armv6k-nintendo-3ds = "newlib"; + armv7-rtems-eabihf = "newlib"; + armv7-sony-vita-newlibeabihf = "newlib"; + armv7-unknown-linux-gnueabi = "gnu"; + armv7-unknown-linux-gnueabihf = "gnu"; + armv7-unknown-linux-musleabi = "musl"; + armv7-unknown-linux-musleabihf = "musl"; + armv7-unknown-linux-ohos = "ohos"; + armv7-unknown-linux-uclibceabi = "uclibc"; + armv7-unknown-linux-uclibceabihf = "uclibc"; + armv7-wrs-vxworks-eabihf = "gnu"; + armv7a-vex-v5 = "v5"; + csky-unknown-linux-gnuabiv2 = "gnu"; + csky-unknown-linux-gnuabiv2hf = "gnu"; + hexagon-unknown-linux-musl = "musl"; + i386-apple-ios = "sim"; + i586-unknown-linux-gnu = "gnu"; + i586-unknown-linux-musl = "musl"; + i586-unknown-redox = "relibc"; + i686-pc-nto-qnx700 = "nto70"; + i686-pc-windows-gnu = "gnu"; + i686-pc-windows-gnullvm = "gnu"; + i686-pc-windows-msvc = "msvc"; + i686-unknown-hurd-gnu = "gnu"; + i686-unknown-linux-gnu = "gnu"; + i686-unknown-linux-musl = "musl"; + i686-uwp-windows-gnu = "gnu"; + i686-uwp-windows-msvc = "msvc"; + i686-win7-windows-gnu = "gnu"; + i686-win7-windows-msvc = "msvc"; + i686-wrs-vxworks = "gnu"; + loongarch64-unknown-linux-gnu = "gnu"; + loongarch64-unknown-linux-musl = "musl"; + loongarch64-unknown-linux-ohos = "ohos"; + m68k-unknown-linux-gnu = "gnu"; + mips-unknown-linux-gnu = "gnu"; + mips-unknown-linux-musl = "musl"; + mips-unknown-linux-uclibc = "uclibc"; + mips64-openwrt-linux-musl = "musl"; + mips64-unknown-linux-gnuabi64 = "gnu"; + mips64-unknown-linux-muslabi64 = "musl"; + mips64el-unknown-linux-gnuabi64 = "gnu"; + mips64el-unknown-linux-muslabi64 = "musl"; + mipsel-unknown-linux-gnu = "gnu"; + mipsel-unknown-linux-musl = "musl"; + mipsel-unknown-linux-uclibc = "uclibc"; + mipsisa32r6-unknown-linux-gnu = "gnu"; + mipsisa32r6el-unknown-linux-gnu = "gnu"; + mipsisa64r6-unknown-linux-gnuabi64 = "gnu"; + mipsisa64r6el-unknown-linux-gnuabi64 = "gnu"; + powerpc-unknown-linux-gnu = "gnu"; + powerpc-unknown-linux-gnuspe = "gnu"; + powerpc-unknown-linux-musl = "musl"; + powerpc-unknown-linux-muslspe = "musl"; + powerpc-wrs-vxworks = "gnu"; + powerpc-wrs-vxworks-spe = "gnu"; + powerpc64-unknown-linux-gnu = "gnu"; + powerpc64-unknown-linux-musl = "musl"; + powerpc64-wrs-vxworks = "gnu"; + powerpc64le-unknown-linux-gnu = "gnu"; + powerpc64le-unknown-linux-musl = "musl"; + riscv32-wrs-vxworks = "gnu"; + riscv32gc-unknown-linux-gnu = "gnu"; + riscv32gc-unknown-linux-musl = "musl"; + riscv32imac-esp-espidf = "newlib"; + riscv32imafc-esp-espidf = "newlib"; + riscv32imc-esp-espidf = "newlib"; + riscv64-wrs-vxworks = "gnu"; + riscv64a23-unknown-linux-gnu = "gnu"; + riscv64gc-unknown-linux-gnu = "gnu"; + riscv64gc-unknown-linux-musl = "musl"; + riscv64gc-unknown-managarm-mlibc = "mlibc"; + riscv64gc-unknown-redox = "relibc"; + s390x-unknown-linux-gnu = "gnu"; + s390x-unknown-linux-musl = "musl"; + sparc-unknown-linux-gnu = "gnu"; + sparc64-unknown-linux-gnu = "gnu"; + thumbv7a-pc-windows-msvc = "msvc"; + thumbv7a-uwp-windows-msvc = "msvc"; + thumbv7neon-unknown-linux-gnueabihf = "gnu"; + thumbv7neon-unknown-linux-musleabihf = "musl"; + wasm32-wali-linux-musl = "musl"; + wasm32-wasip1 = "p1"; + wasm32-wasip1-threads = "p1"; + wasm32-wasip2 = "p2"; + wasm32-wasip3 = "p3"; + x86_64-apple-ios = "sim"; + x86_64-apple-ios-macabi = "macabi"; + x86_64-apple-tvos = "sim"; + x86_64-apple-watchos-sim = "sim"; + x86_64-fortanix-unknown-sgx = "sgx"; + x86_64-pc-nto-qnx710 = "nto71"; + x86_64-pc-nto-qnx710_iosock = "nto71_iosock"; + x86_64-pc-nto-qnx800 = "nto80"; + x86_64-pc-windows-gnu = "gnu"; + x86_64-pc-windows-gnullvm = "gnu"; + x86_64-pc-windows-msvc = "msvc"; + x86_64-unikraft-linux-musl = "musl"; + x86_64-unknown-hurd-gnu = "gnu"; + x86_64-unknown-l4re-uclibc = "uclibc"; + x86_64-unknown-linux-gnu = "gnu"; + x86_64-unknown-linux-gnuasan = "gnu"; + x86_64-unknown-linux-gnumsan = "gnu"; + x86_64-unknown-linux-gnutsan = "gnu"; + x86_64-unknown-linux-gnux32 = "gnu"; + x86_64-unknown-linux-musl = "musl"; + x86_64-unknown-linux-ohos = "ohos"; + x86_64-unknown-managarm-mlibc = "mlibc"; + x86_64-unknown-redox = "relibc"; + x86_64-uwp-windows-gnu = "gnu"; + x86_64-uwp-windows-msvc = "msvc"; + x86_64-win7-windows-gnu = "gnu"; + x86_64-win7-windows-msvc = "msvc"; + x86_64-wrs-vxworks = "gnu"; + xtensa-esp32-espidf = "newlib"; + xtensa-esp32s2-espidf = "newlib"; + xtensa-esp32s3-espidf = "newlib"; +} diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 060ce25df8db..6d7b530454d9 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -148,7 +148,7 @@ in export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 - export CARGO_CFG_TARGET_ENV="gnu" + export CARGO_CFG_TARGET_ENV=${stdenv.hostPlatform.rust.platform.env} export CARGO_CFG_TARGET_ENDIAN=${ if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big" } diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 7e05e49072ab..b0f9dd4190f8 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1008,6 +1008,66 @@ rec { ]; }; + crateWasm32TargetEnv = assertOutputs { + name = "gnu64-crate-target-env"; + mkCrate = mkCrate pkgsCross.wasm32-unknown-none.buildRustCrate; + crateArgs = { + crateName = "wasm32-crate-target-env"; + crateBin = [ { name = "wasm32-crate-target-env"; } ]; + src = symlinkJoin { + name = "wasm32-crate-target-env-sources"; + paths = [ + (mkFile "build.rs" '' + fn main() { + assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("".to_string())); + } + '') + (mkFile "src/main.rs" '' + use std::env; + #[cfg(target_env = "")] + fn main() { + let name: String = env::args().nth(0).unwrap(); + println!("executed {}", name); + } + '') + ]; + }; + }; + expectedFiles = [ + "./bin/wasm32-crate-target-env.wasm" + ]; + }; + + crateGnu64TargetEnv = assertOutputs { + name = "gnu64-crate-target-env"; + mkCrate = mkCrate pkgsCross.gnu64.buildRustCrate; + crateArgs = { + crateName = "gnu64-crate-target-env"; + crateBin = [ { name = "gnu64-crate-target-env"; } ]; + src = symlinkJoin { + name = "gnu64-crate-target-env-sources"; + paths = [ + (mkFile "build.rs" '' + fn main() { + assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("gnu".to_string())); + } + '') + (mkFile "src/main.rs" '' + use std::env; + #[cfg(target_env = "gnu")] + fn main() { + let name: String = env::args().nth(0).unwrap(); + println!("executed {}", name); + } + '') + ]; + }; + }; + expectedFiles = [ + "./bin/gnu64-crate-target-env" + ]; + }; + brotliTest = let pkg = brotliCrates.brotli_2_5_0 { }; From f347c80e99d0870f8c5225410f10ec1e849240ad Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 22:22:40 +0700 Subject: [PATCH 027/133] python3Packages.volvooncall: migrate to pyproject --- pkgs/development/python-modules/volvooncall/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index ac459dd7aaa1..eb87829a3382 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -7,6 +7,7 @@ docopt, fetchFromGitHub, fetchpatch, + setuptools, geopy, mock, pytest-asyncio_0, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "volvooncall"; version = "0.10.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "molobrakos"; @@ -34,7 +35,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; optional-dependencies = { console = [ From 3c87485efdac5778710383c5fa9d36bf45f94544 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 22:24:11 +0700 Subject: [PATCH 028/133] python3Packages.volvooncall: modernize --- .../python-modules/volvooncall/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index eb87829a3382..ccb531b46691 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -14,15 +14,17 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "volvooncall"; version = "0.10.4"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xr3g93rt3jvxVZrZY7cFh5eBP3k0arsejsgvx8p5EV4="; }; @@ -56,16 +58,16 @@ buildPythonPackage rec { pytest-asyncio_0 pytestCheckHook ] - ++ optional-dependencies.mqtt; + ++ finalAttrs.passthru.optional-dependencies.mqtt; pythonImportsCheck = [ "volvooncall" ]; meta = { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; - changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${finalAttrs.version}"; license = lib.licenses.unlicense; mainProgram = "voc"; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) From 5986fcd20fa8cdc00a6df3eb5fdfae66b4c3fee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 15:54:45 +0000 Subject: [PATCH 029/133] mochi: 1.21.14 -> 1.21.16 --- pkgs/by-name/mo/mochi/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 8eb6000d6abd..0f41fbeb5f90 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -12,14 +12,14 @@ let pname = "mochi"; - version = "1.21.14"; + version = "1.21.16"; linux = appimageTools.wrapType2 rec { inherit pname version meta; src = fetchurl { url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage"; - hash = "sha256-+iMT8xofQB2m1V4rNZHR6loRfxNGgcptD3FPlFXC5Mw="; + hash = "sha256-LWwv/+2/djc2bdqhnJiG5etXg+MFaEZbpttewVBZdeg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -44,9 +44,9 @@ let url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg"; hash = if stdenv.hostPlatform.isAarch64 then - "sha256-/ML5jWTBVLzitZDaBoU6sVJ0iNmq0jjMIV33yLnX1io=" + "sha256-dtdQZYGrukT/UgfNdsnGxOYmpuebJCDHXW8cAGN2GZE=" else - "sha256-vldyC/VkHf+BofpKvOxzCTM8F77k2aX9CxFP+frKvKc="; + "sha256-FdNFpuIOMgRzniB9Aze3GUpNY27h++StTdwqfF1k07I="; }; sourceRoot = "."; From 40b38170c34dff312b965a01e9717368789e5c26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 16:57:29 +0000 Subject: [PATCH 030/133] iroh-dns-server: 0.98.2 -> 1.0.0 --- pkgs/tools/networking/iroh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix index df44ce53c60b..d0dc19d8b749 100644 --- a/pkgs/tools/networking/iroh/default.nix +++ b/pkgs/tools/networking/iroh/default.nix @@ -12,16 +12,16 @@ let }: rustPlatform.buildRustPackage rec { pname = name; - version = "0.98.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "iroh"; rev = "v${version}"; - hash = "sha256-oYKl0dJLJtn2HDxu0ajlhzEWL741h4yN8ZVEQq2dwRk="; + hash = "sha256-L5y2/u5Sxh0tnl1NJS5dcRVLHDExHMiF12p0gRY2fzM="; }; - cargoHash = "sha256-hO7bJt4RnqE8PLvemISqN7fqIjDbVPHZrW5AQlGJeqw="; + cargoHash = "sha256-R6b1BfKlgFCcPSif0qMHCj/gZ6v2beawbF4P3knkROw="; buildFeatures = cargoFeatures; cargoBuildFlags = [ From 36977f32c32fea458c8f65755055a46305a0be0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 16:57:35 +0000 Subject: [PATCH 031/133] iroh-relay: 0.98.2 -> 1.0.0 --- pkgs/tools/networking/iroh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix index df44ce53c60b..d0dc19d8b749 100644 --- a/pkgs/tools/networking/iroh/default.nix +++ b/pkgs/tools/networking/iroh/default.nix @@ -12,16 +12,16 @@ let }: rustPlatform.buildRustPackage rec { pname = name; - version = "0.98.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "iroh"; rev = "v${version}"; - hash = "sha256-oYKl0dJLJtn2HDxu0ajlhzEWL741h4yN8ZVEQq2dwRk="; + hash = "sha256-L5y2/u5Sxh0tnl1NJS5dcRVLHDExHMiF12p0gRY2fzM="; }; - cargoHash = "sha256-hO7bJt4RnqE8PLvemISqN7fqIjDbVPHZrW5AQlGJeqw="; + cargoHash = "sha256-R6b1BfKlgFCcPSif0qMHCj/gZ6v2beawbF4P3knkROw="; buildFeatures = cargoFeatures; cargoBuildFlags = [ From fb7d30da81b06518f38784c0ac8abf6435cc84fb Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 15 Jun 2026 10:34:22 -0400 Subject: [PATCH 032/133] elixir/erlang: deprecated top-level attributes These top-level attributes are duplicative, and more likely to cause footguns for users. Let's deprecate them and direct people to use the package sets. --- pkgs/by-name/cl/cl/package.nix | 4 ++-- .../er/erlang-language-platform/package.nix | 4 ++-- pkgs/by-name/gl/gleam/package.nix | 4 ++-- pkgs/by-name/me/mercury/package.nix | 6 ++--- pkgs/by-name/pl/plausible/package.nix | 3 +-- pkgs/by-name/ra/rabbitmq-server/package.nix | 3 +-- pkgs/by-name/ts/tsung/package.nix | 4 ++-- pkgs/by-name/wi/wings/package.nix | 6 ++--- pkgs/by-name/ya/yaws/package.nix | 4 ++-- pkgs/servers/http/couchdb/3.nix | 4 ++-- pkgs/top-level/aliases.nix | 9 +++++++ pkgs/top-level/all-packages.nix | 24 ++----------------- 12 files changed, 31 insertions(+), 44 deletions(-) diff --git a/pkgs/by-name/cl/cl/package.nix b/pkgs/by-name/cl/cl/package.nix index 33f19af1798b..0ed69f19ed7e 100644 --- a/pkgs/by-name/cl/cl/package.nix +++ b/pkgs/by-name/cl/cl/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rebar3, - erlang, + beamPackages, opencl-headers, ocl-icd, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - erlang + beamPackages.erlang rebar3 opencl-headers ocl-icd diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index cdb1d13e0ba1..6288fddca42a 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -3,7 +3,7 @@ lib, fetchurl, autoPatchelfHook, - erlang, + beamPackages, }: let # erlang-language-platform supports multiple OTP versions. @@ -15,7 +15,7 @@ let "elp-macos-${arch}-apple-darwin" else "elp-linux-${arch}-unknown-linux-gnu"; - otp_version = "otp-${lib.versions.major erlang.version}"; + otp_version = "otp-${lib.versions.major beamPackages.erlang.version}"; release_major = "${platform}-${otp_version}"; hashes = builtins.fromJSON (builtins.readFile ./hashes.json); diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix index 928c7f2613e3..ec64c958c1c5 100644 --- a/pkgs/by-name/gl/gleam/package.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, git, pkg-config, - erlang, + beamPackages, nodejs, bun, deno, @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - erlang + beamPackages.erlang ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/me/mercury/package.nix b/pkgs/by-name/me/mercury/package.nix index 10a1d8b570c0..45326948f2ba 100644 --- a/pkgs/by-name/me/mercury/package.nix +++ b/pkgs/by-name/me/mercury/package.nix @@ -7,7 +7,7 @@ bison, texinfo, openjdk8_headless, - erlang, + beamPackages, makeWrapper, readline, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { bison texinfo openjdk8_headless - erlang + beamPackages.erlang readline ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/$e \ --prefix PATH ":" "${gcc}/bin" \ --prefix PATH ":" "${openjdk8_headless}/bin" \ - --prefix PATH ":" "${erlang}/bin" + --prefix PATH ":" "${beamPackages.erlang}/bin" done ''; diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index 3afdb2a5040c..9dbcce981432 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -1,7 +1,6 @@ { lib, beam27Packages, - elixir_1_18, buildNpmPackage, rustPlatform, fetchFromGitHub, @@ -130,7 +129,7 @@ let $out/lazy_html/_build/c/third_party/lexbor/${lexborCommit} ''; - beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; }); + beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; }); in beamPackages.mixRelease rec { diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index 31fe4e99d498..8873c897a339 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -1,7 +1,6 @@ { lib, beam27Packages, - elixir_1_18, stdenv, fetchurl, python3, @@ -41,7 +40,7 @@ let ] ); - beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; }); + beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; }); in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/ts/tsung/package.nix b/pkgs/by-name/ts/tsung/package.nix index 66a7ee410d41..bb9c3d065563 100644 --- a/pkgs/by-name/ts/tsung/package.nix +++ b/pkgs/by-name/ts/tsung/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, makeWrapper, - erlang, + beamPackages, python3, python3Packages, perlPackages, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - erlang + beamPackages.erlang gnuplot perlPackages.perl perlPackages.TemplateToolkit diff --git a/pkgs/by-name/wi/wings/package.nix b/pkgs/by-name/wi/wings/package.nix index 5f80dc7a6e64..90e6630a65f8 100644 --- a/pkgs/by-name/wi/wings/package.nix +++ b/pkgs/by-name/wi/wings/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - erlang, + beamPackages, cl, libGL, libGLU, @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ git ]; buildInputs = [ - erlang + beamPackages.erlang cl libGL libGLU @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { fi cat << EOF > $out/bin/wings #!${runtimeShell} - ${erlang}/bin/erl \ + ${beamPackages.erlang}/bin/erl \ -pa $out/lib/wings-${finalAttrs.version}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings diff --git a/pkgs/by-name/ya/yaws/package.nix b/pkgs/by-name/ya/yaws/package.nix index f0fd09dbaa56..433daf076be9 100644 --- a/pkgs/by-name/ya/yaws/package.nix +++ b/pkgs/by-name/ya/yaws/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - erlang, + beamPackages, pam, perl, autoreconfHook, @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ - erlang + beamPackages.erlang pam perl ]; diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index a83ce7727d5b..04bb048b4995 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - erlang, + beamMinimalPackages, icu, openssl, python3, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - erlang + beamMinimalPackages.erlang ]; buildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85054366042e..36de6c2ba903 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -687,8 +687,12 @@ mapAliases { electron_37 = throw "electron_37 has been removed in favor of newer versions"; # Added 2026-03-20 electron_37-bin = throw "electron_37-bin has been removed in favor of newer versions"; # Added 2026-03-20 elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04 + elixir = warnAlias "'elixir' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir' instead." beamPackages.elixir; # added 2026-06-15 elixir_1_15 = throw "'elixir_1_15' has been removed, due to the removal of erlang_26 as EOL"; # added 2026-04-01 elixir_1_16 = throw "'elixir_1_16' has been removed, due to the removal of erlang_26 as EOL"; # added 2026-04-01 + elixir_1_17 = warnAlias "'elixir_1_17' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir_1_17' instead." beamPackages.elixir_1_17; # added 2026-06-15 + elixir_1_18 = warnAlias "'elixir_1_18' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir_1_18' instead." beamPackages.elixir_1_18; # added 2026-06-15 + elixir_1_19 = warnAlias "'elixir_1_19' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir_1_19' instead." beamPackages.elixir_1_19; # added 2026-06-15 elixir_ls = throw "'elixir_ls' has been renamed to/replaced by 'elixir-ls'"; # Converted to throw 2025-10-27 elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25 emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27 @@ -708,8 +712,11 @@ mapAliases { epick = throw "'epick' has been removed as it has been unmaintained upstream since November 2022"; # Added 2026-02-07 eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 + erlang = warnAlias "'erlang' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.erlang' instead." beamPackages.erlang; # added 2026-06-15 erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02 erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01 + erlang_27 = warnAlias "'erlang_27' is deprecated in favor of using the beamPackages sets. Use 'beam27Packages.erlang' instead." beam27Packages.erlang; # added 2026-06-15 + erlang_28 = warnAlias "'erlang_28' is deprecated in favor of using the beamPackages sets. Use 'beam28Packages.erlang' instead." beam28Packages.erlang; # added 2026-06-15 esbuild-config = throw "'esbuild-config' has been removed as it has been unmaintained upstream since September 2022"; # Added 2026-02-07 etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08 ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28 @@ -717,6 +724,7 @@ mapAliases { eureka-ideas = throw "'eureka-ideas' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07 evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25 eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 + ex_doc = warnAlias "'ex_doc' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.ex_doc' instead." beamPackages.ex_doc; # added 2026-06-15 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18 fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 fancontrol-gui = throw "'fancontrol-gui' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 @@ -1126,6 +1134,7 @@ mapAliases { ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11 lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09 lexical = throw "'lexical' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24 + lfe = warnAlias "'lfe' is deprecated in favor of using the beamPackages sets. Use 'beam27Packages.lfe' instead." beam27Packages.lfe; # added 2026-06-15 lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27 libAppleWM = libapplewm; # Added 2026-02-04 libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cb689540262..b3c659db643e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4617,26 +4617,8 @@ with pkgs; wxSupport = false; }; - inherit (beam.interpreters) - erlang - erlang_28 - erlang_27 - ; - - inherit (beam.packages.erlang_28.beamPackages) - elixir_1_19 - ; - - inherit (beam.packages.erlang_27.beamPackages) - elixir - elixir_1_18 - elixir_1_17 + inherit (beamPackages) elixir-ls - ex_doc - lfe - ; - - inherit (beam.packages.erlang) erlfmt elvis-erlang rebar @@ -7554,9 +7536,7 @@ with pkgs; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - couchdb3 = callPackage ../servers/http/couchdb/3.nix { - erlang = beamMinimalPackages.erlang; - }; + couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; dict = callPackage ../servers/dict { flex = flex_2_5_35; From 00c4abb1b1cc05737ef7f7420c3e66eaea99cd3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 19:08:01 +0000 Subject: [PATCH 033/133] c2patool: 0.26.62 -> 0.26.67 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index c6c188658b82..875b10425d84 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.26.62"; + version = "0.26.67"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-OcZQ8z/hQh5oqXf6JTZ7qN4OSQAyewaBKHwID38aWmc="; + hash = "sha256-18gGrIleSpSwHohX+Qn6Zj6kPIzNri53tHIBlED5/LY="; }; - cargoHash = "sha256-x5QH1iysCdez5V4OQE2xqVXFBpxDygqCrs3MiXNTfTw="; + cargoHash = "sha256-YZKQmekJ0RxtyrLkCeiAry+m7j2jhxm0lsQ+Xi29nEw="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; From 3c72082c96087f21089257bba20895e01276c725 Mon Sep 17 00:00:00 2001 From: daskladas Date: Mon, 15 Jun 2026 21:39:12 +0200 Subject: [PATCH 034/133] angle-grinder: 0.19.4 -> 0.19.6 --- pkgs/by-name/an/angle-grinder/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix index c73c81853f80..09bd209626a7 100644 --- a/pkgs/by-name/an/angle-grinder/package.nix +++ b/pkgs/by-name/an/angle-grinder/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "angle-grinder"; - version = "0.19.4"; + version = "0.19.6"; src = fetchFromGitHub { owner = "rcoh"; repo = "angle-grinder"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c="; + sha256 = "sha256-CkDDX9U3e57fbKA9hwdy1AZ/ZDNpIFe6uvemmc6DcKA="; }; - cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU="; + cargoHash = "sha256-w1+wdvl4wmxOynsg7SmL5lSASd4Cl4OkMJoIBUmuKGY="; passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From 62d203b03d229f4ee1d01edbbcfbdc155628f9e0 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Mon, 15 Jun 2026 19:55:13 +0000 Subject: [PATCH 035/133] legitify: unbreak build --- pkgs/by-name/le/legitify/package.nix | 32 ++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix index 6147fc470318..a87f3ebb535c 100644 --- a/pkgs/by-name/le/legitify/package.nix +++ b/pkgs/by-name/le/legitify/package.nix @@ -4,23 +4,42 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "legitify"; version = "1.0.11"; src = fetchFromGitHub { owner = "Legit-Labs"; repo = "legitify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc="; }; - vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU="; + vendorHash = "sha256-XPfqQFGJ5yZJVFzHq4zzTXzwuxsAPJvTrZBK+gZWRKE="; + + overrideModAttrs = oldAttrs: { + postPatch = (oldAttrs.postPatch or "") + '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + go mod edit -replace golang.org/x/tools=golang.org/x/tools@v0.30.0 + go mod tidy + ''; + postBuild = (oldAttrs.postBuild or "") + '' + cp go.mod go.sum vendor/ + ''; + }; + + preBuild = '' + if [ -d vendor ]; then + chmod -R u+w vendor + cp vendor/go.mod vendor/go.sum . + fi + ''; ldflags = [ "-w" "-s" - "-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}" + "-X=github.com/Legit-Labs/legitify/internal/version.Version=${finalAttrs.version}" ]; preCheck = '' @@ -30,10 +49,9 @@ buildGoModule rec { meta = { description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets"; homepage = "https://github.com/Legit-Labs/legitify"; - changelog = "https://github.com/Legit-Labs/legitify/releases/tag/${src.tag}"; + changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "legitify"; - broken = true; }; -} +}) From 31073b23b0f92a9b090752bcb190766a117c8936 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2026 20:40:55 +0000 Subject: [PATCH 036/133] maintainers/github-teams.json: Automated sync --- maintainers/github-teams.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 9a9fc155a52c..1eaf3ca4cd13 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -128,7 +128,6 @@ "Pandapip1": 45835846, "a-kenji": 65275785, "drakon64": 6444703, - "michaelBelsanti": 62124625, "thefossguy": 44400303 }, "name": "COSMIC" @@ -847,6 +846,18 @@ }, "name": "Radicle" }, + "redis": { + "description": "Maintain Redis, related packages, module, and tests.", + "id": 17932473, + "maintainers": { + "Hythera": 87016780, + "MiniHarinn": 52773156, + "debtquity": 225436867, + "kybe236": 118068228 + }, + "members": {}, + "name": "Redis" + }, "reproducible": { "description": "Team that is interested in reproducible builds", "id": 7625643, From e9fc6a6096fd414d64e86349b4911dec543737ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 21:20:12 +0000 Subject: [PATCH 037/133] vscode-extensions.divyanshuagrawal.competitive-programming-helper: 2026.6.1780508121 -> 2026.6.1780853884 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1f6b8f072645..7ced00d18d2c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1375,8 +1375,8 @@ let mktplcRef = { name = "competitive-programming-helper"; publisher = "DivyanshuAgrawal"; - version = "2026.6.1780508121"; - hash = "sha256-4kb7Nk+gctECMQM/cko+q1Bta1EKPXPEqyCQLBMkbEo="; + version = "2026.6.1780853884"; + hash = "sha256-4nxH5qW3u3/9Vqf+QFs7l5BDusE5wcxxHiJFcPq/2EE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; From 4884e7d1e369020e17fb19e0a64944699eeeb7a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 21:43:51 +0000 Subject: [PATCH 038/133] python3Packages.hyponcloud: 0.9.4 -> 1.0.1 --- pkgs/development/python-modules/hyponcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyponcloud/default.nix b/pkgs/development/python-modules/hyponcloud/default.nix index 444c589e3f57..0fd1cc09dfa9 100644 --- a/pkgs/development/python-modules/hyponcloud/default.nix +++ b/pkgs/development/python-modules/hyponcloud/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "hyponcloud"; - version = "0.9.4"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "jcisio"; repo = "hyponcloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-eehYzPv527zfWAL1vyb6R6iRZW7sYcaOzJBetCHL8jE="; + hash = "sha256-Mn+OZHpDSMgA3mUi1s2t+HTlsnsN9eFfzdNNddDz6OA="; }; build-system = [ From 663a13de1a125b35d3d8538e2f078f93157c1644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 22:13:35 +0000 Subject: [PATCH 039/133] redumper: 722 -> 724 --- pkgs/by-name/re/redumper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix index 2e7df105a3cd..82b9027435f6 100644 --- a/pkgs/by-name/re/redumper/package.nix +++ b/pkgs/by-name/re/redumper/package.nix @@ -13,13 +13,13 @@ # redumper is using C++ modules, this requires latest C++20 compiler and build tools llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: { pname = "redumper"; - version = "722"; + version = "724"; src = fetchFromGitHub { owner = "superg"; repo = "redumper"; tag = "b${finalAttrs.version}"; - hash = "sha256-6UphK1Dq7szUMNqVuFNDK6/5AraOHDGeTXa5bzZo3PI="; + hash = "sha256-EOQEEQKxdAGGZr72/lfJv1KOz7bQglzxwpwblrTPtls="; }; patches = [ From bfe8eafc9cbb5f03533358193162478475a727c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 22:15:53 +0000 Subject: [PATCH 040/133] gaugePlugins.js: 5.0.5 -> 5.0.6 --- pkgs/by-name/ga/gauge/plugins/js/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gauge/plugins/js/default.nix b/pkgs/by-name/ga/gauge/plugins/js/default.nix index 7af057045b3e..d65139b31323 100644 --- a/pkgs/by-name/ga/gauge/plugins/js/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/js/default.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "gauge-plugin-js"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge-js"; rev = "v${version}"; - hash = "sha256-qWnBx6bvut/bSvFC8WPAetyAsF16Wz99Pq0tGg+YpZw="; + hash = "sha256-/hfsBoZ37A4W3uejmOnl6nZv0oCedkQFMNidqWb9DN8="; fetchSubmodules = true; }; - npmDepsHash = "sha256-HD1JsAewyzoUPKFwtpGGwjHWmYUpLSN3Spb5FW+3d10="; + npmDepsHash = "sha256-2kZDpRUegHqZOEc49h3+RRAbKroW7v63bXjzDAu/bCc="; npmBuildScript = "package"; buildInputs = [ nodejs ]; From 142b5fe53d1e34ceed7b6b8f33743e195e4403d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 23:14:15 +0000 Subject: [PATCH 041/133] art: 1.26.5 -> 1.26.6 --- pkgs/by-name/ar/art/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index b2daeeac12d2..1ddfd45d7f69 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "art"; - version = "1.26.5"; + version = "1.26.6"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; tag = finalAttrs.version; - hash = "sha256-kNe+1jwMJ8RVm4dBUg6/ik3TJRZVuGbZt5Wtx8qVbvk="; + hash = "sha256-m5KQUY7loLKH7X2cDw5n7biH1GJTVONTbguILdjNWrI="; }; # Fix the build with CMake 4. From f47a088a80b2afce40794ac10d447a941f159d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jun 2026 16:01:00 -0700 Subject: [PATCH 042/133] python3Packages.mail-parser: 4.1.4 -> 4.4.0 Diff: https://github.com/SpamScope/mail-parser/compare/4.1.4...4.4.0 --- .../python-modules/mail-parser/default.nix | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index c56abff52667..4a9958b594dd 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,58 +2,56 @@ lib, buildPythonPackage, python, - glibcLocales, + extract-msg, fetchFromGitHub, + hatchling, pytest-cov-stub, + pytest-mock, pytestCheckHook, - setuptools, - six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mail-parser"; - version = "4.1.4"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "SpamScope"; repo = "mail-parser"; - tag = version; - hash = "sha256-wwLUD/k26utugK/Yx9eXYEdSOvrk0Cy6RkXGDnzZ+fE="; + tag = finalAttrs.version; + hash = "sha256-fuL2cWQSkYQKhG/UVNOp4ch4MrZINizvsPCQUzb3Z9c="; }; - env.LC_ALL = "en_US.utf-8"; + build-system = [ hatchling ]; - nativeBuildInputs = [ glibcLocales ]; - - build-system = [ setuptools ]; - - pythonRemoveDeps = [ "ipaddress" ]; - - dependencies = [ - six - ]; + optional-dependencies = { + outlook = [ extract-msg ]; + }; pythonImportsCheck = [ "mailparser" ]; nativeCheckInputs = [ pytest-cov-stub + pytest-mock pytestCheckHook - ]; + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; - # Taken from .travis.yml + # Taken from .github/workflows/main.yml postCheck = '' ${python.interpreter} -m mailparser -v ${python.interpreter} -m mailparser -h ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j + ${python.interpreter} -m mailparser -f tests/mails/mail_outlook_1 -j cat tests/mails/mail_malformed_3 | ${python.interpreter} -m mailparser -k -j ''; meta = { + changelog = "https://github.com/SpamScope/mail-parser/releases/tag/${finalAttrs.src.tag}"; description = "Mail parser for python 2 and 3"; - mainProgram = "mailparser"; + mainProgram = "mail-parser"; homepage = "https://github.com/SpamScope/mail-parser"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ psyanticy ]; }; -} +}) From 3b0b0e4ac34a6f48bf4ce1de888e47216c4789c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jun 2026 16:05:42 -0700 Subject: [PATCH 043/133] python3Packages.mailsuite: 1.11.2 -> 2.2.2 Diff: https://github.com/seanthegeek/mailsuite/compare/1.11.2...2.2.2 Changelog: https://github.com/seanthegeek/mailsuite/blob/2.2.2/CHANGELOG.md --- .../python-modules/mailsuite/default.nix | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index c402453f7e42..71203068559e 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -1,24 +1,35 @@ { lib, + azure-identity, + authres, buildPythonPackage, + cryptography, + dkimpy, dnspython, expiringdict, - fetchPypi, + fetchFromGitHub, + google-api-python-client, + google-auth, + google-auth-oauthlib, hatchling, html2text, imapclient, mail-parser, + msgraph-sdk, publicsuffix2, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mailsuite"; - version = "1.11.2"; + version = "2.2.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-ilcOH27lVKhh/xFO/dkWZkwtx6wPYrKTWR3n1xqoUdk="; + src = fetchFromGitHub { + owner = "seanthegeek"; + repo = "mailsuite"; + tag = finalAttrs.version; + hash = "sha256-qQ+AaelLQED0mWCAItx/3d7o9QVUnhUVxvdCfnNRqzQ="; }; pythonRelaxDeps = [ "mail-parser" ]; @@ -26,6 +37,9 @@ buildPythonPackage rec { build-system = [ hatchling ]; dependencies = [ + authres + cryptography + dkimpy dnspython expiringdict html2text @@ -34,16 +48,30 @@ buildPythonPackage rec { publicsuffix2 ]; + optional-dependencies = { + all = lib.concatAttrValues (lib.removeAttrs finalAttrs.passthru.optional-dependencies [ "all" ]); + gmail = [ + google-api-python-client + google-auth + google-auth-oauthlib + ]; + msgraph = [ + azure-identity + msgraph-sdk + ]; + }; + pythonImportsCheck = [ "mailsuite" ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = "Python package to simplify receiving, parsing, and sending email"; homepage = "https://seanthegeek.github.io/mailsuite/"; - changelog = "https://github.com/seanthegeek/mailsuite/blob/master/CHANGELOG.md"; + changelog = "https://github.com/seanthegeek/mailsuite/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ talyz ]; }; -} +}) From 6c62c3fd126c3d1ee195202f948ec75217061453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jun 2026 16:16:17 -0700 Subject: [PATCH 044/133] python3Packages.parsedmarc: 9.6.0 -> 10.1.1 Diff: https://github.com/domainaware/parsedmarc/compare/9.6.0...10.1.1 Changelog: https://github.com/domainaware/parsedmarc/blob/10.1.1/CHANGELOG.md --- pkgs/by-name/pa/parsedmarc/package.nix | 41 +------------------ .../python-modules/parsedmarc/default.nix | 41 ++++++++----------- 2 files changed, 18 insertions(+), 64 deletions(-) diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix index f6b38bf7d3c3..0f28ef5ec02b 100644 --- a/pkgs/by-name/pa/parsedmarc/package.nix +++ b/pkgs/by-name/pa/parsedmarc/package.nix @@ -1,44 +1,7 @@ { - python3, + python3Packages, fetchFromGitHub, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - # https://github.com/domainaware/parsedmarc/issues/464 - msgraph-core = super.msgraph-core.overridePythonAttrs (old: rec { - version = "0.2.2"; - - src = fetchFromGitHub { - owner = "microsoftgraph"; - repo = "msgraph-sdk-python-core"; - rev = "v${version}"; - hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA="; - }; - - nativeBuildInputs = with self; [ - flit-core - ]; - - propagatedBuildInputs = with self; [ - requests - ]; - - nativeCheckInputs = with self; [ - pytestCheckHook - responses - ]; - - disabledTestPaths = [ - "tests/integration" - ]; - - pythonImportsCheck = [ "msgraph.core" ]; - }); - }; - }; -in -with python.pkgs; +with python3Packages; toPythonApplication parsedmarc diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 32d457b1596f..4d6b37a7baa6 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -16,17 +16,10 @@ elasticsearch-dsl, elasticsearch, expiringdict, - geoip2, - google-api-core, - google-api-python-client, - google-auth-httplib2, - google-auth-oauthlib, - google-auth, - imapclient, - kafka-python-ng, + kafka-python, lxml, mailsuite, - msgraph-core, + maxminddb, nixosTests, opensearch-py, publicsuffixlist, @@ -38,7 +31,7 @@ xmltodict, # test - unittestCheckHook, + pytestCheckHook, }: let @@ -49,14 +42,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "9.6.0"; + version = "10.1.1"; pyproject = true; src = fetchFromGitHub { owner = "domainaware"; repo = "parsedmarc"; tag = version; - hash = "sha256-ez7QMFsSvJzxhfCPA4G6oGQhqAzcgKBTJMiMogIJvNg="; + hash = "sha256-dFwlcbR8NNKrDBoKPDX9M82tTK5aCbeP3KMF/BctgMc="; }; postPatch = '' @@ -82,17 +75,10 @@ buildPythonPackage rec { elasticsearch elasticsearch-dsl expiringdict - geoip2 - google-api-core - google-api-python-client - google-auth - google-auth-httplib2 - google-auth-oauthlib - imapclient - kafka-python-ng + kafka-python lxml mailsuite - msgraph-core + maxminddb opensearch-py publicsuffixlist pygelf @@ -101,10 +87,17 @@ buildPythonPackage rec { tqdm urllib3 xmltodict - ]; + ] + ++ mailsuite.optional-dependencies.gmail + ++ mailsuite.optional-dependencies.msgraph; nativeCheckInputs = [ - unittestCheckHook + pytestCheckHook + ]; + + disabledTests = [ + # contacts DNS servers at 1.1.1.1 and 8.8.8.8 + "test_general_dns_settings_with_defaults" ]; pythonImportsCheck = [ "parsedmarc" ]; @@ -121,7 +114,5 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ talyz ]; mainProgram = "parsedmarc"; - # https://github.com/domainaware/parsedmarc/issues/464 - broken = lib.versionAtLeast msgraph-core.version "1.0.0"; }; } From 6564771d0f05818b39e03679edc028da48a4ad79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 23:34:58 +0000 Subject: [PATCH 045/133] kubectl: 1.36.1 -> 1.36.2 --- pkgs/by-name/ku/kubernetes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix index dc0735675aed..475d6e921049 100644 --- a/pkgs/by-name/ku/kubernetes/package.nix +++ b/pkgs/by-name/ku/kubernetes/package.nix @@ -23,13 +23,13 @@ buildGoModule (finalAttrs: { pname = "kubernetes"; - version = "1.36.1"; + version = "1.36.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; tag = "v${finalAttrs.version}"; - hash = "sha256-QG2zFaFtGXoWIlyp3hVBRU+OHre/6vWcvijUe1DdjIo="; + hash = "sha256-vE+2iBoJvkRhJDAHMCrJLIJKD53YWRBN6fBUP4589OU="; }; vendorHash = null; From 182e44d968ca9e39dcc6dd6ce260278cdac77b6e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 Jun 2026 01:27:29 +0200 Subject: [PATCH 046/133] wyoming-faster-whisper: 3.1.0 -> 3.2.0 https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v3.2.0 --- .../home-automation/wyoming/faster-whisper.nix | 13 +++++++++++++ pkgs/by-name/wy/wyoming-faster-whisper/package.nix | 11 +++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index 834cd7c6b774..c0851d190ec8 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -39,6 +39,17 @@ in options = { enable = mkEnableOption "Wyoming faster-whisper server"; + task = mkOption { + type = enum [ + "transcribe" + "translate" + ]; + default = "transcribe"; + description = '' + Whisper task to perform. + ''; + }; + zeroconf = { enable = mkEnableOption "zeroconf discovery" // { default = true; @@ -349,6 +360,8 @@ in options.uri "--device" options.device + "--whisper-task" + options.task "--stt-library" options.sttLibrary "--model" diff --git a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix index 65ddaad79125..8821f9552356 100644 --- a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix +++ b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "wyoming-faster-whisper"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; tag = "v${finalAttrs.version}"; - hash = "sha256-p1FCyj/D7ndKJD1/V5YzhT0xlkg61DSx2m3DCELmPO8="; + hash = "sha256-4tgBsraFd7IUHw6p/59FHzuUISOaALxBU7H8V0yQl0E="; }; build-system = with python3Packages; [ @@ -25,11 +25,6 @@ python3Packages.buildPythonApplication (finalAttrs: { "wyoming" ]; - pythonRemoveDeps = [ - # https://github.com/rhasspy/wyoming-faster-whisper/pull/81 - "requests" - ]; - dependencies = with python3Packages; [ faster-whisper wyoming @@ -58,7 +53,7 @@ python3Packages.buildPythonApplication (finalAttrs: { "wyoming_faster_whisper" ]; - # no tests + # tests require models from huggingface doCheck = false; meta = { From 74ea8346d84e006337538b62c0f5e0e355221824 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 23:49:41 +0000 Subject: [PATCH 047/133] python3Packages.netbox-dns: 1.5.9 -> 1.5.10 --- pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix index e3eb95a6e56f..8a86085099b2 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix @@ -7,7 +7,7 @@ }: buildPythonPackage (finalAttrs: { pname = "netbox-plugin-dns"; - version = "1.5.9"; + version = "1.5.10"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { owner = "peteeckel"; repo = "netbox-plugin-dns"; tag = finalAttrs.version; - hash = "sha256-yWOoYQm5XQs8j2DWs1UAaT9LwI61TKHjfOdjRn6UtJA="; + hash = "sha256-wxTW/qiwp+1CXUeCDJnllEW2oCTjlFVUot7JfWPooaw="; }; build-system = [ setuptools ]; From ebc03826a3cd26d646cb9fb66b5dceba09df6edd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 01:57:22 +0000 Subject: [PATCH 048/133] clickhouse-lts: 26.3.12.3-lts -> 26.3.13.31-lts --- pkgs/by-name/cl/clickhouse/lts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index d039c92c54f7..d265a7c5abc6 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "26.3.12.3-lts"; - rev = "d23c7536b980c34b39c850b08ef23c509f06aaaa"; - hash = "sha256-xM+dqOSNa4rMaCGgz86UCdF3szwXgYr5vH1Ov7y4X08="; + version = "26.3.13.31-lts"; + rev = "27ae4e9fe0e3f97f012b3be293caf42a60d08747"; + hash = "sha256-NTts2SiaQ+B+iPCAPLF4fLQmZ9/0Gp2FFu/E0aXfCMc="; lts = true; } From 420039c8c9d6a17bf8b0e9696c2e7c14e23aaf38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 02:21:23 +0000 Subject: [PATCH 049/133] prow: 0-unstable-2026-06-03 -> 0-unstable-2026-06-15 --- pkgs/by-name/pr/prow/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 755c375fe641..ddc780c80ae3 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-06-03"; - rev = "539ecaca1ce9f8aeeefbfd016be10d5c02876f6c"; + version = "0-unstable-2026-06-15"; + rev = "351e8cfd58915657bd36a50e7e86bbe972bc0739"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-6ySI5Nyv+Twd37w4S7Vxl2To9jjpEyxIH/giQmAY4oo="; + hash = "sha256-TvEAgi2uj1B513o2YWuONiCmCzQvA9S7XPL7MF1VZK4="; }; vendorHash = "sha256-PmvEW80vYTHfcgMOf1AwF9Xb3U9Uj85IJzBpRDxJzhM="; From cbb15ea618af7711514b0d31c34c248f8f2a695e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 03:26:47 +0000 Subject: [PATCH 050/133] python3Packages.microsoft-kiota-serialization-json: 1.10.2 -> 1.10.3 --- .../microsoft-kiota-serialization-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index ca3edef149bd..d0b08a6286d5 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "microsoft-kiota-serialization-json"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-json-v${finalAttrs.version}"; - hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; + hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4="; }; sourceRoot = "${finalAttrs.src.name}/packages/serialization/json/"; From 6c7f838c712edda68005ee82aeae9e8fb041ca2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 03:35:42 +0000 Subject: [PATCH 051/133] python3Packages.atproto: 0.0.67 -> 0.0.68 --- pkgs/development/python-modules/atproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix index eccdd83788ec..6692891b1546 100644 --- a/pkgs/development/python-modules/atproto/default.nix +++ b/pkgs/development/python-modules/atproto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "atproto"; - version = "0.0.67"; + version = "0.0.68"; pyproject = true; # use GitHub, pypi does not include tests @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "MarshalX"; repo = "atproto"; tag = "v${version}"; - hash = "sha256-r/+4DvTjMdu5v0tgbs9YgO3/EOJJqE81rEFrVMzq+x4="; + hash = "sha256-z5/CLC2pxp2cFNZQsnQT96g8y2CFjNmiEatu8yEmYHw="; }; env.POETRY_DYNAMIC_VERSIONING_BYPASS = version; From 7e005b0fc00476866e2ed388ddcbed4329748ffa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:31:18 +0000 Subject: [PATCH 052/133] cameradar: 6.1.1 -> 6.2.0 --- pkgs/by-name/ca/cameradar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix index 12d7eada0d08..6709ee32572c 100644 --- a/pkgs/by-name/ca/cameradar/package.nix +++ b/pkgs/by-name/ca/cameradar/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cameradar"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Ullaakut"; repo = "cameradar"; tag = "v${finalAttrs.version}"; - hash = "sha256-wJiHCJHG8S+iGFd9jFyavyxAtJ5FGlbvfFcGQfwpi9Y="; + hash = "sha256-NgzTZpRrFLoFNn3xiR5ysORTO9Yj2kn2aPSwSa441t0="; }; - vendorHash = "sha256-1jqGRwgbfcOq6fE3h9RJSeLRlFkd4w4L/2RwscA0zZ0="; + vendorHash = "sha256-NljQGN/B/+gdMGmE1pI2rJPfZNY3xBHYLf+xPxzuh3w="; nativeBuildInputs = [ pkg-config ]; From e5a0a9fa9a27bed3fc2159ff78bcbb84e699d41d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:31:48 +0000 Subject: [PATCH 053/133] python3Packages.geoarrow-rust-core: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/geoarrow-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix index e1967b606158..32161008b20e 100644 --- a/pkgs/development/python-modules/geoarrow-rust/default.nix +++ b/pkgs/development/python-modules/geoarrow-rust/default.nix @@ -22,20 +22,20 @@ shapely, }: let - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "geoarrow"; repo = "geoarrow-rs"; tag = "py-v${version}"; - hash = "sha256-qQGGG8aGwFR7ApLaQAE0iQSElpSBeRTtbq4+1xbTC/o="; + hash = "sha256-5RWhOw31yRzkBE27LeES7z3G7OgRHQZP3aYacBuPUDM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src version; pname = "geoarrow-rust-vendor"; cargoRoot = "python"; - hash = "sha256-UjLqynlt5Rkx10hlnaY76wDRhJwhNvHmkhpj04Y8/ek="; + hash = "sha256-HbtNzcFkqDS8RpxW6MBfOhhzy5MsaKguKkhDN5xGckY="; }; commonMeta = { From b3bfa5c605e298ab0724dda11a29064cb6010153 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:07:38 +0000 Subject: [PATCH 054/133] pure-prompt: 1.28.0 -> 1.28.1 --- pkgs/by-name/pu/pure-prompt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix index 9f39772e2cc2..cfad1310e22a 100644 --- a/pkgs/by-name/pu/pure-prompt/package.nix +++ b/pkgs/by-name/pu/pure-prompt/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pure-prompt"; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4And0+06KbIsFDTNupi42yR8fa1BjHoZVi9btdYPkTg="; + sha256 = "sha256-UQ0hP3qJd4Qxiw1LXPdb9d0Dc4OSD3HJpgYzaCfujno="; }; strictDeps = true; From ff403638a3246f2b5a0a3bcf12931e425b839ab6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:19:18 +0000 Subject: [PATCH 055/133] melonds: 1.1-unstable-2026-05-27 -> 1.1-unstable-2026-06-07 --- pkgs/by-name/me/melonds/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index d5bef23c640a..4403f9ff44eb 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonds"; - version = "1.1-unstable-2026-05-27"; + version = "1.1-unstable-2026-06-07"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "c69c1ceb1176a03782f13bb8ae54883a44cb2d5d"; - hash = "sha256-d/9tlGAo66v0C2/erdoDyLXqoxqaTExztlxbFE4V7d8="; + rev = "10a173b5536fc75cd93f8a3868349dad963542ef"; + hash = "sha256-YsVCU40BZgYoxyuscbD0Ab613eUIgYlXJkm0KJQg+yY="; }; nativeBuildInputs = [ From 3da2efb265ef4ee113e5f4d50ecfdfec3863053a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:22:48 +0000 Subject: [PATCH 056/133] python3Packages.pylutron-caseta: 0.28.0 -> 0.29.0 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 2736f2587fd3..34fd2777f6ba 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pylutron-caseta"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "gurumitts"; repo = "pylutron-caseta"; tag = "v${finalAttrs.version}"; - hash = "sha256-0HH+tEZoMTmvD3z67nJWauQfxoQ/IK1Bxlu1XbWGqI4="; + hash = "sha256-YGdx/WQLM7Dglo4FSEr+QJDKTf7Dyn8V3qSFWNlEu00="; }; build-system = [ hatchling ]; From 04f926b78b498c38202a1a0868d358ef59ceebd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:31:00 +0000 Subject: [PATCH 057/133] gore: 0.6.1 -> 0.6.2 --- pkgs/by-name/go/gore/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gore/package.nix b/pkgs/by-name/go/gore/package.nix index a15a0c10bfa6..1e50bec96416 100644 --- a/pkgs/by-name/go/gore/package.nix +++ b/pkgs/by-name/go/gore/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gore"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "motemen"; repo = "gore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EPySMj+mQxTJbGheAtzKvQq23DLljPR6COrmytu1x/Q="; + sha256 = "sha256-niMYoYkDaZsv6ntUIfB0B4VheiG6rMouZGUSjHnm51w="; }; - vendorHash = "sha256-W9hMxANySY31X2USbs4o5HssxQfK/ihJ+vCQ/PTyTDc="; + vendorHash = "sha256-oS5LJfLFrmHEwayoD+HygfamZpmerIL1i4QtoRL4Om4="; doCheck = false; From b3b897b4956ef4056f248e26b1e9054b9a73ddd2 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Mon, 15 Jun 2026 15:53:27 +0000 Subject: [PATCH 058/133] rmg: 0.8.9 -> 0.9.0 --- pkgs/by-name/rm/rmg/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 8f5707c82b09..8192570ab4f8 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, gitUpdater, boost, cmake, @@ -31,29 +30,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rmg"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; tag = "v${finalAttrs.version}"; - hash = "sha256-L8fA2D1BQWhJiygHmbOmINBFk27X2Vd7zHCGnElM9EE="; + hash = "sha256-7ULpuecg8n5AEpWEYIln2SQV6CsGKMyO9ZHT71bDcIg="; }; - # Fixes include errors from including minizip libraries - patches = [ - (fetchpatch2 { - name = "0000-fix-minizip-include-archive"; - url = "https://github.com/Rosalie241/RMG/commit/7e4e402f277803d3a998e96ea04064063bd1551a.patch"; - hash = "sha256-uyEYv2r7J2nou9AHkezEX0LS/mOnIa6lbQqhxHY9ibo="; - }) - (fetchpatch2 { - name = "0001-fix-minizip-include-mupen64plus-core"; - url = "https://github.com/Rosalie241/RMG/commit/8ee3410680c247dcfee806562073626a0b7bf46b.patch"; - hash = "sha256-29zg90ScPNizWq3BzNuM6yfCwmMXRYFfbjOg3YpCrGI="; - }) - ]; - nativeBuildInputs = [ cmake nasm From 3075ecefd28789cfc27b75b23be13bd2716e8fc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:57:14 +0000 Subject: [PATCH 059/133] check-jsonschema: 0.37.2 -> 0.37.3 --- pkgs/by-name/ch/check-jsonschema/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index bf59e76541e0..72e671a1a11a 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "check-jsonschema"; - version = "0.37.2"; + version = "0.37.3"; pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = finalAttrs.version; - hash = "sha256-Uflc92J8oSl633FD+DDIDGXvrFCfwpyxTqoNHLcHEpE="; + hash = "sha256-9s0AitPH9PAuQ7FH009ppBbH5Z2aNjhinAungoXX3OQ="; }; build-system = with python3Packages; [ setuptools ]; From 76b183a00ed62d03175f6ace47ee8fd8ddaf2f61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 08:40:50 +0000 Subject: [PATCH 060/133] grafanaPlugins.grafana-exploretraces-app: 2.0.3 -> 2.0.4 --- .../grafana/plugins/grafana-exploretraces-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix index 770104c28b62..60ecc076f2ee 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-exploretraces-app"; - version = "2.0.3"; - zipHash = "sha256-tV0XINCucQZeDirXHBJovA+V2MQ1f0gx3Jo9VsPNqSc="; + version = "2.0.4"; + zipHash = "sha256-pNmHq7kRlpucwd2taNaPa/m3+yBPUJwBLFoWpxe8eVQ="; meta = { description = "Opinionated traces app"; license = lib.licenses.agpl3Only; From 5b932f07cf97e731583e540dc2b0c03bc356202d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 08:47:29 +0000 Subject: [PATCH 061/133] qbittorrent-nox: 5.2.1 -> 5.2.2 --- pkgs/by-name/qb/qbittorrent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index 7d21ed81972b..671e1d0e3d2b 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${finalAttrs.version}"; - hash = "sha256-xC0XCVbshs4rtfLoJKKp0+IeSN2SRg7J5G504TcXFPI="; + hash = "sha256-5lGv1ajuDE/DTqUbnVeRRBcXntrzn6bs72mZbQMf7Fc="; }; nativeBuildInputs = [ From 8aa505b42ed755a779ecbc57a85bc23cdec22885 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 08:53:15 +0000 Subject: [PATCH 062/133] skills: 1.5.10 -> 1.5.11 --- pkgs/by-name/sk/skills/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index 1bf0ee506d32..86c8e7ca336c 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "skills"; - version = "1.5.10"; + version = "1.5.11"; src = fetchFromGitHub { owner = "vercel-labs"; repo = "skills"; tag = "v${finalAttrs.version}"; - hash = "sha256-nISOazYZ9I786Nn4TKmFXyK6WiTPdULdAG0aeRUVXvA="; + hash = "sha256-IAbkeN1ZP8z5xTaZafRLMhAlhXBDw+fkfTvjZBoGeqw="; }; pnpmDeps = fetchPnpmDeps { From 8fddae52a8f54f29594a2e68127f81d27d9b3c21 Mon Sep 17 00:00:00 2001 From: airone01 Date: Tue, 16 Jun 2026 10:28:28 +0200 Subject: [PATCH 063/133] mullvad-vpn: 2026.2 -> 2026.3 Diff: https://github.com/mullvad/mullvadvpn-app/compare/2026.2...2026.3 Changelog: https://github.com/mullvad/mullvadvpn-app/blob/2026.3/CHANGELOG.md --- pkgs/by-name/mu/mullvad-vpn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 60e664cdb4b5..c7115f9bfb27 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -90,14 +90,14 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-ewJ/XxqwVLF3/MsiN+AZ+jQodMr+JmPtpbcdXe6HNPo="; - aarch64-linux = "sha256-hpuLpDA3PMrlOkF172f0PZY+cGe2gBkRTWCwwwYJwQo="; + x86_64-linux = "sha256-OMbuc66AhwaIVgkiooUlttDazGLC5BCTiGPXA46TGso="; + aarch64-linux = "sha256-pEzb21CSPn/ZflzZGTSJI5Hz3Q+ERFILg8q7V89AN1Q="; }; in stdenv.mkDerivation (finalAttrs: { pname = "mullvad-vpn"; - version = "2026.2"; + version = "2026.3"; __structuredAttrs = true; strictDeps = true; From 77c2f0dbfc5081149b895b821fcb70bd9fd9c493 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 09:13:04 +0000 Subject: [PATCH 064/133] zapret2: 1.0 -> 1.0.1 --- pkgs/by-name/za/zapret2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix index 74dc0ae29657..b9a945235b5d 100644 --- a/pkgs/by-name/za/zapret2/package.nix +++ b/pkgs/by-name/za/zapret2/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret2"; - version = "1.0"; + version = "1.0.1"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "bol-van"; repo = "zapret2"; tag = "v${finalAttrs.version}"; - hash = "sha256-OCXsM1vIb/xtuwNCD4gbrlOV3F8jvARwOi1SCWhoOAY="; + hash = "sha256-hV9MVkDVkGGGdHCUGRscm9rIKORDEi+xWtfITQE22mw="; leaveDotGit = true; postFetch = '' cd "$out" From 3a1473f76f12e911d8d1b34b8aa52176462c6d25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 09:15:24 +0000 Subject: [PATCH 065/133] yamlscript: 0.2.12 -> 0.2.20 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 36c286df2dcd..5792b1f0e712 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "yamlscript"; - version = "0.2.12"; + version = "0.2.20"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar"; - hash = "sha256-/+vvOvZFVzGNC5838vX2CnLD5V2gEWWTXzEfz0AoSb8="; + hash = "sha256-RzMIzwq7L5H40DkVJaIyoa6yK36DphfwW24x0Bbe+Xk="; }; extraNativeImageBuildArgs = [ From 24b0dbfb95f10573cf915a7deaf042c0016bacb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 11:39:42 +0200 Subject: [PATCH 066/133] python3Packages.tencentcloud-sdk-python: 3.1.115 -> 3.1.116 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.115...3.1.116 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.116/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2f16eb0d726b..e8535389af88 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.115"; + version = "3.1.116"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-nGbh+gO1E9cxKh9uWdG7H5KqXcULwehbfHCtpxOHt3M="; + hash = "sha256-56WyEdYo0TWZYyYKIaenZDJiXRPFZKuIrpXvjMIgRMU="; }; build-system = [ setuptools ]; From a15f623ba41513e5cb61714dc83ebee01124c5e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 11:40:20 +0200 Subject: [PATCH 067/133] python3Packages.iamdata: 0.1.202606151 -> 0.1.202606161 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202606151...v0.1.202606161 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202606161 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 7c94104281fb..8a23a3014bff 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202606151"; + version = "0.1.202606161"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-mlh2kTJ/u6jdtR8+etx+zbaFC1P5kE7x+1JAiSPR4bk="; + hash = "sha256-B5xXUgF709FCmiLD8t0nNhDhCIid1IDW1cTgJ6UR7c0="; }; __darwinAllowLocalNetworking = true; From 0dd538a9cc521c02f401eda69b8613540be0e6f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 11:54:23 +0200 Subject: [PATCH 068/133] cnspec: 13.21.1 -> 13.22.1 Diff: https://github.com/mondoohq/cnspec/compare/v13.21.1...v13.22.1 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v13.22.1 --- pkgs/by-name/cn/cnspec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index ebf8ef72e0b4..e6c8eca66eac 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "cnspec"; - version = "13.21.1"; + version = "13.22.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-uc2W1OWvnzXqEpDtkXd2b8ieCHxOIQ0QAvayDyah7pc="; + hash = "sha256-GyaK9aupJ8ki7UlKnkKEtv1jZnbZbzSaFRDDIBBXsYI="; }; proxyVendor = true; - vendorHash = "sha256-RGuV0gZgCxmIVb2neb/Yn/Tvo4hZDAK5vUVEl8FxYBI="; + vendorHash = "sha256-jeJmizGXrEwtbDzoQZyNfu+GtvAkPHt7qIQthai/i1Y="; subPackages = [ "apps/cnspec" ]; From 2138663709e3623265f4cc395ef0d205d6cd672c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 11:55:43 +0200 Subject: [PATCH 069/133] azurehound: 2.12.1 -> 2.12.2 Diff: https://github.com/SpecterOps/AzureHound/compare/v2.12.1...v2.12.2 Changelog: https://github.com/SpecterOps/AzureHound/releases/tag/v2.12.2 --- pkgs/by-name/az/azurehound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index ab84c1aefac3..b1dd9f8fb4c4 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "azurehound"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${finalAttrs.version}"; - hash = "sha256-qJ7mzG1G9ck4xM9dB9rcpojGCAbUoZ8bKZwuZV5bhjA="; + hash = "sha256-w8PmSt+QvU0HELkgdYLfIUgK3R5vCYzlPbMyrHztiPw="; }; vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY="; From 86ee3faa49fc954542d39aa46dbd67f6e3011c30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 12:00:37 +0200 Subject: [PATCH 070/133] python3Packages.claude-agent-sdk: 0.2.101 -> 0.2.102 Diff: https://github.com/anthropics/claude-agent-sdk-python/compare/v0.2.101...v0.2.102 Changelog: https://github.com/anthropics/claude-agent-sdk-python/blob/v0.2.102/CHANGELOG.md --- pkgs/development/python-modules/claude-agent-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index c24b84006289..555dba7fc0fa 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.2.101"; + version = "0.2.102"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ZEXjZZSdw+IOPB4DSSJwVfCEAjgIIs9vholJSeRXoY="; + hash = "sha256-Vh+NS/NGzZICfWiw3MSRSeU/PlusyJTFHwPHTaRwO4M="; }; build-system = [ hatchling ]; From 69607f2ba4b33bcb3c1d2c7a5c9ac8179232e3b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 12:01:39 +0200 Subject: [PATCH 071/133] python3Packages.awsiotsdk: 1.29.0 -> 1.30.0 Diff: https://github.com/aws/aws-iot-device-sdk-python-v2/compare/v1.29.0...v1.30.0 Changelog: https://github.com/aws/aws-iot-device-sdk-python-v2/releases/tag/v1.30.0 --- pkgs/development/python-modules/awsiotsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix index bc368b92c344..3df76ff2c706 100644 --- a/pkgs/development/python-modules/awsiotsdk/default.nix +++ b/pkgs/development/python-modules/awsiotsdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "awsiotsdk"; - version = "1.29.0"; + version = "1.30.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-iot-device-sdk-python-v2"; tag = "v${finalAttrs.version}"; - hash = "sha256-YSBtViejJFlu3r38Kx1sn+TNkfq0+Zy/KfoBlJdj5Gg="; + hash = "sha256-e6bQso8+zIQzw9YSjWPR7Ij6q4nXm/jl6ruHtjA9Mr8="; }; postPatch = '' From 6c0eab00fa8ff36e560ee6cf69f6f166193494af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 12:03:45 +0200 Subject: [PATCH 072/133] python3Packages.cyclonedx-python-lib: 11.9.0 -> 11.10.0 Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/v11.9.0...v11.10.0 Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v11.10.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index bd4d1b2d08a9..ee5346bc44ec 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "cyclonedx-python-lib"; - version = "11.9.0"; + version = "11.10.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Ukq1467cjfrZFewIdFPRWyh73Zf2qmSoZgn4o48h2c="; + hash = "sha256-8iZWIiLLMWJsLbl3ayPTcLYbpxT9ccCpgxIRd7d3Bkk="; }; pythonRelaxDeps = [ "py-serializable" ]; From 184d1b4c0f6e5e05e079a8a6cca67879a317ea2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 16 Jun 2026 11:19:02 +0100 Subject: [PATCH 073/133] nixos/uwsm: set restartIfChanged = false on session units --- nixos/modules/programs/wayland/uwsm.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix index 2ed6a643f39a..838ac2ef01de 100644 --- a/nixos/modules/programs/wayland/uwsm.nix +++ b/nixos/modules/programs/wayland/uwsm.nix @@ -37,6 +37,11 @@ let ; } ) cfg.waylandCompositors; + + sessionServices = [ + "wayland-wm@" + "wayland-session-bindpid@" + ]; in { options.programs.uwsm = { @@ -136,6 +141,17 @@ in # UWSM recommends dbus broker for better compatibility services.dbus.implementation = "broker"; + + # Restarting these kills the graphical session, same treatment as the + # display-manager modules. + systemd.user.services = lib.genAttrs sessionServices (_: { + restartIfChanged = false; + # Defining the units here generates drop-ins; without this they + # would carry the NixOS default Environment="PATH=coreutils:…", + # clobbering the PATH that uwsm imported into the user manager + # and breaking spawn actions that rely on it. + enableDefaultPath = false; + }); } (lib.mkIf (cfg.waylandCompositors != { }) { From 44cd038ef1cc77ac5a7fbd5cd8c49368b4dc0575 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 10:31:59 +0000 Subject: [PATCH 074/133] python3Packages.cyvest: 5.4.1 -> 6.0.0 --- pkgs/development/python-modules/cyvest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyvest/default.nix b/pkgs/development/python-modules/cyvest/default.nix index 148ee24377fc..4ec9fb1f298e 100644 --- a/pkgs/development/python-modules/cyvest/default.nix +++ b/pkgs/development/python-modules/cyvest/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cyvest"; - version = "5.4.1"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "PakitoSec"; repo = "cyvest"; tag = "v${finalAttrs.version}"; - hash = "sha256-FEi/0pWUHFE1ZwDtKt6u2MPFAUeiOqA8LYfoqDu3vzI="; + hash = "sha256-QJirMx/cr9QSCS3wSEDHSGjmBe9XWAtjBEh1ZiRWUGU="; }; postPatch = '' From 10af96ef760fbbec794d667a4c908ba6aef893d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 11:03:10 +0000 Subject: [PATCH 075/133] material-symbols: 4.0.0-unstable-2026-06-05 -> 4.0.0-unstable-2026-06-12 --- pkgs/by-name/ma/material-symbols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/material-symbols/package.nix b/pkgs/by-name/ma/material-symbols/package.nix index 9fec0f1f675e..e6cf43b8c55a 100644 --- a/pkgs/by-name/ma/material-symbols/package.nix +++ b/pkgs/by-name/ma/material-symbols/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation { pname = "material-symbols"; - version = "4.0.0-unstable-2026-06-05"; + version = "4.0.0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "google"; repo = "material-design-icons"; - rev = "27aa4d49e4fabcb2a7f3acc86d205d33b159fad3"; - hash = "sha256-l8uXZZZ0rtQIYiEua8xmpuacLiR8hVjclAyc9dUI8z8="; + rev = "5d5d1fdd5476f3df3749e9fb872e32021ec7a750"; + hash = "sha256-e0bxJpehssgnxigSgPt9qxMrKRZcvlVDyLu5DY6MkTA="; sparseCheckout = [ "variablefont" ]; }; From a64730c2a017c5ccd211ff10170ffe238736cbdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 11:22:13 +0000 Subject: [PATCH 076/133] n8n: 2.23.4 -> 2.25.7 --- pkgs/by-name/n8/n8n/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index f7027b35b302..0e91e2fd604c 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -26,20 +26,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "2.23.4"; + version = "2.25.7"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-0LROPZKLKEKHBgV0kWAfataZB2nMzdsmq1WImCA6bgA="; + hash = "sha256-V8CqEzCw4DcLPCao4HRXrJXFeID2+Ef8fNW1xd1b8Vs="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-oqnLywIOhAZr7nmeGvq6k0brcGjHRhR3pVvBQK3Fg0k="; + hash = "sha256-JS4OY6CmihsbJRyPszSlNUEViFKfLm2vu+G2upIoLW8="; }; nativeBuildInputs = [ From 5fca4986204d6b46e4d213c69d0260620bc43402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 11:36:03 +0000 Subject: [PATCH 077/133] netboxPlugins.netbox-custom-objects: 0.5.1 -> 0.5.2 --- .../ne/netbox_4_5/plugins/netbox-custom-objects/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix index 6cff03d9b841..4a7d67384c07 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix @@ -9,7 +9,7 @@ buildPythonPackage (finalAttrs: { pname = "netbox-custom-objects"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; __structuredAttrs = true; @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { owner = "netboxlabs"; repo = "netbox-custom-objects"; tag = "v${finalAttrs.version}"; - hash = "sha256-8PEqt6TpoQ8ncyZPesRos0BQHF3cKIzgoFr56v8UTTY="; + hash = "sha256-bFPcv7eEUFfLB7XfxOnJR+pBSXUVKsAupcid2dxjtho="; }; build-system = [ setuptools ]; From e3cae8abb333d6024619d7ae6de57f6f41100491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 12:09:30 +0000 Subject: [PATCH 078/133] ctx7: 0.4.4 -> 0.5.2 --- pkgs/by-name/ct/ctx7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix index 2d1ae96149eb..aaa477fc26d0 100644 --- a/pkgs/by-name/ct/ctx7/package.nix +++ b/pkgs/by-name/ct/ctx7/package.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ctx7"; - version = "0.4.4"; + version = "0.5.2"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upstash"; repo = "context7"; tag = "${finalAttrs.pname}@${finalAttrs.version}"; - hash = "sha256-3Hk3YEXIR6SAEtCeDeaU1fU/CyvxuObZSNbgqrzeJ/o="; + hash = "sha256-CAOFt/oKjeFOIesJCTQsAq0miXssEJKNMLcd6Eb9HZs="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-ugUN1U0OR8dPTq4PADJaq6ElngSlw6PlmYDUFoW+2F4="; + hash = "sha256-C+4QgpSJa5sDZr/0ltxHeaPX7IJTgG957dK/iA5sFXs="; }; buildPhase = '' From 34c8ce36563e363c578c5e81d13ab560345eeeaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 12:23:48 +0000 Subject: [PATCH 079/133] qlever-control: 0.5.47 -> 0.5.48 --- pkgs/by-name/ql/qlever-control/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ql/qlever-control/package.nix b/pkgs/by-name/ql/qlever-control/package.nix index ed6aeef694e1..b6610311a142 100644 --- a/pkgs/by-name/ql/qlever-control/package.nix +++ b/pkgs/by-name/ql/qlever-control/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "qlever-control"; - version = "0.5.47"; + version = "0.5.48"; pyproject = true; src = fetchFromGitHub { owner = "qlever-dev"; repo = "qlever-control"; tag = "v${finalAttrs.version}"; - hash = "sha256-sNTI8H7dzK4rDhLzRrf3nWSkn3Z5xHG1rU77+59CwHY="; + hash = "sha256-mjWMRXRo2iU8C8fArXTcuVmts67MuCq8nR9dD87nR1g="; }; build-system = with python3Packages; [ From b8808c3da9b30406a888b18735230f75e7378a79 Mon Sep 17 00:00:00 2001 From: DESPsyched Date: Tue, 16 Jun 2026 08:46:51 -0400 Subject: [PATCH 080/133] python3Packages.claude-agent-sdk: add dependency on sniffio This was added in v0.1.67 (https://github.com/anthropics/claude-agent-sdk-python/commit/62c8bfd0e50b309ec520ee57b4ad8f03cb6a69ee) --- pkgs/development/python-modules/claude-agent-sdk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index c24b84006289..747d6db55ca5 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -8,6 +8,7 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, + sniffio, typing-extensions, }: @@ -28,6 +29,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ anyio mcp + sniffio typing-extensions ]; From 9e34df757eed676e95e9001a729f433a74ee2376 Mon Sep 17 00:00:00 2001 From: "Katja Ramona Sophie Kwast (zaphyra)" Date: Tue, 16 Jun 2026 15:05:31 +0200 Subject: [PATCH 081/133] gomuks-web: 26.05 -> 26.06 --- pkgs/by-name/go/gomuks-web/package.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix index 2fa7366d7570..7c85ab2f0abe 100644 --- a/pkgs/by-name/go/gomuks-web/package.nix +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -11,17 +11,17 @@ buildGoModule (finalAttrs: { pname = "gomuks-web"; - version = "26.05"; + version = "26.06"; src = fetchFromGitHub { owner = "gomuks"; repo = "gomuks"; tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0"; - hash = "sha256-BoTD4c9ZhfyFytsxUCvTIoCoBiFbPW1T1uGWRDx+OIE="; + hash = "sha256-Q4hu3bcB16iuqASZvlv7nDvxj8CFX66qWp6DHIUTmh4="; }; proxyVendor = true; - vendorHash = "sha256-WJQmei6+T98k2Dkma3rHM2c7pzvze0hT8W5UnnARLok="; + vendorHash = "sha256-UH/T3eqFy0KrG/ouEzifJeWXXwe5cUPYG7DpIO0GsYc="; nativeBuildInputs = [ nodejs @@ -37,11 +37,20 @@ buildGoModule (finalAttrs: { npmRoot = "web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/web"; - hash = "sha256-H76LUuhEqjuAh7PxjIjMBW5TvsOg9Ra2T7Y39SfktqM="; + hash = "sha256-RiOes+tmAxhA9IkyA6yWQXTjjXyZg2Z8FmPTgcmCg/g="; }; }; postPatch = '' + # required until libheif gets bumped + substituteInPlace ./go.mod \ + --replace-fail 'github.com/strukturag/libheif v1.23.0' 'github.com/strukturag/libheif v1.21.2' + + substituteInPlace ./go.sum \ + --replace-fail 'github.com/strukturag/libheif v1.23.0 h1:G9Fjf/b8dvTgLIk148tUKp7Z7rgu88FC+Mc8o92U98k=' 'github.com/strukturag/libheif v1.21.2 h1:YFD3crf+d33cFVQh3aTkkVGwJFyWpfqVT4XhzHWU6mA=' \ + --replace-fail 'github.com/strukturag/libheif v1.23.0/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=' 'github.com/strukturag/libheif v1.21.2/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=' + + substituteInPlace ./web/build-wasm.sh \ --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=${finalAttrs.src.tag}" \ --replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=unknown" @@ -52,6 +61,7 @@ buildGoModule (finalAttrs: { tags = [ "goolm" "libheif" + "sqlite_fts5" ]; ldflags = [ From 45dd3c1f7a73b021cd31cc9a9553e91c0e9eff8f Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 15 Jun 2026 12:50:24 -0300 Subject: [PATCH 082/133] maintainers/lucasew: disown some packages Signed-off-by: lucasew --- nixos/tests/xrdp-with-audio-pulseaudio.nix | 4 ++-- .../networking/instant-messengers/pidgin/default.nix | 2 +- pkgs/by-name/ba/backgroundremover/package.nix | 2 +- pkgs/by-name/br/bruno-cli/package.nix | 1 - pkgs/by-name/br/bruno/package.nix | 1 - pkgs/by-name/ch/chatd/package.nix | 2 +- pkgs/by-name/en/enroot/package.nix | 2 +- pkgs/by-name/fl/flet-client-flutter/package.nix | 1 - pkgs/by-name/ga/gallery-dl/package.nix | 1 - pkgs/by-name/np/npm-lockfile-fix/package.nix | 1 - pkgs/by-name/pi/piped/package.nix | 2 +- pkgs/by-name/pm/pmbootstrap/package.nix | 1 - pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix | 2 +- pkgs/by-name/ra/ranger/package.nix | 1 - pkgs/by-name/sh/shadershark/package.nix | 2 +- pkgs/by-name/un/unarc/package.nix | 2 +- pkgs/by-name/xp/xpra-html5/package.nix | 4 +--- pkgs/by-name/xp/xpra/package.nix | 1 - pkgs/by-name/xr/xrdp/package.nix | 1 - pkgs/development/python-modules/anyqt/default.nix | 2 +- pkgs/development/python-modules/baycomp/default.nix | 2 +- pkgs/development/python-modules/bbox/default.nix | 2 +- pkgs/development/python-modules/facenet-pytorch/default.nix | 2 +- pkgs/development/python-modules/flet-cli/default.nix | 1 - pkgs/development/python-modules/flet-desktop/default.nix | 1 - pkgs/development/python-modules/flet-web/default.nix | 1 - pkgs/development/python-modules/flet/default.nix | 1 - pkgs/development/python-modules/hsh/default.nix | 2 +- pkgs/development/python-modules/minexr/default.nix | 2 +- pkgs/development/python-modules/mouseinfo/default.nix | 2 +- pkgs/development/python-modules/naked/default.nix | 2 +- pkgs/development/python-modules/opentsne/default.nix | 2 +- pkgs/development/python-modules/pyautogui/default.nix | 2 +- pkgs/development/python-modules/pygetwindow/default.nix | 2 +- pkgs/development/python-modules/pyquaternion/default.nix | 2 +- pkgs/development/python-modules/pyrect/default.nix | 2 +- pkgs/development/python-modules/pyscreeze/default.nix | 2 +- pkgs/development/python-modules/pytweening/default.nix | 2 +- pkgs/development/python-modules/qasync/default.nix | 2 +- pkgs/development/python-modules/rtfunicode/default.nix | 2 +- pkgs/development/python-modules/serverfiles/default.nix | 2 +- pkgs/development/python-modules/trubar/default.nix | 2 +- pkgs/development/python-modules/yacs/default.nix | 2 +- 43 files changed, 31 insertions(+), 46 deletions(-) diff --git a/nixos/tests/xrdp-with-audio-pulseaudio.nix b/nixos/tests/xrdp-with-audio-pulseaudio.nix index cc630143b990..0023e6307031 100644 --- a/nixos/tests/xrdp-with-audio-pulseaudio.nix +++ b/nixos/tests/xrdp-with-audio-pulseaudio.nix @@ -10,8 +10,8 @@ # - Open a browser or something that plays sound. Ex: chromium name = "xrdp-with-audio-pulseaudio"; - meta = with pkgs.lib.maintainers; { - maintainers = [ lucasew ]; + meta = { + maintainers = [ ]; }; nodes = { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cff21dd33d16..b30c26877e9e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -175,7 +175,7 @@ let homepage = "https://pidgin.im/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; }; diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 6b59dea21ab1..b46784154509 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -107,7 +107,7 @@ let homepage = "https://BackgroundRemoverAI.com"; downloadPage = "https://github.com/nadermx/backgroundremover/releases"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index 8f9c54f3e414..3feb18f23ddf 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -119,7 +119,6 @@ buildNpmPackage { maintainers = with lib.maintainers; [ gepbird kashw2 - lucasew mattpolzin water-sucks ]; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index ba007dc0a2c2..14f7d8b96727 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -196,7 +196,6 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ gepbird kashw2 - lucasew mattpolzin redyf water-sucks diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 5a7a52e44a68..0aac9451c4d4 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -90,7 +90,7 @@ buildNpmPackage rec { homepage = "https://github.com/BruceMacD/chatd"; changelog = "https://github.com/BruceMacD/chatd/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; mainProgram = "chatd"; platforms = electron.meta.platforms; }; diff --git a/pkgs/by-name/en/enroot/package.nix b/pkgs/by-name/en/enroot/package.nix index 0cf1e5027bb2..7bff08c621fd 100644 --- a/pkgs/by-name/en/enroot/package.nix +++ b/pkgs/by-name/en/enroot/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/NVIDIA/enroot"; changelog = "https://github.com/NVIDIA/enroot/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; mainProgram = "enroot"; }; }) diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 7d85c1fc14ea..867b9d0f2e9c 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -92,7 +92,6 @@ flutter338.buildFlutterApplication rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ heyimnova - lucasew ]; mainProgram = "flet"; }; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index a7e3de1ed9e4..dc49a388b40a 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -55,7 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: { maintainers = with lib.maintainers; [ dawidsowa FlameFlag - lucasew ]; }; }) diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index d5ca66514895..e0a3b430e1b6 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -35,7 +35,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "npm-lockfile-fix"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - lucasew felschr ]; }; diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix index e336b6ba7ef4..aab4f2408d10 100644 --- a/pkgs/by-name/pi/piped/package.nix +++ b/pkgs/by-name/pi/piped/package.nix @@ -47,7 +47,7 @@ buildNpmPackage rec { meta = { homepage = "https://github.com/TeamPiped/Piped"; description = "Efficient and privacy-friendly YouTube frontend"; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; license = [ lib.licenses.agpl3Plus ]; }; diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 127e66e01a8c..6563b0c44e9a 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -81,7 +81,6 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ onny - lucasew ungeskriptet ]; mainProgram = "pmbootstrap"; diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix index 532dbb392eb4..2d8f61780942 100644 --- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix +++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "xrdp sink/source pulseaudio modules"; homepage = "https://github.com/neutrinolabs/pulseaudio-module-xrdp"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 58f55f30a3a9..3cbd8343854b 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -93,7 +93,6 @@ python3Packages.buildPythonApplication { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ toonn - lucasew ]; mainProgram = "ranger"; }; diff --git a/pkgs/by-name/sh/shadershark/package.nix b/pkgs/by-name/sh/shadershark/package.nix index 617099efd266..80888fac95c3 100644 --- a/pkgs/by-name/sh/shadershark/package.nix +++ b/pkgs/by-name/sh/shadershark/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { description = "OpenGL/X11 application for GNU/Linux consisting of a single window that shows simple 3D scene of a textured rectangle with applied vertex and fragment shaders (GLSL)"; homepage = "https://graphics.globalcode.info/v_0/shader-shark.xhtml"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/un/unarc/package.nix b/pkgs/by-name/un/unarc/package.nix index 5b1829ab5cae..cb3bbab57aa9 100644 --- a/pkgs/by-name/un/unarc/package.nix +++ b/pkgs/by-name/un/unarc/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "Unpacker for ArC (FreeArc) archives ('ArC\\1' header)"; homepage = "https://github.com/xredor/unarc"; license = lib.licenses.unfree; # unknown - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; mainProgram = "unarc"; }; } diff --git a/pkgs/by-name/xp/xpra-html5/package.nix b/pkgs/by-name/xp/xpra-html5/package.nix index 72a7d8397ea8..0d74efbfeabd 100644 --- a/pkgs/by-name/xp/xpra-html5/package.nix +++ b/pkgs/by-name/xp/xpra-html5/package.nix @@ -37,8 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://github.com/Xpra-org/xpra-html5/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - lucasew - ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index a4de10b06d8f..6d9c26e42de9 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -304,7 +304,6 @@ effectiveBuildPythonApplication rec { maintainers = with lib.maintainers; [ numinit mvnetbiz - lucasew ]; }; } diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix index 922867b7a7a4..ff484fd150ce 100644 --- a/pkgs/by-name/xr/xrdp/package.nix +++ b/pkgs/by-name/xr/xrdp/package.nix @@ -214,7 +214,6 @@ let license = lib.licenses.asl20; maintainers = with lib.maintainers; [ chvp - lucasew ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix index 36eb77416ae1..a5bde7eecedd 100644 --- a/pkgs/development/python-modules/anyqt/default.nix +++ b/pkgs/development/python-modules/anyqt/default.nix @@ -56,6 +56,6 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/ales-erjavec/anyqt"; changelog = "https://github.com/ales-erjavec/anyqt/releases/tag/${finalAttrs.version}"; license = [ lib.licenses.gpl3Only ]; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix index 34a7a81333e8..af6474de2e17 100644 --- a/pkgs/development/python-modules/baycomp/default.nix +++ b/pkgs/development/python-modules/baycomp/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Library for Bayesian comparison of classifiers"; homepage = "https://github.com/janezd/baycomp"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index aabb088dbeeb..771a21fa2a44 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -56,6 +56,6 @@ buildPythonPackage { description = "Python library for 2D/3D bounding boxes"; homepage = "https://github.com/varunagrawal/bbox"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/facenet-pytorch/default.nix b/pkgs/development/python-modules/facenet-pytorch/default.nix index bfd0ba85a2eb..9e8a0b21df1e 100644 --- a/pkgs/development/python-modules/facenet-pytorch/default.nix +++ b/pkgs/development/python-modules/facenet-pytorch/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Pretrained Pytorch face detection (MTCNN) and facial recognition (InceptionResnet) models"; homepage = "https://github.com/timesler/facenet-pytorch"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flet-cli/default.nix b/pkgs/development/python-modules/flet-cli/default.nix index 577383f7b2db..e3665998a44a 100644 --- a/pkgs/development/python-modules/flet-cli/default.nix +++ b/pkgs/development/python-modules/flet-cli/default.nix @@ -59,7 +59,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ heyimnova - lucasew ]; mainProgram = "flet"; }; diff --git a/pkgs/development/python-modules/flet-desktop/default.nix b/pkgs/development/python-modules/flet-desktop/default.nix index 13d0a0d9b6a9..61e340c61cfb 100644 --- a/pkgs/development/python-modules/flet-desktop/default.nix +++ b/pkgs/development/python-modules/flet-desktop/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ heyimnova - lucasew ]; }; } diff --git a/pkgs/development/python-modules/flet-web/default.nix b/pkgs/development/python-modules/flet-web/default.nix index a0248b969690..f2e4583456f6 100644 --- a/pkgs/development/python-modules/flet-web/default.nix +++ b/pkgs/development/python-modules/flet-web/default.nix @@ -44,7 +44,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ heyimnova - lucasew ]; }; } diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 0e0a22f36ea9..cdf5e2e20934 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -93,7 +93,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ heyimnova - lucasew ]; mainProgram = "flet"; }; diff --git a/pkgs/development/python-modules/hsh/default.nix b/pkgs/development/python-modules/hsh/default.nix index cdaf058abe3c..6498374e17fb 100644 --- a/pkgs/development/python-modules/hsh/default.nix +++ b/pkgs/development/python-modules/hsh/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/chrissimpkins/hsh"; downloadPage = "https://github.com/chrissimpkins/hsh/releases"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix index 3a8435e72744..aa1fe13ee685 100644 --- a/pkgs/development/python-modules/minexr/default.nix +++ b/pkgs/development/python-modules/minexr/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Minimal, standalone OpenEXR reader for single-part, uncompressed scan line files"; homepage = "https://github.com/cheind/py-minexr"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix index 1cf2449460a7..d19cc6fe82ae 100644 --- a/pkgs/development/python-modules/mouseinfo/default.nix +++ b/pkgs/development/python-modules/mouseinfo/default.nix @@ -37,6 +37,6 @@ buildPythonPackage { description = "Application to display XY position and RGB color information for the pixel currently under the mouse. Works on Python 2 and 3"; homepage = "https://github.com/asweigart/mouseinfo"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/naked/default.nix b/pkgs/development/python-modules/naked/default.nix index b169b2e0a649..6d2e807c3055 100644 --- a/pkgs/development/python-modules/naked/default.nix +++ b/pkgs/development/python-modules/naked/default.nix @@ -109,6 +109,6 @@ buildPythonPackage rec { homepage = "https://github.com/chrissimpkins/naked"; downloadPage = "https://github.com/chrissimpkins/naked/tags"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix index 8c2f13122c90..930c1e5665d0 100644 --- a/pkgs/development/python-modules/opentsne/default.nix +++ b/pkgs/development/python-modules/opentsne/default.nix @@ -62,7 +62,7 @@ let homepage = "https://github.com/pavlin-policar/openTSNE"; changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/v${version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix index 57125a380d67..24d8f0c064cc 100644 --- a/pkgs/development/python-modules/pyautogui/default.nix +++ b/pkgs/development/python-modules/pyautogui/default.nix @@ -62,6 +62,6 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/asweigart/pyautogui"; changelog = "https://github.com/asweigart/pyautogui/blob/${finalAttrs.src.rev}/CHANGES.txt"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/python-modules/pygetwindow/default.nix b/pkgs/development/python-modules/pygetwindow/default.nix index cccaf6629b9c..c9519b858ece 100644 --- a/pkgs/development/python-modules/pygetwindow/default.nix +++ b/pkgs/development/python-modules/pygetwindow/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Simple, cross-platform module for obtaining GUI information on applications' windows"; homepage = "https://github.com/asweigart/PyGetWindow"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix index 4e66ac7d9cf2..c5e3680e3574 100644 --- a/pkgs/development/python-modules/pyquaternion/default.nix +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Library for representing and using quaternions"; homepage = "http://kieranwynn.github.io/pyquaternion/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index a5503cfd2215..251e5e1116cc 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Simple module with a Rect class for Pygame-like rectangular areas"; homepage = "https://github.com/asweigart/pyrect"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix index ce819f7b2956..8205dd6a5bc6 100644 --- a/pkgs/development/python-modules/pyscreeze/default.nix +++ b/pkgs/development/python-modules/pyscreeze/default.nix @@ -38,6 +38,6 @@ buildPythonPackage { description = "PyScreeze is a simple, cross-platform screenshot module for Python 2 and 3"; homepage = "https://github.com/asweigart/pyscreeze"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytweening/default.nix b/pkgs/development/python-modules/pytweening/default.nix index 21280b657deb..074af0424899 100644 --- a/pkgs/development/python-modules/pytweening/default.nix +++ b/pkgs/development/python-modules/pytweening/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Set of tweening / easing functions implemented in Python"; homepage = "https://github.com/asweigart/pytweening"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix index c1b317c445e2..110ecca557c0 100644 --- a/pkgs/development/python-modules/qasync/default.nix +++ b/pkgs/development/python-modules/qasync/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Allows coroutines to be used in PyQt/PySide applications by providing an implementation of the PEP 3156 event-loop"; homepage = "https://github.com/CabbageDevelopment/qasync"; license = [ lib.licenses.bsd2 ]; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rtfunicode/default.nix b/pkgs/development/python-modules/rtfunicode/default.nix index 6f876d4ad45d..41c25a15a6e6 100644 --- a/pkgs/development/python-modules/rtfunicode/default.nix +++ b/pkgs/development/python-modules/rtfunicode/default.nix @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Encoder for unicode to RTF 1.5 command sequences"; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; license = lib.licenses.bsd2; homepage = "https://github.com/mjpieters/rtfunicode"; changelog = "https://github.com/mjpieters/rtfunicode/releases/tag/${finalAttrs.src.tag}"; diff --git a/pkgs/development/python-modules/serverfiles/default.nix b/pkgs/development/python-modules/serverfiles/default.nix index 5e6670efaac5..d591c23b88c1 100644 --- a/pkgs/development/python-modules/serverfiles/default.nix +++ b/pkgs/development/python-modules/serverfiles/default.nix @@ -25,6 +25,6 @@ buildPythonPackage (finalAttrs: { description = "Utility that accesses files on a HTTP server and stores them locally for reuse"; homepage = "https://github.com/biolab/serverfiles"; license = [ lib.licenses.gpl3Plus ]; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix index 416aaf75c985..6ef9e9c2f649 100644 --- a/pkgs/development/python-modules/trubar/default.nix +++ b/pkgs/development/python-modules/trubar/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/janezd/trubar"; changelog = "https://github.com/janezd/trubar/releases/tag/${version}"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix index e8b5d63afe00..fc6db5333b80 100644 --- a/pkgs/development/python-modules/yacs/default.nix +++ b/pkgs/development/python-modules/yacs/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Yet Another Configuration System"; homepage = "https://github.com/rbgirshick/yacs"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lucasew ]; + maintainers = [ ]; }; } From 8bbd6feba06092b90ed5985e726c392acc3aa4fb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 16 Jun 2026 15:34:25 +0200 Subject: [PATCH 083/133] haxor-news: Remove Signed-off-by: Matthias Beyer --- pkgs/by-name/ha/haxor-news/package.nix | 51 -------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/by-name/ha/haxor-news/package.nix diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix deleted file mode 100644 index f4e7b439b52f..000000000000 --- a/pkgs/by-name/ha/haxor-news/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchPypi, - python3Packages, -}: - -python3Packages.buildPythonApplication { - pname = "haxor-news"; - version = "unstable-2022-04-22"; - format = "setuptools"; - - # haven't done a stable release in 3+ years, but actively developed - src = fetchFromGitHub { - owner = "donnemartin"; - repo = "haxor-news"; - rev = "8294e4498858f036a344b06e82f08b834c2a8270"; - hash = "sha256-0eVk5zj7F3QDFvV0Kv9aeV1oeKxr/Kza6M3pK6hyYuY="; - }; - - propagatedBuildInputs = with python3Packages; [ - click - colorama - requests - pygments - prompt-toolkit - six - ]; - - # will fail without pre-seeded config files - doCheck = false; - - nativeCheckInputs = with python3Packages; [ - unittestCheckHook - mock - ]; - - unittestFlagsArray = [ - "-s" - "tests" - "-v" - ]; - - meta = { - homepage = "https://github.com/donnemartin/haxor-news"; - description = "Browse Hacker News like a haxor"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 287314f2930b..6f5df2d5e35a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -976,6 +976,7 @@ mapAliases { harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26 haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; + haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16 helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05 HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27 hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10 From 7bcbc7d93e8b7de8122384533fd6db94a56ddbc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 14:17:06 +0000 Subject: [PATCH 084/133] python3Packages.microsoft-kiota-serialization-multipart: 1.10.2 -> 1.10.3 --- .../microsoft-kiota-serialization-multipart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix index aa9770764983..5cd49138df9e 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-multipart"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-multipart-v${version}"; - hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; + hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4="; }; sourceRoot = "${src.name}/packages/serialization/multipart/"; From e67d4f5f3bc461b27770d658d1ef12e72398e608 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jun 2026 16:25:04 +0200 Subject: [PATCH 085/133] cewl: 5.5.2 -> 6.2.1 https://github.com/digininja/CeWL/releases/tag/6.2.1 --- pkgs/by-name/ce/cewl/Gemfile.lock | 8 ++++---- pkgs/by-name/ce/cewl/gemset.nix | 26 ++++++++++++++++++-------- pkgs/by-name/ce/cewl/package.nix | 11 +++++++---- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ce/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock index 6f9bd20b1e0f..65a86f8fadef 100644 --- a/pkgs/by-name/ce/cewl/Gemfile.lock +++ b/pkgs/by-name/ce/cewl/Gemfile.lock @@ -6,19 +6,19 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0924) + mime-types-data (3.2026.0414) mini_exiftool (2.14.0) ostruct (>= 0.6.0) pstore (>= 0.1.3) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) ostruct (0.6.3) - pstore (0.2.0) + pstore (0.2.1) racc (1.8.1) rexml (3.4.4) - rubyzip (3.2.2) + rubyzip (3.4.0) spider (0.7.0) PLATFORMS diff --git a/pkgs/by-name/ce/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix index 1fc11621b17b..19cab141ee24 100644 --- a/pkgs/by-name/ce/cewl/gemset.nix +++ b/pkgs/by-name/ce/cewl/gemset.nix @@ -38,10 +38,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj"; + sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726"; type = "gem"; }; - version = "3.2025.0924"; + version = "3.2026.0414"; }; mini_exiftool = { dependencies = [ @@ -76,10 +76,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; + sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq"; type = "gem"; }; - version = "1.18.10"; + version = "1.19.3"; }; ostruct = { groups = [ "default" ]; @@ -96,10 +96,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3lrq8k62n8bazhxgdmjykni9wv0mcjks5vi1g274i3wblcgrfn"; + sha256 = "06icf1n6z7snygcq51zdm1zdz20cpkd4qw76s6b9wmv65h7lv403"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; racc = { groups = [ "default" ]; @@ -126,10 +126,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0"; + sha256 = "0yzmmwya4zis5f7zkhhp8p92m1xh2sg6rlbnlhsvc0m3xg4rpqvd"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.0"; }; spider = { groups = [ "default" ]; @@ -141,4 +141,14 @@ }; version = "0.7.0"; }; + getoptlong = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; + type = "gem"; + }; + version = "0.2.1"; + }; } diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix index a3cdebb0d54f..16ff14d7a948 100644 --- a/pkgs/by-name/ce/cewl/package.nix +++ b/pkgs/by-name/ce/cewl/package.nix @@ -1,6 +1,6 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, bundlerEnv, bundlerUpdateScript, @@ -14,12 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cewl"; - version = "5.5.2"; + version = "6.2.1"; + src = fetchFromGitHub { owner = "digininja"; repo = "CeWL"; tag = finalAttrs.version; - hash = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; + hash = "sha256-wMTGAB4P925z2UYNvlN4kSu1SLzKyB4a/Cjq4BofJ9w="; }; buildInputs = [ rubyEnv.wrappedRuby ]; @@ -34,8 +35,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Custom wordlist generator"; - mainProgram = "cewl"; homepage = "https://digi.ninja/projects/cewl.php/"; + changelog = "https://github.com/digininja/CeWL/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; + maintainers = [ ]; + mainProgram = "cewl"; }; }) From 1c02cdae7b1556b74e23f70d4c344d59f0fcf09c Mon Sep 17 00:00:00 2001 From: Edgar Pireyn Date: Sun, 3 May 2026 15:03:31 +0200 Subject: [PATCH 086/133] frp: 0.66.0 -> 0.69.1 This update refactors the packaging of the dashboard (now compiled using npm). It is therefore built in the dashboard.nix file and used in the package's preBuild phase. --- pkgs/by-name/fr/frp/dashboard.nix | 34 +++++++++++++++++++++++++++++++ pkgs/by-name/fr/frp/package.nix | 22 +++++++++++++------- 2 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/fr/frp/dashboard.nix diff --git a/pkgs/by-name/fr/frp/dashboard.nix b/pkgs/by-name/fr/frp/dashboard.nix new file mode 100644 index 000000000000..facbdd467ea7 --- /dev/null +++ b/pkgs/by-name/fr/frp/dashboard.nix @@ -0,0 +1,34 @@ +{ + buildNpmPackage, + frp, +}: +let + builder = + name: + buildNpmPackage { + pname = "${name}-dashboard"; + inherit (frp) version src; + + sourceRoot = "source/web"; + + preBuild = '' + pushd ${name} + ''; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + npmDepsHash = "sha256-XuqQPfywzK81anAD1pAl1TMQqb1+hH2QxLwuTn7zCPU="; + + meta = frp.meta // { + description = "Dashboard for frp"; + }; + }; +in +{ + frpc = builder "frpc"; + frps = builder "frps"; +} diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index a5e1ddbfb695..7766e6ce5ca6 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -1,22 +1,24 @@ { buildGoModule, + callPackage, lib, fetchFromGitHub, nixosTests, }: - +let + web = callPackage ./dashboard.nix { }; +in buildGoModule (finalAttrs: { pname = "frp"; - version = "0.66.0"; - + version = "0.69.1"; src = fetchFromGitHub { owner = "fatedier"; repo = "frp"; tag = "v${finalAttrs.version}"; - hash = "sha256-GFvXdhX7kA43kppWWdL7KhummUCqpa1cQ7V2d9ISGfo="; + hash = "sha256-3tOOgnzZZ05En5NMLbp4UFNazX950Jbosvszmjf947c="; }; - vendorHash = "sha256-m5ECF0cgp2LfsTKey02MHz5TfqfzOCT5cU5trUfrOjY="; + vendorHash = "sha256-JrkIztnmhEYAogr4pDWrPu9/j+C0VLpEyNbh2UK5UcY="; doCheck = false; @@ -25,8 +27,14 @@ buildGoModule (finalAttrs: { "cmd/frps" ]; - passthru.tests = { - frp = nixosTests.frp; + preBuild = '' + cp -r ${web.frpc} web/frpc/dist + cp -r ${web.frps} web/frps/dist + ''; + + passthru = { + tests.frp = nixosTests.frp; + inherit web; }; meta = { From d8123742614a8a56dfe2d7cca4af27e190a9ab8a Mon Sep 17 00:00:00 2001 From: Edgar Pireyn Date: Sat, 13 Jun 2026 22:56:31 +0200 Subject: [PATCH 087/133] frp: add self as maintainer --- pkgs/by-name/fr/frp/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index 7766e6ce5ca6..25b5cde69a00 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -47,5 +47,6 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/fatedier/frp"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ epireyn ]; }; }) From eec506e16b9b8304df51b799426763b321b1f99d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 14:45:12 +0000 Subject: [PATCH 088/133] python3Packages.microsoft-kiota-serialization-text: 1.10.2 -> 1.10.3 --- .../microsoft-kiota-serialization-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 6094582d51d0..800a324d4bc8 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-text"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-text-v${version}"; - hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; + hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4="; }; sourceRoot = "${src.name}/packages/serialization/text/"; From 92fc36a8e9dd64c706cf63ba538b91130d47d412 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 16 Jun 2026 09:35:50 -0500 Subject: [PATCH 089/133] luaPackages.tree-sitter-kulala_http: init at 0.2.0-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 30 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 7 +++++ 3 files changed, 38 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5a7ff4b27883..d9e899ca2f45 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -172,6 +172,7 @@ toml-edit,,,,,5.1,mrcjkb tomlua,,,,,,birdee tree-sitter-cli,,,,,, tree-sitter-http,,,,0.0.33-1,, +tree-sitter-kulala_http,,,,,, tree-sitter-norg,,,,,5.1,mrcjkb tree-sitter-norg-meta,,,,,, tree-sitter-orgmode,,,,,5.1, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c1d29b481de2..7059d3b6e6d4 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -6231,6 +6231,36 @@ final: prev: { } ) { }; + tree-sitter-kulala_http = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luarocks-build-treesitter-parser, + }: + buildLuarocksPackage { + pname = "tree-sitter-kulala_http"; + version = "0.2.0-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/tree-sitter-kulala_http-0.2.0-1.rockspec"; + sha256 = "19zl90z7jm3qz62f4q4hp95a0z78k3db1lrb6bhhn27kwiy4ww5z"; + }).outPath; + src = fetchzip { + url = "https://github.com/mistweaverco/tree-sitter-kulala-http/archive/v0.2.0.zip"; + sha256 = "0cc0ff8py1mqdxscp3q6zvpiryanc8fjx2y60csng00bzx4g42mj"; + }; + + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; + + meta = { + homepage = "https://kulala.app"; + license = lib.licenses.mit; + description = "Tree-sitter grammar for http (kulala-flavour)."; + }; + } + ) { }; + tree-sitter-norg = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 313f222eaa72..6819850eef40 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1261,6 +1261,13 @@ in ]; }); + tree-sitter-kulala_http = prev.tree-sitter-kulala_http.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + tree-sitter + writableTmpDirAsHomeHook + ]; + }); + tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (old: { meta = (old.meta or { }) // { broken = lua.luaversion != "5.1"; From b978a44087f70ec906769eed03d0eb21ebc960ea Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 15 Jun 2026 09:07:16 -0500 Subject: [PATCH 090/133] vimPlugins: update on 2026-06-15 --- .../editors/vim/plugins/generated.nix | 311 +++++++++--------- .../editors/vim/plugins/overrides.nix | 6 +- .../use-packaged-tree-sitter-parser.patch | 8 +- 3 files changed, 163 insertions(+), 162 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index bfde5100281c..ebb177a5b0fd 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -446,12 +446,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "961c2a806abf56d4e100713ec9dc71d2c8d9d022"; - hash = "sha256-p4YkQeJybRAbZ2zwK39rm/0Q5iSJqYlhJde7bXV6J/Y="; + rev = "3dca2d2153cfbc9aab937c1be0441e371101b0b8"; + hash = "sha256-TBm3EG55pAQIR4cPHuiu4bK5/oRblnAxxzX7u07rpBE="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -924,12 +924,12 @@ final: prev: { amp-nvim = buildVimPlugin { pname = "amp.nvim"; - version = "0-unstable-2025-12-15"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "ampcode"; repo = "amp.nvim"; - rev = "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434"; - hash = "sha256-f/li32jpVigbZANnnbgSArnOH4nusj0DUz7952K+Znw="; + rev = "b851d97d8e8782e58343608d8de7d9eb3a88090f"; + hash = "sha256-SdpKR1hfSyJ25tD7G1u4wYOHRNyeuTKbdMKG80iCUB4="; }; meta.homepage = "https://github.com/ampcode/amp.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -1050,12 +1050,12 @@ final: prev: { artio-nvim = buildVimPlugin { pname = "artio.nvim"; - version = "0-unstable-2026-05-04"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "comfysage"; repo = "artio.nvim"; - rev = "0b08d6862afe685fd78963808d022d7c15c89546"; - hash = "sha256-SrYZPFBQVJgm0X/CzyOOTfDwgNBIrjH+jlW6K8aE2Ec="; + rev = "ff2b4351004f3b512525276d554dc6f0cd412a14"; + hash = "sha256-6wEtjgF36RfaHBanNp49Nb/+WR/b9qElUpV7SNbpESU="; }; meta.homepage = "https://github.com/comfysage/artio.nvim/"; meta.license = getLicenseFromSpdxId "EUPL-1.2"; @@ -1120,12 +1120,12 @@ final: prev: { async-nvim = buildVimPlugin { pname = "async.nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-06-11"; src = fetchFromGitHub { owner = "lewis6991"; repo = "async.nvim"; - rev = "f72017409d703ecf25972a05c6f89acb31adb952"; - hash = "sha256-E8ZS7m2QejmImzmQ+wrgSUlC2x4tkMHv7xGt+XDqcXQ="; + rev = "e2a813be9cd143ab1181de6d8a0720e0230cd86e"; + hash = "sha256-b7jE3tY+6nlbIFTuOxKz4w6jDw7hlyvgBYy0Jg6McAc="; }; meta.homepage = "https://github.com/lewis6991/async.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2030,12 +2030,12 @@ final: prev: { blink-indent = buildVimPlugin { pname = "blink.indent"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.indent"; - tag = "v2.1.2"; - hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng="; + tag = "v2.2.0"; + hash = "sha256-x4nILac79C60FVsMQiWqlU1FjM891W5U9UZWwGAjnk0="; }; meta.homepage = "https://github.com/Saghen/blink.indent/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2547,12 +2547,12 @@ final: prev: { claudecode-nvim = buildVimPlugin { pname = "claudecode.nvim"; - version = "0.3.0-unstable-2026-06-09"; + version = "0.3.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "coder"; repo = "claudecode.nvim"; - rev = "7b8b7090c16f4151401a281741a4bf37050ebd26"; - hash = "sha256-NHhoAqCTa1+go+DYFj25eH0ZDmAqbA9tpHtj3IarCUU="; + rev = "2ee26319eb0c101fb2a6da1c9d6650dfa39363da"; + hash = "sha256-wf+O0PxSoslPkpn1owN2jGUiH0zN7o7hWcKAb6Pd5ns="; }; meta.homepage = "https://github.com/coder/claudecode.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2631,12 +2631,12 @@ final: prev: { cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "38f320fb9f0c4c9f1019f412f561c4d370a94d23"; - hash = "sha256-U8lLK5FzeOiJVUI0Y3AQ7TM+21tegMnnRbn18c7yXfc="; + rev = "98cdc162572a7b77733030425d8d045d68f2a1fd"; + hash = "sha256-juAaEd08WGmI3ipfKMUbeTmLDK6nCOx/omCbRopIMHE="; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -3484,12 +3484,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "0.0.82-unstable-2026-06-08"; + version = "0.0.82-unstable-2026-06-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "92ab906cab1e6b19ad03f754df4f3930f9eae22c"; - hash = "sha256-c0ChbihCajCuEh1hu5XOFtomiFA6OzbCl7eNpzPfBXM="; + rev = "207dc0f4feb2fc5db54bf4f7b6fea9b21168c293"; + hash = "sha256-3dGV25DHXSt40N/X2XyaCg5rzgP3cxjoGHJx/ZwRt0o="; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.license = unfree; @@ -3568,12 +3568,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "19.15.0"; + version = "19.16.0"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - tag = "v19.15.0"; - hash = "sha256-M/2pkFeL+sWwrXiCcE38WWmPb73kdCwC8AWg3ldScY0="; + tag = "v19.16.0"; + hash = "sha256-EUzpQYHEtIP5pVdhsUNWF0Gv7PegMVd25j9WC3Knsq4="; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -3582,12 +3582,12 @@ final: prev: { codecompanion-spinner-nvim = buildVimPlugin { pname = "codecompanion-spinner.nvim"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "franco-ruggeri"; repo = "codecompanion-spinner.nvim"; - tag = "v0.2.5"; - hash = "sha256-QSkiyV70kFkArCnTXYRR+Dt4i5XSq072tYnOnHbKEBc="; + tag = "v0.3.0"; + hash = "sha256-icFyR0q814mfLj+wT3ArSYwo50EWpn9BgI81qhbQDCQ="; }; meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4073,12 +4073,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2.0.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - tag = "v2.0.4"; - hash = "sha256-+hQ4Og0ZZS/tvs4z5733qRu5+W4D24HgHHPIL5vd0Eo="; + tag = "v3.0.0"; + hash = "sha256-xjdTysyt7BMb8a9c2HPQN85EujhQv9ZCQ87yWHjELls="; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4171,12 +4171,12 @@ final: prev: { coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "5054268e58e9e45dbdae598c2d7cca232085d2ce"; - hash = "sha256-SxffEztUDSXp1skO52Pi8XQCinWwFbw34Nn3cvC9GW8="; + rev = "7911f272700449891cbe79e3f87690c4ac638c91"; + hash = "sha256-kP+LrA9Rs0Kfx8eTJ0Cpt5Yg/7RDZS8Ujkm7M8D2pHM="; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -4591,12 +4591,12 @@ final: prev: { ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "1.2.0-unstable-2026-05-24"; + version = "1.2.0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "a8fef26851f3b648e064fa3aeb7c8c054684e846"; - hash = "sha256-vB3sCEJw67kJLON+AXo6B/38jBAFq079EouVxaI9QlQ="; + rev = "7718b6d9539ebddc18e961f90ff1aca7975ffe5c"; + hash = "sha256-2JVCuFXc6mtXUDEB1lVgWC2q38kvwr9tyjKO/Z4iY9k="; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; meta.license = unfree; @@ -5181,12 +5181,12 @@ final: prev: { diagram-nvim = buildVimPlugin { pname = "diagram.nvim"; - version = "0-unstable-2026-02-21"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "3rd"; repo = "diagram.nvim"; - rev = "89d8110ec15021ac9a03ff2317d27b900c45bf60"; - hash = "sha256-0KgZ/3q26b7MxMPRXp4/mgfl7tIUD3PnC6TYgagDGP4="; + rev = "a221810b17cdda2d5fdddba9bab3eba6fab8fabc"; + hash = "sha256-+K5o50CtBFqn37t6GnAnI1p2CfCyA1w4TIhMKpfZX4A="; }; meta.homepage = "https://github.com/3rd/diagram.nvim/"; meta.license = unfree; @@ -5209,12 +5209,12 @@ final: prev: { diffs-nvim = buildVimPlugin { pname = "diffs.nvim"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "barrettruth"; repo = "diffs.nvim"; - tag = "v0.3.3"; - hash = "sha256-g/kXdeNT2NLgQ+iPTI1GdlJyzvSHrcJoCLa0tPDj3gM="; + tag = "v0.4.0"; + hash = "sha256-ZkdvFn5oIlHfXXbO68GxtLrVkF2vxYlG8Fglrkc3Byc="; }; meta.homepage = "https://github.com/barrettruth/diffs.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5237,12 +5237,12 @@ final: prev: { diffview-plus-nvim = buildVimPlugin { pname = "diffview-plus.nvim"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "dlyongemallo"; repo = "diffview-plus.nvim"; - tag = "v0.34"; - hash = "sha256-M3Hf4y9HGFquBOK/Stv5FIxoVYX4aoO4dbbYQNPhisk="; + tag = "v0.35"; + hash = "sha256-yoxylfQjTRrN95w+pgkBWLquBdb4knB5Sjplk2rcKVs="; }; meta.homepage = "https://github.com/dlyongemallo/diffview-plus.nvim/"; meta.license = unfree; @@ -5419,12 +5419,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "5c9577f6fc086e211ccc7d93b763e9a5ace4e64b"; - hash = "sha256-E+f0SHaTN8FI3gEs4t+6NuS5xn45kneK39kSam+Ya9M="; + rev = "70f29290cad01cdcbdb03941034a95e5ef9fc365"; + hash = "sha256-4fqj9U24NizLuEWs5sL2MZXyGmznTTV0dmmZgZ0zdmA="; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -6334,12 +6334,12 @@ final: prev: { pname = "fyler.nvim"; version = "2.0.0-unstable-2025-11-23"; src = fetchFromGitHub { - owner = "A7Lavinraj"; + owner = "FylerOrg"; repo = "fyler.nvim"; rev = "bb8b9f30c652c948d35211958b0deec3496bcc08"; hash = "sha256-Caf1dJiIATbs0PNjSANjA3QgHg7PdeMz9Pjoc0Ti7G4="; }; - meta.homepage = "https://github.com/A7Lavinraj/fyler.nvim/"; + meta.homepage = "https://github.com/FylerOrg/fyler.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; meta.hydraPlatforms = [ ]; }; @@ -6388,12 +6388,12 @@ final: prev: { fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "0-unstable-2026-06-02"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "356608e2ae5d9127e2c964885ea2b21ea7aea9ab"; - hash = "sha256-3u6E8HgLVwAk75fOAWP1zrRb54N4YG6MbRDrKpn7bdw="; + rev = "d2a59a992a2455f609c0fde2ebd84427ea8f919a"; + hash = "sha256-TQR+ivA4nnichGdCDSeL2WeT+dHfNeQM1BPdrXM0Cd8="; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -7073,12 +7073,12 @@ final: prev: { guh-nvim = buildVimPlugin { pname = "guh.nvim"; - version = "0.0.1-unstable-2026-06-10"; + version = "0.0.1-unstable-2026-06-14"; src = fetchFromGitHub { owner = "justinmk"; repo = "guh.nvim"; - rev = "89bca23616361fa316c72b1171bc7aa3401800be"; - hash = "sha256-HEDQMSbWWg7UEru+hf0cT+7KbIMi1r1cU5YcgaBLq/E="; + rev = "92ffef63af03b7188b8d11e052eaa3822b59820c"; + hash = "sha256-5vAyerfY08J0J4qQY5vPmNRRjDQGv2B+nUxIgs6I1DQ="; }; meta.homepage = "https://github.com/justinmk/guh.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8418,12 +8418,12 @@ final: prev: { koda-nvim = buildVimPlugin { pname = "koda.nvim"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "oskarnurm"; repo = "koda.nvim"; - tag = "v2.10.3"; - hash = "sha256-CU634QzBkPRVntJ/fKBu/V0WNQ7K9fzqOtMIUEb9/Vw="; + tag = "v2.11.0"; + hash = "sha256-OiWW7c+cd/MioepNN40pFO3hTAm9ov80I1mVYmTW428="; }; meta.homepage = "https://github.com/oskarnurm/koda.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8460,13 +8460,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "6.9.2"; + version = "6.11.1"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - tag = "v6.9.2"; - hash = "sha256-7q/lV939qxozpsE0SM272ztSdzqIDuAdrgXSITCDLko="; - fetchSubmodules = true; + tag = "v6.11.1"; + hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k="; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9580,12 +9579,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - tag = "v2.2.0"; - hash = "sha256-wWoRUg2nvmqaEWxjYEOk1q+jQyKupgJi2LubhewcVCw="; + tag = "v2.3.0"; + hash = "sha256-yaR7P33ZQdJNAh0P3slN/TS0OL9p6ShMEIWGF4rFqxQ="; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -9608,12 +9607,12 @@ final: prev: { mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason.nvim"; - tag = "v2.3.0"; - hash = "sha256-O+11o3c0iNZ4tMZV80QbzwuMV3mP2Ml4lXQKHz4uR54="; + tag = "v2.3.1"; + hash = "sha256-zx45l5yZeWgnkzaQeY+V3GK84arritj7jfpJ64Go9rg="; }; meta.homepage = "https://github.com/mason-org/mason.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -10014,12 +10013,12 @@ final: prev: { mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.17.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.diff"; - rev = "5af2b6be4a4beb673f3196a414f6fd932bbedd48"; - hash = "sha256-DVvZOwUQCT/TGfkdy65BjH7gPPDIQ9ib2VCqOPzG5fs="; + rev = "05be51814a718e74244829754a2a900a430a8d8b"; + hash = "sha256-B7Z7rYEnxWTl09oO2fXtRFKdGVYwRCY3B7hsgj5kNzE="; }; meta.homepage = "https://github.com/nvim-mini/mini.diff/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10126,12 +10125,12 @@ final: prev: { mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.17.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.icons"; - rev = "520995f1d75da0e4cc901ee95080b1ff2bc46b94"; - hash = "sha256-Q61iFTDA2groQu3qMNJu0yuVnB6NtsGNihpGD5ppeuI="; + rev = "d48ad47359218d2b019034f95f601b3861180885"; + hash = "sha256-sDW/9Y5MhzvklkiW7XmrDslCCGDcYliJ5awgj1Ko558="; }; meta.homepage = "https://github.com/nvim-mini/mini.icons/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10154,12 +10153,12 @@ final: prev: { mini-input = buildVimPlugin { pname = "mini.input"; - version = "0-unstable-2026-06-07"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.input"; - rev = "44477bc40a1d9556decab08cd0e13187f9d909e4"; - hash = "sha256-ex0BKThn97+lnWm6EaI4JuCViQ7B6na+n5yCX9OJavU="; + rev = "d97776877c2dadbc7b5830d47eefa99e33e48cb1"; + hash = "sha256-fOILbrCQciZtMTKtLzXtFKghc/ocR09szG7yyPaunFs="; }; meta.homepage = "https://github.com/nvim-mini/mini.input/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10224,12 +10223,12 @@ final: prev: { mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "0.17.0-unstable-2026-05-28"; + version = "0.17.0-unstable-2026-06-11"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.misc"; - rev = "eb2246ede307fc863a12e9d9b0fa4b7ca9b88188"; - hash = "sha256-gX1li7+jJq0/I0rT13aJsBIbFFrufJIFhz2bFGGy+mw="; + rev = "317e20ad3bdf0f4535f9a7efdae7fbe5c4439f29"; + hash = "sha256-arVLHeI7ON1pMTNq1D17XqQdWZHRMrNKwnYXUb1PWNM="; }; meta.homepage = "https://github.com/nvim-mini/mini.misc/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10266,12 +10265,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "0.17.0-unstable-2026-06-07"; + version = "0.17.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "ff8b3580935818ef2f21bdd651f057a2ae071eab"; - hash = "sha256-wVRhe2ufPG/2DRtJGyAAhoCOTX8CLB2zZ8TQOQz9TqQ="; + rev = "7ed410c73ebb910754c2938a6dae50c51c3a096a"; + hash = "sha256-yyJ0BwKMOi+c2WODEUnlRB5iz+3i4u8G7zL4mtayRMQ="; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10308,12 +10307,12 @@ final: prev: { mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "0.17.0-unstable-2026-06-06"; + version = "0.17.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.pick"; - rev = "1ffba38c7221669d3da7792d4bbe1c9761075f4d"; - hash = "sha256-N/RdA7mEno3E5D4c9gxm9ZIlzAz3f7CPAJbyGEiECBM="; + rev = "f8ea97c5e89cc923f466e0706046eaa3988f246c"; + hash = "sha256-ZQcB/4D0xVAJswotuSFOspFFHs1BtrHvCF0uDv1yhr0="; }; meta.homepage = "https://github.com/nvim-mini/mini.pick/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10336,12 +10335,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.17.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.snippets"; - rev = "9a08aa14e02abb790c823a622d7d6c736cbbe65a"; - hash = "sha256-1w8t2ANiBue7mNk5QYhi8aBHGGNvIbrKPQgGqGO0RqI="; + rev = "c59e203fef0de69b8cb67edb07b4fc10d455bb44"; + hash = "sha256-5auuFMTQGO4gSUadW4iSwAZDZYyKBHZVAJCJjXDO1yI="; }; meta.homepage = "https://github.com/nvim-mini/mini.snippets/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11022,12 +11021,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-06-10"; + version = "1.4.0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "3a0a976a10cba0ff9d9406e4652755881321ecf9"; - hash = "sha256-hPv22eaPTY0UKoCxOXq/D1eUGOomAc8D0CB5mRs1ueQ="; + rev = "0748437c07b5e7fd19af738ed0562479381424b1"; + hash = "sha256-rCYdnx//W0m20ph62PEwdMcx8xd0ZIlATBxjlZARjJ4="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11106,12 +11105,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "3.0.0-unstable-2026-05-13"; + version = "3.0.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "99326a1310fb2d616b455d2fd16d01bf00682f06"; - hash = "sha256-ZKK4JbeuMGYvUjG1B6vLZTeSMeQTXQGFQAlIMqqN660="; + rev = "5d1b65d6215928e941e1a6a4e76e02fd45ada31f"; + hash = "sha256-K7AtBKS2b77pjfdxb11A7U7ED+XTjn4W8ajk//8U7TA="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11487,12 +11486,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "0.37.3"; + version = "0.38.0"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - tag = "v0.37.3"; - hash = "sha256-ALVudtC49gAQOGwucOh7zvhbUyZX0lTGyizhn+QCPl4="; + tag = "v0.38.0"; + hash = "sha256-R24mbFbYTH166gq8EZOuLDZ7dA2Yhjmrc77K2os5jtE="; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12521,11 +12520,11 @@ final: prev: { nvim-dap-disasm = buildVimPlugin { pname = "nvim-dap-disasm"; - version = "0-unstable-2026-02-25"; + version = "0-unstable-2026-06-14"; src = fetchgit { url = "https://codeberg.org/Jorenar/nvim-dap-disasm"; - rev = "1119f3f2b22e411adcd123cdcf6d0425b61a31a7"; - hash = "sha256-lq0tbMksVXccf6GGD7OxWAuoD9w8tlt30dpJSMtN4g8="; + rev = "b86a1e3f03f268635f9b362ccc8ffa5f240dd25d"; + hash = "sha256-hkoFEH8UoAzWOue1YTrHCQn7/N54fXsHpOZ5xAaSbIw="; }; meta.homepage = "https://codeberg.org/Jorenar/nvim-dap-disasm"; meta.license = unfree; @@ -12687,12 +12686,12 @@ final: prev: { nvim-docs-view = buildVimPlugin { pname = "nvim-docs-view"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-06-11"; src = fetchFromGitHub { owner = "amrbashir"; repo = "nvim-docs-view"; - rev = "9a262fa7e181e924d355e8725c68c48f076138b1"; - hash = "sha256-zsrrsTIpjRqDS/NXQH7TA6CjZj3PK8kstD9EB4omSGw="; + rev = "a1696d058a4223d8c3615bb305abfa638c5689a9"; + hash = "sha256-Ws/s3tgFTZczTVDjagBSY2bfso7oWRFB4oy/Y3DFdEA="; }; meta.homepage = "https://github.com/amrbashir/nvim-docs-view/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12757,12 +12756,12 @@ final: prev: { nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "3ea9e52a7be60373a127be9dcc94773bc1d6e25c"; - hash = "sha256-y8dxr4xAOX7+PKCd2h3iMlmWZtmBr9Wp6ecjAYFtunc="; + rev = "67abac716b626ece57f3a7c72121542f0b3edfe9"; + hash = "sha256-6MnwKYvOL3b0hKOnLTvdRYrZkZBYt4XAK2jlFw+DfTM="; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13706,12 +13705,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "1.17.0-unstable-2026-06-08"; + version = "1.17.0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "82f58063d67defc620e1ef8be606fc62a7b5dc1e"; - hash = "sha256-JfOkJkTGVWPw7dhcbDNPsyeNbidrtIvzJhPYUQJ1NoY="; + rev = "fb343438d49fba8c35ecc4829d66fca7a1f0ed3d"; + hash = "sha256-JhLDjrRqY/vWN+R6suVvMZLkZQkLq5IpSFwPojkYYqg="; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.license = unfree; @@ -14434,12 +14433,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "0.11.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "nickjvandyke"; repo = "opencode.nvim"; - tag = "v0.11.0"; - hash = "sha256-i6Ty/TXy9Ph6Ex39qumfgH7ArenH159EHy1UFvNBJfI="; + tag = "v0.13.1"; + hash = "sha256-RusMzeU22v4Lnx1n7q3uucLI6AFVk1AUE+IvpDlvuLw="; }; meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15500,12 +15499,12 @@ final: prev: { refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "0-unstable-2026-05-26"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "624c01e8175901484eac74512baf35e9dfe269b8"; - hash = "sha256-PPGSMbLVHLghqaVfRsViw7gYHrL4RtiH0Svw8H65TpE="; + rev = "7eaa150061ea18fdbe18fbb924d236e3ddccc57d"; + hash = "sha256-CMnRH1M4/ha+QEGGCcuVXwRFSs69O6VycJlKMFYh6CI="; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15906,12 +15905,12 @@ final: prev: { scnvim = buildVimPlugin { pname = "scnvim"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "ec347b24168ac922de4dcddc181efd2fcdcfa0d0"; - hash = "sha256-cqZF3b+DkOQUOSU502vGQx8RNzH4b97B9zqHO9v8IBI="; + rev = "b7d48851e98e6111ad62f94a3c3ddc9b037122e8"; + hash = "sha256-k5a7d3exVXdjHuILfYIj6cinWoev8h6wYBlNXowuHsw="; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -16004,12 +16003,12 @@ final: prev: { searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; - version = "0-unstable-2026-06-01"; + version = "0-unstable-2026-06-13"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "searchbox.nvim"; - rev = "e66c850fbdebf493969da87e4f665acfb539b9c3"; - hash = "sha256-3HFofdEzVK+kXENrll8rxq/Huyg8HhiDg8P7n0JFQXE="; + rev = "83a43dbc52d27755ab1a9f710a11c987f6a73813"; + hash = "sha256-kUJZvXY1JbHvPUyq80nfP7aygi+ZtjcWGPCbsbvHLLQ="; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16201,12 +16200,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.1.0-unstable-2026-06-05"; + version = "2.1.0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "6806149fd36d1c5e797debe3e18b2c07219b685a"; - hash = "sha256-INxUHLtQBnnmbKBmQNgcdm4FxP5Amig2Q2s6pAub11U="; + rev = "501ea73e433246cbd53f0b14bbd205fa44831e4d"; + hash = "sha256-P7XFoM3zZmlOrhRwiY3xJdJZuiIlJAgijLWukt6OHfI="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17085,12 +17084,12 @@ final: prev: { tagbar = buildVimPlugin { pname = "tagbar"; - version = "3.1.1-unstable-2026-05-17"; + version = "3.1.1-unstable-2026-06-14"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "b37b05ff1925b0b3931f031ebf88690aa0974375"; - hash = "sha256-Vqjq6ClXntfg2579MG37MQJWv6tN/4Y5/uuF4OqFMDQ="; + rev = "07cb8247487208124978daff8e13624667635457"; + hash = "sha256-bezgPiUz5EKKjTLuP6SpWGRCEYo8VXGvoF96qhR0aF8="; }; meta.homepage = "https://github.com/preservim/tagbar/"; meta.license = unfree; @@ -18168,15 +18167,15 @@ final: prev: { transparent-nvim = buildVimPlugin { pname = "transparent.nvim"; - version = "0-unstable-2025-06-22"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "xiyaowong"; repo = "transparent.nvim"; - rev = "8ac59883de84e9cd1850ea25cf087031c5ba7d54"; - hash = "sha256-GlN7/+TmXld2UVPN2rDP7nKqbnswiezmGXn+uGK5I5c="; + rev = "e00ca1cf09caef575edf8da7e5a8b9193893b4c7"; + hash = "sha256-VMWvh5QLV7y65SPEbKacrdL6WvHSF+z+LEaWugxqQOI="; }; meta.homepage = "https://github.com/xiyaowong/transparent.nvim/"; - meta.license = unfree; + meta.license = getLicenseFromSpdxId "MIT"; meta.hydraPlatforms = [ ]; }; @@ -18758,12 +18757,12 @@ final: prev: { vague-nvim = buildVimPlugin { pname = "vague.nvim"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "vague-theme"; repo = "vague.nvim"; - tag = "v2.1.2"; - hash = "sha256-8y4Dc+AXx4+DmnOAYYD6Yyi0GDyI6fwdM4AKsmM5hZU="; + tag = "v2.1.3"; + hash = "sha256-ULBLMmJQe93N3uOPx6h8wif+38g0OSC7haklfVJyZdA="; }; meta.homepage = "https://github.com/vague-theme/vague.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -21882,12 +21881,12 @@ final: prev: { vim-just = buildVimPlugin { pname = "vim-just"; - version = "0-unstable-2026-05-10"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "6034ccf6a4682c91f90f38fae4c882068e6723fe"; - hash = "sha256-3ytgSsTvtmq9jC2qyeBzKLK+x0UppyVODggcspDX7ZE="; + rev = "49f318424ed17fb8d49122daa39820fd6a2880f5"; + hash = "sha256-r/YS0LFio0BNTCUh0nRrAndUfcJgYio+ADCoqq8NH8U="; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22190,12 +22189,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "0.0.1-unstable-2026-05-21"; + version = "0.0.1-unstable-2026-06-11"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "1558bbaba4cbb593901e3dfc4d0f1a0cd212b09c"; - hash = "sha256-wMF4y4eMz7UR50GpBvStDsQ0SpKUt48tll6rqEr6AHY="; + rev = "bffb50ffa688e651a3d4ad827c90b887d5c67200"; + hash = "sha256-4AzLUvDTv8stTk2oKvjXetinK5YGx636TwP9yKdluZs="; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -23940,11 +23939,11 @@ final: prev: { vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "1.6.4-unstable-2026-03-11"; + version = "1.6.4-unstable-2026-06-11"; src = fetchgit { url = "https://codeberg.org/lifepillar/vim-solarized8/"; - rev = "5dfbfb00be8237619c680302fc9250e391b1686a"; - hash = "sha256-qJLlHsXKcLC+bpirfcuBj3igK9dDk8L9oVGPzWhtkEI="; + rev = "1cb22c68158a3e27cf5943052a4bd36c3dd4151c"; + hash = "sha256-XPhiSwyV0A23e6NOEb8OejC68WtVVTL5A4YranlghZs="; }; meta.homepage = "https://codeberg.org/lifepillar/vim-solarized8/"; meta.license = unfree; @@ -25241,12 +25240,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2.17-unstable-2026-05-26"; + version = "2.17-unstable-2026-06-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "24e229914182ff301496a3e2c4214b28c4928d3f"; - hash = "sha256-y45zOpF68G51jVdCsa27iiDdw2YEmHZNgkIHDI62nAo="; + rev = "fedb7ffc1bebf254cc74e7419c3a5930b6719065"; + hash = "sha256-h1GZnhQrm8c+e/vbecBwWbFj4QOX3TbagYp3Ea3tk/Q="; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25535,12 +25534,12 @@ final: prev: { wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "0.11-unstable-2026-03-26"; + version = "0.12"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "44f266fc8ed6f8fbc6bae47ee1ca6ba32e5995f8"; - hash = "sha256-wcoiv8lPBr/r4yMw4tO6SmNQ09f1SjFqWlNDat7oXDk="; + tag = "v0.12"; + hash = "sha256-6562XAJFqmWUo/IzBI6Mmy2Jp1p9smwt4LV95X6Cf5w="; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25747,12 +25746,12 @@ final: prev: { pname = "xeno.nvim"; version = "0-unstable-2025-10-23"; src = fetchFromGitHub { - owner = "kyzadev"; + owner = "kyzabuilds"; repo = "xeno.nvim"; rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb"; hash = "sha256-zTGclrlxThgqEvj8K3fQ87G98g3VDqvp/dCnZwSm4I8="; }; - meta.homepage = "https://github.com/kyzadev/xeno.nvim/"; + meta.homepage = "https://github.com/kyzabuilds/xeno.nvim/"; meta.license = unfree; meta.hydraPlatforms = [ ]; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 28890b26907e..08d0361c408b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1657,6 +1657,7 @@ assertNoAdditions { checkInputs = with self; [ luasnip null-ls-nvim + plenary-nvim ]; nvimSkipModules = [ "init" @@ -2012,9 +2013,8 @@ assertNoAdditions { let kulala-http-grammar = neovimUtils.grammarToPlugin ( tree-sitter.buildGrammar { - inherit (old) version src meta; language = "kulala_http"; - location = "lua/tree-sitter"; + inherit (luaPackages.tree-sitter-kulala_http) version src meta; generate = false; } ); @@ -2036,6 +2036,7 @@ assertNoAdditions { "cli.kulala_cli" # Upstream test harnesses are not require-safe modules "minit" + "minit-userscript" "minitest" "test" # Legacy parser module; active parsing is handled by kulala-core @@ -2482,6 +2483,7 @@ assertNoAdditions { dependencies = with self; [ mason-nvim null-ls-nvim + plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch index 2398bd254e22..d7bd71b2c4c6 100644 --- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch +++ b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch @@ -10,10 +10,10 @@ index 5f37046..c60c474 100644 return vim.treesitter.language.add(parser_name) == true end -@@ -48,7 +47,6 @@ M.register_parser = function() - -- queries/kulala_http/*.scm live under lua/tree-sitter/queries/ - vim.opt.rtp:prepend(parser_source_path) - ensure_site_rtp() +@@ -48,7 +47,3 @@ M.register_parser = function() +- -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/ +- vim.opt.rtp:prepend(parser_source_path) +- ensure_site_rtp() - sync_queries() vim.treesitter.language.register(parser_name, filetypes) vim.treesitter.language.register("markdown", "kulala_ui") From a6362d8c05b78795397a0d047ad491e2a5061b20 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 15 Jun 2026 09:09:30 -0500 Subject: [PATCH 091/133] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index aa0ff553697b..5b71424dab58 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -450,7 +450,7 @@ https://github.com/shumphrey/fugitive-gitlab.vim/,, https://github.com/BeneCollyridam/futhark-vim/,, https://github.com/tzachar/fuzzy.nvim/,, https://github.com/rktjmp/fwatch.nvim/,, -https://github.com/A7Lavinraj/fyler.nvim/,stable, +https://github.com/FylerOrg/fyler.nvim/,stable, https://github.com/stsewd/fzf-checkout.vim/,, https://github.com/monkoose/fzf-hoogle.vim/,, https://github.com/gfanto/fzf-lsp.nvim/,, @@ -1836,7 +1836,7 @@ https://github.com/natecraddock/workspaces.nvim/,, https://github.com/andrewferrier/wrapping.nvim/,, https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,, -https://github.com/kyzadev/xeno.nvim/,, +https://github.com/kyzabuilds/xeno.nvim/,, https://github.com/Mythos-404/xmake.nvim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, From 9cd025a377c3e3c58df271c181c6f4576b78c9ee Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 15 Jun 2026 09:25:20 -0500 Subject: [PATCH 092/133] vimPlugins.null-ls-nvim: remove Upstream deleted the repository, and none-ls-nvim is the maintained fork for users that need null-ls-compatible functionality. --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + .../applications/editors/vim/plugins/generated.nix | 14 -------------- .../applications/editors/vim/plugins/overrides.nix | 11 ++--------- .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 7dc05270b5c0..9bf4e706a40e 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -55,6 +55,7 @@ mapAliases ( mind-nvim = throw "'vimPlugins.mind-nvim' has been removed: the upstream repository got deleted"; # Added 2026-05-03 minsnip-nvim = throw "'vimPlugins.minsnip-nvim' has been removed: the upstream repository got deleted"; # Added 2025-08-30 neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10 + null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15 nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18 nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ebb177a5b0fd..316a0db1aa27 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12183,20 +12183,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - null-ls-nvim = buildVimPlugin { - pname = "null-ls.nvim"; - version = "0-unstable-2023-08-12"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "null-ls.nvim"; - rev = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7"; - hash = "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI="; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; - meta.license = unfree; - meta.hydraPlatforms = [ ]; - }; - numb-nvim = buildVimPlugin { pname = "numb.nvim"; version = "1.1.0"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 08d0361c408b..5fbeef6c5535 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1656,7 +1656,7 @@ assertNoAdditions { ]; checkInputs = with self; [ luasnip - null-ls-nvim + none-ls-nvim plenary-nvim ]; nvimSkipModules = [ @@ -2482,7 +2482,7 @@ assertNoAdditions { mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs { dependencies = with self; [ mason-nvim - null-ls-nvim + none-ls-nvim plenary-nvim ]; }; @@ -3096,13 +3096,6 @@ assertNoAdditions { dependencies = [ self.aniseed ]; }; - null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { - dependencies = [ self.plenary-nvim ]; - meta = old.meta // { - license = lib.licenses.unlicense; - }; - }); - nvchad = super.nvchad.overrideAttrs { # You've signed up for a distro, providing dependencies. dependencies = with self; [ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5b71424dab58..b88ffdcf9b7c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -868,7 +868,6 @@ https://github.com/shaunsingh/nord.nvim/,, https://github.com/alexvzyl/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,, https://github.com/jlesquembre/nterm.nvim/,, -https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,, https://github.com/nvchad/ui/,,nvchad-ui From 3b742e22c60556a4ea4ecd2aeed6258c30b5a7e8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 15 Jun 2026 09:26:40 -0500 Subject: [PATCH 093/133] vimPlugins.nvim-lsp-ts-utils: remove Upstream deleted the repository, so keep a throwing alias instead of a stale generated package. --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + .../applications/editors/vim/plugins/generated.nix | 14 -------------- .../editors/vim/plugins/vim-plugin-names | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 9bf4e706a40e..3cb69dfde76d 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -57,6 +57,7 @@ mapAliases ( neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10 null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15 nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18 + nvim-lsp-ts-utils = throw "'vimPlugins.nvim-lsp-ts-utils' has been removed: upstream deleted repository"; # Added 2026-06-15 nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 peskcolor-vim = throw "'vimPlugins.peskcolor-vim' has been removed: abandoned by upstream"; # Added 2024-08-23 diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 316a0db1aa27..920f2b20e9a5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13101,20 +13101,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - nvim-lsp-ts-utils = buildVimPlugin { - pname = "nvim-lsp-ts-utils"; - version = "0-unstable-2022-07-17"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "nvim-lsp-ts-utils"; - rev = "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7"; - hash = "sha256-38YOgLDtku2BPCaNEmX0555x1QmHuuDSCZL274bBhcg="; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; - meta.license = getLicenseFromSpdxId "Unlicense"; - meta.hydraPlatforms = [ ]; - }; - nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; version = "2.10.0"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b88ffdcf9b7c..5917b790b245 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -934,7 +934,6 @@ https://github.com/martineausimon/nvim-lilypond-suite/,, https://codeberg.org/mfussenegger/nvim-lint/,, https://github.com/antosha417/nvim-lsp-file-operations/,, https://github.com/mrded/nvim-lsp-notify/,, -https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, https://github.com/sam4llis/nvim-lua-gf/,, From c09c07a6649ef35baa2a6e80930a18ccab499951 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 15 Jun 2026 09:27:25 -0500 Subject: [PATCH 094/133] vimPlugins.typescript-nvim: remove Upstream deleted the repository, so keep a throwing alias instead of a stale generated package. --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + .../applications/editors/vim/plugins/generated.nix | 14 -------------- .../applications/editors/vim/plugins/overrides.nix | 11 ----------- .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 1 insertion(+), 26 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 3cb69dfde76d..a83a782436c7 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -71,6 +71,7 @@ mapAliases ( sparkup = throw "'vimPlugins.sparkup' was removed: the upstream repository got deleted"; # Added 2025-08-06 syntax-tree-surfer = throw "'vimPlugins.syntax-tree-surfer' has been archived"; # Added 2025-12-18 todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23 + typescript-nvim = throw "'vimPlugins.typescript-nvim' has been removed: upstream deleted repository"; # Added 2026-06-15 vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12 vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14 # keep-sorted end diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 920f2b20e9a5..85489fefd586 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18405,20 +18405,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - typescript-nvim = buildVimPlugin { - pname = "typescript.nvim"; - version = "0-unstable-2023-08-12"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "typescript.nvim"; - rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467"; - hash = "sha256-tStomym4qd7IXj/ohYAc3akImNsOJdC7nQL+CkdMomc="; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; - meta.license = getLicenseFromSpdxId "Unlicense"; - meta.hydraPlatforms = [ ]; - }; - typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; version = "0-unstable-2025-11-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5fbeef6c5535..03edb8dac52b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4627,17 +4627,6 @@ assertNoAdditions { runtimeDeps = [ television ]; }; - typescript-nvim = super.typescript-nvim.overrideAttrs { - checkInputs = [ - # Optional null-ls integration - self.none-ls-nvim - ]; - dependencies = with self; [ - nvim-lspconfig - plenary-nvim - ]; - }; - typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5917b790b245..97bcfcc72948 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1314,7 +1314,6 @@ https://github.com/alexpasmantier/tv.nvim/,, https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, -https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/MrPicklePinosaur/typst-conceal.vim/,, https://github.com/chomosuke/typst-preview.nvim/,, https://github.com/kaarmu/typst.vim/,, From e06b33e3b903b8a5314041a8f31d791b14a70f76 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:34:55 +0000 Subject: [PATCH 095/133] =?UTF-8?q?evolution-data-server:=203.60.1=20?= =?UTF-8?q?=E2=86=92=203.60.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.60.1...3.60.2 --- .../evolution-data-server/hardcode-gsettings.patch | 12 ++++++------ pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 9a45269b21f9..c259dd0f1269 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -130,7 +130,7 @@ index 9d986d2..d63902a 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 60ff97f..8535dec 100644 +index c24a37a..e5cf57e 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void) @@ -338,7 +338,7 @@ index 94f0769..8de758b 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index 2c0b6ef..b354332 100644 +index 3de034a..b6732ba 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c @@ -363,7 +363,19 @@ void @@ -363,10 +363,10 @@ index 2c0b6ef..b354332 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index e605049..9961fea 100644 +index e3f2391..374c72d 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -507,10 +507,10 @@ index 3738359..f9ce2d9 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index c999d4d..e9cf7c5 100644 +index 9f56da2..f82921a 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -95,7 +95,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 4a686d1d2775..65178d7ce4cc 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.60.1"; + version = "3.60.2"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-M/ktO4gi66BMMTeWwHeMu2Who4Ry6FftxfmIVMyps0w="; + hash = "sha256-IITb2sOWNxs2XVBMH/RYZrqNyi8SUuXaHT2cM6vcEoY="; }; patches = [ From 99728d9ec3c9cce625edb0e447ecd1dbe1087eb3 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:36:17 +0000 Subject: [PATCH 096/133] =?UTF-8?q?gdm:=2050.0=20=E2=86=92=2050.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/50.0...50.1 --- pkgs/by-name/gd/gdm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index a84f733c3345..6495cdc457d8 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "50.0"; + version = "50.1"; outputs = [ "out" @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZG9T1o8tLRRxRv+uuFBH3ti4E9yxwQTY8Ow2ymCetb8="; + hash = "sha256-dwFZNzUSGSQQ9BK10MRnjsFXPxrks5yB/nWGH+iJAXQ="; }; mesonFlags = [ From df9ee173ed727614d166cb33d0e01d3b26ce7723 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:38:38 +0000 Subject: [PATCH 097/133] =?UTF-8?q?gnome-control-center:=2050.1=20?= =?UTF-8?q?=E2=86=92=2050.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/50.1...50.2 --- pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 6fdf165b7ec8..d4d1d2eeaa6e 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -77,11 +77,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "50.1"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-64MkkdCI5PdCbopZKxBCikWlc2wL/+IQXFHExow6Ud0="; + hash = "sha256-tWvriHuUMumAp1e5juydMdiWlev/tHkbPDvUeWI6kmE="; }; patches = [ From 9179733defecd874460759e58778c5dc65c0872a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:40:23 +0000 Subject: [PATCH 098/133] =?UTF-8?q?gnome-session:=2050.0=20=E2=86=92=2050.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/50.0...50.1 --- pkgs/by-name/gn/gnome-session/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index f1f41e7ea312..2ae9f47e8790 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "50.0"; + version = "50.1"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-vncIzZ0mDhrBg4FTE9u2ILGHbq1bo5zn6i5tx629ckY="; + hash = "sha256-Yom2r6RNPkyZnOV2H/iywQujCfVflCXysT+YIIyB9vs="; }; patches = [ From 459d7086cab166218a4134ce3f45cfd9be18f6fa Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:41:28 +0000 Subject: [PATCH 099/133] =?UTF-8?q?gnome-shell:=2050.1=20=E2=86=92=2050.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/50.1...50.2 --- pkgs/by-name/gn/gnome-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index bede5d2d751e..94315515d002 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "50.1"; + version = "50.2"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-G0d2AXLBTz9O3Rya/zZfTeRVg1F78PgN9NOsvU5MspQ="; + hash = "sha256-UyFUIOUO/dTQYRultZ4Qy0yJ+j9R4q3f2Vyt4GGgmik="; }; patches = [ From bcd725fed02f896637e0ed088e9c7b387d0454e7 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:43:34 +0000 Subject: [PATCH 100/133] =?UTF-8?q?gnome-software:=2050.1=20=E2=86=92=2050?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/50.1...50.2 --- pkgs/by-name/gn/gnome-software/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index 52b81eec1fce..c89227c58930 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "50.1"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-aWfu/sadUdNNIAWFye3+JPFRgD5J7ZKEo9dO2w5TQKg="; + hash = "sha256-ysroXVfkbRj0p8j+M0vzXIwY51uKZvrVbgzioA4c/j8="; }; patches = [ From f1407811b9b0e5e0b7b27dd19b8cd3f5bf99c4d4 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:44:23 +0000 Subject: [PATCH 101/133] =?UTF-8?q?gnome-text-editor:=2050.0=20=E2=86=92?= =?UTF-8?q?=2050.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/50.0...50.1 --- pkgs/by-name/gn/gnome-text-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index ffafb849bb03..8c8fb7beaaaf 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "50.0"; + version = "50.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-ncKZ2k2qCFQjtdSNtZ8AIa1V50FDpcuKsuX/4Xln9Fs="; + hash = "sha256-9oA2sJ03j6qIO/6Tbkecb/NwJ8L/7RAdr5Et9wxR0OY="; }; nativeBuildInputs = [ From 391ebae7949f74f690b52fb159c116a95c930132 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:45:19 +0000 Subject: [PATCH 102/133] =?UTF-8?q?gnome-user-docs:=2050.0=20=E2=86=92=205?= =?UTF-8?q?0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/50.0...50.2 --- pkgs/by-name/gn/gnome-user-docs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index 246b3cd0420c..6327615c371b 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-docs"; - version = "50.0"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz"; - hash = "sha256-6OIzJBhMfphcUE8F9tnGNCDJqdH2Tv3l2iqBEjYHL3g="; + hash = "sha256-g0hj2RYYmuE/clYr6B04FyMuE20NN+w3aBERH/oVlUI="; }; nativeBuildInputs = [ From b8764a66a676abcdb5a42e35ef347be785cd5236 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:46:43 +0000 Subject: [PATCH 103/133] =?UTF-8?q?gnome-user-share:=2048.2=20=E2=86=92=20?= =?UTF-8?q?48.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-share/-/compare/48.2...48.3 --- pkgs/by-name/gn/gnome-user-share/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 1cc81d060b58..e5043acb06d8 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-share"; - version = "48.2"; + version = "48.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ayho1Ar4UIC6Thi6XatGwOZj7H5DiUnwgsgFeV9ivwY="; + hash = "sha256-oE1IP0mz92naj/Xi0/y/++rztsa3HYLSoqYju0seDdQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { From e20dab6b2ed0109bd9421019748187c63c7e749f Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:50:35 +0000 Subject: [PATCH 104/133] =?UTF-8?q?gupnp-av:=200.14.4=20=E2=86=92=200.14.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp-av/-/compare/gupnp-av-0.14.4...gupnp-av-0.14.5 --- pkgs/by-name/gu/gupnp-av/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gupnp-av/package.nix b/pkgs/by-name/gu/gupnp-av/package.nix index 9ab6982ea828..22422a67b388 100644 --- a/pkgs/by-name/gu/gupnp-av/package.nix +++ b/pkgs/by-name/gu/gupnp-av/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gupnp-av"; - version = "0.14.4"; + version = "0.14.5"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor finalAttrs.version}/gupnp-av-${finalAttrs.version}.tar.xz"; - sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc="; + sha256 = "k5GPz1r1Kf2ls9LZ/Dt3zZPfiAZJObgvJJ9Vd9jeHAI="; }; strictDeps = true; From 250bde9c3c8e65a5a4570ba5512da5e4dd105f76 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:53:05 +0000 Subject: [PATCH 105/133] =?UTF-8?q?nautilus:=2050.1=20=E2=86=92=2050.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/50.1...50.2.2 --- pkgs/by-name/na/nautilus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index d535f9081431..d210135a1d87 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "50.1"; + version = "50.2.2"; outputs = [ "out" @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-1ieTuWWXcbZqa24FK1Iin4aN2+wTiKC2ae7wvSESEu4="; + hash = "sha256-4eKF7930LtMN2lsp9/jSQtq0vBQJqQVIY7NnutSzTVo="; }; patches = [ From efec514c0b771e0d63f7e64670debbcc06481afb Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 17:55:02 +0000 Subject: [PATCH 106/133] =?UTF-8?q?orca:=2050.1.2=20=E2=86=92=2050.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/50.1.2...50.2 --- pkgs/by-name/or/orca/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 6cb77c9b2ed0..d666bd22a269 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "orca"; - version = "50.1.2"; + version = "50.2"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major finalAttrs.version}/orca-${finalAttrs.version}.tar.xz"; - hash = "sha256-hZK1PfhCOep13aqN7GeSyE0rmft7R6X9kCLGr4ymV6g="; + hash = "sha256-BxRCHN6OxLr0fxjktKErTlxKPP47FhVp4HD+A3cT/QQ="; }; patches = [ From 20aefa7228383ffb304beb3161da2a67be0d6d00 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 18:07:12 +0000 Subject: [PATCH 107/133] =?UTF-8?q?papers:=2050.0=20=E2=86=92=2050.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/papers/-/compare/50.0...50.2 --- pkgs/by-name/pa/papers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index c1a16e039543..2695ea244070 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "50.0"; + version = "50.2"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-MBsg60a8ZNbKcuo3F10o2orqT4YT5HG5TDGF5cTRvAU="; + hash = "sha256-rhvc8c1Hy1DJ2EdleEYH+Bxy3xfdbmrZM/6hQXPSufQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { From b196b6a6d6469cc442f53fce7f7e994c64fb6d61 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 18:11:23 +0000 Subject: [PATCH 108/133] =?UTF-8?q?rygel:=2045.1=20=E2=86=92=2045.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/45.1...45.2 --- pkgs/by-name/ry/rygel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index 53e2e425b73a..a22928d51c55 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rygel"; - version = "45.1"; + version = "45.2"; # TODO: split out lib outputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - hash = "sha256-zzhuKA2Or5tmd6L0i6eEhMcqCVVNXFjFHNh/pZRWF8g="; + hash = "sha256-IOV7cLFahl133Dj594arxSxksRH+X5OKYsKNcS3xMx0="; }; patches = [ From 077ef53a6b2d5cc7c93cbd6f305124cc9379ce62 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 18:12:10 +0000 Subject: [PATCH 109/133] =?UTF-8?q?sushi:=2050.rc.1=20=E2=86=92=2050.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sushi/-/compare/50.rc.1...50.0 --- pkgs/by-name/su/sushi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index 6bb8f31e72ed..714cf91381a0 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sushi"; - version = "50.rc.1"; + version = "50.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major finalAttrs.version}/sushi-${finalAttrs.version}.tar.xz"; - hash = "sha256-l6efnH4IsLF2Am7Ux6BDXwYSxMENoz1H4rr6ucYpImM="; + hash = "sha256-qyUXeQjVzMWFaHaageubTzIwZ4bmxzYYGT6/YaEn7gA="; }; nativeBuildInputs = [ From 3a2d18f8682844c64313fc4ea05c94f58b020bea Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 9 Jun 2026 18:13:11 +0000 Subject: [PATCH 110/133] =?UTF-8?q?yelp:=2049.0=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/49.0...49.1 --- pkgs/by-name/ye/yelp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix index 197b9a79dff1..30b0cbce2796 100644 --- a/pkgs/by-name/ye/yelp/package.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yelp"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz"; - hash = "sha256-5mFOCx9Lpf57jRSb3UJnPwMGVvvc1zaumGBxkZfGNFc="; + hash = "sha256-Pj6U7y0slIfMUQYuOvv6FXjOvSnYDIQ1e21+5tz9inQ="; }; nativeBuildInputs = [ From 9c40cf3a9fd2e893bb61f057b1f46b7888e2a1f9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Jun 2026 15:48:35 +0000 Subject: [PATCH 111/133] =?UTF-8?q?mutter:=2050.1=20=E2=86=92=2050.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/50.1...50.2 --- pkgs/by-name/mu/mutter/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index d6e132537610..88a35c0432be 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -1,5 +1,6 @@ { fetchurl, + fetchpatch, runCommand, lib, stdenv, @@ -72,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "50.1"; + version = "50.2"; outputs = [ "out" @@ -83,9 +84,18 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-k0RQLORz94h5Xya0X4uP9TwKNrhnRw1wWhGj7gkRAh4="; + hash = "sha256-/ejfinRlAMUfHJJbUeV8PdhwByM771Yweegx9Tv6O1Y="; }; + patches = [ + # mutter 50.2 spams logs, clutter_input_focus_set_cursor_location + # https://gitlab.gnome.org/GNOME/mutter/-/work_items/4840 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/f1570318ec3e9a38615eb91708bb71628ab8bcfd.patch"; + hash = "sha256-73GI2DTgoEBUQGa7nTUIur/ZuDHgDu4SwjUWHBRCyuo="; + }) + ]; + mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these From 97823cb3dbef2c3915adb321b2c19321f0fae074 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Tue, 16 Jun 2026 17:35:58 +0200 Subject: [PATCH 112/133] dua: 2.34.0 -> 2.35.0 Changelog: https://github.com/Byron/dua-cli/releases/tag/v2.35.0 Diff: https://github.com/Byron/dua-cli/compare/v2.34.0...v2.35.0 skip another interactive test --- pkgs/by-name/du/dua/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index f851a097f925..e538551b9fd6 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-F09Ne+2Ospw44L97nwHXp/ELM9B3G2Mt0Crau//zV/c="; + hash = "sha256-dlm8jp7Bh0DgUN4ztalE6uPSzeJy+JDfai39xZKiptw="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -22,12 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-g92G/4mfHH7zW14eoodL7j179Iah5iAH78zlmcxM/AM="; + cargoHash = "sha256-620Emfkuzyc8/LVr8codB1/IAemxDBOnhS/rL6gR8R8="; checkFlags = [ # Skip interactive tests "--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked" "--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked" + "--skip=interactive::app::tests::journeys_readonly::once_allows_replayed_quit_to_exit stdout" "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only" "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion" "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels" From 48bac9bc4166a81d31d53072651d48057b1b33f1 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:44:54 +0300 Subject: [PATCH 113/133] gtdialog: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/gt/gtdialog/package.nix | 46 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/by-name/gt/gtdialog/package.nix diff --git a/pkgs/by-name/gt/gtdialog/package.nix b/pkgs/by-name/gt/gtdialog/package.nix deleted file mode 100644 index bcfe50d7324b..000000000000 --- a/pkgs/by-name/gt/gtdialog/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - cdk, - unzip, - gtk2, - glib, - ncurses, - pkg-config, - fetchFromGitHub, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtdialog"; - version = "1.6"; - - src = fetchFromGitHub { - owner = "orbitalquark"; - repo = "gtdialog"; - rev = "gtdialog_${finalAttrs.version}"; - hash = "sha256-TdYwT4bC+crTSNGJIr1Nno+/h1YgxNp0BR5MQtxdrVg="; - }; - - nativeBuildInputs = [ - pkg-config - unzip - ]; - buildInputs = [ - cdk - gtk2 - glib - ncurses - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "Cross-platform helper for creating interactive dialogs"; - mainProgram = "gtdialog"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; - homepage = "http://foicica.com/gtdialog"; - downloadPage = "http://foicica.com/gtdialog/download"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 749962b7e66e..4120f7f074c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,6 +969,7 @@ mapAliases { gscrabble = throw "'gscrabble' has been removed, as it is unmaintained upstream, and broken in nixpkgs"; # Added 2026-01-03 gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06 gssdp = throw "'gssdp' (version 1.4) has been removed as it was unmaintained upstream and depended on libsoup 2.4. Consider using `gssdp_1_6` instead"; # Added 2026-06-07 + gtdialog = throw "'gtdialog' has been removed, as it depended on GTK 2. Consider using 'yad' or 'zenity' instead."; # Added 2026-05-22 gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27 gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 gtkgnutella = gtk-gnutella; # Added 2026-05-21 From bf007c2ede65bc3b17cb08c5dca4066157e4bbc1 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:45:05 +0300 Subject: [PATCH 114/133] gtklp: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/gt/gtklp/000-autoconf.patch | 23 ------ .../gt/gtklp/001-format-parameter.patch | 22 ------ pkgs/by-name/gt/gtklp/package.nix | 76 ------------------- pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 pkgs/by-name/gt/gtklp/000-autoconf.patch delete mode 100644 pkgs/by-name/gt/gtklp/001-format-parameter.patch delete mode 100644 pkgs/by-name/gt/gtklp/package.nix diff --git a/pkgs/by-name/gt/gtklp/000-autoconf.patch b/pkgs/by-name/gt/gtklp/000-autoconf.patch deleted file mode 100644 index c1698bee1fdc..000000000000 --- a/pkgs/by-name/gt/gtklp/000-autoconf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch origin: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/3 - -diff --git a/configure.ac b/configure.ac -index b7a30e9..3768ae9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h]) - - AC_CONFIG_MACRO_DIR([m4]) - AM_GNU_GETTEXT([external]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) - - dnl Extra params - CUPSCONFIGPATH="" -@@ -30,8 +31,6 @@ AC_SUBST(XLIBS) - - dnl Checks for header files - --dnl internationalization macros --AM_GNU_GETTEXT - - - # Forte Compiler ############################################################ diff --git a/pkgs/by-name/gt/gtklp/001-format-parameter.patch b/pkgs/by-name/gt/gtklp/001-format-parameter.patch deleted file mode 100644 index 6cfc90beb02a..000000000000 --- a/pkgs/by-name/gt/gtklp/001-format-parameter.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch source: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/1 - ---- a/libgtklp/libgtklp.c 2020-08-25 17:31:52.427298559 +0100 -+++ b/libgtklp/libgtklp.c 2020-08-25 17:36:37.728154682 +0100 -@@ -939,7 +939,7 @@ - gtk_widget_show(pixmapwid); - - if (strlen(gerror2) == 0) -- snprintf(tmplabel, (size_t) MAXLINE, gerror1); -+ snprintf(tmplabel, (size_t) MAXLINE, "%s", gerror1); - else - snprintf(tmplabel, (size_t) MAXLINE, gerror1, gerror2); - label = gtk_label_new(tmplabel); -@@ -973,7 +973,7 @@ - #endif - } else { - if (strlen(gerror2) == 0) -- g_warning(gerror1); -+ g_warning("%s", gerror1); - else - g_warning(gerror1, gerror2); - } diff --git a/pkgs/by-name/gt/gtklp/package.nix b/pkgs/by-name/gt/gtklp/package.nix deleted file mode 100644 index 8b4f3b209865..000000000000 --- a/pkgs/by-name/gt/gtklp/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - autoreconfHook, - cups, - fetchurl, - gettext, - glib, - gtk2, - libtool, - openssl, - pkg-config, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtklp"; - version = "1.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/gtklp/gtklp-${finalAttrs.version}.src.tar.gz"; - hash = "sha256-vgdgkEJZX6kyA047LXA4zvM5AewIY/ztu1GIrLa1O6s="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - cups - ]; - - buildInputs = [ - cups - gettext - glib - gtk2 - libtool - openssl - ]; - - outputs = [ - "out" - "doc" - "man" - ]; - - strictDeps = true; - - patches = [ - ./000-autoconf.patch - ./001-format-parameter.patch - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar'; - # file.o:libgtklp/libgtklp.h:83: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - postPatch = '' - substituteInPlace include/defaults.h \ - --replace "netscape" "firefox" \ - --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \ - "http://localhost:631/help/" - ''; - - preInstall = '' - install -D -m0644 -t $doc/share/doc AUTHORS BUGS ChangeLog README USAGE - ''; - - meta = { - homepage = "https://gtklp.sirtobi.com"; - description = "GTK-based graphical frontend for CUPS"; - license = with lib.licenses; [ gpl2Only ]; - mainProgram = "gtklp"; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4120f7f074c8..0a581bef2a4d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -973,6 +973,7 @@ mapAliases { gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27 gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 gtkgnutella = gtk-gnutella; # Added 2026-05-21 + gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22 gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12 gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28 guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27 From bf30dd0b21528f4e91cb35a6b9ebd03231989c7a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 03:25:06 +0300 Subject: [PATCH 115/133] asunder: switch to GTK 3 fork Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/as/asunder/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix index 3299b9ef16d5..31bb09cb0179 100644 --- a/pkgs/by-name/as/asunder/package.nix +++ b/pkgs/by-name/as/asunder/package.nix @@ -1,9 +1,10 @@ { lib, stdenv, - fetchurl, + autoreconfHook, + fetchFromGitHub, makeWrapper, - gtk2, + gtk3, libcddb, intltool, pkg-config, @@ -36,20 +37,24 @@ let in stdenv.mkDerivation (finalAttrs: { - version = "3.0.2"; pname = "asunder"; - src = fetchurl { - url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2"; - hash = "sha256-txNB10bM9WqnexeFxq+BqmQdCErD00t4vrU3YYhItks="; + version = "3.1.0-unstable-2025-03-24"; + + src = fetchFromGitHub { + owner = "rizalmart"; + repo = "asunder-gtk3"; + rev = "e3676704f7c7912e61ad7d78fe19015c102a27e1"; + hash = "sha256-bJVrSbjOUkmrF76e6euM5VPwbvvRrA5ZLPzZGjEep98="; }; nativeBuildInputs = [ + autoreconfHook intltool makeWrapper pkg-config ]; buildInputs = [ - gtk2 + gtk3 libcddb ]; @@ -61,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Graphical Audio CD ripper and encoder for Linux"; mainProgram = "asunder"; - homepage = "http://littlesvr.ca/asunder/index.php"; + homepage = "https://github.com/rizalmart/asunder-gtk3"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ mudri ]; platforms = lib.platforms.linux; From 11c1745faca631d84febd306b340923294d673ad Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 03:25:15 +0300 Subject: [PATCH 116/133] gftp: switch to GTK 3 Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/gf/gftp/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix index 68cf2bf9510e..1bb023756a27 100644 --- a/pkgs/by-name/gf/gftp/package.nix +++ b/pkgs/by-name/gf/gftp/package.nix @@ -5,24 +5,22 @@ meson, ninja, gettext, - gtk2, + gtk3, ncurses, openssl, pkg-config, readline, - nix-update-script, - versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "gftp"; - version = "2.9.1b-unstable-2025-05-12"; + version = "2.9.1b-unstable-2026-03-30"; src = fetchFromGitHub { owner = "masneyb"; repo = "gftp"; - rev = "48114635f7b7b1f9a5eda985021ea53b10a7a030"; - hash = "sha256-unTsd2xX8Y71ItE3gYHoxUPgViK/xhZdx0IQYvDPaEc="; + rev = "f64d27b116be1fc444e0f50ec375847b72df65f7"; + hash = "sha256-2CVRIrSOBi1AUoEKiyYhMmGcIIBnwMQ3EQsgBIvlXEs="; }; nativeBuildInputs = [ @@ -33,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk2 + gtk3 ncurses openssl readline From 35d4acf531ff0857b8d4295bd28bc7543ad8f3f5 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:45:37 +0300 Subject: [PATCH 117/133] xzgv: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/xz/xzgv/package.nix | 47 -------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/by-name/xz/xzgv/package.nix diff --git a/pkgs/by-name/xz/xzgv/package.nix b/pkgs/by-name/xz/xzgv/package.nix deleted file mode 100644 index 8439c3176a9e..000000000000 --- a/pkgs/by-name/xz/xzgv/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gtk2, - libexif, - pkg-config, - texinfo, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xzgv"; - version = "0.9.2"; - src = fetchurl { - url = "mirror://sourceforge/xzgv/xzgv-${finalAttrs.version}.tar.gz"; - sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; - }; - nativeBuildInputs = [ - pkg-config - texinfo - ]; - buildInputs = [ - gtk2 - libexif - ]; - env.NIX_CFLAGS_COMPILE = toString [ - # gcc15 build failure - "-std=gnu17" - ]; - postPatch = '' - substituteInPlace config.mk \ - --replace /usr/local $out - substituteInPlace Makefile \ - --replace "all: src man" "all: src man info" - ''; - preInstall = '' - mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} - ''; - meta = { - homepage = "https://sourceforge.net/projects/xzgv/"; - description = "Picture viewer for X with a thumbnail-based selector"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.womfoo ]; - platforms = lib.platforms.linux; - mainProgram = "xzgv"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0a581bef2a4d..9a19614b67e9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2714,6 +2714,7 @@ mapAliases { xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27 xxgdb = throw "'xxgdb' seems inactive and doesn't compile with glibc 2.42"; # Added 2025-09-28 xxHash = warnAlias "'xxHash' has been renamed to 'xxhash'" xxhash; # Added 2026-02-12 + xzgv = throw "'xzgv' has been removed, as it depended on GTK 2. Consider using 'geeqie' or 'gthumb' instead."; # Added 2026-05-22 yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10 yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10 yacas-gui = throw "'yacas-gui' has been removed, as it depended on qt5 webengine. Upstream is considering deprecation of the gui entirely, see https://github.com/grzegorzmazur/yacas/issues/361."; # Added 2026-02-11 From 22079f8d54d0c49f7bc0469546b475fcd629a6f3 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:45:48 +0300 Subject: [PATCH 118/133] artha: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/ar/artha/package.nix | 39 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/by-name/ar/artha/package.nix diff --git a/pkgs/by-name/ar/artha/package.nix b/pkgs/by-name/ar/artha/package.nix deleted file mode 100644 index 85d7a879b094..000000000000 --- a/pkgs/by-name/ar/artha/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - autoreconfHook, - fetchurl, - dbus-glib, - gtk2, - pkg-config, - wordnet, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "artha"; - version = "1.0.5"; - - src = fetchurl { - url = "mirror://sourceforge/artha/${finalAttrs.version}/artha-${finalAttrs.version}.tar.bz2"; - sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - dbus-glib - gtk2 - wordnet - ]; - - meta = { - description = "Offline thesaurus based on WordNet"; - homepage = "https://artha.sourceforge.net"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - mainProgram = "artha"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9a19614b67e9..f8062b8ab237 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -327,6 +327,7 @@ mapAliases { argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27 aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27 arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + artha = throw "'artha' has been removed, as the packaged GTK 2 application is unmaintained upstream. Consider using 'wordnet' instead."; # Added 2026-05-22 artichoke = throw "artichoke has been removed due to being archived upstream."; # Added 2025-11-04 artim-dark = aritim-dark; # Added 2025-07-27 artyFX = openav-artyfx; # Added 2026-02-08 From 9dca59caf5cea179b67fd17b008e7f477de2b70a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:45:58 +0300 Subject: [PATCH 119/133] gbdfed: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/gb/gbdfed/Makefile.patch | 15 -------- pkgs/by-name/gb/gbdfed/package.nix | 49 --------------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 pkgs/by-name/gb/gbdfed/Makefile.patch delete mode 100644 pkgs/by-name/gb/gbdfed/package.nix diff --git a/pkgs/by-name/gb/gbdfed/Makefile.patch b/pkgs/by-name/gb/gbdfed/Makefile.patch deleted file mode 100644 index 9c437deca07c..000000000000 --- a/pkgs/by-name/gb/gbdfed/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git "a/Makefile.in" "b/Makefile.in" -index b482958..472b8da 100644 ---- "a/Makefile.in" -+++ "b/Makefile.in" -@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs - CC = @CC@ - CFLAGS = @XX_CFLAGS@ @CFLAGS@ - --DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED -+DEFINES = @DEFINES@ - - SRCS = bdf.c \ - bdfcons.c \ diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix deleted file mode 100644 index ef988794e367..000000000000 --- a/pkgs/by-name/gb/gbdfed/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - freetype, - gtk2-x11, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "1.6"; - pname = "gbdfed"; - - src = fetchurl { - url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${finalAttrs.version}.tar.bz2"; - sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - freetype - gtk2-x11 - ]; - - patches = [ ./Makefile.patch ]; - - hardeningDisable = [ "format" ]; - - postPatch = '' - # gcc15 - substituteInPlace bdfgrab.c --replace-fail 'int (*old_error_handler)();' 'XErrorHandler old_error_handler;' - substituteInPlace hbf.c --replace-fail 'typedef int bool;' '// typedef int bool;' - ''; - - meta = { - description = "Bitmap Font Editor"; - longDescription = '' - gbdfed lets you interactively create new bitmap font files or modify existing ones. - It allows editing multiple fonts and multiple glyphs, - it allows cut and paste operations between fonts and glyphs and editing font properties. - The editor works natively with BDF fonts. - ''; - homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.all; - mainProgram = "gbdfed"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f8062b8ab237..4e519a3476e4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -858,6 +858,7 @@ mapAliases { garage_1_x = warnAlias "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23 garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16 gavrasm = throw "'gavrasm' has been removed. Use 'avra' instead."; # Added 2025-12-21 + gbdfed = throw "'gbdfed' has been removed, as it is unmaintained upstream and depends on GTK 2. Consider using 'fontforge' instead."; # Added 2026-05-22 gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gcc10 = throw "gcc10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 From f5cc3b36f162ed743a985247bf762add9ae11cd6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:46:20 +0300 Subject: [PATCH 120/133] chemtool: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/ch/chemtool/package.nix | 61 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 pkgs/by-name/ch/chemtool/package.nix diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix deleted file mode 100644 index 344b1d66150b..000000000000 --- a/pkgs/by-name/ch/chemtool/package.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libx11, - gtk2, - fig2dev, - wrapGAppsHook3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "chemtool"; - version = "1.6.14"; - - src = fetchurl { - url = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-${finalAttrs.version}.tar.gz"; - sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - buildInputs = [ - libx11 - gtk2 - fig2dev - ]; - - # Workaround build on -fno-common toolchains like upstream gcc-10. - # Otherwise built fails as: - # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of - # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") - ''; - - meta = { - homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"; - description = "Draw chemical structures"; - longDescription = '' - Chemtool is a program for drawing organic molecules. It runs under the X - Window System using the GTK widget set. - - Most operations in chemtool can be accomplished using the mouse - the - first (usually the left) button is used to select or place things, the - middle button modifies properties (e.g. reverses the direction of a bond), - and the right button is used to delete objects. - - The program offers essentially unlimited undo/redo, two text fonts plus - symbols, seven colors, drawing at several zoom scales, and square and - hexagonal backdrop grids for easier alignment. - ''; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4e519a3476e4..c2c07565d362 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -475,6 +475,7 @@ mapAliases { check_systemd = throw "'check_systemd' has been renamed to/replaced by 'nagiosPlugins.check_systemd'"; # Converted to throw 2025-10-27 check_zfs = throw "'check_zfs' has been renamed to/replaced by 'nagiosPlugins.check_zfs'"; # Converted to throw 2025-10-27 checkSSLCert = throw "'checkSSLCert' has been renamed to/replaced by 'nagiosPlugins.check_ssl_cert'"; # Converted to throw 2025-10-27 + chemtool = throw "'chemtool' has been removed, as it is unmaintained upstream and depends on GTK 2. Consider using 'avogadro2' instead."; # Added 2026-05-22 chiaki4deck = throw "'chiaki4deck' has been renamed to/replaced by 'chiaki-ng'"; # Converted to throw 2025-10-27 chit = throw "'chit' has been removed from nixpkgs because it was unmaintained upstream and used insecure dependencies"; # Added 2025-11-28 chkrootkit = throw "chkrootkit has been removed as it is unmaintained and archived upstream and didn't even work on NixOS"; # Added 2025-09-12 From cca51b0cdd911db32f723c5c6823215b7efe3c36 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:50:40 +0300 Subject: [PATCH 121/133] fped: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/fp/fped/package.nix | 63 -------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/by-name/fp/fped/package.nix diff --git a/pkgs/by-name/fp/fped/package.nix b/pkgs/by-name/fp/fped/package.nix deleted file mode 100644 index 0cfb5c180913..000000000000 --- a/pkgs/by-name/fp/fped/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - flex, - bison, - fig2dev, - imagemagick, - netpbm, - gtk2, - pkg-config, -}: - -stdenv.mkDerivation { - pname = "fped"; - version = "unstable-2017-05-11"; - - src = fetchgit { - url = "git://projects.qi-hardware.com/fped.git"; - rev = "fa98e58157b6f68396d302c32421e882ac87f45b"; - sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' - ''; - - # Workaround build failure on -fno-common toolchains: - # ld: postscript.o:postscript.h:29: multiple definition of - # `postscript_params'; fped.o:postscript.h:29: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - # This uses '/bin/bash', '/usr/local' and 'lex' by default - makeFlags = [ - "PREFIX=${placeholder "out"}" - "LEX=flex" - "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt" - ]; - - nativeBuildInputs = [ - flex - bison - pkg-config - imagemagick - fig2dev - netpbm - ]; - - buildInputs = [ - flex - gtk2 - ]; - - meta = { - description = "Editor that allows the interactive creation of footprints electronic components"; - mainProgram = "fped"; - homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2c07565d362..71405fa29d29 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -827,6 +827,7 @@ mapAliases { ); # Converted to warning 2025-10-28 forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27 + fped = throw "'fped' has been removed, as it is unmaintained upstream and depends on GTK 2. Consider using 'kicad' instead."; # Added 2026-05-22 fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27 framac = frama-c; # Added 2026-04-24 framework-system-tools = throw "'framework-system-tools' has been renamed to/replaced by 'framework-tool'"; # Converted to throw 2025-10-27 From f6ef66e41b9a551d9d3ce9d32a07c222c3252c7f Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 May 2026 01:51:00 +0300 Subject: [PATCH 122/133] hasmail: drop Assisted-by: codex with gpt-5.5-high --- pkgs/by-name/ha/hasmail/package.nix | 43 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/by-name/ha/hasmail/package.nix diff --git a/pkgs/by-name/ha/hasmail/package.nix b/pkgs/by-name/ha/hasmail/package.nix deleted file mode 100644 index e562a4a24ad6..000000000000 --- a/pkgs/by-name/ha/hasmail/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - pkg-config, - pango, - cairo, - gtk2, -}: - -buildGoModule { - pname = "hasmail-unstable"; - version = "2019-08-24"; - - src = fetchFromGitHub { - owner = "jonhoo"; - repo = "hasmail"; - rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; - hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w="; - }; - - vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk="; - - doCheck = false; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - pango - cairo - gtk2 - ]; - - meta = { - description = "Simple tray icon for detecting new email on IMAP servers"; - mainProgram = "hasmail"; - homepage = "https://github.com/jonhoo/hasmail"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 71405fa29d29..a999b542c1b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -988,6 +988,7 @@ mapAliases { gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17 hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26 harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26 + hasmail = throw "'hasmail' has been removed, as the GTK 2 project is no longer maintained upstream."; # Added 2026-05-22 haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16 From 35ce86165095543a2244b14251ca21bd5b67d824 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 1 May 2026 03:56:57 +0300 Subject: [PATCH 123/133] ghcWithPackages: throw on non-derivation inputs Previously the user-supplied package list was passed directly through `lib.closePropagation` and an `isHaskellLibrary`-attribute filter, so mistakes such as `[ dontCheck hp.foo ]` (forgetting parentheses around the override) silently produced a GHC environment with the affected package missing instead of failing. Validate each top-level entry up front. We deliberately accept any derivation (not just Haskell libraries), because shellFor passes mixed inputs like `libraryFrameworkDepends` through here on Darwin; those are still silently dropped by the existing closure-side filter. The user-error case the issue is about -- non-derivation values like functions or strings -- is now rejected with a helpful message that points at the canonical fix. Fixes #30304 Assisted-by: claude-code with claude-opus-4-8[1m]-high --- .../haskell-modules/with-packages-wrapper.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 9968ea355363..37bf1e450314 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -48,7 +48,24 @@ let hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null; - packages = selectPackages haskellPackages ++ [ hoogleWithPackages' ]; + # Catches obviously-wrong inputs (functions, strings, etc.) but lets + # non-Haskell derivations through; shellFor passes libraryFrameworkDepends + # and similar mixed inputs in, and those are dropped later by the + # closure-side `isHaskellLibrary` filter. + checkPackage = + p: + if p == null || lib.isDerivation p then + p + else + throw '' + ghcWithPackages: expected a derivation, got a ${builtins.typeOf p}. + A common cause is missing parentheses around an override, e.g. + (hp: [ dontCheck hp.foo ]) + should be written as + (hp: [ (dontCheck hp.foo) ]). + ''; + + packages = map checkPackage (selectPackages haskellPackages ++ [ hoogleWithPackages' ]); isHaLVM = ghc.isHaLVM or false; ghcCommand' = "ghc"; From 2c76a5766f6dcc7cc3484eb2a4aae750c4b2dde3 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Tue, 16 Jun 2026 18:48:57 +0300 Subject: [PATCH 124/133] python3Packages.exllamav3: 0.0.42 -> 0.0.43 --- pkgs/development/python-modules/exllamav3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix index 0f8baeda4922..ab7e43ef490f 100644 --- a/pkgs/development/python-modules/exllamav3/default.nix +++ b/pkgs/development/python-modules/exllamav3/default.nix @@ -29,14 +29,14 @@ let in buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { pname = "exllamav3"; - version = "0.0.42"; + version = "0.0.43"; pyproject = true; src = fetchFromGitHub { owner = "turboderp-org"; repo = "exllamav3"; tag = "v${finalAttrs.version}"; - hash = "sha256-kdI2BT7T2+mrdgWE7aXTeqC49WP6qEus+LfQGk0ozhA="; + hash = "sha256-68v8ptvtOzRTnnRXrgU0emqmbCO0pECidgJ36bwm8/s="; }; pythonRelaxDeps = [ From 7a1dbb4ced58ac876c5204ce39f6236738c082b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Jun 2026 17:54:52 +0200 Subject: [PATCH 125/133] kinfocenter: also substitute aha --- pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch | 2 +- pkgs/kde/plasma/kinfocenter/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index d696d3c095bf..3c9f541bf7e1 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -257,7 +257,7 @@ index a49284d3..77818fe2 100644 const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, u"kinfocenter/network/ip.sh"_s, QStandardPaths::LocateFile); const QString darkness = QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark ? u"1"_s : u"0"_s; - m_outputContext = new CommandOutputContext({u"ip"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent); -+ m_outputContext = new CommandOutputContext({u"@ip@"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent); ++ m_outputContext = new CommandOutputContext({u"@ip@"_s, u"@aha@"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent); } CommandOutputContext *outputContext() const { diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 2e8ebe634cd9..443a98adb4c8 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -55,7 +55,7 @@ mkKdeDerivation { ]; postPatch = '' - substituteInPlace kcms/firmware_security/fwupdmgr.sh \ + substituteInPlace kcms/{firmware_security/fwupdmgr.sh,network/ip.sh} \ --replace-fail " aha " " ${lib.getExe aha} " ''; From 4308e24d1bd393bc1316eaf20bbb1495e700d37c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 16:12:12 +0000 Subject: [PATCH 126/133] asciinema: 3.2.0 -> 3.2.1 --- pkgs/by-name/as/asciinema/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix index 5d93445c8101..9b690bf3b8c6 100644 --- a/pkgs/by-name/as/asciinema/package.nix +++ b/pkgs/by-name/as/asciinema/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "asciinema"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "asciinema"; repo = "asciinema"; tag = "v${finalAttrs.version}"; - hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58="; + hash = "sha256-MZMc1YypMP2JEbpDmsGj+Sm+y3mfr50DnoCN04rY9xY="; }; - cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8="; + cargoHash = "sha256-Qzxlp/c5VowlZplu7iMVh0a3+raQXsYmO8OEC45dSl4="; env.ASCIINEMA_GEN_DIR = "gendir"; From 559fe1e719de2e3ac72d86df59ec60b425db7cdc Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 16 Jun 2026 09:22:23 -0700 Subject: [PATCH 127/133] llvmPackages_22: 22.1.7 -> 22.1.8 --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index ac4a5ef58288..8d7fffead8b5 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -26,7 +26,7 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; - "22.1.7".officialRelease.sha256 = "sha256-AmozlrL8AAlfr+F7OrJqr3ecd/KhBx5Bngj3SopPdyY="; + "22.1.8".officialRelease.sha256 = "sha256-SF7wFuh4kXZTytpdgX7vUZItKtRobnVICm+ixze4iG0="; "23.0.0-git".gitRelease = { rev = "47ef7495ad781b742a0c4435ca72590d297ba8bf"; rev-version = "23.0.0-unstable-2026-06-07"; From f45669144c8d176b0c2573e59fb58cfec7bd9910 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 17:01:19 +0000 Subject: [PATCH 128/133] cocoon: 0.9.0 -> 0.10 --- pkgs/by-name/co/cocoon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix index 34b58d9ad51a..bbd5dc372d26 100644 --- a/pkgs/by-name/co/cocoon/package.nix +++ b/pkgs/by-name/co/cocoon/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "cocoon"; - version = "0.9.0"; + version = "0.10"; src = fetchFromGitHub { owner = "haileyok"; repo = "cocoon"; tag = "v${finalAttrs.version}"; - hash = "sha256-MmDUTFcXonAwHzeeIBxTk4KOVuCNHmaBFHMqHkf4+Yc="; + hash = "sha256-SvLXtn4Nr8zcvvjGarNLYeKqyniI6eg50cnqV6Q+3/s="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-bux3OfHT8f1FVpBAZUP23vo8M6h8nPTJbi/GTUzhdc4="; + vendorHash = "sha256-Vkf5XyJA/Vdufa1OpCzgIGSQa5pVsFCTfaAVI7l947E="; passthru = { tests = lib.optionalAttrs stdenvNoCC.hostPlatform.isLinux { inherit (nixosTests) cocoon; }; From bebf07f2f4ec916f7b8fb7c66f07107a219fb930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 17:15:09 +0000 Subject: [PATCH 129/133] mathicgb: 1.3 -> 1.4 --- pkgs/by-name/ma/mathicgb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mathicgb/package.nix b/pkgs/by-name/ma/mathicgb/package.nix index 3e11ddd869c6..cf88e8024712 100644 --- a/pkgs/by-name/ma/mathicgb/package.nix +++ b/pkgs/by-name/ma/mathicgb/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathicgb"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "Macaulay2"; repo = "mathicgb"; tag = "v${finalAttrs.version}"; - hash = "sha256-zcHaYzznvbBkfeFXNxIxy9qlyD0esOvwUIOuEli4rwc="; + hash = "sha256-34ASkRPNH6d8TSJmyZmYZVOi1p02nHgMVXXWVJMNZ1c="; }; buildInputs = [ From 2fc7270138619914819dbdeb7696c8b1367b4501 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Tue, 16 Jun 2026 20:49:20 +0300 Subject: [PATCH 130/133] stats: move a post-fixup comment --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 0da129d80fcb..4df7b9d1ab34 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -333,9 +333,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + # Stats is an app bundle with nested frameworks, so sign the bundle to generate + # sealed resources instead of signing only the Mach-O files. postFixup = '' - # Stats is an app bundle with nested frameworks, so sign the bundle to - # generate sealed resources instead of signing only the Mach-O files ${lib.getExe rcodesign} sign "$out/Applications/Stats.app" ''; From fc4dd33f627b3101e31ada4d4ce4f5febe98d870 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Mon, 8 Jun 2026 13:45:03 +0300 Subject: [PATCH 131/133] stats: 2.12.7 -> 3.0.3 --- pkgs/by-name/st/stats/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 4df7b9d1ab34..0825a624f088 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -24,6 +24,7 @@ let "Bluetooth" "Sensors" "Clock" + "Remote" ]; modules = lib.tail frameworks; @@ -53,7 +54,7 @@ let # CFBundleVersion is extracted from upstream's Info.plist at build time Description = "Simple macOS system monitor in your menu bar"; LSApplicationCategoryType = "public.app-category.utilities"; - LSMinimumSystemVersion = "11.0"; + LSMinimumSystemVersion = "12.0"; LSUIElement = true; NSAppTransportSecurity = { NSAllowsArbitraryLoads = true; @@ -67,13 +68,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.12.7"; + version = "3.0.3"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "exelban"; repo = "Stats"; tag = "v${finalAttrs.version}"; - hash = "sha256-qx4FI+MnFknIrTOPP+8wyy1wqFMWyaunmags023ay6A="; + hash = "sha256-HYuS0mFzzln+EjYUmQgjCPFsF4aGP+4QWalDL0vt3OA="; }; nativeBuildInputs = [ @@ -204,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: { buildFramework CPU "Modules/CPU/bridge.h" \ -lKit -framework IOKit - buildFramework GPU "" \ + buildFramework GPU "Modules/GPU/bridge.h" \ -lKit -framework IOKit -framework Metal buildFramework RAM "" \ @@ -258,6 +262,9 @@ stdenv.mkDerivation (finalAttrs: { buildFramework Clock "" \ -lKit + buildFramework Remote "" \ + -lKit + echo "=== Building Stats app ===" statsSwiftFiles=() @@ -312,12 +319,6 @@ stdenv.mkDerivation (finalAttrs: { --app-icon AppIcon \ "Stats/Supporting Files/Assets.xcassets" - actool \ - --compile "$app/Contents/Frameworks/Kit.framework/Resources" \ - --platform macosx \ - --minimum-deployment-target 14.0 \ - "Kit/Supporting Files/Assets.xcassets" - # Copy localization files find "Stats/Supporting Files" -name '*.lproj' -type d -exec cp -r {} "$app/Contents/Resources/" \; From 04f917691576210165bc7625375b7ffff417c26e Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 16 Jun 2026 20:02:53 +0200 Subject: [PATCH 132/133] nixos/release: remove tests.allDrivers We discussed in #staging:nixos.org (Matrix) that the drivers itself are helpful for development, but that executing them in Hydra don't provide a benefit over executing the tests themself. --- nixos/release.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index efc2570c5a70..baecebb63580 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -54,27 +54,6 @@ let ${system} = hydraJob test; } ); - } - // { - # for typechecking of the scripts and evaluation of - # the nodes, without running VMs. - allDrivers = import ./tests/all-tests.nix { - inherit system; - pkgs = import ./.. { inherit system; }; - callTest = - config: - let - inherit (config) driver; - in - lib.optionalAttrs (builtins.elem system (getPlatforms driver)) ( - if attrNamesOnly then - hydraJob driver - else - { - ${system} = hydraJob driver; - } - ); - }; }; allTests = foldAttrs recursiveUpdate { } ( From 9e0033270b0905f4905a6a24699008e2756332f7 Mon Sep 17 00:00:00 2001 From: Ian Mitchell Date: Tue, 16 Jun 2026 14:29:33 -0400 Subject: [PATCH 133/133] sc3-plugins: add pretentiousUsername as maintainer --- .../interpreters/supercollider/plugins/sc3-plugins.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index f13f8feb1c17..6377ada48dca 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -48,7 +48,9 @@ stdenv.mkDerivation rec { meta = { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + pretentiousUsername + ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; };