diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 56780feb5e8b..9fa4398dfaa4 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -87,6 +87,8 @@ - `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0). +- `commafeed` has been updated to version 7.0.0, which includes changes impacting its security. Please see [upstream's release notes](https://github.com/Athou/commafeed/releases/tag/7.0.0) for details. + - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. - `nodePackages.browser-sync` has been removed, as it was unmaintained within nixpkgs. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aff362c46d0b..736f08973fde 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3684,6 +3684,12 @@ githubId = 6375609; name = "Bob van der Linden"; }; + bodier123 = { + email = "brubacher.1@gmail.com"; + github = "bodier123"; + githubId = 71633864; + name = "Bodie"; + }; bodil = { email = "nix@bodil.org"; github = "bodil"; @@ -4291,12 +4297,6 @@ } ]; }; - cameroncuttingedge = { - email = "buckets-taxiway5l@icloud.com"; - github = "cameroncuttingedge"; - githubId = 109548666; - name = "Cameron Byte"; - }; camerondugan = { email = "cameron.dugan@protonmail.com"; github = "camerondugan"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 10392e1dea75..56c72ed3e1b8 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -135,7 +135,7 @@ - [QGroundControl], a ground station support and configuration manager for the PX4 and APM Flight Stacks. Available as [programs.qgroundcontrol](options.html#opt-programs.qgroundcontrol.enable). -- [Eintopf](https://eintopf.info), a community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf.enable). +- [Eintopf](https://eintopf.info), a community event and calendar web application. Available as `services.eintopf`. - [`pay-respects`](https://codeberg.org/iff/pay-respects), a terminal command correction program, alternative to `thefuck`, written in Rust. Available as [programs.pay-respects](options.html#opt-programs.pay-respects). diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index a0d535534e54..f5487eb82faf 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -66,6 +66,8 @@ - [Shoko](https://shokoanime.com), an anime management system. Available as [services.shoko](#opt-services.shoko.enable). +- [perses](https://perses.dev/), the open dashboard tool for Prometheus and other data sources. Available as [services.perses](#opt-services.perses.enable). + - [Drasl](https://github.com/unmojang/drasl), an alternative authentication server for Minecraft. Available as [services.drasl](#opt-services.drasl.enable). ## Backward Incompatibilities {#sec-release-26.05-incompatibilities} @@ -78,12 +80,16 @@ - `sing-box` has been updated to 1.13.0, which has removed some deprecated options. See [upstream documentation](https://sing-box.sagernet.org/configuration/) for details and migration options. +- `services.statsd` has been removed because the packages it relies on do not exist anymore in nixpkgs. + - `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media). - `rustic` was upgraded to `0.11.x`, which contains breaking [changes to command-line parameters and configuration file](https://rustic.cli.rs/docs/breaking_changes.html#0110). - The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled. +- `services.uptime` has been removed because the package it relies on does not exist anymore in nixpkgs. + - `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a package instead of attrs. Now, by default, nixpkgs.coredns in conjunction with dockerTools.buildImage is used, instead of pulling the upstream container image from Docker Hub. If you want the old behavior, you can set: @@ -104,6 +110,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `systemd.services.stalwart` owned by `stalwart:stalwart`. The `user` and `group` are configurable via `services.stalwart.user` and `services.stalwart.group`, respectively. By default, if `stateVersion` is older than `26.05`, will fallback to legacy value of `stalwart-mail` for both `user` and `group`. - Default value for `services.stalwart.dataDir` has changed to `/var/lib/stalwart`. If `stateVersion` is older than `26.05`, will fallback to legacy value of `/var/lib/stalwart-mail`. +- `services.eintopf` has been renamed to `services.lauti` to align with upstream re-brand as a community online calendar. + - `services.oauth2-proxy.clientSecret` and `services.oauth2-proxy.cookie.secret` have been replaced with `services.oauth2-proxy.clientSecretFile` and `services.oauth2-proxy.cookie.secretFile` respectively. This was done to ensure secrets don't get made world-readable. - [`services.grafana.settings.security.secret_key`](#opt-services.grafana.settings.security.secret_key) doesn't have a @@ -205,6 +213,8 @@ See . - [services.resolved](#opt-services.resolved.enable) module was converted to RFC42-style settings. The moved options have also been renamed to match the upstream names. Aliases mean current configs will continue to function, but users should move to the new options as convenient. +- `systemd.sleep.extraConfig` was replaced by [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant `systemd.sleep.settings.Sleep`, which is used to generate the `sleep.conf` configuration file. See {manpage}`sleep.conf.d(5)` for available options. + - Support for Bluetooth audio based on `bluez-alsa` has been added to the `hardware.alsa` module. It can be enabled with the new [enableBluetooth](#opt-hardware.alsa.enableBluetooth) option. - `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled. This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bef9b910c4db..0c1c1ba417d2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1037,6 +1037,7 @@ ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/osquery.nix ./services/monitoring/parsedmarc.nix + ./services/monitoring/perses.nix ./services/monitoring/pgscv.nix ./services/monitoring/prometheus/alertmanager-gotify-bridge.nix ./services/monitoring/prometheus/alertmanager-irc-relay.nix @@ -1056,7 +1057,6 @@ ./services/monitoring/scrutiny.nix ./services/monitoring/smartd.nix ./services/monitoring/snmpd.nix - ./services/monitoring/statsd.nix ./services/monitoring/sysstat.nix ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix @@ -1068,7 +1068,6 @@ ./services/monitoring/unpoller.nix ./services/monitoring/ups.nix ./services/monitoring/uptime-kuma.nix - ./services/monitoring/uptime.nix ./services/monitoring/vlagent.nix ./services/monitoring/vmagent.nix ./services/monitoring/vmalert.nix @@ -1624,7 +1623,6 @@ ./services/web-apps/drasl.nix ./services/web-apps/drupal.nix ./services/web-apps/echoip.nix - ./services/web-apps/eintopf.nix ./services/web-apps/engelsystem.nix ./services/web-apps/ente.nix ./services/web-apps/fediwall.nix @@ -1679,6 +1677,7 @@ ./services/web-apps/lanraragi.nix ./services/web-apps/lasuite-docs.nix ./services/web-apps/lasuite-meet.nix + ./services/web-apps/lauti.nix ./services/web-apps/lemmy.nix ./services/web-apps/librechat.nix ./services/web-apps/librespeed.nix diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix index 2f3a4064ef05..447aebb61788 100644 --- a/nixos/modules/programs/npm.nix +++ b/nixos/modules/programs/npm.nix @@ -16,9 +16,7 @@ in programs.npm = { enable = lib.mkEnableOption "{command}`npm` global config"; - package = lib.mkPackageOption pkgs [ "nodePackages" "npm" ] { - example = "nodePackages_13_x.npm"; - }; + package = lib.mkPackageOption pkgs "nodejs" { }; npmrc = lib.mkOption { type = lib.types.lines; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 68f89cf0c27b..5b5eccc96788 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -319,6 +319,9 @@ in the program being unmaintained. The options `programs.msmtp.*` can be used instead. '') + (mkRemovedOptionModule [ "services" "statsd" ] '' + The statsd module was removed because the packages it uses have been removed from nixpkgs. + '') (mkRemovedOptionModule [ "services" "sourcehut" ] '' The sourcehut packages and the corresponding module have been removed due to being broken and unmaintained. '') @@ -328,6 +331,10 @@ in (mkRemovedOptionModule [ "services" "unifi-video" ] "The unifi-video package and the corresponding module have been removed as the software has been unsupported since 2021 and requires a MongoDB version that has reached end of life." ) + (mkRemovedOptionModule [ + "services" + "uptime" + ] "The package for services.uptime has been removed from nixpkgs.") (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" diff --git a/nixos/modules/services/monitoring/perses.nix b/nixos/modules/services/monitoring/perses.nix new file mode 100644 index 000000000000..352cdd1eaee3 --- /dev/null +++ b/nixos/modules/services/monitoring/perses.nix @@ -0,0 +1,131 @@ +{ + pkgs, + lib, + config, + utils, + ... +}: + +let + inherit (lib) + getExe + mkOption + mkEnableOption + mkPackageOption + mkIf + types + ; + + cfg = config.services.perses; + + settingsFormat = pkgs.formats.yaml { }; + + configPath = "/run/perses/config.yaml"; + secretsReplacement = utils.genJqSecretsReplacement { + loadCredential = true; + } cfg.settings configPath; + +in +{ + options.services.perses = { + enable = mkEnableOption "perses"; + + package = mkPackageOption pkgs "perses" { }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Perses Web interface port. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = ""; + description = '' + Address to listen on. Empty string will listen on all interfaces. + ''; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + }; + description = '' + Perses settings. See for available options. + You can specify secret values in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly. + ''; + default = { }; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "-web.telemetry-path=/metrics" + ]; + description = "Additional options passed to perses daemon."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.perses = { + description = "Perses Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + + preStart = secretsReplacement.script; + + serviceConfig = rec { + ExecStart = utils.escapeSystemdExecArgs ( + [ + (getExe cfg.package) + "-config=${configPath}" + "-web.listen-address=${cfg.listenAddress}:${toString cfg.port}" + ] + ++ cfg.extraOptions + ); + + User = "perses"; + DynamicUser = true; + Restart = "on-failure"; + RuntimeDirectory = "perses"; + RuntimeDirectoryMode = "0755"; + StateDirectory = "perses"; + WorkingDirectory = "%S/${StateDirectory}"; + + LoadCredential = secretsReplacement.credentials; + + # Hardening + AmbientCapabilities = mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = if (cfg.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = "0027"; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix deleted file mode 100644 index 48bb0f0e93f3..000000000000 --- a/nixos/modules/services/monitoring/statsd.nix +++ /dev/null @@ -1,154 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - - cfg = config.services.statsd; - - isBuiltinBackend = - name: - builtins.elem name [ - "graphite" - "console" - "repeater" - ]; - - backendsToPackages = - let - mkMap = list: name: if isBuiltinBackend name then list else list ++ [ pkgs.nodePackages.${name} ]; - in - lib.foldl mkMap [ ]; - - configFile = pkgs.writeText "statsd.conf" '' - { - address: "${cfg.listenAddress}", - port: "${toString cfg.port}", - mgmt_address: "${cfg.mgmt_address}", - mgmt_port: "${toString cfg.mgmt_port}", - backends: [${ - lib.concatMapStringsSep "," ( - name: if (isBuiltinBackend name) then ''"./backends/${name}"'' else ''"${name}"'' - ) cfg.backends - }], - ${lib.optionalString (cfg.graphiteHost != null) ''graphiteHost: "${cfg.graphiteHost}",''} - ${lib.optionalString (cfg.graphitePort != null) ''graphitePort: "${toString cfg.graphitePort}",''} - console: { - prettyprint: false - }, - log: { - backend: "stdout" - }, - automaticConfigReload: false${lib.optionalString (cfg.extraConfig != null) ","} - ${cfg.extraConfig} - } - ''; - - deps = pkgs.buildEnv { - name = "statsd-runtime-deps"; - pathsToLink = [ "/lib" ]; - ignoreCollisions = true; - - paths = backendsToPackages cfg.backends; - }; - -in - -{ - - ###### interface - - options.services.statsd = { - - enable = lib.mkEnableOption "statsd"; - - listenAddress = lib.mkOption { - description = "Address that statsd listens on over UDP"; - default = "127.0.0.1"; - type = lib.types.str; - }; - - port = lib.mkOption { - description = "Port that stats listens for messages on over UDP"; - default = 8125; - type = lib.types.port; - }; - - mgmt_address = lib.mkOption { - description = "Address to run management TCP interface on"; - default = "127.0.0.1"; - type = lib.types.str; - }; - - mgmt_port = lib.mkOption { - description = "Port to run the management TCP interface on"; - default = 8126; - type = lib.types.port; - }; - - backends = lib.mkOption { - description = "List of backends statsd will use for data persistence"; - default = [ ]; - example = [ - "graphite" - "console" - "repeater" - "statsd-librato-backend" - "statsd-influxdb-backend" - ]; - type = lib.types.listOf lib.types.str; - }; - - graphiteHost = lib.mkOption { - description = "Hostname or IP of Graphite server"; - default = null; - type = lib.types.nullOr lib.types.str; - }; - - graphitePort = lib.mkOption { - description = "Port of Graphite server (i.e. carbon-cache)."; - default = null; - type = lib.types.nullOr lib.types.port; - }; - - extraConfig = lib.mkOption { - description = "Extra configuration options for statsd"; - default = ""; - type = lib.types.nullOr lib.types.str; - }; - - }; - - ###### implementation - - config = lib.mkIf cfg.enable { - - assertions = map (backend: { - assertion = !isBuiltinBackend backend -> lib.hasAttrByPath [ backend ] pkgs.nodePackages; - message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; - }) cfg.backends; - - users.users.statsd = { - uid = config.ids.uids.statsd; - description = "Statsd daemon user"; - }; - - systemd.services.statsd = { - description = "Statsd Server"; - wantedBy = [ "multi-user.target" ]; - environment = { - NODE_PATH = "${deps}/lib/node_modules"; - }; - serviceConfig = { - ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}"; - User = "statsd"; - }; - }; - - environment.systemPackages = [ pkgs.statsd ]; - - }; - -} diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix deleted file mode 100644 index 53e2d441bd49..000000000000 --- a/nixos/modules/services/monitoring/uptime.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - config, - options, - pkgs, - lib, - ... -}: -let - inherit (lib) - literalExpression - mkOption - mkEnableOption - mkIf - mkMerge - types - optional - ; - - cfg = config.services.uptime; - opt = options.services.uptime; - - configDir = pkgs.runCommand "config" { preferLocalBuild = true; } ( - if cfg.configFile != null then - '' - mkdir $out - ext=`echo ${cfg.configFile} | grep -o \\..*` - ln -sv ${cfg.configFile} $out/default$ext - ln -sv /var/lib/uptime/runtime.json $out/runtime.json - '' - else - '' - mkdir $out - cat ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/config/default.yaml > $out/default.yaml - cat >> $out/default.yaml < ./package_version + ''; + outputs = [ "out" "dev" + "doc" ]; doCheck = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = [ libopus ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "Library for encoding .opus audio files and live streams"; license = lib.licenses.bsd3; homepage = "https://www.opus-codec.org/"; platforms = lib.platforms.unix; + pkgConfigModules = [ "libopusenc" ]; maintainers = with lib.maintainers; [ pmiddend ]; }; }) diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index effdcdd33b9c..2403185417aa 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "litmusctl"; - version = "1.22.0"; + version = "1.23.0"; nativeBuildInputs = [ installShellFiles @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { owner = "litmuschaos"; repo = "litmusctl"; rev = "${finalAttrs.version}"; - hash = "sha256-wf/y74ST4H6w8f/AyA2QIvLmQusyOALPY95qVtHF6Ac="; + hash = "sha256-F0WRA9wDvUibJQdBTXz0Vhw1m0B0cuwG2e1l6kpolkE="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/pkgs/by-name/lx/lxgw-fusionkai/package.nix b/pkgs/by-name/lx/lxgw-fusionkai/package.nix index f41da234e594..53e43fa9d48b 100644 --- a/pkgs/by-name/lx/lxgw-fusionkai/package.nix +++ b/pkgs/by-name/lx/lxgw-fusionkai/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,13 +16,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-pEISoFEsv8SJOGa2ud/nV1yvl8T9kakfKENu3mfYA5A="; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/lxgw/FusionKai"; diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index c13bd716be93..07619db5a043 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, fetchurl, lib, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -12,14 +13,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-secUl91sR6AgHD1ac96ka4BtaMjdQYUPnzVM7jgv5n4="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - mv *.ttf $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/lxgw/LxgwWenKaiTC"; diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix index be50342ee3f6..96fa62eb3632 100644 --- a/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -13,14 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-4GWCSMl+gdxnEPa8JPz7c+bWmxP7HaZHj+D0yUDqgVc="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - mv *.ttf $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://lxgw.github.io/"; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 9174beca0303..2ec7f6d841c9 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2026.2.18"; + version = "2026.2.25"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-f9foHBRj14DQY41FgFV5KtDnnLErEPO0jen31MXVbls="; + hash = "sha256-BoJbEpfMxGmO8+Y4vLs4EaqnQgs9TNEPVCcTGSKumiw="; }; - vendorHash = "sha256-CiWZaiFdaD8RoSxk04cz/dsRf03C3E7h1KuHN27ScwQ="; + vendorHash = "sha256-szUkKri3Rx1i3681r85xrOLqXV5u7s9DUemQHeh+qJw="; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix index 162dd0d6123b..8d0354fd090a 100644 --- a/pkgs/by-name/me/memogram/package.nix +++ b/pkgs/by-name/me/memogram/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "memogram"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "usememos"; repo = "telegram-integration"; tag = "v${finalAttrs.version}"; - hash = "sha256-b7y3+Qfa6NWX58gMmIPXSZxfl/d40xUQDQN9EBaewaY="; + hash = "sha256-OkNx5qAF7Gxk50S9a31NUWRoC9uHPUwUHG3jA8gy7AQ="; }; - vendorHash = "sha256-G3ZkjpmZjIGyCwZvxWDQGW33n/AbuN9hXlvdLo85M6Q="; + vendorHash = "sha256-iSJU/FyyEbZlpTT3isJlsEvDzNpg3ylE5367KPBeUxM="; subPackages = [ "bin/memogram" ]; diff --git a/pkgs/by-name/mi/milkytracker/package.nix b/pkgs/by-name/mi/milkytracker/package.nix index 9fbf0d723ca4..c3efa745778c 100644 --- a/pkgs/by-name/mi/milkytracker/package.nix +++ b/pkgs/by-name/mi/milkytracker/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop - install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png + install -Dm644 $src/resources/pictures/carton.png $out/share/icons/hicolor/128x128/apps/milkytracker.png install -Dm644 resources/org.milkytracker.MilkyTracker.metainfo.xml $out/share/appdata/org.milkytracker.MilkyTracker.metainfo.xml ''; diff --git a/pkgs/by-name/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix index 1b41b4aeba1b..1c958ad68420 100644 --- a/pkgs/by-name/mi/miniaudio/package.nix +++ b/pkgs/by-name/mi/miniaudio/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "miniaudio"; - version = "0.11.24"; + version = "0.11.25"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; tag = finalAttrs.version; - hash = "sha256-2i0VTbf/zcolGcf1vzleFNRiGnisoaN+g+Dy9iCbei8="; + hash = "sha256-2k346Z/ueINPbaY20P2cbBvRfFXXH0ugdv4d7WaYt2w="; }; outputs = [ diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index be8964387c64..4cbf36fd756d 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/raviqqe/muffet"; changelog = "https://github.com/raviqqe/muffet/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ hythera ]; mainProgram = "muffet"; }; }) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index cd5de0265588..f2233ad94e93 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -25,20 +25,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "2.9.4"; + version = "2.10.2"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-XXQPZHtY66gOQ+nYH+Q1IjbR+SRZ9g06sgBy2x8gGh4="; + hash = "sha256-Mpeksn6Xkk7jc4xJIdFS+9rWy882H85h82/IZ0RlUhI="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-TU7HIShYj20QtdcthP0nQdubYl0bdy+XM3CoX5Rvhzk="; + hash = "sha256-fnaQKbJqv1Gkc75wbCgRId4g53os5VKRhb3Jlb2eWRQ="; }; nativeBuildInputs = [ @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { gepbird AdrienLemaire sweenu + wrbbz ]; license = lib.licenses.sustainableUse; mainProgram = "n8n"; diff --git a/pkgs/by-name/n8/n8n/update.sh b/pkgs/by-name/n8/n8n/update.sh index bcf02c247da9..066dae4bc0aa 100755 --- a/pkgs/by-name/n8/n8n/update.sh +++ b/pkgs/by-name/n8/n8n/update.sh @@ -2,6 +2,9 @@ #!nix-shell --pure -i bash -p bash curl jq nix-update cacert git set -euo pipefail -new_version="$(curl -s "https://api.github.com/repos/n8n-io/n8n/releases?per_page=30" | \ - jq --raw-output 'map(select(.prerelease | not) | .tag_name) | sort | last | ltrimstr("n8n@")')" +new_version="$(curl -s 'https://api.github.com/repos/n8n-io/n8n/releases?per_page=30' | \ + jq -r ' + map(select(.prerelease | not) | .tag_name | sub("^n8n@"; "")) + | sort_by(split(".") | map(tonumber)) | last + ')" nix-update n8n --version "$new_version" diff --git a/pkgs/by-name/ne/neofetch/package.nix b/pkgs/by-name/ne/neofetch/package.nix deleted file mode 100644 index c6d0ec72962d..000000000000 --- a/pkgs/by-name/ne/neofetch/package.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - bash, - makeWrapper, - pciutils, - x11Support ? stdenvNoCC.hostPlatform.isLinux, - ueberzug, - fetchpatch, -}: - -stdenvNoCC.mkDerivation { - pname = "neofetch"; - version = "unstable-2021-12-10"; - - src = fetchFromGitHub { - owner = "dylanaraps"; - repo = "neofetch"; - rev = "ccd5d9f52609bbdcd5d8fa78c4fdb0f12954125f"; - sha256 = "sha256-9MoX6ykqvd2iB0VrZCfhSyhtztMpBTukeKejfAWYW1w="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/dylanaraps/neofetch/commit/413c32e55dc16f0360f8e84af2b59fe45505f81b.patch"; - sha256 = "1fapdg9z79f0j3vw7fgi72b54aw4brn42bjsj48brbvg3ixsciph"; - name = "avoid_overwriting_gio_extra_modules_env_var.patch"; - }) - # https://github.com/dylanaraps/neofetch/pull/2114 - (fetchpatch { - url = "https://github.com/dylanaraps/neofetch/commit/c4eb4ec7783bb94cca0dbdc96db45a4d965956d2.patch"; - sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs="; - name = "update_old_nixos_logo.patch"; - }) - # https://github.com/dylanaraps/neofetch/pull/2157 - (fetchpatch { - url = "https://github.com/dylanaraps/neofetch/commit/de253afcf41bab441dc58d34cae654040cab7451.patch"; - sha256 = "sha256-3i7WnCWNfsRjbenTULmKHft5o/o176imzforNmuoJwo="; - name = "improve_detect_nixos_version.patch"; - }) - ]; - - outputs = [ - "out" - "man" - ]; - - strictDeps = true; - buildInputs = [ bash ]; - nativeBuildInputs = [ makeWrapper ]; - postPatch = '' - patchShebangs --host neofetch - ''; - - postInstall = '' - wrapProgram $out/bin/neofetch \ - --prefix PATH : ${ - lib.makeBinPath ( - lib.optional (!stdenvNoCC.hostPlatform.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug - ) - } - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "SYSCONFDIR=${placeholder "out"}/etc" - ]; - - meta = { - description = "Fast, highly customizable system info script"; - homepage = "https://github.com/dylanaraps/neofetch"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ konimex ]; - mainProgram = "neofetch"; - }; -} diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index 83ebff353c3e..d648a19b1412 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nfs-ganesha"; - version = "9.5"; + version = "9.7"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "nfs-ganesha"; repo = "nfs-ganesha"; tag = "V${finalAttrs.version}"; - hash = "sha256-WgNuzG9A3pA9K9Wwtr+kLtvYA9PKQgZuEJlx8OVgCqY="; + hash = "sha256-MGDt78UnkPaNc2YD/GHlFnvZNo0ZBbtvG+vxcplH+fI="; }; patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch; diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index 07af655a8b08..b8600de99089 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, python3Packages, nix-update-script, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -18,6 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + installFonts python3Packages.afdko python3Packages.fonttools ]; @@ -34,22 +36,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postBuild ''; - installPhase = '' - runHook preInstall - - install -Dm444 NomNaTong-Regular.otf -t $out/share/fonts/opentype/ - install -Dm444 NomNaTong-Regular.ttf -t $out/share/fonts/truetype/ - - runHook postInstall - ''; - passthru.updateScript = nix-update-script { }; meta = { homepage = "https://nomfoundation.org/nom-tools/Nom-Font"; description = "Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.eclairevoyant ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/oc/ocrs/package.nix b/pkgs/by-name/oc/ocrs/package.nix new file mode 100644 index 000000000000..0cf5be2214e6 --- /dev/null +++ b/pkgs/by-name/oc/ocrs/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ocrs"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "robertknight"; + repo = "ocrs"; + tag = "ocrs-v${finalAttrs.version}"; + hash = "sha256-MHtMuUAFxfbbXI7jkS9mHbap9TbSmSilekFnSaI76Ac="; + }; + + cargoHash = "sha256-zYXhXGEWapAsEav3wpc17VWT8glFkys3BERCmhsUkZk="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Library and tool for OCR, extracting text from images"; + homepage = "https://github.com/robertknight/ocrs"; + mainProgram = "ocrs"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ + ethancedwards8 + ]; + }; +}) diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index 88675756c747..6e74b746a704 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.72.1"; + version = "2.73.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; tag = "v${version}"; - hash = "sha256-tQufX7LIRrPDCid2lfKKEJjZHInVDRVmoCd1oYiSCfk="; + hash = "sha256-qPIdSsWsbJlJQKGY9AA4qJRKmYTSdXtL1/okjQogGg4="; }; vendorHash = null; diff --git a/pkgs/by-name/pa/pagemon/package.nix b/pkgs/by-name/pa/pagemon/package.nix index 2cd0481d1335..a051eee3f9da 100644 --- a/pkgs/by-name/pa/pagemon/package.nix +++ b/pkgs/by-name/pa/pagemon/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pagemon"; - version = "0.02.05"; + version = "0.02.06"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "pagemon"; tag = "V${finalAttrs.version}"; - hash = "sha256-Crr1312wZ1IIwvODAUooZ0Lr75W0qdDQrr1sszaNHa4="; + hash = "sha256-nlgrPGctgP6F90LTkVXVZ1MVbkr8yDF/AI+yrvnU5Hs="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix index 016d2a3a0f21..e970a3db3958 100644 --- a/pkgs/by-name/pa/panoply/package.nix +++ b/pkgs/by-name/pa/panoply/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-OCxplchCBx5hCbihg4WNu/RrcYBo5Jfdm1VDIr9swRU="; + hash = "sha256-PwGbN/J4zXelzV1nSUqOtOyb7anh+aht46Ihza5aLCc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pa/paqet/package.nix b/pkgs/by-name/pa/paqet/package.nix index ca00901a7535..d651f6445fd8 100644 --- a/pkgs/by-name/pa/paqet/package.nix +++ b/pkgs/by-name/pa/paqet/package.nix @@ -9,12 +9,12 @@ }: buildGoModule (finalAttrs: { pname = "paqet"; - version = "1.0.0-alpha.18"; + version = "1.0.0-alpha.19"; src = fetchFromGitHub { owner = "hanselime"; repo = "paqet"; tag = "v${finalAttrs.version}"; - hash = "sha256-FuCbQz+Lhbw/xHJYhZo4uxH2ODV/uVFR7XDOK5DKZkU="; + hash = "sha256-aflWI3WBVF6rl+yS8sNv2XOMK6q4oj3qqGpuqlmrh18="; }; vendorHash = "sha256-olyjpzHZKgD5fhXSyCmEuwYmcJGMUS+b+Hglm2JF1NY="; diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix index a7b17d8c9b35..cdc98c312aa2 100644 --- a/pkgs/by-name/pe/perses/package.nix +++ b/pkgs/by-name/pe/perses/package.nix @@ -10,6 +10,7 @@ turbo, linkFarm, installShellFiles, + nixosTests, }: let @@ -118,6 +119,8 @@ buildGoModule (finalAttrs: { passthru = { updateScript = ./update.sh; + tests.nixos = nixosTests.perses; + inherit pluginsArchive; }; diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index ca8046697d64..668201afc545 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "10.0.2"; + version = "10.0.5"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; tag = finalAttrs.version; - hash = "sha256-Nfo0IaN7kdvaY7ER/BOTfAz2YQL2Jjfiu8vzcKz3n0s="; + hash = "sha256-cQBOdF3HP4CFOSfWyVXGQBs42V/A4w6R2UwelQTE3dQ="; }; postUnpack = '' diff --git a/pkgs/by-name/pr/prometheus-nut-exporter/package.nix b/pkgs/by-name/pr/prometheus-nut-exporter/package.nix index e045d6e24d59..6edc92ca6ee1 100644 --- a/pkgs/by-name/pr/prometheus-nut-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-nut-exporter/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "3.2.3"; + version = "3.2.5"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-tgYxkVen2aegX+py9goQIQtw1eNZJ7K8CqgaKOsDgxA="; + sha256 = "sha256-et1XCKpjyhr7yY24t8xBSRzh9nAmIG6bdjgbI1LuJaE="; }; vendorHash = "sha256-cMZ4GSal03LIZi7ESr/sQx8zLHNepOTZGEEsdvsNhec="; diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix index 5a330cd06ce1..9220bdda4773 100644 --- a/pkgs/by-name/pr/proxyman/package.nix +++ b/pkgs/by-name/pr/proxyman/package.nix @@ -37,7 +37,7 @@ appimageTools.wrapAppImage { extraInstallCommands = '' install -Dm444 ${appimageContents}/proxyman.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/proxyman.png -t $out/share/pixmaps + install -Dm444 ${appimageContents}/proxyman.png -t $out/share/icons/hicolor/256x256/apps substituteInPlace $out/share/applications/proxyman.desktop \ --replace-fail "Exec=AppRun" "Exec=proxyman --" ''; diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index 3816b554022f..5bb34fa993c7 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pyenv"; - version = "2.6.23"; + version = "2.6.24"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; tag = "v${finalAttrs.version}"; - hash = "sha256-ejYVBXTDPJFh/9vBet16HMxXvQ5qJzZPPp3vnZUp8A8="; + hash = "sha256-s8roBirIoZQ1IJ76Tu5HM/EXiAug2O7wMOAFamqBFqw="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/by-name/ra/raspberrypi-armstubs/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix rename to pkgs/by-name/ra/raspberrypi-armstubs/package.nix diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/by-name/ra/raspberrypifw/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/raspberrypi/default.nix rename to pkgs/by-name/ra/raspberrypifw/package.nix diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix index ca2ad1d863db..ebd02a7a790f 100644 --- a/pkgs/by-name/ro/ron-lsp/package.nix +++ b/pkgs/by-name/ro/ron-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ron-lsp"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "jasonjmcghee"; repo = "ron-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-c+cJrXINuoK+NR1rMSrOeZqZzrEcg/brSTKSTu5mNr4="; + hash = "sha256-+fMV2J6S6+vRmdSsS6TtrCGxxOw+dgL4dEJWsJpB5bY="; }; - cargoHash = "sha256-eEoxgnfc9s59b0SNozEIj/1wHv+OWDmd4bniBbGsgSQ="; + cargoHash = "sha256-vJ0+M0Mg2ONfGcKqGs2hffMAdcgawra1cHWPeaqpo1w="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix index 3147d1c8a79d..477232599625 100644 --- a/pkgs/by-name/ru/rustscan/package.nix +++ b/pkgs/by-name/ru/rustscan/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/RustScan/RustScan"; changelog = "https://github.com/RustScan/RustScan/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ bodier123 ]; mainProgram = "rustscan"; }; }) diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix index 8433b7aa3010..6d0422180938 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.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool"; tag = finalAttrs.version; - hash = "sha256-scHvBbpIZXwRC7lpY2lj0mN/ECj+uDxN4DF9sxOzy6o="; + hash = "sha256-pWECmFzxOLhmiascyK1yS/uzZ3O/MVze/cRNgE01ptY="; }; - cargoHash = "sha256-ysuSGXHtpDKW3p18EgZUd0biqfK685BxKseQVHmWOWI="; + cargoHash = "sha256-mvL102oT4WxpEEplxSu6uxp+odLHFB3n6mBcztXXmRA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index feaaa9d28d45..31e1dab38703 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 = "20260218-1"; + version = "20260302"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-axwER9LrgKxt8jVYPn3DsIJ4lW6zadLvfGXySYqs7J4="; + hash = "sha256-nDe7TSD37K7nEwQ3GVjFiuBff/IwxQNtu5YCfSIrk/k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sing-geoip/main.go b/pkgs/by-name/si/sing-geoip/main.go index 8c2ac246fba4..574af46272c8 100644 --- a/pkgs/by-name/si/sing-geoip/main.go +++ b/pkgs/by-name/si/sing-geoip/main.go @@ -1,36 +1,14 @@ func main() { var err error - input := os.Args[1] - ruleSetOutput := "rule-set" + input := os.Args[1] + ruleSetOutput := "rule-set" - binary, err := os.ReadFile(input) + binary, err := os.ReadFile(input) if err != nil { panic(err) } - metadata, countryMap, err := parse(binary) - if err != nil { - panic(err) - } - allCodes := make([]string, 0, len(countryMap)) - for code := range countryMap { - allCodes = append(allCodes, code) - } - - writer, err := newWriter(metadata, allCodes) - if err != nil { - panic(err) - } - err = write(writer, countryMap, "geoip.db", nil) - if err != nil { - panic(err) - } - - writer, err = newWriter(metadata, []string{"cn"}) - if err != nil { - panic(err) - } - err = write(writer, countryMap, "geoip-cn.db", []string{"cn"}) + _, countryMap, err := parse(binary) if err != nil { panic(err) } diff --git a/pkgs/by-name/si/sing-geoip/package.nix b/pkgs/by-name/si/sing-geoip/package.nix index 10e259820cd2..e40b36976b47 100644 --- a/pkgs/by-name/si/sing-geoip/package.nix +++ b/pkgs/by-name/si/sing-geoip/package.nix @@ -53,8 +53,6 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - install -Dm644 geoip.db $out/share/sing-box/geoip.db - install -Dm644 geoip-cn.db $out/share/sing-box/geoip-cn.db install -Dm644 rule-set/* -t $out/share/sing-box/rule-set runHook postInstall diff --git a/pkgs/by-name/si/sing-geosite/package.nix b/pkgs/by-name/si/sing-geosite/package.nix index 76ba9725644d..19d1f779a42f 100644 --- a/pkgs/by-name/si/sing-geosite/package.nix +++ b/pkgs/by-name/si/sing-geosite/package.nix @@ -41,7 +41,6 @@ buildGoModule (finalAttrs: { installPhase = '' runHook preInstall - install -Dm644 geosite.db $out/share/sing-box/geosite.db install -Dm644 rule-set/* -t $out/share/sing-box/rule-set runHook postInstall ''; diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 53fd07c020cb..0f5d51a30194 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -14,7 +14,7 @@ }: let - version = "0.10.0"; + version = "0.10.1"; # list of all theoretically available targets targets = [ "genode" @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - hash = "sha256-iBmod0/LhQ5xBSfxHh2nRwCCyBPK4k1MVEO7WKAxrmo="; + hash = "sha256-UfYkyE1k5S57kRLaYk7hRE4lOCuzjzcTv4SNtlqk9DU="; }; configurePhase = '' diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index b5fc05ea29a3..81c5ac4f3cb3 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "10.8.1"; + version = "10.8.5"; src = fetchFromGitHub { owner = "TaterClient"; repo = "TClient"; tag = "V${finalAttrs.version}"; - hash = "sha256-yPGXbTxbj+hsdygC68TRtzVg+flEAxqNnhd9smbbekU="; + hash = "sha256-wdX7AZG4hDzRDUl6XjzL2bTMwBxMWdRt4geE7NuqpdQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/te/terminusdb/package.nix b/pkgs/by-name/te/terminusdb/package.nix index aff90b470905..0ad90475818a 100644 --- a/pkgs/by-name/te/terminusdb/package.nix +++ b/pkgs/by-name/te/terminusdb/package.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "terminusdb"; - version = "12.0.2"; + version = "12.0.4"; src = fetchFromGitHub { owner = "terminusdb"; repo = "terminusdb"; tag = "v${finalAttrs.version}"; - hash = "sha256-l573Drc76KSUXxhdleU/IBscDTul8VtgkZdrRPvNuNc="; + hash = "sha256-vJifp0U4FrbtI86M8pt022BQWIIeK8jWWFG1Ch1m7IQ="; leaveDotGit = true; postFetch = '' # Will be used for `TERMINUSDB_GIT_HASH` @@ -90,17 +90,17 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; - hash = "sha256-zF506S4SiWx/uYyN2Trm4XPVUIU2K/qoNSjfKthLVuw="; + hash = "sha256-SvWS18amC4FHuXc/N6e+tomwnVfJ/KlTLIACfl72Nqc="; }; - # TODO: remove if/when merged upstream https://github.com/terminusdb/terminusdb/pull/2360 - patches = [ - # Avoid building bundled GMP/MPFR/MPC in gmp-mpfr-sys during the Rust build - (fetchpatch2 { - url = "https://github.com/terminusdb/terminusdb/commit/b84dc6b28ef3fd0ef76db2cf7f69537b95af07cc.patch?full_index=1"; - hash = "sha256-L3U/MHZgMSoXIy6j+1+gKKY2+2obKgaJ3HdJOoMe2Sw="; - }) - ]; + postPatch = '' + # Fix MAKEFLAGS order in vendored tikv-jemalloc-sys + # TODO: remove when tikv-jemalloc-sys 0.6.2+ is released + # equivalent to https://github.com/tikv/jemallocator/pull/152 + substituteInPlace $cargoDepsCopy/tikv-jemalloc-sys-*/build.rs \ + --replace-fail 'format!("{orig_makeflags} {makeflags}")' \ + 'format!("{makeflags} {orig_makeflags}")' + ''; strictDeps = true; @@ -122,11 +122,16 @@ stdenv.mkDerivation (finalAttrs: { libmpc ]; - # Darwin: gmp-mpfr-sys (use-system-libs) runs raw `$CC ... -lgmp` probes without - # propagating `CFLAGS`/`CPPFLAGS`, so we must provide include/lib paths via - # compiler-native env vars - # https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.5.3/build.rs#L187 - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + env = { + # Use system GMP/MPFR/MPC + # Overrides FEATURES ?= in Makefile.rust + FEATURES = "--features terminusdb-community/use-system-gmp"; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Darwin: gmp-mpfr-sys (use-system-libs) runs raw `$CC ... -lgmp` probes without + # propagating `CFLAGS`/`CPPFLAGS`, so we must provide include/lib paths via + # compiler-native env vars + # https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.5.3/build.rs#L187 C_INCLUDE_PATH = lib.makeSearchPath "include" [ (lib.getDev gmp) (lib.getDev mpfr) diff --git a/pkgs/by-name/te/terminusdb/tests.nix b/pkgs/by-name/te/terminusdb/tests.nix index a9d0930fd919..be81bf37d78c 100644 --- a/pkgs/by-name/te/terminusdb/tests.nix +++ b/pkgs/by-name/te/terminusdb/tests.nix @@ -19,18 +19,9 @@ buildNpmPackage { sourceRoot = "${terminusdb.src.name}/tests"; - npmDepsHash = "sha256-vNafxS19++AszhcYTw1jnfI4HMUyy5lOgKvjHHcGpWg="; + npmDepsHash = "sha256-R2kbwHhlja5mH2AGpyiiVCz3YmSWF9cWptOTdcZb0PM="; # Test-only JS adjustments live here so the runtime package stays untouched - patches = [ - # TODO: remove if/when merged upstream https://github.com/terminusdb/terminusdb/pull/2362 - # Prefer an injected TerminusDB binary path in tests - (fetchpatch2 { - url = "https://github.com/terminusdb/terminusdb/commit/8ffe22b3e20bff8fe8efb1a2b8236bb8b40c0bc3.patch?full_index=1"; - relative = "tests"; - hash = "sha256-NrFQknjdrRJjHvkOrutSkzxkUwcC6S+S0kHuK/xQTj0="; - }) - ]; postPatch = '' # Read git hash from the COMMIT file in the source substituteInPlace lib/info.js --replace-fail \ diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix index 04355f8746fa..7132b7938c15 100644 --- a/pkgs/by-name/te/terraform-ls/package.nix +++ b/pkgs/by-name/te/terraform-ls/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "terraform-ls"; - version = "0.38.4"; + version = "0.38.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-ls"; rev = "v${finalAttrs.version}"; - hash = "sha256-lnFmeE9kPSG+r1PW83Ld5WaLqQSlfglSiUIZAtVzjF4="; + hash = "sha256-sMYOdd7+fut6Rko4jcaITfT7YdXoRzWsfWsOBvKoBhY="; }; - vendorHash = "sha256-g7r2+enb2j8cvRY3EP7GDIwEUfin8366ihw1r7zMhjw="; + vendorHash = "sha256-qN09XAkk8cvzsXxr0v7ttlChhqMWBTawQ6PQlpxJWK4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix index ffae4f9c7464..b72d90681812 100644 --- a/pkgs/by-name/ti/tinfoil-cli/package.nix +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tinfoil-cli"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "tinfoilsh"; repo = "tinfoil-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-EAC6FGYTTLq2/VeDLLV+o03/mVaEi3WTICERZoWJ8tI="; + hash = "sha256-ICfuyI48fY8+Ecwbt45JE1F/ElJ3c9RMMzWLxBDiLqA="; }; - vendorHash = "sha256-5ENb7Wb6iUX0vd/k46sQCs8fZvprlRHS+QGHrUboXGU="; + vendorHash = "sha256-4JC4e+ICG1EG+6Of9EBbs4rBG46NoGgDztbCcW1AMII="; # The attestation test requires internet access checkFlags = [ "-skip=TestAttestationVerifySEV" ]; diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix index 9f8029e8b675..41700c789543 100644 --- a/pkgs/by-name/tm/tml/package.nix +++ b/pkgs/by-name/tm/tml/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "tml"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "liamg"; repo = "tml"; rev = "v${finalAttrs.version}"; - hash = "sha256-QMXEKjOKYQlzXc2ds8OAAL5xUxayGb6mxxyeHsCkfwo="; + hash = "sha256-hDcQIBwjm7ZL9zUdTeZfvMeh/kqRk6wjwtCUvTJCG/U="; }; vendorHash = "sha256-CHZS1SpPko8u3tZAYbf+Di882W55X9Q/zd4SmFCRgKM="; diff --git a/pkgs/by-name/to/tonearm/package.nix b/pkgs/by-name/to/tonearm/package.nix new file mode 100644 index 000000000000..98d0a99ba9e2 --- /dev/null +++ b/pkgs/by-name/to/tonearm/package.nix @@ -0,0 +1,120 @@ +{ + buildGoModule, + cairo, + copyDesktopItems, + fetchFromGitea, + gdk-pixbuf, + glib, + glib-networking, + gobject-introspection, + graphene, + gst_all_1, + gtk4, + lib, + libadwaita, + libsecret, + librsvg, + makeDesktopItem, + makeWrapper, + pango, + pkg-config, + symlinkJoin, + wrapGAppsHook4, +}: +let + libraryPath = symlinkJoin { + name = "tonearm-puregotk-lib-folder"; + paths = [ + cairo + gdk-pixbuf + glib.out + graphene + pango.out + gtk4 + libadwaita + libsecret + gobject-introspection + librsvg + ]; + }; +in +buildGoModule (finalAttrs: { + pname = "tonearm"; + version = "1.2.0"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dergs"; + repo = "Tonearm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2on27z3BRf63gjs3NKmF9H0Le7hBdaHRUp8WQgFs3QU="; + }; + vendorHash = "sha256-j+7cobxVGNuZFYeRn5ad7XT4um8WNWE1byFo7qo9zK0="; + + ldflags = [ + "-X \"codeberg.org/dergs/tonearm/internal/ui.Version=${finalAttrs.version}\"" + ]; + + buildInputs = [ + glib-networking + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gtk4 + libsecret + ]; + doCheck = false; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + makeWrapper + wrapGAppsHook4 + ]; + + subPackages = [ + "cmd/tonearm" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "dev.dergs.Tonearm"; + exec = "tonearm %u"; + icon = "dev.dergs.Tonearm"; + comment = "Tonearm is a GTK client for TIDAL written in GoLang."; + desktopName = "Tonearm"; + mimeTypes = [ + "x-scheme-handler/tidal" + ]; + categories = [ + "Audio" + "AudioVideo" + "Music" + "GNOME" + "GTK" + ]; + }) + ]; + + postInstall = '' + wrapProgram $out/bin/tonearm \ + --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --set-default PUREGOTK_LIB_FOLDER ${libraryPath}/lib \ + ''${gappsWrapperArgs[@]} + install -Dm444 internal/icons/hicolor/scalable/apps/dev.dergs.Tonearm.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm444 internal/icons/hicolor/128x128/apps/dev.dergs.Tonearm.png -t $out/share/icons/hicolor/128x128/apps + install -Dm444 internal/icons/hicolor/symbolic/apps/dev.dergs.Tonearm-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps + install -Dm444 internal/settings/dev.dergs.Tonearm.gschema.xml -t $out/share/glib-2.0/schemas + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = { + description = "GTK client for TIDAL written in Golang"; + homepage = "https://codeberg.org/dergs/Tonearm"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + drafolin + nilathedragon + ]; + mainProgram = "tonearm"; + }; +}) diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index 98d89876bd7c..2f026020ad68 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -6,6 +6,7 @@ fontconfig, freetype, lib, + stdenv, libglvnd, libxkbcommon, makeWrapper, @@ -53,17 +54,19 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/uad-ng --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - fontconfig - freetype - libglvnd - libxkbcommon - wayland - libx11 - libxcursor - libxi - libxrandr - ] + lib.makeLibraryPath ( + [ + fontconfig + freetype + libglvnd + libxkbcommon + libx11 + libxcursor + libxi + libxrandr + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ] + ) } --suffix PATH : ${lib.makeBinPath [ android-tools ]} ''; @@ -76,6 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.gpl3Only; mainProgram = "uad-ng"; maintainers = with lib.maintainers; [ lavafroth ]; - platforms = lib.platforms.linux; + broken = with stdenv.hostPlatform; isDarwin && isx86_64; + platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index 1f8baf9ad178..02e3880b5987 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "usage"; - version = "2.18.0"; + version = "2.18.2"; src = fetchFromGitHub { owner = "jdx"; repo = "usage"; tag = "v${finalAttrs.version}"; - hash = "sha256-605IvofbErtpfsNoIY8G4xafVC0ChFuxy9p60UCDnvk="; + hash = "sha256-vypgdu9G+6soLl9QrlRiA1U/2ijFUEqwPS6XrV9Ubek="; }; - cargoHash = "sha256-ccAPI50X13b15do3dwfmMKxRfIZuFl5+BO/2Hh9zNyA="; + cargoHash = "sha256-CnrBFH1dnFOL8dwyFioj6FO2MPqpl169y9YMgQpPi5Y="; postPatch = '' substituteInPlace ./examples/*.sh \ diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix index 4f81c29e1ffe..2484bdf1e39d 100644 --- a/pkgs/by-name/ve/vengi-tools/package.nix +++ b/pkgs/by-name/ve/vengi-tools/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.1.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "vengi-voxel"; repo = "vengi"; - rev = "v${finalAttrs.version}"; - hash = "sha256-YSqMhwgCdJNf8sehwgPHhr/Nu6jKXCeszuRp3hPqz7g="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2ZiRN+59oJL0Bgd0D78w8FLoBCwzVTlo0SgsMJY8Jxk="; }; prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -132,5 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; + # Segfaults when building shaders + broken = stdenv.isLinux; }; }) diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix index 0d94cb0cb28b..04fa27f45781 100644 --- a/pkgs/by-name/vg/vgmtools/package.nix +++ b/pkgs/by-name/vg/vgmtools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "vgmtools"; - version = "0.1-unstable-2026-01-10"; + version = "0.1-unstable-2026-02-23"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "2e0754f2f2ca815bc6d4050c9e8c2bc188bd1581"; - hash = "sha256-pq11cqDLlQIv8WLmlV4weZogYXInWB1QxJEBzGx7CPQ="; + rev = "728c8c75d770632244ac387307286344c2144cd3"; + hash = "sha256-HIMOj9eWElHe/AozrM8prGNShV3gJEb8Zhd0irzELew="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix index f9adc43ba599..fe1cc4d9bcd3 100644 --- a/pkgs/by-name/xb/xbyak/package.nix +++ b/pkgs/by-name/xb/xbyak/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xbyak"; - version = "7.33.3"; + version = "7.34.1"; src = fetchFromGitHub { owner = "herumi"; repo = "xbyak"; tag = "v${finalAttrs.version}"; - hash = "sha256-dZgEjyVwr2Bg49k6f5yETLHsk+LevNdvq0BOCZsZ3nA="; + hash = "sha256-cajYwHw9/RzPAQw3c0zpNRm/nBBym0OtowqqtYnpVWc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/xl/xla/package.nix b/pkgs/by-name/xl/xla/package.nix index 85be5651e6a8..900b192d8fae 100644 --- a/pkgs/by-name/xl/xla/package.nix +++ b/pkgs/by-name/xl/xla/package.nix @@ -161,6 +161,7 @@ in { x86_64-linux = "sha256-OJfSqDlEC+yhWwwMwaD5HGvuHm8OWk+yQxmbH0/gZ88="; aarch64-darwin = "sha256-sKxtdgozCV1on1gd+bm8FKyFxP0u70Hs24OdLNA3jh0="; + aarch64-linux = "sha256-Ex0tbTF+EdISPKvy6K2zas8A+MofLmaLDN0Xvz7JI/o="; } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); preInstall = '' @@ -206,6 +207,7 @@ in maintainers = with lib.maintainers; [ samuela ]; platforms = [ "x86_64-linux" + "aarch64-linux" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/xt/xtris/package.nix b/pkgs/by-name/xt/xtris/package.nix index d0a189acc515..2ecb57d9ec6d 100644 --- a/pkgs/by-name/xt/xtris/package.nix +++ b/pkgs/by-name/xt/xtris/package.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ libx11 ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix index 92f8bf43094b..e981c76da634 100644 --- a/pkgs/by-name/ze/zeekscript/package.nix +++ b/pkgs/by-name/ze/zeekscript/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zeekscript"; - version = "1.3.2-61"; + version = "1.3.2-75"; pyproject = true; src = fetchFromGitHub { owner = "zeek"; repo = "zeekscript"; - rev = "7f3d41b495cc87ee0db5cc90ccd0f5c9a23487df"; - hash = "sha256-IpoDSLPDF2p/Yuijb3xtvs1zivtYrKny/pY5dRL56QA="; + rev = "74591d35d6e9fbb805d2af738032c05b31d3c93a"; + hash = "sha256-VAcbrzRIKdPC3q7U+ze7d3lVwDessHVL9orNYKzLovs="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index 295d5c6a3037..91e0e81e38d1 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -20,18 +20,12 @@ let ; jdk = jdk11; gradle = gradle_8; - extraConfig = [ - # jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix) - # because of several compile errors. We need to include this parameter for - # Corretto, too. - "--disable-warnings-as-errors" - ]; - version = "11.0.29.7.1"; + version = "11.0.30.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - hash = "sha256-/VlV8tAo1deOZ5Trc4VlLNtpjWx352qUGZmfVbj7HuU="; + hash = "sha256-SUdJlTYE+RRAZa8DhFW0EYW1kHmuNDG+hk+/3MXtx1w="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index df9282fb7abc..4a90c0741d83 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -44,6 +44,7 @@ jdk.overrideAttrs ( postPatch = let extra_config = builtins.concatStringsSep " " extraConfig; + jdk_configure_flags = "'" + builtins.concatStringsSep "', '" oldAttrs.configureFlags + "'"; in (oldAttrs.postPatch or "") + '' @@ -70,6 +71,12 @@ jdk.overrideAttrs ( substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" done + # Prepend corresponding OpenJDK flags to Corretto's own configure flags. + # This will provide us with the version-specific fixes (see + # openjdk/generic.nix) while giving Corretto's flags precedence. + # Note that the OpenJdK flags contain "--with-boot-jdk=..."! + substituteInPlace build.gradle --replace-fail "correttoCommonFlags = [" "correttoCommonFlags = [${jdk_configure_flags} ," + # Finally, *append* nix-corretto-version specific flags. gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") ''; @@ -138,6 +145,7 @@ jdk.overrideAttrs ( license = lib.licenses.gpl2Only; description = "Amazon's distribution of OpenJDK"; maintainers = with lib.maintainers; [ rollf ]; + platforms = lib.platforms.linux; teams = [ ]; }; } diff --git a/pkgs/development/gnuradio-modules/lora_sdr/default.nix b/pkgs/development/gnuradio-modules/lora_sdr/default.nix index 18ac1fc65e2a..84a5f0247236 100644 --- a/pkgs/development/gnuradio-modules/lora_sdr/default.nix +++ b/pkgs/development/gnuradio-modules/lora_sdr/default.nix @@ -15,13 +15,13 @@ mkDerivation { pname = "gr-lora_sdr"; - version = "unstable-2025-01-09"; + version = "0-unstable-2026-01-05"; src = fetchFromGitHub { owner = "tapparelj"; repo = "gr-lora_sdr"; - rev = "9befbad3e6120529918acf1a742e25465f6b95e4"; - hash = "sha256-9oBdzoS2aWWXmiUk5rI0gG3g+BJqUDgMu3/PmZSUkuU="; + rev = "862746dd1cf635c9c8a4bfbaa2c3a0ec3a5306c9"; + hash = "sha256-12IqFNMLvqTN2R8+M9bXiteG4nQ8TwIMECSQPpgKCxM="; }; disabled = gnuradioOlder "3.10"; diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index a1fbe4e7cc46..8751efdeae4f 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -3,6 +3,7 @@ stdenv, mkDerivation, fetchgit, + fetchpatch, gnuradio, cmake, pkg-config, @@ -34,6 +35,15 @@ mkDerivation rec { hash = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ="; }; + patches = [ + # Fixes build with boost 1.89, see: + # https://github.com/osmocom/gr-osmosdr/pull/29 + (fetchpatch { + url = "https://github.com/osmocom/gr-osmosdr/commit/06249f1f0930aa553ef8877b50503b9f5c77b4a0.patch"; + hash = "sha256-ofjuDvTT2PzRTR6UWchTQzmr9a83ka5TfUdlCBe4Is0="; + }) + ]; + disabled = gnuradioAtLeast "3.11"; outputs = [ diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index 373567d92cc5..a56dcd7dd4df 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -69,10 +69,14 @@ buildEnv { touch $out/.octave_packages for path in ${lib.concatStringsSep " " packages}; do if [ -e $path/*.tar.gz ]; then + # Glob-match here so that we grab the paths of all tarballs produced + # by "octave build" in buildOctavePackage's buildPhase. We can then + # Use this list later. + pkg_tarballs=($path/*.tar.gz) $out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \ pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \ pfx = pkg (\"prefix\"); \ - pkg install -nodeps -local $path/*.tar.gz" + pkg install -nodeps -local $pkg_tarballs" fi done diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 987a08f478ef..3d5a697f35d3 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -23,6 +23,7 @@ # Both are needed for discrete Fourier transform fftw, fftwSinglePrec, + fast-float, zlib, curl, rapidjson, @@ -99,12 +100,12 @@ let allPkgs = pkgs; in stdenv.mkDerivation (finalAttrs: { - version = "10.3.0"; + version = "11.1.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-L8s43AYuRA8eBsBpu8qEDtRtzI+YPkc+FVj8w4OE7ms="; + sha256 = "sha256-wOfiyRvFcyVkMbLMmJKQub0ThR263VnQrHRxTxM0sOY="; }; postPatch = '' @@ -155,6 +156,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fast-float ]; nativeBuildInputs = [ perl @@ -176,6 +180,8 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) NIX_LDFLAGS = "-lobjc"; + # https://savannah.gnu.org/bugs/index.php?68042 + NIX_CFLAGS_COMPILE = "-Wno-format-security"; } // lib.optionalAttrs use64BitIdx { # See https://savannah.gnu.org/bugs/?50339 diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 004d6c43e0b9..061763973722 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,13 +14,13 @@ buildDunePackage (finalAttrs: { pname = "ca-certs-nss"; - version = "3.118"; + version = "3.121"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${finalAttrs.version}/ca-certs-nss-${finalAttrs.version}.tbz"; - hash = "sha256-BthKUUeuf3jFRmQzw0U9SEbvRqcVc1UKHmb4+YePRio="; + hash = "sha256-KLFr7n9DORIkRHXud/xe61DkxKAKPZ1TopGCeK5h45w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 431bb391292e..91318f108b18 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -10,18 +10,19 @@ pytestCheckHook, setuptools, syrupy, + yarl, }: buildPythonPackage rec { pname = "accuweather"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "bieniu"; repo = "accuweather"; tag = version; - hash = "sha256-EM0DpFvToPgI0PSFYlJsQQ16Uh1qd0ARp1ucvUD16ss="; + hash = "sha256-IXsf78AN5Gl6itQBfxwMEWE0ggoUohD0RgMgsgLaXOI="; }; build-system = [ setuptools ]; @@ -29,6 +30,7 @@ buildPythonPackage rec { dependencies = [ aiohttp orjson + yarl ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index da593f8d434b..df6844e81a02 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.25.0"; + version = "3.26.0"; pyproject = true; src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-HluYC1wkWeh1HI77JV0vtZ5FcL9/mHEz4/D/Cg/eVVw="; + hash = "sha256-zhI84vLvL9enC5SGeK5u7OnFDxvlZDNkZ3MyVMFZTSU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix index 2116f1c96d33..3158dde61dee 100644 --- a/pkgs/development/python-modules/aiotankerkoenig/default.nix +++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, mashumaro, orjson, - poetry-core, + hatchling, pytest-asyncio, pytest-cov-stub, pytestCheckHook, @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiotankerkoenig"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "jpbede"; repo = "aiotankerkoenig"; tag = "v${version}"; - hash = "sha256-5rxK6K10kUWEq3RMN8ojQhoy+w7NNbh/9+v8Jl7w4Ak="; + hash = "sha256-TpSVRo8FWltZF5ZQx9kZ3mlJ1bEHVWmIdLVSyaKjj04="; }; postPatch = '' @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/aiowebdav2/default.nix b/pkgs/development/python-modules/aiowebdav2/default.nix index 0834cf207e66..45a1a2c945c4 100644 --- a/pkgs/development/python-modules/aiowebdav2/default.nix +++ b/pkgs/development/python-modules/aiowebdav2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiowebdav2"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "jpbede"; repo = "aiowebdav2"; tag = "v${version}"; - hash = "sha256-u4Iar5vmWttG42CrDpDS8SdxYGnpZT0NAmm9rXQI1sc="; + hash = "sha256-xByCfzIxHPo7yDvv14c91FNipKv6TkPvtaFmb2fG/5A="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/autodocsumm/default.nix b/pkgs/development/python-modules/autodocsumm/default.nix index 0b576f6bc422..a2cc266e2634 100644 --- a/pkgs/development/python-modules/autodocsumm/default.nix +++ b/pkgs/development/python-modules/autodocsumm/default.nix @@ -31,5 +31,7 @@ buildPythonPackage rec { homepage = "https://github.com/Chilipp/autodocsumm"; license = lib.licenses.asl20; maintainers = [ ]; + # https://github.com/Chilipp/autodocsumm/issues/108 + broken = lib.versionAtLeast sphinx.version "9.0"; }; } diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index 9399a4d7150e..fa41be45ee56 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -29,7 +29,6 @@ buildPythonPackage, pythonAtLeast, fetchFromGitHub, - fetchpatch, # build-system poetry-core, @@ -53,11 +52,6 @@ # native gobject-introspection, - sphinxHook, - sphinx-design, - sphinx-copybutton, - sphinx-toolbox, - pydata-sphinx-theme, # buildInputs gst_all_1, @@ -162,11 +156,6 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ gobject-introspection - sphinxHook - sphinx-design - sphinx-copybutton - sphinx-toolbox - pydata-sphinx-theme ] ++ extraNativeBuildInputs; @@ -178,19 +167,7 @@ buildPythonPackage (finalAttrs: { outputs = [ "out" - "doc" - "man" ]; - sphinxBuilders = [ - "html" - "man" - ]; - # Causes an installManPage error. Not clear why this directory gets generated - # with the manpages. The same directory is observed correctly in - # $doc/share/doc/beets-${version}/html - preInstallSphinx = '' - rm -r .sphinx/man/man/_sphinx_design_static - ''; postInstall = '' mkdir -p $out/share/zsh/site-functions diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 094a048247c6..24a3fadb1bd2 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -67,8 +67,11 @@ buildPythonPackage rec { "test_step_decorator_async_run_until_complete" ]; + # -e disables tags.help.feature from being executed (due to stdout formatting differences) postCheck = '' - ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ + ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' \ + -e tags.help.feature \ + features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ ''; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 8f7141e517fe..34be3e6498df 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.23"; + version = "3.24"; pyproject = true; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; tag = version; - hash = "sha256-dHP5nyumuQxAS3hkw4XRaLR3DMFn+WEFkLRbKBODIFo="; + hash = "sha256-AbkIVtUbQkkui7H1ZT/xHl1tCfZMvlrbZ2RD3YJAh0E="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index def50df00c0f..349136e602a7 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.21"; + version = "3.22"; pyproject = true; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; tag = version; - hash = "sha256-INqZwN3x5MzrACyaUOa2A7mrKvld9reN1PJVxkq837o="; + hash = "sha256-+Nq/7ftOD9/un9TYdrztbaUcBtDcfju36bkrDH57+ms="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index c7575f56d419..d9d95005fc8e 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "dsmr-parser"; - version = "1.4.4"; + version = "1.5"; pyproject = true; src = fetchFromGitHub { owner = "ndokter"; repo = "dsmr_parser"; - tag = "v${finalAttrs.version}"; - hash = "sha256-/N8w4X/XsJ0tfWLKnSa5oo24mT1tftaKxAocBoA8FWk="; + tag = "v.${finalAttrs.version}"; + hash = "sha256-+dv9V06o1kI6pX/Bq05JmUUvW+KoqauLaWqY6xhs6PE="; }; pythonRelaxDeps = [ "dlms_cosem" ]; diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix index fac894456263..9788809e6039 100644 --- a/pkgs/development/python-modules/fenics-dolfinx/default.nix +++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, - toPythonModule, - fetchFromGitHub, buildPythonPackage, # build-system @@ -16,7 +14,6 @@ # buildInputs dolfinx, - darwinMinVersionHook, # dependency numpy, @@ -87,8 +84,7 @@ buildPythonPackage (finalAttrs: { buildInputs = [ fenicsPackages.dolfinx - ] - ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3"); + ]; dependencies = [ numpy diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix deleted file mode 100644 index 6389d96bec6e..000000000000 --- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - - # build system - setuptools, - - # dependencies - jupyterlab, - numpy, - pandas, - plotly, - pydot, - torch, - - # tests - pytestCheckHook, - writableTmpDirAsHomeHook, -}: - -buildPythonPackage rec { - pname = "HolisticTraceAnalysis"; - version = "0.5.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = "HolisticTraceAnalysis"; - tag = "v${version}"; - hash = "sha256-3DuoP9gQ0vLlAAJ2uWw/oOEH/DTbn2xulzvqk4W3BiY="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - jupyterlab - numpy - pandas - plotly - pydot - torch - ]; - - nativeCheckInputs = [ - pytestCheckHook - writableTmpDirAsHomeHook - ]; - - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Permission denied: '/tmp/my_saved_cp_graph/trace_data.csv' - "test_critical_path_breakdown_and_save_restore" - # Fails under Python 3.12 on Darwin with I/O errors - # Permission denied: '/tmp/path_does_not_exist/...' - "test_critical_path_overlaid_trace" - # Permission error: [Errno 1] Operation not permitted - "test_get_mtia_aten_op_kernels_and_delay_inference_single_rank" - # No cuda on Darwin, can cause hangs in nixpkgs-review - "test_frequent_cuda_kernel_sequences" - "test_get_cuda_kernel_launch_stats_for_h100" - "test_get_cuda_kernel_launch_stats_inference_single_rank" - "test_get_cuda_kernel_launch_stats_training_multiple_ranks" - ]; - - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # Makes assumptions about the filesystem layout - "tests/test_config.py" - # EOFError -- makes assumptions about file I/O under Python 3.12 - # https://github.com/facebookresearch/HolisticTraceAnalysis/issues/300 - "tests/test_symbol_table.py" - ]; - - pythonImportsCheck = [ "hta" ]; - - meta = { - description = "Performance analysis tool to identify bottlenecks in distributed training workloads"; - homepage = "https://github.com/facebookresearch/HolisticTraceAnalysis"; - changelog = "https://github.com/facebookresearch/HolisticTraceAnalysis/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jherland ]; - }; -} diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 65e9a97b1d57..c25d79753eef 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202603021"; + version = "0.1.202603031"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-yoTwuKsGqmd5hXffswIfPp+eJNJoR3IES+/4TGap6vw="; + hash = "sha256-/kSoNHtnhdczU9gos+FY46ILx9OcjhBHTNDVv7T8LDY="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 4c82178aab11..df554a9b6079 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,14 +33,14 @@ buildPythonPackage (finalAttrs: { pname = "meshtastic"; - version = "2.7.7"; + version = "2.7.8"; pyproject = true; src = fetchFromGitHub { owner = "meshtastic"; repo = "python"; tag = finalAttrs.version; - hash = "sha256-dpO5mYdEagJ/dDiKV7vJMRdQAZN0GY7/Sf6/kkHRpCM="; + hash = "sha256-LAcBD7BUNzexq3kTY/fw2yPMq66T5+cPj9p3GeGH/Vw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyiceberg/default.nix b/pkgs/development/python-modules/pyiceberg/default.nix index 7487cae06d0c..49156390e087 100644 --- a/pkgs/development/python-modules/pyiceberg/default.nix +++ b/pkgs/development/python-modules/pyiceberg/default.nix @@ -60,14 +60,14 @@ buildPythonPackage (finalAttrs: { pname = "iceberg-python"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "iceberg-python"; tag = "pyiceberg-${finalAttrs.version}"; - hash = "sha256-sej0RJuoTnpX0DXC54RTacZNJIxzorcG4xlxByNUxc4="; + hash = "sha256-MjBvLJOnjtpIwBMkI+81S6aipye+PnbrC8T317Qj6rY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index dc0f48ee5e02..8a108dd588be 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "pynmeagps"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${finalAttrs.version}"; - hash = "sha256-78dbqH/Znr1utj1nctwuwabl/HiF1cQWq+obKj/RC5I="; + hash = "sha256-0Jgo2lQwftnJfzaaxN2dA9D1ACvWMuOLVac/P/I9ty4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysrdaligateway/default.nix b/pkgs/development/python-modules/pysrdaligateway/default.nix index c3f3a14a35e9..57b148571b87 100644 --- a/pkgs/development/python-modules/pysrdaligateway/default.nix +++ b/pkgs/development/python-modules/pysrdaligateway/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysrdaligateway"; - version = "0.20.2"; + version = "0.20.3"; pyproject = true; src = fetchFromGitHub { owner = "maginawin"; repo = "PySrDaliGateway"; tag = "v${version}"; - hash = "sha256-JZ4+HJ53p28iqr62E/SCW7/ohv4/skyvRaIea24+mzM="; + hash = "sha256-D98hT87xcLxwOKHgd0M4wIdQIrojxYhtEFlw3hkE2FI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-openevse-http/default.nix b/pkgs/development/python-modules/python-openevse-http/default.nix index bc1d7b5e044d..156d5aafc819 100644 --- a/pkgs/development/python-modules/python-openevse-http/default.nix +++ b/pkgs/development/python-modules/python-openevse-http/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "python-openevse-http"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "firstof9"; repo = "python-openevse-http"; tag = finalAttrs.version; - hash = "sha256-aI1IU9mGThg9tNAqdgKAG5miuVDQozWJoBaoy3cFhwY="; + hash = "sha256-HcrcjMJTDZz/5ijluv3Ow77A24jOWg26nlbq/mBcmAA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-xbox/default.nix b/pkgs/development/python-modules/python-xbox/default.nix index 0a4a40115ea8..1943f8c83c40 100644 --- a/pkgs/development/python-modules/python-xbox/default.nix +++ b/pkgs/development/python-modules/python-xbox/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - ecdsa, + cryptography, fetchFromGitHub, freezegun, hatch-regex-commit, @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-xbox"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "python-xbox"; tag = "v${version}"; - hash = "sha256-qSVUAjstTPIxpqF0eE4HhwvUf/Q9rD+pqw9CQUkF6ug="; + hash = "sha256-5sYN7w/cemZPMt8awsoaUPo845oXiiUsIfl8GG85Umw="; }; build-system = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; dependencies = [ - ecdsa + cryptography httpx ms-cv pydantic diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index e83a1845193b..0f2f70b19e68 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "sievelib"; - version = "1.4.3"; + version = "1.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bFemWvAc6WbJCxPlLxT7+acDd2egcbg4FHTMWrIxBPQ="; + hash = "sha256-Kvuq8lA6/pEt4IgeTFdzg+b5D4dikx+00y8rVBI85FA="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 7f8b316609a5..4e1409053443 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "soundcloud-v2"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "7x11x13"; repo = "soundcloud.py"; tag = "v${finalAttrs.version}"; - hash = "sha256-xx5F5xscPCbuN7T03zL5V9LLrTbpJnTF4lmUVEqBJA4="; + hash = "sha256-V+eEBMlzHbNM3dd+vBNkIvjwc+DdV8RZTasSggCv/jY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-toolbox/default.nix b/pkgs/development/python-modules/sphinx-toolbox/default.nix index f09dc61e58b3..82328a7efd23 100644 --- a/pkgs/development/python-modules/sphinx-toolbox/default.nix +++ b/pkgs/development/python-modules/sphinx-toolbox/default.nix @@ -11,6 +11,7 @@ dict2css, filelock, html5lib, + roman, ruamel-yaml, sphinx-autodoc-typehints, sphinx-jinja2-compat, @@ -19,13 +20,14 @@ tabulate, python, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "sphinx-toolbox"; version = "4.1.2"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinx_toolbox"; hash = "sha256-wwpPhsTCnpetsOuTN9NfUJPLlqRPScr/z31bxYqIt4E="; }; @@ -47,6 +49,7 @@ buildPythonPackage rec { dict2css filelock html5lib + roman ruamel-yaml sphinx-autodoc-typehints sphinx-jinja2-compat @@ -57,7 +60,7 @@ buildPythonPackage rec { # Not PEP420 compliant, some variables are imported from within the package. postFixup = '' - echo '__version__: str = "${version}"' > $out/${python.sitePackages}/sphinx_toolbox/__init__.py + echo '__version__: str = "${finalAttrs.version}"' > $out/${python.sitePackages}/sphinx_toolbox/__init__.py ''; meta = { @@ -66,4 +69,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index fca59a1bd40f..81b5e5b4c172 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.22.3.20251115"; + version = "0.22.3.20260223"; pyproject = true; src = fetchPypi { pname = "types_docutils"; inherit version; - hash = "sha256-D3nqanvU0S1WyfgkoAkP+uDqQgQgPrAAY5KQaFCRPhY="; + hash = "sha256-6Q6Gjagt9hXqIhfPNt/zHwlmDaoV/A+VavU/icE2RQE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix index f7730eda393e..d400055c5856 100644 --- a/pkgs/development/python-modules/types-regex/default.nix +++ b/pkgs/development/python-modules/types-regex/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "types-regex"; - version = "2026.2.19.20260221"; + version = "2026.2.28.20260301"; pyproject = true; src = fetchPypi { pname = "types_regex"; inherit (finalAttrs) version; - hash = "sha256-u+fQHX/c3O2nu+Kz4TUL556ddY9h+YqnsEgczFXOZ8s="; + hash = "sha256-ZEwjHbPzaJCDIBcMFJBXMaeuX6vawPYPXW0S7N07yN0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uhooapi/default.nix b/pkgs/development/python-modules/uhooapi/default.nix index edb18bd3354c..a6598f54644a 100644 --- a/pkgs/development/python-modules/uhooapi/default.nix +++ b/pkgs/development/python-modules/uhooapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "uhooapi"; - version = "1.2.6"; + version = "1.2.7"; pyproject = true; src = fetchFromGitHub { owner = "getuhoo"; repo = "uhooapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-DEb54ZoYe9CaxpCoQVpqbQlaZkDLuqRAjiu8SqiI6b0="; + hash = "sha256-3t9c4KomP5aQlU80AeQ5FK7XtgLWs7PdeDIwscf+k3g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vllm/0006-drop-rocm-extra-reqs.patch b/pkgs/development/python-modules/vllm/0006-drop-rocm-extra-reqs.patch new file mode 100644 index 000000000000..762cec20f976 --- /dev/null +++ b/pkgs/development/python-modules/vllm/0006-drop-rocm-extra-reqs.patch @@ -0,0 +1,20 @@ +diff --git a/requirements/rocm.txt b/requirements/rocm.txt +index 375f0a019..04a59dc3b 100644 +--- a/requirements/rocm.txt ++++ b/requirements/rocm.txt +@@ -9,4 +9,2 @@ ray[cgraph]>=2.48.0 # Ray Compiled Graph, required for pipeline parallelism in V1. + peft +-pytest-asyncio +-tensorizer==2.10.1 + packaging>=24.2 +@@ -12,6 +10,2 @@ tensorizer==2.10.1 + packaging>=24.2 +-setuptools>=77.0.3,<80.0.0 +-setuptools-scm>=8 +-runai-model-streamer[s3,gcs]==0.15.3 +-conch-triton-kernels==1.2.1 + timm>=1.0.17 + grpcio-tools>=1.76.0 +@@ -17,2 +13,1 @@ conch-triton-kernels==1.2.1 + timm>=1.0.17 +-grpcio-tools>=1.76.0 diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 30b05b17a6da..4797383a3c17 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -27,12 +27,14 @@ # dependencies aioprometheus, + amdsmi, anthropic, bitsandbytes, blake3, cachetools, cbor2, compressed-tensors, + datasets, depyf, einops, fastapi, @@ -58,6 +60,7 @@ outlines, pandas, partial-json-parser, + peft, prometheus-fastapi-instrumentator, py-cpuinfo, pyarrow, @@ -70,6 +73,7 @@ sentencepiece, setproctitle, tiktoken, + timm, tokenizers, torch, torchaudio, @@ -294,7 +298,7 @@ let else if cudaSupport then gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities else if rocmSupport then - rocmPackages.clr.gpuTargets + rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets else throw "No GPU targets specified" ); @@ -311,6 +315,13 @@ let libcublas ]; + # header path ends up missing rocthrust & its deps + rocmExtraIncludeFlags = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [ + rocmPackages.rocthrust + rocmPackages.rocprim + rocmPackages.hipcub + ]; + # Some packages are not available on all platforms nccl = shouldUsePkg (cudaPackages.nccl or null); @@ -338,6 +349,7 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { ./0002-setup.py-nix-support-respect-cmakeFlags.patch ./0003-propagate-pythonpath.patch ./0005-drop-intel-reqs.patch + ./0006-drop-rocm-extra-reqs.patch ]; postPatch = '' @@ -413,6 +425,16 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { rocprim hipsparse hipblas + rocrand + hiprand + rocblas + miopen-hip + hipfft + hipcub + hipsolver + rocsolver + hipblaslt + rocm-runtime ] ) ++ lib.optionals stdenv.cc.isClang [ @@ -485,6 +507,13 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { cupy flashinfer nvidia-ml-py + ] + ++ lib.optionals rocmSupport [ + rocmPackages.rocminfo + amdsmi + datasets + peft + timm ]; optional-dependencies = { @@ -523,9 +552,12 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { } // lib.optionalAttrs rocmSupport { VLLM_TARGET_DEVICE = "rocm"; - # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing. - PYTORCH_ROCM_ARCH = lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets; - ROCM_HOME = "${rocmPackages.clr}"; + PYTORCH_ROCM_ARCH = gpuTargetString; + # vLLM's CMake logic checks `ROCM_PATH` to decide whether HIP/ROCm is available. + ROCM_PATH = "${rocmPackages.clr}"; + TRITON_KERNELS_SRC_DIR = "${lib.getDev triton-kernels}/python/triton_kernels/triton_kernels"; + HIPFLAGS = rocmExtraIncludeFlags; + CXXFLAGS = rocmExtraIncludeFlags; } // lib.optionalAttrs cpuSupport { VLLM_TARGET_DEVICE = "cpu"; @@ -558,6 +590,7 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { happysalada lach daniel-fahey + LunNova # esp. for ROCm ]; badPlatforms = [ # CMake Error at cmake/cpu_extension.cmake:188 (message): diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 865c8c4d6ec1..ead691a159f1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.31.0"; + version = "3.32.0"; pyproject = true; src = fetchFromGitHub { owner = "ietf-tools"; repo = "xml2rfc"; tag = "v${version}"; - hash = "sha256-thgLt1PHXbKxDDhqQcHUP/AZsGq/OfAOSRV9KrFmPWw="; + hash = "sha256-3SE54ihJY5zs4YIROalHhKoeCiXCk6wYgaOBHEP3ze0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index b190154ac3eb..5440e47e84a9 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -1,7 +1,6 @@ { lib, async-interrupt, - async-timeout, bleak, bleak-retry-connector, buildPythonPackage, @@ -16,21 +15,20 @@ buildPythonPackage (finalAttrs: { pname = "yalexs-ble"; - version = "3.2.6"; + version = "3.2.7"; pyproject = true; src = fetchFromGitHub { - owner = "bdraco"; + owner = "Yale-Libs"; repo = "yalexs-ble"; tag = "v${finalAttrs.version}"; - hash = "sha256-kk9D6433xh4MRbpdJpep7XdEEO0rsEUS3I94iBjQ6kM="; + hash = "sha256-8Y2ix5ikrWC9taCHJhg8Irt3PGOiH+OzqLRSVW/q8Gs="; }; build-system = [ poetry-core ]; dependencies = [ async-interrupt - async-timeout bleak bleak-retry-connector cryptography @@ -47,8 +45,8 @@ buildPythonPackage (finalAttrs: { meta = { description = "Library for Yale BLE devices"; - homepage = "https://github.com/bdraco/yalexs-ble"; - changelog = "https://github.com/bdraco/yalexs-ble/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + homepage = "https://github.com/Yale-Libs/yalexs-ble"; + changelog = "https://github.com/Yale-Libs/yalexs-ble/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 755d64cc780d..b7f738c1d92c 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system hatchling, @@ -11,25 +11,61 @@ donfig, numpy, numcodecs, + google-crc32c, packaging, typing-extensions, - # tests - hypothesis, - pytest-asyncio, - pytest-xdist, + # optional-dependencies + # remote + fsspec, + obstore ? null, # TODO: Package + # gpu + cupy, + # cli + typer, + # test pytestCheckHook, + pytest-asyncio, + pytest-cov, + pytest-accept ? null, # TODO: Package + rich, + mypy, + numpydoc, + hypothesis, + pytest-xdist, tomlkit, + uv, + # remote_tests + botocore, + s3fs, + moto, + requests, + # optional + universal-pathlib, + # docs + mkdocs-material, + mkdocs, + mkdocstrings, + mkdocstrings-python, + mike, + mkdocs-redirects, + markdown-exec ? null, # TODO: Package + griffe-inherited-docstrings ? null, # TODO: Package, + ruff, + towncrier, + astroid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zarr"; - version = "3.1.1"; + version = "3.1.5"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-F9ty838kiUUtITesiRxBM7j5dvkYnY79PnXzs63YTow="; + src = fetchFromGitHub { + owner = "zarr-developers"; + repo = "zarr-python"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1Kx8gN1JiaY4eHmwpdilvJ8+NdnzxhDvn7YZjphgtZw="; }; build-system = [ @@ -40,35 +76,100 @@ buildPythonPackage rec { dependencies = [ donfig numcodecs + google-crc32c numpy packaging typing-extensions - ] - ++ numcodecs.optional-dependencies.crc32c; + ]; + + passthru = { + optional-dependencies = { + remote = [ + fsspec + obstore + ]; + gpu = [ + cupy + ]; + cli = [ + typer + ]; + # Development extras + test = [ + #pytest + pytest-asyncio + pytest-cov + pytest-accept + rich + mypy + numpydoc + hypothesis + # From some reason the existence of pytest-xdist makes the tests fail + # depending on $NIX_BUILD_CORES + #pytest-xdist + packaging + tomlkit + uv + ]; + remote_tests = [ + botocore + s3fs + moto + requests + ] + ++ moto.optional-dependencies.server + ++ moto.optional-dependencies.s3; + optional = [ + rich + universal-pathlib + ]; + docs = [ + # Doc building + mkdocs-material + mkdocs + mkdocstrings + mkdocstrings-python + mike + mkdocs-redirects + markdown-exec + griffe-inherited-docstrings + ruff + towncrier # Changelog generation + # Optional dependencies to run examples + rich + s3fs + astroid + #pytest + ] + ++ mkdocs-material.optional-dependencies.imaging + ++ markdown-exec.optional-dependencies.ansi + ++ numcodecs.optional-dependencies.msgpack; + }; + }; nativeCheckInputs = [ - hypothesis - pytest-asyncio - pytest-xdist pytestCheckHook - tomlkit - ]; + ] + ++ finalAttrs.finalPackage.passthru.optional-dependencies.cli + # Not adding `passthru.optional-dependencies.remote{,_tests}` since the + # existence of these Python modules triggers tests that fail in the sandbox + # due to failed network requests. + ++ finalAttrs.finalPackage.passthru.optional-dependencies.test; disabledTestPaths = [ # requires uv and then fails at setting up python envs - "tests/test_examples.py" + "tests/test_examples.py::test_scripts_can_run[script_path0]" + # Requires zarr==2.x to generate zarr stores for the tests + "tests/test_regression" ]; pythonImportsCheck = [ "zarr" ]; - # FIXME remove once zarr's reverse dependencies support v3 - passthru.skipBulkUpdate = true; - meta = { description = "Implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; - changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; + changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index e58951b2048c..aead6cec9440 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.19.5"; # zen + version = "6.18.13"; # zen suffix = "zen1"; # zen - sha256 = "1fv0mpjqpmama7a9jqwl3c00zd70s8zzwy9z0b8sgx95lr9g2i0k"; # zen + sha256 = "0x6s3pa7c6zlvr3w2fv6i15v54cy1pschvgk7b4vrzx1bcrjdxf7"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix index 627621cf801d..59c204316e5f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "yesoreyeram-infinity-datasource"; - version = "3.7.1"; - zipHash = "sha256-jXK5Rw6IpX1ZCc1TZ0oU9RbmwDM2lxAxbfHIq00WZhU="; + version = "3.7.3"; + zipHash = "sha256-fsBbEbb8Uys/w/vnMN15WDpYbw4heztH5G30ol2uD0g="; meta = { description = "Visualize data from JSON, CSV, XML, GraphQL and HTML endpoints in Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index 283873a2485f..8dd87f358533 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "14.21"; - rev = "refs/tags/REL_14_21"; - hash = "sha256-9uG32BVzXOL2yAJmFVkIvEZJrmI5ToL7ojtivWmufL8="; + version = "14.22"; + rev = "refs/tags/REL_14_22"; + hash = "sha256-0vZEdsrj2WAdXFpZAli5sd0liAfvp9/Os93GjVTy7wk="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index bb0043b7d2a9..ce7fa81ed7f2 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "15.16"; - rev = "refs/tags/REL_15_16"; - hash = "sha256-ju/KkeBOumYHCarhqNA8jq+ceUo4y8g/SzjAMWm80ak="; + version = "15.17"; + rev = "refs/tags/REL_15_17"; + hash = "sha256-IxvCNJfTbbKT/2dFnNLk3fNUYDaRwHQeeAmvGc1w/OY="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 56176de6f674..45e381ced790 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "16.12"; - rev = "refs/tags/REL_16_12"; - hash = "sha256-1jkVElZTtp60Jgl5RyPT+8lalDYtjRDe9MxO3KMYJmU="; + version = "16.13"; + rev = "refs/tags/REL_16_13"; + hash = "sha256-Ue117xTq4RMQfq70mnXRBwqJ+IUigW27FvHY7I519ng="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index b6419a41a48d..c0238d083db9 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "17.8"; - rev = "refs/tags/REL_17_8"; - hash = "sha256-4lV1/xRmMsc5rgY3RB6WMigTXHgHjh9bmR6nzL82Rs4="; + version = "17.9"; + rev = "refs/tags/REL_17_9"; + hash = "sha256-kmESMgxYL5FsDjg3MLHaginIu6IWMo20kNdOLMM1x4w="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix index 22b652ca1c07..babdf3866792 100644 --- a/pkgs/servers/sql/postgresql/18.nix +++ b/pkgs/servers/sql/postgresql/18.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "18.2"; - rev = "refs/tags/REL_18_2"; - hash = "sha256-cvBXxA7/kEwDGxFv/YoZCIh17jzUujrCtfKAmtSxKTw="; + version = "18.3"; + rev = "refs/tags/REL_18_3"; + hash = "sha256-3cu3oyPJ5q6ewv7RFY7Nys5l+10dsQv5f1HNIoYtrO8="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 300ebaf928c6..ec9970293e7d 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.25.1"; + version = "2.25.2"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-/Pjv8YnUBVu3lIymYQf2ILXjiO3yNSalPca3/p1t9R4="; + hash = "sha256-PtkeGuBWGYMiacVUnJcM+jDDNxis9IQTcwQuaaUqMvE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d037616dd5a2..62633935060c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1380,6 +1380,7 @@ mapAliases { nekoray = lib.warnOnInstantiate "nekoray has been renamed to throne" throne; # Added 2025-11-10 neo4j-desktop = throw "neo4j-desktop has been removed as it was out-of-date"; # Added 2025-11-01 neocities-cli = throw "'neocities-cli' has been renamed to/replaced by 'neocities'"; # Converted to throw 2025-10-27 + neofetch = throw "'neofetch' has been removed because it is unmaintained upstream. Consider using 'fastfetch' instead."; # Added 2026-03-02 netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14 netbsdCross = throw "'netbsdCross' has been renamed to/replaced by 'netbsd'"; # Converted to throw 2025-10-27 netsurf.browser = throw "'netsurf.browser' has been renamed to/replaced by 'netsurf-browser'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ed64c7fd077..7074fcb2adcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8831,9 +8831,6 @@ with pkgs; } ); - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { }; - raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { }; - rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6f66261976e6..e7a981d26262 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -236,6 +236,7 @@ mapAliases { heif-image-plugin = throw "heif-image-plugin has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17 hglib = throw "'hglib' has been renamed to/replaced by 'python-hglib'"; # Converted to throw 2025-10-29 hijri-converter = hijridate; # added 2025-08-07 + holistic-trace-analysis = throw "'holistic-trace-analysis' was removed because there is no such package on PyPI"; # added 2026-02-28 homeassistant-bring-api = throw "'homeassistant-bring-api' has been renamed to/replaced by 'bring-api'"; # Converted to throw 2025-10-29 HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29 IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b0ed7cde76f..3a4def1ce85d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7054,8 +7054,6 @@ self: super: with self; { holidays = callPackage ../development/python-modules/holidays { }; - holistic-trace-analysis = callPackage ../development/python-modules/holistic-trace-analysis { }; - hologram = callPackage ../development/python-modules/hologram { }; holoviews = callPackage ../development/python-modules/holoviews { };