diff --git a/lib/modules.nix b/lib/modules.nix index e545f9c9707d..6d430effcc89 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -12,6 +12,7 @@ let concatMap concatStringsSep elem + elemAt filter foldl' functionArgs @@ -20,12 +21,14 @@ let head id imap1 + init isAttrs isBool isFunction oldestSupportedReleaseIsAtLeast isList isString + last length mapAttrs mapAttrsToList @@ -34,12 +37,16 @@ let optional optionalAttrs optionalString + pipe recursiveUpdate + remove reverseList sort + sortOn seq setAttrByPath substring + take throwIfNot trace typeOf @@ -60,6 +67,8 @@ let ; inherit (lib.strings) isConvertibleWithToString + levenshtein + levenshteinAtMost ; showDeclPrefix = @@ -304,8 +313,41 @@ let addErrorContext "while evaluating the error message for definitions for `${optText}', which is an option that does not exist" (addErrorContext "while evaluating a definition from `${firstDef.file}'" (showDefs [ firstDef ])); + + # absInvalidOptionParent is absolute; other variables are relative to the submodule prefix + absInvalidOptionParent = init (prefix ++ firstDef.prefix); + invalidOptionParent = init firstDef.prefix; + siblingOptionNames = attrNames (attrByPath invalidOptionParent { } options); + candidateNames = + if invalidOptionParent == [ ] then remove "_module" siblingOptionNames else siblingOptionNames; + invalidOptionName = last firstDef.prefix; + # For small option sets, check all; for large sets, only check distance ≤ 2 + suggestions = + if length candidateNames < 100 then + pipe candidateNames [ + (sortOn (levenshtein invalidOptionName)) + (take 3) + ] + else + pipe candidateNames [ + # levenshteinAtMost is only fast for distance ≤ 2 + (filter (levenshteinAtMost 2 invalidOptionName)) + (sortOn (levenshtein invalidOptionName)) + (take 3) + ]; + suggestion = + if suggestions == [ ] then + "" + else if length suggestions == 1 then + "\n\nDid you mean `${showOption (absInvalidOptionParent ++ [ (head suggestions) ])}'?" + else + "\n\nDid you mean ${ + concatStringsSep ", " ( + map (s: "`${showOption (absInvalidOptionParent ++ [ s ])}'") (init suggestions) + ) + } or `${showOption (absInvalidOptionParent ++ [ (last suggestions) ])}'?"; in - "The option `${optText}' does not exist. Definition values:${defText}"; + "The option `${optText}' does not exist. Definition values:${defText}${suggestion}"; in if attrNames options == [ "_module" ] diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index d148cd1839da..aa9d3443fb6a 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -870,6 +870,14 @@ checkConfigError 'A definition for option .* is not of type .*' config.addCheckF checkConfigOutput '^true$' config.result ./v2-check-coherence.nix +# Option name suggestions +checkConfigError 'Did you mean .set\.enable.\?' config.set ./error-typo-nested.nix +checkConfigError 'Did you mean .set.\?' config ./error-typo-outside-with-nested.nix +checkConfigError 'Did you mean .bar., .baz. or .foo.\?' config ./error-typo-multiple-suggestions.nix +checkConfigError 'Did you mean .enable., .ebe. or .enabled.\?' config ./error-typo-large-attrset.nix +checkConfigError 'Did you mean .services\.myservice\.port. or .services\.myservice\.enable.\?' config.services.myservice ./error-typo-submodule.nix +checkConfigError 'Did you mean .services\.nginx\.virtualHosts\."example\.com"\.ssl\.certificate. or .services\.nginx\.virtualHosts\."example\.com"\.ssl\.certificateKey.\?' config.services.nginx.virtualHosts.\"example.com\" ./error-typo-deeply-nested.nix + cat </dev/null)' "go.mau.fi/gomuks/version.Tag=v${ver}" \ + --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=v${finalAttrs.version}" \ --replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=${rev}" ''; @@ -56,7 +54,7 @@ buildGoModule ( tags = [ "goolm" ]; ldflags = [ - "-X 'go.mau.fi/gomuks/version.Tag=v${ver}'" + "-X 'go.mau.fi/gomuks/version.Tag=v${finalAttrs.version}'" "-X 'go.mau.fi/gomuks/version.Commit=${rev}'" "-X \"go.mau.fi/gomuks/version.BuildTime=$(date -Iseconds)\"" "-X \"maunium.net/go/mautrix.GoModVersion=$(cat go.mod | grep 'maunium.net/go/mautrix ' | head -n1 | awk '{ print $2 })\"" diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index d8736f85d38f..6e36774da1b8 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "144.0.7559.109"; + version = "144.0.7559.132"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-O3fFCcSghHor8UaqvUCn/GDqKD+8SCrXT6FEnWh9QUc="; + hash = "sha256-5VuJaixlw9o+oD1bp6S3o2kR8KcolomSFyWpMZQydwM="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -334,6 +334,9 @@ let changelog = "https://chromereleases.googleblog.com/"; description = "Freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; + knownVulnerabilities = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ + "Out of date, because the updater (pkgs/by-name/go/google-chrome/update.sh) has stopped working, and there does not seem to be another way to get stable URLs to particular Chrome versions." + ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ iedame diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix index e9fae78d0826..8c2f1e1aa696 100644 --- a/pkgs/by-name/go/google-cloud-sdk/package.nix +++ b/pkgs/by-name/go/google-cloud-sdk/package.nix @@ -8,6 +8,7 @@ # { + cacert, stdenv, lib, fetchurl, @@ -168,6 +169,16 @@ stdenv.mkDerivation rec { $out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)" ''; + # Replace all vendored copies of CA bundle with the one used by Nixpkgs. + # This search/replace is a bit overzealous and replaces some files used by tests + # but it should cause no harm since we're not running those tests. + postFixup = '' + while IFS= read -rd "" f; do + echo "rewriting certificate bundle: $f" + ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt "$f" + done < <(find "$out" '(' -name cacert.pem -o -name cacerts.txt ')' -print0) + ''; + passthru = { inherit components withExtraComponents; updateScript = ./update.sh; diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix index 4956c05cab38..0cc1f49f7e1f 100644 --- a/pkgs/by-name/go/google-java-format/package.nix +++ b/pkgs/by-name/go/google-java-format/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.33.0"; + version = "1.34.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-aXcHrwfHdT8py6QVxqdreIJwL/Rk+AfamLKAabh1GRA="; + sha256 = "sha256-S7/IwMJ6Eux420pXJQTPeDab3aztUOGZxPmfBW/DLUE="; }; dontUnpack = true; diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 8c0cf6428ad1..f506abf8df26 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -39,11 +39,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-t3rNrop2ANuVdvx0kpJ0LBCRZ2SABVEwNd6nZ+RaAN8="; + hash = "sha256-cpXLwmzOGUNElNVNmoEL6P3z01AUsu0yOLtIUaY3kss="; }; buildInputs = [ diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index 8dd2a04d0d9f..2d6af2c67b2f 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.72.0"; + version = "1.72.1"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-4CKDmdey4a6sSYzz0d2nX72BDFODzyD5PWRfNHGLPuU="; + hash = "sha256-2kRayrMisv/poIx/OGqS01D/yLt/w4u2X+cJYN8QHA8="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix index 1535a0cdf8aa..2f4eb2b070a1 100644 --- a/pkgs/by-name/ka/kafkactl/package.nix +++ b/pkgs/by-name/ka/kafkactl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kafkactl"; - version = "5.17.0"; + version = "5.17.1"; src = fetchFromGitHub { owner = "deviceinsight"; repo = "kafkactl"; tag = "v${version}"; - hash = "sha256-nZkIAlvQ3jsXWJXLYbaZWJYOgxF7okRY//BZdGPNU0s="; + hash = "sha256-puXOpLtuIqvHXcf2bCDLxm+YNnMMbkglLD9Z8cAsnqs="; }; vendorHash = "sha256-oiN1nMln8oXy/e7gt0JtynCQxcxi0rwcdVthaWhjBWQ="; diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix index 1eac59b89914..7d1edf5d7451 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -15,13 +15,15 @@ libuv, gnutls, lmdb, + # optionals, in principle jemalloc, systemdMinimal, libcap_ng, dns-root-data, - nghttp2, # optionals, in principle + nghttp2, + ngtcp2-gnutls, fstrm, - protobufc, # more optionals + protobufc, # test-only deps. cmocka, which, @@ -34,11 +36,11 @@ let # TODO: we could cut the `let` short here, but it would de-indent everything. unwrapped = stdenv.mkDerivation (finalAttrs: { pname = "knot-resolver_6"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz"; - hash = "sha256-eSHfdQcobZBXS79a5mSopTeAXOQLX6ixX10NM+LEONA="; + hash = "sha256-tEYzvIQxgMC8fHfPexX+VxJDrpkrTdt0r97kz6gDcBs="; }; outputs = [ @@ -92,6 +94,7 @@ let ++ [ jemalloc nghttp2 + ngtcp2-gnutls # dnstap support fstrm protobufc diff --git a/pkgs/by-name/kn/knxd/package.nix b/pkgs/by-name/kn/knxd/package.nix index ef6f68e33cd5..a1ea965e4622 100644 --- a/pkgs/by-name/kn/knxd/package.nix +++ b/pkgs/by-name/kn/knxd/package.nix @@ -8,7 +8,7 @@ indent, perl, argp-standalone, - fmt_9, + fmt, libev, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "knxd"; - version = "0.14.73"; + version = "0.14.75"; src = fetchFromGitHub { owner = "knxd"; repo = "knxd"; tag = finalAttrs.version; - hash = "sha256-rBYvwNJ8rIXGv9Hz0xTn+4cUdptdoddCCv6JvF4f1+M="; + hash = "sha256-3C88YfUfqTbxL2/SflJ1sIv/R9lLLMyfFZkRRvV59qg="; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fmt_9 + fmt libev ] ++ lib.optional withSystemd systemd @@ -65,5 +65,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; + mainProgram = "knxd"; }; }) diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index bf3edc36ce0c..2f4da4a053d0 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-kEGUPlFCU2kKgVJHobVP+DFmAcMc/ZDP+u0w03DnhSo="; + hash = "sha256-TJ09n/j0othys0ygbjqbbTp74j/lxoee6DWQjDL5f6M="; }; vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE="; diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index e7c610b61238..68eb7dd1c5a0 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "4.4.0"; + version = "4.5.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-z/rDpjq483f3xFxZmf6neIQTls0xhn70JrWMlQatasw="; + sha256 = "sha256-7cHEEExdQQFS3Nm1dKO9FZrcZ0hUj1i3BVpWOy9yfAI="; }; buildInputs = [ diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index fb20f684f368..19e2ec240c48 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "26.1.27"; + version = "26.1.31"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-Y6l0BX/pW+YWxzW75C0ssBW6rieQx2G1FiYQ868ZnQs="; + hash = "sha256-Bx84e5/foF4XxRZJve0YhiikZJa3mqxOHuk9bsPxjag="; }; - cargoHash = "sha256-ebq/OOO8ItHx7ayWaeZoqjE1qquVFxuNiL6lMMKy5iI="; + cargoHash = "sha256-D4U58OssBiLnw8KIIaWzYLCS+VoeNk0CCFRFAIO6Ays="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index 8f6067cf516f..6feb02cac86f 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "26.1.27"; + version = "26.1.31"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-Y6l0BX/pW+YWxzW75C0ssBW6rieQx2G1FiYQ868ZnQs="; + hash = "sha256-Bx84e5/foF4XxRZJve0YhiikZJa3mqxOHuk9bsPxjag="; }; - cargoHash = "sha256-ebq/OOO8ItHx7ayWaeZoqjE1qquVFxuNiL6lMMKy5iI="; + cargoHash = "sha256-D4U58OssBiLnw8KIIaWzYLCS+VoeNk0CCFRFAIO6Ays="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix index 8296cde08a7f..af4bc17cb6f2 100644 --- a/pkgs/by-name/md/mdns-scanner/package.nix +++ b/pkgs/by-name/md/mdns-scanner/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdns-scanner"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "CramBL"; repo = "mdns-scanner"; tag = "v${finalAttrs.version}"; - hash = "sha256-CUaJ2TZGOnb+ebckvKzQFhUx/B+BU1Wu8cr247VE4Pg="; + hash = "sha256-QMUgPY8BwUL0CGv1mFV+KbdGXh/O4hnngCYYVWsGI64="; }; - cargoHash = "sha256-Lb24qEiIMbatzKY9YQgQRrsRBp/An4ADalNY8zG5Mr0="; + cargoHash = "sha256-esC84lY+EGGQK8N4DWuVs7hZoXYag8NSxDrfybamYJQ="; meta = { homepage = "https://github.com/CramBL/mdns-scanner"; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index 6961558f756e..9225b50469d9 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "mini-calc"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "vanilla-extracts"; repo = "calc"; tag = version; - hash = "sha256-601BmecY+jbiD39buN68MeJKd5wguH0hahHquHadsL4="; + hash = "sha256-eyWRDuECMV/jfxq+Ki2uouiYqp4PmQJa+D3QORewj+Y="; }; - cargoHash = "sha256-9Ug6lyDvacj47FnLzJo4fwpXeMYxgSlMB7+2fIv5oxo="; + cargoHash = "sha256-7hBtu6mJ+wQF4apU0SAuVKFE7LdajjZdMyk3Ov6xxlQ="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index 1213c1b1fa7a..5108683f8198 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.17.55"; + version = "2.17.76"; pyproject = true; src = fetchPypi { pname = "music_assistant_frontend"; inherit version; - hash = "sha256-fRn2hLg0y+G2atyxpzMq86mJJA41nfSS5UweNZL+0ew="; + hash = "sha256-wQ+6xD1BDajMIpz7VVH0j/AIgCcIVjv1Y/k/kMYv96U="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index e290e2a32801..b0f9ebf8e190 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.7.5"; + version = "2.7.6"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-iWdOGdmPJO7Pjdn8UjuSOhWnRGBFjmARFsuHmP6IP58="; + hash = "sha256-tAzCEU8jFWENOy0WaAchuhQGjmQl8BTW9TuGZPJByPw="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 0ad1828c4768..b60bff14bdf3 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,10 +1,12 @@ # Do not edit manually, run ./update-providers.py { - version = "2.7.5"; + version = "2.7.6"; providers = { - airplay = ps: [ - ]; + airplay = + ps: with ps; [ + srptools + ]; airplay_receiver = ps: [ ]; alexa = diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index fae20d3bebf9..57bb2e39d4e7 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pay-respects"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromCodeberg { owner = "iff"; repo = "pay-respects"; tag = "v${finalAttrs.version}"; - hash = "sha256-qKej29kM0Kq5RRHo+lu9cGeTjnjUvpmIqSxq5yHuCKc="; + hash = "sha256-HRSSJPiHILV3YsyXw0vRNDNV6gR1wB2W0H396yU2wko="; }; - cargoHash = "sha256-2MEbUBTZ/zsPLhHTnQCrWQManqUQ3V3xta5NT9gu38A="; + cargoHash = "sha256-jgeypBPHffZPu8mEJPn8d6eh691K7Jh5OvXdVBeuwF0="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 605ce75ba928..48c583437036 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -49,13 +49,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "pcsx2"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { pname = "pcsx2-source"; owner = "PCSX2"; repo = "pcsx2"; tag = "v${finalAttrs.version}"; - hash = "sha256-cv7En9DgamohWYZPPyL6etaqi/P3yxAuVUQfsZwjIzQ="; + hash = "sha256-85PZ7ZDoannmwoFeKM7hm7fQS1X2MPxAwm6k+Sa+bGc="; }; patches = [ diff --git a/pkgs/by-name/pe/perplexity-mcp/package.nix b/pkgs/by-name/pe/perplexity-mcp/package.nix index 6af3a0585db3..03e60ff4b2d8 100644 --- a/pkgs/by-name/pe/perplexity-mcp/package.nix +++ b/pkgs/by-name/pe/perplexity-mcp/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "perplexity-mcp"; - version = "0-unstable-2025-12-19"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "perplexityai"; repo = "modelcontextprotocol"; - rev = "29dddc491b5853d8be66aac9e0ffdce105aa7f07"; - hash = "sha256-GBA4NPGf6fbj8DJ6Cke4DD03jMe3Ts6uGu2PoLhOaUg="; + rev = "3f15235fb04698bff33bff673d4725842371cc1d"; + hash = "sha256-cv8d5/wH71Nd8/WmcPYqgipX8ZMSWzpoLqOdt97OGfM="; }; - npmDepsHash = "sha256-aAIH/z/5BSbLYmAc7ZyPEIoblLdHlncp8uFGFDebots="; + npmDepsHash = "sha256-654nkK7IQauZImUzeTf328sDDneUkkTSuzlbOmXZXDM="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix index edf6d5cf001c..c692c4e186f0 100644 --- a/pkgs/by-name/po/podlet/package.nix +++ b/pkgs/by-name/po/podlet/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "podlet"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "podlet"; tag = "v${version}"; - hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc="; + hash = "sha256-9hZ0JggtLgLpWQXTCNI4+loyGIzh2l9pbrCjI41hNuA="; }; - cargoHash = "sha256-FeYGNyBtMCiufeX9Eik3QXPxqOGEW/ZbvwFn50mTag8="; + cargoHash = "sha256-WYOddpFgD41TpkBXWbzSarfIWRIBR9W+RwkZczkn0sQ="; meta = { description = "Generate Podman Quadlet files from a Podman command, compose file, or existing object"; diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index dbb54faa4d5d..dec1fd300a1c 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.24"; + version = "1.8.25"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-uWtpNdI4rbNEc3Ix0KMxwKEHtpDR7Atshut1DmPLxxc="; + hash = "sha256-33kIgPQT/AXP+ZjBKcO+Ulzcxa5FbD4+Y3QHoHnzu10="; }; vendorHash = null; diff --git a/pkgs/by-name/pr/protobuf-language-server/package.nix b/pkgs/by-name/pr/protobuf-language-server/package.nix index 095e0c0fc021..f7ca19c3c2c7 100644 --- a/pkgs/by-name/pr/protobuf-language-server/package.nix +++ b/pkgs/by-name/pr/protobuf-language-server/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "protobuf-language-server"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "lasorda"; repo = "protobuf-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-bDsvByXa2kH3DnvQpAq79XvwFg4gfhtOP2BpqA1LCI0="; + hash = "sha256-xaWcQMoahOVm6pAP8Y01fkSOuvuwS+aRFEb5ztbL3pk="; }; - vendorHash = "sha256-dRria1zm5Jk7ScXh0HXeU686EmZcRrz5ZgnF0ca9aUQ="; + vendorHash = "sha256-4nTpKBe7ekJsfQf+P6edT/9Vp2SBYbKz1ITawD3bhkI="; # TestMethodsGen overwrites go-lsp/lsp/methods_gen.go with missing imports. # This causes other tests to break. diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix index ea67f43797b6..6762298d7b3f 100644 --- a/pkgs/by-name/pr/proxyman/package.nix +++ b/pkgs/by-name/pr/proxyman/package.nix @@ -6,11 +6,11 @@ }: let pname = "proxyman"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage"; - hash = "sha256-uGzegB/t/9/ovgTY3F2ihBKOgLKDenZh2Ojg9SBNQos="; + hash = "sha256-ntOIFvt4XwcmE4QloGD1KfbTpehpO/3SjTciMSKoWIs="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/py/pylode/package.nix b/pkgs/by-name/py/pylode/package.nix index 9fb7c9c8cdf5..16a68d6b6c33 100644 --- a/pkgs/by-name/py/pylode/package.nix +++ b/pkgs/by-name/py/pylode/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "pylode"; - version = "3.2.1"; + version = "3.2.3"; pyproject = true; src = fetchFromGitHub { owner = "RDFLib"; repo = "pylode"; tag = finalAttrs.version; - hash = "sha256-X12rcXvFvMB5tZ3WtfCE+yb8mhed9FnscjiTmMcSyV4="; + hash = "sha256-b1asjzkatSbe5HRqGPf808wjnJTwOaYKABPyO+jSd8c="; }; pythonRelaxDeps = [ "rdflib" ]; diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index 3c699febe550..07e4e672c0f9 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-F8r+kJx2nBwekeU2d2xLo+pggAzVWy0V0CV8Z0ZfLs8="; + hash = "sha256-Id1HPBJoeNBknuxiAyRSAay89jPaXGHgUe1s4LzrXhc="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-vkqxRIbNEKJWNIIAMtny1XF6TSzV7KCpZPl+OCDEiPo="; + cargoHash = "sha256-VdF6nUTubF08VfGMHkq9iOvX1UiXOsWck481NgxwzY0="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index e3f2bc16bab9..81d79c6b9633 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2026-01-26"; + version = "2026-02-02"; - cargoHash = "sha256-0eVrWPe/S4lwwmgk8T76tAenEfFri9Y8PtRpGJ6b7BQ="; + cargoHash = "sha256-tMjS0nFfnBAdzuSidC/y8kFucMqUZKWeslYU9gmyUuU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-sPt2PMeN1rhczLfbrOKK1tOx8UmA4KkhpPkokO0YAMc="; + hash = "sha256-VOsqRwtcLiaJWVVz4Enk9yYJl7Ce9+pJ7rtFts/7tCY="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix index dfd0fc586c74..ca2de8db9202 100644 --- a/pkgs/by-name/sh/shellspec/package.nix +++ b/pkgs/by-name/sh/shellspec/package.nix @@ -3,6 +3,11 @@ stdenv, fetchFromGitHub, bash, + + # Test-only + dash, + ksh, + zsh, }: stdenv.mkDerivation (finalAttrs: { @@ -22,12 +27,31 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' ./shellspec --no-banner --task fixture:stat:prepare - ./shellspec --no-banner spec --jobs "$(nproc)" + ./shellspec --no-banner spec --jobs "$(nproc)" ${finalAttrs.extraTestArgs or ""} ''; # "Building" the script happens in Docker dontBuild = true; + passthru.tests = + let + # Tests are not enabled by default, so enable them. + enabled = finalAttrs.overrideAttrs { doCheck = true; }; + # For adding variations. Use testWith (finalAttrs: prevAttrs: { }) if needed. + testWith = enabled.overrideAttrs; + in + { + # Enable tests in all variations + # Some of these may log failures, which are later treated as SKIPPED. + # This is normal. Look for "0 failures" and a successful derivation build. + with-bin-sh = enabled; + with-bash = testWith { extraTestArgs = "--shell ${lib.getExe bash}"; }; + # with-dash: Broken as of shellspec 0.28.1, dash 0.5.13.1 + # with-dash = testWith { extraTestArgs = "--shell ${lib.getExe dash}"; }; + with-ksh = testWith { extraTestArgs = "--shell ${lib.getExe ksh}"; }; + with-zsh = testWith { extraTestArgs = "--shell ${lib.getExe zsh}"; }; + }; + meta = { description = "Full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells"; homepage = "https://shellspec.info/"; diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 4e621946302a..854fa4cf8d7c 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -7,24 +7,23 @@ stdenvNoCC, nodejs, nix-update-script, - fetchpatch, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.51"; + version = "2.0.52"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; tag = "v${finalAttrs.version}"; - hash = "sha256-5HJ5dusFyWIljT6V2/hizwbkdBfFeMHrSJ1cyT+Xtno="; + hash = "sha256-rxqAzqOL8tB6QbJoYBGwxnxWAEmUZaxapIGTIAaRUhk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; - fetcherVersion = 1; - hash = "sha256-43VIPcLNPCUMxDmWnt3fRuriOKFp7w5rzxVHdjEz3lU="; + fetcherVersion = 3; + hash = "sha256-/nYH3ZgfNv9krvH/ZjCJ2F3aanLZzlkNwOizgTRtqXE="; }; nativeBuildInputs = [ @@ -52,15 +51,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - patches = [ - # TODO: remove on next release - (fetchpatch { - name = "lua-regression-patch"; - url = "https://github.com/kvndrsslr/sketchybar-app-font/commit/f6735ef0acacc700b84b31b2cc3f430bf0f01f6e.patch"; - hash = "sha256-Fj3oqRdEvRcM0Bz6E97lN02H+nRx5vonW1p2jcSig7s="; - }) - ]; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/sl/slurp/package.nix b/pkgs/by-name/sl/slurp/package.nix index 8e3cdc9fa954..57015677ceb7 100644 --- a/pkgs/by-name/sl/slurp/package.nix +++ b/pkgs/by-name/sl/slurp/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slurp"; - version = "1.6.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${finalAttrs.version}"; - hash = "sha256-kH7K/ttTNYQ5im7YsJ28bLi8yKfWZ3HGEDOfTs22UR0="; + hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/by-name/sq/sqlit-tui/package.nix b/pkgs/by-name/sq/sqlit-tui/package.nix index 57fe37bc3a7a..8971f28cb2ef 100644 --- a/pkgs/by-name/sq/sqlit-tui/package.nix +++ b/pkgs/by-name/sq/sqlit-tui/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "sqlit-tui"; - version = "1.2.11"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Maxteabag"; repo = "sqlit"; tag = "v${version}"; - hash = "sha256-zPkBdGq4PoAWonMq5FWGaz19QWiZsHuVQcW/45ynqq4="; + hash = "sha256-+7mv5aNJuNEudFARSZdB9/yedvqk6UHbfGku8J7Ye1g="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index e0b9aa71b427..6601e23ac94f 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-R7nzzYP7yA7bYQ6WLRrxNoEe7p7ElvQIJCNBu8zICfM="; + hash = "sha256-LD6mwa2UKeddAnOp2fGxfgvrpH15an9jmUDRosB8Prc="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/tg/tgeraser/package.nix b/pkgs/by-name/tg/tgeraser/package.nix index eb7dc7573e33..faf0808abbcd 100644 --- a/pkgs/by-name/tg/tgeraser/package.nix +++ b/pkgs/by-name/tg/tgeraser/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "tgeraser"; - version = "1.4.2"; + version = "1.5.1"; pyproject = true; src = fetchFromGitHub { owner = "en9inerd"; repo = "tgeraser"; tag = "v${version}"; - hash = "sha256-xB6bdB6ndyS3EOb3D2h9mRbelUXSQXkBkDvzCm7m5TY="; + hash = "sha256-xqims4Xfo7FH5nkq6mffkLhBbfq4lCJW3gBhL8assL8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 25545487754b..0d181e198f5a 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "3.1.0"; + version = "3.3.1"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; tag = version; - hash = "sha256-Nn/Nwd1KvrkR+uGp8HmRGeBC7E0/Y1EVMpJAp7UDj7Q="; + hash = "sha256-scGTGlAt1k6eS8O3thrlJpVv3vZe2lKNBxtDYIBWOPg="; }; nativeBuildInputs = [ @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { click httpx m3u8 + wcwidth ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ty/tygo/package.nix b/pkgs/by-name/ty/tygo/package.nix index 1765fcf616c6..1fe9c0551f2a 100644 --- a/pkgs/by-name/ty/tygo/package.nix +++ b/pkgs/by-name/ty/tygo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tygo"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "gzuidhof"; repo = "tygo"; rev = "v${version}"; - hash = "sha256-scda2o+aLYC4NpruEN8fZAhJuTHI9SExZv7qvAteR0M="; + hash = "sha256-nhGc5K6Mb6l88lNbcX2vOT2jUZoIVoHuk4NCzL3hjys="; }; vendorHash = "sha256-XQS+P+vPt2rH0SD0srFSnqjupIeu5XgFi3iVzq/ovmg="; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index dcd1cf531e4e..1d708ee50649 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.46"; + version = "0.1.47"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${version}"; - hash = "sha256-cl9Ufoj+O0rmLIQ6iRYuF0xmziGdwtb9GeRWxM+9nP0="; + hash = "sha256-Sv11I2HdPwgxA1SV1/bo9MS2aanzqjtm4KtnMl6iiqU="; }; - cargoHash = "sha256-PdLMAoezqmIb7RHU+5e8fnjY8ZO85aMJlznzzM2VWXA="; + cargoHash = "sha256-qgpM5z5VF1fvaZKmJJZXTHOFMuz82a6UtnkKhgYUh3M="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index 76959d63576b..fbaafb427ebb 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-Y0jJIS2DSJWQJK0Uyzyb/WSHTE/uQZefRidf0hRQwNU="; + hash = "sha256-r0EbZn2j5QsKnt3PDq0+kTi49OyPQDtIyL8zhKkTP1M="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; @@ -117,7 +117,9 @@ stdenv.mkDerivation (finalAttrs: { description = "High-performance data structure server that primarily serves key/value workloads"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + debtquity + ]; changelog = "https://github.com/valkey-io/valkey/releases/tag/${finalAttrs.version}"; mainProgram = "valkey-cli"; }; diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix index 3f07dc405180..8f8f1927f7f5 100644 --- a/pkgs/by-name/wd/wdt/package.nix +++ b/pkgs/by-name/wd/wdt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2026-01-12"; + version = "1.27.1612021-unstable-2026-01-28"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "024eafc69a7aa764a08162be842a89a98459e61a"; - sha256 = "sha256-v0LCik5XgmUSPnBduKxhfCYy4rAalId5skEC8u3Jzq8="; + rev = "8529231cd0906876f5ed5902d026bf313fa2ef98"; + sha256 = "sha256-ylmzw5LRc7b8GfvO0HiK77fDp4k5gumDd8uvnZ/pvxs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 349ada62a5ee..5de75a6b138a 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wstunnel"; - version = "10.5.1"; + version = "10.5.2"; src = fetchFromGitHub { owner = "erebe"; repo = "wstunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-2KNqxhi5fFfw54iPKZrJF0G0q6I0uNWzdC81T19GyaE="; + hash = "sha256-CsXzcQ4rd2NTjDJjsi5U3Hes2D98HQ8K6/AmPRSLkbM="; }; - cargoHash = "sha256-2A3t1l8iBSufBcl/IjZBJoPv3ZfKH2bdBQjnZxLWFBE="; + cargoHash = "sha256-/JRfgJpg5FjkjWUYDe/ln3rMv0ISQy0AEdcZaPmLBDg="; cargoBuildFlags = [ "--package wstunnel-cli" ]; diff --git a/pkgs/by-name/ya/yaralyzer/package.nix b/pkgs/by-name/ya/yaralyzer/package.nix index 8484eb40fd9b..c639e50791ec 100644 --- a/pkgs/by-name/ya/yaralyzer/package.nix +++ b/pkgs/by-name/ya/yaralyzer/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "yaralyzer"; - version = "1.3.10"; + version = "1.3.17"; pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; tag = "v${finalAttrs.version}"; - hash = "sha256-OhZ1TG1dqxlUoW+OI+BFn0LsujLytqg6L7aNdYnfRPQ="; + hash = "sha256-ze6s/XCxW/Lf5fiFEI8tmgd5DRAPVD6Z9Xo/ayI5fAc="; }; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index f59856953af4..a4c9ca4eb8df 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -56,6 +56,7 @@ let attrs // { + pname = name; name = "${name}-${version}"; inherit version; diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix index d4d81f993d33..04b97757476d 100644 --- a/pkgs/development/beam-modules/livebook/default.nix +++ b/pkgs/development/beam-modules/livebook/default.nix @@ -9,7 +9,7 @@ beamPackages.mixRelease rec { pname = "livebook"; - version = "0.18.3"; + version = "0.18.4"; inherit (beamPackages) elixir; @@ -21,7 +21,7 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; tag = "v${version}"; - hash = "sha256-/FAHBSOmVoNj1YRaxLjZMoDhUTMcV7Zi/TsSwxS1SHo="; + hash = "sha256-MPkr15QeIstqtEn6RWferGI9RHU22byRP4zyX5MaRbs="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/development/cuda-modules/packages/cudatoolkit.nix b/pkgs/development/cuda-modules/packages/cudatoolkit.nix index 3309b31d01b0..6eadaf032c6a 100644 --- a/pkgs/development/cuda-modules/packages/cudatoolkit.nix +++ b/pkgs/development/cuda-modules/packages/cudatoolkit.nix @@ -64,7 +64,7 @@ let allPackages = (map (p: p.__spliced.buildHost or p) hostPackages) ++ targetPackages; in symlinkJoin rec { - name = "cuda-merged-${cudaMajorMinorVersion}"; + pname = "cuda-merged"; version = cudaMajorMinorVersion; paths = builtins.concatMap getAllOutputs allPackages; @@ -72,7 +72,7 @@ symlinkJoin rec { passthru = { cc = lib.warn "cudaPackages.cudatoolkit is deprecated, refer to the manual and use splayed packages instead" backendStdenv.cc; lib = symlinkJoin { - inherit name; + inherit pname version; paths = map (p: lib.getLib p) allPackages; }; }; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 0bd9a412a316..08a7ce0db2a6 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -12,16 +12,13 @@ # qualche cambiamento negli header .h # TODO: compilazione di moduli dipendenti da zip, ssl, tcl, gtk, gtk2 -let +stdenv.mkDerivation (finalAttrs: { + name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "ocaml-mysql"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.2.1"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-mysql/${name}.tar.gz"; + url = "http://ygrek.org.ua/p/release/ocaml-mysql/ocaml-mysql-${finalAttrs.version}.tar.gz"; sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; }; @@ -54,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.roconnor ]; }; -} +}) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 99388853f391..59a98f431c0c 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "aioswitcher"; - version = "6.0.3"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "TomerFi"; repo = "aioswitcher"; tag = finalAttrs.version; - hash = "sha256-6wBeAbBiuAZW9kHq/bKC0FMJxkLxM6RZN7RLwbF1ig4="; + hash = "sha256-SCJV2r6VB1Y1ceywHkoYDsO+PRnjualGdetnQrlBKDI="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index ad336b5d96a4..f903e2051c0b 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ansicolor"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "numerodix"; repo = "ansicolor"; tag = version; - hash = "sha256-a/BAU42AfMR8C94GwmrLkvSvolFEjV0LbDypvS9UuOA="; + hash = "sha256-ndChpcHjsGWmlw0uvPF0RvRvi99b3cnajHRXudmQXBw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index a240dab9733c..3026e947dfba 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.27"; + version = "4.2.28"; pyproject = true; disabled = pythonAtLeast "3.13"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; tag = version; - hash = "sha256-vdY85Ib2knRFLPmZZ6ojiD5R9diuvpVut1+nOVXSp0Y="; + hash = "sha256-dxlTonT8zFIFGFrrOW4GFKOy5b0chcESxt9i9xHO8h4="; }; patches = [ diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index 8124da832b00..9d66911b0f98 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -26,7 +27,7 @@ buildPythonPackage rec { libX11 ]; - postPatch = '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' substituteInPlace glcontext/x11.cpp \ --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \ --replace-fail '"libX11.so"' '"${libX11}/lib/libX11.so"' @@ -46,7 +47,7 @@ buildPythonPackage rec { homepage = "https://github.com/moderngl/glcontext"; description = "OpenGL implementation for ModernGL"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 4d5e681e21aa..ef21222ffe55 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.7.2"; + version = "2.7.3"; pyproject = true; src = fetchFromGitHub { owner = "Parquery"; repo = "icontract"; tag = "v${version}"; - hash = "sha256-FRfDcjylYGWwYPgCipzS+NZYCSPATlQdWtavTo/NZY0="; + hash = "sha256-UYBskomnu53A9VCY7y7zAOQm40Y+INOqPK6IqZsk6h0="; }; preCheck = '' diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index 0cfd75ad5c6b..90730adc2769 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -61,6 +61,7 @@ buildPythonPackage (finalAttrs: { "draccus" "gymnasium" "huggingface-hub" + "opencv" "rerun-sdk" "torch" "torchvision" diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 7acf802dcf86..69e97d822744 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.8.3"; + version = "1.8.4"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; tag = "v${version}"; - hash = "sha256-nWm0h/ceGDtoUVqYPkIC+anXrneJsxlZ4DN3Wge0NCk="; + hash = "sha256-9neXSbupZFLhpkc4HUY4l0c/Vtfrf7ve9VMfaOCSA2A="; }; build-system = [ diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index 761d5575af85..e6151ef2e221 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mdformat-footnote"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "executablebooks"; repo = "mdformat-footnote"; tag = "v${version}"; - hash = "sha256-QiekcxKfJGWog8rfSL6VIDHdo7rpw8ftl/dDJpVpdUg="; + hash = "sha256-KPxPDKG3aC5zLdrJRL3kzFMpLJ0Yk5UZXW4CamC1/NQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 6a7683bb5ef2..98c835c393f9 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -24,17 +24,17 @@ nanobind, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nanobind"; - version = "2.10.2"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; repo = "nanobind"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-io44YhN+VpfHFWyvvLWSanRgbzA0whK8WlDNRi3hahU="; + hash = "sha256-IsR3e6eWKXFtOXq8iZLpXgwrjXVqNnHtuiKdIbTsDlc="; }; build-system = [ @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/wjakob/nanobind"; - changelog = "https://github.com/wjakob/nanobind/blob/${src.tag}/docs/changelog.rst"; + changelog = "https://github.com/wjakob/nanobind/blob/${finalAttrs.src.tag}/docs/changelog.rst"; description = "Tiny and efficient C++/Python bindings"; longDescription = '' nanobind is a small binding library that exposes C++ types in Python and @@ -88,4 +88,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ parras ]; }; -} +}) diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 686b1c8172b9..11a67b9c9734 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2026.01.14"; + version = "2026.01.27"; pyproject = true; src = fetchFromGitHub { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-u7RdzRQRweEjCu8Rp+PkaUZg1FxpM7UssbhD0BonOtY="; + hash = "sha256-aQ/GuskXKBpc1H6vtaBA3hZiPKip/2Kev/hbMcB9Y1E="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 6eda1baa56b8..62ef21d8a46f 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "3.6"; + version = "3.6.1"; pyproject = true; src = fetchFromGitHub { owner = "Fizzadar"; repo = "pyinfra"; tag = "v${version}"; - hash = "sha256-CTeGn9aN5voyCUL5LuTErLgTgC1Z/qTS7SB9TNfq7mc="; + hash = "sha256-SB/V5pV10pBaYyYTp/Ty3J+/NX9oT3u++ZWELCk1qkc="; }; patches = [ diff --git a/pkgs/development/python-modules/pysmarlaapi/default.nix b/pkgs/development/python-modules/pysmarlaapi/default.nix index f887d40e93ca..cf871d82db2f 100644 --- a/pkgs/development/python-modules/pysmarlaapi/default.nix +++ b/pkgs/development/python-modules/pysmarlaapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysmarlaapi"; - version = "0.10.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "Explicatis-GmbH"; repo = "pysmarlaapi"; tag = version; - hash = "sha256-aHwmZIesBco6XyxKv321p+0p3Gibvi+X7xs+7RkwbVc="; + hash = "sha256-paOBRcTpVMLHB3HCP8JolvebC+xD19x1wieFjZCw4Ko="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index fbdd13160345..ea8bdccee52b 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -7,6 +7,8 @@ libXinerama, libXrandr, poetry-core, + pyobjc-framework-Cocoa, + cython, pytestCheckHook, }: @@ -22,9 +24,14 @@ buildPythonPackage rec { hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - postPatch = '' + dependencies = lib.optionals (stdenv.isDarwin) [ + pyobjc-framework-Cocoa + cython + ]; + + postPatch = lib.optionalString (stdenv.isLinux) '' substituteInPlace screeninfo/enumerators/xinerama.py \ --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \ --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libXinerama}/lib/libXinerama.so")' @@ -43,7 +50,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "screeninfo" ]; meta = { - broken = stdenv.hostPlatform.isDarwin; description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 933623e33ec1..845b3de41053 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -13,9 +13,9 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "subarulink"; - version = "0.7.17"; + version = "0.7.18"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "G-Two"; repo = "subarulink"; - tag = "v${version}"; - hash = "sha256-vmMvKDZV8jChLehgdSGWQdxWVylnKU2BWXSiG9zI/to="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GzTIgxFBmVjdM+D5IxHAoqDW29ZJEywX4+B217ZdITM="; }; build-system = [ setuptools ]; @@ -49,9 +49,9 @@ buildPythonPackage rec { meta = { description = "Python module for interacting with STARLINK-enabled vehicle"; homepage = "https://github.com/G-Two/subarulink"; - changelog = "https://github.com/G-Two/subarulink/releases/tag/${src.tag}"; + changelog = "https://github.com/G-Two/subarulink/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "subarulink"; }; -} +}) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index f9bab25df030..cceee784a234 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/__init__.py \ --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \ - --replace-fail "'3.9', '3.10']" "'3.9', '3.10', '3.11', '3.12', '3.13']" # if the Python version used isn't in this list, tests fail + --replace-fail "'3.9', '3.10']" "'3.9', '3.10', '3.11', '3.12', '3.13', '3.14']" # if the Python version used isn't in this list, tests fail substituteInPlace tests/test_virtualenv_sys.py \ --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" diff --git a/pkgs/development/python-modules/xsdata-pydantic/default.nix b/pkgs/development/python-modules/xsdata-pydantic/default.nix index 9a1c3774c193..77fba93cf6fa 100644 --- a/pkgs/development/python-modules/xsdata-pydantic/default.nix +++ b/pkgs/development/python-modules/xsdata-pydantic/default.nix @@ -2,18 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - pytestCheckHook, - xsdata, + + # dependencies pydantic, + xsdata, + + # tests click, click-default-group, - jinja2, docformatter, + jinja2, + pytestCheckHook, toposort, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xsdata-pydantic"; version = "24.5"; pyproject = true; @@ -21,15 +27,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tefra"; repo = "xsdata-pydantic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ExgAXQRNfGQRSZdMuWc8ldJPqz+3c4Imgu75KXLXHNk="; }; build-system = [ setuptools ]; dependencies = [ - xsdata pydantic + xsdata ]; nativeCheckInputs = [ @@ -37,19 +43,23 @@ buildPythonPackage rec { click-default-group docformatter jinja2 - toposort pytestCheckHook + toposort ]; - pythonImportsCheck = [ - "xsdata_pydantic" + pythonImportsCheck = [ "xsdata_pydantic" ]; + + disabledTests = [ + # AssertionError: SystemExit(2) is not None + "test_complete" ]; meta = { - description = "Naive XML & JSON Bindings for python pydantic classes!"; + description = "Naive XML & JSON Bindings for python pydantic classes"; homepage = "https://github.com/tefra/xsdata-pydantic"; + changelog = "https://github.com/tefra/xsdata-pydantic/blob/${finalAttrs.src.tag}/CHANGES.md"; maintainers = with lib.maintainers; [ berrij ]; license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 50ffa2dc4b4b..b4a64e85b363 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -16,6 +16,7 @@ kio-extras, opentimelineio, frei0r, + shaderc, }: mkKdeDerivation { pname = "kdenlive"; @@ -31,6 +32,9 @@ mkKdeDerivation { "-DFETCH_OTIO=0" ]; + # Workaround until https://github.com/NixOS/nixpkgs/pull/480475 hits master + NIX_LDFLAGS = [ "-L${shaderc.lib}/lib -lshaderc_shared" ]; + extraNativeBuildInputs = [ pkg-config shared-mime-info diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 6c8361141111..70bba321fca5 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -5,14 +5,14 @@ patches ? [ ], }: let - version = "4.5.5"; + version = "4.5.6"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-3tu7HYrJ+32yIgO6zVBokPTt66zICZOBzRFAeEVidWo="; + hash = "sha256-m2LDNyv2jxsp5zPKOfQWvtBG8bD8iuBWBEoz+L0OvNk="; passthru = { inherit version; yarnHash = "sha256-2MOl6kHidkGU2I/cZaUmbQCiEl9SDfL/j9fT/6eNdFA=";