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/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b79e6e60493a..b700dde1c27c 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -885,8 +885,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"; } @@ -912,6 +911,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/doc/redirects.json b/doc/redirects.json index 21e7d9a68d31..d21aa2dde8d0 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -3972,6 +3972,9 @@ "maven": [ "index.html#maven" ], + "maven-4": [ + "index.html#maven-4" + ], "maven-buildmavenpackage": [ "index.html#maven-buildmavenpackage" ], diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index c760306c0608..989d52686006 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -53,6 +53,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/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/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, 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/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 != { }) { 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/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix index f43a102d741d..fa636bbe06fc 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" ]; @@ -144,5 +175,8 @@ in ) enabledInstances; }; - meta.maintainers = with lib.maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ + zaldnoay + epireyn + ]; } diff --git a/nixos/release.nix b/nixos/release.nix index 553fc56ee7b4..f29e20efe19c 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 { } ( diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix index 48c4e2bc842c..00982a6e05bf 100644 --- a/nixos/tests/frp.nix +++ b/nixos/tests/frp.nix @@ -9,10 +9,14 @@ let name = "secrets"; text = "token=${token}"; }; + portRange = 6003; in { name = "frp"; - meta.maintainers = with lib.maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ + zaldnoay + epireyn + ]; nodes = { frps = { networking = { @@ -56,14 +60,25 @@ in services.httpd = { enable = true; adminAddr = "admin@example.com"; - virtualHosts."test-appication" = + virtualHosts = let testdir = pkgs.writeTextDir "web/index.php" "-, + # 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 @@ -94,6 +110,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/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/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 0903096ed281..574af45c0575 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. @@ -155,14 +156,37 @@ crate_: lib.makeOverridable ( # The rust compiler to use. - # - # Default: pkgs.rustc { rust ? rustc, # The cargo package to use for getting some metadata. # # 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. @@ -198,6 +222,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. # @@ -329,6 +360,7 @@ lib.makeOverridable crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: { }) crateOverrides crate_); dependencies_ = dependencies; buildDependencies_ = buildDependencies; + devDependencies_ = devDependencies; processedAttrs = [ "src" "propagatedBuildInputs" @@ -340,6 +372,7 @@ lib.makeOverridable "libPath" "buildDependencies" "dependencies" + "devDependencies" "features" "crateRenames" "crateName" @@ -432,6 +465,7 @@ lib.makeOverridable cargo jq ] + ++ lib.optional useClippy clippy ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) @@ -441,7 +475,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); @@ -563,6 +600,7 @@ lib.makeOverridable buildPhase = buildCrate { inherit crateName + version dependencies crateFeatures crateRenames @@ -579,6 +617,7 @@ lib.makeOverridable buildTests codegenUnits capLints + useClippy ; }; dontStrip = !release; @@ -614,6 +653,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 = [ ]; @@ -638,6 +679,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/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 28da36666dad..23eb7640bbbf 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 7e05e49072ab..c7fe6f461d01 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"; @@ -1008,6 +1029,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 { }; @@ -1068,6 +1149,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; 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" ]; }; 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. 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/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"; 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; 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="; 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/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; 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 ]; 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"; }; }) 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/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 ]; 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/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/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; } 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" ]; 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; }; 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 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 = '' 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; 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" 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"; 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/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/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/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 = [ 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/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/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..25b5cde69a00 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 = { @@ -39,5 +47,6 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/fatedier/frp"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ epireyn ]; }; }) 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/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 ]; 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/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 = [ 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 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/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 = [ 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 = [ 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 = [ 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 = [ 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 = [ 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 = [ 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 { 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 = [ 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; 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/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/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; 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/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/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; 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; }; -} +}) 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 ]; 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" ]; }; 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 = [ diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index afa25872e976..eb14f9904eec 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -121,6 +121,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; + }; +}) 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 = [ 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/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 }; 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 = "."; 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; 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 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 = [ 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 = [ 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 ]; 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 ]; 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/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 41769c769272..18619dbcbd97 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 = [ 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 { 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/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 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/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/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 53cabe076d1b..256e1533000e 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/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="; 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/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; 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 = { 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 = [ 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; [ 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/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/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" 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 = [ 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 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 = [ 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/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 = [ 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..e0f76f7aad0a --- /dev/null +++ b/pkgs/by-name/si/silver-searcher-ng/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + git, + pkg-config, + pcre2, + python3Packages, + zlib, + xz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "silver-searcher-ng"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "silver-searcher"; + repo = "silver-searcher-ng"; + rev = finalAttrs.version; + hash = "sha256-IiVFbS9XGmqcGN4NRXFC07cV6bGKDs9C2y5XxJKdvFk="; + }; + + patches = [ ./bash-completion.patch ]; + + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + NIX_LDFLAGS = "-lgcc_s"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + pcre2 + zlib + xz + ]; + + doCheck = true; + nativeCheckInputs = [ + python3Packages.cram + git + ]; + checkPhase = '' + runHook preCheck + + make test + + 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"; + maintainers = with lib.maintainers; [ timschumi ]; + mainProgram = "ag"; + platforms = lib.platforms.all; + license = lib.licenses.asl20; + }; +}) 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 { diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index ab288d597aed..0825a624f088 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, }: @@ -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,21 +68,24 @@ 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 = [ swift perl actool - darwin.autoSignDarwinBinariesHook makeWrapper + rcodesign ]; buildInputs = [ leveldb ]; @@ -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/" \; @@ -333,6 +334,12 @@ 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 = '' + ${lib.getExe rcodesign} sign "$out/Applications/Stats.app" + ''; + passthru.updateScript = nix-update-script { }; meta = { 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 = [ 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/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/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/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" ]; 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 = { 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/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/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 = [ 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/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 = [ 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" diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 42b0dabf6e1b..54998d946b26 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 = "625facd4375f6bfa5de501d0559bd262062e2dc3"; rev-version = "23.0.0-unstable-2026-06-14"; 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"; 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 = { diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index a3203e87bc06..6377ada48dca 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 = [ @@ -46,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; }; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 6571e7a9f1c3..add7967fba4b 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"; 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/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; 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 = '' 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/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index c24b84006289..1dae2565580c 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -8,19 +8,20 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, + sniffio, typing-extensions, }: 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 ]; @@ -28,6 +29,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ anyio mcp + sniffio typing-extensions ]; 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" ]; 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 = '' 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 = [ 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/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 = { 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/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 = [ 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; 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 ]; }; -} +}) 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 ]; }; -} +}) 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/"; 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/"; 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/"; 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/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"; }; } 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/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 ]; 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/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 ]; 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/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index ac459dd7aaa1..ccb531b46691 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -7,21 +7,24 @@ docopt, fetchFromGitHub, fetchpatch, + setuptools, geopy, mock, pytest-asyncio_0, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "volvooncall"; version = "0.10.4"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xr3g93rt3jvxVZrZY7cFh5eBP3k0arsejsgvx8p5EV4="; }; @@ -34,7 +37,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; optional-dependencies = { console = [ @@ -53,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 ]; }; -} +}) 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 = [ ]; }; } 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} " ''; 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/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; 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 = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 287314f2930b..ccfc72823133 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 @@ -474,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 @@ -690,8 +692,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 @@ -711,15 +717,20 @@ 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 + 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 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 @@ -817,6 +828,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 @@ -849,6 +861,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 @@ -961,9 +974,11 @@ 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 + 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 @@ -974,8 +989,10 @@ 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 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 @@ -1134,6 +1151,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 @@ -1998,7 +2016,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 @@ -2702,6 +2720,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa79f42e9da7..66f926fbef60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4255,11 +4255,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 { }; @@ -4543,26 +4552,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 @@ -7472,9 +7463,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;