diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 12301021e9c8..5d86e5f90ac2 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -263,6 +263,11 @@ lib.mapAttrs mkLicense ( fullName = "Lawrence Berkeley National Labs BSD variant license"; }; + bsd3Modification = { + spdxId = "BSD-3-Clause-Modification"; + fullName = "BSD 3-Clause Modification"; + }; + bsd3ClauseTso = { spdxId = "BSD-3-Clause-Tso"; fullName = "BSD 3-Clause Tso variant"; diff --git a/nixos/lib/testing/call-test.nix b/nixos/lib/testing/call-test.nix index b85cdaf49244..ee8d7d487f0d 100644 --- a/nixos/lib/testing/call-test.nix +++ b/nixos/lib/testing/call-test.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkOption types; + inherit (lib) mkOption; unsafeGetAttrPosStringOr = default: name: value: diff --git a/nixos/lib/testing/interactive.nix b/nixos/lib/testing/interactive.nix index 959cf463160c..4088cc2abfc1 100644 --- a/nixos/lib/testing/interactive.nix +++ b/nixos/lib/testing/interactive.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkOption types; + inherit (lib) mkOption; in { options = { diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index b05505687193..515c3795a9fe 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -9,7 +9,6 @@ { config, lib, ... }: let inherit (lib) - mkDefault mkIf mkOption stringAfter diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix index 928ed0c2c9b6..630c0f096ec1 100644 --- a/nixos/modules/config/nix-remote-build.nix +++ b/nixos/modules/config/nix-remote-build.nix @@ -15,7 +15,6 @@ let filter getVersion mkIf - mkMerge mkOption optional optionalString diff --git a/nixos/modules/config/stub-ld.nix b/nixos/modules/config/stub-ld.nix index 277ed7594566..2e61ad50a18c 100644 --- a/nixos/modules/config/stub-ld.nix +++ b/nixos/modules/config/stub-ld.nix @@ -7,7 +7,6 @@ let inherit (lib) - optionalString mkOption types mkIf diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 56ff03aefec1..8291f55f37cb 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -11,10 +11,8 @@ let any attrNames attrValues - boolToString concatMap concatMapStringsSep - concatStrings elem filter filterAttrs @@ -39,12 +37,10 @@ let mkRenamedOptionModule optional optionals - sort stringAfter stringLength trace types - versionOlder xor ; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index cefe69707a17..3fd6e126cc1c 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -17,7 +17,6 @@ let cleanSourceFilter concatMapStringsSep evalModules - filter functionArgs hasSuffix isAttrs diff --git a/nixos/modules/programs/bat.nix b/nixos/modules/programs/bat.nix index d3fe0096c13d..cbe6ac48e909 100644 --- a/nixos/modules/programs/bat.nix +++ b/nixos/modules/programs/bat.nix @@ -16,7 +16,6 @@ let mkOption mkPackageOption nameValuePair - optionalString types isBool boolToString diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index 92f5aa8d66b2..4929681b56b7 100644 --- a/nixos/modules/security/apparmor/includes.nix +++ b/nixos/modules/security/apparmor/includes.nix @@ -5,7 +5,7 @@ ... }: let - inherit (builtins) attrNames hasAttr isAttrs; + inherit (builtins) hasAttr isAttrs; inherit (lib) getLib; inherit (config.environment) etc; # Utility to generate an AppArmor rule diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index a2a5cb366850..a18af9f85ae7 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -147,7 +147,7 @@ in (lib.mkIf cfg.enable { warnings = [ '' - The `security.dhparam` module is deprecated and scheduled for removal in NixOS 26.11. + The `security.dhparams` module is deprecated and scheduled for removal in NixOS 26.11. Generating your own params has been shown to be problematic in RFC 7919 (2016). Remove any uses of DHE and migrate to ECDHE (RFC 8422, 2018) and diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 254e6f500ede..b4913eab102e 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -7,8 +7,6 @@ let cfg = config.services.rabbitmq; - inherit (builtins) concatStringsSep; - config_file_content = lib.generators.toKeyValue { } cfg.configItems; config_file = pkgs.writeText "rabbitmq.conf" config_file_content; diff --git a/nixos/modules/services/audio/tts.nix b/nixos/modules/services/audio/tts.nix index 554256e6d246..85457fc05839 100644 --- a/nixos/modules/services/audio/tts.nix +++ b/nixos/modules/services/audio/tts.nix @@ -99,7 +99,6 @@ in mapAttrs' nameValuePair optionalString - concatMapStringsSep escapeShellArgs ; in diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index 4b705b3fb88b..c44fc48836ce 100644 --- a/nixos/modules/services/backup/btrbk.nix +++ b/nixos/modules/services/backup/btrbk.nix @@ -11,7 +11,6 @@ let concatMapStringsSep concatStringsSep filterAttrs - flatten getAttr isAttrs literalExpression diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 414483a85fe7..43f522c2aa82 100644 --- a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -13,8 +13,6 @@ }: let inherit (lib) - filterAttrs - literalExpression mkIf mkOption mkRemovedOptionModule diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index 20c5deb02e8e..2cbf44f9f3dc 100644 --- a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -11,7 +11,7 @@ ... }: let - inherit (lib) mkIf mkDefault; + inherit (lib) mkIf; cfg = config.services.hercules-ci-agent; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 2161fc13ea59..7ddb083f6a10 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -9,7 +9,6 @@ let inherit (lib) concatStringsSep flip - literalMD literalExpression optionalAttrs optionals @@ -19,7 +18,6 @@ let mkIf mkOption types - versionAtLeast ; cfg = config.services.cassandra; diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index 17c1dd9045e8..30bb7375cb20 100644 --- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -9,7 +9,6 @@ let inherit (lib) mkEnableOption mkIf - mkRenamedOptionModule teams ; in diff --git a/nixos/modules/services/games/armagetronad.nix b/nixos/modules/services/games/armagetronad.nix index 17e449beb547..0066e7fc41f6 100644 --- a/nixos/modules/services/games/armagetronad.nix +++ b/nixos/modules/services/games/armagetronad.nix @@ -16,7 +16,6 @@ let mapAttrsToList filterAttrs unique - recursiveUpdate types ; diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index 56b29a311497..572c5a4bb324 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -7,10 +7,8 @@ let inherit (lib) - literalExpression mkIf mkOption - singleton types mkPackageOption ; diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index d55f736b3bed..8e4b5ce1de2d 100644 --- a/nixos/modules/services/misc/packagekit.nix +++ b/nixos/modules/services/misc/packagekit.nix @@ -13,7 +13,6 @@ let mkOption mkIf mkRemovedOptionModule - types listToAttrs recursiveUpdate ; diff --git a/nixos/modules/services/monitoring/metricbeat.nix b/nixos/modules/services/monitoring/metricbeat.nix index c8e2f4c7773c..b3ff2ce85910 100644 --- a/nixos/modules/services/monitoring/metricbeat.nix +++ b/nixos/modules/services/monitoring/metricbeat.nix @@ -8,7 +8,6 @@ let inherit (lib) attrValues - literalExpression mkEnableOption mkPackageOption mkIf diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 4e52894b6425..ea3bb4ea2b52 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -33,7 +33,6 @@ let isAttrs isString isInt - isList typeOf hashString ; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bird.nix b/nixos/modules/services/monitoring/prometheus/exporters/bird.nix index 78174385d0d0..8f4c34ceaaee 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bird.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bird.nix @@ -12,7 +12,6 @@ let mkOption types concatStringsSep - singleton ; in { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix index 939d2bcf3b7b..57985b699c7b 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix @@ -7,7 +7,7 @@ let cfg = config.services.prometheus.exporters.deluge; - inherit (lib) mkOption types concatStringsSep; + inherit (lib) mkOption types; in { port = 9354; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix b/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix index ebe17e08aeac..0792b8c84dde 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix @@ -12,7 +12,6 @@ let mkOption mkMerge types - concatStringsSep ; in { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix b/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix index 2d38a5023a0f..398a0729c70d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix @@ -13,7 +13,6 @@ let mkIf types concatStringsSep - any optionalString ; moonraker = config.services.moonraker; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix index e1015b3ce764..baa5f7a4890d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix @@ -12,7 +12,6 @@ let mkOption mkIf mkForce - cli concatStringsSep optionalString escapeShellArgs diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix b/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix index bf3d6ffa8ec9..ad70f3e90ccd 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix @@ -8,7 +8,6 @@ let cfg = config.services.prometheus.exporters.nvidia-gpu; inherit (lib) - types concatStringsSep ; in diff --git a/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/nixos/modules/services/monitoring/prometheus/exporters/script.nix index 2658c27c720d..561ecf38573a 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/script.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/script.nix @@ -10,7 +10,6 @@ let cfg = config.services.prometheus.exporters.script; inherit (lib) mkOption - types literalExpression concatStringsSep ; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index c93d0d8c37bb..ebfb12867e35 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -9,7 +9,6 @@ let cfg = config.services.zabbixAgent; inherit (lib) - mkDefault mkEnableOption mkPackageOption mkIf @@ -18,9 +17,7 @@ let ; inherit (lib) attrValues - concatMapStringsSep literalExpression - optionalString types ; inherit (lib.generators) toKeyValue; diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 29578cfb14ee..6f1c8f87dbbf 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -22,7 +22,6 @@ let ; inherit (lib) attrValues - concatMapStringsSep getName literalExpression optional diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 50a33d26d827..e4f4e3b82930 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -22,7 +22,6 @@ let ; inherit (lib) attrValues - concatMapStringsSep getName literalExpression optional diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 2a1460a8eef0..8f6e0b47ffcc 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -8,7 +8,6 @@ let inherit (lib.attrsets) optionalAttrs; inherit (lib.generators) toINIWithGlobalSection; - inherit (lib.lists) optional; inherit (lib.modules) mkIf mkRemovedOptionModule; inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.strings) escape; @@ -16,7 +15,6 @@ let attrsOf bool int - lines oneOf str submodule diff --git a/nixos/modules/services/networking/cloudflare-ddns.nix b/nixos/modules/services/networking/cloudflare-ddns.nix index 438794dc5dd7..183ead4a0f0c 100644 --- a/nixos/modules/services/networking/cloudflare-ddns.nix +++ b/nixos/modules/services/networking/cloudflare-ddns.nix @@ -9,7 +9,6 @@ let boolToString = b: if b then "true" else "false"; formatList = l: lib.concatStringsSep "," l; - formatDuration = d: d.String; in { options.services.cloudflare-ddns = { @@ -266,7 +265,6 @@ in let toEnv = name: value: "${name}=\"${toString value}\""; toEnvList = name: value: "${name}=\"${formatList value}\""; - toEnvDuration = name: value: "${name}=\"${formatDuration value}\""; toEnvBool = name: value: "${name}=\"${boolToString value}\""; toEnvMaybe = pred: name: value: diff --git a/nixos/modules/services/networking/ghostunnel.nix b/nixos/modules/services/networking/ghostunnel.nix index ea087d699e70..72d1494632ea 100644 --- a/nixos/modules/services/networking/ghostunnel.nix +++ b/nixos/modules/services/networking/ghostunnel.nix @@ -7,17 +7,13 @@ let inherit (lib) attrValues - concatMap concatStringsSep escapeShellArg - literalExpression - mapAttrs' mkDefault mkEnableOption mkPackageOption mkIf mkOption - nameValuePair optional types ; diff --git a/nixos/modules/services/networking/go-camo.nix b/nixos/modules/services/networking/go-camo.nix index 3bf4687895f2..d360b0cc6eed 100644 --- a/nixos/modules/services/networking/go-camo.nix +++ b/nixos/modules/services/networking/go-camo.nix @@ -11,7 +11,6 @@ let mkOption mkEnableOption mkIf - mkMerge types optionalString ; diff --git a/nixos/modules/services/networking/https-dns-proxy.nix b/nixos/modules/services/networking/https-dns-proxy.nix index 4e8f81888cc2..1d735c906d10 100644 --- a/nixos/modules/services/networking/https-dns-proxy.nix +++ b/nixos/modules/services/networking/https-dns-proxy.nix @@ -9,7 +9,6 @@ let inherit (lib) concatStringsSep mkEnableOption - mkIf mkOption types ; diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index cf8ff650eea0..6da0c2ae424c 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -11,7 +11,6 @@ let mkPackageOption mkIf mkOption - types recursiveUpdate optionalAttrs ; diff --git a/nixos/modules/services/networking/mtr-exporter.nix b/nixos/modules/services/networking/mtr-exporter.nix index e7c8bea4499b..f82a982fd7c7 100644 --- a/nixos/modules/services/networking/mtr-exporter.nix +++ b/nixos/modules/services/networking/mtr-exporter.nix @@ -9,7 +9,6 @@ let inherit (lib) maintainers types - literalExpression escapeShellArg escapeShellArgs mkEnableOption @@ -17,7 +16,6 @@ let mkRemovedOptionModule mkIf mkPackageOption - optionalString concatMapStrings concatStringsSep ; diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix index c91454f1e605..7afcba232989 100644 --- a/nixos/modules/services/networking/wireguard-networkd.nix +++ b/nixos/modules/services/networking/wireguard-networkd.nix @@ -9,7 +9,6 @@ let inherit (lib) types; inherit (lib.attrsets) filterAttrs - mapAttrs mapAttrs' mapAttrsToList nameValuePair diff --git a/nixos/modules/services/search/typesense.nix b/nixos/modules/services/search/typesense.nix index 8556bacd0a7a..bd53f6a9fb3f 100644 --- a/nixos/modules/services/search/typesense.nix +++ b/nixos/modules/services/search/typesense.nix @@ -12,7 +12,6 @@ let mkIf mkOption mkPackageOption - optionalString types ; diff --git a/nixos/modules/services/security/spire/agent.nix b/nixos/modules/services/security/spire/agent.nix index dc5cfa7a992e..5a5d1112b448 100644 --- a/nixos/modules/services/security/spire/agent.nix +++ b/nixos/modules/services/security/spire/agent.nix @@ -150,7 +150,7 @@ in Restart = "on-failure"; StateDirectory = "spire/agent"; StateDirectoryMode = "0700"; - RuntimeDirectory = "spire/agent"; + RuntimeDirectory = "spire/agent/public"; # TODO: Switch to DynamicUser once https://github.com/NixOS/nixpkgs/issues/299476 lands # Without it, the systemd plugin can not talk to dbus diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 5dfc3bed844f..f65163978299 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -6,7 +6,7 @@ }: let - inherit (lib) mkOption types; + inherit (lib) mkOption; inherit (lib.types) listOf str; cfg = config.services.kerberos_server; inherit (config.security.krb5) package; diff --git a/nixos/modules/services/torrent/bitmagnet.nix b/nixos/modules/services/torrent/bitmagnet.nix index 13369dab1f79..2d8ce218d427 100644 --- a/nixos/modules/services/torrent/bitmagnet.nix +++ b/nixos/modules/services/torrent/bitmagnet.nix @@ -15,7 +15,6 @@ let ; inherit (lib.types) bool - int port str submodule diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix index f51b0c9a0dba..5e9bbbd1d8c4 100644 --- a/nixos/modules/services/web-apps/actual.nix +++ b/nixos/modules/services/web-apps/actual.nix @@ -8,7 +8,6 @@ let inherit (lib) getExe - mkDefault mkEnableOption mkIf mkOption diff --git a/nixos/modules/services/web-apps/cook-cli.nix b/nixos/modules/services/web-apps/cook-cli.nix index e1addb21318e..e775037fbaf3 100644 --- a/nixos/modules/services/web-apps/cook-cli.nix +++ b/nixos/modules/services/web-apps/cook-cli.nix @@ -9,11 +9,7 @@ let cfg = config.services.cook-cli; inherit (lib) mkIf - mkEnableOption - mkPackageOption - mkOption getExe - types ; in { diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 00daaaa74c94..7df3a71cd4e9 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -8,7 +8,7 @@ with lib; let - inherit (lib.options) showOption showFiles; + inherit (lib.options) showFiles; cfg = config.services.dokuwiki; eachSite = cfg.sites; diff --git a/nixos/modules/services/web-apps/drupal.nix b/nixos/modules/services/web-apps/drupal.nix index 3b307327a6d7..b071e465145a 100644 --- a/nixos/modules/services/web-apps/drupal.nix +++ b/nixos/modules/services/web-apps/drupal.nix @@ -33,7 +33,6 @@ let inherit (pkgs) mariadb stdenv - writeShellScript ; cfg = config.services.drupal; eachSite = cfg.sites; diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 6dc6c26bc089..ec54b98cdf0e 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -20,7 +20,6 @@ let concatMapStringsSep getExe mkMerge - mkDefault ; in { diff --git a/nixos/modules/services/web-apps/meme-bingo-web.nix b/nixos/modules/services/web-apps/meme-bingo-web.nix index 5bda9afcf88d..83d9bbdc04e9 100644 --- a/nixos/modules/services/web-apps/meme-bingo-web.nix +++ b/nixos/modules/services/web-apps/meme-bingo-web.nix @@ -12,7 +12,6 @@ let mkIf mkOption types - literalExpression ; cfg = config.services.meme-bingo-web; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index bad9c0d95337..2fd1332d5f9b 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -13,7 +13,6 @@ let types literalExpression mkIf - mkDefault ; cfg = config.services.miniflux; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 037792be9c82..4967587aa5b4 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -17,9 +17,7 @@ let types ; inherit (lib) - concatStringsSep literalExpression - mapAttrsToList optional optionalString ; diff --git a/nixos/modules/services/web-apps/open-web-calendar.nix b/nixos/modules/services/web-apps/open-web-calendar.nix index f136ef8b75f5..98976d81b960 100644 --- a/nixos/modules/services/web-apps/open-web-calendar.nix +++ b/nixos/modules/services/web-apps/open-web-calendar.nix @@ -13,8 +13,6 @@ let mkPackageOption mkDefault types - concatMapStringsSep - generators ; cfg = config.services.open-web-calendar; diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index 5045da9a89d5..184787d94c0e 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -7,7 +7,6 @@ let inherit (lib) - literalExpression mkEnableOption mkIf mkOption diff --git a/nixos/modules/services/web-apps/porn-vault/default.nix b/nixos/modules/services/web-apps/porn-vault/default.nix index e493e5de7b84..a676daeb4904 100644 --- a/nixos/modules/services/web-apps/porn-vault/default.nix +++ b/nixos/modules/services/web-apps/porn-vault/default.nix @@ -11,12 +11,8 @@ let defaultConfig = import ./default-config.nix; inherit (lib) mkIf - mkEnableOption - mkPackageOption mkOption getExe - literalExpression - types ; in { diff --git a/nixos/modules/services/web-apps/rimgo.nix b/nixos/modules/services/web-apps/rimgo.nix index 47aaf5317b2d..21c5b9ec5b5a 100644 --- a/nixos/modules/services/web-apps/rimgo.nix +++ b/nixos/modules/services/web-apps/rimgo.nix @@ -10,7 +10,6 @@ let mkOption mkEnableOption mkPackageOption - mkDefault mkIf types literalExpression diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix index b2969ed1bcfa..3a0f66185ea1 100644 --- a/nixos/modules/services/web-apps/writefreely.nix +++ b/nixos/modules/services/web-apps/writefreely.nix @@ -15,7 +15,6 @@ let ; inherit (lib) optional - optionals optionalAttrs optionalString ; diff --git a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix index 09ddc3fffc56..ffa5dede1194 100644 --- a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix +++ b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix @@ -3,7 +3,6 @@ let inherit (lib) genAttrs - maintainers mkAliasOptionModule mkEnableOption mkIf diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 57a91fe09159..7cf6dfaebaf9 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (lib) mkOption types; + inherit (lib) mkOption; cfg = config.services.xserver.windowManager; in diff --git a/nixos/modules/system/activation/lib-test.nix b/nixos/modules/system/activation/lib-test.nix index 72039a6921a0..bb2628156774 100644 --- a/nixos/modules/system/activation/lib-test.nix +++ b/nixos/modules/system/activation/lib-test.nix @@ -6,7 +6,6 @@ testers, }: let - inherit (lib) fileset; runTests = stdenv.mkDerivation { name = "tests-activation-lib"; diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix index d9a9631fba92..5161a5a2c2ff 100644 --- a/nixos/modules/system/boot/systemd/user.nix +++ b/nixos/modules/system/boot/systemd/user.nix @@ -15,7 +15,6 @@ let systemd = config.systemd.package; inherit (systemdUtils.lib) - makeUnit generateUnits targetToUnit serviceToUnit diff --git a/nixos/tests/chromadb.nix b/nixos/tests/chromadb.nix index de8454d5d131..a1500b0718ee 100644 --- a/nixos/tests/chromadb.nix +++ b/nixos/tests/chromadb.nix @@ -1,21 +1,13 @@ -{ lib, pkgs, ... }: - -let - lib = pkgs.lib; - -in { name = "chromadb"; meta.maintainers = [ ]; nodes = { - machine = - { pkgs, ... }: - { - services.chromadb = { - enable = true; - }; + machine = { + services.chromadb = { + enable = true; }; + }; }; testScript = '' diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index 27887bdb339c..eb024be44fa9 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -2,7 +2,7 @@ import ../make-test-python.nix ( { lib, pkgs, ... }: let - inherit (lib) mkMerge nameValuePair maintainers; + inherit (lib) mkMerge; baseGrafanaConf = { services.grafana = { diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 550b2c4189e0..8fed76d5b282 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -2,7 +2,7 @@ import ../../make-test-python.nix ( { lib, pkgs, ... }: let - inherit (lib) mkMerge maintainers; + inherit (lib) mkMerge; baseGrafanaConf = { services.grafana = { diff --git a/nixos/tests/pam/pam-file-contents.nix b/nixos/tests/pam/pam-file-contents.nix index c0342ebaaf7b..3f027a9ff2b3 100644 --- a/nixos/tests/pam/pam-file-contents.nix +++ b/nixos/tests/pam/pam-file-contents.nix @@ -1,6 +1,3 @@ -let - name = "pam"; -in { pkgs, ... }: { name = "pam-file-contents"; diff --git a/nixos/tests/spire.nix b/nixos/tests/spire.nix index dfdeba26e635..dec1d0748df1 100644 --- a/nixos/tests/spire.nix +++ b/nixos/tests/spire.nix @@ -45,6 +45,14 @@ let config.services.spire.agent.settings.agent.socket_path; virtualisation.credentials."spire.trust_bundle".source = "./trust_bundle"; systemd.services.spire-agent.serviceConfig.ImportCredential = [ "spire.trust_bundle" ]; + + # A non-root, non-spire-agent user used to verify that arbitrary + # workloads can reach the Workload API socket. + users.users.workload = { + isNormalUser = true; + group = "workload"; + }; + users.groups.workload = { }; }; in { @@ -180,25 +188,36 @@ in join_token = server.succeed("spire-server token generate -socketPath ${adminSocket}").split()[1] with open(agent.state_dir / "join_token", "w") as f: f.write(join_token) - parent_id = f"spiffe://${trustDomain}/spire/agent/join_token/{join_token}" - server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector 'systemd:id:backdoor.service' -parentID {parent_id} -spiffeID {spiffe_id}") + return f"spiffe://${trustDomain}/spire/agent/join_token/{join_token}" def provision_tpm(agent): agent.wait_for_unit("tpm2.target") ek_hash = agent.succeed("get_tpm_pubhash").strip() - parent_id = f"spiffe://${trustDomain}/spire/agent/tpm/{ek_hash}" - server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector 'systemd:id:backdoor.service' -parentID '{parent_id}' -spiffeID {spiffe_id}") + return f"spiffe://${trustDomain}/spire/agent/tpm/{ek_hash}" + + + def register_entry(parent_id, selector, spiffe_id): + server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector '{selector}' -parentID '{parent_id}' -spiffeID '{spiffe_id}'") def test_agent(name, agent_node, provision_fn): with subtest(f"Setup SPIRE agent with {name} attestation"): provision_trust_bundle(agent_node) - provision_fn(agent_node) + parent_id = provision_fn(agent_node) + register_entry(parent_id, "systemd:id:backdoor.service", spiffe_id) + register_entry(parent_id, "unix:user:workload", "spiffe://${trustDomain}/workload") agent_node.wait_for_unit("spire-agent.service") agent_node.wait_until_succeeds("spire-agent healthcheck -socketPath $SPIFFE_ENDPOINT_SOCKET", timeout=90) with subtest(f"Test certificate authentication from {name} agent"): agent_node.wait_until_succeeds("spire-agent api fetch x509 -socketPath $SPIFFE_ENDPOINT_SOCKET -write .") + with subtest(f"Workload running as non-root, non-spire-agent user can reach Workload API ({name})"): + # SPIRE's security model relies on workload attestation, not unix + # permissions on the socket. Verify an unrelated user can connect. + agent_node.wait_until_succeeds( + "su -s /bin/sh workload -c " + "'spire-agent api fetch x509 -socketPath \"$SPIFFE_ENDPOINT_SOCKET\"'" + ) # TODO: Add something to communicate with diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 852011735e27..2e99430c49a6 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ( - { lib, pkgs, ... }@args: + { lib, pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; diff --git a/nixos/tests/web-apps/immich-public-proxy.nix b/nixos/tests/web-apps/immich-public-proxy.nix index 7f627e14404c..bd3cf7c5bc9c 100644 --- a/nixos/tests/web-apps/immich-public-proxy.nix +++ b/nixos/tests/web-apps/immich-public-proxy.nix @@ -1,9 +1,8 @@ -{ pkgs, lib, ... }: { name = "immich-public-proxy"; nodes.machine = - { pkgs, ... }@args: + { pkgs, ... }: { virtualisation.memorySize = 2048; # test hits OOM with default 1024 environment.systemPackages = [ diff --git a/nixos/tests/windmill/default.nix b/nixos/tests/windmill/default.nix index 5f4ffa66467f..3d432f19dd4b 100644 --- a/nixos/tests/windmill/default.nix +++ b/nixos/tests/windmill/default.nix @@ -1,4 +1,4 @@ -{ runTest, ... }@testArgs: +{ runTest, ... }: { apiIntegration = runTest ./api-integration.nix; } diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 3b8b449d7585..e39681865ab2 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -471,7 +471,7 @@ recurseIntoAttrs { toml = expectDataEqual { file = writeTOML "data.toml" { hello = "world"; }; expected = '' - hello = 'world' + hello = "world" ''; }; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 89e31b89c958..be96ca33df78 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -46,12 +46,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.26.4"; + version = "0.26.6"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-5tOAkKTpdkN1UDztmy4Dt9kpRrWYVLolnXRwHmfXpLo="; + hash = "sha256-aJeW8I7hx9VN5AU6gVq18cKO0QuKtc7JGUDbVsSXXE4="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-nNPttQJBYJ3eyjR/INoC0MW5e3WcUkDpLdQ0W10+qj0="; + outputHash = "sha256-CSB7fQnxkUx+LRDO0PbiPc2NZuvzWbBLNkImfrSm44o="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index a36b1788da6e..6f4ce57a2d7e 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -82,13 +82,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2026-04-21"; + version = "0-unstable-2026-05-01"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "01022024bc001987ac69308c8a5d1b2b4063f239"; - hash = "sha256-vsy4oi0iK8P2UTk0C6X9j5ItOxIYJ2xuGXOAm4uioIA="; + rev = "31c4dcb406b26a18e86e0b88232696ee476b5705"; + hash = "sha256-brbk5/ujjmwbiTLk3gwyIZP9ihupg6dxjVV/eeztg0o="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix index e0a0729bd9f8..234f66ac031e 100644 --- a/pkgs/by-name/bc/bcompare/package.nix +++ b/pkgs/by-name/bc/bcompare/package.nix @@ -2,13 +2,9 @@ lib, autoPatchelfHook, bzip2, - cairo, fetchurl, - gdk-pixbuf, glibc, - pango, - gtk2, - libsForQt5, + kdePackages, stdenv, runtimeShell, unzip, @@ -16,19 +12,19 @@ let pname = "bcompare"; - version = "4.4.7.28397"; + version = "5.2.0.31950"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { - url = "https://www.scootersoftware.com/bcompare-${version}_amd64.deb"; - sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U"; + url = "https://www.scootersoftware.com/files/bcompare-${version}_amd64.deb"; + sha256 = "sha256-CCSRNGWIYVKAoQVVJ8McDUtc45nK0S4CdamcT5uVlQM="; }; x86_64-darwin = fetchurl { - url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; - sha256 = "sha256-qbpM6hJbv+APo+ed45k3GXrl1HnZRxD1uT2lvaN3oM4="; + url = "https://www.scootersoftware.com/files/BCompareOSX-${version}.zip"; + sha256 = "sha256-R+G2Zlr074i2W4GaEDweK0c0q8tnzjs6M0N106WVAlg="; }; aarch64-darwin = srcs.x86_64-darwin; @@ -54,35 +50,34 @@ let cp -R usr/{bin,lib,share} $out/ # Remove library that refuses to be autoPatchelf'ed + # - bcompare_ext_kde.amd64.so is linked with Qt4 + # - bcompare_ext_kde5.amd64.so is linked with Qt5 rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so + rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so substituteInPlace $out/bin/bcompare \ --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ --replace "ldd" "${glibc.bin}/bin/ldd" \ --replace "/bin/bash" "${runtimeShell}" - - # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 ''; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ (lib.getLib stdenv.cc.cc) - gtk2 - pango - cairo - libsForQt5.kio - libsForQt5.kservice - libsForQt5.ki18n - libsForQt5.kcoreaddons - gdk-pixbuf + kdePackages.kio + kdePackages.kservice + kdePackages.ki18n + kdePackages.kcoreaddons bzip2 ]; dontBuild = true; dontConfigure = true; dontWrapQtApps = true; + + __structuredAttrs = true; + strictDeps = true; }; darwin = stdenv.mkDerivation { @@ -98,6 +93,9 @@ let mkdir -p $out/Applications/BCompare.app cp -R . $out/Applications/BCompare.app ''; + + __structuredAttrs = true; + strictDeps = true; }; meta = { diff --git a/pkgs/by-name/bc/bcompare4/package.nix b/pkgs/by-name/bc/bcompare4/package.nix new file mode 100644 index 000000000000..90e805ca7d3b --- /dev/null +++ b/pkgs/by-name/bc/bcompare4/package.nix @@ -0,0 +1,127 @@ +{ + lib, + autoPatchelfHook, + bzip2, + cairo, + fetchurl, + gdk-pixbuf, + glibc, + pango, + gtk2, + libsForQt5, + stdenv, + runtimeShell, + unzip, +}: + +let + pname = "bcompare4"; + version = "4.4.7.28397"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://www.scootersoftware.com/bcompare-${version}_amd64.deb"; + sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U"; + }; + + x86_64-darwin = fetchurl { + url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; + sha256 = "sha256-qbpM6hJbv+APo+ed45k3GXrl1HnZRxD1uT2lvaN3oM4="; + }; + + aarch64-darwin = srcs.x86_64-darwin; + }; + + src = srcs.${stdenv.hostPlatform.system} or throwSystem; + + linux = stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + unpackPhase = '' + ar x $src + tar xfz data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/{bin,lib,share} + + cp -R usr/{bin,lib,share} $out/ + + # Remove library that refuses to be autoPatchelf'ed + rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so + + substituteInPlace $out/bin/bcompare \ + --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ + --replace "ldd" "${glibc.bin}/bin/ldd" \ + --replace "/bin/bash" "${runtimeShell}" + + # Create symlink bzip2 library + ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + (lib.getLib stdenv.cc.cc) + gtk2 + pango + cairo + libsForQt5.kio + libsForQt5.kservice + libsForQt5.ki18n + libsForQt5.kcoreaddons + gdk-pixbuf + bzip2 + ]; + + dontBuild = true; + dontConfigure = true; + dontWrapQtApps = true; + + __structuredAttrs = true; + strictDeps = true; + }; + + darwin = stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications/BCompare.app + cp -R . $out/Applications/BCompare.app + ''; + + __structuredAttrs = true; + strictDeps = true; + }; + + meta = { + description = "GUI application that allows to quickly and easily compare files and folders"; + longDescription = '' + Beyond Compare is focused. Beyond Compare allows you to quickly and easily compare your files and folders. + By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. + You can then merge the changes, synchronize your files, and generate reports for your records. + ''; + homepage = "https://www.scootersoftware.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + ktor + arkivm + ]; + platforms = builtins.attrNames srcs; + mainProgram = "bcompare"; + }; +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix index d931def734b4..61bd3243059b 100644 --- a/pkgs/by-name/bo/bookstack/package.nix +++ b/pkgs/by-name/bo/bookstack/package.nix @@ -8,16 +8,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "bookstack"; - version = "25.12.8"; + version = "26.03.3"; src = fetchFromGitHub { owner = "bookstackapp"; repo = "bookstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-1dyY66pU73IYa1sOvOn6HTvs1Cww06jvHJl5s/QB6r4="; + hash = "sha256-HzFniRSt9lt5307K37sj1AbxCIPFVFvvYX1xo4qSSu0="; }; - vendorHash = "sha256-sb5Tn/yPEQAVWwbC5AwXTU34Mc8aK5PDV5Wp+XH3ruk="; + vendorHash = "sha256-ZNVJ38KqH1FEhrSlk8+0f3rjFT7FzMtTibmjxjNJFLY="; passthru = { phpPackage = php83; diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix index af7a07604e18..ff9a4ccf2326 100644 --- a/pkgs/by-name/br/brush/package.nix +++ b/pkgs/by-name/br/brush/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "brush"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "reubeno"; repo = "brush"; tag = "brush-shell-v${finalAttrs.version}"; - hash = "sha256-Ib7IRjehcftCETUAT1+otXRdTFFOOwMN4mjnArYLP7Y="; + hash = "sha256-zG6ho/QECzLC/evOUdo9mYXoh4xA2PF+BQvnCsLZiNg="; }; - cargoHash = "sha256-mD6zrYX5xlEfV56syb0jqxE3jUO28asugOHKz27hTC4="; + cargoHash = "sha256-NSvlLiLp0kdnWNUSIateGkscL5as+b00d54CP3sEakI="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/bs/bsh/package.nix b/pkgs/by-name/bs/bsh/package.nix index 37b75963ea4f..8ea7c2037e18 100644 --- a/pkgs/by-name/bs/bsh/package.nix +++ b/pkgs/by-name/bs/bsh/package.nix @@ -1,4 +1,7 @@ -{ fetchurl }: +{ + lib, + fetchurl, +}: fetchurl (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}.jar"; @@ -6,4 +9,7 @@ fetchurl (finalAttrs: { version = "2.1.1"; url = "https://github.com/beanshell/beanshell/releases/download/${finalAttrs.version}/bsh-${finalAttrs.version}.jar"; hash = "sha256-cRksu+Seeiac/LoF3Fy5WcM7myba/NYmbKMoi0YfhqM="; + meta = { + license = lib.licenses.asl20; + }; }) diff --git a/pkgs/by-name/ch/chessdb/package.nix b/pkgs/by-name/ch/chessdb/package.nix index f17d43c4204d..d9cb6c9dfee7 100644 --- a/pkgs/by-name/ch/chessdb/package.nix +++ b/pkgs/by-name/ch/chessdb/package.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://chessdb.sourceforge.net/"; description = "Free chess database"; platforms = lib.platforms.linux; + license = lib.licenses.gpl2Only; }; }) diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix index f3bbe247be4a..a41039fb00cc 100644 --- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix +++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Concentrator HAL daemon for LoRa gateways"; diff --git a/pkgs/by-name/co/coc-cmake/package.nix b/pkgs/by-name/co/coc-cmake/package.nix index ba9d4484ef85..c50ab33dad33 100644 --- a/pkgs/by-name/co/coc-cmake/package.nix +++ b/pkgs/by-name/co/coc-cmake/package.nix @@ -55,4 +55,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + meta = { + license = lib.licenses.mit; + }; }) diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index 49e42328389a..20492fbabd6c 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; - version = "2.2.0"; + version = "2.2.3"; src = fetchFromGitHub { owner = "upstash"; repo = "context7"; tag = "${tag-prefix}@${finalAttrs.version}"; - hash = "sha256-MFHajv1f+Xj8BtiiDQs4Sct1IhYS4+hYY+PdVAYqkNw="; + hash = "sha256-Vse6mOfzDC65V3qoL1tZu5S9DU93PmVNI8NRm94Gcn8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/corto/package.nix b/pkgs/by-name/co/corto/package.nix index 5efe16c864c4..55b96cdc8373 100644 --- a/pkgs/by-name/co/corto/package.nix +++ b/pkgs/by-name/co/corto/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Mesh compression library, designed for rendering and speed"; diff --git a/pkgs/by-name/cp/cpptrace/package.nix b/pkgs/by-name/cp/cpptrace/package.nix index bd4dd944f3b1..c64586d88408 100644 --- a/pkgs/by-name/cp/cpptrace/package.nix +++ b/pkgs/by-name/cp/cpptrace/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, libdwarf, + libunwind, gtest, callPackage, zstd, @@ -32,9 +33,18 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ (lib.getDev libdwarf) ]; + buildInputs = [ + (lib.getDev libdwarf) + libunwind + ]; - propagatedBuildInputs = [ zstd ] ++ (lib.optionals static [ libdwarf ]); + propagatedBuildInputs = [ + zstd + ] + ++ (lib.optionals static [ + libdwarf + libunwind + ]); cmakeFlags = [ (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) @@ -42,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_GTEST" true) + (lib.cmakeBool "CPPTRACE_UNWIND_WITH_LIBUNWIND" true) ]; checkInputs = [ gtest ]; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 5a7c2dbb9a12..41f60d302c02 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -57,7 +57,7 @@ buildGo126Module (finalAttrs: { --zsh <($out/bin/crush completion zsh) ''; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Glamourous AI coding agent for your favourite terminal"; diff --git a/pkgs/by-name/de/defuddle/package.nix b/pkgs/by-name/de/defuddle/package.nix index ef1ca4f9e8f1..16b78498174a 100644 --- a/pkgs/by-name/de/defuddle/package.nix +++ b/pkgs/by-name/de/defuddle/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "defuddle"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "kepano"; repo = "defuddle"; tag = version; - hash = "sha256-w1V2xdaE8Htl6NeDyfKLFHOt3UEUuI4eBPW433qD1WI="; + hash = "sha256-e/+eigIzpP0g+ZqTeyZnF6mloaY6UeKcMWfqryCcLbM="; }; - npmDepsHash = "sha256-D+Gn9Dcc+YNeRonnKjEcp3BzpxIdwy7J4lJvxefJSvs="; + npmDepsHash = "sha256-1NFwhYEGTKpjzCdK/eHK0TWtOEpn67FA+B3QZ11w1Rs="; # jsdom is both a peerDependency and devDependency; pruning # devDependencies removes it, but the CLI needs it at runtime. diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 5efcb8d024b8..d1f35cba4f03 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-JnErWcq7aVkeZAIaINSEqmi/Fi/9wrPqFZ583EG8qyg="; + hash = "sha256-bfvs8gpFYpXEHyGKY5b/PvdQWS1VeT5NFeXaI+a9nlo="; }; buildInputs = [ php ]; @@ -40,13 +40,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) pname src version; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-iYW5GrUaHwoJzv4WN1r5YPEMUOH15A4BmOSlKIqCcdg="; + vendorHash = "sha256-/exzNHzqqbT1PLciyKC7ZGUTva0xiWZS5Pnz1kAfe/4="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-6zha6lTkdrcMc9EAhFvSg1LRAw0HJlUITPqguCVrx+8="; + hash = "sha256-uV7VWEpuI+rUXrzk8BKLEkaUftrXH+vEOqdQO/pZq+M="; }; preInstall = '' diff --git a/pkgs/by-name/fu/fusesoc/package.nix b/pkgs/by-name/fu/fusesoc/package.nix index 0c0d86c3671f..eae1c06c99f2 100644 --- a/pkgs/by-name/fu/fusesoc/package.nix +++ b/pkgs/by-name/fu/fusesoc/package.nix @@ -8,6 +8,7 @@ gitMinimal, openssh, writableTmpDirAsHomeHook, + nix-update-script, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "fusesoc"; @@ -64,11 +65,13 @@ python3Packages.buildPythonApplication (finalAttrs: { }" ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/olofk/fusesoc"; description = "Package manager and build tools for HDL code"; - maintainers = [ ]; - license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ VZstless ]; + license = lib.licenses.bsd2; mainProgram = "fusesoc"; }; }) diff --git a/pkgs/by-name/gc/gcalcli/package.nix b/pkgs/by-name/gc/gcalcli/package.nix index 11be99716582..ee0ab7fa718e 100644 --- a/pkgs/by-name/gc/gcalcli/package.nix +++ b/pkgs/by-name/gc/gcalcli/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-FU1EHLQ+/2sOGeeGwONsrV786kHTFfMel7ocBcCe+rI="; }; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace gcalcli/argparsers.py \ diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index fe494f0316ef..06ec7a8a9ea2 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -11,11 +11,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.39.1"; + version = "0.40.1"; src = fetchzip { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini-cli-bundle.zip"; - hash = "sha256-mDKBquxjdeIpNOFOrL2Nnsxwr9Fz8FH/Ulhpiwrv1TA="; + hash = "sha256-lSwBnrPX9RjKs0HVR64BcAhgzD4hVMethgnwRErXpDQ="; stripRoot = false; }; diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index e7b92cfdf163..4199b8a864dc 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2026-04-11"; + version = "0-unstable-2026-05-03"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "93066aae8d7328c41f0da9985c680691fafa3fab"; - hash = "sha256-2nA9c8PAIr8o/of//WUI9XHZgVNtXYsnMaaTOdAMTwc="; + rev = "46174e9b25850c9898ca0c2de90af31ad83122d7"; + hash = "sha256-UnMpV9RCDsJEDBj4/gypzYFhR4IqEVKYKLpvrLlTGaA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix index 265d6b4451da..1cffae016364 100644 --- a/pkgs/by-name/gi/git-pages-cli/package.nix +++ b/pkgs/by-name/gi/git-pages-cli/package.nix @@ -10,6 +10,8 @@ buildGoModule (finalAttrs: { pname = "git-pages-cli"; version = "1.8.2"; + __structuredAttrs = true; + src = fetchFromCodeberg { owner = "git-pages"; repo = "git-pages-cli"; @@ -28,7 +30,12 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(.*)" + ]; + }; meta = { description = "Command-line application for uploading a site to a git-pages server"; diff --git a/pkgs/by-name/ho/hof/go-testdeps-modulepath.patch b/pkgs/by-name/ho/hof/go-testdeps-modulepath.patch new file mode 100644 index 000000000000..a30d79f09458 --- /dev/null +++ b/pkgs/by-name/ho/hof/go-testdeps-modulepath.patch @@ -0,0 +1,14 @@ +diff --git a/script/runtime/exe.go b/script/runtime/exe.go +index d15bf50f..66f784a4 100644 +--- a/script/runtime/exe.go ++++ b/script/runtime/exe.go +@@ -140,6 +140,9 @@ func (nopTestDeps) WriteProfileTo(name string, w io.Writer, debug int) error { + func (nopTestDeps) ImportPath() string { + return "" + } ++func (nopTestDeps) ModulePath() string { ++ return "" ++} + func (nopTestDeps) StartTestLog(w io.Writer) {} + + func (nopTestDeps) StopTestLog() error { diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix index 75abe20896c5..f5884c8649ff 100644 --- a/pkgs/by-name/ho/hof/package.nix +++ b/pkgs/by-name/ho/hof/package.nix @@ -17,6 +17,11 @@ buildGoModule (finalAttrs: { hash = "sha256-okc11mXqB/PaXd0vsRuIIL70qWSFprvsZJtE6PvCaIg="; }; + patches = [ + # https://github.com/hofstadter-io/hof/pull/411 + ./go-testdeps-modulepath.patch + ]; + nativeBuildInputs = [ installShellFiles ]; vendorHash = "sha256-mLOWnHzKw/B+jFNuswejEnYbPxFkk95I/BWeHRTH55I="; diff --git a/pkgs/by-name/ho/hors/package.nix b/pkgs/by-name/ho/hors/package.nix deleted file mode 100644 index 7f3364fec0b4..000000000000 --- a/pkgs/by-name/ho/hors/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "hors"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "windsoilder"; - repo = "hors"; - rev = "v${finalAttrs.version}"; - sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0"; - }; - - cargoHash = "sha256-JTHgOEBpGXPO3C7YUbBF0LFeSUQK+R2w1LugwMV5xyU="; - - # requires network access - doCheck = false; - - meta = { - description = "Instant coding answers via the command line"; - mainProgram = "hors"; - homepage = "https://github.com/windsoilder/hors"; - changelog = "https://github.com/WindSoilder/hors/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = lib.licenses.gpl3Only; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/jp/jpegli/package.nix b/pkgs/by-name/jp/jpegli/package.nix index 33458a90c655..68ed1766c073 100644 --- a/pkgs/by-name/jp/jpegli/package.nix +++ b/pkgs/by-name/jp/jpegli/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation { pname = "jpegli"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-04-30"; src = fetchFromGitHub { owner = "google"; repo = "jpegli"; - rev = "0b846bb0e309b70cf56f64986c4d711c39bfcb49"; - hash = "sha256-TFf2DYOGpHnmVRl+vXLP+W0agIQ8SNsV63ryvqV/SdI="; + rev = "7a57896e68a8ab861ded9857b2d3a402868d3d9e"; + hash = "sha256-lnmLS4ueQhPLUfIY0G+FhqsHpn9aFDDtHVQg6+TIkbQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index 5cec0ea6913a..db331eec8b42 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-4DxyKzIcX2hVCmgMTnA/4kqlghJd38jPoL7B7PcV+NU="; + hash = "sha256-ew8/ugjSkCus5Fd/SpXfWKspvdOR6FC/Q2gBzWO3OOw="; }; - cargoHash = "sha256-E6eHB1tJ2rCgkU+xoyx5yg5X0ZGFn54Ozt0fJW7qn58="; + cargoHash = "sha256-YejdnLECFCmuYfmj6rYnKKsMD5HkHsYnS8gs4f3iCcw="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index de057fc624a5..79c57ceca027 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -60,7 +60,7 @@ buildGoModule (finalAttrs: { doCheck = true; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Command line interface for KCL programming language"; diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix index 5137fdf8db83..8e01b708e4e6 100644 --- a/pkgs/by-name/la/lavacli/package.nix +++ b/pkgs/by-name/la/lavacli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "lavacli"; - version = "2.7"; + version = "2.8"; pyproject = true; src = fetchFromGitLab { owner = "lava"; repo = "lavacli"; tag = "v${finalAttrs.version}"; - hash = "sha256-UiAqZJU7+x8f53myMY0gUwQ5PYNzKmO6kYWEqs1QvG4="; + hash = "sha256-oIB5BLLwyaDkV5mQ8vndlQQv4R1lCEATHO9JqJDYv7s="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix index 72af85f673b5..fd4e4043424a 100644 --- a/pkgs/by-name/la/lazyworktree/package.nix +++ b/pkgs/by-name/la/lazyworktree/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "lazyworktree"; - version = "1.45.0"; + version = "1.45.1"; src = fetchFromGitHub { owner = "chmouel"; repo = "lazyworktree"; tag = "v${finalAttrs.version}"; - hash = "sha256-qOJlX8kMGvzlMWII0dit8DnDrgRuhqa6VER7PoUMod0="; + hash = "sha256-Bgw4B7r+pwh0lEDDowS1n8ZmUs2ClxRZQjQbE880nS0="; }; - vendorHash = "sha256-EZY4flrYM3JRY5i1qsjp5vvGW32IvDHeINdYuQJgUuQ="; + vendorHash = "sha256-bMgMe9Crv5MKVhOMtqUG+peaSW0kQewT4qmdk0a7W6o="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libvarlink/package.nix b/pkgs/by-name/li/libvarlink/package.nix index 053f6b84d45c..657aafaca699 100644 --- a/pkgs/by-name/li/libvarlink/package.nix +++ b/pkgs/by-name/li/libvarlink/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libvarlink"; - version = "24"; + version = "24.0.1"; src = fetchFromGitHub { owner = "varlink"; repo = "libvarlink"; - rev = finalAttrs.version; - sha256 = "sha256-/BWbbDFLxa1da5ewrt3DG/+096dZ+s6p8VdcRGDiEiU="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-MO5wfmPAm90AD+Y+vYqZynB4A18/XtJ1cys+lIIwbTY="; }; nativeBuildInputs = [ @@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { --replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' "" patchShebangs lib/test-symbols.sh varlink-wrapper.py + + # They forgot to update the version + substituteInPlace meson.build \ + --replace-fail "24.0.0" "${finalAttrs.version}" ''; doCheck = true; diff --git a/pkgs/by-name/lo/localtunnel/package.nix b/pkgs/by-name/lo/localtunnel/package.nix index 6005a6ca1f5d..cf15b0574417 100644 --- a/pkgs/by-name/lo/localtunnel/package.nix +++ b/pkgs/by-name/lo/localtunnel/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs ]; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/localtunnel/localtunnel/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index ee783f10d5fb..57ee664c22b7 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -89,16 +89,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-7w2+hltPj0mP3xcmHfjFvIqxwFkcf71bzm4TFiz745g="; + hash = "sha256-GIYG2fKiUSOx2aAumCZLrc4vuWj1UWJf8nXyuDdj1oI="; }; - cargoHash = "sha256-DuHV4/a3B/Khq9/RgxFg5RfQ2svdKPv+QyuUqKGAveo="; + cargoHash = "sha256-V8byPrtgUQPri36pNtgOEtTlblxMAm90cSf8fgmx4tA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index 323c2748e07f..c5ea64b36b84 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-5HIc0h042gP4mGr4Yp6ej0fkwNW2SDEzlwITgLF2/7I="; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ml/mlv-app/package.nix b/pkgs/by-name/ml/mlv-app/package.nix index 9be0365f2bd9..3868d679b9b8 100644 --- a/pkgs/by-name/ml/mlv-app/package.nix +++ b/pkgs/by-name/ml/mlv-app/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "All in one MLV processing app that is pretty great"; diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index 989dda376f0d..f04976bdfe02 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,16 +8,17 @@ buildGoModule (finalAttrs: { pname = "mtail"; - version = "3.2.26"; + version = "3.2.48"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${finalAttrs.version}"; - hash = "sha256-L+kRRAP74n8OJVQhbDjDGNc8IYp/11a6sKbGa1/UdNY="; + hash = "sha256-dZ0fjBpQ1hS1AxuD5A3gSTmimhP6PbiyxGs8XaYdo64="; }; - vendorHash = "sha256-kdPj9XjjvDMNCP8K8RBFoHCd1G2NqVq6UR1XykZEdkQ="; + proxyVendor = true; + vendorHash = "sha256-ZZcVtZBG0Erh/NmYbw0aOVCg2AGZeHMFRfRbwNFTCks="; nativeBuildInputs = [ gotools # goyacc diff --git a/pkgs/by-name/mu/musly/0005-Fix-minilog-get.patch b/pkgs/by-name/mu/musly/0005-Fix-minilog-get.patch new file mode 100644 index 000000000000..701124a097fc --- /dev/null +++ b/pkgs/by-name/mu/musly/0005-Fix-minilog-get.patch @@ -0,0 +1,13 @@ +diff --git a/include/minilog.h b/include/minilog.h +index b1c387e..9390a6e 100644 +--- a/include/minilog.h ++++ b/include/minilog.h +@@ -198,7 +198,7 @@ Log::from_string( + else if (level == "NONE") + return logNONE; + else { +- Log().Get(logWARNING) << "Unknown logging level '" << level ++ Log().get(logWARNING) << "Unknown logging level '" << level + << "'. Using INFO level as default."; + return logINFO; + } diff --git a/pkgs/by-name/mu/musly/package.nix b/pkgs/by-name/mu/musly/package.nix index 07cb806a21f0..cf3ed188ea69 100644 --- a/pkgs/by-name/mu/musly/package.nix +++ b/pkgs/by-name/mu/musly/package.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation { ./0002-Fix-build-with-C-17.patch ./0003-Modernize-CMake-build-system.patch ./0004-Use-pkg-config-to-find-libresample-and-kissfft.patch + # Fix build with gcc15: minilog.h uses Get() instead of get() in unused + # template code + # https://github.com/dominikschnitzer/musly/pull/55 + ./0005-Fix-minilog-get.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/nf/nfft/package.nix b/pkgs/by-name/nf/nfft/package.nix index 01347c93c79b..64e26c829f7b 100644 --- a/pkgs/by-name/nf/nfft/package.nix +++ b/pkgs/by-name/nf/nfft/package.nix @@ -3,6 +3,7 @@ automake, cunit, fetchFromGitHub, + fetchpatch, fftw, lib, libtool, @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-HR8ME9PVC+RAv1GIgV2vK6eLU8Wk28+rSzbutThBv3w="; }; + patches = [ + (fetchpatch { + name = "fix-gcc15.patch"; + url = "https://github.com/NFFT/nfft/commit/b06d01be964be7490aed797468f9722e2de1dbfa.patch"; + hash = "sha256-Ynhsyzf8ECVw4eBq50okd0oikiIfOCqFRHivuceg0KU="; + }) + ]; + nativeBuildInputs = [ autoconf automake diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 8a48256d8237..356de4c085d4 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nix-update"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; tag = "v${finalAttrs.version}"; - hash = "sha256-l6EvOXUZcbx712WYN3L4y8Qdim9sEISH06CWxgav6cQ="; + hash = "sha256-M62YdrdAqK81MF0FL0bx6iKTDCaqOtPx3civlSg46uk="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index bd57d951d3b9..8f662b138d75 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -13,8 +13,8 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nomacs"; - version = "3.21.1"; - hash = "sha256-RRa19vj7iTtGzdssdtHVOsDzS4X+p1HeiZKy8EIWxq8="; + version = "3.22.0"; + hash = "sha256-yheDM92AtojGXCx0UrK5gBvQgyGSxcsKPzl93HpHRt8="; src = fetchFromGitHub { owner = "nomacs"; @@ -24,13 +24,6 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) hash; }; - plugins = fetchFromGitHub { - owner = "novomesk"; - repo = "nomacs-plugins"; - rev = "20101da282f13d3184ece873388e1c234a79b5e7"; - hash = "sha256-gcRc4KoWJQ5BirhLuk+c+5HwBeyQtlJ3iyX492DXeVk="; - }; - outputs = [ "out" ] @@ -39,13 +32,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/ImageLounge"; - postUnpack = '' - rm -rf $sourceRoot/plugins - mkdir $sourceRoot/plugins - cp -r ${finalAttrs.plugins}/* $sourceRoot/plugins/ - chmod -R +w $sourceRoot/plugins - ''; - nativeBuildInputs = [ cmake qt6.wrapQtAppsHook diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix index 6804b61651ac..4a817f26827e 100644 --- a/pkgs/by-name/op/openclaw/package.nix +++ b/pkgs/by-name/op/openclaw/package.nix @@ -11,7 +11,7 @@ versionCheckHook, rolldown, installShellFiles, - version ? "2026.4.21", + version ? "2026.4.22", }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "openclaw"; @@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "openclaw"; repo = "openclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-K1Pl9lXzGKfoq/fXWxYX5PoY3IBzJr0PPstUDGET/gs="; + hash = "sha256-BB+stGBDgMRAPHrVWJS2dFRjw2WrVrFdVf/23Tq1UeA="; }; - pnpmDepsHash = "sha256-FDajXHs4s0+QDRPq4ZxQWWW9rqeSJVYACAl/5Mw2Agc="; + pnpmDepsHash = "sha256-z45mB/w7sorAE3CTliDpvMm9eq+/l9L/mmhYJt0t9O4="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; @@ -78,6 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pluginDir, pruneConfig, repoRoot, + stampPath, }) ) { continue; @@ -90,6 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pluginDir, pruneConfig, repoRoot, + stampPath, }) ) { continue; @@ -135,9 +137,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { in '' installShellCompletion --cmd openclaw \ - --bash <(${emulator} $out/bin/openclaw completion --shell bash) \ - --fish <(${emulator} $out/bin/openclaw completion --shell fish) \ - --zsh <(${emulator} $out/bin/openclaw completion --shell zsh) + --bash <(OPENCLAW_SKIP_PLUGIN_CLI=1 ${emulator} $out/bin/openclaw completion --shell bash) \ + --fish <(OPENCLAW_SKIP_PLUGIN_CLI=1 ${emulator} $out/bin/openclaw completion --shell fish) \ + --zsh <(OPENCLAW_SKIP_PLUGIN_CLI=1 ${emulator} $out/bin/openclaw completion --shell zsh) '' ); @@ -146,6 +148,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; + patches = [ + ./skip-bundled-runtime-install.patch + ]; + meta = { description = "Self-hosted, open-source AI assistant/agent"; longDescription = '' diff --git a/pkgs/by-name/op/openclaw/skip-bundled-runtime-install.patch b/pkgs/by-name/op/openclaw/skip-bundled-runtime-install.patch new file mode 100644 index 000000000000..539ba54d20c5 --- /dev/null +++ b/pkgs/by-name/op/openclaw/skip-bundled-runtime-install.patch @@ -0,0 +1,17 @@ +diff --git a/src/plugins/bundled-runtime-deps.ts b/src/plugins/bundled-runtime-deps.ts +index 5dca7aa..fac598b 100644 +--- a/src/plugins/bundled-runtime-deps.ts ++++ b/src/plugins/bundled-runtime-deps.ts +@@ -823,6 +823,12 @@ export function installBundledRuntimeDeps(params: { + missingSpecs: string[]; + env: NodeJS.ProcessEnv; + }): void { ++ // Refuse to spawn `npm install` in environments that opt out (e.g. the Nix ++ // build sandbox). Bundled runtime deps are expected to already be staged by ++ // the package build; a runtime install would require network access. ++ if (params.env.OPENCLAW_SKIP_PLUGIN_CLI === "1") { ++ throw new Error("bundled runtime deps install skipped (OPENCLAW_SKIP_PLUGIN_CLI=1)"); ++ } + const installExecutionRoot = params.installExecutionRoot ?? params.installRoot; + fs.mkdirSync(params.installRoot, { recursive: true }); + fs.mkdirSync(installExecutionRoot, { recursive: true }); diff --git a/pkgs/by-name/os/osdlyrics/package.nix b/pkgs/by-name/os/osdlyrics/package.nix index 9892e8b8639c..053898c30cf1 100644 --- a/pkgs/by-name/os/osdlyrics/package.nix +++ b/pkgs/by-name/os/osdlyrics/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osdlyrics"; - version = "0.5.15"; + version = "0.5.16"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = finalAttrs.version; - hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI="; + hash = "sha256-GvvFtpiuWuHh1dxd7Hd9F9M0WyVOtN0LxZJzGGB0mVA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pn/pngoptimizer/package.nix b/pkgs/by-name/pn/pngoptimizer/package.nix index 8a0e510062a8..c1c4b6c70473 100644 --- a/pkgs/by-name/pn/pngoptimizer/package.nix +++ b/pkgs/by-name/pn/pngoptimizer/package.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: { "DESTDIR=$(out)" ]; + # Fix build with GCC 15 + env.NIX_CFLAGS_COMPILE = "-Wno-error=old-style-definition"; + postInstall = '' mv $out/usr/bin $out/bin mv $out/usr/share $out/share diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index b15cd1805a86..b0cd94ad313b 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -51,13 +51,13 @@ let }; pname = "pretix"; - version = "2026.4.0"; + version = "2026.4.1"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; tag = "v${version}"; - hash = "sha256-M5ty2kcIyVAFzGiieLx1FHIRXnl4jCR/O2IU7kztV3U="; + hash = "sha256-afqhPiTg1g2rnJOl8yFYq/p2/fIxpfTp/3jbTXpiRZQ="; }; npmDeps = buildNpmPackage { diff --git a/pkgs/by-name/ql/qlever/package.nix b/pkgs/by-name/ql/qlever/package.nix index 0eac6aa36ba3..30b4eee93aab 100644 --- a/pkgs/by-name/ql/qlever/package.nix +++ b/pkgs/by-name/ql/qlever/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qlever"; - version = "0.5.46"; + version = "0.5.47"; src = fetchFromGitHub { owner = "ad-freiburg"; repo = "qlever"; tag = "v${finalAttrs.version}"; - hash = "sha256-UUfSWy1mImmyL7Ha2xCbxm9srdY/rTJS4oUJbJiDtwQ="; + hash = "sha256-sRV3OZTg9Q2Nvys0OgMbBGRqWPm+8P9zJD9rcaEEZ/Y="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/se/send/dannycoates-express-ws-drop-esm-loader.patch b/pkgs/by-name/se/send/dannycoates-express-ws-drop-esm-loader.patch new file mode 100644 index 000000000000..2992fa59b581 --- /dev/null +++ b/pkgs/by-name/se/send/dannycoates-express-ws-drop-esm-loader.patch @@ -0,0 +1,130 @@ +From 4e1e354d17b558954c8e006bb432bb746922ec81 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Sat, 2 May 2026 04:26:09 +0800 +Subject: [PATCH] express-ws: convert ESM sources to CommonJS for Node.js 22 + +--- + express-ws/index.js | 4 +--- + express-ws/src/add-ws-method.js | 8 +++++--- + express-ws/src/index.js | 14 ++++++++------ + express-ws/src/trailing-slash.js | 4 +++- + express-ws/src/websocket-url.js | 6 ++++-- + express-ws/src/wrap-middleware.js | 4 +++- + 6 files changed, 24 insertions(+), 16 deletions(-) + +diff --git a/express-ws/index.js b/express-ws/index.js +index b0df682..bada276 100644 +--- a/express-ws/index.js ++++ b/express-ws/index.js +@@ -1,4 +1,2 @@ + /* eslint-disable-next-line no-underscore-dangle */ +-const _require = require('esm')(module); +- +-module.exports = _require('./src/index').default; ++module.exports = require("./src/index"); +diff --git a/express-ws/src/add-ws-method.js b/express-ws/src/add-ws-method.js +index 8c3a279..633ff86 100644 +--- a/express-ws/src/add-ws-method.js ++++ b/express-ws/src/add-ws-method.js +@@ -1,7 +1,7 @@ +-import wrapMiddleware from './wrap-middleware'; +-import websocketUrl from './websocket-url'; ++const wrapMiddleware = require('./wrap-middleware'); ++const websocketUrl = require('./websocket-url'); + +-export default function addWsMethod(target) { ++function addWsMethod(target) { + /* This prevents conflict with other things setting `.ws`. */ + if (target.ws === null || target.ws === undefined) { + target.ws = function addWsRoute(route, ...middlewares) { +@@ -28,3 +28,5 @@ export default function addWsMethod(target) { + }; + } + } ++ ++module.exports = addWsMethod; +diff --git a/express-ws/src/index.js b/express-ws/src/index.js +index dab6c66..16f3a2b 100644 +--- a/express-ws/src/index.js ++++ b/express-ws/src/index.js +@@ -3,14 +3,14 @@ + * + * Here be dragons. */ + +-import http from 'http'; +-import express from 'express'; +-import ws from 'ws'; ++const http = require('http'); ++const express = require('express'); ++const ws = require('ws'); + +-import websocketUrl from './websocket-url'; +-import addWsMethod from './add-ws-method'; ++const websocketUrl = require('./websocket-url'); ++const addWsMethod = require('./add-ws-method'); + +-export default function expressWs(app, httpServer, options = {}) { ++function expressWs(app, httpServer, options = {}) { + let server = httpServer; + + if (server === null || server === undefined) { +@@ -84,3 +84,5 @@ export default function expressWs(app, httpServer, options = {}) { + } + }; + } ++ ++module.exports = expressWs; +diff --git a/express-ws/src/trailing-slash.js b/express-ws/src/trailing-slash.js +index c7cba79..791c43c 100644 +--- a/express-ws/src/trailing-slash.js ++++ b/express-ws/src/trailing-slash.js +@@ -1,7 +1,9 @@ +-export default function addTrailingSlash(string) { ++function addTrailingSlash(string) { + let suffixed = string; + if (suffixed.charAt(suffixed.length - 1) !== '/') { + suffixed = `${suffixed}/`; + } + return suffixed; + } ++ ++module.exports = addTrailingSlash; +diff --git a/express-ws/src/websocket-url.js b/express-ws/src/websocket-url.js +index 64b845f..d2f35eb 100644 +--- a/express-ws/src/websocket-url.js ++++ b/express-ws/src/websocket-url.js +@@ -1,7 +1,7 @@ +-import trailingSlash from './trailing-slash'; ++const trailingSlash = require('./trailing-slash'); + + /* The following fixes HenningM/express-ws#17, correctly. */ +-export default function websocketUrl(url) { ++function websocketUrl(url) { + if (url.indexOf('?') !== -1) { + const [baseUrl, query] = url.split('?'); + +@@ -9,3 +9,5 @@ export default function websocketUrl(url) { + } + return `${trailingSlash(url)}.websocket`; + } ++ ++module.exports = websocketUrl; +diff --git a/express-ws/src/wrap-middleware.js b/express-ws/src/wrap-middleware.js +index 09b0dbf..c8586d7 100644 +--- a/express-ws/src/wrap-middleware.js ++++ b/express-ws/src/wrap-middleware.js +@@ -1,4 +1,4 @@ +-export default function wrapMiddleware(middleware) { ++function wrapMiddleware(middleware) { + return (req, res, next) => { + if (req.ws !== null && req.ws !== undefined) { + req.wsHandled = true; +@@ -15,3 +15,5 @@ export default function wrapMiddleware(middleware) { + } + }; + } ++ ++module.exports = wrapMiddleware; +-- +2.53.0 + diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix index 51486020a37c..1261459c7963 100644 --- a/pkgs/by-name/se/send/package.nix +++ b/pkgs/by-name/se/send/package.nix @@ -3,24 +3,32 @@ buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, - nodejs_20, + nodejs_22, nix-update-script, nixosTests, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "send"; version = "3.4.27"; src = fetchFromGitHub { owner = "timvisee"; repo = "send"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tfntox8Sw3xzlCOJgY/LThThm+mptYY5BquYDjzHonQ="; }; - nodejs = nodejs_20; + # @dannycoates/express-ws uses the unmaintained esm loader, which fails on nodejs_22. + postConfigure = '' + patch -p1 \ + --directory=node_modules/@dannycoates \ + < ${./dannycoates-express-ws-drop-esm-loader.patch} + ''; - npmDepsHash = "sha256-ZVegUECrwkn/DlAwqx5VDmcwEIJV/jAAV99Dq29Tm2w="; + nodejs = nodejs_22; + + npmDepsFetcherVersion = 2; + npmDepsHash = "sha256-QInXcYpZcAOJMS6QFtIapftyWsqA80ef+OiKJ9XEs98="; nativeBuildInputs = [ makeBinaryWrapper @@ -28,19 +36,16 @@ buildNpmPackage rec { env = { PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; - NODE_OPTIONS = "--openssl-legacy-provider"; }; - makeCacheWritable = true; - npmPackFlags = [ "--ignore-scripts" ]; postInstall = '' cp -r dist $out/lib/node_modules/send/ ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json - makeWrapper ${lib.getExe nodejs} $out/bin/send \ + makeWrapper ${lib.getExe finalAttrs.nodejs} $out/bin/send \ --add-flags $out/lib/node_modules/send/server/bin/prod.js \ --set "NODE_ENV" "production" ''; @@ -54,7 +59,7 @@ buildNpmPackage rec { meta = { description = "File Sharing Experiment"; - changelog = "https://github.com/timvisee/send/releases/tag/v${version}"; + changelog = "https://github.com/timvisee/send/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/timvisee/send"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ @@ -63,4 +68,4 @@ buildNpmPackage rec { ]; mainProgram = "send"; }; -} +}) diff --git a/pkgs/by-name/sf/sftool-gui/disable-bundling.patch b/pkgs/by-name/sf/sftool-gui/disable-bundling.patch new file mode 100644 index 000000000000..a050ea4c4186 --- /dev/null +++ b/pkgs/by-name/sf/sftool-gui/disable-bundling.patch @@ -0,0 +1,22 @@ +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 419c116..aa3fece 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -23,7 +23,7 @@ + "frontendDist": "../dist" + }, + "bundle": { +- "active": true, ++ "active": false, + "icon": [ + "icons/32x32.png", + "icons/128x128.png", +@@ -39,7 +39,7 @@ + "app", + "dmg" + ], +- "createUpdaterArtifacts": true ++ "createUpdaterArtifacts": false + }, + "plugins": { + "updater": { diff --git a/pkgs/by-name/sf/sftool-gui/package.nix b/pkgs/by-name/sf/sftool-gui/package.nix index 9ffcca6a8fed..f3093c92e031 100644 --- a/pkgs/by-name/sf/sftool-gui/package.nix +++ b/pkgs/by-name/sf/sftool-gui/package.nix @@ -20,21 +20,28 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool-gui"; - version = "1.0.3"; + version = "1.1.4-unstable-2026-04-16"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool-gui"; - tag = "v${finalAttrs.version}"; - hash = "sha256-kjxUl9YrvTgJby+FvUbx5ugucK8NiBqzGBhTi9Zwd1s="; + rev = "e182a5973a4e23f8af078f3480a8b2416d7439b3"; + hash = "sha256-6wYf0DNn5cjJTeuVfOB91RQP/E2YWr6PlGUnzZdwgNY="; }; - cargoHash = "sha256-XAU3ru+TxUo99OQwcXNLJ8gzBOZUkC8UCAApz7M/QTM="; + patches = [ + # We don't want tauri to bundle the built binaries as we only use them and not the + # bundled .deb, .appimage, and so on. Bundling the binaries would also require a signing + # key, which we don't have. + ./disable-bundling.patch + ]; + + cargoHash = "sha256-hwQJnhWgPqQ3ZudCsEEuWoygYDcUKXgWz15dHZ+vR6Q="; cargoRoot = "src-tauri"; pnpmDeps = fetchPnpmDeps { - fetcherVersion = 2; + fetcherVersion = 3; inherit (finalAttrs) pname version src; - hash = "sha256-gamgu9koBf+JLDswi3eGXRZybF8UiYE8CoifpQCgLaI="; + hash = "sha256-DwDXfbwgt/OSNOQbzCBlathX9QDnbEsXZLsgB67LOEk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix index 149b0285c889..70e4bc82bad5 100644 --- a/pkgs/by-name/su/sus-compiler/package.nix +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sus_compiler"; - updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; meta = { description = "New Hardware Design Language that keeps you in the driver's seat"; diff --git a/pkgs/by-name/sy/syncthing-macos/package.nix b/pkgs/by-name/sy/syncthing-macos/package.nix index 245b0a166c12..811acd40881e 100644 --- a/pkgs/by-name/sy/syncthing-macos/package.nix +++ b/pkgs/by-name/sy/syncthing-macos/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; meta = { description = "Official frugal and native macOS Syncthing application bundle"; diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index 3590b69dbba0..8e671861f574 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -2571,9 +2571,9 @@ }; swift = rec { - version = "0.7.1"; + version = "0.7.2"; url = "github:alex-pinkus/tree-sitter-swift/${version}-with-generated-files"; - hash = "sha256-jVZpnwpcQ3sXE4hXQIHKzQgEE13pqE3fGqdRMjb1AOQ="; + hash = "sha256-tG+tM7B6901QP4QyJdf55V38b4XduSU1eb+gaP7BikE="; meta = { license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index bb12b794d01b..ea3f8d7faf69 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -15,13 +15,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2026-04-24"; + version = "0-unstable-2026-05-02"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "515d036f927aba8b468011098e2721335f0e2d00"; - hash = "sha256-agEuOB7dnYZB6I5qA+/IdrGVSewg/8b74gRntwtaeaE="; + rev = "2f6504c1b0efb1750abf948fe277981b50214093"; + hash = "sha256-PU4euqJAkBvzFzn0UemiFRfDciIi62KejRgcjbi5paQ="; fetchSubmodules = false; }; diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index 23f5494befe7..e792ab407ab5 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -13,12 +13,12 @@ let pname = "uhk-agent"; - version = "9.0.2"; + version = "10.0.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-4lOyLbz5QIzO9iEyYhE32ujZql2yNQd/EIAv4VOuRlA="; + sha256 = "sha256-FLEuVTQznDTrzJLKGmpjVechCvBwYQro8I80vYhDJ7c="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ui/uif2iso/package.nix b/pkgs/by-name/ui/uif2iso/package.nix index 95fc5781b3bd..fd58c3c0a4b5 100644 --- a/pkgs/by-name/ui/uif2iso/package.nix +++ b/pkgs/by-name/ui/uif2iso/package.nix @@ -2,19 +2,30 @@ lib, stdenv, fetchurl, + fetchpatch, unzip, zlib, + versionCheckHook, }: stdenv.mkDerivation { pname = "uif2iso"; - version = "0.1.7"; + version = "0.1.7c"; src = fetchurl { url = "https://aluigi.altervista.org/mytoolz/uif2iso.zip"; sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-cdr/uif2iso/files/uif2iso-0.1.7c-fix_c23.patch?id=80ed6e7c6b7b628e80f9f76d614c49f583ed5152"; + hash = "sha256-8b18Q6gGVd2pjQzRf17jhrYuaz86crHH26gOJy/krqk="; + stripLen = 2; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ unzip ]; buildInputs = [ zlib ]; @@ -22,6 +33,9 @@ stdenv.mkDerivation { make -C . prefix="$out" install; ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Tool for converting single/multi part UIF image files to ISO"; homepage = "http://aluigi.org/mytoolz.htm#uif2iso"; diff --git a/pkgs/by-name/xo/xosd-xft/package.nix b/pkgs/by-name/xo/xosd-xft/package.nix index bf44b4f28692..1cc64eddf60d 100644 --- a/pkgs/by-name/xo/xosd-xft/package.nix +++ b/pkgs/by-name/xo/xosd-xft/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/osd-echo"; versionCheckProgramArg = "--help"; - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Show text content with Xft/TTF fonts on X11 display"; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 59ad90bc350a..976f1b187aa8 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -10,4 +10,7 @@ fetchurl (finalAttrs: { pname = "all-cabal-hashes"; version = lib.substring 0 7 pin.commit; passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh; + meta = { + license = lib.licenses.mit; + }; }) diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 481093cbe188..33fe7ee169e0 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -5,11 +5,15 @@ python3, qmake, qtbase, - qtquickcontrols, + qtdeclarative, + qtquickcontrols ? null, # Qt6: merged into qtdeclarative qtsvg, ncurses, }: +let + withQt6 = lib.strings.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation rec { pname = "pyotherside"; version = "1.6.2"; @@ -21,11 +25,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-2OYVULNW9EzssqodiVtL2EmhTSbefXpLkub3zFvNwNo="; }; + postPatch = '' + substituteInPlace qtquicktests/run \ + --replace-fail \ + 'exec ./qtquicktests' \ + 'exec ./${ + if stdenv.hostPlatform.isDarwin then + "qtquicktests.app/Contents/MacOS/qtquicktests" + else + "qtquicktests" + }' \ + --replace-fail \ + '-plugins ../src' \ + '-plugins ../src -import $out/${qtbase.qtQmlPrefix} -import ${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}' + ''; + nativeBuildInputs = [ qmake ]; buildInputs = [ python3 qtbase - qtquickcontrols + (if withQt6 then qtdeclarative else qtquickcontrols) qtsvg ncurses ]; @@ -35,10 +54,35 @@ stdenv.mkDerivation rec { patches = [ ./qml-path.patch ]; installTargets = [ "sub-src-install_subtargets" ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + checkPhase = '' + runHook preCheck + + export QT_QPA_PLATFORM=minimal + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ./tests/tests + + runHook postCheck + ''; + + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + installCheckPhase = '' + runHook preInstallCheck + + pushd qtquicktests + ./run + popd + + runHook postInstallCheck + ''; + meta = { - description = "Asynchronous Python 3 Bindings for Qt 5"; + description = "Asynchronous Python 3 Bindings for Qt ${lib.versions.major qtbase.version}"; homepage = "https://thp.io/2011/pyotherside/"; license = lib.licenses.isc; maintainers = [ lib.maintainers.mic92 ]; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 9f4f1bc85715..a8061d19fe0d 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -33,8 +33,9 @@ let stripIdlelib = true; stripTests = true; enableOptimizations = false; - packageOverrides = prev: final: { - setuptools = removeKnownVulnerabilities final.setuptools; + packageOverrides = final: prev: { + pip = removeKnownVulnerabilities prev.pip; + setuptools = removeKnownVulnerabilities prev.setuptools; }; }; callPackage = lib.callPackageWith (pkgsBuildHost // { python27 = python27'; }); diff --git a/pkgs/development/ocaml-modules/mlbdd/default.nix b/pkgs/development/ocaml-modules/mlbdd/default.nix index 5adf079d24b6..dd72cb9e8f89 100644 --- a/pkgs/development/ocaml-modules/mlbdd/default.nix +++ b/pkgs/development/ocaml-modules/mlbdd/default.nix @@ -26,5 +26,6 @@ buildDunePackage { homepage = "https://github.com/arlencox/mlbdd"; description = "Not-quite-so-simple Binary Decision Diagrams implementation for OCaml"; maintainers = with lib.maintainers; [ katrinafyi ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index 7f1bc1a7ed3d..f706962de445 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -17,5 +17,6 @@ buildPythonPackage rec { meta = { description = "Command Arguments for Humans"; homepage = "https://github.com/kennethreitz/args"; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 2aabd0107f53..7ff5c7719bd1 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -23,5 +23,6 @@ buildPythonPackage rec { description = "Atomic file writes on POSIX"; homepage = "https://pypi.python.org/pypi/atomicwrites"; maintainers = with lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index 6f7474e6f40e..94c4d665a032 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -31,5 +31,6 @@ buildPythonPackage rec { description = "Serialization and RPC framework"; mainProgram = "avro"; homepage = "https://pypi.python.org/pypi/avro3k/"; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index d71befaa6011..13e98aea9132 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, curtsies, cwcwidth, greenlet, @@ -29,6 +30,14 @@ buildPythonPackage rec { hash = "sha256-NmWM0fdzS9n5FSnNJOCdS1JE5ZHrmJXqCuHa54rT8GU="; }; + patches = [ + # This should be removed in the next release. + (fetchpatch { + url = "https://github.com/bpython/bpython/commit/870e81cb5a6860f1ba15744c81b97f71467eedf9.patch"; + hash = "sha256-z55EkLT51ulz/V3XgjP1cbQza9ztb5YHu1UlXlbaWTQ="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace-fail 'version = "unknown"' 'version = "${version}"' diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix index a45bff2e2654..907de8a8cdc9 100644 --- a/pkgs/development/python-modules/chai/default.nix +++ b/pkgs/development/python-modules/chai/default.nix @@ -24,5 +24,6 @@ buildPythonPackage rec { meta = { description = "Mocking, stubbing and spying framework for python"; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix index 3690d8fff16c..9c359cab7b7b 100644 --- a/pkgs/development/python-modules/contexter/default.nix +++ b/pkgs/development/python-modules/contexter/default.nix @@ -14,5 +14,7 @@ buildPythonPackage rec { sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8"; }; - meta = { }; + meta = { + license = lib.licenses.mit; + }; } diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix index 6fc1b8d17010..204551a50f69 100644 --- a/pkgs/development/python-modules/crewai/default.nix +++ b/pkgs/development/python-modules/crewai/default.nix @@ -56,14 +56,14 @@ buildPythonPackage (finalAttrs: { pname = "crewai"; - version = "1.14.3"; + version = "1.14.4"; pyproject = true; src = fetchFromGitHub { owner = "crewAIInc"; repo = "crewAI"; tag = finalAttrs.version; - hash = "sha256-AMGAo2fllV4RasRXoeOpJii8aWfu7/JW1iXp3VgTGVo="; + hash = "sha256-QrJM2oVoqos8GMhrn9E6i1m1O1guP/q+51b8NYtJA5Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index f644f48ac660..339925f900b8 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, httpx, setuptools, + pytest-asyncio, pytest-cov-stub, pytest-mock, pytest-vcr, @@ -12,16 +13,16 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deezer-python"; - version = "7.2.0"; + version = "7.3.0"; pyproject = true; src = fetchFromGitHub { owner = "browniebroke"; repo = "deezer-python"; - tag = "v${version}"; - hash = "sha256-j7FiZJX2YIYs03bKKu2e+ByElp5oYpmpUheVr8BVXZo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pCrPlEbt5Mx8qGjewR5+Z/W7rFEehqd7QRrtvPGyKJk="; }; build-system = [ setuptools ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ environs + pytest-asyncio pytest-cov-stub pytest-mock pytest-vcr @@ -48,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; - changelog = "https://github.com/browniebroke/deezer-python/releases/tag/v${version}"; + changelog = "https://github.com/browniebroke/deezer-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix index c80bce22ef2c..d177bdbf7f54 100644 --- a/pkgs/development/python-modules/duet/default.nix +++ b/pkgs/development/python-modules/duet/default.nix @@ -36,5 +36,6 @@ buildPythonPackage rec { description = "Simple future-based async library for python"; homepage = "https://github.com/google/duet"; maintainers = [ ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 1377f8e92f93..072ba065326f 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -82,7 +82,7 @@ buildPythonPackage (finalAttrs: { "google.cloud.firestore_admin_v1" ]; - updateScript = nix-update-script { + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" "google-cloud-firestore-v(.*)" diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 0bd78ebdac36..d900bad5bfbe 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.202605021"; + version = "0.1.202605041"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-nnvd6bVqsnBH5K3zSI5VNs8NK4CT35Rotx7FIw2EiXE="; + hash = "sha256-Mkyd5QM8rH1xdSOKSdrqfk7oqAs1glAuLavDCrP2fgU="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ibmiotf/default.nix b/pkgs/development/python-modules/ibmiotf/default.nix deleted file mode 100644 index fbcfa3298bae..000000000000 --- a/pkgs/development/python-modules/ibmiotf/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - iso8601, - pytz, - paho-mqtt, - requests, - requests-toolbelt, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "ibmiotf"; - version = "1.0.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ibm-watson-iot"; - repo = "iot-python"; - tag = version; - hash = "sha256-miNkOVPYf2EGlLKtx4UiOu/xkoffaPSiYbTpAA3El7I="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ - iso8601 - pytz - paho-mqtt - requests - requests-toolbelt - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - # Tests require network access and IBM Watson IoT Platform credentials - doCheck = false; - - pythonImportsCheck = [ "ibmiotf" ]; - - meta = { - description = "Python Client for IBM Watson IoT Platform"; - homepage = "https://github.com/ibm-watson-iot/iot-python"; - changelog = "https://github.com/ibm-watson-iot/iot-python/releases/tag/${src.tag}"; - license = lib.licenses.epl10; - maintainers = [ lib.maintainers.jamiemagee ]; - }; -} diff --git a/pkgs/development/python-modules/mediawiki-langcodes/default.nix b/pkgs/development/python-modules/mediawiki-langcodes/default.nix index dd351dbf8e69..3fd2a9c32630 100644 --- a/pkgs/development/python-modules/mediawiki-langcodes/default.nix +++ b/pkgs/development/python-modules/mediawiki-langcodes/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "mediawiki-langcodes"; - version = "0.2.21"; + version = "0.2.22"; pyproject = true; # Using fetchPypi instead of fetching from source for technical reason. @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "mediawiki_langcodes"; inherit (finalAttrs) version; - hash = "sha256-WUzxMJu2PYuuxEUlLQpuVvP1F3h6+NVgH8g4ohbjenI="; + hash = "sha256-8CGCPHT7I7FYlwTpt3hSONq6XToTowEZ0lkd7sN6+ao="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix index 6b6b727c613b..11687fbece99 100644 --- a/pkgs/development/python-modules/oscpy/default.nix +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, }: @@ -18,15 +17,6 @@ buildPythonPackage rec { hash = "sha256-sumpJ2y9lpd0UhQjk4zVDp3SipBwh3NBkJ3dqWs18IE="; }; - patches = [ - # Fix flaky tests with kivy/oscpy#67 - https://github.com/kivy/oscpy/pull/67 - (fetchpatch { - name = "improve-reliability-of-test_intercept_errors.patch"; - url = "https://github.com/kivy/oscpy/commit/2bc114a97692aef28f8b84d52d0d5a41554a7d93.patch"; - hash = "sha256-iT7cB3ChWD1o0Zx7//Czkk8TaU1oTU1pRQWvPeIpeWY="; - }) - ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oscpy" ]; diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index c9720fd3b0c4..66c6b5741d45 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslotest"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-j86DR3S5aGNdCIb/HgC8yyXbz+KIrFInGbFe5pvzUY4="; + hash = "sha256-XOlzR3NPCMpia7SWliqLx6266Wk3MPWFnZxSk9Si/YA="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index e93f7e5ef44c..a47eb71111ef 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/"; maintainers = [ ]; platforms = lib.platforms.all; + license = lib.licenses.bsd3Modification; }; } diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index ae13490a68d0..43a3e99154f6 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -23,5 +23,6 @@ buildPythonPackage rec { description = "Python library to work with Document Object Identifiers (doi)"; homepage = "https://github.com/papis/python-doi"; maintainers = with lib.maintainers; [ teto ]; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/raspyrfm-client/default.nix b/pkgs/development/python-modules/raspyrfm-client/default.nix index 5d5a20ff9589..95735136e3b9 100644 --- a/pkgs/development/python-modules/raspyrfm-client/default.nix +++ b/pkgs/development/python-modules/raspyrfm-client/default.nix @@ -33,5 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/markusressel/raspyrfm-client"; changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ ethancedwards8 ]; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/python2-modules/pip/default.nix index e0b6b001cb3e..31383a035c0f 100644 --- a/pkgs/development/python2-modules/pip/default.nix +++ b/pkgs/development/python2-modules/pip/default.nix @@ -40,6 +40,9 @@ buildPythonPackage rec { description = "PyPA recommended tool for installing Python packages"; license = with lib.licenses; [ mit ]; homepage = "https://pip.pypa.io/"; + knownVulnerabilities = [ + "CVE-2021-28363" + ]; priority = 10; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c511f4f40c4a..fc1809109537 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -101,11 +101,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "595.44.05"; + version = "595.44.06"; persistencedVersion = "595.45.04"; settingsVersion = "595.45.04"; - sha256_64bit = "sha256-fOUoqTUFXYQyDxj67egK3o4O0Z6hbfNypnSehW24K8Y="; - openSha256 = "sha256-jSJqpWMdITf8jdxTSGQHC9jlNbhffAdY8N+Zd7sTHqQ="; + sha256_64bit = "sha256-Gq7peoXLeYVuVHBx+2EIx3/bZIVl56c35qS/30Q7208="; + openSha256 = "sha256-RSlpdGhYTxxywMQ+0tBkpJG5ohnmJYh8pzedin1sBBs="; settingsSha256 = "sha256-Y45pryyM+6ZTJyRaRF3LMKaiIWxB5gF5gGEEcQVr9nA="; persistencedSha256 = "sha256-5FoeUaRRMBIPEWGy4Uo0Aho39KXmjzQsuAD9m/XkNpA="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix index 2f701298a882..663d00ea3a83 100644 --- a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix +++ b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix @@ -10,6 +10,7 @@ bc, opensnitch, nixosTests, + fetchpatch2, }: stdenv.mkDerivation rec { @@ -18,6 +19,17 @@ stdenv.mkDerivation rec { inherit (opensnitch) src; + patches = [ + (fetchpatch2 { + # fixes build failures on kernel >= 6.19 (#490127) + # remove when added to a release + name = "fix-kernel-6.19-build.patch"; + stripLen = 1; + url = "https://github.com/evilsocket/opensnitch/commit/614537c92ec82f54f76a45fb406ad2fb6e6fa618.patch?full_index=1"; + hash = "sha256-FCJfDhgmnm1GXPDaxr+YpVWTRrwBvjVzvGdZSFB6SqQ="; + }) + ]; + sourceRoot = "${src.name}/ebpf_prog"; nativeBuildInputs = with llvmPackages; [ @@ -35,6 +47,7 @@ stdenv.mkDerivation rec { # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=opensnitch-ebpf-module&id=984b952a784eb701f691dd9f2d45dfeb8d15053b env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + env.KERNEL_VER = kernel.modDirVersion; env.KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"; env.KERNEL_HEADERS = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 61d2752336c9..ee5b8aaec1a0 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -467,20 +467,18 @@ optionalAttrs allowAliases aliases generate = name: value: pkgs.callPackage ( - { runCommand, go-toml }: + { runCommand, remarshal }: runCommand name { - nativeBuildInputs = [ go-toml ]; + nativeBuildInputs = [ remarshal ]; value = builtins.toJSON value; preferLocalBuild = true; __structuredAttrs = true; } - # -use-json-number: preserve JSON ints as TOML ints - # (Go's json.Decoder defaults to float64 for all numbers) '' valuePath="$TMPDIR/value" printf "%s" "$value" > "$valuePath" - jsontoml -use-json-number < "$valuePath" > "$out" + json2toml "$valuePath" "$out" '' ) { }; diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 49b9ac4c8a30..f1da9041ea79 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -695,16 +695,14 @@ runBuildTests { float = 3.141 int = 10 list = [1, 2] - str = 'foo' + str = "foo" true = true [attrs] - foo = 'foo' + foo = "foo" - [level1] - [level1.level2] [level1.level2.level3] - level4 = 'deep' + level4 = "deep" ''; }; @@ -725,7 +723,7 @@ runBuildTests { ]; }; expected = '' - language-server = ['bash-language-server', {except-features = ['diagnostics'], name = 'typescript-language-server'}] + language-server = ["bash-language-server", {except-features = ["diagnostics"], name = "typescript-language-server"}] ''; }; @@ -739,7 +737,7 @@ runBuildTests { "stack(x,n)" = "foobar"; }; expected = '' - 'stack(x,n)' = 'foobar' + "stack(x,n)" = "foobar" ''; }; diff --git a/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix b/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix index 308af647e8c1..56aa2efd0db9 100644 --- a/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix +++ b/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent rec { owner = "Pirate-Weather"; domain = "pirateweather"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { inherit owner; repo = "pirate-weather-ha"; tag = "v${version}"; - hash = "sha256-3vhsuyPXDDSd2x6m4HS53Iuszga4lxP7uWCznfSFj1w="; + hash = "sha256-lcI+ClZ6iwkzI88fzxyWvbILMfLwMgHu0WJSSWGM7q0="; }; nativeCheckInputs = [ diff --git a/pkgs/servers/sql/postgresql/ext/pg_graphql.nix b/pkgs/servers/sql/postgresql/ext/pg_graphql.nix index 64fa7c860a59..3e7de8c7952e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_graphql.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_graphql.nix @@ -11,16 +11,16 @@ buildPgrxExtension (finalAttrs: { cargo-pgrx = cargo-pgrx_0_16_1; pname = "pg_graphql"; - version = "1.5.12"; + version = "1.6.0"; src = fetchFromGitHub { owner = "supabase"; repo = "pg_graphql"; tag = "v${finalAttrs.version}"; - hash = "sha256-mJBxen6Gg1LbzIF+WKThrs+wPD01a6WjZ+AHrGdWL4Q="; + hash = "sha256-OnFYxhRBlEeCyRlgGu3N1rkKdsJoVyWnQF+kEqgAWhs="; }; - cargoHash = "sha256-GZjoHGqNhZOuMbHji1Y3xKmdJ1GB1KasT+47P2e83sU="; + cargoHash = "sha256-EN1ndJwV0lQ7F0J2cTiiX+9MTgQnKJ+BWaq1lA8EPR4="; # pgrx tests try to install the extension into postgresql nix store doCheck = false; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 404debbf1b06..50388c3c302c 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -571,8 +571,9 @@ let ); # Needed for CI to be able to avoid requesting reviews from individual - # team members - nonTeamMaintainers = attrs.meta.maintainers or [ ]; + # team members. + # Prefer nonTeamMaintainers in case meta is copied from another package + nonTeamMaintainers = attrs.meta.nonTeamMaintainers or attrs.meta.maintainers or [ ]; identifiers = let diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index dc16f7ab3cd4..dcf3f21e07c7 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -35,21 +35,6 @@ confDir ? "/etc", }: let - # Support for mdbook >= 0.5, https://git.lix.systems/lix-project/lix/issues/1051 - lixMdbookPatch = fetchpatch2 { - name = "lix-mdbook-0.5-support.patch"; - url = "https://git.lix.systems/lix-project/lix/commit/54df89f601b3b4502a5c99173c9563495265d7e7.patch"; - excludes = [ "package.nix" ]; - hash = "sha256-uu/SIG8fgVVWhsGxmszTPHwe4SQtLgbxdShOMKbeg2w="; - }; - - lixLowdown30Patch = fetchpatch { - name = "lix-lowdown-3.0-support.patch"; - url = "https://git.lix.systems/lix-project/lix/commit/af0390c27bdc401ece8f8192cb3024f0ff08e977.patch"; - excludes = [ "flake.nix" ]; - hash = "sha256-ZBkbgeZ/D7H2teX8bPy5NEG1aXbQVksTDV3aVBZdRPM="; - }; - makeLixScope = { attrName, @@ -189,14 +174,14 @@ lib.makeExtensible ( attrName = "lix_2_94"; lix-args = rec { - version = "2.94.1"; + version = "2.94.2"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; rev = version; - hash = "sha256-+VJmizrdZPygtffgS/yfMb4PkZUUK5JmyGGzn0GPsKc="; + hash = "sha256-Nmqsl/YCnBW5U3TUfFWHGVUbyS2/Ll655BAE3qZilC4="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -206,8 +191,6 @@ lib.makeExtensible ( }; patches = [ - lixMdbookPatch - lixLowdown30Patch ]; }; }; @@ -216,14 +199,14 @@ lib.makeExtensible ( attrName = "lix_2_95"; lix-args = rec { - version = "2.95.1"; + version = "2.95.2"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; rev = version; - hash = "sha256-eZEynXdDcrjDMjGVfDhFJJrU5ENal7wlx7bn/wkggTg="; + hash = "sha256-nFxJMIdcGTI9NiHAa5HZ2BmcGFLwC2pTq+V4Gjc499I="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index de0556356e53..7a781e8d0688 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -213,14 +213,14 @@ lib.makeExtensible ( nixComponents_git = (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.35pre20260407_${lib.substring 0 8 src.rev}"; + version = "2.35pre20260503_${lib.substring 0 8 src.rev}"; inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a37db9d249afd61a81ae26368696f60e065d6f61"; - hash = "sha256-RpfExg4DcWZ/SanVuwVbdijqPylsjvtMrHTQHemE+t8="; + rev = "61024d0855f397d80a2c8c554188fd3bd9b171a2"; + hash = "sha256-Bu0+ILJVOfrblVrgQGYSDJTpjPwsciQ80kjm7aPi1lo="; }; }).appendPatches patches_common; diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index d17ee0d31a20..4efc2239670c 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -380,7 +380,8 @@ in nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { }; nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { }; - nix-perl-bindings = callPackage ../src/perl/package.nix { }; + nix-perl-bindings = + if (lib.versionAtLeast version "2.35pre") then null else callPackage ../src/perl/package.nix { }; nix-everything = callPackage ../packaging/everything.nix { } // { # Note: no `passthru.overrideAllMesonComponents` etc diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index 79cce347cc88..0584cde9b33f 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -74,7 +74,11 @@ let } // lib.optionalAttrs - (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + ( + (lib.versionOlder version "2.35pre") + && !stdenv.hostPlatform.isStatic + && stdenv.buildPlatform.canExecute stdenv.hostPlatform + ) { # Currently fails in static build inherit @@ -147,7 +151,12 @@ stdenv.mkDerivation (finalAttrs: { nix-functional-tests ] ++ - lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + lib.optionals + ( + (lib.versionOlder version "2.35pre") + && !stdenv.hostPlatform.isStatic + && stdenv.buildPlatform.canExecute stdenv.hostPlatform + ) [ # Perl currently fails in static build # TODO: Split out tests into a separate derivation? diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix index 79cb2c93e259..965dffdf109e 100644 --- a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix @@ -12,6 +12,7 @@ nix-fetchers, boost, boehmgc, + libcpuid, nlohmann_json, toml11, @@ -45,7 +46,8 @@ mkMesonLibrary (finalAttrs: { buildInputs = [ toml11 - ]; + ] + ++ lib.optional ((lib.versionAtLeast version "2.35pre") && stdenv.hostPlatform.isx86_64) libcpuid; propagatedBuildInputs = [ nix-util diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 70cd4ef68356..80f95ea3981d 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -4,6 +4,7 @@ mkMesonLibrary, unixtools, + freebsd, nix-util, boost, @@ -17,6 +18,7 @@ sqlite, busybox-sandbox-shell ? null, + pkgsStatic, # Configuration Options @@ -24,6 +26,17 @@ embeddedSandboxShell ? stdenv.hostPlatform.isStatic, + withSandboxShell ? + stdenv.hostPlatform.isLinux + || (lib.versionAtLeast version "2.35pre" && stdenv.hostPlatform.isFreeBSD), + sandboxShell ? + if stdenv.hostPlatform.isLinux then + "${busybox-sandbox-shell}/bin/busybox" + else if stdenv.hostPlatform.isFreeBSD then + "${pkgsStatic.bash}/bin/bash" + else + null, + withAWS ? # Default is this way because there have been issues building this dependency # TODO: aws-crt-cpp is broken on cygwin, find a good way to check that here @@ -45,6 +58,9 @@ mkMesonLibrary (finalAttrs: { curl sqlite ] + ++ lib.optional ( + lib.versionAtLeast version "2.35pre" && stdenv.hostPlatform.isFreeBSD + ) freebsd.libjail ++ lib.optional stdenv.hostPlatform.isLinux libseccomp # There have been issues building these dependencies ++ @@ -64,8 +80,8 @@ mkMesonLibrary (finalAttrs: { ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") ( lib.mesonEnable "s3-aws-auth" withAWS ) - ++ lib.optionals stdenv.hostPlatform.isLinux [ - (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") + ++ lib.optionals withSandboxShell [ + (lib.mesonOption "sandbox-shell" sandboxShell) ]; meta = { diff --git a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix index 33880fc37e4f..45f38c758bb0 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix @@ -10,6 +10,7 @@ rapidcheck, gtest, + zstd, runCommand, # Configuration Options @@ -30,7 +31,8 @@ mkMesonExecutable (finalAttrs: { nix-util-test-support rapidcheck gtest - ]; + ] + ++ lib.optional (lib.versionAtLeast version "2.35pre") zstd; mesonFlags = [ ]; diff --git a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix index 4be08b14bf60..3eda8ac3011d 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix @@ -11,6 +11,7 @@ libsodium, nlohmann_json, openssl, + zstd, # Configuration Options @@ -27,6 +28,7 @@ mkMesonLibrary (finalAttrs: { brotli ] ++ lib.optional (lib.versionAtLeast version "2.27") libblake3 + ++ lib.optional (lib.versionAtLeast version "2.35pre") zstd ++ [ libsodium openssl diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2523074389a4..ae73e253d09f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -935,6 +935,7 @@ mapAliases { hiPrio = warnAlias "'hiPrio' has been removed from pkgs, use `lib.hiPrio` instead" lib.hiPrio; # Added 2025-10-30 hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20 hop = throw "'hop' has been removed due to lack of maintenance"; # Added 2025-11-08 + hors = throw "'hors' has been removed due to being unmaintained upstream"; # Added 2026-05-04 hostPlatform = warnAlias "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'" stdenv.hostPlatform; # Converted to warning 2025-10-28 hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11 hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27 @@ -1740,6 +1741,7 @@ mapAliases { pyCA = warnAlias "'pyCA' was renamed to 'pyca'" pyca; # Added 2026-02-12 pyload-ng = throw "'pyload-ng' has been removed due to vulnerabilities and being unmaintained"; # Added 2026-03-21 pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27 + pyotherside = warnAlias "'pyotherside' has been renamed to 'libsForQt5.pyotherside'. A Qt6 build is available at 'qt6Packages.pyotherside'."; # Added 2026-03-27 pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27 python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55c7257cf718..0a43f4b09bb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7115,8 +7115,6 @@ with pkgs; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; - qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; qdjango = libsForQt5.callPackage ../development/libraries/qdjango { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 18c15d67895b..ccda5e076670 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -258,6 +258,7 @@ mapAliases { homepluscontrol = throw "'homepluscontrol' has been removed as it was unmaintained upstream"; # Added 2026-03-22 howdoi = throw "'howdoi' has been removed as it was unmaintained upstream"; # Added 2026-04-19 HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29 + ibmiotf = throw "'ibmiotf' has been removed as it was unmaintained upstream and the corresponding home-assistant integration was removed"; # Added 2026-05-04 idna-ssl = throw "'idna-ssl' has been removed as it was archived upstream"; # Added 2026-04-23 IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29 inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1e3cb567236..851361cdec27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7376,8 +7376,6 @@ self: super: with self; { ibm-watson = callPackage ../development/python-modules/ibm-watson { }; - ibmiotf = callPackage ../development/python-modules/ibmiotf { }; - ical = callPackage ../development/python-modules/ical { }; icalendar = callPackage ../development/python-modules/icalendar { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 1a52c4faa1be..cc23ae2fbb92 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,6 +154,8 @@ makeScopeWithSplicing' { pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; + pyotherside = callPackage ../development/libraries/pyotherside { }; + qca = callPackage ../development/libraries/qca { inherit (libsForQt5) qtbase; }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index cc1b5fec45b7..d17adae73183 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -92,6 +92,8 @@ makeScopeWithSplicing' { maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; + pyotherside = callPackage ../development/libraries/pyotherside { }; + qca = callPackage ../development/libraries/qca { inherit (qt6) qtbase qt5compat; };