diff --git a/doc/redirects.json b/doc/redirects.json index 8f45ed9add20..41d1f5a9a3e9 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -412,6 +412,9 @@ "sec-meta-identifiers-cpe": [ "index.html#sec-meta-identifiers-cpe" ], + "sec-meta-identifiers-purl": [ + "index.html#sec-meta-identifiers-purl" + ], "sec-modify-via-packageOverrides": [ "index.html#sec-modify-via-packageOverrides" ], @@ -932,6 +935,15 @@ "var-meta-identifiers-possibleCPEs": [ "index.html#var-meta-identifiers-possibleCPEs" ], + "var-meta-identifiers-purl": [ + "index.html#var-meta-identifiers-purl" + ], + "var-meta-identifiers-purlParts": [ + "index.html#var-meta-identifiers-purlParts" + ], + "var-meta-identifiers-purls": [ + "index.html#var-meta-identifiers-purls" + ], "var-meta-teams": [ "index.html#var-meta-teams" ], diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index ed4f8a8240f3..33805fc50055 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -11,12 +11,17 @@ - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details. +- `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes. ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} -- Create the first release note entry in this section! +- Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi` and `fetchFromGithub` fetchers. + `mkDerivation` has been adjusted to reuse this information. + Package-URLs allow reliably identifying and locating software packages. + Maintainers of derivations using the adapted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. + Maintainers using `fetchurl` for `drv.src` are urged to adapt their `drv.meta.identifiers.purlParts` for proper identification. ## Nixpkgs Library {#sec-nixpkgs-release-26.11-lib} diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 1fac5244af66..a88683ed37b7 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -334,3 +334,30 @@ A readonly attribute that concatenates all CPE parts in one string. #### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs} A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess. + +### Package URL {#sec-meta-identifiers-purl} + +[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages. +Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management. +Package-URLs shall default to the `mkDerivation.src`, as the original consumed software package is the single source of truth. + +#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts} + +This attribute contains an attribute set of all parts of the PURL for this package. + +* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided +* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md) + +#### `meta.identifiers.purl` {#var-meta-identifiers-purl} + +An extendable attribute which is built based on `purlParts`. +This is the main identifier of the software package. +For handling edge cases, consider using the list interface [`meta.identifiers.purls`](#var-meta-identifiers-purls). + +#### `meta.identifiers.purls` {#var-meta-identifiers-purls} + +An extendable list attribute which defaults to a single element equal to [`meta.identifiers.purl`](#var-meta-identifiers-purl). +It provides an interface for additional identifiers of `mkDerivation.src` or for identifiers of vendored dependencies inside `mkDerivation.src`, which maintainers may carefully consider to specify as well. + +Additional identifiers are generally not recommended, as they might cause maintenance overhead or diverge. +For example, a source distribution `pkg:github` may be hard to keep correctly aligned with the corresponding binary distribution `pkg:pypi`. diff --git a/nixos/doc/manual/configuration/profiles/headless.section.md b/nixos/doc/manual/configuration/profiles/headless.section.md index 6b84bb7d5cc9..dab7386913d3 100644 --- a/nixos/doc/manual/configuration/profiles/headless.section.md +++ b/nixos/doc/manual/configuration/profiles/headless.section.md @@ -2,7 +2,7 @@ Common configuration for headless machines (e.g., Amazon EC2 instances). -Disables [vesa](#opt-boot.vesa), serial consoles, +Disables serial consoles, [emergency mode](#opt-systemd.enableEmergencyMode), [grub splash images](#opt-boot.loader.grub.splashImage) and configures the kernel to reboot automatically on panic. diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 05a52258d54e..17f5f67082f9 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -16,7 +16,7 @@ -- Create the first release note entry in this section! +- `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly. ## Other Notable Changes {#sec-release-26.11-notable-changes} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index fe4b5e101151..73efd441d23d 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -206,11 +206,6 @@ let if lib.isList cfg.sslCiphers then (lib.concatStringsSep ":" cfg.sslCiphers) else cfg.sslCiphers };" } - ${optionalString (cfg.sslDhparam != false) - "ssl_dhparam ${ - if cfg.sslDhparam == true then config.security.dhparams.params.nginx.path else cfg.sslDhparam - };" - } ${optionalString cfg.recommendedTlsSettings '' # Consider https://ssl-config.mozilla.org/#server=nginx&config=intermediate as the lower bound @@ -981,9 +976,6 @@ in "ECDHE-RSA-AES256-GCM-SHA384" "ECDHE-ECDSA-CHACHA20-POLY1305" "ECDHE-RSA-CHACHA20-POLY1305" - "DHE-RSA-AES128-GCM-SHA256" - "DHE-RSA-AES256-GCM-SHA384" - "DHE-RSA-CHACHA20-POLY1305" ]; description = '' List of available cipher suites to choose from when negotiating TLS sessions. @@ -1002,13 +994,6 @@ in description = "Allowed TLS protocol versions."; }; - sslDhparam = mkOption { - type = types.either types.path types.bool; - default = false; - example = "/path/to/dhparams.pem"; - description = "Path to DH parameters file, or `true` to generate with `security.dhparms.params.nginx`."; - }; - proxyResolveWhileRunning = mkOption { type = types.bool; default = false; @@ -1308,6 +1293,13 @@ in }; imports = [ + (mkRemovedOptionModule [ "services" "nginx" "sslDhparam" ] '' + DHE cipher suites have been removed from the default nginx cipher list. + + No additional configuration is required as ECDHE is used by default already. + + If you wish to use Hybrid PQ key exchange, you can set services.nginx.recommendedTlsSettings = true. + '') (mkRemovedOptionModule [ "services" "nginx" "stateDir" ] '' The Nginx log directory has been moved to /var/log/nginx, the cache directory to /var/cache/nginx. The option services.nginx.stateDir has been removed. @@ -1678,8 +1670,6 @@ in in listToAttrs acmePairs; - security.dhparams.params.nginx = lib.mkIf (cfg.sslDhparam == true) { }; - users.users = optionalAttrs (cfg.user == "nginx") { nginx = { group = cfg.group; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 9f05ac0ccd2e..6a9ec9571391 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -35,6 +35,15 @@ in { + imports = [ + (mkRemovedOptionModule [ "boot" "vesa" ] '' + The `boot.vesa` option has been removed. It was deprecated in 2020 + because Xorg now works better with kernel modesetting. If you still + need the legacy VESA 800x600 fallback, set + `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly. + '') + ]; + ###### interface options = { @@ -181,19 +190,6 @@ in ''; }; - boot.vesa = mkOption { - type = types.bool; - default = false; - description = '' - (Deprecated) This option, if set, activates the VESA 800x600 video - mode on boot and disables kernel modesetting. It is equivalent to - specifying `[ "vga=0x317" "nomodeset" ]` in the - {option}`boot.kernelParams` option. This option is - deprecated as of 2020: Xorg now works better with modesetting, and - you might want a different VESA vga setting, anyway. - ''; - }; - boot.extraModulePackages = mkOption { type = types.listOf types.package; default = [ ]; @@ -427,10 +423,6 @@ in # (so you don't need to reboot to have changes take effect). boot.kernelParams = [ "loglevel=${toString config.boot.consoleLogLevel}" - ] - ++ optionals config.boot.vesa [ - "vga=0x317" - "nomodeset" ]; boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e4c007652da9..97d492a6b34e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -262,8 +262,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "21.2.3"; - hash = "sha256-Gdxw1WvMQ/t4XUfDkekIvwOsWYjmDIjGE7scsImohNc="; + version = "21.2.4"; + hash = "sha256-2oTZLOQfcbqrSpEhJ0p7et/8X2JkTi4Kf2jfqVS2DKo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -2855,8 +2855,8 @@ let mktplcRef = { publisher = "llvm-vs-code-extensions"; name = "vscode-clangd"; - version = "0.4.0"; - hash = "sha256-A1+JaodEBWCQ5NqLkXfNqhOr8j2aFQzEofU+wseh/SY="; + version = "0.6.0"; + hash = "sha256-hmoAPCp0BKB3z6z2Ai0w45RDE9v3BYupmu2A5y5OM50="; }; meta = { description = "C/C++ completion, navigation, and insights"; @@ -3491,8 +3491,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.22.2"; - hash = "sha256-qkSBD8Mk6ow1GryitXgXx0kcLHCJeRs51VxqLQv6gac="; + version = "1.23.2"; + hash = "sha256-btwEFVhvNqCnMCftSt7CS6c4lAf29N3MxBAMriKDyjg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index 2488435118a1..4d28a074a0b2 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2026-05-18"; + version = "0-unstable-2026-05-20"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "175438e5fe68ae0cfb7d04c29f81eed17635e6b4"; - hash = "sha256-crFrG6OsmW3nNnQ+OHFtYz7cRuU9hTjWe3vq4PdYJqA="; + rev = "b76f27959a32e18aa04c619273152178fd0cf03b"; + hash = "sha256-0FUfeA8IY3VyzhbZqiWYJ7Ttp4CT7kernhgwji6wALQ="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index 88617aa02e56..f89170fc4be5 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2026-05-18"; + version = "0-unstable-2026-05-21"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "6fbf272e342387281484ae84f690fa129f0ab86e"; - hash = "sha256-JwFIQfWaorQmDxYgHvpq/CEFMc0LVAsX6TyiGN6FhZA="; + rev = "9fda5f344470d6837e17b939b0f53e5afe938878"; + hash = "sha256-gGuYxGRRGyBbHiyG7Gpoi2/frEI5d+ySo8JdZStznN8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 038808d54915..d8a6c14aef48 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -562,13 +562,13 @@ "vendorHash": "sha256-tCwe8TDqwq3lY7so//tHhbTh51EtfIE1UkBylJ8JhoU=" }, "hashicorp_dns": { - "hash": "sha256-sdJpv5Am1tlKyaUkmByrZauzRGZUeAirf7k9a/Fv0S0=", + "hash": "sha256-7sr51WH7M2x1oewGo+/1tYE2e1DKg32ryVZJPt2ZYlY=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.6.0", + "rev": "v3.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-01tI68RBp6Qpveqo6Jdynd7SWypbUsY6buPNwdcoPkc=" + "vendorHash": "sha256-fnw0mG2kkeALZAyylgpGWyAdcybA77KL5MrobkZBhUU=" }, "hashicorp_external": { "hash": "sha256-/uBQaDqZBNmIOkwYD+zOPo7ZHiHKDZO2MmD0q52KM4k=", @@ -1292,11 +1292,11 @@ "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978=" }, "tailscale_tailscale": { - "hash": "sha256-c1Hz8srHNaZJq1kJrSwm8ruoHcebM11yX2wQhWavoWE=", + "hash": "sha256-h+VKIhmx3wa+kImQaHeqXYM8oxeH3Ic75bG7FHBKJ1g=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.29.0", + "rev": "v0.29.1", "spdx": "MIT", "vendorHash": "sha256-hl9govsnEXMd4VbOPqoSGLgSnImDA55enYTaDz2wKH0=" }, @@ -1454,13 +1454,13 @@ "vendorHash": "sha256-B4W8rzWHucYqA0HXrMrtKQ91ZfFAgcxHqFMvMnVuGfk=" }, "vmware_avi": { - "hash": "sha256-Zc9kvJgUeoYApurIAgghKoicpLuPoU+e52MedqPWhyA=", + "hash": "sha256-OPmsbEI9NgzolQSLH/OKJq8a7gvYfWNk1VVz+J9F0JA=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "repo": "terraform-provider-avi", - "rev": "v31.2.2", + "rev": "v32.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-bmMJcNmB9Pt4Y14YLGrZt2ynnLbSm4rmrqPtdrbDU08=" + "vendorHash": "sha256-WXw9H/BQj0ZEW5YLRHWTiXF4VyaVpwlxWO4Hfy4/NdM=" }, "vmware_vcd": { "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=", diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e8a2b74c4156..8a78d99b79c8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -30,11 +30,12 @@ let (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch) ]; # FIXME: let's hope that upstream will fix this soon and we can drop this hack again. - # https://bugzilla.mozilla.org/show_bug.cgi?id=2006630 + # https://bugzilla.mozilla.org/show_bug.cgi?id=2040877 extraPostPatch = - lib.optionalString (lib.versionAtLeast version "147" && lib.versionOlder version "149") + lib.optionalString (lib.versionAtLeast version "151" && lib.versionOlder version "152") '' - find . -name .cargo-checksum.json | xargs sed 's/"[^"]*\.gitmodules":"[a-z0-9]*",//g' -i + echo https://hg.mozilla.org/releases/comm-release/rev/becfb8fb2c70f1603882a2787e2170d5d8013949 >> sourcestamp.txt + echo https://hg.mozilla.org/releases/mozilla-release/rev/fc12dc911f904307729760a817deb829cbf8feb4 >> sourcestamp.txt ''; meta = { @@ -73,8 +74,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "150.0.2"; - sha512 = "3e52220ff34aa6cd1bf46a910dba1f30d0abf7d19ed7f501ffeeb8f5901b8d97fdc0adb0cceb434ef8e83c7f7b83f28024b872280237af72ff2da9d89fafe065"; + version = "151.0.1"; + sha512 = "a09c1e18faa8d7fdccf39e905542c21e817230e68c7cc6050beec048d0fec0f8eb92e51278d2ccd8d8cfa842762662235517e20238b555a4ad48ee5648dc3589"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 021d01fffce4..c0b7ebbc0377 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,6 +9,7 @@ zarith, camlp5, camlp-streams, + pcre2, bash, }: @@ -19,6 +20,7 @@ let '' -I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith \ -I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ + -I ${pcre2}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ '' else lib.optionalString (num != null) '' @@ -64,6 +66,7 @@ stdenv.mkDerivation { ]; propagatedBuildInputs = [ camlp-streams + pcre2 (if use_zarith then zarith else num) ]; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 5cf447e37a0d..3eb3f412d37d 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -251,7 +251,18 @@ lib.makeOverridable ( ${if allowedRequisites != null then "allowedRequisites" else null} = allowedRequisites; }; - inherit preferLocalBuild meta; + inherit preferLocalBuild; + + meta = meta // { + identifiers = { + purlParts = { + type = "generic"; + # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md + spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}"; + }; + } + // meta.identifiers or { }; + }; env = { NIX_PREFETCH_GIT_CHECKOUT_HOOK = finalAttrs.postCheckout; diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index e12052e3d15d..1b0a1aa92805 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -89,6 +89,22 @@ decorate ( meta // { homepage = meta.homepage or baseUrl; + identifiers = { + purlParts = + if githubBase == "github.com" then + { + type = "github"; + # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md + spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}"; + } + else + { + type = "generic"; + # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md + spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}"; + }; + } + // meta.identifiers or { }; } // lib.optionalAttrs (position != null) { # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix index 71530bddff37..453883ac13f2 100644 --- a/pkgs/build-support/fetchpypi/default.nix +++ b/pkgs/build-support/fetchpypi/default.nix @@ -51,6 +51,8 @@ lib.makeOverridable ( format ? "setuptools", sha256 ? "", hash ? "", + pname, + version, ... }@attrs: let @@ -60,8 +62,20 @@ lib.makeOverridable ( "hash" ] ); + meta = { + identifiers.purlParts = { + type = "pypi"; + # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/pypi-definition.md + spec = "${pname}@${version}"; + }; + }; in fetchurl { - inherit url sha256 hash; + inherit + url + sha256 + hash + meta + ; } ) diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix index 54d50ee3cf44..201e4cd2ef1d 100644 --- a/pkgs/by-name/_9/_9pfs/package.nix +++ b/pkgs/by-name/_9/_9pfs/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "9pfs"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "ftrvxmtrx"; repo = "9pfs"; tag = finalAttrs.version; - sha256 = "sha256-NT8oIQK8Os3HRZLOH2OvauiCvh5bXZFbeEtTFbzNvrs="; + sha256 = "sha256-zJ1H5UfnTqGWCPt24Pi+Fr3K04wUiPVUmx1AH2sjXmM="; }; postPatch = '' diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix index 466f99598717..b5aa88e65c77 100644 --- a/pkgs/by-name/ai/air/package.nix +++ b/pkgs/by-name/ai/air/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "air"; - version = "1.65.2"; + version = "1.65.3"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; tag = "v${finalAttrs.version}"; - hash = "sha256-kQqWIqGJx8396rALn87ykdA3g+1IH+XGOpaICD02j2U="; + hash = "sha256-w3UJ6ezvud0KJYeModGueXx0gp9zTxo6R+BoZPH4Bpo="; }; vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw="; diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 58503bc8e6c4..0f764d54e280 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.3.15"; + version = "3.3.16"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-7DkVhFGUvAAFWUiFTOaYARIGCyAW3UqMCLUs5F55vfM="; + hash = "sha256-us22AgTEmJ8HNlXPR9mT+WJ03Qxndt+ORfMucKvIc0U="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index e13c62d67527..0d0765e57161 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2446"; + version = "2.0.2452"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-77nJGQX/TCnWFYt7+ZMSMbEi8TvoO03+0EpH7h0tG+8="; + hash = "sha256-LNBEp1jGUxJ2cuIeXIx7+FMPkeLZP2XcTOkP0I3o5zw="; }; - npmDepsHash = "sha256-9fq9J/afHI3W/ghmw8VhmD/QaldB9pR5mfEHrvOvkcc="; + npmDepsHash = "sha256-ZOtL9GDQASZhNGQdhdJv+rGLscidzfCdmwVkDfyHmGo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index ae840dfca893..2b27eab43df4 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "aws-nuke"; - version = "3.64.2"; + version = "3.64.4"; src = fetchFromGitHub { owner = "ekristen"; repo = "aws-nuke"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rg68lngQcF6Psg7aE0N/4Nvx7ctrs2DFtcOaqXGDUGA="; + hash = "sha256-oUziuU2lhp1X/RTOYn4FtimmNZ4ZEjbihdfokoeLrmw="; }; vendorHash = "sha256-q1ASHG4KWlU8tLjHireMqmkW33Q2hy+ikOTWQPOYIXo="; diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index bb9ae72fcd05..73774109c2da 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "badkeys"; - version = "0.0.17"; + version = "0.0.18"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; tag = "v${finalAttrs.version}"; - hash = "sha256-sQ2HOgffVklHKpOTmIHMR0QSfsB9lxrEcaT2jzicVlM="; + hash = "sha256-sQPMil8MdGR9vauBgX+fAX/wdmSdqkchoxD4drGXR3I="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix index 0ab5f5eb73fb..8c1bfe924e6a 100644 --- a/pkgs/by-name/bi/bird2/package.nix +++ b/pkgs/by-name/bi/bird2/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "bird"; - version = "2.18.1"; + version = "2.19.0"; src = fetchFromGitLab { domain = "gitlab.nic.cz"; owner = "labs"; repo = "bird"; tag = "v${finalAttrs.version}"; - hash = "sha256-tYICTipTzugtb7kv/zwsChM8v+zJ2TVsotEkJDcZCto="; + hash = "sha256-xk3z5kkjnInmIwtE6Q7kCJ5P5Njt/Oz1+HPO0vcr93E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index acbe1d3deb9b..4f8272b481bf 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "bird"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitLab { domain = "gitlab.nic.cz"; owner = "labs"; repo = "bird"; tag = "v${finalAttrs.version}"; - hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A="; + hash = "sha256-mH9CM9Emie2B9c5PeW4DKUQUzvgxTExPBGG06YbWqGo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 33e733fdd90d..9cf5f276fa98 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "buf"; - version = "1.69.0"; + version = "1.70.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; tag = "v${finalAttrs.version}"; - hash = "sha256-x8Dj4xl67Jq0ViWu+Tz+3lAnfIpE926dIr+oe4ul0gI="; + hash = "sha256-C06/5a4icjgI35ADQKvlZ6JmCCyW/9e0aF9VIpLCqn0="; }; - vendorHash = "sha256-zhXpWpYd/bim5f4EQJujVm072LPgBusjCFGYAwK10HE="; + vendorHash = "sha256-Vveg7rBno66IPinVs9RJtzVJdtAJE55QZfWA3WIXGDQ="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index 556d5060d481..d779bdc6bc6b 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "caligula"; - version = "0.4.11"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ifd3f"; repo = "caligula"; rev = "v${finalAttrs.version}"; - hash = "sha256-2KCP7Utb785yIn8w/Ls19UPS9ylg1PtLRki87+BD+xw="; + hash = "sha256-0KSQd/DvIo813HSLL+Qvn+5GMFRK7CGxOSq4+Fyl8Zk="; }; - cargoHash = "sha256-C86wu2Pc9O7YM1TnnfotzzOQlnJXJe2zmsX04JyJsjA="; + cargoHash = "sha256-ICvQ7XtA7705gJ0GijuZJROGAp/BMpyqsIygR+6kJ2I="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 0d55579b0272..997b3d788980 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.11.0"; + version = "2.11.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-hbTpLeWMc5nSJeq1vWKbVpfhp1KZjiBgmaiQMUs/MIQ="; + hash = "sha256-BH/tQlrmCMAab5LqQ/xl9+A5nCnN8sk6mavvAkajYHM="; }; - cargoHash = "sha256-PrvlPfK/9qyBWOs6hG3C3w9TMK7p1TCoKpjSWkhN2rY="; + cargoHash = "sha256-QX151ckeSxbZgbFO88zhsvnNnjZffLpR5dDp1Dv1Wlo="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch b/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch deleted file mode 100644 index ff9b7d3bebd5..000000000000 --- a/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/java/nl/altindag/crip/command/FileBaseTest.java b/src/test/java/nl/altindag/crip/command/FileBaseTest.java -index 674ca10..f140601 100644 ---- a/src/test/java/nl/altindag/crip/command/FileBaseTest.java -+++ b/src/test/java/nl/altindag/crip/command/FileBaseTest.java -@@ -26,7 +26,7 @@ import java.util.stream.Collectors; - - public class FileBaseTest extends BaseTest { - -- protected static final Path TEMP_DIRECTORY = Paths.get(System.getProperty("user.home"), "certificate-ripper-temp"); -+ protected static final Path TEMP_DIRECTORY = Paths.get(System.getenv("TMP"), "certificate-ripper-temp"); - - @BeforeEach - void createTempDirAndClearConsoleCaptor() throws IOException { diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix index ece2a2fa1186..38613cb0c202 100644 --- a/pkgs/by-name/ce/certificate-ripper/package.nix +++ b/pkgs/by-name/ce/certificate-ripper/package.nix @@ -7,7 +7,7 @@ buildGraalvmNativeImage (finalAttrs: { pname = "certificate-ripper"; - version = "2.4.1"; + version = "2.7.1"; src = maven.buildMavenPackage { pname = "certificate-ripper-jar"; @@ -17,30 +17,24 @@ buildGraalvmNativeImage (finalAttrs: { owner = "Hakky54"; repo = "certificate-ripper"; tag = finalAttrs.version; - hash = "sha256-qQ5BHH+DT1sGNDGzSbclqc6+byBxyP16qvm3k9E/Yks="; + hash = "sha256-yKBINzHhUpjqrbMIt3LulKtMLyuZvuBzBaR6wMs6lCI="; }; patches = [ ./pin-default-maven-plguin-versions.patch - ./fix-test-temp-dir-path.patch ]; - mvnHash = "sha256-G2+Z1JyxTzCZzWjB8MQH1T9kwHjtRPag+bmzGXpQXw4="; + mvnHash = "sha256-ZuqPzFL7CJ/H6SBcQMwTMqBsKtlxv9oiQXXfFgMdQpE="; - mvnParameters = - let - disabledTests = [ - "PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # uses network - "DerExportCommandShould#processSystemTrustedCertificates" - "JksExportCommandShould#processSystemTrustedCertificates" - "PemExportCommandShould#processSystemTrustedCertificates" - "Pkcs12ExportCommandShould#processSystemTrustedCertificates" - ]; - in - lib.escapeShellArgs [ - "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic - "-Dtest=${lib.concatMapStringsSep "," (t: "!" + t) disabledTests}" - ]; + mvnParameters = lib.escapeShellArgs [ + # generate a singular .jar file + "-Pfat-jar" + # make the build timestamp deterministic + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" + ]; + + # Integration tests and network based tests fail, let's not bother with blacklisting them one-by-one + doCheck = false; installPhase = '' install -Dm644 target/crip.jar $out diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix index fcaed57dc550..57e30c965d4b 100644 --- a/pkgs/by-name/ch/chess-tui/package.nix +++ b/pkgs/by-name/ch/chess-tui/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chess-tui"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "thomas-mauran"; repo = "chess-tui"; tag = finalAttrs.version; - hash = "sha256-BGJOPsePE5S5ySrOg63cNKn9pT+7MmDLHZrW3YhUFz8="; + hash = "sha256-B6CpUha5e2W82HnWOxV2arHAiqJCyL5bwkhELYQPxMg="; }; - cargoHash = "sha256-n9rjr5vUK619XIfuHIlf+lxUAeTbhTAzmdysliKNOFY="; + cargoHash = "sha256-Vik4FceQSYnziDpAqz7r7gpabUp2JL5u40iT0r8fnAw="; checkFlags = [ # assertion failed: result.is_ok() diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index c1b4eda08e07..8f8c716aa020 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2026-04-30"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "3681f0ce1446167d01dfe125d6db96ba2ac31c3c"; - hash = "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw="; + rev = "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d"; + hash = "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cpu-info"; maintainers = with lib.maintainers; [ pawelchcki ]; pkgConfigModules = [ "libcpuinfo" ]; - # https://github.com/pytorch/cpuinfo/blob/3681f0ce1446167d01dfe125d6db96ba2ac31c3c/CMakeLists.txt#L98 + # https://github.com/pytorch/cpuinfo/blob/ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d/CMakeLists.txt#L98 platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv; }; }) diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 36dfaaef23f3..ee07d11f47ea 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -12,15 +12,17 @@ libdrm, libxrandr, libxext, + acl, + dbus, }: stdenv.mkDerivation (finalAttrs: { pname = "ddcutil"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz"; - hash = "sha256-5LaRkcC0UK6iOjSlks88WPAn/hRiAgF5BwzJLV7K7Yg="; + hash = "sha256-GaxmBM8Rd7pWZm+KaCWB5x6Jc70Gx8jc8DNnTkqqpkg="; }; nativeBuildInputs = [ @@ -29,14 +31,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + acl + dbus glib jansson libdrm libgudev libusb1 - udev libxext libxrandr + udev ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix index 8235fbe99030..f64a2c08c943 100644 --- a/pkgs/by-name/de/der-ascii/package.nix +++ b/pkgs/by-name/de/der-ascii/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "der-ascii"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "google"; repo = "der-ascii"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-i4rNeNDE7bIsO04haMKsbJmyvQRhhEt3I7UxmfTtL78="; + sha256 = "sha256-/9Go4fAwXmA3SLl0bP7aLy6fEItPZoscQ4pdA2GZuyM="; }; vendorHash = null; diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index 74bf69b06b19..25e7b521c0c3 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "doctl"; - version = "1.159.0"; + version = "1.160.0"; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { owner = "digitalocean"; repo = "doctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-SBUTqJbxO2z5d78SQtGquVyPKQEeapmT/SVTd7nt7L0="; + hash = "sha256-LXALzs5oubT1uL+sgA0LsaoFbir3e8JYVlIiJv6U5J4="; }; meta = { diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 5d743cfb1c3c..f72f9bfb10e4 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.260"; + version = "0.0.263"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-juYkvJZUo0b7N/yRRgD4Xwh4nHxRQFMVoWTgIW+N0/0="; + hash = "sha256-+Br2PS5IsHaAAJM5IJR7gXMx90pduixbdbSVNxL+kLo="; }; postPatch = '' diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index 082f18ae7e09..3e0534acfbd6 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "euphonica"; - version = "0.99.3-beta"; + version = "0.99.4-beta"; src = fetchFromGitHub { owner = "htkhiem"; repo = "euphonica"; tag = "v${finalAttrs.version}"; - hash = "sha256-C9OX8RzgUMdStBFq43sSl5vG7XccXTJjFvn0E2WQDuo="; + hash = "sha256-TDW3at2NXbdfUvHAZg7KK0HEqF8xDm0cIYfGuTSlYCQ="; fetchSubmodules = true; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-3m0ObaRR/HlxPF9Z5Zg5fMQ17YVRCx6W3drI8XVwZP8="; + hash = "sha256-cXlfJ3MrW8n34KxE5uD+6dTqzaazmwgNQC3hHNPqzcE="; }; mesonBuildType = "release"; @@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ paperdigits aaravrav + doronbehar ]; mainProgram = "euphonica"; platforms = with lib.platforms; linux; diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix index 770c955b60b3..42a589cf366f 100644 --- a/pkgs/by-name/ex/extest/package.nix +++ b/pkgs/by-name/ex/extest/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "extest"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "extest"; rev = finalAttrs.version; - hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw="; + hash = "sha256-4SVZD0aHKsn97B5bhCf7URR6iQhJlYGALKWhDg+lGhU="; }; - cargoHash = "sha256-82jG4tHqc5FQFGp4NANk2oJjiHc0+ekVdbdWlqjzaj8="; + cargoHash = "sha256-OBWgNQ3OfqztaQwbK4fjOp7Lbu58U6j8tbStJ17bIko="; meta = { description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland"; diff --git a/pkgs/by-name/fa/fakeroot/package.nix b/pkgs/by-name/fa/fakeroot/package.nix index 3b42386c05d0..401b39ab993c 100644 --- a/pkgs/by-name/fa/fakeroot/package.nix +++ b/pkgs/by-name/fa/fakeroot/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.37.2"; + version = "1.38.1"; pname = "fakeroot"; src = fetchFromGitLab { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "fakeroot"; rev = "upstream/${finalAttrs.version}"; domain = "salsa.debian.org"; - hash = "sha256-TU/9oltd+2wYums8EEDUhaIVzwPeQvW13laCrJqb5A4="; + hash = "sha256-1Xmb8OPZSVP4xtSBGuwwKwdVQXixEugMgQfvAJueJAg="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/fe/fetchmail/package.nix b/pkgs/by-name/fe/fetchmail/package.nix index 55b9f40033df..29a4776a4538 100644 --- a/pkgs/by-name/fe/fetchmail/package.nix +++ b/pkgs/by-name/fe/fetchmail/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fetchmail"; - version = "6.6.3"; + version = "6.6.4"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${finalAttrs.version}.tar.xz"; - hash = "sha256-JG5fwONck93ho/tmd446twDhaAkjLklZxQi5EhQ3S7I="; + hash = "sha256-7+AWkNIr2jWaV5x34rAHJligkr/0kOwEeKISxrfQ63A="; }; buildInputs = [ diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index f891f6d5fab9..ab577cab9e0e 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fly"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${finalAttrs.version}"; - hash = "sha256-YKa1hGqmmwFNcPX6N7iJUjUL6FnPJLi9DZTkcujzVkY="; + hash = "sha256-eqzrrbIpX6hS56SQe24gWlnBPMlLH1lz+NwxdNZ3OoE="; }; - vendorHash = "sha256-dvE5rtJX3MIuYyswLgcwojd5LIkhD4WnPEL3HNfmhkA="; + vendorHash = "sha256-ZNhGt+nyl7zmQIHT+5f/c2hixyZ8kLmCWO5qa7CAGuY="; subPackages = [ "fly" ]; diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index 0c024c61b743..f88fbffe120d 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "fn"; - version = "0.6.56"; + version = "0.6.58"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = finalAttrs.version; - hash = "sha256-GeOb6HkIScxcTTPgXcZy3VyJlwK8NxDJBikDv13tTQM="; + hash = "sha256-Ysf+FmYiJ0R4NIskEqIClcG55EnMnBFLD/GDJd8G/sQ="; }; vendorHash = null; diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix index f183837ea19f..ccd69b10c520 100644 --- a/pkgs/by-name/gg/ggml/package.nix +++ b/pkgs/by-name/gg/ggml/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ggml"; - version = "0.12.0"; + version = "0.13.0"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "ggml"; tag = "v${finalAttrs.version}"; - hash = "sha256-xho510x/7LrCHzmw++zdTg+lI96SebJkdotqIUGLwac="; + hash = "sha256-yUd/9uk9utNqkM2V/IIkcNuEojBJQwAOEEUbBPDsNCE="; }; # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR diff --git a/pkgs/by-name/gi/git-credential-keepassxc/package.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix index a33a78b6fa42..5e83ff78fa01 100644 --- a/pkgs/by-name/gi/git-credential-keepassxc/package.nix +++ b/pkgs/by-name/gi/git-credential-keepassxc/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-credential-keepassxc"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${finalAttrs.version}"; - hash = "sha256-tA90IM2zLDX9LkIZ6BEW9L+Se3f/cq80f+IwLfq1cjI="; + hash = "sha256-rgYwcfglyutHIZrENFlYUHFeobMoLU6BwkdsaWqDkWE="; }; - cargoHash = "sha256-5aXVvQdiQ+3c3VsGX/nrvclgNlXUO3bs0/De8LEXDek="; + cargoHash = "sha256-zHSMbfP9ge3JYGyUI2XMGtQwQnsDPkWDnm0F3WWwfNc="; buildFeatures = [ ] diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index ddd7b7ebacb3..b41ae97b3f66 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "glooctl"; - version = "1.21.4"; + version = "1.21.6"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${finalAttrs.version}"; - hash = "sha256-cG3WKpvIanWneBYw98nprbmoTHaFbdRopJ4p5oaJkyU="; + hash = "sha256-KZh0ZUCZ5zUJRmt/JpfqowADrjuGgK27XoIJ/1TBgzA="; }; - vendorHash = "sha256-8iRotQm41EcqjHUK92wpNFcq/ODDbhAhcKSxSRFmGrA="; + vendorHash = "sha256-1bY+69XKEmcV+8HV2X2JYA6S9A29KbHTLaXSZbkFbhg="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index bdcc557e20aa..18d7f034dcd4 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.125"; + version = "0.126"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-rdYZgBBzZDcq64Foe8WKZsDQyeCixKm7ttNxT7RSuqw="; + hash = "sha256-rXXdiDGGrxCi+Lol9bTm6bKXTTkvNcjgo5O0/xNLSC0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/highscore-mednafen/package.nix b/pkgs/by-name/hi/highscore-mednafen/package.nix index 29deded80c82..e3c70a929641 100644 --- a/pkgs/by-name/hi/highscore-mednafen/package.nix +++ b/pkgs/by-name/hi/highscore-mednafen/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highscore-mednafen"; - version = "0-unstable-2026-01-31"; + version = "0-unstable-2026-05-22"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mednafen-highscore"; - rev = "f1646bbc664837f5b2ecbfb32cc5c42101466bfd"; - hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8="; + rev = "e13c337a2cde6d5304f2a33311447280ef206a7a"; + hash = "sha256-nwvOkL1RzqXCqMFiDuSvNhgmujvxFYpdp4OScvEmppI="; }; sourceRoot = "${finalAttrs.src.name}/highscore"; diff --git a/pkgs/by-name/hi/highscore-mgba/package.nix b/pkgs/by-name/hi/highscore-mgba/package.nix index 72c52a4a2040..c8cff0f59554 100644 --- a/pkgs/by-name/hi/highscore-mgba/package.nix +++ b/pkgs/by-name/hi/highscore-mgba/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "highscore-mgba"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-05-21"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mgba"; - rev = "eeb3cf0f34af549d9224dd75a1e6cb6361d09aeb"; - hash = "sha256-yGUAnG8LnZ+hCV+uE1tGX2Zmp5Hriu7LQaWfXZTJqXk="; + rev = "c010031f76b729819246497627746fb4a7bf6c85"; + hash = "sha256-QhQ27s4Gc2IVkvgiB2vK2c0WXcxwl5/wmvpIRpM3NNI="; }; outputs = [ diff --git a/pkgs/by-name/in/interactive-html-bom/package.nix b/pkgs/by-name/in/interactive-html-bom/package.nix index fad9176bad82..daa92fd895b1 100644 --- a/pkgs/by-name/in/interactive-html-bom/package.nix +++ b/pkgs/by-name/in/interactive-html-bom/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "interactive-html-bom"; - version = "2.11.1"; + version = "2.11.2"; pyproject = true; src = fetchFromGitHub { owner = "openscopeproject"; repo = "InteractiveHtmlBom"; tag = "v${finalAttrs.version}"; - hash = "sha256-j8ORSHMZ3aWtWNA5UaHeL+OXh4D1wdek5JjinmqpOfI="; + hash = "sha256-MNwQJAibnAAMvsoTWtFiIhM6TGVUs7B2w6sA4ruXFbc="; }; build-system = [ python3Packages.hatchling ]; diff --git a/pkgs/by-name/ir/iroh-ssh/package.nix b/pkgs/by-name/ir/iroh-ssh/package.nix index 0e34673c8a5d..5d9ad7314e19 100644 --- a/pkgs/by-name/ir/iroh-ssh/package.nix +++ b/pkgs/by-name/ir/iroh-ssh/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "iroh-ssh"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "rustonbsd"; repo = "iroh-ssh"; tag = finalAttrs.version; - hash = "sha256-A/QdpPHI9TCqQ2oghxPUJl4KKX8gqkA3kBvN8f1Kegg="; + hash = "sha256-/g5U8WW/iqf+ccIsZ5tPhkjVFsoVgDj6sfk/aSgGJBw="; }; - cargoHash = "sha256-/cq/rOzrQ4t0qvdaqM3JhRn8IMncx7jWYDjdYmLCYvc="; + cargoHash = "sha256-2NAl4ClPN+OI1EBAkuL/KSiByxU34sBmYDjnRXYuiOY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 31633d27ba03..70b6bb169fce 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -139,5 +139,9 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; mainProgram = "jq"; + identifiers.purlParts = { + type = "github"; + spec = "jqlang/jq@jq-${finalAttrs.version}"; + }; }; }) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 0598d7359c8a..56c309ea268a 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kdlfmt"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-W4a+pPdQv6/XOS3ps1CBCLuspcSAn7FJuvkA5hesvww="; + hash = "sha256-Ftzf4gI7E5tPo8U5ZxUMqlY5+AK5IEUUAll+GsEKYpg="; }; - cargoHash = "sha256-VXg7CVsTuAvXrQNAtzlcJvd24BtS/bQYTGselh4Dzyk="; + cargoHash = "sha256-B/ir+Sf4uxQ9Fqmy6yEa3DMt0qdpfPrwD8lhUMOEUbo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix index 49a34fe93d7c..125498486e5c 100644 --- a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix +++ b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "kubectl-rabbitmq"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "cluster-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-84rcffEG2+AxtCbOo7KnT6mQFOMpeWJyA0HgDxjmlyc="; + hash = "sha256-6kh4R84Nq82M66Y0vl1NLYUxWh52oYpCydK7vOmkMcU="; }; modRoot = "kubectl-rabbitmq"; - vendorHash = "sha256-+++RbYcQ3qrdWeBUjd50RuCuvpSbDrTycCR7mptvhoc="; + vendorHash = "sha256-/50MnUk1wxpUed8jZ8OC6rgu4Qj6CnUZdbYsgyjsxIo="; ldflags = [ "-s" diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index aa28c2db02d1..827526232430 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.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-fQGojLJdMnzWXetE2AL2i0q16ZRebPsGx9UsWm1CmAs="; + hash = "sha256-rdXZmvyBzVcvycFP/AmrnOuVauQKrmJ1ZTIXc0TWxSI="; }; vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE="; diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix index bb65c4e9071e..1db62953bff2 100644 --- a/pkgs/by-name/le/ledfx/package.nix +++ b/pkgs/by-name/le/ledfx/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "ledfx"; - version = "2.1.8"; + version = "2.1.9"; pyproject = true; src = fetchFromGitHub { owner = "LedFx"; repo = "LedFx"; tag = "v${finalAttrs.version}"; - hash = "sha256-le3SEGI9uis7wx9+SFpn0BJbpCybSecXEcxxAkC910U="; + hash = "sha256-h3bevsvgRILzAnQKSJj8X5AixB8qsyhf2+SkolSEdbk="; }; postPatch = '' diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix index 855776e6eca6..ac7b4c4f6561 100644 --- a/pkgs/by-name/li/libglibutil/package.nix +++ b/pkgs/by-name/li/libglibutil/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libglibutil"; - version = "1.0.81"; + version = "1.0.82"; src = fetchFromGitHub { owner = "sailfishos"; repo = "libglibutil"; rev = finalAttrs.version; - sha256 = "sha256-sDSdcsCkmsdD6yPEOi8rdURJRJ6LN69ZeiBfLZL2I68="; + sha256 = "sha256-etFvEqU3WeXkImRhXgEw0Pd2gZvuQK4Sy4pIIyuazqc="; }; outputs = [ diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/by-name/li/libosmscout/package.nix similarity index 92% rename from pkgs/development/libraries/libosmscout/default.nix rename to pkgs/by-name/li/libosmscout/package.nix index 7c850d962ff1..8fe0cb9fc900 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/by-name/li/libosmscout/package.nix @@ -5,10 +5,8 @@ fetchpatch, cmake, pkg-config, - wrapQtAppsHook, marisa, - qttools, - qtlocation, + libsForQt5, }: stdenv.mkDerivation { @@ -37,12 +35,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ marisa - qttools - qtlocation + libsForQt5.qttools + libsForQt5.qtlocation ]; meta = { diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix index fad26c37245a..63e2932d0a14 100644 --- a/pkgs/by-name/li/librashader/package.nix +++ b/pkgs/by-name/li/librashader/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "librashader"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "SnowflakePowered"; repo = "librashader"; tag = "librashader-v${finalAttrs.version}"; - hash = "sha256-02ZWu5kllTmQsFqQFbT8ckzhWgWkjH5YsD6mf4j0ySg="; + hash = "sha256-ZkmaPv7cy2qj1I8hBiLBAIgbATS6Ooe/Y52cjKNYyCw="; }; patches = [ ./patches/fix-optional-dep-syntax.patch ]; - cargoHash = "sha256-8F7Rl1sC3UW01HFGVp9nu83sUXrigB2URyOFSiQ6Fqs="; + cargoHash = "sha256-zEHvhjFGcZ9eFWfmJfrRpbjnHPqQhZ0G3OMHBWKQBzQ="; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix index 4a55ce0216e4..6ecee84d2cb1 100644 --- a/pkgs/by-name/ll/llmfit/package.nix +++ b/pkgs/by-name/ll/llmfit/package.nix @@ -2,20 +2,23 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "llmfit"; - version = "0.9.25"; + version = "0.9.28"; src = fetchFromGitHub { owner = "AlexsJones"; repo = "llmfit"; tag = "v${finalAttrs.version}"; - hash = "sha256-ijm2RkOF+B1E7dARxI3MsZz3l6OTQOUqBC+2mzZ7ruI="; + hash = "sha256-okTaIKaLw3BcBqBRe1Mz9V3tCaEStF32qxrcfggi33w="; }; - cargoHash = "sha256-BdnsqqqnvnXQl6Q1L0tVHQyn7BatQVYfYF8mLRqZfqQ="; + cargoHash = "sha256-ty45oqyDcuUuiM1J41UreCqc0SbMz8U/V9ckE2FZv3c="; + + passthru.updateScript = nix-update-script { }; meta = { description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU"; diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index e63092003efb..dbfcaa927b4b 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 (finalAttrs: { pname = "lockbook-desktop"; - version = "26.4.13"; + version = "26.5.22"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY="; + hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc="; }; - cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74="; + cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index 62f20bb4c598..a9e5bb46a7fb 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 (finalAttrs: { pname = "lockbook"; - version = "26.4.13"; + version = "26.5.22"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY="; + hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc="; }; - cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74="; + cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 6a76a110fc1b..62e1682374cc 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.301"; + version = "1.302"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-C/M5Dl94L83vB7TzREdx6dBms9aHPQfgdWEyjvtvS00="; + hash = "sha256-7YRfB+nDHUhzPuWyjuZUIwx7tLKjjhP9JutNWRnAw3w="; }; dontUnpack = true; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/by-name/ma/manuskript/package.nix similarity index 96% rename from pkgs/applications/editors/manuskript/default.nix rename to pkgs/by-name/ma/manuskript/package.nix index 400b73ee5062..ecc140a74ba6 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/by-name/ma/manuskript/package.nix @@ -3,7 +3,7 @@ zlib, fetchFromGitHub, python3Packages, - wrapQtAppsHook, + libsForQt5, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; propagatedBuildInputs = [ python3Packages.pyqt5 diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/by-name/ma/masterpdfeditor4/package.nix similarity index 94% rename from pkgs/applications/misc/masterpdfeditor4/default.nix rename to pkgs/by-name/ma/masterpdfeditor4/package.nix index ea54e30ebecd..84b70d3cad60 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/by-name/ma/masterpdfeditor4/package.nix @@ -2,11 +2,9 @@ stdenv, fetchurl, sane-backends, - qtbase, - qtsvg, autoPatchelfHook, lib, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -20,12 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg sane-backends stdenv.cc.cc ]; diff --git a/pkgs/by-name/ma/matrix-hookshot/package.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix index 12377a05339c..85c9fd4dac82 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.nix +++ b/pkgs/by-name/ma/matrix-hookshot/package.nix @@ -18,23 +18,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "matrix-hookshot"; - version = "7.3.2"; + version = "7.3.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-hookshot"; tag = finalAttrs.version; - hash = "sha256-FHxR0rUrony/z8Nxv4HA0XCDlwsdoLXK/yBQlfkC6U4="; + hash = "sha256-SVQsXzQU3TTiKjd1manEsqL/Ui6s/sFoZPBf9mWp31k="; }; offlineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-Qodvybg0G2a6Jtcd89Mci/PoLXrozTJCRRVh/fedngk="; + hash = "sha256-1J2a0ZRARYOEQE70WnKZlgwjIwafPfmgBtUVXX106lg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-X0k60VOG/VoffE5+pCJ33C0Oxjr7NsOHHsLNWFb/z6s="; + hash = "sha256-EMwrIo17d5+LTczv4/+4m6XALfH0dCHnWtBU17h+mxI="; }; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix index ea0401bde70b..ab888aadef1f 100644 --- a/pkgs/by-name/me/megabasterd/package.nix +++ b/pkgs/by-name/me/megabasterd/package.nix @@ -6,7 +6,7 @@ maven, }: let - version = "8.47"; + version = "8.51"; in maven.buildMavenPackage { pname = "megabasterd"; @@ -16,7 +16,7 @@ maven.buildMavenPackage { owner = "tonikelope"; repo = "megabasterd"; tag = "v${version}"; - hash = "sha256-pJk6ZDVPs/hrm0ZZI9YXv+dfZAEbpwwI8Z1By+FPwCs="; + hash = "sha256-FbExOSdJ4XiXKzetIlsSPrD9x2H4MxM2kKCMA4XkMLA="; }; mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY="; diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix index 32c04a12d019..6bda9038b194 100644 --- a/pkgs/by-name/mi/minimap2/package.nix +++ b/pkgs/by-name/mi/minimap2/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minimap2"; - version = "2.30"; + version = "2.31"; src = fetchFromGitHub { repo = "minimap2"; owner = "lh3"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-TnJ/h04QdTdL56yyh+3Po19UAzrAkictu5Q6OiCQ2DY="; + sha256 = "sha256-RH9IvpmcDEnuFEXucORpzeWc+yJlAvW4r6RnaUT+//c="; }; buildInputs = [ zlib ]; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index ea4d514cb694..f29d326ddb85 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -22,22 +22,13 @@ let hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg="; }; }); - # 112/2907 tests fail with textual 8.2.5: - # textual.app.InvalidThemeError: Theme 'textual-ansi' has not been registered. - textual = prev.textual.overridePythonAttrs (old: rec { - version = "8.2.4"; - src = old.src.override { - tag = "v${version}"; - hash = "sha256-827cm9pcj1o1FYeaoWKCJ6dEyXeDop4kYd205cySTfg="; - }; - }); }; }; python3Packages = python.pkgs; in python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.10.1"; + version = "2.11.0"; pyproject = true; __structuredAttrs = true; @@ -45,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-hbsOA+8tOoFuwiz2KLdcJsbrn/sYec8vqzvh6mKgX08="; + hash = "sha256-s0mgWOKO+kKwJivnZw2IJRhGRET000ApvuhK6OovIIw="; }; build-system = with python3Packages; [ diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/by-name/mk/mkchromecast/package.nix similarity index 93% rename from pkgs/applications/networking/mkchromecast/default.nix rename to pkgs/by-name/mk/mkchromecast/package.nix index f0db4eec7065..5d95d8c485f1 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/by-name/mk/mkchromecast/package.nix @@ -6,7 +6,6 @@ sox, flac, lame, - wrapQtAppsHook, ffmpeg, vorbis-tools, pulseaudio, @@ -15,7 +14,7 @@ opus-tools, gst_all_1, enableSonos ? true, - qtwayland, + libsForQt5, }: let packages = [ @@ -44,7 +43,7 @@ python3Packages.buildPythonApplication { hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4="; }; - buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland; propagatedBuildInputs = with python3Packages; ( @@ -66,7 +65,7 @@ python3Packages.buildPythonApplication { --replace 'platform.system() == "Linux"' 'True' ''; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; # Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs. # Is also I/O bound and impure, testing an actual device, so we disable. diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix index ead5f5734f45..f596eea0c2cd 100644 --- a/pkgs/by-name/mk/mkvtoolnix/package.nix +++ b/pkgs/by-name/mk/mkvtoolnix/package.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mkvtoolnix"; - version = "98.0"; + version = "99.0"; src = fetchFromCodeberg { owner = "mbunkus"; repo = "mkvtoolnix"; tag = "release-${finalAttrs.version}"; - hash = "sha256-gLs2+hbWFhhpabdknwoozH8WHgVNSR0VjnrmwQA7xrc="; + hash = "sha256-re4z0ZseuOP/P1HW3qdWLIo+YhLlSRBuqefewRm6KEI="; }; passthru = { diff --git a/pkgs/by-name/mo/mocha/package.nix b/pkgs/by-name/mo/mocha/package.nix index b6fc8c731bb6..04dcea632516 100644 --- a/pkgs/by-name/mo/mocha/package.nix +++ b/pkgs/by-name/mo/mocha/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "mocha"; - version = "11.7.5"; + version = "11.7.6"; src = fetchFromGitHub { owner = "mochajs"; repo = "mocha"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bk/yF3z/DZ4h9mj1a/EG5ofC6/CIpLd81iQ1w7XkZ0A="; + hash = "sha256-pY6LYMitbhOfjNf00UuUbLgdZii7Nr/8/SlBgM5pYMI="; }; - npmDepsHash = "sha256-dcq6P4BB6w7GGMzW2GfF8AzDnqPV/BS5nz+dxVjnc3o="; + npmDepsHash = "sha256-1uisNcDlv/EY+Mq24rM7BgA8GREKKvxX/gHt8dHlX2Q="; postInstall = '' # Installed only for backwards compat, but should just be removed. diff --git a/pkgs/applications/editors/molsketch/openbabel.patch b/pkgs/by-name/mo/molsketch/openbabel.patch similarity index 100% rename from pkgs/applications/editors/molsketch/openbabel.patch rename to pkgs/by-name/mo/molsketch/openbabel.patch diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/by-name/mo/molsketch/package.nix similarity index 95% rename from pkgs/applications/editors/molsketch/default.nix rename to pkgs/by-name/mo/molsketch/package.nix index f042627055e7..3aea780b0450 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/by-name/mo/molsketch/package.nix @@ -4,8 +4,7 @@ fetchurl, cmake, pkg-config, - qttools, - wrapQtAppsHook, + libsForQt5, hicolor-icon-theme, openbabel, desktop-file-utils, @@ -45,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ hicolor-icon-theme diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/by-name/mo/moolticute/package.nix similarity index 89% rename from pkgs/applications/misc/moolticute/default.nix rename to pkgs/by-name/mo/moolticute/package.nix index fe87ff3a1429..dbcfa3829f0a 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/by-name/mo/moolticute/package.nix @@ -4,11 +4,7 @@ fetchFromGitHub, libusb1, pkg-config, - qmake, - qttools, - wrapQtAppsHook, - qtbase, - qtwebsockets, + libsForQt5, }: stdenv.mkDerivation rec { @@ -29,14 +25,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libusb1 - qtbase - qtwebsockets + libsForQt5.qtbase + libsForQt5.qtwebsockets ]; doInstallCheck = true; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/by-name/my/mytetra/package.nix similarity index 93% rename from pkgs/applications/office/mytetra/default.nix rename to pkgs/by-name/my/mytetra/package.nix index 0fae90828e9f..373864b8f1b1 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/by-name/my/mytetra/package.nix @@ -2,10 +2,8 @@ lib, stdenv, fetchFromGitHub, - qmake, - qtsvg, makeWrapper, - wrapQtAppsHook, + libsForQt5, xdg-utils, }: @@ -21,11 +19,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake makeWrapper - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtsvg ]; + buildInputs = [ libsForQt5.qtsvg ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 356de4c085d4..7e054548f497 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nix-update"; - version = "1.15.0"; + version = "1.15.1"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; tag = "v${finalAttrs.version}"; - hash = "sha256-M62YdrdAqK81MF0FL0bx6iKTDCaqOtPx3civlSg46uk="; + hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index a373c22a23d3..d44923191750 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2026-05-13"; + version = "0-unstable-2026-05-23"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "018fe3c3134d49504be652a7ace5512291545317"; - hash = "sha256-JUsFHsacED+7eTLAlfBnF9vasIHWIL/POJMCPbC9Baw="; + rev = "57f49add9b32d4741351b63236f28341eba35077"; + hash = "sha256-l0feMriwY8/WAghUOwSsD0MDUVGXgOkzUklnnvS1ij8="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index a67d8406714a..fb55edfcbc8f 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -7,22 +7,22 @@ }: rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2026-03-26"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "074930a23bc89a5f720a0d46ac2853f3153817c2"; - hash = "sha256-XqiUPAVM6OuyNo9HbBKW+OKQrE7QbSjDRtyfmIYQRxs="; + rev = "2a9661dffb7e432b46c0b0956e74e0511e783dc7"; + hash = "sha256-OTKtCQ1AafQ6ejW657mJ1vqtgmZCxKEnNMT/EOsT5ic="; }; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-heHFiW1/2qV6BJH7Y0ObSV1sPfVaU0m2KLbASdzca8s="; + cargoHash = "sha256-jgmNMk2tprJsGU/pddxfKdfWli9dNwLt02LhVhQrHc4="; - # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/074930a23bc89a5f720a0d46ac2853f3153817c2 + # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/2a9661dffb7e432b46c0b0956e74e0511e783dc7 postPatch = '' substituteInPlace tests/ground_truth.rs --replace-fail \ ' let path = PathBuf::from(target_dir).join("debug").join(exe_name);' \ diff --git a/pkgs/by-name/nu/nushell-plugin-semver/package.nix b/pkgs/by-name/nu/nushell-plugin-semver/package.nix index 239e189e688f..dbddc5a9d324 100644 --- a/pkgs/by-name/nu/nushell-plugin-semver/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-semver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_semver"; - version = "0.11.16"; + version = "0.11.17"; src = fetchFromGitHub { owner = "abusch"; repo = "nu_plugin_semver"; tag = "v${finalAttrs.version}"; - hash = "sha256-LgB2a14ZIQvNpvYU4nu3AEcwjjWIpJlMS4OGB+dHj2E="; + hash = "sha256-GJ3B7dENuSEZSkHV42plt7tsGLZPqqXCO3c/0ILZQ1Y="; }; - cargoHash = "sha256-PunvfZbghJzcpAMLDIozec2GAklWTosPUWlBJ76lPV8="; + cargoHash = "sha256-U3wwXtvnHfbxfH5awVJbSI4OaVd/c/TsQHzaUljw99o="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 81f95ba03bcc..66b8885577fb 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "oelint-adv"; - version = "9.7.1"; + version = "9.8.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = finalAttrs.version; - hash = "sha256-44ebctMX7QfF459RvjJM4oz+ByBF3cz4e+02GnY9h1s="; + hash = "sha256-N7S3pmxoOcntCnMuM78H9wYZR5MczJBPhv9v0wSZIuY="; }; postPatch = '' diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/by-name/of/ofono-phonesim/package.nix similarity index 82% rename from pkgs/development/tools/ofono-phonesim/default.nix rename to pkgs/by-name/of/ofono-phonesim/package.nix index 32a33f54b0ea..f5e929dd690d 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/by-name/of/ofono-phonesim/package.nix @@ -4,8 +4,7 @@ fetchzip, autoreconfHook, pkg-config, - wrapQtAppsHook, - qtbase, + libsForQt5, }: stdenv.mkDerivation { @@ -20,16 +19,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; makeFlags = [ - "MOC=${qtbase.dev}/bin/moc" - "UIC=${qtbase.dev}/bin/uic" + "MOC=${libsForQt5.qtbase.dev}/bin/moc" + "UIC=${libsForQt5.qtbase.dev}/bin/uic" ]; meta = { diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/by-name/op/openhantek6022/package.nix similarity index 88% rename from pkgs/applications/science/electronics/openhantek6022/default.nix rename to pkgs/by-name/op/openhantek6022/package.nix index e92a92890c6c..481dd40bb622 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/by-name/op/openhantek6022/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, makeWrapper, cmake, - wrapQtAppsHook, - qtbase, - qttools, + libsForQt5, fftw, libusb1, libglvnd, @@ -26,14 +24,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ fftw libusb1 libglvnd - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools ]; postPatch = '' @@ -51,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OpenHantek/OpenHantek6022"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ baracoder ]; - platforms = qtbase.meta.platforms; + platforms = libsForQt5.qtbase.meta.platforms; }; } diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 4a25b64c5c6c..22afac3969d4 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -16,16 +16,16 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.11.8"; + version = "1.12.0"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; tag = "v${version}"; - hash = "sha256-0lsx+tLo/m7crkRLOtASwLpbjnpghFrsxuwNr2d+7y0="; + hash = "sha256-ciT5GOeL+09dnwdrRpFQBAhWVvpSBQQjJKJvNdVqjCw="; }; - vendorHash = "sha256-WO5OtKwluks5nuSHJ4NO1+EKhtCrJE9MuMGmu5fYKM4="; + vendorHash = "sha256-ZcsZv4MLcrVUNoK/NewfwDWUpMdgxO/f2DkyTjUqCK4="; ldflags = [ "-s" "-w" @@ -34,7 +34,7 @@ let ]; nativeBuildInputs = [ installShellFiles ]; - patches = [ ./provider-path-0_15.patch ]; + patches = [ ./provider-path-1_12.patch ]; passthru = { inherit plugins; diff --git a/pkgs/by-name/op/opentofu/provider-path-0_15.patch b/pkgs/by-name/op/opentofu/provider-path-0_15.patch deleted file mode 100644 index 318df9ab69a8..000000000000 --- a/pkgs/by-name/op/opentofu/provider-path-0_15.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go ---- terraform.old/internal/command/init.go -+++ terraform.new/internal/command/init.go -@@ -3,6 +3,7 @@ - import ( - "context" - "fmt" -+ "os" - "log" - "strings" - -@@ -55,6 +56,11 @@ - - var diags tfdiags.Diagnostics - -+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") -+ if ok { -+ flagPluginPath = append(flagPluginPath, val) -+ } -+ - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath - } diff --git a/pkgs/by-name/op/opentofu/provider-path-1_12.patch b/pkgs/by-name/op/opentofu/provider-path-1_12.patch new file mode 100644 index 000000000000..fa1a86463578 --- /dev/null +++ b/pkgs/by-name/op/opentofu/provider-path-1_12.patch @@ -0,0 +1,24 @@ +diff --git a/internal/command/init.go b/internal/command/init.go +index cd44c899bd..bef2426475 100644 +--- a/internal/command/init.go ++++ b/internal/command/init.go +@@ -8,6 +8,7 @@ package command + import ( + "context" + "fmt" ++ "os" + "log" + "reflect" + "slices" +@@ -78,6 +79,11 @@ func (c *InitCommand) Run(rawArgs []string) int { + // continue to mutate the Meta object state for now. + c.Meta.input = args.ViewOptions.InputEnabled + ++ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") ++ if ok { ++ args.FlagPluginPath = append(args.FlagPluginPath, val) ++ } ++ + if len(args.FlagPluginPath) > 0 { + c.pluginPath = args.FlagPluginPath + } diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 67c683c7fe99..10458eae1768 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ouch"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ouch-org"; repo = "ouch"; rev = finalAttrs.version; - hash = "sha256-XT2CWYZiY5UskTmHKl9EVWBIJoOiR9rOCQUoN8U9o40="; + hash = "sha256-yQt+FeEUgC6JurFwOU1Yd++OYT75TmGO7/qchng/BUA="; }; - cargoHash = "sha256-ckqzptKk6aituDMTA5JGzMWoXiVuOoK3N29KNUJnmgw="; + cargoHash = "sha256-3/uO5WLcGXWryJSQ8UhJGecpAD2vQVE2c19vYAHtT/4="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix index b8765bd109c7..f558700c7a2e 100644 --- a/pkgs/by-name/pa/pangolin-cli/package.nix +++ b/pkgs/by-name/pa/pangolin-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "pangolin-cli"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "cli"; tag = finalAttrs.version; - hash = "sha256-LMLeJVYu2L1+FVOLNapEShj36zv8vCP9BVkU4Y/g0vc="; + hash = "sha256-y+B29E6wXUcMQsWLAcLYIpg0uuqjr+zfxf2WVt0oY9A="; }; ldflags = [ diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix index 777b48c3027b..34074b940159 100644 --- a/pkgs/by-name/pd/pdfarranger/package.nix +++ b/pkgs/by-name/pd/pdfarranger/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pdfarranger"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "pdfarranger"; repo = "pdfarranger"; tag = finalAttrs.version; - hash = "sha256-lZuzFGRk19opLJ2pnh8s/VwdzDLtGwTchFh0ZuLezU4="; + hash = "sha256-vucl04ltyAFUhwGlFfNnLEyvX2SACEt0WCG3t4QLuxc="; }; nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/by-name/pd/pdfhummus/package.nix similarity index 96% rename from pkgs/development/libraries/pdfhummus/default.nix rename to pkgs/by-name/pd/pdfhummus/package.nix index e32984e33602..8cf89b119ded 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/by-name/pd/pdfhummus/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qtbase, + libsForQt5, zlib, freetype, libjpeg, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix index bdbd08aab5c6..e7cbec3eb4c0 100644 --- a/pkgs/by-name/pl/pls/package.nix +++ b/pkgs/by-name/pl/pls/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pls"; - version = "0.0.1-beta.9"; + version = "0.0.1-beta.10"; src = fetchFromGitHub { owner = "pls-rs"; repo = "pls"; tag = "v${finalAttrs.version}"; - hash = "sha256-ofwdhGpqYlADDY2BLe0SkoHWqSeRNtQaXK61zWVFXzw="; + hash = "sha256-j0bYikR0DoHRcArNnHsuYxdYqT9YjsH1g+T3s16UmcI="; }; - cargoHash = "sha256-P+4jRuakDUPaICJPsNJ6nXfhm09K/GC/VA9bsTXIMvc="; + cargoHash = "sha256-eh0beK1UYf/Xe30wGxli6dfPKh875yTnOn7CCN2XTtI="; meta = { changelog = "https://github.com/pls-rs/pls/releases/tag/${finalAttrs.src.tag}"; diff --git a/pkgs/by-name/po/popt/package.nix b/pkgs/by-name/po/popt/package.nix index b7e84260c1b2..abe07f84237b 100644 --- a/pkgs/by-name/po/popt/package.nix +++ b/pkgs/by-name/po/popt/package.nix @@ -60,5 +60,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ qyliss ]; license = lib.licenses.mit; platforms = lib.platforms.unix; + identifiers.purlParts = { + type = "github"; + spec = "rpm-software-management/popt@popt-${finalAttrs.version}-release"; + }; }; }) diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/by-name/pr/proxmark3/package.nix similarity index 95% rename from pkgs/tools/security/proxmark3/default.nix rename to pkgs/by-name/pr/proxmark3/package.nix index 2c0ac5017148..868e5796ddeb 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/by-name/pr/proxmark3/package.nix @@ -15,8 +15,7 @@ udevCheckHook, nix-update-script, withGui ? true, - wrapQtAppsHook, - qtbase, + libsForQt5, withPython ? true, python3, withBlueshark ? false, @@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gcc-arm-embedded udevCheckHook ] - ++ lib.optional withGui wrapQtAppsHook; + ++ lib.optional withGui libsForQt5.wrapQtAppsHook; buildInputs = [ readline bzip2 @@ -68,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { whereami lua ] - ++ lib.optional withGui qtbase + ++ lib.optional withGui libsForQt5.qtbase ++ lib.optional withPython python3 ++ lib.optional withBlueshark bluez5; diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/by-name/qd/qdjango/package.nix similarity index 94% rename from pkgs/development/libraries/qdjango/default.nix rename to pkgs/by-name/qd/qdjango/package.nix index d0f1a66b440a..ad780ca0d750 100644 --- a/pkgs/development/libraries/qdjango/default.nix +++ b/pkgs/by-name/qd/qdjango/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, testers, doxygen, - qmake, - qtbase, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ doxygen - qmake + libsForQt5.qmake ]; dontWrapQtApps = true; @@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; preCheck = '' - export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + export QT_PLUGIN_PATH=${lib.getBin libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix} '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path. diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/by-name/qe/qelectrotech/package.nix similarity index 92% rename from pkgs/applications/misc/qelectrotech/default.nix rename to pkgs/by-name/qe/qelectrotech/package.nix index 7ce61dcf307f..7b05c2dec4c5 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/by-name/qe/qelectrotech/package.nix @@ -5,10 +5,7 @@ installShellFiles, pkg-config, cmake, - qtbase, - qtsvg, - wrapQtAppsHook, - qttools, + libsForQt5, pugixml, }: let @@ -53,13 +50,13 @@ stdenv.mkDerivation rec { installShellFiles pkg-config cmake - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg pugixml ]; @@ -88,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "https://qelectrotech.org/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ yvesf ]; - platforms = qtbase.meta.platforms; + platforms = libsForQt5.qtbase.meta.platforms; broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/qelectrotech/system-pugixml.patch b/pkgs/by-name/qe/qelectrotech/system-pugixml.patch similarity index 100% rename from pkgs/applications/misc/qelectrotech/system-pugixml.patch rename to pkgs/by-name/qe/qelectrotech/system-pugixml.patch diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/by-name/ql/qlcplus/package.nix similarity index 89% rename from pkgs/applications/misc/qlcplus/default.nix rename to pkgs/by-name/ql/qlcplus/package.nix index 6bb2506b6ea4..2c3d79f1716f 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/by-name/ql/qlcplus/package.nix @@ -2,15 +2,10 @@ lib, stdenv, fetchFromGitHub, - qmake, pkg-config, udevCheckHook, - wrapQtAppsHook, udev, - qtmultimedia, - qtscript, - qtserialport, - qtwebsockets, + libsForQt5, alsa-lib, ola, libftdi1, @@ -31,17 +26,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config udevCheckHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ udev - qtmultimedia - qtscript - qtserialport - qtwebsockets + libsForQt5.qtmultimedia + libsForQt5.qtscript + libsForQt5.qtserialport + libsForQt5.qtwebsockets alsa-lib ola libftdi1 diff --git a/pkgs/development/libraries/qmarkdowntextedit/default.nix b/pkgs/by-name/qm/qmarkdowntextedit/package.nix similarity index 93% rename from pkgs/development/libraries/qmarkdowntextedit/default.nix rename to pkgs/by-name/qm/qmarkdowntextedit/package.nix index ad75505c3642..56df28267e51 100644 --- a/pkgs/development/libraries/qmarkdowntextedit/default.nix +++ b/pkgs/by-name/qm/qmarkdowntextedit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, + libsForQt5, }: stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ libsForQt5.qmake ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/by-name/qm/qmediathekview/package.nix similarity index 91% rename from pkgs/applications/video/qmediathekview/default.nix rename to pkgs/by-name/qm/qmediathekview/package.nix index 0abe2d514ca7..e83a58bf02d1 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/by-name/qm/qmediathekview/package.nix @@ -3,11 +3,9 @@ stdenv, fetchFromGitHub, boost, - qtbase, xz, - qmake, pkg-config, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -27,15 +25,15 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qtbase + libsForQt5.qtbase xz boost ]; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/by-name/ra/radeon-profile/package.nix similarity index 87% rename from pkgs/tools/misc/radeon-profile/default.nix rename to pkgs/by-name/ra/radeon-profile/package.nix index 5299fde25113..a7de444b968a 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/by-name/ra/radeon-profile/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtbase, - qtcharts, + libsForQt5, libxrandr, libdrm, }: @@ -16,12 +13,12 @@ stdenv.mkDerivation rec { version = "20200824"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtcharts + libsForQt5.qtbase + libsForQt5.qtcharts libxrandr libdrm ]; diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix index d6a723d56863..a0ef20843e8a 100644 --- a/pkgs/by-name/re/regclient/package.nix +++ b/pkgs/by-name/re/regclient/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildGoModule, fetchFromGitHub, @@ -16,15 +17,14 @@ let ]; in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "regclient"; version = "0.11.3"; - tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; - rev = tag; + tag = "v${finalAttrs.version}"; sha256 = "sha256-/gKvjyFOzyTsgMuqCqZaWl2yun7f+eboQ0iLuXHh4lI="; }; vendorHash = "sha256-P9ayAWvQY4WgmFTWzk2ZLQ5uwMvIsSfL73C99ROmze8="; @@ -34,30 +34,37 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/regclient/regclient/internal/version.vcsTag=${tag}" + "-X github.com/regclient/regclient/internal/version.vcsTag=${finalAttrs.src.tag}" ]; + env.CGO_ENABLED = 0; + nativeBuildInputs = [ installShellFiles lndir ]; - postInstall = lib.concatMapStringsSep "\n" (bin: '' - export bin=''$${bin} - export outputBin=bin + postInstall = lib.concatMapStringsSep "\n" ( + bin: + '' + export bin=''$${bin} + export outputBin=bin - mkdir -p $bin/bin - mv $out/bin/${bin} $bin/bin + mkdir -p $bin/bin + mv $out/bin/${bin} $bin/bin + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd ${bin} \ + --bash <($bin/bin/${bin} completion bash) \ + --fish <($bin/bin/${bin} completion fish) \ + --zsh <($bin/bin/${bin} completion zsh) + '' + + '' + lndir -silent $bin $out - installShellCompletion --cmd ${bin} \ - --bash <($bin/bin/${bin} completion bash) \ - --fish <($bin/bin/${bin} completion fish) \ - --zsh <($bin/bin/${bin} completion zsh) - - lndir -silent $bin $out - - unset bin outputBin - '') bins; + unset bin outputBin + '' + ) bins; checkFlags = [ # touches network @@ -69,7 +76,7 @@ buildGoModule rec { "${bin}Version" = testers.testVersion { package = regclient; command = "${bin} version"; - version = tag; + version = finalAttrs.src.tag; }; }) bins ); @@ -80,6 +87,6 @@ buildGoModule rec { description = "Docker and OCI Registry Client in Go and tooling using those libraries"; homepage = "https://github.com/regclient/regclient"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ maxbrunet ]; + maintainers = [ lib.maintainers.maxbrunet ]; }; -} +}) diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix index bbefbb44107b..b72c1fcd0fa4 100644 --- a/pkgs/by-name/ro/routedns/package.nix +++ b/pkgs/by-name/ro/routedns/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "routedns"; - version = "0.1.170"; + version = "0.1.188"; src = fetchFromGitHub { owner = "folbricht"; repo = "routedns"; rev = "v${finalAttrs.version}"; - hash = "sha256-hCjsyBnCHewMopnLue70ibKfTt+xUmg0/Kk+eKU/+JQ="; + hash = "sha256-ZVlWN8UV/R0tZKp3w/2fAAiFKZXyiwh0RtyolNaf25k="; }; vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs="; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index e83195e4022a..bc45272d7f1e 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-05-23"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "9d3790f73cc0a0131fe38378157f5e464d2e08ee"; - hash = "sha256-G3Lnmjzeqfwe6rmo+2PQ2NKYeKcTu/L+RTqft7UdCrg="; + rev = "b5bcb8a5677b0491248e1f8dc732552d0198b8d0"; + hash = "sha256-IgjzdXCyetDOU74Oy2f+aGhaEbGqX3oI78Kp2CUi0YM="; }; patches = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-IRqBTLdl2XC+dql7CqOfYxy+ej1UXItY932L3tWHd/s="; + hash = "sha256-KB9NAK0lqnMZ504hbKoj1Mpm0swDvrBSW4ggAORqKOo="; pnpm = pnpm_10; }; diff --git a/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/pkgs/by-name/rt/rtl_fm_streamer/package.nix index 777e927c92e5..0154b55258df 100644 --- a/pkgs/by-name/rt/rtl_fm_streamer/package.nix +++ b/pkgs/by-name/rt/rtl_fm_streamer/package.nix @@ -6,34 +6,20 @@ pkg-config, libusb1, libev, + rtl-sdr, }: stdenv.mkDerivation (finalAttrs: { pname = "rtl_fm_streamer"; - version = "unstable-2021-06-08"; + version = "0-unstable-2026-05-23"; src = fetchFromGitHub { owner = "AlbrechtL"; repo = "rtl_fm_streamer"; - rev = "ceb2bf06883f986ed01aa57c84989ba35b6b9a27"; - hash = "sha256-9M7GS6AC7HEJge04vl7V6ZdtwWvbMu/Rhaf9fwQa9WA="; + rev = "7d98bcee154be86b772ab9440bc65361ac2cad67"; + hash = "sha256-IlZcxu9JMaiqY+Vu6Bv14JxpQeJqytugW4mAvS0qIKY="; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" - - substituteInPlace rtl-sdr.rules \ - --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' - - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" - ''; - - patches = [ - ./use-stdbool.patch - ]; - nativeBuildInputs = [ cmake pkg-config @@ -42,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libusb1 libev + rtl-sdr ]; cmakeFlags = [ @@ -55,6 +42,5 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AlbrechtL/rtl_fm_streamer"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix index 9dc31eb0a0e7..28a414961233 100644 --- a/pkgs/by-name/sc/scdl/package.nix +++ b/pkgs/by-name/sc/scdl/package.nix @@ -7,23 +7,25 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "scdl"; - version = "3.0.4"; + version = "3.0.5"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-r7cvsoKTWE0W/pbjmbaGqra9+qb1MDxf2B5C/rdrCdU="; + hash = "sha256-IwbH1YUeJuAf2rtKWfluyksRRkUab0UMuOWAP8L8rzE="; }; build-system = [ python3Packages.setuptools ]; - dependencies = with python3Packages; [ - curl-cffi - docopt-ng - mutagen - soundcloud-v2 - yt-dlp - ]; + dependencies = + with python3Packages; + [ + docopt-ng + mutagen + soundcloud-v2 + yt-dlp + ] + ++ yt-dlp.optional-dependencies.curl-cffi; # Ensure ffmpeg is available in $PATH: makeWrapperArgs = diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix index 6d0422180938..d262c5dd0f0c 100644 --- a/pkgs/by-name/sf/sftool/package.nix +++ b/pkgs/by-name/sf/sftool/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool"; tag = finalAttrs.version; - hash = "sha256-pWECmFzxOLhmiascyK1yS/uzZ3O/MVze/cRNgE01ptY="; + hash = "sha256-W7ndWXwhXuY5w299njDONgmkRWmvHxX0hBYW/+yVp38="; }; - cargoHash = "sha256-mvL102oT4WxpEEplxSu6uxp+odLHFB3n6mBcztXXmRA="; + cargoHash = "sha256-STOL4spLNxdXv3jUov9qMg9ToYzK7aQpT31xy/aec2k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index bcae436f8128..81a18d7573aa 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 = "20260511"; + version = "20260523-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-InI7A1/p6zSFntgWYYQBB1HMwPVorYgOVesnABy6HCY="; + hash = "sha256-8x5b+jDxEExoi5FvzXbE9KOfsTKEjXVMv4yYPU4aPbA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index 44942f163cab..3cb507297c47 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://simdjson.org/"; + changelog = "https://github.com/simdjson/simdjson/releases/tag/${finalAttrs.src.tag}"; description = "Parsing gigabytes of JSON per second"; license = lib.licenses.asl20; platforms = lib.platforms.all; diff --git a/pkgs/by-name/si/simplescreenrecorder/package.nix b/pkgs/by-name/si/simplescreenrecorder/package.nix index e04c684a35b2..be8539bffd13 100644 --- a/pkgs/by-name/si/simplescreenrecorder/package.nix +++ b/pkgs/by-name/si/simplescreenrecorder/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation { pname = "simplescreenrecorder"; - version = "0.4.4-unstable-2025-12-28"; + version = "0.4.4-unstable-2026-05-23"; src = fetchFromGitHub { owner = "MaartenBaert"; repo = "ssr"; - rev = "d790385b49de937976165d6feb39414c75ad6a3d"; - hash = "sha256-QfFK43iwtwZvTRbxNXiphcsxhn/ofllGX993XppiRBw="; + rev = "ad99c7e855794888101aea2f119cdab1d4aa3073"; + hash = "sha256-Slfte4K1VEUWIWFp7D49SRNEMZY+VVHTWzf966MUR4E="; }; cmakeFlags = [ diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix index b7f059a9276b..c74cae4fb072 100644 --- a/pkgs/by-name/si/sipexer/package.nix +++ b/pkgs/by-name/si/sipexer/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "sipexer"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "miconda"; repo = "sipexer"; rev = "v${finalAttrs.version}"; - hash = "sha256-7L29nyFOc/5XAHpzGsFSngxMTwwIDkmwhIKIjHYGszc="; + hash = "sha256-I3Z0CK2XtKf+BXiHmLfVusCHVNN45Ej0hHOf/Csz+3w="; }; vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU="; diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index 5ceb3439cd7d..5d6ebf6c067b 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "skaffold"; - version = "2.19.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ltndb5IekV6NQ6PRmMf0/uPRN0x4LsbFYdzdebrMPf0="; + hash = "sha256-ny1iWispfR9V4SBhTTn8e8lShi2X+HLjVT6RcqigCR8="; }; vendorHash = null; diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix index 45ccc6018adc..7b6ba67ff957 100644 --- a/pkgs/by-name/sm/smug/package.nix +++ b/pkgs/by-name/sm/smug/package.nix @@ -7,7 +7,7 @@ buildGoModule (finalAttrs: { pname = "smug"; - version = "0.3.17"; + version = "0.3.18"; subPackages = [ "." ]; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "ivaaaan"; repo = "smug"; tag = "v${finalAttrs.version}"; - hash = "sha256-wp7JkppWsGMN9/5QcoisXlqMhG/5N1EFvP6OMeRmPEE="; + hash = "sha256-+A+FKHmJcStoumw/aDeSHG8nZ8hJbiizViC1MpbzT7g="; }; - vendorHash = "sha256-N6btfKjhJ0MkXAL4enyNfnJk8vUeUDCRus5Fb7hNtug="; + vendorHash = "sha256-0PWAY2CeBtaRqkN93ZWeVSynaMW8E9zJwUxI5CzC1mE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sp/speakeasy-cli/package.nix b/pkgs/by-name/sp/speakeasy-cli/package.nix index 2cb42d7d631a..e44197fb0f99 100644 --- a/pkgs/by-name/sp/speakeasy-cli/package.nix +++ b/pkgs/by-name/sp/speakeasy-cli/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "speakeasy-cli"; - version = "1.636.3"; + version = "1.761.9"; sourceRoot = "."; src = @@ -33,19 +33,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "x86_64-darwin" = fetchurl { url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip"; - hash = "sha256-Q1m4g5XBNAaxJZyYz6cD/7asTUGZMa493XVVJ9s0byE="; + hash = "sha256-rTnaKHCJt4bQepg6e110AZavsU4AGD/3WPR0/M14gBo="; }; "x86_64-linux" = fetchurl { url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip"; - hash = "sha256-H1c+b4/fBWudc3tAHTNdWwa9aoe8HpffRaLRU7OOWs4="; + hash = "sha256-fmoLK8hAgIS0vSBQkIiJagBtfEwvf6FElhvW5xjnje4="; }; "aarch64-darwin" = fetchurl { url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_arm64.zip"; - hash = "sha256-xO9S9gjiMel2ZB8Dq2nN5O+zIB/4qf5Z2xeXS0wiprc="; + hash = "sha256-f9/Pse4B8DB86ZHHPdS21yUzVtecFFS+RhOPLf/8MLg="; }; "aarch64-linux" = fetchurl { url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_arm64.zip"; - hash = "sha256-zH/HyA6MrrCh9j53hoqfVSiRqIoL6IOCV/nsAwRlgjg="; + hash = "sha256-Su0ZiKwEFugniMNJshb5C156BnuHxhcArLI8FzixIEI="; }; }; updateScript = writeShellScript "update-speakeasy" '' @@ -57,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { common-updater-scripts ] }" - - NEW_VERSION=$(curl --silent https://api.github.com/repos/speakeasy-api/speakeasy/releases/latest | jq '.tag_name' | ltrimstr("v") --raw-output) - if [[ ${finalAttrs.version} = "$NEW_VERSION"]]; then + NEW_VERSION=$(curl --silent https://api.github.com/repos/speakeasy-api/speakeasy/releases/latest | jq --raw-output '.tag_name | ltrimstr("v")') + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then echo "The new version is the same as old" exit 0 fi - for platfrom in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + for platform in ${lib.escapeShellArgs (builtins.attrNames finalAttrs.passthru.sources)}; do update-source-version "speakeasy-cli" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done ''; }; diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix index 08fa8d0ca4cc..7c7fbf9c1e9c 100644 --- a/pkgs/by-name/ss/ssh-vault/package.nix +++ b/pkgs/by-name/ss/ssh-vault/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ssh-vault"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "ssh-vault"; repo = "ssh-vault"; tag = finalAttrs.version; - hash = "sha256-kJscLetdP4D6DzzERfohezdsJqGcm/dmYTC+ZxjvRvo="; + hash = "sha256-2EriGn507ojvZVQrwza/hkad4YgxuB5HcmskS0cCnv4="; }; - cargoHash = "sha256-XFKqEwWDg8FUeObhI6oOIXNh8c7gsWgSWy3YThExuU4="; + cargoHash = "sha256-n37iK0ZftL1KBYnHzrM7LU3ApYw672vs6MZjKI0J1lg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ss/sshified/package.nix b/pkgs/by-name/ss/sshified/package.nix index e7877129bbce..69913964c1df 100644 --- a/pkgs/by-name/ss/sshified/package.nix +++ b/pkgs/by-name/ss/sshified/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "sshified"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "hoffie"; repo = "sshified"; tag = "v${finalAttrs.version}"; - hash = "sha256-+YaqHkcsP6+J39w4WP5iA0LowmGwDHBoDNzT8fhv+Xg="; + hash = "sha256-XOVoITfP02m9fVimu+IHs14pbJA3+xJcSHeGV+9fSNw="; }; vendorHash = null; diff --git a/pkgs/development/libraries/structuresynth/default.nix b/pkgs/by-name/st/structuresynth/package.nix similarity index 95% rename from pkgs/development/libraries/structuresynth/default.nix rename to pkgs/by-name/st/structuresynth/package.nix index 23b44fb28d19..226fd556b304 100644 --- a/pkgs/development/libraries/structuresynth/default.nix +++ b/pkgs/by-name/st/structuresynth/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, libGL, libGLU, }: @@ -44,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL libGLU - qtbase + libsForQt5.qtbase ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; meta = { diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/by-name/su/subsurface/package.nix similarity index 91% rename from pkgs/applications/misc/subsurface/default.nix rename to pkgs/by-name/su/subsurface/package.nix index 7922e5fd0eb6..fbc41a4b5e54 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/by-name/su/subsurface/package.nix @@ -5,9 +5,7 @@ autoreconfHook, writeShellScriptBin, cmake, - wrapQtAppsHook, pkg-config, - qmake, curl, grantlee, hidapi, @@ -18,12 +16,7 @@ libxslt, libzip, zlib, - qtbase, - qtconnectivity, - qtlocation, - qtsvg, - qttools, - qtpositioning, + libsForQt5, libxcomposite, bluez, writeScript, @@ -84,17 +77,17 @@ let hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ libsForQt5.qmake ]; buildInputs = [ - qtbase - qtlocation + libsForQt5.qtbase + libsForQt5.qtlocation libxcomposite ]; dontWrapQtApps = true; - pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; + pluginsSubdir = "lib/qt-${libsForQt5.qtbase.qtCompatVersion}/plugins"; installPhase = '' mkdir -p $out $(dirname ${pluginsSubdir}/geoservices) @@ -138,16 +131,16 @@ stdenv.mkDerivation { libxml2 libxslt libzip - qtbase - qtconnectivity - qtsvg - qttools - qtpositioning + libsForQt5.qtbase + libsForQt5.qtconnectivity + libsForQt5.qtsvg + libsForQt5.qttools + libsForQt5.qtpositioning ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook pkg-config ]; diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix index 1776735f3e91..95eec57bb9ed 100644 --- a/pkgs/by-name/su/supercronic/package.nix +++ b/pkgs/by-name/su/supercronic/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "supercronic"; - version = "0.2.45"; + version = "0.2.46"; src = fetchFromGitHub { owner = "aptible"; repo = "supercronic"; rev = "v${finalAttrs.version}"; - hash = "sha256-QOWNC9RZb5FmCChcs8DvgbrW8F66IG9nteR997n0B7k="; + hash = "sha256-gjfQQcp7hKjkK7hQ922jgxizqu1l5aPbgna6ciovaiA="; }; - vendorHash = "sha256-x/OSHI5HIG8Bo0FV+TzJ1o7d6+1gXida23dSxi5QiQQ="; + vendorHash = "sha256-n22rFA4M4QBpZGTF9FVuqCEWTBZvof8Df1ZmTilbWjI="; excludedPackages = [ "cronexpr/cronexpr" ]; diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index feca251c6f39..f81a4bcf12d0 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.26.0"; + version = "1.27.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-Hd3apIXVYEj42LM+Q9HWL06bZijux/wayfdppkFZapQ="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-quUO6HDBKMefpugUlRSmQe2yA4ACNWsPo/NPyHSCCHQ="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-pI1xwcifWoMDSwEDphGD4S2UbgFH43BmLpusIWlNMwA="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-niPKBLEq/YCPDsoTT00ZHaL7O+a3T+1hQ4VH1tPzyJk="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-X6m0pqsfZIHSQQCA5sUeG9LrPkoC2s3nPMmYtTj4mwY="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-g6mA7qhBBKLDfyF3XX1pO5Abr2nnnKR2VHyUjhdS3k0="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-ahFiiIucXJBoxqLlcjLbFI9olekNJYSJMjcfBWvaGrQ="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-2wkM3C7DCTpYwR0A5eFiUNZHTYq7WHZxRPFb7jSHwyU="; }; } diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index 1d836a91f6f1..d5473cab7c94 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "tdl"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-xDCvZ6a7xW5kJ+3nsCQGASypzrosjihI0hlSobBWwj0="; + hash = "sha256-uVg4SXq+E+pzKFzCt7nn99sTCLj7CXaWnjIidKPA2Kk="; }; - vendorHash = "sha256-dMuDmW3WtXU1Awuw7KKSCk1o/GKpBfsrqfvb3wVNGWw="; + vendorHash = "sha256-tg6GQ3SVDJnKUCrOuI+iJ/cJeiNNki9+ZF21r0t5rQA="; postPatch = '' rm go.work go.work.sum diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 71875dfa3214..02fdbf1f698c 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "terramate"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${finalAttrs.version}"; - hash = "sha256-Se1A43fDx4/RK70xNvUUZaAdFVWAijo+VLyHqMYgmfw="; + hash = "sha256-jdhOuaSFcq3bw9cX+IJN233x4o76shMfZQDmyUiTWO4="; }; - vendorHash = "sha256-U9ASe8P+c6UDHGpazV7LJXcAAkABqXN1AO0WqxlhEGo="; + vendorHash = "sha256-tjAsA8rxFE4zINc0Dpm2/5PpJ6BGYJiz059dBKCKsck="; # required for version info nativeBuildInputs = [ git ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/by-name/ti/tiled/package.nix similarity index 87% rename from pkgs/applications/editors/tiled/default.nix rename to pkgs/by-name/ti/tiled/package.nix index 2e87b827843d..51178cec800d 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/by-name/ti/tiled/package.nix @@ -1,28 +1,22 @@ { lib, stdenv, - env, fetchFromGitHub, pkg-config, qbs, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qttools, - qtwayland, - qtsvg, + libsForQt5, zlib, zstd, libGL, }: let - qtEnv = env "tiled-qt-env" [ - qtbase - qtdeclarative - qtsvg - qttools - qtwayland + qtEnv = libsForQt5.env "tiled-qt-env" [ + libsForQt5.qtbase + libsForQt5.qtdeclarative + libsForQt5.qtsvg + libsForQt5.qttools + libsForQt5.qtwayland ]; in @@ -40,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config qbs - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ qtEnv diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index 94c5c5bb9981..9bee88c7bfb2 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -10,7 +10,7 @@ let pname = "trezor-suite"; - version = "26.4.2"; + version = "26.5.1"; suffix = { @@ -24,8 +24,8 @@ let hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mE+mzMKAD0NrP2QI5Zc9yEH9vjC6e2cQjzK/CW5Q5FXUg6bGC+uy5fJhxM7Q00YPcNwnoD/vP/qltIa+Y5F8wg=="; - x86_64-linux = "sha512-DBitrg6RwUUaj3tFv2wVJ2ssuU/QedYILCGkCZQmTHVT1Y/kVs/SCXEm/fX2Ni/aPbMmB6JecslbxGgU5Tftjg=="; + aarch64-linux = "sha512-3IPLiRyjNPN7Mw/De5SI1ez9xheNVBFuWn98bKg3rDdkLg7Bl94TgznzNBkU3wP8WtOdw3qLfOdv7ioIBu1Aqg=="; + x86_64-linux = "sha512-TG7vRqz34LzxdzvD4e4N14DnwyuCi1eQsQrPMLkk5d60ThHXh/JN8PT53JMFIjVcp/0pTjLmshEsuQzZRhPJGg=="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix index f2dc554703e3..aae19eff9656 100644 --- a/pkgs/by-name/tr/trilium-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-desktop/package.nix @@ -5,7 +5,7 @@ fetchurl, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_40, + electron_41, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -15,7 +15,7 @@ let pname = "trilium-desktop"; - version = "0.102.2"; + version = "0.103.0"; triliumSource = os: arch: hash: { url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.hash = "sha256-OVkF/iDpbtcyv8ZXVtp9QYeKrA3rolQSWBUIBaJn74Q="; - aarch64-linux.hash = "sha256-85HlQsd/YjuVCYSO6wP9u8dNul87weq2IYDYR7N0gls="; - x86_64-darwin.hash = "sha256-S28eV7NUunWsE6kpKN2h7KKRCSFaMgIr7Ofj5pjJRhI="; - aarch64-darwin.hash = "sha256-GghYjS7Env8IQcNS8ZwIX4bmc6iZgGeL1W4IvCGMiBw="; + x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No="; + aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4="; + x86_64-darwin.hash = "sha256-H6eJPJdj1rZt1pXRKBUVOJuIhmDHY5SexKkZ8ITARGQ="; + aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY="; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.hash; @@ -111,7 +111,7 @@ let asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_40} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_41} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix index 88cd03372c20..f769724efc76 100644 --- a/pkgs/by-name/tr/trilium-server/package.nix +++ b/pkgs/by-name/tr/trilium-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.102.2"; + version = "0.103.0"; serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.hash = "sha256-2/Skk4I8CwttF5SEs8gPW6KyNxcrYcTuQBQ7irNL1lw="; + serverSource_x64.hash = "sha256-+PmlEevacif9xP8y7KrMMCwMQ0jGmT9yVhMrQ1SYG58="; serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.hash = "sha256-MQlYci2Z45qSYGxgSTWN3P017GImUqkv24DBn8usDm8="; + serverSource_arm64.hash = "sha256-RjnHCvVIR/ExZ9lC8ukGr2M8X1Hnj5ZeVMmQHUvZTKY="; serverSource = if stdenv.hostPlatform.isx86_64 then diff --git a/pkgs/by-name/ts/tsidp/package.nix b/pkgs/by-name/ts/tsidp/package.nix index 438df791b4e1..75e9035767e3 100644 --- a/pkgs/by-name/ts/tsidp/package.nix +++ b/pkgs/by-name/ts/tsidp/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "tsidp"; - version = "0.0.12"; + version = "0.0.14"; src = fetchFromGitHub { owner = "tailscale"; repo = "tsidp"; tag = "v${finalAttrs.version}"; - hash = "sha256-J85JXK7votjNzXh9qiu9YtafVh6s6SRjxO5y7jrh/tE="; + hash = "sha256-AZ0fAQag+pY5uYq2loQClkk0BqvC7e5C+KcI6J9g8Pw="; }; - vendorHash = "sha256-CFiGRKlSCoPUpH63NiYBGvTUZI/Dxqkh7OsiExsNcEk="; + vendorHash = "sha256-sycTIr6cRY2BLve23vvpk7mhiV/jrP26SoLHxY7tznw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix index d50553908846..04d20b10bb44 100644 --- a/pkgs/by-name/un/unixbench/package.nix +++ b/pkgs/by-name/un/unixbench/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "unixbench"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "kdlucas"; repo = "byte-unixbench"; tag = "v${finalAttrs.version}"; - hash = "sha256-GQYejkIf7g2abHafJJQTl0nWqRGsg9VDtYQgyBY/jOg="; + hash = "sha256-wzhyOMN2brH8mP2PQ85Ud0kSoXu8826TdQz7h9hUR7k="; }; patches = [ diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix index b51ee2fb17bc..28008fa5ad4b 100644 --- a/pkgs/by-name/us/usacloud/package.nix +++ b/pkgs/by-name/us/usacloud/package.nix @@ -3,21 +3,22 @@ buildGoModule, fetchFromGitHub, versionCheckHook, + writableTmpDirAsHomeHook, nix-update-script, }: buildGoModule (finalAttrs: { pname = "usacloud"; - version = "1.19.3"; + version = "1.22.1"; src = fetchFromGitHub { owner = "sacloud"; repo = "usacloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-uHZJnhj36NEAZxWfwrm0Dsw42NgQp37SgOduEGA8SEU="; + hash = "sha256-dlrhrmIKU360/54rvjPvkwpvtvq2LtdjqV15dkFLmFI="; }; - vendorHash = "sha256-bJV/m3b6UC3j1/SGJ7riz0GRxoCQ6lVU5DiatQWnIVc="; + vendorHash = "sha256-BLJ+9PEZPfNMP3IuG9ihFkSxG9Lt/Pp5eXPYkDlcbug="; ldflags = [ "-s" @@ -26,7 +27,11 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/by-name/vi/vite/package.nix similarity index 91% rename from pkgs/applications/science/misc/vite/default.nix rename to pkgs/by-name/vi/vite/package.nix index 1bdabe3875d6..845c479a5b34 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/by-name/vi/vite/package.nix @@ -4,14 +4,11 @@ fetchpatch, lib, cmake, - qtbase, - qttools, - qtcharts, libGLU, libGL, glm, glew, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtcharts + libsForQt5.qtbase + libsForQt5.qtcharts libGLU libGL glm diff --git a/pkgs/by-name/vs/vsh/package.nix b/pkgs/by-name/vs/vsh/package.nix index d5a3e0aebe40..8aae0d5a16cf 100644 --- a/pkgs/by-name/vs/vsh/package.nix +++ b/pkgs/by-name/vs/vsh/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "vsh"; - version = "0.14.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-rYltOLDmrRc3KsxR5MmpZqf+loAs1KEdPndpnhqkBDM="; + sha256 = "sha256-5mQ2FlNUyvp0acdYicuVgdjkEeLxaINtZAoCwf2njzA="; }; # vendor directory is part of repository diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix index 1da30d4848df..420cc327339b 100644 --- a/pkgs/by-name/wg/wgcf/package.nix +++ b/pkgs/by-name/wg/wgcf/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "wgcf"; - version = "2.2.30"; + version = "2.2.31"; src = fetchFromGitHub { owner = "ViRb3"; repo = "wgcf"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZiVSbsudGnwV7IkhUltzeC4EjTxWIaxvmxBiMcMYAfQ="; + hash = "sha256-G/qyCc43tjcWtR/GD0DtTq3TZY4MmitQhTQbpruhCKw="; }; subPackages = "."; - vendorHash = "sha256-nEUupbb918KQrJaeSHWB/jxRtM/pD6Fjzib4y/GtnVc="; + vendorHash = "sha256-0KuMWUHxfnfj60PR02JQ9Ajk4czC9ggUVEspOxH8JQk="; meta = { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/by-name/wo/wolfram-engine/l10ns.nix similarity index 100% rename from pkgs/applications/science/math/wolfram-engine/l10ns.nix rename to pkgs/by-name/wo/wolfram-engine/l10ns.nix diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/by-name/wo/wolfram-engine/package.nix similarity index 98% rename from pkgs/applications/science/math/wolfram-engine/default.nix rename to pkgs/by-name/wo/wolfram-engine/package.nix index e8a83f45b3d7..0dcd79b98ea8 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/by-name/wo/wolfram-engine/package.nix @@ -34,7 +34,7 @@ lang ? "en", libGL, libGLU, - wrapQtAppsHook, + libsForQt5, }: let @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook installShellFiles - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/xc/xcaddy/package.nix b/pkgs/by-name/xc/xcaddy/package.nix index 9b0be4e6d9ef..c73018fc6f83 100644 --- a/pkgs/by-name/xc/xcaddy/package.nix +++ b/pkgs/by-name/xc/xcaddy/package.nix @@ -6,7 +6,7 @@ buildGoModule (finalAttrs: { pname = "xcaddy"; - version = "0.4.5"; + version = "0.4.6"; subPackages = [ "cmd/xcaddy" ]; @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { owner = "caddyserver"; repo = "xcaddy"; rev = "v${finalAttrs.version}"; - hash = "sha256-2cP0bkG16bRdLycLx7gpnQuALgO8hDowp/4cRBO4KuM="; + hash = "sha256-SXCOKrGaTwcdrVhPenQGjdBaDl8/bUGmm1B3spk8eUA="; }; patches = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${finalAttrs.version}" ]; - vendorHash = "sha256-2OZoSOUCkt94uG+54Dx/1di/RZxZ2UOsmTC6YDA5cKo="; + vendorHash = "sha256-K5+Gj4Lqla6q9vx95BtCS67mZMWkMjgIHVYpBUdx/Wc="; meta = { homepage = "https://github.com/caddyserver/xcaddy"; diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 34657eefa06b..14cd14a49b54 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -13,6 +13,9 @@ copyDesktopItems, }: +let + electron = electron_39; +in stdenv.mkDerivation (finalAttrs: { pname = "zulip"; version = "5.12.3"; @@ -43,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - npm_config_nodedir=${electron_39.headers} \ + npm_config_nodedir=${electron.headers} \ node --run pack -- \ - -c.electronDist=${electron_39}/libexec/electron \ - -c.electronVersion=${electron_39.version} + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} runHook postBuild ''; @@ -59,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png - makeBinaryWrapper '${lib.getExe electron_39}' "$out/bin/zulip" \ + makeBinaryWrapper '${lib.getExe electron}' "$out/bin/zulip" \ --add-flags "$out/share/lib/zulip/app.asar" \ --inherit-argv0 diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix index bc897e98f084..72d4fbd8722d 100644 --- a/pkgs/development/python-modules/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "auditwheel"; - version = "6.6.0"; + version = "6.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-J387MVrQsE3wor4tEmw/05kwvCZd8PlYnXjJcP8G9Ss="; + hash = "sha256-cKpP6OJNRH6ftHCC8KoN4ta96Kqpu/5RcCAyjOqA4PE="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 25850b7ed4b2..98a144f91a66 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -8,15 +8,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-netapp"; - version = "15.0.0"; + version = "16.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_netapp"; - inherit version; - hash = "sha256-0wp5YQK1BFvnmIHaXPMxs0XiXQ9akjWXGYOh2uUc84k="; + inherit (finalAttrs) version; + hash = "sha256-/tcO1+pIMcB2e+T1f2ClHxLjSzqv0PherTPMgI12/BY="; }; build-system = [ setuptools ]; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure NetApp Files Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${finalAttrs.version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 52213081e0f5..87c00c52e548 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -1,33 +1,35 @@ { lib, buildPythonPackage, - fetchPypi, - isPy3k, - progressbar231 ? null, - progressbar33, - mock, + fetchFromGitHub, + hatchling, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitmath"; - version = "1.3.3.1"; - format = "setuptools"; + version = "2.1.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8"; + src = fetchFromGitHub { + owner = "timlnx"; + repo = "bitmath"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9hiwIpDIAU+N+LhlJ9qlKBZQibbrwwhGM77fvEnABRI="; }; - nativeCheckInputs = [ - (if isPy3k then progressbar33 else progressbar231) - mock - ]; + build-system = [ hatchling ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "bitmath" ]; meta = { description = "Module for representing and manipulating file sizes with different prefix"; - mainProgram = "bitmath"; - homepage = "https://github.com/tbielawa/bitmath"; + homepage = "https://github.com/timlnx/bitmath"; + changelog = "https://github.com/timlnx/bitmath/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ twey ]; + mainProgram = "bitmath"; }; -} +}) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 3a6058c9c5e5..0501cb397a41 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -2,7 +2,6 @@ fetchPypi, buildPythonPackage, setuptools, - future, packbits, pillow, pyusb, @@ -14,24 +13,26 @@ buildPythonPackage rec { pname = "brother-ql"; - version = "0.11.2"; + version = "0.12.0"; pyproject = true; src = fetchPypi { pname = "brother_ql_next"; inherit version; - hash = "sha256-3rTf+4W5KK7zSGIE3bBHXHE0hjyvpjB0IiEtbax6mkU="; + hash = "sha256-NTw5hlMJRoABvbteyCYF0Kopc9AjNyuwLSB+zS3RYRQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools - future + ]; + + dependencies = [ + attrs + click + jsons packbits pillow pyusb - click - attrs - jsons ]; meta = { diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index b233d5ac8cf1..ba704941367e 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "12.4.1"; + version = "12.4.2"; pyproject = true; src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-WQf2GNj4vjoUmRPmEVua0DsXNYpnJDI/oVRz+C9m82k="; + hash = "sha256-4oyVZCKtQ3B3vy4cSJfV3GSylbM5sQcygAKzIv47aq8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix index d50282718c1f..dadf385564e6 100644 --- a/pkgs/development/python-modules/color-operations/default.nix +++ b/pkgs/development/python-modules/color-operations/default.nix @@ -16,16 +16,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "color-operations"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "vincentsarago"; repo = "color-operations"; - tag = version; - hash = "sha256-LUO9PxrXCkFqyguvX4GT6vmlALMyfkDqXeGZAQG76vw="; + tag = finalAttrs.version; + hash = "sha256-hDxbyhelsl/EvsesD4Rux5CQM86squ4gHevVK/UP8Y8="; }; build-system = [ @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Apply basic color-oriented image operations. Fork of rio-color"; homepage = "https://github.com/vincentsarago/color-operations"; - changelog = "https://github.com/vincentsarago/color-operations/releases/tag/${src.tag}"; + changelog = "https://github.com/vincentsarago/color-operations/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; teams = [ lib.teams.geospatial ]; }; -} +}) diff --git a/pkgs/development/python-modules/color-parser-py/default.nix b/pkgs/development/python-modules/color-parser-py/default.nix index 9f4ae2bc0b00..77862d5041ae 100644 --- a/pkgs/development/python-modules/color-parser-py/default.nix +++ b/pkgs/development/python-modules/color-parser-py/default.nix @@ -6,21 +6,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "color-parser-py"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; # PyPI has Cargo.lock src = fetchPypi { pname = "color_parser_py"; - inherit version; - hash = "sha256-m1qhVAwQNtCwz+DLSAdfKhzkohMLMjvPHxynKhlJfN8="; + inherit (finalAttrs) version; + hash = "sha256-C3Q9vaOa/SE0PtQu5Gw/sk1JMRIlhgbA5VTW+2aC5dU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-tKXA6sd5gLCJUaqxzFcZ3lePK41Wk2TbLp0HXBacOyo="; + inherit (finalAttrs) pname version src; + hash = "sha256-nyl0Nmf0DNLH3j2XrTTO1u3erBCbRyp/xO0w/USjDHE="; }; nativeBuildInputs = [ @@ -38,7 +38,8 @@ buildPythonPackage rec { meta = { description = "Python bindings for color parsing and conversion"; homepage = "https://github.com/rusiaaman/color-parser-py"; + changelog = "https://github.com/rusiaaman/color-parser-py/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aleksana ]; }; -} +}) diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix index 29fde5dac071..d770b390bec1 100644 --- a/pkgs/development/python-modules/cometx/default.nix +++ b/pkgs/development/python-modules/cometx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "cometx"; - version = "3.4.3"; + version = "3.6.6"; pyproject = true; build-system = [ setuptools ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "comet-ml"; repo = "cometx"; tag = version; - hash = "sha256-Wb4En/fTXeC5kvOIVAQzKxl8HXyOYvG4OGWhKhrAP6g="; + hash = "sha256-Ub7Ucn/Xgaedymqjgiouy685PPr3tULAvJNLeqAgf78="; }; dependencies = [ diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 2a076628e538..9e542285ca2e 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -28,14 +28,14 @@ buildPythonPackage (finalAttrs: { pname = "cyclopts"; - version = "4.16.0"; + version = "4.16.1"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${finalAttrs.version}"; - hash = "sha256-tDDYVqhjvTRQ0rTvib4ek49zEnEefkKoq1t/3C/PRlQ="; + hash = "sha256-uKeGQw/vWDOtRi+CGNHfMAf/ofZyEfRqp2fUUWaIEDs="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index e32a4a19981a..48deb090ecd4 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -1,32 +1,35 @@ { lib, - boto3, + stdenv, buildPythonPackage, celery, - django-storages, - django, fetchFromGitHub, flit-core, flit-scm, - gitMinimal, - mock, pytest-cov-stub, pytest-django, pytestCheckHook, redis, - sphinx, + psutil, + dnspython, + pytest-asyncio, + libredirect, + confluent-kafka, + aio-pika, + httpx, + feedparser, }: buildPythonPackage rec { pname = "django-health-check"; - version = "3.20.8"; + version = "4.4.1"; pyproject = true; src = fetchFromGitHub { - owner = "KristianOellegaard"; + owner = "codingjoe"; repo = "django-health-check"; tag = version; - hash = "sha256-voB3shugfM/nO0vPd9yA4NOUB+E9aVcFnqG1mtfRYFc="; + hash = "sha256-ijlkgE1ZxlBPUadTeZcwIKYocZo51ZidQyQqFHOnEv4="; }; build-system = [ @@ -34,36 +37,67 @@ buildPythonPackage rec { flit-scm ]; - buildInputs = [ - sphinx - django + dependencies = [ + dnspython ]; - nativeBuildInputs = [ gitMinimal ]; + optional-dependencies = { + psutil = [ psutil ]; + celery = [ celery ]; + kafka = [ confluent-kafka ]; + rabbitmq = [ aio-pika ]; + redis = [ redis ]; + rss = [ + httpx + feedparser + ]; + atlassian = [ httpx ]; + }; nativeCheckInputs = [ - boto3 - django-storages pytest-cov-stub pytest-django pytestCheckHook - mock - celery - redis + psutil + pytest-asyncio + libredirect.hook ]; disabledTests = [ - # commandline output mismatch - "test_command_with_non_existence_subset" + # require online DNS resolution + "test_run_check__dns_working" + "test_check_status__nonexistent_hostname" + "test_check_status__no_answer" + ] + ++ lib.optionals stdenv.isDarwin [ + # sensors_temperatures is not available on darwin: https://psutil.readthedocs.io/stable/index.html#psutil.sensors_temperatures + "TestTemperature" + # some metrics aren't available on darwin: https://psutil.readthedocs.io/stable/index.html#psutil.virtual_memory + "TestMemory" + # live_server not working on darwin + "TestHealthCheckCommand" ]; pythonImportsCheck = [ "health_check" ]; + preCheck = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/resolv.conf=$(realpath resolv.conf) + ''; + + preInstallCheck = '' + export PYTHONPATH=$PWD:$PYTHONPATH + export DJANGO_SETTINGS_MODULE=tests.testapp.settings + ''; + meta = { description = "Pluggable app that runs a full check on the deployment"; - homepage = "https://github.com/KristianOellegaard/django-health-check"; - changelog = "https://github.com/revsys/django-health-check/releases/tag/${src.tag}"; + homepage = "https://github.com/codingjoe/django-health-check"; + changelog = "https://github.com/codingjoe/django-health-check/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ onny ]; + maintainers = with lib.maintainers; [ + onny + dav-wolff + ]; }; } diff --git a/pkgs/development/python-modules/django-markdownx/default.nix b/pkgs/development/python-modules/django-markdownx/default.nix index 687a4e578b30..97f37c7a85c2 100644 --- a/pkgs/development/python-modules/django-markdownx/default.nix +++ b/pkgs/development/python-modules/django-markdownx/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-markdownx"; - version = "4.0.9"; + version = "4.0.11"; pyproject = true; src = fetchFromGitHub { owner = "neutronX"; repo = "django-markdownx"; tag = "v${version}"; - hash = "sha256-il9bXi8URq7mQMCyKl5ikHT4nH2R9ixMDHSpH8gfnVU="; + hash = "sha256-dTNWTXHj5Tk77/XdIgfFGLir0JhlhwcWAIKDax8qM9M="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index b2526d41c4ad..07eebf02ed58 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -3,21 +3,23 @@ buildPythonPackage, fetchFromGitHub, setuptools, + django, prometheus-client, + psycopg, pytest-django, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-prometheus"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "django-commons"; repo = "django-prometheus"; - tag = "v${version}"; - hash = "sha256-Bf1JSh9ibiPOa252IPld1FvHTPbCsB/amtlQdRQwoWY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ghY8eznPbkK7/jaeTAG3v5CD4ZZbFNNWSfjBNfuHBTo="; }; postPatch = '' @@ -34,20 +36,24 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ prometheus-client ]; + dependencies = [ + django + prometheus-client + ]; pythonImportsCheck = [ "django_prometheus" ]; nativeCheckInputs = [ - pytest-django + psycopg pytestCheckHook + pytest-django ]; meta = { - changelog = "https://github.com/django-commons/django-prometheus/releases/tag/v${version}"; + changelog = "https://github.com/django-commons/django-prometheus/releases/tag/${finalAttrs.src.tag}"; description = "Django middlewares to monitor your application with Prometheus.io"; homepage = "https://github.com/django-commons/django-prometheus"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/development/python-modules/ggml-python/default.nix b/pkgs/development/python-modules/ggml-python/default.nix index 9a2fc9a01658..95fb4eccad21 100644 --- a/pkgs/development/python-modules/ggml-python/default.nix +++ b/pkgs/development/python-modules/ggml-python/default.nix @@ -36,6 +36,7 @@ buildPythonPackage (finalAttrs: { pname = "ggml-python"; version = "0.0.37"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "abetlen"; diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index f2c6759cf63c..3f70f86a5eae 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "greynoise"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchFromGitHub { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; tag = "v${version}"; - hash = "sha256-CP+Fx3Gu6pQWnX/WjJ+qq7TK9onatVHp0ghu33WU7X4="; + hash = "sha256-ClNKDMfMKcOYOasUqmQoOtKFsAi5wZw/MLTkq5YzpJk="; }; patches = lib.optionals (!withRepl) [ diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 505f2800d634..4dc38d26b6dc 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hy"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "hylang"; repo = "hy"; tag = version; - hash = "sha256-uKkTH5vywJ5OrbbHIpHGLbTA/Px0/02JEXI8NIUvt/w="; + hash = "sha256-B8luwaIDUMdMZk/QZNKTM+ejCvJR8LoIcuQCCqsqu2k="; }; # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 10ad8a1f528b..4fdc59fa52e0 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yB1YmHF7grYJo84qc/i40yMLDHV+XA3p1rGs/cIk9VE="; + hash = "sha256-0g65/CoA6GSTphVrKg5OV58jN56P6hhqDmA/02oTAic="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix index 9d0f41163128..446ffc72c0bf 100644 --- a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mkdocs-include-markdown-plugin"; - version = "7.2.2"; + version = "7.3.0"; pyproject = true; src = fetchPypi { pname = "mkdocs_include_markdown_plugin"; inherit version; - hash = "sha256-8FLMt0Hsz0mBFrgmwdeKLXYcVnRzcllHCUQc7glj+8k="; + hash = "sha256-KAASZ0ZFLjHC4yG71DyBkLNW4N41PiDLwWo0o8PWeWw="; }; build-system = [ diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index 4ea724ca1c60..3a4ec1b457c7 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "msprime"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aKcgjq6jDKRzNlKHyDMHj2VK8eGGsk/AEF53F8k7uWc="; + hash = "sha256-hpGz7fdPl5ZBFieXDmps0Q7Fhcmr9K3ULZPimzhl/SI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 6b1c02676856..cd42a619f65f 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -17,6 +17,7 @@ pathvalidate, pip, ptpython, + psutil, pytimeparse2, pyyaml, requests, @@ -41,17 +42,29 @@ buildPythonPackage (finalAttrs: { pname = "osxphotos"; - version = "0.75.1"; + version = "0.75.9"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; tag = "v${finalAttrs.version}"; - hash = "sha256-aX+4wgjqWxoIez/pJ7ioes5OTHFijztSFTvTxdND6Eo="; + hash = "sha256-9oQ9yLNHACLgOegNRcuysGIo8cbYLhlkNa41Y+YHFTM="; }; + pythonRelaxDeps = [ + "bitmath" + "mako" + "more-itertools" + "objexplore" + "rich" + "textx" + "tenacity" + "whenever" + ]; + build-system = [ setuptools ]; + dependencies = [ beautifulsoup4 bitmath @@ -64,12 +77,13 @@ buildPythonPackage (finalAttrs: { packaging pathvalidate pip + psutil ptpython pytimeparse2 pyyaml requests - rich-theme-manager rich + rich-theme-manager shortuuid strpdatetime tenacity @@ -83,16 +97,8 @@ buildPythonPackage (finalAttrs: { xdg-base-dirs ]; - pythonRelaxDeps = [ - "mako" - "more-itertools" - "objexplore" - "rich" - "textx" - "tenacity" - ]; - pythonImportsCheck = [ "osxphotos" ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index 4d48cc1435c9..831ae47316b9 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "py-opensonic"; - version = "9.0.1"; + version = "9.1.0"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; tag = "v${version}"; - hash = "sha256-CkOAqeB9p6K3qFf7q/McyTpKte8w4sKo3fuBk6sx6ZE="; + hash = "sha256-xZHlI62QoKkR4sZf0GUEzUGMpG2urHooPs8GvVyqpIQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index 1cc7afb19d5f..a8f07d074aa9 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyfireservicerota"; - version = "0.0.48"; + version = "0.0.49"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-fireservicerota"; tag = version; - hash = "sha256-wHcIzhSofp8dwlPy35gOJwIM0wtWPqUx7/kg6NjfNhc="; + hash = "sha256-EVMxAOP6haS+jkLD6pOZnu0yhhNMR+gCud2qXsycNbc="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 1ba3142797bb..b813583c19ca 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,12 +12,12 @@ buildPythonPackage (finalAttrs: { pname = "pytapo"; - version = "3.4.13"; + version = "3.4.14"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-+PQ5x8ob59AhcCaqs/KKS3/7ywe0bkZUvun/sVGBtNA="; + hash = "sha256-x9XmlTlt/V+0pVFJlQBZmj5CX03LrRhI6cE5VV48GTI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix index 42d469b2cd89..11005215975b 100644 --- a/pkgs/development/python-modules/pytest-spec/default.nix +++ b/pkgs/development/python-modules/pytest-spec/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "pytest-spec"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "pchomik"; repo = "pytest-spec"; tag = finalAttrs.version; - hash = "sha256-2DXC02FSiGzsavdkoDFlxKdYaYpPAy3VbEG4YZSO5c8="; + hash = "sha256-9kJLIe2msS2DrpEerSOa9rh3XfBJQMfY7wwrtH3XQn0="; }; build-system = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 9d5634503d8a..db881906be3a 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.16.1"; + version = "0.16.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uTwyyF0IwGro9eMXf5z9bEleF0XyEgt3eDCt7l2cNkg="; + hash = "sha256-CUUavoeBM2/WhCIHzZXOXoYJ2Z8TvN6JhBJTgSXDUIg="; }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 86d56facfead..0588073bf039 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -18,16 +18,19 @@ pydantic, pytest-asyncio, pytest-httpserver, + pytest-xdist, pytestCheckHook, pythonOlder, requests, + stdenv, setuptools-scm, validators, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "weaviate-client"; - version = "4.20.5"; + version = "4.21.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +39,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-3CJLD/bew9qx2aDrIwcaMlgwCe8E4bj3ZDh5t0v8Pf8="; + hash = "sha256-nGYslKyIQWAwhu5Fa23jXtgBN9q4jjrmBhWv4EO3Vn8="; }; pythonRelaxDeps = [ @@ -69,13 +72,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-httpserver pytest-asyncio + pytest-httpserver + pytest-xdist pytestCheckHook + writableTmpDirAsHomeHook ]; preCheck = '' - export HOME=$(mktemp -d) sed -i '/raw.githubusercontent.com/,+1d' test/test_util.py substituteInPlace pytest.ini \ --replace-fail "--benchmark-skip" "" @@ -97,7 +101,10 @@ buildPythonPackage rec { enabledTestPaths = [ "test" - "mock_tests" + ]; + + disabledTestPaths = [ + "mock_tests" # mock gRPC/HTTP servers fail to bind ports ]; __darwinAllowLocalNetworking = true; @@ -110,9 +117,5 @@ buildPythonPackage rec { changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; - badPlatforms = [ - # weaviate.exceptions.WeaviateGRPCUnavailableError - lib.systems.inspect.patterns.isDarwin - ]; }; } diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index c3873ff9e938..a69600afbce7 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage (finalAttrs: { pname = "whisperx"; - version = "3.8.5"; + version = "3.8.6"; pyproject = true; src = fetchFromGitHub { owner = "m-bain"; repo = "whisperX"; tag = "v${finalAttrs.version}"; - hash = "sha256-dFjB0X7JUqv7r64QLbsQwJNRWti+xGUOWKkhOxJE1tg="; + hash = "sha256-VPP02LtyczOiWdKuDvgnGeekEk+p6DVvLQrCE0d0LfU="; }; # As `makeWrapperArgs` does not apply to the module, and whisperx depends on `ffmpeg`, diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index a759f10138f3..ba2a5dddcb84 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -72,6 +72,13 @@ lib.makeOverridable ( attrs.source.remotes or [ "https://rubygems.org" ] ); inherit (attrs.source) sha256; + meta = { + identifiers.purlParts = { + type = "gem"; + # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/gem-definition.md + spec = "${gemName}@${version}?platform=${platform}"; + }; + }; } else if type == "git" then fetchgit { diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 8c87c868de75..cfe95417ac31 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -460,8 +460,7 @@ optionalAttrs allowAliases aliases toml = { }: - json { } - // { + { type = types.toml; generate = diff --git a/pkgs/servers/home-assistant/custom-components/smarthq/package.nix b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix new file mode 100644 index 000000000000..301fa4e15907 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix @@ -0,0 +1,31 @@ +{ + lib, + aiohttp, + buildHomeAssistantComponent, + fetchFromGitHub, +}: + +buildHomeAssistantComponent (finalAttrs: { + owner = "geappliances"; + domain = "smarthq"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "geappliances"; + repo = "geappliances-smarthq-integration"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LTLlkl4Mh0nSZfNVyLEItVPnQkM1nnDkPjsM98otp3w="; + }; + + dependencies = [ + aiohttp + ]; + + meta = { + changelog = "https://github.com/geappliances/geappliances-smarthq-integration/releases/tag/${finalAttrs.src.tag}"; + description = "Home Assistant integration for GE Appliances SmartHQ connected devices"; + homepage = "https://github.com/geappliances/geappliances-smarthq-integration"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix index 12a1053d3dae..85f5dfeed814 100644 --- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "frser-sqlite-datasource"; - version = "4.0.2"; - zipHash = "sha256-soRmlYBhFhUoQmSGJC6mMP+UH7nqKzBTVItOk2WFggs="; + version = "4.0.6"; + zipHash = "sha256-5c4jVN0mupvqVrN/ntQFDMkXpGuFigoZHhyv2jgr8Yo="; meta = { description = "Use a SQLite database as a data source in Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix index 7bdafecf2e50..cc50b6028da4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-dynamictext-panel"; - version = "6.2.0"; - zipHash = "sha256-pxTmylBvI73csDM6rMoUjGN9EM5zR/PfH1ZE1XKW94c="; + version = "6.2.3"; + zipHash = "sha256-Z2R/kl6y4OaN8JRqPaKOuVLRZvPy2M43wVE+al4YquI="; meta = { description = "Dynamic, data-driven text panel for Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix index ec8b8bfea2c2..4beded4f79c8 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-echarts-panel"; - version = "7.2.4"; - zipHash = "sha256-ZqTGG3UlRqpSCITBFB5g7gIE9vxHS8VZ0Gchcfr9Dko="; + version = "7.2.5"; + zipHash = "sha256-5J9SDu+S85HRHHepT1UDtUBFHp51XamsXLNVOo5ds7U="; meta = { description = "Visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index 3a440ef98d61..d7b9064a2a5b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-form-panel"; - version = "6.3.3"; - zipHash = "sha256-nhHTNKqnSAGSpsAOB1IjcA4zm013ywJf/ucJzAm9osQ="; + version = "6.3.4"; + zipHash = "sha256-6VFhDmkShKxennSdprdxIWWp0D//MlE6EZr8bXj7naU="; meta = { description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix index 3db477e171ed..3cc607729bda 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-rss-datasource"; - version = "4.4.0"; - zipHash = "sha256-0/B5E1DSjVq9e+1FAFw0J3Kuc7oud6apP9b07icg1Hk="; + version = "4.4.1"; + zipHash = "sha256-SaSzrtAiB97IM2se1RLBkkpZeFjMmvS9o5Si2aGOv+c="; meta = { description = "Plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix index 3dc1aadadf96..da5e64159391 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-variable-panel"; - version = "5.1.3"; - zipHash = "sha256-oNTTvNelEKENDJ7xsjbtwGg2rsKZn9iy52l1zZWE26I="; + version = "5.2.0"; + zipHash = "sha256-MzxKOJhDc0qogIPCnhf5bG/GcSzT6RbwYxU81Qj/NO8="; meta = { description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 91e40c365127..62b2abdf5b2f 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -622,14 +622,37 @@ let cpe = makeCPE guessedParts; } ) possibleCPEPartsFuns; + + purlParts = attrs.meta.identifiers.purlParts or { }; + purlPartsFormatted = + if purlParts ? type && purlParts ? spec then "pkg:${purlParts.type}/${purlParts.spec}" else null; + + # search for a PURL in the following order: + purl = + # 1) locally set through API + if purlPartsFormatted != null then purlPartsFormatted else null; + + # search for a PURL in the following order: + purls = + # 1) locally overwritten through meta.identifiers.purls (e.g. extension of list) + attrs.meta.identifiers.purls or ( + # 2) locally set through API + if purlPartsFormatted != null then [ purlPartsFormatted ] else [ ] + ); + v1 = { - inherit cpeParts possibleCPEs; + inherit + cpeParts + possibleCPEs + purls + ; ${if cpe != null then "cpe" else null} = cpe; + ${if purl != null then "purl" else null} = purl; }; in v1 // { - inherit v1; + inherit v1 purlParts; }; # Expose the result of the checks for everyone to see. diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index 02ffa2bddb18..db5411b0d6cb 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ibus-rime"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "rime"; repo = "ibus-rime"; rev = version; - sha256 = "sha256-prxXFC5l7JKmrKJe2R5U7kKJmb2m06B+Tic+m6LGthM="; + sha256 = "sha256-7RyCJpgGMqq5s4ijTDA2aq2CtpnQ1HOwO9aPrizSaSo="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ece4f96a5030..530bd293d3d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2846,8 +2846,6 @@ with pkgs; } ); - mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; - nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { }); maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { }); @@ -2937,8 +2935,6 @@ with pkgs; nwdiag = with python3Packages; toPythonApplication nwdiag; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; - ola = callPackage ../applications/misc/ola { protobuf = protobuf_21; }; @@ -2949,8 +2945,6 @@ with pkgs; open-interpreter = with python3Packages; toPythonApplication open-interpreter; - openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; - openmvs = callPackage ../applications/science/misc/openmvs { inherit (llvmPackages) openmp; }; @@ -3123,8 +3117,6 @@ with pkgs; po4a = perlPackages.Po4a; - proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { }; - pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; pyinfra = with python3Packages; toPythonApplication pyinfra; @@ -3147,14 +3139,8 @@ with pkgs; mpi = openmpi; # this attribute should used to build MPI applications - qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - - qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; - quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; - radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; - rainbowstream = with python3.pkgs; toPythonApplication rainbowstream; rapidgzip = with python3Packages; toPythonApplication rapidgzip; @@ -3263,8 +3249,6 @@ with pkgs; strip-nondeterminism = perlPackages.strip-nondeterminism; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; - sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { }; @@ -3311,8 +3295,6 @@ with pkgs; extraFonts = true; }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; - tinc = callPackage ../tools/networking/tinc { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; @@ -6624,8 +6606,6 @@ with pkgs; libmicrohttpd = libmicrohttpd_1_0; - libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; - libpeas = callPackage ../development/libraries/libpeas { }; libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { }; @@ -7001,8 +6981,6 @@ with pkgs; pcre2 = callPackage ../development/libraries/pcre2 { }; - pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { }; - inherit (callPackage ../development/libraries/physfs { }) @@ -7074,8 +7052,6 @@ with pkgs; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - qdjango = libsForQt5.callPackage ../development/libraries/qdjango { }; - quartoMinimal = quarto.override { rWrapper = null; python3 = null; @@ -7299,8 +7275,6 @@ with pkgs; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { }; - structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { }; - szurubooru = callPackage ../servers/web-apps/szurubooru { }; tclap = tclap_1_2; @@ -7975,8 +7949,6 @@ with pkgs; ]; }; - mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; - moodle = callPackage ../servers/web-apps/moodle { }; moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { }; @@ -8935,8 +8907,6 @@ with pkgs; activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { }; - masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; - inherit ({ pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; @@ -9371,12 +9341,8 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; - minari = python3Packages.toPythonApplication python3Packages.minari; - molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; @@ -9674,8 +9640,6 @@ with pkgs; lua = lua5; }; - moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; - mopidyPackages = recurseIntoAttrs ( callPackages ../applications/audio/mopidy { python = python3; @@ -9901,8 +9865,6 @@ with pkgs; qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; }; - qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { }; - qemu-python-utils = python3Packages.toPythonApplication ( python3Packages.qemu.override { fuseSupport = true; @@ -9921,8 +9883,6 @@ with pkgs; wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; - qmplay2-qt5 = qmplay2.override { qtVersion = "5"; }; qmplay2-qt6 = qmplay2.override { qtVersion = "6"; }; @@ -11133,8 +11093,6 @@ with pkgs; trilinos-mpi = trilinos.override { withMPI = true; }; - wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { }; - wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { }; ### SCIENCE/MOLECULAR-DYNAMICS @@ -11283,7 +11241,7 @@ with pkgs; enableUnfree = true; }; - inherit (ocamlPackages) hol_light; + inherit (ocaml-ng.ocamlPackages_5_3) hol_light; isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { }); @@ -11401,8 +11359,6 @@ with pkgs; python3 = python312; # fails to build otherwise }; - vite = libsForQt5.callPackage ../applications/science/misc/vite { }; - ### SCIENCE / PHYSICS hepmc3 = callPackage ../development/libraries/physics/hepmc3 {