diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 5fb5b6d4e51c..644ac630401f 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -28,6 +28,8 @@ NEWS can been viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30). +- The default openexr version has been updated to 3.2.4. + - The default PHP version has been updated to 8.4. - The default Erlang OTP version has been updated to 27. @@ -113,6 +115,8 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration. + - `teleport` has been upgraded from major version 16 to major version 17. Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/) and [release notes for v17](https://goteleport.com/docs/changelog/#1701-11152024). @@ -276,6 +280,7 @@ - `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024. - Emacs 28 and 29 have been removed. +- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched. - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more @@ -331,7 +336,7 @@ ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} -- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.3. +- `nexusmods-app` has been upgraded from version 0.6.3 to 0.9.2. - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present. diff --git a/lib/default.nix b/lib/default.nix index e671fcf9546d..19316addb8cb 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -446,6 +446,7 @@ let fixupOptionType mkIf mkAssert + mkDefinition mkMerge mkOverride mkOptionDefault diff --git a/lib/modules.nix b/lib/modules.nix index a9ddaf7bda02..7716e855ebb2 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1097,10 +1097,16 @@ let # Process mkMerge and mkIf properties. defs' = concatMap ( m: - map (value: { - inherit (m) file; - inherit value; - }) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) + map ( + value: + if value._type or null == "definition" then + value + else + { + inherit (m) file; + inherit value; + } + ) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) ) defs; # Process mkOverride properties. @@ -1365,6 +1371,11 @@ let inherit contents; }; + /** + Return a definition with file location information. + */ + mkDefinition = args@{ file, value, ... }: args // { _type = "definition"; }; + mkOverride = priority: content: { _type = "override"; inherit priority content; @@ -2095,6 +2106,7 @@ private mkBefore mkChangedOptionModule mkDefault + mkDefinition mkDerivedConfig mkFixStrictness mkForce diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index e623c0fb55b8..9df6e61797b7 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -673,6 +673,14 @@ checkConfigError 'The option .conflictingPathOptionType. in .*/pathWith.nix. is # types.pathWith { inStore = true; absolute = false; } checkConfigError 'In pathWith, inStore means the path must be absolute' config.impossiblePathOptionType ./pathWith.nix +# mkDefinition +# check that mkDefinition 'file' is printed in the error message +checkConfigError 'Cannot merge definitions.*\n\s*- In .file.*\n\s*- In .other.*' config.conflict ./mkDefinition.nix +checkConfigError 'A definition for option .viaOptionDefault. is not of type .boolean.*' config.viaOptionDefault ./mkDefinition.nix +checkConfigOutput '^true$' config.viaConfig ./mkDefinition.nix +checkConfigOutput '^true$' config.mkMerge ./mkDefinition.nix +checkConfigOutput '^true$' config.mkForce ./mkDefinition.nix + cat < (!(cfg.settings ? name) && !(cfg.settings ? port)); + message = "`services.centrifugo.settings` is v5 config, must be compatible with centrifugo v6 config format"; + } + ]; + systemd.services.centrifugo = { description = "Centrifugo messaging server"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index 35d7fafb43b5..36122d45c128 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -84,6 +84,28 @@ in description = "Whether this node is a relay."; }; + lighthouse.dns.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether this lighthouse node should serve DNS."; + }; + + lighthouse.dns.host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + IP address on which nebula lighthouse should serve DNS. + 'localhost' is a good default to ensure the service does not listen on public interfaces; + use a Nebula address like 10.0.0.5 to make DNS resolution available to nebula hosts only. + ''; + }; + + lighthouse.dns.port = lib.mkOption { + type = lib.types.nullOr lib.types.port; + default = 5353; + description = "UDP port number for lighthouse DNS server."; + }; + lighthouses = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; @@ -172,10 +194,7 @@ in ''; example = lib.literalExpression '' { - lighthouse.dns = { - host = "0.0.0.0"; - port = 53; - }; + lighthouse.interval = 15; } ''; }; @@ -203,6 +222,9 @@ in lighthouse = { am_lighthouse = netCfg.isLighthouse; hosts = netCfg.lighthouses; + serve_dns = netCfg.lighthouse.dns.enable; + dns.host = netCfg.lighthouse.dns.host; + dns.port = netCfg.lighthouse.dns.port; }; relay = { am_relay = netCfg.isRelay; @@ -231,6 +253,19 @@ in '' settings ); + capabilities = + let + nebulaPort = if !settings.tun.disabled then settings.listen.port else 0; + dnsPort = if settings.lighthouse.serve_dns then settings.lighthouse.dns.port else 0; + in + lib.concatStringsSep " " ( + # creation of tunnel interfaces + lib.optional (!settings.tun.disabled) "CAP_NET_ADMIN" + # binding to privileged ports + ++ lib.optional ( + nebulaPort > 0 && nebulaPort < 1024 || dnsPort > 0 && dnsPort < 1024 + ) "CAP_NET_BIND_SERVICE" + ); in { # Create the systemd service for Nebula. @@ -248,8 +283,8 @@ in Restart = "always"; ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; UMask = "0027"; - CapabilityBoundingSet = "CAP_NET_ADMIN"; - AmbientCapabilities = "CAP_NET_ADMIN"; + CapabilityBoundingSet = capabilities; + AmbientCapabilities = capabilities; LockPersonality = true; NoNewPrivileges = true; PrivateDevices = false; # needs access to /dev/net/tun (below) @@ -302,5 +337,8 @@ in ); }; - meta.maintainers = with lib.maintainers; [ numinit ]; + meta.maintainers = with lib.maintainers; [ + numinit + siriobalmelli + ]; } diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index 2d0465d6a0b8..514442dbe437 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -164,6 +164,12 @@ in ]; description = "Log level (0 = DEBUG, 5 = FATAL)."; }; + + disable = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.commas; + description = "Endpoints to disable (comma-separated list)"; + }; }; config = lib.mkIf cfg.enable { @@ -218,6 +224,7 @@ in (opt "tls-remote-ca" tlsRemoteCa) (opt "db-config" dbConfig) (opt "loglevel" (toString logLevel)) + (opt "disable" disable) ]; } (lib.mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) { diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix index 06c9e05a1e90..132cc874d5c1 100644 --- a/nixos/modules/services/web-apps/homebox.nix +++ b/nixos/modules/services/web-apps/homebox.nix @@ -35,6 +35,15 @@ in [documentation](https://homebox.software/en/configure-homebox.html). ''; }; + database = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Configure local PostgreSQL database server for Homebox. + ''; + }; + }; }; config = mkIf cfg.enable { @@ -43,16 +52,37 @@ in group = "homebox"; }; users.groups.homebox = { }; - services.homebox.settings = { - HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data"; - HBOX_DATABASE_DRIVER = mkDefault "sqlite3"; - HBOX_DATABASE_SQLITE_PATH = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; - HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false"; - HBOX_OPTIONS_CHECK_GITHUB_RELEASE = mkDefault "false"; - HBOX_MODE = mkDefault "production"; + services.homebox.settings = lib.mkMerge [ + (lib.mapAttrs (_: mkDefault) { + HBOX_STORAGE_DATA = "/var/lib/homebox/data"; + HBOX_DATABASE_DRIVER = "sqlite3"; + HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; + HBOX_OPTIONS_ALLOW_REGISTRATION = "false"; + HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false"; + HBOX_MODE = "production"; + }) + + (lib.mkIf cfg.database.createLocally { + HBOX_DATABASE_DRIVER = "postgres"; + HBOX_DATABASE_HOST = "/run/postgresql"; + HBOX_DATABASE_USERNAME = "homebox"; + HBOX_DATABASE_DATABASE = "homebox"; + HBOX_DATABASE_PORT = toString config.services.postgresql.settings.port; + }) + ]; + services.postgresql = lib.mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ "homebox" ]; + ensureUsers = [ + { + name = "homebox"; + ensureDBOwnership = true; + } + ]; }; systemd.services.homebox = { - after = [ "network.target" ]; + requires = lib.optional cfg.database.createLocally "postgresql.service"; + after = lib.optional cfg.database.createLocally "postgresql.service"; environment = cfg.settings; serviceConfig = { User = "homebox"; @@ -82,6 +112,7 @@ in ProcSubset = "pid"; ProtectSystem = "strict"; RestrictAddressFamilies = [ + "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index b1352778fee0..572b47d2b518 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -147,34 +147,34 @@ let else throw "Invalid database driver: ${cfg.database.driver}"; - mattermostPluginDerivations = - with pkgs; - map ( - plugin: - stdenv.mkDerivation { - name = "mattermost-plugin"; - installPhase = '' - mkdir -p $out/share - cp ${plugin} $out/share/plugin.tar.gz - ''; - dontUnpack = true; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - preferLocalBuild = true; - } - ) cfg.plugins; + mattermostPluginDerivations = map ( + plugin: + pkgs.stdenvNoCC.mkDerivation { + name = "${cfg.package.name}-plugin"; + installPhase = '' + runHook preInstall + mkdir -p $out/share + ln -sf ${plugin} $out/share/plugin.tar.gz + runHook postInstall + ''; + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + preferLocalBuild = true; + } + ) cfg.plugins; mattermostPlugins = - with pkgs; if mattermostPluginDerivations == [ ] then null else - stdenv.mkDerivation { + pkgs.stdenvNoCC.mkDerivation { name = "${cfg.package.name}-plugins"; - nativeBuildInputs = [ autoPatchelfHook ] ++ mattermostPluginDerivations; + nativeBuildInputs = [ pkgs.autoPatchelfHook ] ++ mattermostPluginDerivations; buildInputs = [ cfg.package ]; installPhase = '' + runHook preInstall mkdir -p $out plugins=(${ escapeShellArgs (map (plugin: "${plugin}/share/plugin.tar.gz") mattermostPluginDerivations) @@ -187,6 +187,7 @@ let GZIP_OPT=-9 tar -C "$hash" -cvzf "$out/$hash.tar.gz" . rm -rf "$hash" done + runHook postInstall ''; dontUnpack = true; @@ -254,8 +255,8 @@ let } ); - mattermostConfJSON = pkgs.writeText "mattermost-config.json" (builtins.toJSON mattermostConf); - + format = pkgs.formats.json { }; + finalConfig = format.generate "mattermost-config.json" mattermostConf; in { imports = [ @@ -454,9 +455,9 @@ in the options specified in services.mattermost will be generated but won't be overwritten on changes or rebuilds. - If this option is disabled, changes in the system console won't - be possible (default). If an config.json is present, it will be - overwritten! + If this option is disabled, persistent changes in the system + console won't be possible (the default). If a config.json is + present, it will be overwritten at service start! ''; }; @@ -480,7 +481,20 @@ in description = '' Plugins to add to the configuration. Overrides any installed if non-null. This is a list of paths to .tar.gz files or derivations evaluating to - .tar.gz files. + .tar.gz files. You can use `mattermost.buildPlugin` to build plugins; + see the NixOS documentation for more details. + ''; + }; + + pluginsBundle = mkOption { + type = with types; nullOr package; + default = mattermostPlugins; + defaultText = '' + All entries in {config}`services.mattermost.plugins`, repacked + ''; + description = '' + Derivation building to a directory of plugin tarballs. + This overrides {option}`services.mattermost.plugins` if provided. ''; }; @@ -508,7 +522,8 @@ in type = with types; attrsOf (either int str); default = { }; description = '' - Extra environment variables to export to the Mattermost process, in the systemd unit. + Extra environment variables to export to the Mattermost process + from the systemd unit configuration. ''; example = { MM_SERVICESETTINGS_SITEURL = "http://example.com"; @@ -524,11 +539,11 @@ in for mattermost (see [the Mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)). Settings defined in the environment file will overwrite settings - set via nix or via the {option}`services.mattermost.extraConfig` + set via Nix or via the {option}`services.mattermost.extraConfig` option. Useful for setting config options without their value ending up in the - (world-readable) nix store, e.g. for a database password. + (world-readable) Nix store, e.g. for a database password. ''; }; @@ -639,13 +654,13 @@ in if cfg.database.driver == "postgres" then { sslmode = "disable"; - connect_timeout = 30; + connect_timeout = 60; } else if cfg.database.driver == "mysql" then { charset = "utf8mb4,utf8"; - writeTimeout = "30s"; - readTimeout = "30s"; + writeTimeout = "60s"; + readTimeout = "60s"; } else throw "Invalid database driver ${cfg.database.driver}"; @@ -653,13 +668,13 @@ in if config.mattermost.database.driver == "postgres" then { sslmode = "disable"; - connect_timeout = 30; + connect_timeout = 60; } else if config.mattermost.database.driver == "mysql" then { charset = "utf8mb4,utf8"; - writeTimeout = "30s"; - readTimeout = "30s"; + writeTimeout = "60s"; + readTimeout = "60s"; } else throw "Invalid database driver"; @@ -687,7 +702,7 @@ in }; settings = mkOption { - type = types.attrs; + inherit (format) type; default = { }; description = '' Additional configuration options as Nix attribute set in config.json schema. @@ -786,7 +801,7 @@ in "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -" # Ensure that pluginDir is a directory, as it could be a symlink on prior versions. - "r- ${pluginDir} - - - - -" + # Don't remove or clean it out since it should be persistent, as this is where plugins are unpacked. "d= ${pluginDir} 0750 ${cfg.user} ${cfg.group} - -" # Ensure that the plugin directories exist. @@ -801,15 +816,14 @@ in "L+ ${cfg.dataDir}/client - - - - ${cfg.package}/client" ] ++ ( - if mattermostPlugins == null then - # Create the plugin tarball directory if it's a symlink. + if cfg.pluginsBundle == null then + # Create the plugin tarball directory to allow plugin uploads. [ - "r- ${cfg.dataDir}/plugins - - - - -" "d= ${cfg.dataDir}/plugins 0750 ${cfg.user} ${cfg.group} - -" ] else - # Symlink the plugin tarball directory, removing anything existing. - [ "L+ ${cfg.dataDir}/plugins - - - - ${mattermostPlugins}" ] + # Symlink the plugin tarball directory, removing anything existing, since it's managed by Nix. + [ "L+ ${cfg.dataDir}/plugins - - - - ${cfg.pluginsBundle}" ] ); systemd.services.mattermost = rec { @@ -836,7 +850,7 @@ in configDir=${escapeShellArg cfg.configDir} logDir=${escapeShellArg cfg.logDir} package=${escapeShellArg cfg.package} - nixConfig=${escapeShellArg mattermostConfJSON} + nixConfig=${escapeShellArg finalConfig} '' + optionalString (versionAtLeast config.system.stateVersion "25.05") '' # Migrate configs in the pre-25.05 directory structure. diff --git a/nixos/modules/services/web-apps/reposilite.nix b/nixos/modules/services/web-apps/reposilite.nix new file mode 100644 index 000000000000..ac9c9937bcfa --- /dev/null +++ b/nixos/modules/services/web-apps/reposilite.nix @@ -0,0 +1,439 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.reposilite; + format = pkgs.formats.cdn { }; + configFile = format.generate "reposilite.cdn" cfg.settings; + + useEmbeddedDb = cfg.database.type == "sqlite" || cfg.database.type == "h2"; + useMySQL = cfg.database.type == "mariadb" || cfg.database.type == "mysql"; + usePostgres = cfg.database.type == "postgresql"; + + # db password is appended at runtime by the service script (if needed) + dbString = + if useEmbeddedDb then + "${cfg.database.type} ${cfg.database.path}" + else + "${cfg.database.type} ${cfg.database.host}:${builtins.toString cfg.database.port} ${cfg.database.dbname} ${cfg.database.user} $(<${cfg.database.passwordFile})"; + + certDir = config.security.acme.certs.${cfg.useACMEHost}.directory; + + databaseModule = { + options = { + type = lib.mkOption { + type = lib.types.enum [ + "h2" + "mariadb" + "mysql" + "postgresql" + "sqlite" + ]; + description = '' + Database engine to use. + ''; + default = "sqlite"; + }; + + path = lib.mkOption { + type = lib.types.str; + description = '' + Path to the embedded database file. Set to `--temporary` to use an in-memory database. + ''; + default = "reposilite.db"; + }; + + host = lib.mkOption { + type = lib.types.str; + description = '' + Database host address. + ''; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + type = lib.types.port; + description = '' + Database TCP port. + ''; + defaultText = lib.literalExpression '' + if type == "postgresql" then 5432 else 3306 + ''; + default = if usePostgres then config.services.postgresql.settings.port else 3306; + }; + + dbname = lib.mkOption { + type = lib.types.str; + description = '' + Database name. + ''; + default = "reposilite"; + }; + + user = lib.mkOption { + type = lib.types.str; + description = '' + Database user. + ''; + default = "reposilite"; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + description = '' + Path to the file containing the password for the database connection. + This file must be readable by {option}`services.reposilite.user`. + ''; + default = null; + }; + }; + }; + + settingsModule = { + freeformType = format.type; + options = { + hostname = lib.mkOption { + type = lib.types.str; + description = '' + The hostname to bind to. Set to `0.0.0.0` to accept connections from everywhere, or `127.0.0.1` to restrict to localhost." + ''; + default = "0.0.0.0"; + example = "127.0.0.1"; + }; + + port = lib.mkOption { + type = lib.types.port; + description = '' + The TCP port to bind to. + ''; + default = 3000; + }; + + database = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Database connection string. Please use {option}`services.reposilite.database` instead. + See https://reposilite.com/guide/general#local-configuration for valid values. + ''; + default = null; + }; + + sslEnabled = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to listen for encrypted connections on {option}`settings.sslPort`. + ''; + default = false; + }; + + sslPort = lib.mkOption { + type = lib.types.port; # cant be null + description = "SSL port to bind to. SSL needs to be enabled explicitly via {option}`settings.enableSsl`."; + default = 443; + }; + + keyPath = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Path to the .jsk KeyStore or paths to the PKCS#8 certificate and private key, separated by a space (see example). + You can use `''${WORKING_DIRECTORY}` to refer to paths relative to Reposilite's working directory. + If you are using a Java KeyStore, don't forget to specify the password via the {var}`REPOSILITE_LOCAL_KEYPASSWORD` environment variable. + See https://reposilite.com/guide/ssl for more information on how to set SSL up. + ''; + default = null; + example = "\${WORKING_DIRECTORY}/cert.pem \${WORKING_DIRECTORY}/key.pem"; + }; + + keyPassword = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Plaintext password used to unlock the Java KeyStore set in {option}`services.reposilite.settings.keyPath`. + WARNING: this option is insecure and should not be used to store the password. + Consider using {option}`services.reposilite.keyPasswordFile` instead. + ''; + default = null; + }; + + enforceSsl = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to redirect all traffic to SSL. + ''; + default = false; + }; + + webThreadPool = lib.mkOption { + type = lib.types.ints.between 5 65535; + description = '' + Maximum amount of threads used by the core thread pool. (min: 5) + The web thread pool handles the first few steps of incoming HTTP connections, tasks are redirected as soon as possible to the IO thread pool. + ''; + default = 16; + }; + + ioThreadPool = lib.mkOption { + type = lib.types.ints.between 2 65535; + description = '' + The IO thread pool handles all tasks that may benefit from non-blocking IO. (min: 2) + Because most tasks are redirected to IO thread pool, it might be a good idea to keep it at least equal to web thread pool. + ''; + default = 8; + }; + + databaseThreadPool = lib.mkOption { + type = lib.types.ints.positive; + description = '' + Maximum amount of concurrent connections to the database. (one per thread) + Embedded databases (sqlite, h2) do not support truly concurrent connections, so the value will always be `1` if they are used. + ''; + default = 1; + }; + + compressionStrategy = lib.mkOption { + type = lib.types.enum [ + "none" + "gzip" + ]; + description = '' + Compression algorithm used by this instance of Reposilite. + `none` reduces usage of CPU & memory, but requires transfering more data. + ''; + default = "none"; + }; + + idleTimeout = lib.mkOption { + type = lib.types.ints.unsigned; + description = '' + Default idle timeout used by Jetty. + ''; + default = 30000; + }; + + bypassExternalCache = lib.mkOption { + type = lib.types.bool; + description = '' + Add cache bypass headers to responses from /api/* to avoid issues with proxies such as Cloudflare. + ''; + default = true; + }; + + cachedLogSize = lib.mkOption { + type = lib.types.ints.unsigned; + description = '' + Amount of messages stored in the cache logger. + ''; + default = 50; + }; + + defaultFrontend = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to enable the default included frontend with a dashboard. + ''; + default = true; + }; + + basePath = lib.mkOption { + type = lib.types.str; + description = '' + Custom base path for this Reposilite instance. + It is not recommended changing this, you should instead prioritize using a different subdomain. + ''; + default = "/"; + }; + + debugEnabled = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to enable debug mode. + ''; + default = false; + }; + }; + }; +in +{ + options.services.reposilite = { + enable = lib.mkEnableOption "Reposilite"; + package = lib.mkPackageOption pkgs "reposilite" { } // { + apply = + pkg: + pkg.override (old: { + plugins = (old.plugins or [ ]) ++ cfg.plugins; + }); + }; + + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; + description = '' + List of plugins to add to Reposilite. + ''; + default = [ ]; + example = "with reposilitePlugins; [ checksum groovy ]"; + }; + + database = lib.mkOption { + description = "Database options."; + default = { }; + type = lib.types.submodule databaseModule; + }; + + keyPasswordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + description = '' + Path the the file containing the password used to unlock the Java KeyStore file specified in {option}`services.reposilite.settings.keyPath`. + This file must be readable my {option}`services.reposilite.user`. + ''; + default = null; + }; + + useACMEHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Host of an existing Let's Encrypt certificate to use for SSL. + Make sure that the certificate directory is readable by the `reposilite` user or group, for example via {option}`security.acme.certs..group`. + *Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using {option}`security.acme.certs`* + ''; + default = null; + }; + + settings = lib.mkOption { + description = "Configuration written to the reposilite.cdn file"; + default = { }; + type = lib.types.submodule settingsModule; + }; + + workingDirectory = lib.mkOption { + type = lib.types.path; + description = '' + Working directory for Reposilite. + ''; + default = "/var/lib/reposilite"; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = '' + Extra arguments/parameters passed to the Reposilite. Can be used for first token generation. + ''; + default = [ ]; + example = lib.literalExpression ''[ "--token" "name:tempsecrettoken" ]''; + }; + + user = lib.mkOption { + type = lib.types.str; + description = '' + The user to run Reposilite under. + ''; + default = "reposilite"; + }; + + group = lib.mkOption { + type = lib.types.str; + description = '' + The group to run Reposilite under. + ''; + default = "reposilite"; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to open the firewall ports for Reposilite. If SSL is enabled, its port will be opened too. + ''; + default = false; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.settings.sslEnabled -> cfg.settings.keyPath != null; + message = '' + Reposilite was configured to enable SSL, but no valid paths to certificate files were provided via `settings.keyPath`. + Read more about SSL certificates here: https://reposilite.com/guide/ssl + ''; + } + { + assertion = cfg.settings.enforceSsl -> cfg.settings.sslEnabled; + message = "You cannot enforce SSL if SSL is not enabled."; + } + { + assertion = !useEmbeddedDb -> cfg.database.passwordFile != null; + message = "You need to set `services.reposilite.database.passwordFile` when using MySQL or Postgres."; + } + ]; + + services.reposilite.settings.keyPath = lib.mkIf ( + cfg.useACMEHost != null + ) "${certDir}/fullchain.pem ${certDir}/key.pem"; + + environment.systemPackages = [ cfg.package ]; + + users = { + groups.${cfg.group} = lib.mkIf (cfg.group == "reposilite") { }; + users.${cfg.user} = lib.mkIf (cfg.user == "reposilite") { + isSystemUser = true; + group = cfg.group; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall ( + lib.mkMerge [ + { + allowedTCPPorts = [ cfg.settings.port ]; + } + (lib.mkIf cfg.settings.sslEnabled { + allowedTCPPorts = [ cfg.settings.sslPort ]; + }) + ] + ); + + systemd.services.reposilite = { + enable = true; + wantedBy = [ "multi-user.target" ]; + after = + [ "network.target" ] + ++ (lib.optional useMySQL "mysql.service") + ++ (lib.optional usePostgres "postgresql.service"); + + script = + lib.optionalString (cfg.keyPasswordFile != null && cfg.settings.keyPassword == null) '' + export REPOSILITE_LOCAL_KEYPASSWORD="$(<${cfg.keyPasswordFile})" + '' + + '' + export REPOSILITE_LOCAL_DATABASE="${dbString}" + + ${lib.getExe cfg.package} --local-configuration ${configFile} --local-configuration-mode none --working-directory ${cfg.workingDirectory} ${lib.escapeShellArgs cfg.extraArgs} + ''; + + serviceConfig = lib.mkMerge [ + (lib.mkIf (builtins.dirOf cfg.workingDirectory == "/var/lib") { + StateDirectory = builtins.baseNameOf cfg.workingDirectory; + StateDirectoryMode = "700"; + }) + { + Type = "exec"; + Restart = "on-failure"; + + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.workingDirectory; + + # TODO better hardening + LimitNOFILE = "1048576"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = "strict"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + } + ]; + }; + }; + + meta.maintainers = [ lib.maintainers.uku3lig ]; +} diff --git a/nixos/tests/agnos.nix b/nixos/tests/agnos.nix new file mode 100644 index 000000000000..b73f1c021412 --- /dev/null +++ b/nixos/tests/agnos.nix @@ -0,0 +1,209 @@ +{ + system ? builtins.currentSystem, + pkgs ? import ../.. { inherit system; }, + lib ? pkgs.lib, +}: + +let + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + nodeIP = n: n.networking.primaryIPAddress; + dnsZone = + nodes: + pkgs.writeText "agnos.test.zone" '' + $TTL 604800 + @ IN SOA ns1.agnos.test. root.agnos.test. ( + 3 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL + ; + ; name servers - NS records + IN NS ns1.agnos.test. + + ; name servers - A records + ns1.agnos.test. IN A ${nodeIP nodes.dnsserver} + + agnos-ns.agnos.test. IN A ${nodeIP nodes.server} + _acme-challenge.a.agnos.test. IN NS agnos-ns.agnos.test. + _acme-challenge.b.agnos.test. IN NS agnos-ns.agnos.test. + _acme-challenge.c.agnos.test. IN NS agnos-ns.agnos.test. + _acme-challenge.d.agnos.test. IN NS agnos-ns.agnos.test. + ''; + + mkTest = + { + name, + extraServerConfig ? { }, + checkFirewallClosed ? true, + }: + makeTest { + inherit name; + meta = { + maintainers = with lib.maintainers; [ justinas ]; + }; + + nodes = { + # The fake ACME server which will respond to client requests + acme = + { nodes, pkgs, ... }: + { + imports = [ ./common/acme/server ]; + environment.systemPackages = [ pkgs.netcat ]; + networking.nameservers = lib.mkForce [ (nodeIP nodes.dnsserver) ]; + }; + + # A fake DNS server which points _acme-challenge subdomains to "server" + dnsserver = + { nodes, ... }: + { + networking.firewall.allowedTCPPorts = [ 53 ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + services.bind = { + cacheNetworks = [ "192.168.1.0/24" ]; + enable = true; + extraOptions = '' + dnssec-validation no; + ''; + zones."agnos.test" = { + file = dnsZone nodes; + master = true; + }; + }; + }; + + # The server using agnos to request certificates + server = + { nodes, ... }: + { + imports = [ extraServerConfig ]; + + networking.extraHosts = '' + ${nodeIP nodes.acme} acme.test + ''; + security.agnos = { + enable = true; + generateKeys.enable = true; + persistent = false; + server = "https://acme.test/dir"; + serverCa = ./common/acme/server/ca.cert.pem; + temporarilyOpenFirewall = true; + + settings.accounts = [ + { + email = "webmaster@agnos.test"; + # account with an existing private key + private_key_path = "${./common/acme/server/acme.test.key.pem}"; + + certificates = [ + { + domains = [ "a.agnos.test" ]; + # Absolute paths + fullchain_output_file = "/tmp/a.agnos.test.crt"; + key_output_file = "/tmp/a.agnos.test.key"; + } + + { + domains = [ + "b.agnos.test" + "*.b.agnos.test" + ]; + # Relative paths + fullchain_output_file = "b.agnos.test.crt"; + key_output_file = "b.agnos.test.key"; + } + ]; + } + + { + email = "webmaster2@agnos.test"; + # account with a missing private key, should get generated + private_key_path = "webmaster2.key"; + + certificates = [ + { + domains = [ "c.agnos.test" ]; + # Absolute paths + fullchain_output_file = "/tmp/c.agnos.test.crt"; + key_output_file = "/tmp/c.agnos.test.key"; + } + + { + domains = [ + "d.agnos.test" + "*.d.agnos.test" + ]; + # Relative paths + fullchain_output_file = "d.agnos.test.crt"; + key_output_file = "d.agnos.test.key"; + } + ]; + } + ]; + }; + }; + }; + + testScript = '' + def check_firewall_closed(caller): + """ + Check that TCP port 53 is closed again. + + Since we do not set `networking.firewall.rejectPackets`, + "timed out" indicates a closed port, + while "connection refused" (after agnos has shut down) indicates an open port. + """ + + out = caller.fail("nc -v -z -w 1 server 53 2>&1") + assert "Connection timed out" in out + + start_all() + acme.wait_for_unit('pebble.service') + server.wait_for_unit('default.target') + + # Test that agnos.timer is scheduled + server.succeed("systemctl status agnos.timer") + server.succeed('systemctl start agnos.service') + + expected_perms = "640 agnos agnos" + outputs = [ + "/tmp/a.agnos.test.crt", + "/tmp/a.agnos.test.key", + "/var/lib/agnos/b.agnos.test.crt", + "/var/lib/agnos/b.agnos.test.key", + "/var/lib/agnos/webmaster2.key", + "/tmp/c.agnos.test.crt", + "/tmp/c.agnos.test.key", + "/var/lib/agnos/d.agnos.test.crt", + "/var/lib/agnos/d.agnos.test.key", + ] + for o in outputs: + out = server.succeed(f"stat -c '%a %U %G' {o}").strip() + assert out == expected_perms, \ + f"Expected mode/owner/group to be '{expected_perms}', but it was '{out}'" + + ${lib.optionalString checkFirewallClosed "check_firewall_closed(acme)"} + ''; + }; +in +{ + iptables = mkTest { + name = "iptables"; + }; + + nftables = mkTest { + name = "nftables"; + extraServerConfig = { + networking.nftables.enable = true; + }; + }; + + no-firewall = mkTest { + name = "no-firewall"; + extraServerConfig = { + networking.firewall.enable = lib.mkForce false; + security.agnos.temporarilyOpenFirewall = lib.mkForce false; + }; + checkFirewallClosed = false; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 56ed0e9137ed..3fea2e23d8d6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -177,6 +177,7 @@ in agate = runTest ./web-servers/agate.nix; agda = runTest ./agda.nix; age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix; + agnos = discoverTests (import ./agnos.nix); agorakit = runTest ./web-apps/agorakit.nix; airsonic = runTest ./airsonic.nix; akkoma = runTestOn [ "x86_64-linux" "aarch64-linux" ] { @@ -338,6 +339,30 @@ in containers-unified-hierarchy = handleTest ./containers-unified-hierarchy.nix { }; convos = handleTest ./convos.nix { }; corerad = handleTest ./corerad.nix { }; + cosmic = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic"; + _module.args.enableAutologin = false; + _module.args.enableXWayland = true; + }; + cosmic-autologin = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-autologin"; + _module.args.enableAutologin = true; + _module.args.enableXWayland = true; + }; + cosmic-noxwayland = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-noxwayland"; + _module.args.enableAutologin = false; + _module.args.enableXWayland = false; + }; + cosmic-autologin-noxwayland = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-autologin-noxwayland"; + _module.args.enableAutologin = true; + _module.args.enableXWayland = false; + }; coturn = handleTest ./coturn.nix { }; couchdb = handleTest ./couchdb.nix { }; crabfit = handleTest ./crabfit.nix { }; @@ -480,7 +505,7 @@ in imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.floorp; }; - fluent-bit = handleTest ./fluent-bit.nix { }; + fluent-bit = runTest ./fluent-bit.nix; fluentd = handleTest ./fluentd.nix { }; fluidd = handleTest ./fluidd.nix { }; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix { }; @@ -1123,6 +1148,7 @@ in redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix { }; renovate = handleTest ./renovate.nix { }; replace-dependencies = handleTest ./replace-dependencies { }; + reposilite = runTest ./reposilite.nix; restartByActivationScript = handleTest ./restart-by-activation-script.nix { }; restic-rest-server = handleTest ./restic-rest-server.nix { }; restic = handleTest ./restic.nix { }; diff --git a/nixos/tests/centrifugo.nix b/nixos/tests/centrifugo.nix index 8ad44a011663..5867297c3d30 100644 --- a/nixos/tests/centrifugo.nix +++ b/nixos/tests/centrifugo.nix @@ -10,7 +10,10 @@ in { lib, ... }: { name = "centrifugo"; - meta.maintainers = [ lib.maintainers.tie ]; + meta.maintainers = [ + lib.maintainers.tie + lib.maintainers.valodim + ]; nodes = lib.listToAttrs ( lib.imap0 (index: name: { @@ -21,12 +24,15 @@ in services.centrifugo = { enable = true; settings = { - inherit name; - port = centrifugoPort; - # See https://centrifugal.dev/docs/server/engines#redis-sharding - engine = "redis"; - # Connect to local Redis shard via Unix socket. - redis_address = + node = { + inherit name; + }; + http_server.port = centrifugoPort; + http_api.insecure = true; + usage_stats.disabled = true; + + engine.type = "redis"; + engine.redis.address = let toRedisAddresses = map (name: "${name}:${toString redisPort}"); in @@ -35,8 +41,6 @@ in "unix://${config.services.redis.servers.centrifugo.unixSocket}" ] ++ toRedisAddresses (lib.drop (index + 1) nodes); - usage_stats_disable = true; - api_insecure = true; }; extraGroups = [ config.services.redis.servers.centrifugo.user diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix new file mode 100644 index 000000000000..44df8fb1da49 --- /dev/null +++ b/nixos/tests/cosmic.nix @@ -0,0 +1,131 @@ +{ + config, + lib, + testName, + enableAutologin, + enableXWayland, + ... +}: + +{ + name = testName; + + meta = { + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + thefossguy + ]; + }; + + nodes.machine = { + imports = [ ./common/user-account.nix ]; + + services = { + # For `cosmic-store` to be added to `environment.systemPackages` + # and for it to work correctly because Flatpak is a runtime + # dependency of `cosmic-store`. + flatpak.enable = true; + + displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic = { + enable = true; + xwayland.enable = enableXWayland; + }; + }; + + services.displayManager.autoLogin = lib.mkIf enableAutologin { + enable = true; + user = "alice"; + }; + + environment.systemPackages = with config.node.pkgs; [ + # These two packages are used to check if a window was opened + # under the COSMIC session or not. Kinda important. + # TODO: Move the check from the test module to + # `nixos/lib/test-driver/src/test_driver/machine.py` so more + # Wayland-only testing can be done using the existing testing + # infrastructure. + jq + lswt + ]; + + # So far, all COSMIC tests launch a few GUI applications. In doing + # so, the default allocated memory to the guest of 1024M quickly + # poses a very high risk of an OOM-shutdown which is worse than an + # OOM-kill. Because now, the test failed, but not for a genuine + # reason, but an OOM-shutdown. That's an inconclusive failure + # which might possibly mask an actual failure. Not enabling + # systemd-oomd because we need said applications running for a + # few seconds. So instead, bump the allocated memory to the guest + # from 1024M to 4x; 4096M. + virtualisation.memorySize = 4096; + }; + + testScript = + { nodes, ... }: + let + cfg = nodes.machine; + user = cfg.users.users.alice; + DISPLAY = lib.strings.optionalString enableXWayland ( + if enableAutologin then "DISPLAY=:0" else "DISPLAY=:1" + ); + in + '' + #testName: ${testName} + '' + + ( + if (enableAutologin) then + '' + with subtest("cosmic-greeter initialisation"): + machine.wait_for_unit("graphical.target") + '' + else + '' + from time import sleep + + machine.wait_for_unit("graphical.target") + machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter") + # Sleep for 10 seconds for ensuring that `greetd` loads the + # password prompt for the login screen properly. + sleep(10) + + with subtest("cosmic-session login"): + machine.send_chars("${user.password}\n", delay=0.2) + '' + ) + + '' + # _One_ of the final processes to start as part of the + # `cosmic-session` target is the Workspaces applet. So, wait + # for it to start. The process existing means that COSMIC + # now handles any opened windows from now on. + machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'") + + # The best way to test for Wayland and XWayland is to launch + # the GUI applications and see the results yourself. + with subtest("Launch applications"): + # key: binary_name + # value: "app-id" as reported by `lswt` + gui_apps_to_launch = {} + + # We want to ensure that the first-party applications + # start/launch properly. + gui_apps_to_launch['cosmic-edit'] = 'com.system76.CosmicEdit' + gui_apps_to_launch['cosmic-files'] = 'com.system76.CosmicFiles' + gui_apps_to_launch['cosmic-player'] = 'com.system76.CosmicPlayer' + gui_apps_to_launch['cosmic-settings'] = 'com.system76.CosmicSettings' + gui_apps_to_launch['cosmic-store'] = 'com.system76.CosmicStore' + gui_apps_to_launch['cosmic-term'] = 'com.system76.CosmicTerm' + + for gui_app, app_id in gui_apps_to_launch.items(): + machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} >&2 &'", timeout=5) + # Nix builds the following non-commented expression to the following: + # `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' ` + machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30) + machine.succeed(f"pkill {gui_app}", timeout=5) + + machine.succeed("echo 'test completed succeessfully' > /${testName}") + machine.copy_from_vm('/${testName}') + + machine.shutdown() + ''; +} diff --git a/nixos/tests/envfs.nix b/nixos/tests/envfs.nix index 9e728698ebc3..b9067467eb2b 100644 --- a/nixos/tests/envfs.nix +++ b/nixos/tests/envfs.nix @@ -25,8 +25,6 @@ import ./make-test-python.nix ( "PATH= /usr/bin/env --version", "PATH= test -e /usr/bin/sh", "PATH= test -e /usr/bin/env", - # no stat - "! test -e /usr/bin/cp", # also picks up PATH that was set after execve "! /usr/bin/hello", "PATH=${pkgs.hello}/bin /usr/bin/hello", diff --git a/nixos/tests/fluent-bit.nix b/nixos/tests/fluent-bit.nix index 9dc68011ea85..f9923e3ada7e 100644 --- a/nixos/tests/fluent-bit.nix +++ b/nixos/tests/fluent-bit.nix @@ -1,40 +1,56 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "fluent-bit"; - - nodes.machine = - { config, pkgs, ... }: - { - services.fluent-bit = { - enable = true; - settings = { - pipeline = { - inputs = [ - { - name = "systemd"; - systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service"; - } - ]; - outputs = [ - { - name = "file"; - path = "/var/log/fluent-bit"; - file = "fluent-bit.out"; - } - ]; - }; - }; +# Regression test for https://github.com/NixOS/nixpkgs/pull/395128 +{ + name = "fluent-bit"; + nodes.machine = { + services.fluent-bit = { + enable = true; + settings = { + pipeline = { + inputs = [ + { + name = "systemd"; + systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service"; + } + ]; + outputs = [ + { + name = "file"; + path = "/var/log/fluent-bit"; + file = "fluent-bit.out"; + } + ]; }; - - systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit"; }; + }; + systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit"; - testScript = '' - start_all() + # Logs get compressed when larger than 1024 bytes + # Lets generate some logs that trigger that + # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+ + # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress= + systemd.services.fluent-bit-regression-395128 = { + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + for i in {1..20}; do + (head -c 1200 < /dev/zero | tr '\0' 'A') && echo + sleep 1 + done + ''; + }; + }; - machine.wait_for_unit("fluent-bit.service") - machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out") - ''; - } -) + testScript = '' + start_all() + + machine.wait_for_unit("fluent-bit.service") + + with subtest("fluent-bit handles zstd-compressed journal logs"): + machine.succeed("systemctl start fluent-bit-regression-395128.service") + machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'") + + machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out") + ''; +} diff --git a/nixos/tests/homebox.nix b/nixos/tests/homebox.nix index 2d14a153c976..aadcd4269774 100644 --- a/nixos/tests/homebox.nix +++ b/nixos/tests/homebox.nix @@ -8,19 +8,36 @@ import ./make-test-python.nix ( meta = with pkgs.lib.maintainers; { maintainers = [ patrickdag ]; }; - nodes.machine = { - services.homebox = { - enable = true; - settings.HBOX_WEB_PORT = port; - }; - }; - testScript = '' - machine.wait_for_unit("homebox.service") - machine.wait_for_open_port(${port}) + nodes = + let + self = { + simple = { + services.homebox = { + enable = true; + settings.HBOX_WEB_PORT = port; + }; + }; - machine.succeed("curl --fail -X GET 'http://localhost:${port}/'") - out = machine.succeed("curl --fail 'http://localhost:${port}/api/v1/status'") - assert '"health":true' in out + postgres = { + imports = [ self.simple ]; + services.homebox.database.createLocally = true; + }; + }; + in + self; + testScript = '' + def test_homebox(node): + node.wait_for_unit("homebox.service") + node.wait_for_open_port(${port}) + + node.succeed("curl --fail -X GET 'http://localhost:${port}/'") + out = node.succeed("curl --fail 'http://localhost:${port}/api/v1/status'") + assert '"health":true' in out + + test_homebox(simple) + simple.send_monitor_command("quit") + simple.wait_for_shutdown() + test_homebox(postgres) ''; } ) diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index eb7b814e3983..bfbbf40b3d8d 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -33,7 +33,7 @@ import ../make-test-python.nix ( ); }; - system.stateVersion = lib.mkDefault "25.05"; + system.stateVersion = lib.mkDefault (lib.versions.majorMinor lib.version); services.mattermost = lib.recursiveUpdate { enable = true; @@ -63,7 +63,7 @@ import ../make-test-python.nix ( # Upgrade to the latest Mattermost. specialisation.latest.configuration = { services.mattermost.package = lib.mkForce pkgs.mattermostLatest; - system.stateVersion = lib.mkVMOverride "25.05"; + system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version); }; } ) @@ -90,57 +90,60 @@ import ../make-test-python.nix ( name = "mattermost"; nodes = rec { - postgresMutable = + postgresMutable = makeMattermost { + mutableConfig = true; + preferNixConfig = false; + settings.SupportSettings.HelpLink = "https://search.nixos.org"; + } { }; + postgresMostlyMutable = makeMattermost { mutableConfig = true; - preferNixConfig = false; - settings.SupportSettings.HelpLink = "https://search.nixos.org"; + preferNixConfig = true; + plugins = with pkgs; [ + # Build the demo plugin. + (mattermost.buildPlugin { + pname = "mattermost-plugin-starter-template"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mattermost"; + repo = "mattermost-plugin-starter-template"; + # Newer versions have issues with their dependency lockfile. + rev = "7c98e89ac1a268ce8614bc665571b7bbc9a70df2"; + hash = "sha256-uyfxB0GZ45qL9ssWUord0eKQC6S0TlCTtjTOXWtK4H0="; + }; + vendorHash = "sha256-Jl4F9YkHNqiFP9/yeyi4vTntqxMk/J1zhEP6QLSvJQA="; + npmDepsHash = "sha256-z08nc4XwT+uQjQlZiUydJyh8mqeJoYdPFWuZpw9k99s="; + }) + + # Build the todos plugin. + (mattermost.buildPlugin { + pname = "mattermost-plugin-todo"; + version = "0.8-pre"; + src = fetchFromGitHub { + owner = "mattermost-community"; + repo = "mattermost-plugin-todo"; + # 0.7.1 didn't work, seems to use an older set of node dependencies. + rev = "f25dc91ea401c9f0dcd4abcebaff10eb8b9836e5"; + hash = "sha256-OM+m4rTqVtolvL5tUE8RKfclqzoe0Y38jLU60Pz7+HI="; + }; + vendorHash = "sha256-5KpechSp3z/Nq713PXYruyNxveo6CwrCSKf2JaErbgg="; + npmDepsHash = "sha256-o2UOEkwb8Vx2lDWayNYgng0GXvmS6lp/ExfOq3peyMY="; + extraGoModuleAttrs = { + npmFlags = [ "--legacy-peer-deps" ]; + }; + }) + ]; } { # Last version to support the "old" config layout. system.stateVersion = lib.mkForce "24.11"; - # First version to support the "new" config layout. - specialisation.upgrade.configuration.system.stateVersion = lib.mkVMOverride "25.05"; + # Supports the "new" config layout. + specialisation.upgrade.configuration.system.stateVersion = lib.mkVMOverride ( + lib.versions.majorMinor lib.version + ); }; - postgresMostlyMutable = makeMattermost { - mutableConfig = true; - plugins = with pkgs; [ - # Build the demo plugin. - (mattermost.buildPlugin { - pname = "mattermost-plugin-starter-template"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "mattermost"; - repo = "mattermost-plugin-starter-template"; - # Newer versions have issues with their dependency lockfile. - rev = "7c98e89ac1a268ce8614bc665571b7bbc9a70df2"; - hash = "sha256-uyfxB0GZ45qL9ssWUord0eKQC6S0TlCTtjTOXWtK4H0="; - }; - vendorHash = "sha256-Jl4F9YkHNqiFP9/yeyi4vTntqxMk/J1zhEP6QLSvJQA="; - npmDepsHash = "sha256-z08nc4XwT+uQjQlZiUydJyh8mqeJoYdPFWuZpw9k99s="; - }) - - # Build the todos plugin. - (mattermost.buildPlugin { - pname = "mattermost-plugin-todo"; - version = "0.8-pre"; - src = fetchFromGitHub { - owner = "mattermost-community"; - repo = "mattermost-plugin-todo"; - # 0.7.1 didn't work, seems to use an older set of node dependencies. - rev = "f25dc91ea401c9f0dcd4abcebaff10eb8b9836e5"; - hash = "sha256-OM+m4rTqVtolvL5tUE8RKfclqzoe0Y38jLU60Pz7+HI="; - }; - vendorHash = "sha256-5KpechSp3z/Nq713PXYruyNxveo6CwrCSKf2JaErbgg="; - npmDepsHash = "sha256-o2UOEkwb8Vx2lDWayNYgng0GXvmS6lp/ExfOq3peyMY="; - extraGoModuleAttrs = { - npmFlags = [ "--legacy-peer-deps" ]; - }; - }) - ]; - } { }; postgresImmutable = makeMattermost { package = pkgs.mattermost.overrideAttrs (prev: { webapp = prev.webapp.overrideAttrs (prevWebapp: { @@ -343,9 +346,14 @@ import ../make-test-python.nix ( ''; in '' + import sys import shlex + import threading + import queue def wait_mattermost_up(node, site_name="${siteName}"): + print(f"wait_mattermost_up({node.name!r}, site_name={site_name!r})", file=sys.stderr) + node.wait_for_unit("multi-user.target") node.systemctl("start mattermost.service") node.wait_for_unit("mattermost.service") node.wait_for_open_port(8065) @@ -353,20 +361,25 @@ import ../make-test-python.nix ( node.succeed(f"curl {shlex.quote('${url}')}/index.html | grep {shlex.quote(site_name)}") def restart_mattermost(node, site_name="${siteName}"): + print(f"restart_mattermost({node.name!r}, site_name={site_name!r})", file=sys.stderr) node.systemctl("restart mattermost.service") wait_mattermost_up(node, site_name) def expect_config(node, mattermost_version, *configs): + print(f"expect_config({node.name!r}, {mattermost_version!r}, *{configs!r})", file=sys.stderr) for config in configs: node.succeed(f"${expectConfig} {shlex.quote(config)} {shlex.quote(mattermost_version)}") def expect_plugins(node, jq_or_code): + print(f"expect_plugins({node.name!r}, {jq_or_code!r})", file=sys.stderr) node.succeed(f"${expectPlugins} {shlex.quote(str(jq_or_code))}") def ensure_post(node, fail_if_not_found=False): + print(f"ensure_post({node.name!r}, fail_if_not_found={fail_if_not_found!r})", file=sys.stderr) node.succeed(f"${ensurePost} {shlex.quote('${url}')} {1 if fail_if_not_found else 0}") - def set_config(node, *configs, nixos_version='25.05'): + def set_config(node, *configs, nixos_version='${lib.versions.majorMinor lib.version}'): + print(f"set_config({node.name!r}, *{configs!r}, nixos_version={nixos_version!r})", file=sys.stderr) for config in configs: args = [shlex.quote("${setConfig}")] args.append(shlex.quote(config)) @@ -374,8 +387,13 @@ import ../make-test-python.nix ( args.append(shlex.quote(str(nixos_version))) node.succeed(' '.join(args)) - def run_mattermost_tests(mutableToplevel: str, mutable, - mostlyMutableToplevel: str, mostlyMutable, + def switch_to_specialisation(node, toplevel: str, specialisation: str): + print(f"switch_to_specialisation({node.name!r}, {toplevel!r}, {specialisation!r})", file=sys.stderr) + node.succeed(f"{toplevel}/specialisation/{specialisation}/bin/switch-to-configuration switch || true") + + def run_mattermost_tests(shutdown_queue: queue.Queue, + mutableToplevel: str, mutable, + mostlyMutableToplevel: str, mostlyMutablePlugins: str, mostlyMutable, immutableToplevel: str, immutable, environmentFileToplevel: str, environmentFile): esr, latest = '${pkgs.mattermost.version}', '${pkgs.mattermostLatest.version}' @@ -391,8 +409,7 @@ import ../make-test-python.nix ( set_config( mutable, '.SupportSettings.AboutLink = "https://mattermost.com"', - '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"', - nixos_version='24.11' # Default 'mutable' config is an old version + '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"' ) ensure_post(mutable) restart_mattermost(mutable) @@ -401,23 +418,14 @@ import ../make-test-python.nix ( expect_config(mutable, esr, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"') ensure_post(mutable, fail_if_not_found=True) - # Switch to the newer config - mutable.succeed(f"{mutableToplevel}/specialisation/upgrade/bin/switch-to-configuration switch") - wait_mattermost_up(mutable) - - # AboutLink and HelpLink should be changed, still, and the post should still exist - expect_config(mutable, esr, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"') - ensure_post(mutable, fail_if_not_found=True) - # Switch to the latest Mattermost version - mutable.succeed(f"{mutableToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(mutable, mutableToplevel, "latest") wait_mattermost_up(mutable) # AboutLink and HelpLink should be changed, still, and the post should still exist expect_config(mutable, latest, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"') ensure_post(mutable, fail_if_not_found=True) - - mutable.shutdown() + shutdown_queue.put(mutable) ## Mostly mutable node tests ## mostlyMutable.start() @@ -434,13 +442,40 @@ import ../make-test-python.nix ( mostlyMutable, '.SupportSettings.AboutLink = "https://mattermost.com"', '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"', + nixos_version='24.11' # Default 'mostlyMutable' config is an old version + ) + ensure_post(mostlyMutable) + restart_mattermost(mostlyMutable) + + # HelpLink should be changed but AboutLink should not, and the post should exist + expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + ensure_post(mostlyMutable, fail_if_not_found=True) + + # Switch to the newer config and make sure the plugins directory is replaced with a directory, + # since it could have been a symlink on previous versions. + mostlyMutable.systemctl("stop mattermost.service") + mostlyMutable.succeed(f"[ ! -L /var/lib/mattermost/data/plugins ] && rm -rf /var/lib/mattermost/data/plugins && ln -s {mostlyMutablePlugins} /var/lib/mattermost/data/plugins || true") + mostlyMutable.succeed('[ -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]') + switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "upgrade") + wait_mattermost_up(mostlyMutable) + mostlyMutable.succeed('[ ! -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]') + + # HelpLink should be changed, still, and the post should still exist + expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + ensure_post(mostlyMutable, fail_if_not_found=True) + + # Edit the config and make a post + set_config( + mostlyMutable, + '.SupportSettings.AboutLink = "https://mattermost.com/foo"', + '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual/bar"', '.PluginSettings.PluginStates."com.mattermost.plugin-todo".Enable = true' ) ensure_post(mostlyMutable) restart_mattermost(mostlyMutable) # AboutLink should be overridden by NixOS configuration; HelpLink should be what we set above - expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual/bar"') # Single plugin that's now enabled. expect_plugins(mostlyMutable, 'length == 1') @@ -449,14 +484,14 @@ import ../make-test-python.nix ( ensure_post(mostlyMutable, fail_if_not_found=True) # Switch to the latest Mattermost version - mostlyMutable.succeed(f"{mostlyMutableToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "latest") wait_mattermost_up(mostlyMutable) # AboutLink should be overridden and the post should still exist - expect_config(mostlyMutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + expect_config(mostlyMutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual/bar"') ensure_post(mostlyMutable, fail_if_not_found=True) - mostlyMutable.shutdown() + shutdown_queue.put(mostlyMutable) ## Immutable node tests ## immutable.start() @@ -484,14 +519,14 @@ import ../make-test-python.nix ( ensure_post(immutable, fail_if_not_found=True) # Switch to the latest Mattermost version - immutable.succeed(f"{immutableToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(immutable, immutableToplevel, "latest") wait_mattermost_up(immutable) # AboutLink and HelpLink should be changed, still, and the post should still exist expect_config(immutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"') ensure_post(immutable, fail_if_not_found=True) - immutable.shutdown() + shutdown_queue.put(immutable) ## Environment File node tests ## environmentFile.start() @@ -503,36 +538,56 @@ import ../make-test-python.nix ( ensure_post(environmentFile, fail_if_not_found=True) # Switch to the latest Mattermost version - environmentFile.succeed(f"{environmentFileToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(environmentFile, environmentFileToplevel, "latest") wait_mattermost_up(environmentFile) # AboutLink should be changed still, and the post should still exist expect_config(environmentFile, latest, '.AboutLink == "https://nixos.org"') ensure_post(environmentFile, fail_if_not_found=True) - environmentFile.shutdown() + shutdown_queue.put(environmentFile) - run_mattermost_tests( - "${nodes.mysqlMutable.system.build.toplevel}", - mysqlMutable, - "${nodes.mysqlMostlyMutable.system.build.toplevel}", - mysqlMostlyMutable, - "${nodes.mysqlImmutable.system.build.toplevel}", - mysqlImmutable, - "${nodes.mysqlEnvironmentFile.system.build.toplevel}", - mysqlEnvironmentFile - ) + # Run shutdowns asynchronously so we can pipeline them. + shutdown_queue: queue.Queue = queue.Queue() + def shutdown_worker(): + while True: + node = shutdown_queue.get() + print(f"Shutting down node {node.name!r} asynchronously", file=sys.stderr) + node.shutdown() + shutdown_queue.task_done() + threading.Thread(target=shutdown_worker, daemon=True).start() + + ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 '' + # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues. + run_mattermost_tests( + shutdown_queue, + "${nodes.mysqlMutable.system.build.toplevel}", + mysqlMutable, + "${nodes.mysqlMostlyMutable.system.build.toplevel}", + "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}", + mysqlMostlyMutable, + "${nodes.mysqlImmutable.system.build.toplevel}", + mysqlImmutable, + "${nodes.mysqlEnvironmentFile.system.build.toplevel}", + mysqlEnvironmentFile + ) + ''} run_mattermost_tests( + shutdown_queue, "${nodes.postgresMutable.system.build.toplevel}", postgresMutable, "${nodes.postgresMostlyMutable.system.build.toplevel}", + "${nodes.postgresMostlyMutable.services.mattermost.pluginsBundle}", postgresMostlyMutable, "${nodes.postgresImmutable.system.build.toplevel}", postgresImmutable, "${nodes.postgresEnvironmentFile.system.build.toplevel}", postgresEnvironmentFile ) + + # Drain the queue + shutdown_queue.join() ''; } ) diff --git a/nixos/tests/nebula.nix b/nixos/tests/nebula.nix index b3096424a614..68a48d4c86a2 100644 --- a/nixos/tests/nebula.nix +++ b/nixos/tests/nebula.nix @@ -14,7 +14,10 @@ import ./make-test-python.nix ( lib.mkMerge [ { # Expose nebula for doing cert signing. - environment.systemPackages = [ pkgs.nebula ]; + environment.systemPackages = [ + pkgs.dig + pkgs.nebula + ]; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; services.openssh.enable = true; networking.firewall.enable = true; # Implicitly true, but let's make sure. @@ -51,6 +54,7 @@ import ./make-test-python.nix ( lighthouse = { ... }@args: makeNebulaNode args "lighthouse" { + networking.firewall.allowedUDPPorts = [ 53 ]; networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ { address = "192.168.1.1"; @@ -77,6 +81,13 @@ import ./make-test-python.nix ( } ]; }; + lighthouse = { + dns = { + enable = true; + host = "10.0.100.1"; # bind to lighthouse interface + port = 53; # answer on standard DNS port + }; + }; }; }; @@ -338,6 +349,8 @@ import ./make-test-python.nix ( # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall allowAny.succeed("ping -c3 10.0.100.1") allowAny.fail("ping -c3 10.0.100.3") + # allowAny can also resolve DNS on lighthouse + allowAny.succeed("dig @10.0.100.1 allowToLighthouse | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+A\s+10\.0\.100\.4'") # allowFromLighthouse can ping the lighthouse and allowAny allowFromLighthouse.succeed("ping -c3 10.0.100.1") diff --git a/nixos/tests/reposilite.nix b/nixos/tests/reposilite.nix new file mode 100644 index 000000000000..f66a95b47a1d --- /dev/null +++ b/nixos/tests/reposilite.nix @@ -0,0 +1,53 @@ +{ lib, ... }: +{ + name = "reposilite"; + + nodes = { + machine = + { pkgs, ... }: + { + services = { + mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "reposilite" ]; + initialScript = pkgs.writeText "reposilite-test-db-init" '' + CREATE USER 'reposilite'@'localhost' IDENTIFIED BY 'ReposiliteDBPass'; + GRANT ALL PRIVILEGES ON reposilite.* TO 'reposilite'@'localhost'; + FLUSH PRIVILEGES; + ''; + }; + + reposilite = { + enable = true; + plugins = with pkgs.reposilitePlugins; [ + checksum + groovy + ]; + extraArgs = [ + "--token" + "test:SuperSecretTestToken" + ]; + database = { + type = "mariadb"; + passwordFile = "/run/reposiliteDbPass"; + }; + settings.port = 8080; + }; + }; + }; + }; + + testScript = '' + machine.start() + + machine.execute("echo \"ReposiliteDBPass\" > /run/reposiliteDbPass && chmod 600 /run/reposiliteDbPass && chown reposilite:reposilite /run/reposiliteDbPass") + machine.wait_for_unit("reposilite.service") + machine.wait_for_open_port(8080) + + machine.fail("curl -Sf localhost:8080/api/auth/me") + machine.succeed("curl -Sfu test:SuperSecretTestToken localhost:8080/api/auth/me") + ''; + + meta.maintainers = [ lib.maintainers.uku3lig ]; +} diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index eee2d7f1b2dd..8e42515a0320 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation rec { pname = "calf"; - version = "0.90.4"; + version = "0.90.6"; src = fetchFromGitHub { owner = "calf-studio-gear"; repo = "calf"; tag = version; - hash = "sha256-E9H2YG1HAhIN+zJxDKIJTkJapbNz8h9dfd5YfZp9Zp0="; + hash = "sha256-rcMuQFig6BrnyGFyvYaAHmOvabEHGl+1lMNfffLHn1w="; }; outputs = [ diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 8640d64786b3..90189ee8b779 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -46,8 +46,6 @@ lib.makeScope pkgs.newScope ( withPgtk = true; }; - emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; - emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; } ) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ef8a5d923822..b8156c5b3bcc 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -535,10 +535,10 @@ mkDerivation (finalAttrs: { }; }; - meta = meta // { + meta = { broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ]; - }; + } // meta; }) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 952d8e5aeab7..c8bea20543b1 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -13,6 +13,7 @@ let patches ? _: [ ], rev, hash, + meta ? { }, }: { inherit @@ -98,7 +99,7 @@ let } .${variant}; mainProgram = "emacs"; - }; + } // meta; }; in { @@ -121,40 +122,26 @@ in ]; }); - emacs28-macport = import ./make-emacs.nix (mkArgs { - pname = "emacs-mac"; - version = "28.2"; - variant = "macport"; - rev = "emacs-28.2-mac-9.1"; - hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; - patches = fetchpatch: [ - # CVE-2022-45939 - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; - hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; - }) - - # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; - }) - ]; - }); - emacs29-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; - version = "29.1"; + version = "29.4"; variant = "macport"; - rev = "emacs-29.1-mac-10.0"; - hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + rev = "emacs-29.4-mac-10.1"; + hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic="; + patches = fetchpatch: [ + # CVE-2024-53920 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4="; + }) + + # CVE-2025-1244 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w="; + }) + ]; + + meta.knownVulnerabilities = [ ]; }); } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8e3053497b05..57651d9773d2 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -82,9 +82,9 @@ let pname jdk extraWrapperArgs - extraLdPath extraBuildInputs ; + extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ]; src = if fromSource then communitySources."${pname}" @@ -336,7 +336,6 @@ rec { libICE libSM libX11 - libGL ]; }).overrideAttrs (attrs: { @@ -378,7 +377,6 @@ rec { libxcrypt-legacy fontconfig xorg.libX11 - libGL ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat diff --git a/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix new file mode 100644 index 000000000000..3164d8dda54a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "arepl"; + publisher = "almenon"; + version = "3.0.0"; + hash = "sha256-NadsB/6kUQ7/d9o3rUc7889jO+4MdvBhtyI4UUGpzqk="; + }; + + meta = { + description = "Preferred dark/light themes by John Papa"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=almenon.arepl"; + homepage = "https://github.com/Almenon/AREPL-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 4fc5c16eb7fd..bbb5f89de32c 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.374"; - hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk="; + version = "2.0.496"; + hash = "sha256-vf6JwsMMAcAZMXTRrczgEpvmmN34eSgsO8QXNL4+DHM="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix index ad38fb0393ea..0f1084cd9a24 100644 --- a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix +++ b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "solargraph"; publisher = "castwide"; - version = "0.24.1"; - hash = "sha256-M96kGuCKo232rIwLovDU+C/rhEgZWT4s/zsR7CUYPnk="; + version = "0.25.0"; + hash = "sha256-5SmCkHGCS8dYfdSm3NRk091jH44m+7kkj+VL84YKM4g="; }; meta = { description = "Ruby language server featuring code completion, intellisense, and inline documentation"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 63d1f22bf9b7..e01c1bd7d952 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -241,6 +241,8 @@ let }; }; + almenon.arepl = callPackage ./almenon.arepl { }; + alygin.vscode-tlaplus = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tlaplus"; @@ -257,8 +259,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "19.2.2"; - hash = "sha256-WoNrKcK9Gr9gVWH/pwKyEUHuzcVNKh6zQwwpG4BuVCg="; + version = "19.2.3"; + hash = "sha256-fW7JtaFXBR+PL17CUCtIAXndO/fBctisHd/uZg5Dez4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -490,8 +492,8 @@ let mktplcRef = { publisher = "banacorn"; name = "agda-mode"; - version = "0.5.4"; - hash = "sha256-U+J1FxFMK0tfi+YueXohnommHXagoadVYsZLp5lAC3Q="; + version = "0.5.5"; + hash = "sha256-xz+KO743jGziLzO7pINTcOX9JV68MJ0juDl+rpr9hk8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; @@ -781,8 +783,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.14.12"; - hash = "sha256-Dn+Z5uZYoWSriNnkYK1rRoHv8sjr7ui70UeTA3e0wIs="; + version = "0.14.14"; + hash = "sha256-LUjVrtL1HmxzzW8OqbadN/p3DdZDwSj2iFeXudV2ULo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -1011,8 +1013,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.5.0"; - hash = "sha256-l4F3HZKkqANw9ErCE75IpI3GIWJIkePOW9+4QsKWaVQ="; + version = "1.7.0"; + hash = "sha256-uUm5kS8vjCKGpJOdyJcE/ig3DUZSsQ7LbvYodNyWF5w="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1158,8 +1160,8 @@ let mktplcRef = { name = "dbclient-jdbc"; publisher = "cweijan"; - version = "1.4.2"; - hash = "sha256-ru4c7/6X3HfKyn5wz7I5PRh+A4bntB+FAWEGUzjMlY8="; + version = "1.4.3"; + hash = "sha256-XaV7N3IFe6+gc/qrHkSUikAQghJb6k6+XE5fMYWdyDY="; }; meta = { description = "JDBC Adapter For Database Client"; @@ -1174,8 +1176,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.2.3"; - hash = "sha256-QOYTJSO0kGXSjvLnkbmbXSaKZcvWqO07yvZ/PNe8Fmc="; + version = "8.2.4"; + hash = "sha256-tfUEUFyijRfzH805Eb26fgrIPLPv2GuOsCOqHuQQmQM="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1203,8 +1205,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.9.49"; - hash = "sha256-YKeUgQpnH5XrYOiUdU5R2a9PJLj2iLYPXxhGdXAqW8U="; + version = "3.10.68"; + hash = "sha256-CB6XraQoMoFRhSKZzTVwsXs5ip5PfYraGR6GyULxrl0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1220,8 +1222,8 @@ let mktplcRef = { publisher = "daohong-emilio"; name = "yash"; - version = "0.3.0"; - hash = "sha256-vQ0r1/DEfA6ebB4NmUciO5d4zRWS4pZeTXspWVRfe4g="; + version = "0.3.1"; + hash = "sha256-DentLM/XT7b7O4vptVcja9E8pQjiDPOLilo8wjTH0IE="; }; meta = { license = lib.licenses.mit; @@ -1233,8 +1235,8 @@ let mktplcRef = { name = "dart-code"; publisher = "dart-code"; - version = "3.107.20250311"; - hash = "sha256-A66/oodVLCFT2+UAP+DW+Un8T5l396UDACzHYHbe7Hk="; + version = "3.108.2"; + hash = "sha256-tBJSx0m/RWWkZaBdoM7awaBt7ZrfWic0AIYUAGyNz+E="; }; meta.license = lib.licenses.mit; @@ -1244,8 +1246,8 @@ let mktplcRef = { name = "flutter"; publisher = "dart-code"; - version = "3.107.20250303"; - hash = "sha256-xhhZIZK7ywNxoXHeih/fpR0QoatIkbzcfX+eXOogzJs="; + version = "3.108.0"; + hash = "sha256-+wqnHTQhVuSn46CsIVa3PCCrJ73kRr9oOLePm3uPshA="; }; meta.license = lib.licenses.mit; @@ -1482,8 +1484,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.22.36"; - hash = "sha256-SZ9cT5fowDS8NcWpZWU05+VEiDENs/vCikc8K6loRms="; + version = "2.22.40"; + hash = "sha256-YxWla1bayzIX70PxdFSZuJum6ddazzgQKjRH7DpceTY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; @@ -1511,8 +1513,8 @@ let mktplcRef = { name = "competitive-programming-helper"; publisher = "DivyanshuAgrawal"; - version = "2025.3.1742989763"; - hash = "sha256-e7pRhZOe+6UW7VE63yX+Il2YZToR4cwYqEar+aAPlkc="; + version = "2025.4.1743875007"; + hash = "sha256-WtzJ9rcssUAk2zACjqWYpwh6aHtzh9eGMGANeeFqCnU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; @@ -1595,8 +1597,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "16.3.3"; - hash = "sha256-nc/EaMhZSdpd3ZaRQLZkSh1p4Ai3CFN4GunI2+o/+ZI="; + version = "17.0.1"; + hash = "sha256-0wRhdVR9q7oFjQQM090oXRxICUMCu7BjgOGkKTxeQmg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1898,8 +1900,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.79"; - hash = "sha256-gcykn/mOvNzFKjKyY4fVhmIWR2kBKCo1ILpp1am0dIw="; + version = "0.4.80"; + hash = "sha256-Qe0EOKohvk/ALYT0QbOiYKOkBvfF63hv3T4VwiIls6A="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -2105,8 +2107,8 @@ let publisher = "github"; name = "copilot"; # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json - version = "1.293.0"; - hash = "sha256-LwgINocPHA9jL6pMw40BgaZ3lOUwWPoOJWTDr+27h5Q="; + version = "1.297.0"; + hash = "sha256-UVL0Yf8MSY7ETOxmEK+dljrOQL9ctUWVhbYdr0v00b0="; }; meta = { @@ -2171,8 +2173,8 @@ let mktplcRef = { publisher = "github"; name = "vscode-pull-request-github"; - version = "0.107.2025031304"; - hash = "sha256-BWmcAocEWBE7eeiyMBUcTBmozPWgLkdiDOskhf7drD8="; + version = "0.108.0"; + hash = "sha256-GNNPc8nzNIrPOn+4ujKvhKodeHt9r1QlV8+EgqIz54I="; }; meta = { license = lib.licenses.mit; @@ -2183,8 +2185,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.6.0"; - hash = "sha256-Tf1rsKK1KMBonwBR/2fZv2F6VLkPYXzX7sI3EipZvrQ="; + version = "6.7.1"; + hash = "sha256-qNOjbDdGrab53YYO4TCqxk8v2pmvjElgeXYU525/6Eg="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2550,8 +2552,8 @@ let mktplcRef = { name = "ionic"; publisher = "ionic"; - version = "1.103.0"; - hash = "sha256-TjtMkFCKu30LUvYv7nKav9EZlnmm3iXb9LlRYPPfKB0="; + version = "1.104.0"; + hash = "sha256-E3Hfs7YgZ4+eF0Pg7CI7fPFt6DEtFw0DdLq4BSY7vBQ="; }; meta = { description = "Official VSCode extension for Ionic and Capacitor development"; @@ -2566,8 +2568,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.25.5"; - hash = "sha256-Aak4uML3NqMaq4IJzcGHTYbcXlq1y/ZJ6m/f1pQWoQs="; + version = "7.25.7"; + hash = "sha256-6AN6LrFGWmLsCwRrtLqW1Mf+txReGeg7fvZ8W2Jv8Uo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -2827,8 +2829,8 @@ let mktplcRef = { name = "lean"; publisher = "jroesch"; - version = "0.16.59"; - hash = "sha256-tXiAM2MBF+Axd0zB7Rlgx8b8FgwlLaZex0++H2DpBls="; + version = "0.16.60"; + hash = "sha256-z0mOnbqpKMH5d78jAMgDIgO+5sk4xHOWAfa4kzXYISs="; }; meta = { changelog = "https://github.com/leanprover/vscode-lean/blob/v${mktplcRef.version}/README.md#release-notes"; @@ -3074,8 +3076,8 @@ let mktplcRef = { name = "vscode-ltex-plus"; publisher = "ltex-plus"; - version = "15.4.0"; - hash = "sha256-ET7ZnXKiT4IAoySMaZn0O2awsKtWMGgnTT7xOEcSim4="; + version = "15.5.0"; + hash = "sha256-tAqtWX7NHR8ftrtDRY2BGk3VwLa0Wx9OxQo8uGF/JlA="; }; meta = { description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others"; @@ -3119,8 +3121,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "3.1.1"; - hash = "sha256-WRhLd5uTy3F2rBf/9emjm9JB5hvRv+dB66vhuqnedwc="; + version = "3.2.0"; + hash = "sha256-SSkmvm9NJnLw38luZWF6K7g5caaivtP+v+39qPR/oyo="; }; meta = { license = lib.licenses.mit; @@ -3209,8 +3211,8 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.18.0"; - hash = "sha256-zmIaGvenFU8jiGHGIk3d6dmXO12t+WMwq76OEUbclgg="; + version = "3.19.0"; + hash = "sha256-el3vcF90RZiXrqlBxAko9mLdeoThnwGb/JzmR1woutc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; @@ -3349,8 +3351,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "2.3.0"; - hash = "sha256-KfWQpg+qSxrmL4z05pk239i8bY6EMJpu6F48mJbnK08="; + version = "2.3.1"; + hash = "sha256-0bn2B17kJd5uXe/MJCzYin2iWGdKD4H4nUIXdzb5NxM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -3368,26 +3370,26 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-oQMwzQuW5vjxtDboRCeiEO5aytsAY6rb14JDTmK3JPg="; + hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-/9+qtLDNYUFvdoehit3BihA38p6RqJ7na5Q27xxpZk0="; + hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-JqLlYMKyTXaEzuTPPxVaO8WJiuCUN+9xBzyA6+aYdSc="; + hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-dhiUePePkO3MxRQ5UP+lOxRax503JlERe/GWJ8pPUIg="; + hash = "sha256-8XIeK5AIFKQaK5YMNSRqxr5p72zXb7ZLPq6PbeWO864="; }; }; in { name = "vscodeintellicode-csharp"; publisher = "ms-dotnettools"; - version = "2.1.11"; + version = "2.2.3"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -3415,8 +3417,8 @@ let mktplcRef = { name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; - version = "1.3.20"; - hash = "sha256-83KcESin+w3Y6jiSrSq6iWF99jformxr7NTnYSkKtKQ="; + version = "1.3.21"; + hash = "sha256-/Y7sRpJzwmo3fgwdrYqNNu8XA+j3zohJBv9vOcm3bRk="; }; meta = { license = lib.licenses.mit; @@ -3638,8 +3640,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.404.0"; - hash = "sha256-7rPJruFk3XbDvipIYqYwwsbhofuViXsdtnKihiwRKok="; + version = "0.409.0"; + hash = "sha256-K+pJeon1EWux3pnfzvwCODo55vWpA2Lvps4GFJW/ALU="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -3952,8 +3954,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.20.0"; - sha256 = "sha256-Z83FXPf8mXcxmzOdk8IG9ZcP/1OYL8pEHEKPc3pZFdo="; + version = "5.21.2"; + sha256 = "sha256-HEcFa+SCosf5UonqxFQZI+G5ogxCaScmHt54xn4H4QI="; }; meta = { license = lib.licenses.mit; @@ -4550,8 +4552,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.18.0"; - hash = "sha256-+2aeJhIwH6oiRQcPK714u8IiU3QKwhQOB0xgmsf4DXw="; + version = "4.19.0"; + hash = "sha256-IjukIQIs4RoCZyzJiRDgFIPBvIK5Wn8o7NdvbfqlMBI="; }; meta.license = lib.licenses.lgpl3Only; }; @@ -4641,8 +4643,8 @@ let mktplcRef = { publisher = "streetsidesoftware"; name = "code-spell-checker"; - version = "4.0.41"; - hash = "sha256-M/uqzU64nqSdRtxxQ1H+pg0YdkqYXEHlxmXrVcn/UqA="; + version = "4.0.45"; + hash = "sha256-2goKjykQMLTRPP9Y0aBXLu3qDlhEKO00x82C18nKlIY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4751,8 +4753,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.249.0"; - hash = "sha256-Pp1LlVAkozh2kIEvmPxg4LuuT08MeGbMN77M5Mx81qI="; + version = "3.253.0"; + hash = "sha256-4FDYIDLqb66XylX1WRGqbwqBUc0XgNG6XENEVXC/7Sk="; }; meta = { license = lib.licenses.mit; @@ -5038,8 +5040,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.62"; - hash = "sha256-Fq3NmCL17QVAmOmFWSkxc0qRwCRDsRbkeRzwyP02Nq4="; + version = "0.0.63"; + hash = "sha256-qlBcnQyH5VbgmBlTvVi59OpYtyuVrJLoSuRIbrBGFVE="; }; meta = { description = "VSCode language extension for Uiua"; @@ -5092,8 +5094,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.24.0"; - hash = "sha256-r5xXR4rDbP+2bk66yqPoLod8IZXFrntcKHuWbAiFWwE="; + version = "3.25.0"; + hash = "sha256-Gszz6sGJt6DBgVCH7tgTGTX73TbKBwityJn7cY39WmU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -5292,8 +5294,8 @@ let mktplcRef = { publisher = "vscjava"; name = "vscode-java-test"; - version = "0.43.0"; - hash = "sha256-EM0S1Y4cRMBCRbAZgl9m6fIhANPrvdGVZXOLlDLnVWo="; + version = "0.43.1"; + hash = "sha256-yiKBG1A5ahvB6iTqh2yzFzcKJlU1lu4dqd+4cygWVQ4="; }; meta = { license = lib.licenses.mit; @@ -5681,8 +5683,8 @@ let mktplcRef = { name = "vscode-zig"; publisher = "ziglang"; - version = "0.6.7"; - hash = "sha256-l8pu348v2JUg/7+Qy5B41eyraPUj9WQ1WuW1aumgM9w="; + version = "0.6.8"; + hash = "sha256-u4Vd2YP47ccpz4ZMOGDN1eFS8qiC7nGIbo6YtvxNHFM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix index 60ee4ebf8f62..4ae1856fe0b2 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2025.4.1"; - hash = "sha256-PzO5CA/JaLlyMMQ0wOIIvoL116boSOpqtX9plw9IUgQ="; + version = "2025.6.0"; + hash = "sha256-sdePoi+GdWi0AMWLOvVtCYkCbdxZMx2pMJAZF7aYluc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index dd70a4e1527d..1c88d3a0f416 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2025.2.0"; - hash = "sha256-YMvu8aEumV3VTdNZKiLK+5jmTL9y5tcMxrEBwEMcTI4="; + version = "2025.3.0"; + hash = "sha256-dH74EX5PDq4t/CukjsswtKLVwbE+q0J+fpZ1MA8CDZI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 024c4e5237ed..57e0e3e8b276 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.118.0"; - hash = "sha256-LHsOjl5fIm4/ixlFs/yL/U2VRwRMigRk0Q3MtNdyzVE="; + version = "0.119.0"; + hash = "sha256-S6quMPlDNSLIqyMmTZsDts5bLh2LBdAPuQibT3AEHH8="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 90aabc32d73f..8d2cfbad60c4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -41,11 +41,11 @@ let isx86Linux = stdenv.hostPlatform.system == "x86_64-linux"; supported = { x86_64-linux = { - hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o="; + hash = "sha256-KWr+nfODCRoZq67qwswzbcPW5WMmf9kvRwNFKpjyt4k="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA="; + hash = "sha256-a6PwlSo3q1hLVx0JDSTwPGfjfk7CtdYCuFccSpPg7U8="; arch = "linux-arm64"; }; }; @@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.22.2"; + version = "1.24.5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index cdb13b4c6020..263f7baaa46e 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.6.1"; - hash = "sha256-BAA7wSfyJ4y8how+NnaGdCf/BCU6aOmI8ew8qpcQCnY="; + version = "0.10.9"; + hash = "sha256-JhpPOnzFQmTtzyl5p/dqFH/tjJ4qsfJhdco6uLUpVN4="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 47f844424189..e4562b1713e7 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.10.5"; - hash = "sha256-7A8BQHUu7CYA28fHv68Zvf6zhlJwwXZaNVLb+/cBAIg="; + version = "3.11.9"; + hash = "sha256-+Bi9nHRXXZGKGvTS8o0CbtS6KBJmQz+Wiiinqs16vZA="; }; passthru.updateScript = vscode-extensions-update-script { }; diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 19686b60827a..86bb5c49f123 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.8.6"; - hash = "sha256-JqrzMZoAlBcBfQPWJn+c0PW5ScWclstg5BDPyntN3co="; + version = "3.9.2"; + hash = "sha256-InlftUHtOHEszgtjPl7H6V0PkyHUEZ6MqyZTbFtjA+k="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 88221112cb7b..5bbccd2b23e3 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-s3peDZApzSfemXRqRjf5fYQGHVf1DAP7XG4NuOqiGcY="; + hash = "sha256-Sno0UnWnuOogT9DMEF+8dMZLqxAoHSsKORkHpre40dE="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-WutwGOcXoREk6oUdFjhsKcrf64CG4GSn9JgGWiQe9l8="; + hash = "sha256-GaqBiAs0G9h1p2itDITPFBkFD1uOmM0fEp4tKmYFCXY="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-377T8cfY4jHX+iJjdDScMP+wX6UZCYLasl16ngwfq6U="; + hash = "sha256-uDRhsAGw7mEI2ztC8QWDtrHAeMwk9IzU5Sln7HQl+1Y="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-fufJ9NV73skhwBFe2vCLjh5ykQagXfO0VAdHGPhfOQ4="; + hash = "sha256-/5VEFXlGORo9t5ehDmLcqb0cYvJ6Gb1yIootyqpMZM8="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.14.2"; + version = "0.14.4"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 53fa19ff4df0..c9911c347d1b 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-03-28"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "9f2b7943db1fb784daf0948b0b493bc7f76919f8"; - hash = "sha256-fwrfZ0Z/DAtDRuBqxCS11/qNoomAtUgEOf4eOLk9vO0="; + rev = "4ee33ff536f14295c178a037f9b5d5a960ce3c6f"; + hash = "sha256-ZL+aV469RHp5SSBFmK0q+1h2MdcM1q+TZu5Rrv/N0DU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 50679b0bf8c9..c0f00af9e778 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-03-28"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "e2522914f72291ad7232d996e7eabdf167b1b414"; - hash = "sha256-uxnRNP5BRpabHLjuI4IiLzqCfRobETEMnwJ9mw+ZdaE="; + rev = "90c09d4b8e6923a22538c35f68ace2d9fead134d"; + hash = "sha256-eVoKmGE3N8uePcNpxWjAjgUjTIfEHZR3K2FLtQtLp+M="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index 539bcef66f52..07f1f03b2148 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "ec353ea2502be9b71f3d9830b7a7b66ee69e254c"; - hash = "sha256-9QRKEIi1JHd503KN9+DKxLMJMJWyNu9vomPAmlbb/zw="; + rev = "8d89089d35bedc257dc13bebd3790f70417311a5"; + hash = "sha256-0n2N2Ks8MIy7dcuj2SESjDNxma7RRhAgOxQ5sC3XJTM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index fe7a6f78ed78..3039615973f7 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-04-06"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "26f92531a95a9a74f45a8bf13fc9f3f48cde2976"; - hash = "sha256-XtSuZEfu03dFMQUX4VvpeFLzoWG3TeIBQG4cQkap+t8="; + rev = "b349f7f3e211bb7725f133d3818ab98da5059760"; + hash = "sha256-MNYpuipjnDl9GUl5qWGi5W5cFhUCd/weCKuTRdttKJ4="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index c60d72e1d021..2f28042aa697 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "4b3edb41d33e52b6d70c4e18bf0819a070991b66"; - hash = "sha256-8RmNDvUd64FqEgduNMHgbunu92SqMi+Pn//Ou2EQUFs="; + rev = "2910240a4100ccad68f935082b8bbce194673cb5"; + hash = "sha256-segz2SocZaNNgToNQOIEVIOD3CidyZIS81dStcdAsTs="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index ea811e7eece3..f286c792d223 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-03-08"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "1024afbcd77a7bf7c87972c7c86d3a7759877fc7"; - hash = "sha256-9Y3uzWpiYIRGTFApVGdLIONpBpPaO1sRgaGj1EVI3M4="; + rev = "32a4853c5fd352cc3054e83ed375476cf023aa5f"; + hash = "sha256-3r562/3WWWkibEKzPrA+lASY5Wpz8kuX5EQKqFKJdAA="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 82855f07f20f..587f11685853 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2025-03-06"; + version = "0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "40edadab2e445bfda9d206def9508b43b11fb96a"; - hash = "sha256-TrDx77VCdtLuihwhlz+sYkUvegTxsG8eAn3h6KYO3z0="; + rev = "a638be8510d061f435e2abd46e514bb6c7e41262"; + hash = "sha256-adMLJ3mm+02X07UwG3ojhdt1x5+FvCartxNc/EHz4CQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 876cc55cc95b..4c0f638580f3 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-04-07"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "4df08f409666e46a0a2d94c3cebcfbba72975ca9"; - hash = "sha256-Dp4f3j9Zm3BLMftEJSDSYrqPy1zJ8miStiUTI9mFdLw="; + rev = "2b5fc26ee64d963021bc266aa45f19d90b282f92"; + hash = "sha256-ZbebYUOUdaLVTh+VD8AQvAv/zQzr6tugJRl3iYSrUeo="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix index ddc92524eeac..6a21b1681378 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-04-02"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-libretro"; - rev = "8565eec2e963b78f07a5a1f4b74df1271f3ece13"; - hash = "sha256-pChPUwKIOtP4nl9ReqlrgxOJ/qcO6m2SnHhx3Y+hktM="; + rev = "a0547e84a8f58856551ca2d252f05f56212810a4"; + hash = "sha256-POpKNpPOyOp/EkrUTa2esOJAaWoJvuijDToF6/V41uU="; }; # Fix build with GCC 14 diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index f107b64f8d5d..445e0cea6ca3 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2025-03-26"; + version = "0-unstable-2025-03-30"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "4b0894f55fb7244b522fb720f41363e86f2085fe"; - hash = "sha256-748TR87fO1BLBWwDAJxkEBr327g64RUTdBvvMu6lSEI="; + rev = "6091efb4d64ed745495455ba82352ec82f55cb4f"; + hash = "sha256-9FyD3a6FE7xtt/UGvRNfopvQPgAg/0QGrJ1NNMEIsyg="; }; dontConfigure = true; diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix index f7a8e3bc1bc9..04843e9eee1d 100644 --- a/pkgs/applications/emulators/libretro/cores/picodrive.nix +++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "picodrive"; - version = "0-unstable-2025-03-25"; + version = "0-unstable-2025-04-03"; src = fetchFromGitHub { owner = "libretro"; repo = "picodrive"; - rev = "752c266491ae8775dab9a98dbd94472f42b9b16f"; - hash = "sha256-l9qYOUyQzyleWeQv74rEOEwOk6iyH43WVIUHcC6Aw2Y="; + rev = "1a08d73159820bb31941d8c5ed6242a74bd4b332"; + hash = "sha256-849XeceXoPHpOMlxVtHgL2TYQTHibUbGs0oHBEiCzvw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index a0dd0c6399db..98861e57c740 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-03-25"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "01d094c0c3ed723b0747079afddfd319001f01d4"; - hash = "sha256-o8tfYg88spRZBDokc/dkRsVvvfGejYVnDQfvQ1BBRps="; + rev = "225e37d0dc7b8a7bb6dc3534b992373477f9923d"; + hash = "sha256-bY4RwJyS4R/vjae2UCi4SnIW04IzoQyMOYsW4f+UQg8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/scummvm.nix b/pkgs/applications/emulators/libretro/cores/scummvm.nix index 7e545bb3c28a..13082d102542 100644 --- a/pkgs/applications/emulators/libretro/cores/scummvm.nix +++ b/pkgs/applications/emulators/libretro/cores/scummvm.nix @@ -25,13 +25,13 @@ let in mkLibretroCore { core = "scummvm"; - version = "0-unstable-2025-03-09"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "libretro"; repo = "scummvm"; - rev = "8e9d265d81661dcffe0bc326e07e50af5d1d224a"; - hash = "sha256-BdBQoj358uL7VNPZozRA4oEG5KS09rkucd80vQgkaDo="; + rev = "9d31b31c179fd4a43f7cfc383a3435a9070c6aa8"; + hash = "sha256-E5e30Iowwr8pnryncnzlPjBhpIEuKqAHxHk+HwagEnE="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 853dea8f22e6..31a67dd3c413 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -115,9 +115,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.4"; + version = "10.5"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-oJAZzlxCuga6kexCPUnY8qmo6sTBqSMMc+HRGWOdXpI="; + hash = "sha256-wDbsHvR2dHdKX5lFgwIuni62j+j8GLOox55oWzvsibw="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -163,7 +163,7 @@ rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-LteUANxr+w1N9r6LNztjRfr3yXtJnUMi0uayTRtFoSU="; + hash = "sha256-rXA/55rwQSJR247E4H7cQdTtXRmjomRbls7THV3jfcE="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4a8ddae9923c..49b290b37e4b 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.42.0"; + version = "3.42.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-vqT6ffqY1M6/2eW08VghysC+v7ZI9Yz0Zhk9UY/izZc="; + hash = "sha256-0VW/5X8C35uwIZu018Vtp7qosS0v1b+1SFUE8NSTQYE="; }; passthru = { diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d2b2644a1709..e5e552f299f9 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -45,7 +45,7 @@ libheif, libxslt, libgudev, - openexr_3, + openexr, desktopToDarwinBundle, AppKit, Cocoa, @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { poppler poppler_data libtiff - openexr_3 + openexr libmng librsvg libwmf diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 989bdb6fb02e..9b008cfc5d78 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -30,7 +30,7 @@ libkdcraw, lcms2, gsl, - openexr_3, + openexr, giflib, libjxl, mlt, @@ -105,7 +105,7 @@ mkDerivation rec { fribidi lcms2 gsl - openexr_3 + openexr lager libaom libheif diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index 688f2f0716d6..38f74d11f327 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { pname = "qvge"; - version = "0.6.3"; + version = "0.6.3-unstable-2024-04-08"; src = fetchFromGitHub { owner = "ArsMasiuk"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-rtbUAp3l0VZsu+D9HCHM3q0UkDLflw50rYRq/LP4Wu4="; + repo = "qvge"; + #tag = "v${version}"; + rev = "5751948358d407673cfda10f52892683be143d42"; + hash = "sha256-Rh8ahS/9x2aWu4THjLKoog58+yJoCQ6GETaAQTW4Hq8="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/pkgs/applications/graphics/qvge/set-graphviz-path.patch index d18eb81c5d04..3d003c0657c3 100644 --- a/pkgs/applications/graphics/qvge/set-graphviz-path.patch +++ b/pkgs/applications/graphics/qvge/set-graphviz-path.patch @@ -1,7 +1,7 @@ diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp index 7dacd48..64983e4 100644 ---- i/commonui/CNodeEditorUIController.cpp -+++ w/commonui/CNodeEditorUIController.cpp +--- i/qvgeui/CNodeEditorUIController.cpp ++++ w/qvgeui/CNodeEditorUIController.cpp @@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) : QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz"; m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath(); diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 91d80677bb16..918c74301ad5 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -24,7 +24,7 @@ syntax-highlighting, libmtp, libssh, - openexr_3, + openexr, libtirpc, phonon, qtsvg, @@ -71,7 +71,7 @@ mkDerivation { syntax-highlighting libmtp libssh - openexr_3 + openexr libtirpc phonon qtsvg diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 24c14969970f..89c32a27b7ce 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,5 +1,6 @@ { lib, + config, fetchFromGitHub, python3Packages, wmctrl, @@ -8,8 +9,6 @@ }: { - stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 - dev = with python3Packages; mkDerivationWith buildPythonPackage rec { @@ -58,3 +57,6 @@ ''; }; } +// lib.optionalAttrs config.allowAliases { + stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 +} diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 29f084a35e29..4db78372a890 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "135.0.7049.52", + "version": "135.0.7049.84", "chromedriver": { - "version": "135.0.7049.42", - "hash_darwin": "sha256-CixR0TvndAgxvXYbetIqKg6NRu/z3pJe+USCZ0pyQd4=", - "hash_darwin_aarch64": "sha256-WKDi97j1F9+I6RYOsdiXVrgVibZ3ZoVPljo1XAtw0o8=" + "version": "135.0.7049.85", + "hash_darwin": "sha256-L4x/MSCbVt2UIQwbHREDV8br6DmdfuqTJ3//7opK2IU=", + "hash_darwin_aarch64": "sha256-vixXGqbc2UYpydg1RILhrtmr5DdbJ5I1sD8aNikejQU=" }, "deps": { "depot_tools": { @@ -20,8 +20,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173", - "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=", + "rev": "6c019e56001911b3fd467e03bf68c435924d62f4", + "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=", "recompress": true }, "src/third_party/clang-format/script": { @@ -126,8 +126,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31", - "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ=" + "rev": "53dfda5e9d07d58b43cea66b8153c55dd751ff88", + "hash": "sha256-zXxJZz2C4eDJ8beHDXJe0UCNesDw5R0ogFcsdiF8VIc=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -616,8 +616,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c", - "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY=" + "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb", + "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -706,8 +706,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130", - "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U=" + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -751,8 +751,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2", - "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk=" + "rev": "9e5db68b15087eccd8d2493b4e8539c1657e0f75", + "hash": "sha256-gXdBDo+fzp6hJB8qyhscV7ajwSfCUeYvSxhL10g56rU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 2f9545fbdc6c..01528df8d729 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k="; + hash = "sha256-wnroUILQKVW+aMPhI8MHyzRMox3MhpRMtvYWm6siJqQ="; }; - vendorHash = "sha256-kotV3GC2ilq258cLVGOzBTHb0koWfn92Acl0L8rRi5I="; + vendorHash = "sha256-B4o67yVp7u9N/HNEkF7pbHC33a8fZJvayoPL+qovDeY="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0ae39566c1a9..5d4963c03457 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -135,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-wM/oWLOAB6EhtUVTP+gHn+hpqhrISAsd31ili2hmLyQ=", + "hash": "sha256-pbXkGKym7amioTZlguwBpoFvfvYnCGOxZ7PIT8I3dxY=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.24.0", + "rev": "v4.26.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -913,11 +913,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-/tgZFUzJqBNTxJzmhcs9YyB55DNwC3oFr9nVyHsFGW4=", + "hash": "sha256-UG2dXoHHH7sWma4+Zlvtj2aHwcvJPKgTxJFZDxqzKyc=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v6.31.0", + "rev": "v6.32.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 792b6b5a9331..a9433b3be18a 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -13,11 +13,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-Snm9dDtHZQsx4T82tML77auBTb1lvITUOfL+kmhY4es="; + sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE="; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5ec027401bf8..08de8ea78c46 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -99,8 +99,8 @@ rec { thunderbird-128 = common { applicationName = "Thunderbird ESR"; - version = "128.8.1esr"; - sha512 = "f1ef0a665f2cef49b427cbfb4a3548df0cccf4470c03367cdb3d2729d4f6bbf25056c378ffa9e1184b6687332998d12ff9ba251b97b7ca859d9d43be9d7414ba"; + version = "128.9.1esr"; + sha512 = "bc53ad210c6942fd4a5d31e693d6f376c009873397ea4e3c36d9de33d9dc1af5a3ff9e6ca9039dd8849ea8b56daa220f08b7bef4e2ea1b86e98dfe3b9b58dc0d"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 499ef5248938..be65d30b7376 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.131.0"; + version = "2.132.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-pVykRTs0yI9UArgxuE3RUKI8onv27hjyG1Dy4PXztuQ="; + hash = "sha256-d4B+rVwWHKLVgY/aK3E6i6CyQKD4TsxZ/XyKbbCrQE0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a00c8d806b5f..487403f40184 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation rec { - version = "16.3.11"; + version = "16.3.13"; pname = "jmol"; src = @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-sa2wYzLtk3rSghNxk/kJfaOIDPEJLfwKRRIXMRNBEuI="; + hash = "sha256-ehJZSMhUsE0iO3sDD5Q0UMfcjNmTgPzMNgWG5nIeBFo="; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 1f42d5ae2a62..cfb13ffab886 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E="; }) ./4.4.1-newer-spdlog-fmt-compat.patch + ./resynthesis-fix-narrowing-conversion.patch ]; # make sure bundled dependencies don't get in the way - install also otherwise diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch new file mode 100644 index 000000000000..58160330cd06 --- /dev/null +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp +index 7a7e404114f..f2889667af8 100644 +--- a/plugins/resynthesis/src/resynthesis.cpp ++++ b/plugins/resynthesis/src/resynthesis.cpp +@@ -1058,7 +1058,7 @@ namespace hal + // delete the created directory and the contained files + std::filesystem::remove_all(base_path); + +- return OK(subgraph.size()); ++ return OK(static_cast(subgraph.size())); + } + + Result resynthesize_subgraph_of_type(Netlist* nl, const std::vector& gate_types, GateLibrary* target_gl) diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index aa41e3185c03..8ced7004f1a2 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "25.1.1"; + version = "25.1.2"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - hash = "sha256-H/iLCCX1fMozs/G8erX7cia7wRLjvLxofuiu6pGVJ58="; + hash = "sha256-+xPhHmuogNuolmMFcUAP2hMfJh1D+O4DrPkcuR6+mR8="; }; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/twitch-chat.nix b/pkgs/applications/video/mpv/scripts/twitch-chat.nix index cdcadf2f9ead..bf6eab70d187 100644 --- a/pkgs/applications/video/mpv/scripts/twitch-chat.nix +++ b/pkgs/applications/video/mpv/scripts/twitch-chat.nix @@ -7,13 +7,13 @@ }: buildLua { pname = "twitch-chat"; - version = "0-unstable-2024-06-23"; + version = "0-unstable-2025-03-30"; src = fetchFromGitHub { owner = "CrendKing"; repo = "mpv-twitch-chat"; - rev = "bb0c2e84675f4f1e0c221c8e1d3516b60242b985"; - hash = "sha256-lnWYcr49koI60Su85OWbcxrARWTfXW2zIvfCZ6c3GtI="; + rev = "97c94ae58b4a898067b9c63c477716280327d8e1"; + hash = "sha256-KjlzVuj47zos2RQHbveijsyJoN2f7VGBboWolISom7M="; postFetch = "rm $out/screenshot.webp"; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix index 313fb67ecc5f..2f31975697ca 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-color-monitor"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-color-monitor"; tag = finalAttrs.version; - hash = "sha256-EIp1GQ5dKN43D7xodX/ucYcJm994eKsnidFlbLKWHuI="; + hash = "sha256-4Dagga9BgW1Fiaxqs9QlyTax+SgFyTiNiU3yP2GjIDs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index b0c39aa7b3b5..b3cd3512a74d 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -12,7 +12,7 @@ cmake, wrapQtAppsHook, openimageio, - openexr_3, + openexr, portaudio, imath, qtwayland, @@ -78,7 +78,7 @@ stdenv.mkDerivation { opencolorio openimageio' imath - openexr_3 + openexr portaudio qtwayland qtmultimedia diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix index e6122df922f4..fbda3c4b7897 100644 --- a/pkgs/by-name/ad/adminer/package.nix +++ b/pkgs/by-name/ad/adminer/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.1.0"; + version = "5.1.1"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip"; - hash = "sha256-SLu7NJoCkfEL9WhYQSHEx5QZmD6cjkBXpwEnp7d6Elo="; + hash = "sha256-L1akLFljp4UW/YEVLi317ijY62WN9L4g+OQ127vUP/4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ag/agnos/package.nix b/pkgs/by-name/ag/agnos/package.nix new file mode 100644 index 000000000000..cc171a165971 --- /dev/null +++ b/pkgs/by-name/ag/agnos/package.nix @@ -0,0 +1,33 @@ +{ + fetchFromGitHub, + lib, + nixosTests, + rustPlatform, + openssl, + pkg-config, +}: +rustPlatform.buildRustPackage rec { + pname = "agnos"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "krtab"; + repo = "agnos"; + rev = "v${version}"; + hash = "sha256-hSiJvpTQIbhz/0AFBTvgfRDTqOi9YcDOvln15SksMJs="; + }; + + cargoHash = "sha256-wmnfAvtTjioslSdD6z0mMl3Hz46wpPYMk494r9xXj44="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "Obtains certificates from Let's Encrypt using DNS-01 without the need for API access to the DNS provider"; + homepage = "https://github.com/krtab/agnos"; + license = licenses.mit; + maintainers = with maintainers; [ justinas ]; + }; + + passthru.tests = nixosTests.agnos; +} diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 1d324fa7e43d..3703b3b04c2d 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-03-23"; + version = "0-unstable-2025-04-06"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "9de336a436cb5ea1e47a319947acb1ea44cede6e"; - hash = "sha256-gI5dmI5ysoCmUBTL6CgUw+F/K8D4RbXlXNTpIJMbotk="; + rev = "d109d6b9948449a883a9694d3f5aa8702a57f56b"; + hash = "sha256-4yXcPedz5wYqAiLyF5Cgc/DH4jjfJGSLv4qDyIJW4x0="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index 72c325b8297f..8ddb7c933f52 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "alioth"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "alioth"; tag = "v${version}"; - hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU="; + hash = "sha256-xFNX2cxmaw2H8D21qs6mnTMuSidmJ0xJ/b4pxdLTvow="; }; # Checks use `debug_assert_eq!` checkType = "debug"; useFetchCargoVendor = true; - cargoHash = "sha256-kW76EBlpzeSmIhW5UsYjPYp5KeH2mPuf3aAiTSM06g4="; + cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI="; separateDebugInfo = true; diff --git a/pkgs/by-name/al/alive2/package.nix b/pkgs/by-name/al/alive2/package.nix index e69c134d4d1e..89a3587a85b8 100644 --- a/pkgs/by-name/al/alive2/package.nix +++ b/pkgs/by-name/al/alive2/package.nix @@ -24,17 +24,19 @@ clangStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + ninja + re2c ]; buildInputs = [ - re2c z3 hiredis llvm_18 - ninja ]; + strictDeps = true; postPatch = '' substituteInPlace CMakeLists.txt \ + --replace-fail '-Werror' "" \ --replace-fail 'find_package(Git REQUIRED)' "" ''; diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index ed17dc8c903f..8994558d2c03 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -12,14 +12,12 @@ shadowsocks-rust, cloak-pt, wireguard-tools, - procps, - iproute2, - sudo, libssh, zlib, tun2socks, xray, nix-update-script, + bash, }: let amnezia-tun2socks = tun2socks.overrideAttrs ( @@ -83,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace client/configurators/openvpn_configurator.cpp \ --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");" substituteInPlace client/ui/qautostart.cpp \ - --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" + --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN" substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" substituteInPlace deploy/data/linux/AmneziaVPN.service \ @@ -107,31 +105,31 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bash + kdePackages.qt5compat + kdePackages.qtremoteobjects + kdePackages.qtsvg libsecret qt6.qtbase qt6.qttools - kdePackages.qtremoteobjects - kdePackages.qtsvg - kdePackages.qt5compat ]; - qtWrapperArgs = [ - ''--prefix PATH : ${ - lib.makeBinPath [ - procps - iproute2 - sudo - ] - }'' - ]; + installPhase = '' + runHook preInstall - postInstall = '' mkdir -p $out/bin $out/libexec $out/share/applications $out/share/pixmaps $out/lib/systemd/system - cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/ - cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/ - cp ../AppDir/AmneziaVPN.desktop $out/share/applications/ - cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ - cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/ + install -m555 client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/ + install -m555 ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/ + install -m444 ../AppDir/AmneziaVPN.desktop $out/share/applications/ + install -m444 ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ + install -m444 ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/ + + runHook postInstall + ''; + + postFixup = '' + # Temporary unwrap non-binary executable until qt6.wrapQtAppsHook is fixed + mv $out/libexec/.update-resolv-conf.sh-wrapped $out/libexec/update-resolv-conf.sh ''; passthru = { @@ -149,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Amnezia VPN Client"; downloadPage = "https://amnezia.org/en/downloads"; - homepage = "https://amnezia.org/en"; + homepage = "https://github.com/amnezia-vpn/amnezia-client"; license = licenses.gpl3; mainProgram = "AmneziaVPN"; maintainers = with maintainers; [ sund3RRR ]; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 1e01858c5097..8e7d7dc50645 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -15,7 +15,7 @@ libxml2, cmake, exiftool, - openexr_3, + openexr, glib, python3Packages, perlPackages, @@ -147,7 +147,7 @@ stdenv.mkDerivation { libxkbcommon libxslt libXtst - openexr_3 + openexr openjpeg osm-gps-map pcre diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index c9c9e269833d..9b22ba61467a 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage { pname = "anyrun"; - version = "0-unstable-2024-12-27"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "kirottu"; repo = "anyrun"; - rev = "06017e753c8886d5296768dca80745ee09402a2d"; - hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o="; + rev = "786f539d69d5abcefa68978dbaa964ac14536a00"; + hash = "sha256-f+oXT9b3xuBDmm4v4nDqJvlHabxxZRB6+pay4Ub/NvA="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index d7f316ea540f..003fbcd80ef4 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-e0G7J2BRRC+2MMqpvu5BNnimS7RRTjRBgo/j1T9iYWU="; + hash = "sha256-WUAyGx7RcLlQsYpfcbV69k1ESaif5VraxUFAslMi5lo="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-A9BCdYxeWPjCOZ/L0wYTVuqybLHfc1vsWWxAY7IJohw="; + hash = "sha256-fB6DCp2+7T9ozHuMdsv6IwwIyD6+t7LxVWMj9lDJ5Fw="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.8.7"; + version = "0.8.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index c6ac2033d256..428aaf9d400e 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -32,7 +32,7 @@ exiv2, exiftool, mimalloc, - openexr_3, + openexr, ilmbase, opencolorio, color-transformation-language, @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { exiftool libcanberra-gtk3 mimalloc - openexr_3 + openexr ilmbase opencolorio color-transformation-language diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index f0ddc302125c..5e8c267dbf2d 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - nixForLinking, + nixVersions, nixosTests, boost, pkg-config, @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { buildInputs = [ - nixForLinking + nixVersions.nix_2_24 boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; ATTIC_DISTRIBUTOR = "nixpkgs"; - NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include"; + NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include"; # Attic interacts with Nix directly and its tests require trusted-user access # to nix-daemon to import NARs, which is not possible in the build sandbox. diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 1b963d940c7d..37dbc1ff7f45 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -11,7 +11,7 @@ let p = python3.pkgs; self = p.buildPythonApplication rec { pname = "backgroundremover"; - version = "0.2.9"; + version = "0.3.0"; pyproject = true; build-system = [ @@ -22,7 +22,7 @@ let owner = "nadermx"; repo = "backgroundremover"; rev = "v${version}"; - hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM="; + hash = "sha256-fWazMDjc+EoXvO7Iq+zwtJaMEU64ajpO6JtlvU5T0nc="; }; models = runCommand "background-remover-models" { } '' diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 505934d42f48..ad0cc70edb98 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -11,13 +11,13 @@ }: let pname = "backrest"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "garethgeorge"; repo = "backrest"; tag = "v${version}"; - hash = "sha256-X3FiNor2q/JgyV05CIAls7MjMvongH5dGeutPz+CW9I="; + hash = "sha256-p2CKXQeA0rHhS6uP0x2tNsFzHBCOi6sRDlr+o4HeBjk="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -69,7 +69,11 @@ buildGoModule { checkFlags = let skippedTests = - [ "TestRunCommand" ] + [ + "TestMultihostIndexSnapshots" + "TestRunCommand" + "TestSnapshot" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBackup" # relies on ionice "TestCancelBackup" diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 9dc855b9ded8..f1655fe44951 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "badger"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; rev = "v${version}"; - hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY="; + hash = "sha256-R4nahpUuCjPas1NBnWmQ/KBTY+/yPSyo8AmTvgwhYVI="; }; - vendorHash = "sha256-UVdOiaj1FN0etB9F0kt+THfO0Aa1kgdGYVeSVv4GpxY="; + vendorHash = "sha256-x4+CHLmQhu7Y6n1qx2CBY6KzRIRLD7Gn+pzXQy3/5rA="; subPackages = [ "badger" ]; diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index 56a3071df33a..cf01ae2ff834 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bao"; - version = "0.13.0"; + version = "0.13.1"; src = fetchCrate { inherit version; pname = "${pname}_bin"; - hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI="; + hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8="; + cargoHash = "sha256-B0wvJTcIRJxBU0G1DONnKeQYrmsmMIorhTLc73o4/kE="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 64be0b278445..3c6298124ba8 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.6.5"; + version = "1.7.0"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-TitZzTNfEnuU0clTsGKexrtbIcsqE1W9A1pJCefVA6U="; + hash = "sha256-i+6EBgT8Fv3GN2qwnr+QH9mcDToeQvit52qRt30Y9sM="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 9b2400adf39e..dc5cb37b9775 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "bento"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-ufRC/xVuSnoN+dHeiQZ2k2T8mYxz576l1n+y3Y3TMEY="; + hash = "sha256-IPdRe5H/ADaQyz9MjFFplhesUwWMnZ9/RKLBt+f0Z8w="; }; proxyVendor = true; - vendorHash = "sha256-FRaT+TeH6+0RzvCwPd0e+2a6i85GTPARS2H49zYVwk4="; + vendorHash = "sha256-ormwwLixxvU5W5Vy8c3HTfS5lXkcs+1z0EKr99Em92o="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix index c78e7ad5fc15..6b6e9f67eab1 100644 --- a/pkgs/by-name/be/betula/package.nix +++ b/pkgs/by-name/be/betula/package.nix @@ -5,15 +5,15 @@ }: buildGoModule rec { pname = "betula"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromSourcehut { owner = "~bouncepaw"; repo = "betula"; rev = "v${version}"; - hash = "sha256-20sA2Hnnppr2RXqu2Qx2bkU/u9FUkH6INUUGx2zKfao="; + hash = "sha256-f2F0YRhDnKdMqcUvpcRFNAI62gbusfzIUKQSZ65onMU="; }; - vendorHash = "sha256-SWcQYF8LP6lw5kWlAVFt3qiwDnvpSOXenmdm6TSfJSc="; + vendorHash = "sha256-3PS4fIyHbGGjnbMOy2VIQBXsnIyYDKR/ecl/i5jwSVM="; env.CGO_ENABLED = 1; # These tests use internet, so are failing in Nix build. diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix index 5d28f0add04c..c7e50d9e75a5 100644 --- a/pkgs/by-name/bi/bird2/package.nix +++ b/pkgs/by-name/bi/bird2/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.16.1"; + version = "2.17"; src = fetchurl { url = "https://bird.network.cz/download/bird-${version}.tar.gz"; - hash = "sha256-9uWcvMrKYmaK6gIGhyS9QnuexEnH4PD8VoFQOYjHNbQ="; + hash = "sha256-ebvMd8Y+nht6EKSDichvT3WwU/097Ejjxsvg3xuoHrM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix index 96a7d15f070c..05519f122068 100644 --- a/pkgs/by-name/bi/bisq2/package.nix +++ b/pkgs/by-name/bi/bisq2/package.nix @@ -18,7 +18,7 @@ }: let - version = "2.1.6"; + version = "2.1.7"; jdk = jdk23.override { enableJavaFX = true; }; @@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb"; - hash = "sha256-420XZt8wEzY70xv1OZswYZO1/dtVDt8CRyKCJW068H0="; + hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44="; # Verify the upstream Debian package prior to extraction. # See https://bisq.wiki/Bisq_2#Installation @@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation rec { signature = fetchurl { url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc"; - hash = "sha256-17NjRIcDKlmqvX/zKVrahWd8qJEY+v25qP9yfFMPojw="; + hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index d5236efdea77..6c6f6ba67283 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.12.2"; + version = "4.12.4"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-/OdSV/wTrs6roiPiSQCqCLrlWtkB11gm3DM7r7B4HUU="; + hash = "sha256-tg2ICxliTmahO3twKgC4LSVyiX9K2jfA7lCcSCkzcbQ="; }; nativeBuildInputs = @@ -28,7 +28,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-ZM3hFMHuKl5BW1+10czESDknc9jIZ024mUSUdNHF3EM="; + npmDepsHash = "sha256-a5OjCVHPeaBEYTFIUOnc9We677oCGwAvwMv8f1QRk9Q="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -66,7 +66,7 @@ buildNpmPackage rec { for size in 16 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - magick convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png + magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png done makeWrapper ${lib.getExe electron} $out/bin/blockbench \ diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 8785f5c0f034..634d7acf32bd 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.76.81"; + version = "1.77.95"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-Q9BCoSIgP0asYACkHgashQ5h4BITl5My4dxuy50ID8g="; + hash = "sha256-jK9narldfjxgtRjOR2P/0r2hVwFF+D60iCHOIrVTBdM="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Mzd1qxPUmlZkl7kmuO+rEVT8EE2EF8fQwdF2398gjoI="; + hash = "sha256-k4x2TdTIlYPCJ/u30JrwPt0AOSvt16qrxisHjqkDNY8="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-5GrlXZW2uIHNpTXFHStWWfGpz4hINR9z6442n2g9258="; + hash = "sha256-apJFnG80joh7RMJndJI7jU6tgS2QwHZpnackVp4rCek="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-gOZagyA0oM8KvM+FTsYV/vknG6fG/49rfNInQmN/8K4="; + hash = "sha256-wdKIFUwGKJdI7EiMFIrOJuLnMaeBSGgDOk2QUwhNlLE="; }; }; diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix index e5f98c653ad5..f0bf4886ae6f 100644 --- a/pkgs/by-name/bs/bstone/package.nix +++ b/pkgs/by-name/bs/bstone/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bstone"; - version = "1.2.13"; + version = "1.2.15"; src = fetchFromGitHub { owner = "bibendovsky"; repo = "bstone"; - rev = "v${finalAttrs.version}"; - hash = "sha256-jK40/FdC11SWe2Vmh6cbNTxPeM1vrAveEtUWoiAh+jc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-L07GfqeQPTWGQb+vOOXNgbYLYpxQ2OHFnCLWd4uSlBw="; }; nativeBuildInputs = [ @@ -28,8 +28,9 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mkdir -p $out/bin - mv $out/bstone* $out/bin + mkdir -p $out/{bin,share/bibendovsky/bstone} + mv $out/bstone $out/bin + mv $out/*.txt $out/share/bibendovsky/bstone ''; meta = { diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix index a863bbf155b3..7cbfafa4fea4 100644 --- a/pkgs/by-name/bt/btcpayserver/package.nix +++ b/pkgs/by-name/bt/btcpayserver/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "btcpayserver"; repo = "btcpayserver"; - rev = "v${version}"; - sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk="; + tag = "v${version}"; + sha256 = "sha256-OK2OqI4h2SLtnGM2Oen5IgmFKqCkd1ZPuXgCOx6Gixs="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 2481b5a236b7..6d9dbaf03da9 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.1.5"; + version = "2025.2.3"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-QTYeiM2hyZpvSu5oE2wrNrF3qFkp4JJnQftOg3BJqZA="; + hash = "sha256-eVtqlZHW1w10tUKlqdwFSbx2kJW5hEtfyq7MuBsNS4Q="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-vIcBRsylS+ftSq5x0HDe6Zb8dtVUtWw6hENBITYmzyQ="; + hash = "sha256-XWAaNAdPVxKS7/9uYWpAdbzHt+xNqpKCIOH7dVcUyaI="; }; src = fetchurl { @@ -109,6 +109,7 @@ buildFHSEnv { hydraPlatforms = [ ]; maintainers = with maintainers; [ bennofs + blackzeshi fab ]; mainProgram = "burpsuite"; diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 5cae5d2671c4..75dc31527bd7 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -9,29 +9,43 @@ libffi, xar, versionCheckHook, + rev ? "unknown", + debug ? false, + checks ? true, }: - +let + inherit (lib.strings) optionalString; +in llvmPackages.stdenv.mkDerivation (finalAttrs: { - pname = "c3c"; - version = "0.6.6"; + + pname = "c3c${optionalString debug "-debug"}"; + version = "0.7.0"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-+rNj1SmiBYBw3Ncx2uS8X5OA/qDvJ8SFpZOQVRCgvmM="; + hash = "sha256-SCUMyc8Gf7TAOXRppooNiyfbM84CUoIvokgvNgODqw8="; }; + cmakeBuildType = if debug then "Debug" else "Release"; + postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" + substituteInPlace git_hash.cmake \ + --replace-fail "\''${GIT_HASH}" "${rev}" ''; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DC3_ENABLE_CLANGD_LSP=${if debug then "ON" else "OFF"}" + "-DC3_LLD_DIR=${llvmPackages.lld.lib}/lib" + "-DLLVM_CRT_LIBRARY_DIR=${llvmPackages.compiler-rt}/lib/darwin" + ]; buildInputs = [ llvmPackages.llvm llvmPackages.lld + llvmPackages.compiler-rt curl libxml2 libffi @@ -39,12 +53,18 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ python3 ]; - doCheck = llvmPackages.stdenv.system == "x86_64-linux"; + doCheck = + lib.elem llvmPackages.stdenv.system [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ] + && checks; checkPhase = '' runHook preCheck - ( cd ../resources/testproject; ../../build/c3c build ) - ( cd ../test; python src/tester.py ../build/c3c test_suite ) + ( cd ../resources/testproject; ../../build/c3c build --trust=full ) + ( cd ../test; ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite ) runHook postCheck ''; @@ -56,6 +76,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/c3lang/c3c"; license = licenses.lgpl3Only; maintainers = with maintainers; [ + hucancode anas ]; platforms = platforms.all; diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 1bb6049bc849..051a2be17e1a 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.5.10"; + version = "0.5.11"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-FwjmqCIoo1RG+57Y1fnAAWRtOAj4ILQb0pJMESxkiwo="; + sha256 = "sha256-d6IKORuySXrVk5ifevtPlposSuxk7n9b/dxD8CRfdMQ="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index cf9b0745f851..ef79b31cbb54 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -70,6 +70,7 @@ let maintainers = with lib.maintainers; [ octodi d3vil0p3r + blackzeshi ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 0180e338c4b9..008fedf7eb1a 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.12"; + version = "1.1.13"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-rhrcjGR179oBhflEBAztHD+e6Q0MsIkAR40LDrSYzgE="; + hash = "sha256-jHUFHmVVugshheRjz5ztIVK1jsrW7kSWSgEjZj9OVQw="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; diff --git a/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch b/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch new file mode 100644 index 000000000000..fc86ce32233c --- /dev/null +++ b/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch @@ -0,0 +1,22 @@ +From f13bdf94c00a9da3b152ed9fe20001e240215b96 Mon Sep 17 00:00:00 2001 +From: James Lambert +Date: Tue, 9 Feb 2021 11:49:51 -0700 +Subject: [PATCH] Cast mi_regs callbacks + +--- + bus/controller.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bus/controller.c b/bus/controller.c +index 1f0cdfccf..24b3df260 100644 +--- a/bus/controller.c ++++ b/bus/controller.c +@@ -44,7 +44,7 @@ int bus_init(struct bus_controller *bus, int dd_present) { + static const struct bus_controller_mapping mappings[NUM_MAPPINGS] = { + {read_ai_regs, write_ai_regs, AI_REGS_BASE_ADDRESS, AI_REGS_ADDRESS_LEN}, + {read_dp_regs, write_dp_regs, DP_REGS_BASE_ADDRESS, DP_REGS_ADDRESS_LEN}, +- {read_mi_regs, write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN}, ++ {(memory_rd_function)read_mi_regs, (memory_wr_function)write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN}, + {read_pi_regs, write_pi_regs, PI_REGS_BASE_ADDRESS, PI_REGS_ADDRESS_LEN}, + {read_ri_regs, write_ri_regs, RI_REGS_BASE_ADDRESS, RI_REGS_ADDRESS_LEN}, + {read_si_regs, write_si_regs, SI_REGS_BASE_ADDRESS, SI_REGS_ADDRESS_LEN}, diff --git a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch new file mode 100644 index 000000000000..7d3ff742c57a --- /dev/null +++ b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch @@ -0,0 +1,137 @@ +From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001 +From: ghpzin +Date: Tue, 25 Mar 2025 15:26:07 +0300 +Subject: [PATCH] Fix thread arg type for pthread_setname_np + +- change `thread` arg type to `cen64_thread` instead of `cen64_thread *` +(`pthread_t` instead of `pthread_t *`) according to definition of +`pthread_setname_np` from ``: +`int pthread_setname_np(pthread_t thread, const char *name);` +fixes gcc14 errors: +``` +/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion] + 475 | cen64_thread_setname(thread, "device"); + | ^~~~~~ + | | + | cen64_thread {aka long unsigned int} +In file included from /build/source/device/device.h:26, + from /build/source/cen64.c:15: +/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo> + 59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) { + | ~~~~~~~~~~~~~~^ +``` + +- add cast to `cen64_thread` from NULL where `cen64_thread` is called +with it, fixes gcc14 errors: +``` +/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion] + 82 | cen64_thread_setname(NULL, "gdb"); + | ^~~~ + | | + | void * +/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *' + 59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) { + | ~~~~~~~~~~~~~^ +``` +--- + cen64.c | 2 +- + device/device.c | 4 ++-- + gdb/gdb.c | 4 ++-- + os/posix/thread.h | 6 +++--- + os/winapi/thread.h | 2 +- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/cen64.c b/cen64.c +index 51014a4..ca6bda1 100644 +--- a/cen64.c ++++ b/cen64.c +@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) { + } + + CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) { +- cen64_thread_setname(NULL, "device"); ++ cen64_thread_setname((cen64_thread)NULL, "device"); + struct cen64_device *device = (struct cen64_device *) opaque; + + device_run(device); +diff --git a/device/device.c b/device/device.c +index cd5a046..c915846 100644 +--- a/device/device.c ++++ b/device/device.c +@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) { + } + + CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) { +- cen64_thread_setname(NULL, "vr4300"); ++ cen64_thread_setname((cen64_thread)NULL, "vr4300"); + struct cen64_device *device = (struct cen64_device *) opaque; + + while (likely(device->running)) { +@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) { + + cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) { + vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler); +-} +\ No newline at end of file ++} +diff --git a/gdb/gdb.c b/gdb/gdb.c +index 021784d..0e8d188 100644 +--- a/gdb/gdb.c ++++ b/gdb/gdb.c +@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co + } + + CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) { +- cen64_thread_setname(NULL, "gdb"); ++ cen64_thread_setname((cen64_thread)NULL, "gdb"); + struct gdb *gdb = (struct gdb *) opaque; + + cen64_mutex_lock(&gdb->client_mutex); +@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) { + + gdb->device = NULL; + free(gdb); +-} +\ No newline at end of file ++} +diff --git a/os/posix/thread.h b/os/posix/thread.h +index 2a261c6..e8e6144 100644 +--- a/os/posix/thread.h ++++ b/os/posix/thread.h +@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) { + #ifdef __APPLE__ + int pthread_setname_np(const char*); + #elif __NETBSD__ +-int pthread_setname_np(cen64_thread*, const char*, const char*); ++int pthread_setname_np(cen64_thread, const char*, const char*); + #else +-int pthread_setname_np(cen64_thread*, const char*); ++int pthread_setname_np(cen64_thread, const char*); + #endif + + // Sets the name of the thread to a specific value +@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*); + // If you call it at the wrong time or your OS doesn't support custom thread names + // the return value will be non-zero. + // If cen64_thread is not set the name of the current thread will be changed. +-static inline int cen64_thread_setname(cen64_thread *t, const char *name) { ++static inline int cen64_thread_setname(cen64_thread t, const char *name) { + #ifdef __APPLE__ + if (t == NULL) + return pthread_setname_np(name); +diff --git a/os/winapi/thread.h b/os/winapi/thread.h +index d7c162a..128d935 100644 +--- a/os/winapi/thread.h ++++ b/os/winapi/thread.h +@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) { + // + // Windows isn't supported for the moment. + // +-static inline int cen64_thread_setname(cen64_thread *t, const char *name) { ++static inline int cen64_thread_setname(cen64_thread t, const char *name) { + return ENOSYS; + } + +-- +2.48.1 + diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix index 1a2450ee6304..ea6071c71260 100644 --- a/pkgs/by-name/ce/cen64/package.nix +++ b/pkgs/by-name/ce/cen64/package.nix @@ -11,15 +11,23 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "unstable-2022-10-02"; + version = "0-unstable-2023-05-29"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "ee6db7d803a77b474e73992fdc25d76b9723d806"; - sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I="; + rev = "1c1118462bd9d9b8ceb4c556a647718072477aab"; + sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w="; }; + patches = [ + # fix build with gcc14: + # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 + ./cast-mi_regs-callbacks.patch + # https://github.com/n64dev/cen64/pull/237 + ./fix-thread-arg-type-for-pthread_setname_np.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libGL diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index e96f82a984b6..9a74648e6efa 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -16,23 +16,23 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.9"; + version = "6.1.0"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI="; + hash = "sha256-7hh9wcM9cMfQ2W2PlDitTdJD9ftZt/KO/B+wV/c588U="; }; - vendorHash = "sha256-WfYN7bhtOPDp2UeB/WqtN3dD3+WO9lIxnXe2iTqn000="; + vendorHash = "sha256-hl1BznajnaOXMrlSqksqPdJih29yRDYW9IsyV9mSN20="; ldflags = [ "-s" "-w" - "-X=github.com/centrifugal/centrifugo/v5/internal/build.Version=${version}" - "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsEndpoint=${statsEndpoint}" - "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsToken=${statsToken}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.Version=${version}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsEndpoint=${statsEndpoint}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsToken=${statsToken}" ]; excludedPackages = [ @@ -56,7 +56,10 @@ buildGoModule rec { homepage = "https://centrifugal.dev"; changelog = "https://github.com/centrifugal/centrifugo/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.tie ]; + maintainers = [ + lib.maintainers.tie + lib.maintainers.valodim + ]; mainProgram = "centrifugo"; }; } diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/by-name/ch/chafa/package.nix similarity index 99% rename from pkgs/tools/misc/chafa/default.nix rename to pkgs/by-name/ch/chafa/package.nix index 490d1a7049d9..ef46ea903727 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/by-name/ch/chafa/package.nix @@ -16,7 +16,6 @@ docbook_xml_dtd_412, docbook_xsl, glib, - Foundation, }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/pkgs/by-name/ch/chafa/xmlcatalog_patch.patch similarity index 100% rename from pkgs/tools/misc/chafa/xmlcatalog_patch.patch rename to pkgs/by-name/ch/chafa/xmlcatalog_patch.patch diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 4d0abb1aa746..eca5647ce705 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.397"; + version = "3.2.400"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-TFAieHFWM/gQqZyLMKqmGjvTUMPwXbn6LzOBGkSBqk0="; + hash = "sha256-R0u1O0az4LMrE7m3PVyLmNf1ru90ym5lbpWAd3T+0QU="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index b68b64dcd96f..5f2e46b344db 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.111.1"; + version = "1.112.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-eOoUwYNQS83/uNfbbEPUbTf9aIjqc2vklIC3zi9U9KU="; + hash = "sha256-yh7/2QsUO2/sCyrgT8QTBC/BENEZNmXoHTIiz5abngw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 56560fe90f17..fa3dbcc79939 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.62" + "@anthropic-ai/claude-code": "^0.2.65" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.62", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.62.tgz", - "integrity": "sha512-Mod9/kbqKy344lm5YmDJLn8dR3HYlA2zGCQy4exU7hmECNqg3KlTAz8u4O4YdiRMxXeUJ3Izi9YSJUT7oZOKdg==", + "version": "0.2.65", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.65.tgz", + "integrity": "sha512-LCxFb/WeHoHfVhQfEQGbGlFURYCm5Brcff4GHD+lVX2N3GtexLTcf0iXElAYz3S2vlWX9km8nGVfB/Yd/ieVUw==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index d7dc872039d9..e6a2c8022be6 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "claude-code"; - version = "0.2.62"; + version = "0.2.65"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-O6jkpx3OxEh/npZjyJb+osoeJrG+HZ6NRB9T4EMkdf8="; + hash = "sha256-4YFdDEpKi7agSqJUetcItqElec5VD0uQARwDSsh1S8o="; }; - npmDepsHash = "sha256-tVA4VbPaPc+KwZzUK0QI9In3QSXXoELaNM2U65wxGGA="; + npmDepsHash = "sha256-157BP/8DfEBE2dhOYj3CGzlV7M2EE44L0Zr0qwAQoQw="; postPatch = '' cp ${./package-lock.json} package-lock.json @@ -24,8 +24,7 @@ buildNpmPackage rec { AUTHORIZED = "1"; # `claude-code` tries to auto-update by default, this disables that functionality. - # Note that the `DISABLE_AUTOUPDATER` environment variable is not documented, so this trick may - # not continue to work. + # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables postInstall = '' wrapProgram $out/bin/claude \ --set DISABLE_AUTOUPDATER 1 diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index 5b938f117a2a..741103455c39 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "clickable"; - version = "8.2.0"; + version = "8.3.0"; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - hash = "sha256-MFzpeiWeqJ0MG8ouwRkYXD1e6Nsxshmz1NSzCIBRjZ0="; + hash = "sha256-5fymmsZUYwB+wc1X7Y1HwwJbGRjQPwkk9JLTxnfH8fo="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index 737e24e42554..74372b7a2ae0 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; tag = "v${version}"; - hash = "sha256-HYCD7mCfIJOijKTPvL5OixZ6zmI/P/+0Agx9bBhxy0Y="; + hash = "sha256-xCGGyPfD6cQgVTowh8ZO9Ak3xH5Hct51Vm18FJWLF1E="; }; - vendorHash = "sha256-fZ7l4+No/a8EYqC1nacSyh5fD2QAdzANjTTmbY0d/L4="; + vendorHash = "sha256-PW9Yu8d5PPIL6cc692N8e5qO73drEgfu7JrVeihggcs="; subPackages = [ "cmd/cloudlist/" ]; diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix index 2c3ac68857c0..f764b4b162df 100644 --- a/pkgs/by-name/cn/cnsprcy/package.nix +++ b/pkgs/by-name/cn/cnsprcy/package.nix @@ -22,9 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-8hNuF5tD1PwdIJB0q3wxDOGDcppo0ac+zol3AHWGv0s="; - passthru.updateScript = lib.mkUpdateScript { - extraFetchers = [ fetchFromSourcehut ]; - }; + passthru.updateScript = ./update.sh; RUSTC_BOOTSTRAP = true; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/cn/cnsprcy/update.sh b/pkgs/by-name/cn/cnsprcy/update.sh new file mode 100755 index 000000000000..c6ab5fe5ba46 --- /dev/null +++ b/pkgs/by-name/cn/cnsprcy/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update common-updater-scripts gnused + +set -euo pipefail + +version=$(list-git-tags --url="https://git.sr.ht/~xaos/cnsprcy" | sed -En 's/^cnspr\/v(.*)/\1/p' | tail -1) +nix-update cnsprcy --version="$version" diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index cef8e8b27769..a822dac98fab 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -6,20 +6,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "coconutbattery"; - version = "3.9.14"; + version = "4.0.2,152"; src = fetchzip { url = "https://coconut-flavour.com/downloads/coconutBattery_${ - builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version + lib.replaceStrings [ "." "," ] [ "" "_" ] finalAttrs.version }.zip"; - hash = "sha256-zKSPKwDBwxlyNJFurCLLGtba9gpizJCjOOAd81vdD5Q="; + hash = "sha256-PNSDUp07lUx5ebcfM3WSJAfRQjeuIIy7KfY0KJ0i1AE="; }; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - dontFixup = true; - installPhase = '' runHook preInstall @@ -29,16 +24,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Standard for battery reading since 2005"; longDescription = '' With coconutBattery you are always aware of your current battery health. It shows you live information about the battery quality in your Mac, iPhone and iPad. ''; homepage = "https://www.coconut-flavour.com/coconutbattery"; - license = with licenses; [ unfree ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ stepbrobd ]; + license = with lib.licenses; [ unfree ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" "x86_64-darwin" diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix index f09011e8e68b..c39f58b3a783 100644 --- a/pkgs/by-name/co/codechecker/package.nix +++ b/pkgs/by-name/co/codechecker/package.nix @@ -68,6 +68,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350) lxml sqlalchemy alembic @@ -122,6 +123,5 @@ python3Packages.buildPythonApplication rec { felixsinger ]; mainProgram = "CodeChecker"; - platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/colcon/package.nix b/pkgs/by-name/co/colcon/package.nix new file mode 100644 index 000000000000..c88b051d468a --- /dev/null +++ b/pkgs/by-name/co/colcon/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication colcon diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix index 7fe0b5c661be..1fd5403142c9 100644 --- a/pkgs/by-name/co/color-transformation-language/package.nix +++ b/pkgs/by-name/co/color-transformation-language/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, ilmbase, - openexr_3, + openexr, libtiff, aces-container, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ilmbase - openexr_3 + openexr libtiff aces-container ]; diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix index 639d9275357d..96e15a4e8023 100644 --- a/pkgs/by-name/co/commit/package.nix +++ b/pkgs/by-name/co/commit/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "commit"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Commit"; tag = "v${finalAttrs.version}"; - hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw="; + hash = "sha256-yNzMFOd0IN5EUKG7ztCEbQzQ9RHc+D4iC1OiBauMSwE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index d43c222385b8..d3d1bdd9ebb0 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -14,6 +14,7 @@ udev, xkeyboard_config, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -64,13 +65,23 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index a6fca5a62349..30dcddceb0ae 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -6,6 +6,7 @@ libcosmicAppHook, just, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -43,13 +44,23 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 61fe82b61528..dd6637c115f8 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -1,55 +1,57 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, libcosmicAppHook, just, nasm, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-bg"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-bg"; + version = "1.0.0-alpha.6"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-bg"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks="; + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-bg"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk="; + + nativeBuildInputs = [ + just + libcosmicAppHook + nasm + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg" + ]; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk="; - - nativeBuildInputs = [ - just - libcosmicAppHook - nasm - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold"; - - passthru.updateScript = nix-update-script { + updateScript = nix-update-script { extraArgs = [ "--version" "unstable" @@ -57,16 +59,17 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - homepage = "https://github.com/pop-os/cosmic-bg"; - description = "Applies Background for the COSMIC Desktop Environment"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - mainProgram = "cosmic-bg"; - }; - }) + meta = { + homepage = "https://github.com/pop-os/cosmic-bg"; + description = "Applies Background for the COSMIC Desktop Environment"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; + mainProgram = "cosmic-bg"; + }; +}) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 2f3ae72a11c6..815b6d2deb87 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -13,6 +13,7 @@ udev, systemd, nix-update-script, + nixosTests, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: @@ -57,13 +58,23 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index f9077e2c283c..d30051be8245 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,6 +16,7 @@ wayland, xorg, vulkan-loader, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -84,6 +85,15 @@ rustPlatform.buildRustPackage (finalAttrs: { --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" ''; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-edit"; description = "Text Editor for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 7951c9f82d9d..2f94b8b9f533 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -7,6 +7,7 @@ libcosmicAppHook, glib, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -80,13 +81,23 @@ rustPlatform.buildRustPackage (finalAttrs: { runHook postCheck ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 90ca350a82c2..68a5ee7aa5ea 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -12,6 +12,7 @@ coreutils, xkeyboard_config, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -69,13 +70,23 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 3bf2c64eb330..18332385b9fc 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -11,6 +11,7 @@ just, bash, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -48,13 +49,23 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"' ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index fba267328761..d852fefb31e3 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -1,52 +1,56 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, just, libcosmicAppHook, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-launcher"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-launcher"; + version = "1.0.0-alpha.6"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-launcher"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s="; + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-launcher"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs="; + + nativeBuildInputs = [ + just + libcosmicAppHook + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher" + ]; + + env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs="; - - nativeBuildInputs = [ - just - libcosmicAppHook - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - "--cfg tokio_unstable${lib.optionalString withMoldLinker " -C link-arg=-fuse-ld=mold"}"; - passthru.updateScript = nix-update-script { extraArgs = [ "--version" @@ -55,16 +59,17 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - homepage = "https://github.com/pop-os/cosmic-launcher"; - description = "Launcher for the COSMIC Desktop Environment"; - mainProgram = "cosmic-launcher"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - }; - }) + meta = { + homepage = "https://github.com/pop-os/cosmic-launcher"; + description = "Launcher for the COSMIC Desktop Environment"; + mainProgram = "cosmic-launcher"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 99a85f7ee6a7..5fa93c6b17c5 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,6 +12,7 @@ appstream-glib, desktop-file-utils, intltool, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -62,6 +63,15 @@ rustPlatform.buildRustPackage (finalAttrs: { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" ''; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-notifications"; description = "Notifications for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 745f86f03891..31be64525d5e 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -6,6 +6,7 @@ pulseaudio, udev, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -31,13 +32,23 @@ rustPlatform.buildRustPackage (finalAttrs: { env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 279addbd48b7..56b193f96dbf 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -6,6 +6,7 @@ libcosmicAppHook, just, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -39,13 +40,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 4dc39cf83dfb..82e0bb86bd2f 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -13,6 +13,7 @@ libglvnd, libgbm, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -71,13 +72,23 @@ rustPlatform.buildRustPackage (finalAttrs: { libcosmicAppWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index e887e516cbec..7f6b46785e2a 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, wayland-scanner, nix-update-script, + nixosTests, }: stdenv.mkDerivation { @@ -20,11 +21,21 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "branch=HEAD" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index e8115fad0f15..e5605ace88ab 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -1,56 +1,58 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, just, pkg-config, wayland, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-randr"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-randr"; + version = "1.0.0-alpha.6"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-randr"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4="; + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-randr"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY="; + + nativeBuildInputs = [ + just + pkg-config + ]; + + buildInputs = [ wayland ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr" + ]; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY="; - - nativeBuildInputs = [ - just - pkg-config - ]; - - buildInputs = [ wayland ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold"; - - passthru.updateScript = nix-update-script { + updateScript = nix-update-script { extraArgs = [ "--version" "unstable" @@ -58,16 +60,17 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - homepage = "https://github.com/pop-os/cosmic-randr"; - description = "Library and utility for displaying and configuring Wayland outputs"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - mainProgram = "cosmic-randr"; - }; - }) + meta = { + homepage = "https://github.com/pop-os/cosmic-randr"; + description = "Library and utility for displaying and configuring Wayland outputs"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; + mainProgram = "cosmic-randr"; + }; +}) diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index df6a50a5ec12..4a5a6e4da84b 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -5,6 +5,7 @@ rustPlatform, just, pkg-config, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -37,6 +38,15 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-screenshot" ]; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-screenshot"; description = "Screenshot tool for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 3f3bf681c7b1..d92ff5c15e0c 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -7,6 +7,7 @@ dbus, stdenv, xdg-desktop-portal-cosmic, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -62,7 +63,17 @@ rustPlatform.buildRustPackage (finalAttrs: { fi ''; - passthru.providedSessions = [ "cosmic" ]; + passthru = { + providedSessions = [ "cosmic" ]; + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + }; meta = { homepage = "https://github.com/pop-os/cosmic-session"; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 48345bac9841..1fea2c041514 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -7,6 +7,7 @@ geoclue2-with-demo-agent, libinput, udev, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -38,12 +39,24 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings-daemon"; description = "Settings Daemon for the COSMIC Desktop Environment"; mainProgram = "cosmic-settings-daemon"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; + maintainers = with maintainers; [ + nyabinary + drakon64 + ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 3cac2e12b85f..76a97c61c3e8 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, cmake, @@ -19,73 +18,76 @@ cosmic-randr, xkeyboard_config, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: let libcosmicAppHook' = (libcosmicAppHook.__spliced.buildHost or libcosmicAppHook).override { includeSettings = false; }; in -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-settings"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-settings"; + version = "1.0.0-alpha.6"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-settings"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE="; + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-settings"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8="; + + nativeBuildInputs = [ + cmake + just + libcosmicAppHook' + pkg-config + rustPlatform.bindgenHook + util-linux + ]; + + buildInputs = [ + expat + fontconfig + freetype + libinput + pipewire + pulseaudio + udev + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" + ]; + + preFixup = '' + libcosmicAppWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} + --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml + --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml + ) + ''; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8="; - - nativeBuildInputs = [ - cmake - just - libcosmicAppHook' - pkg-config - rustPlatform.bindgenHook - util-linux - ]; - - buildInputs = [ - expat - fontconfig - freetype - libinput - pipewire - pulseaudio - udev - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold"; - - preFixup = '' - libcosmicAppWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} - --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml - --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml - ) - ''; - - passthru.updateScript = nix-update-script { + updateScript = nix-update-script { extraArgs = [ "--version" "unstable" @@ -93,16 +95,17 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - description = "Settings for the COSMIC Desktop Environment"; - homepage = "https://github.com/pop-os/cosmic-settings"; - license = lib.licenses.gpl3Only; - mainProgram = "cosmic-settings"; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - }; - }) + meta = { + description = "Settings for the COSMIC Desktop Environment"; + homepage = "https://github.com/pop-os/cosmic-settings"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-settings"; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index e096b9cc2d03..9387581d4aa8 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -10,6 +10,7 @@ flatpak, openssl, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -51,6 +52,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; updateScript = nix-update-script { extraArgs = [ "--version" diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index f8efd682d3a4..c186673faf4a 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -10,6 +10,7 @@ freetype, libinput, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -57,13 +58,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 598ad84c8a36..824f3f960f85 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -9,6 +9,7 @@ libgbm, udev, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,13 +46,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index de9cff77feab..20fc80c99e5f 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "cpplint"; repo = "cpplint"; tag = version; - hash = "sha256-IM1XznnpdL1Piei9kKR1nCwfs7TVgLcTgMI4r+cQXLg="; + hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k="; }; # We use pytest-cov-stub instead diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 56c0799783b3..c005a716ddaa 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -55,7 +55,7 @@ libxslt, lua, util-linux, - openexr_3, + openexr, openjpeg, osm-gps-map, pcre2, @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { libwebp libxslt lua - openexr_3 + openexr openjpeg osm-gps-map pcre2 diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 6a4dfd8729ba..37d5168f8741 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -8,6 +8,7 @@ ffmpeg, libxslt, shaka-packager, + nix-update-script, }: let @@ -24,13 +25,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4="; + hash = "sha256-PMzHWY129Bddl1RQQyEPstqvDLAqXxGv9I3fw1AylBo="; }; patches = [ @@ -38,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0="; + cargoHash = "sha256-qy8X9DoBD5MIUQ6akalqtyasst0ZKJJLZTEz+6Hp6EI="; nativeBuildInputs = [ makeWrapper @@ -59,6 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest"; longDescription = '' diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index fac1601d14d8..d2c418761f1b 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.0.1"; + version = "25.0.2"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-p4bVQxP5dazNPSGJN6tu2rsowLf5VPJN30W+q8HiUNM="; - aarch64-linux = "sha256-3vrJOqC5szOWcj/oDg3uc1BND5vfbMRR+MNTDcG4vk8="; - x86_64-darwin = "sha256-bu67Tz8awAQ69inY2s330g2qPan2tRLWImeYx9HB3tU="; - aarch64-darwin = "sha256-3TnswzRm3l7egoZttaOBSfO0aGasD56dOndMZ0howDI="; + x86_64-linux = "sha256-UmTy4Flxz/zIh3cLxRi7EhNDf0Ojc7fuzCbRKIE/+CQ="; + aarch64-linux = "sha256-I+V/2kfdxGx8zNkH98b2685IQPbVPSe9++qS4QEg0LU="; + x86_64-darwin = "sha256-8Qf69OHXPiqdMs//f1jbKbyKoll+oX+P+l3mpdOvraI="; + aarch64-darwin = "sha256-bGxn8y9hvJyqj1/i5tScufO5/ZjdlOlPChmeL+DWwoY="; }; in fetchurl { @@ -89,10 +89,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }" mkdir -p $out/share/icons/hicolor/256x256/apps - # for some reason it's missing from the aarch64 build - if [ -e $out/opt/dbeaver/dbeaver.png ]; then - ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png - fi + ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png mkdir -p $out/share/applications ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix index 162c1b9a8aa5..3b4640ba5f58 100644 --- a/pkgs/by-name/de/decibels/package.nix +++ b/pkgs/by-name/de/decibels/package.nix @@ -17,15 +17,15 @@ }: stdenv.mkDerivation rec { pname = "decibels"; - version = "46.0"; + version = "48.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; group = "GNOME"; owner = "Incubator"; repo = "decibels"; - rev = version; - hash = "sha256-3LQQcrpmWrTfk8A8GR+KnxJEB1HGozgEsM+j5ECK8kc="; + tag = version; + hash = "sha256-qtKiKfcxGLuV1bE3lb7l4s+reZRJXcjlV35M8eZmvHc="; fetchSubmodules = true; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Play audio files"; homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; - changelog = "https://gitlab.gnome.org/GNOME/Incubator/decibels/-/blob/main/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/decibels/-/blob/${version}/NEWS?ref_type=tags"; license = lib.licenses.gpl3Only; maintainers = lib.teams.gnome-circle.members; mainProgram = "org.gnome.Decibels"; diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix index cefe95973b8d..0c0d2ab0b492 100644 --- a/pkgs/by-name/dp/dprint/plugins/default.nix +++ b/pkgs/by-name/dp/dprint/plugins/default.nix @@ -13,7 +13,12 @@ let maintainers ? [ lib.maintainers.phanirithvij ], }: fetchurl { - inherit hash url; + inherit + hash + url + pname + version + ; name = "${pname}-${version}.wasm"; meta = { inherit diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index de16727c3bf6..6e6e0668064b 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -53,21 +53,21 @@ let provider_asn1 = buildRebar3 { name = "provider_asn1"; - version = "0.3.0"; + version = "0.4.1"; src = fetchHex { pkg = "provider_asn1"; - version = "0.3.0"; - sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU="; + version = "0.4.1"; + sha256 = "sha256-HqR6IyJyJinvbPJJlhJE14yEiBbNmTGOmR0hqonrOR0="; }; beamDeps = [ ]; }; rebar3_hex = buildRebar3 { name = "rebar3_hex"; - version = "7.0.7"; + version = "7.0.8"; src = fetchHex { pkg = "rebar3_hex"; - version = "7.0.7"; - sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok="; + version = "7.0.8"; + sha256 = "sha256-aEY0EEZwRHp6AAuE1pSfm5RjBjU+PaaJuKp7fvXRiBc="; }; beamDeps = [ ]; }; @@ -141,7 +141,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "24.12"; + version = "25.03"; nativeBuildInputs = [ makeWrapper @@ -170,17 +170,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE="; + hash = "sha256-VEH1V8v2wQ9qf6Xcj00xHw30tWo0s9AhPyoB7d5B8k8="; }; - patches = [ - # Fix json_encode_with_kv_list used in mod_matrix_gw - (fetchpatch2 { - url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1"; - hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4="; - }) - ]; - passthru.tests = { inherit (nixosTests) ejabberd; }; diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index 4fd3e6740b74..bd5b79474028 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -44,21 +44,21 @@ let }; yconf = builder { name = "yconf"; - version = "1.0.17"; + version = "1.0.18"; src = fetchHex { pkg = "yconf"; - version = "1.0.17"; - sha256 = "sha256-3SiSkjJBRJpGzIRXuewPsUAwcAc1pYhZVWd8c1w0GiU="; + version = "1.0.18"; + sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo="; }; beamDeps = [ fast_yaml ]; }; xmpp = builder { name = "xmpp"; - version = "1.9.1"; + version = "1.10.0"; src = fetchHex { pkg = "xmpp"; - version = "1.9.1"; - sha256 = "sha256-0rFDGvbkwaTIv5DK8MwRzesEe4MjuH6dfkgm1JEyddw="; + version = "1.10.0"; + sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU="; }; beamDeps = [ ezlib @@ -71,11 +71,11 @@ let }; stun = builder { name = "stun"; - version = "1.2.15"; + version = "1.2.17"; src = fetchHex { pkg = "stun"; - version = "1.2.15"; - sha256 = "sha256-9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8="; + version = "1.2.17"; + sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0="; }; beamDeps = [ fast_tls @@ -84,11 +84,11 @@ let }; stringprep = builder { name = "stringprep"; - version = "1.0.30"; + version = "1.0.31"; src = fetchHex { pkg = "stringprep"; - version = "1.0.30"; - sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o="; + version = "1.0.31"; + sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA="; }; beamDeps = [ p1_utils ]; }; @@ -117,18 +117,18 @@ let version = "1.0.26"; src = fetchHex { pkg = "p1_utils"; - version = "1.0.26"; - sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw="; + version = "1.0.27"; + sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA="; }; beamDeps = [ ]; }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.29"; + version = "1.1.32"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.29"; - sha256 = "sha256-pv9Y6LF0mT84ldo+piEan50MVNGm4ouzIdo7PNaLOME="; + version = "1.1.32"; + sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4="; }; beamDeps = [ xmpp ]; }; @@ -144,11 +144,11 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.25"; + version = "1.0.26"; src = fetchHex { pkg = "p1_mysql"; - version = "1.0.25"; - sha256 = "sha256-5hh/+ulbcmCY6I8+5vI0SsJZziwm4O5AOwX+7zQa5DQ="; + version = "1.0.26"; + sha256 = "sha256-6hOAg/LFRxm5z1Sdv1gCooiwAZ6j5USbNUx0zAP6/ew="; }; beamDeps = [ ]; }; @@ -250,11 +250,11 @@ let }; esip = builder { name = "esip"; - version = "1.0.56"; + version = "1.0.57"; src = fetchHex { pkg = "esip"; - version = "1.0.56"; - sha256 = "sha256-nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8="; + version = "1.0.57"; + sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0="; }; beamDeps = [ fast_tls @@ -284,11 +284,11 @@ let }; eimp = builder { name = "eimp"; - version = "1.0.23"; + version = "1.0.24"; src = fetchHex { pkg = "eimp"; - version = "1.0.23"; - sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo="; + version = "1.0.24"; + sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0="; }; beamDeps = [ p1_utils ]; }; diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix index ceb56e9b4d12..ab135355eba8 100644 --- a/pkgs/by-name/el/elasticsearch-curator/package.nix +++ b/pkgs/by-name/el/elasticsearch-curator/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "8.0.20"; + version = "8.0.21"; pyproject = true; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; tag = "v${version}"; - hash = "sha256-oeQ36CvR/v0Mvo+aGL+dYHTgEsq9TesZoBMdoePmgnI="; + hash = "sha256-yVOZBz4AJNjmpxRp3t03KwDzp/3W8uJiHwuSRJbfLvk="; }; pythonRelaxDeps = [ "es-client" ]; diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix index 6dd4a3472547..3c7b57002fb4 100644 --- a/pkgs/by-name/en/envfs/package.nix +++ b/pkgs/by-name/en/envfs/package.nix @@ -1,34 +1,42 @@ { - rustPlatform, lib, fetchFromGitHub, + rustPlatform, nixosTests, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "envfs"; - version = "1.0.6"; + version = "1.1.0"; + src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; - rev = version; - hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08="; + rev = finalAttrs.version; + hash = "sha256-bpATdm/lB+zomPYGCxA7omWK/SKPIaqr94J+fjMaXfE="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-VvdvYxNBzwJJy09npC30VaOzOU9Fwi++qon9Od4juHE="; - passthru.tests = { - envfs = nixosTests.envfs; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-nMUdAFRHJZDwvLASBVykzzkwk3HxslDehqqm1U99qYg="; postInstall = '' ln -s envfs $out/bin/mount.envfs ln -s envfs $out/bin/mount.fuse.envfs ''; - meta = with lib; { + + passthru = { + tests = { + envfs = nixosTests.envfs; + }; + + updateScript = nix-update-script { }; + }; + + meta = { description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process"; homepage = "https://github.com/Mic92/envfs"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 2c764b8d8076..25e8ddf3dbe3 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -106,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/gabmus/envision"; license = lib.licenses.agpl3Only; mainProgram = "envision"; + # More maintainers needed! + # envision (wrapped) requires frequent updates to the dependency list; + # the more people that can help with this, the better. maintainers = with lib.maintainers; [ pandapip1 Scrumplex diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 794ce30a59bd..19a4fce1f80a 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -52,6 +52,7 @@ buildFHSEnv { xorg.xorgproto SDL2 wayland + mesa-gl-headers # Additional dependencies required for Monado WMR support bc fmt @@ -60,6 +61,7 @@ buildFHSEnv { gtest jq libepoxy + lz4 lz4.dev tbb libxkbcommon diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 3df2bacc3604..f9fa72114747 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-03-30"; + version = "2025-04-08"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-79CcXrGxFNc51LctL1OiUiYIJyGUkqB+NmGiUoxTbpU="; + hash = "sha256-xo9DhcQyigfAOF/yn46U09YMr8jlbJZp93wwJ4btr6Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index 81edec825164..dbcd7a4f2b72 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "ffizer"; - version = "2.13.1"; + version = "2.13.2"; buildFeatures = [ "cli" ]; @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { owner = "ffizer"; repo = "ffizer"; rev = version; - hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw="; + hash = "sha256-GL1tdWOcbdybPayfShoGnxHsqYi8p+DZ6Eo/8bvWElE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JbCRD2P2jt2f+c2BUnb512p5ulein0guzgx4gj3SeVU="; + cargoHash = "sha256-5hsJ6eMiUPOqAzW1bdXTGTP5tY6VM2tTdySpkJl6pAY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 4f137746068c..c174fac4ee0c 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "filebeat"; - version = "8.17.3"; + version = "8.17.4"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-b0JDOA3yb/Pfcp9WQFvzE+k9DXDKg/hF4+iWGJ00doo="; + hash = "sha256-m3TJaYmmyE+MXGCiRnuGCObyv0QPrvN7imI2lWtoAn8="; }; - vendorHash = "sha256-p2Bm2MM85BFI/ePw+ZY90UgqeFKbozGvFvsjY6M82ts="; + vendorHash = "sha256-D24ViZv34mhv8S4l1O8cup54e7wXT5MyZ/HkkBO4bOo="; subPackages = [ "filebeat" ]; diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 62d60e8abbcd..c5827e2c3b40 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "furnace"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-G5yjqsep+hDGXCqGNBKoMvV7JOD7ZZTxTPBl9VmG8RM="; + hash = "sha256-pdl46Xrq1NS0Wtri/xMfd4SxKnFQykB0TpOG/GJT89Y="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 42fb06906a68..9c87c8b7a52d 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -13,8 +13,9 @@ pkg-config, wrapGAppsHook3, - openssl, + glib-networking, libsoup_3, + openssl, webkitgtk_4_1, }: @@ -66,9 +67,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + glib-networking # needed to load icons libsoup_3 - webkitgtk_4_1 openssl + webkitgtk_4_1 ]; meta = { diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 46004d44a882..2ca0aaf4e7fa 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -1,18 +1,18 @@ [ { "pname": "Azure.Core", - "version": "1.41.0", - "hash": "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y=" + "version": "1.44.1", + "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" }, { "pname": "Azure.Storage.Blobs", - "version": "12.21.2", - "hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o=" + "version": "12.24.0", + "hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs=" }, { "pname": "Azure.Storage.Common", - "version": "12.20.1", - "hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w=" + "version": "12.23.0", + "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q=" }, { "pname": "CommandLineParser", @@ -25,9 +25,29 @@ "hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "1.1.1", - "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.14", + "hash": "sha256-/KLfqaH4v++SyVJR9p+2WxrMDKPEZKmUvLUjB2ZwT/0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "8.0.14", + "hash": "sha256-f0PiSIwbh5t4IKMcVBWb6qSEGp/NAHuC/bWdR3Er440=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.14", + "hash": "sha256-HGSGesUhWei4IE+jqGh85aokkIg7xufpVn+n1vOLoY4=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "8.0.14", + "hash": "sha256-rAypEtdQcbfckGqa8oAY2WLTDlx54Xi3IOiE42BKV+M=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "8.0.14", + "hash": "sha256-6nKy10sMp/xqjFZvDfv28s9+r8gzYnKpxVq9p2v6FAo=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -35,129 +55,179 @@ "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, { - "pname": "Microsoft.Build.Tasks.Git", - "version": "8.0.0", - "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + "pname": "Microsoft.Bcl.Memory", + "version": "9.0.0", + "hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "8.0.0", - "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + "version": "9.0.3", + "hash": "sha256-p1KEkbl1h3dJkBZQUMK2Jt1vbm/NGIHqLEr7QrLYIbg=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + "version": "9.0.3", + "hash": "sha256-OjL0pzW+Wsp0KSrqawYHdtIf8w0XqvY8USEbptgP6dI=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + "version": "9.0.3", + "hash": "sha256-KxYOzATIl0qI8MScHL9BYsCB3dvqoNDCrraiquBHMVs=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "version": "9.0.3", + "hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + "version": "9.0.3", + "hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" + "version": "9.0.3", + "hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.0", "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.3", + "hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso=" + }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "8.0.0", - "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" + "version": "9.0.3", + "hash": "sha256-u9Un3Bc+Cbj2E8u2etU+KPPv3IbCKgCAY/SCAGK6+LE=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "8.0.0", - "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=" + "version": "9.0.3", + "hash": "sha256-bDHxUjuO4d63GXbDoD9Hdo8AvAke0/r38hzctAWQUqc=" }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" + "version": "9.0.3", + "hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "8.0.0", - "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + "version": "9.0.3", + "hash": "sha256-FjYrMjnkEplPTYoHUVU94zXIuVsjL5AcGHb/zYkh138=" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "8.0.0", - "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + "version": "9.0.3", + "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus=" }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.0.1", - "hash": "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI=" + "version": "8.6.1", + "hash": "sha256-RDyVSOYjQFGZsGr2tjwcJHjJV4JJPZ5uZdwE3BbbLB0=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.0.1", - "hash": "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y=" + "version": "8.6.1", + "hash": "sha256-Y3NBDifORZ09vKlIF8J1Ocxe8DrmWV4/DuVJZul4xmM=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.0.1", - "hash": "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y=" + "version": "8.6.1", + "hash": "sha256-AXGRN3rs+CJlxyxF80FzPe8UDcZqg6jHrj12pyBs+gU=" }, { "pname": "Microsoft.IdentityModel.Protocols", - "version": "8.0.1", - "hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg=" + "version": "8.6.1", + "hash": "sha256-o+1L4GoUh94XKcUzTS/ECVoPIfVH/i84XN+wSmE75pg=" }, { "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", - "version": "8.0.1", - "hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0=" + "version": "8.6.1", + "hash": "sha256-H8ZkyYOR37DT09dbCU4khligNgUbIHfnHUiuaD5Kenw=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.0.1", - "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA=" + "version": "8.6.1", + "hash": "sha256-rB4Hg9FSlkiXireuZKYdVq9CcqmJa5YeTw+WMlSVnkQ=" }, { "pname": "Microsoft.IdentityModel.Validators", - "version": "8.0.1", - "hash": "sha256-5LTLbFNWz33nco+hyKAEHcQeAWaBugJ0oMKR6AuEI34=" + "version": "8.6.1", + "hash": "sha256-BDdJNDquVEplPJT3fYOakg26bSNyzNyUce+7mCjtc5o=" }, { - "pname": "Microsoft.SourceLink.Common", - "version": "8.0.0", - "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "8.0.14", + "hash": "sha256-TCO/TrAqfmDvJfO+oM80frwHtg4hzpGTZXkrR3UiuAc=" }, { - "pname": "Microsoft.SourceLink.GitHub", - "version": "8.0.0", - "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.14", + "hash": "sha256-MO52s0Y/7wkAhY4d+ecz1MT+xe7pMqchsakvcY8pWNA=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "8.0.14", + "hash": "sha256-QJeEGCWpGejHQiQVgnwUH60CxM9YPZfyuhywoVf/bE8=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "8.0.14", + "hash": "sha256-uVxJpshjquHLuWzFOA6gcWSB87U39dJw4y5MhmsPvoM=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.14", + "hash": "sha256-YeIjDhpNaO+7kWYZL0ZrbH+EX3inANNbd7m45cxDwLI=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "8.0.14", + "hash": "sha256-NBmDWdhOzIbS4KzGnndhWV5addf46B8/mn8j7BC/oDs=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.14", + "hash": "sha256-l8clUSsyExPwyZ7oO6Dl/K2Md1mnaNdVEe9G4716yCs=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "8.0.14", + "hash": "sha256-OrtH7sxUN+BKS+5LQJxto0QJkakQmFgfTgEyRp3bS2c=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "8.0.14", + "hash": "sha256-2S+TxQJfLtdpHZftM1YTENQYQpwH+ZWlmLSvwK51Ikk=" }, { "pname": "System.ClientModel", - "version": "1.0.0", - "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y=" + "version": "1.1.0", + "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.3", + "hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M=" + }, { "pname": "System.IdentityModel.Tokens.Jwt", - "version": "8.0.1", - "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" + "version": "8.6.1", + "hash": "sha256-vzwoEHRmUBnmlj77lFUZ/nD2oCEmY2rjwyaaXEZxuaU=" }, { "pname": "System.Interactive.Async", @@ -169,6 +239,11 @@ "version": "6.0.0", "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.3", + "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68=" + }, { "pname": "System.Linq.Async", "version": "6.0.1", @@ -179,6 +254,11 @@ "version": "1.0.2", "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" }, + { + "pname": "System.Memory.Data", + "version": "6.0.0", + "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", @@ -191,18 +271,33 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "4.7.2", - "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.3", + "hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE=" }, { "pname": "System.Text.Json", - "version": "4.7.2", - "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" + "version": "6.0.0", + "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" }, { "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.9", + "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.3", + "hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w=" }, { "pname": "System.Threading.Tasks.Extensions", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index ed1a40a268ad..102062f446d6 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,24 +8,24 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.58"; + version = "1.0.61"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-PP1Dko7/3Yx3evEyTRhHA85m6XztQiUt307LVZsCx64="; + hash = "sha256-Xvc/ECu/aIduHABZ08J3+iDgvOBs3vLCpzHJwfuLSp0="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; dotnetBuildFlags = [ "-f" - "net8.0" + "net9.0" ]; dotnetInstallFlags = dotnetBuildFlags; diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index f48a32f03216..ebfd7f0604ad 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + gitUpdater, nixosTests, }: @@ -20,6 +21,11 @@ stdenv.mkDerivation rec { ''; passthru = { + updateScript = gitUpdater { + url = "https://gerrit.googlesource.com/gerrit"; + rev-prefix = "v"; + allowedVersions = "^[0-9\\.]+$"; + }; # A list of plugins that are part of the gerrit.war file. # Use `java -jar gerrit.war ls | grep plugins/` to generate that list. plugins = [ diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix index a096a25db3e7..e644d316f253 100644 --- a/pkgs/by-name/gh/ghq/package.nix +++ b/pkgs/by-name/gh/ghq/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "ghq"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; - rev = "v${version}"; - sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo="; + tag = "v${version}"; + sha256 = "sha256-5BN96/RShfJpkfpJe0qrZVDuyFoAV9kgCiBv4REY/5Y="; }; vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec="; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 45d487615bf9..d140654911b9 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-LpD4zLAeLFod7sCNvBW8u9Wk0lL75OmlRXZqpQsQMOs="; + hash = "sha256-cIS6awIzGadeDdIfSmHKlL9NhouZwQAND7Au8zz0HJA="; }; - vendorHash = "sha256-YqjcPP4elzdwEVvYUcFBoPYWlFzeT+q2+pxNzgj1X0Q="; + vendorHash = "sha256-eBKTnuJk705oE//ejdwu/hi1hq8N88C6e4dEkKuM+5g="; ldflags = [ "-s" diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index bbf6b3592832..30f90db82be6 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "17.2.0"; + version = "17.10.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-a2Igy4DS3fYTvPW1vvDrH/DjMQ4lG9cm/P3mFr+y9s4="; + hash = "sha256-pLmDWZHxd9dNhmbcHJRBxPuY0IpcJoXz/fOJeP1lVlA="; }; - vendorHash = "sha256-1MwHss76apA9KoFhEU6lYiUACrPMGYzjhds6nTyNuJI="; + vendorHash = "sha256-1NteDxcGjsC0kT/9u7BT065EN/rBhaNznegdPHZUKxo="; # For patchShebangs nativeBuildInputs = [ bash ]; @@ -33,32 +33,43 @@ buildGoModule (finalAttrs: { '' # Remove some tests that can't work during a nix build - # Requires to run in a git repo + # Needs the build directory to be a git repo sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + rm shells/abstract_test.go # No writable developer environment - rm common/build_test.go rm common/build_settings_test.go + rm common/build_test.go rm executors/custom/custom_test.go - # No docker during build - rm executors/docker/terminal_test.go + # No Docker during build rm executors/docker/docker_test.go - rm helpers/docker/auth/auth_test.go rm executors/docker/services_test.go + rm executors/docker/terminal_test.go + rm helpers/docker/auth/auth_test.go + + # No Kubernetes during build + rm executors/kubernetes/feature_test.go + rm executors/kubernetes/kubernetes_test.go + rm executors/kubernetes/overwrites_test.go '' + lib.optionalString stdenv.buildPlatform.isDarwin '' + # Invalid bind arguments break Unix socket tests + sed -i "s/func TestRunnerWrapperCommand_createListener/func OFF_TestRunnerWrapperCommand_createListener/" commands/wrapper_test.go + # No keychain access during build breaks X.509 certificate tests - rm helpers/certificate/x509_test.go - rm network/client_test.go + sed -i "s/func TestCertificate/func OFF_TestCertificate/" helpers/certificate/x509_test.go + sed -i "s/func TestClientInvalidSSL/func OFF_TestClientInvalidSSL/" network/client_test.go ''; excludedPackages = [ - # CI helper script for pushing images to Docker and ECR registries + # Nested dependency Go module, used with go.mod replace directive # - # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139 - "./scripts/sync-docker-images" + # https://gitlab.com/gitlab-org/gitlab-runner/-/commit/57ea9df5d8a8deb78c8d1972930bbeaa80d05e78 + "./helpers/runner_wrapper/api" + # Helper scripts for upstream Make targets, not intended for downstream consumers + "./scripts" ]; ldflags = diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 0646e82f9032..3d9cc47f9bb9 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchurl, - fetchpatch, aqbanking, boost, cmake, @@ -30,12 +29,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.10"; + version = "5.11"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - hash = "sha256-eJ2fNpjuW4ZyAnmjo+EOd0QhDhLFJa5/A9MvpwQHrZM="; + hash = "sha256-a6QjE6qqmbXwf/bk28WLM/v19L5ukRN2cB1lwm/U3r4="; }; nativeBuildInputs = [ @@ -80,18 +79,6 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch - # this patch fixes the build against icu 76 - (fetchpatch { - name = "icu-76.patch"; - url = "https://github.com/Gnucash/gnucash/commit/579eed1facc0f7834ea70b1a342ebca0f125d788.patch"; - hash = "sha256-XzRPHDPxt2TfeqO48vaNEcfF58neVDMxVqkPKrG5xoM="; - }) - # fixes QIF imports: https://bugs.gnucash.org/show_bug.cgi?id=799492 - (fetchpatch { - name = "qif-import.patch"; - url = "https://github.com/Gnucash/gnucash/commit/6531d3e46b7bee1add61aa6c6aaf8fb1f889a586.patch"; - hash = "sha256-Lque2w9X9yencNVzI/DfuE3H2dN46yVNnbBdiEQE6/4="; - }) ]; # this needs to be an environment variable and not a cmake flag to suppress diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix index d22898102778..f363710a18d8 100644 --- a/pkgs/by-name/go/go-toml/package.nix +++ b/pkgs/by-name/go/go-toml/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.2.3"; + version = "2.2.4"; in buildGoModule { pname = "go-toml"; @@ -14,10 +14,10 @@ buildGoModule { owner = "pelletier"; repo = "go-toml"; rev = "v${version}"; - sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM="; + sha256 = "sha256-VKUrpSaGzkewNSyE0sB6PWVIQiraY7UxE5Wve+76UFk="; }; - vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI="; + vendorHash = null; excludedPackages = [ "cmd/gotoml-test-decoder" diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix index 6d1546d69f42..eb28baa3d818 100644 --- a/pkgs/by-name/go/goconst/package.nix +++ b/pkgs/by-name/go/goconst/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "goconst"; - version = "1.7.1"; + version = "1.8.0"; excludedPackages = [ "tests" ]; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "jgautheron"; repo = "goconst"; rev = "v${version}"; - sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y="; + sha256 = "sha256-pEkwEVnxZ7d10FE1CG5Ym9JBbzZl8mnabzdPg5gfKuo="; }; vendorHash = null; diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index b5768d407e9f..bfb4a6c57d22 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -12,18 +12,18 @@ }: stdenv.mkDerivation rec { pname = "google-lighthouse"; - version = "12.4.0"; + version = "12.5.1"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; tag = "v${version}"; - hash = "sha256-O5HBaL+NogrE7dWi3TI0C5t+kQcJ7YG6yxRWsYpE1vw="; + hash = "sha256-v4V4K77WC3InQ+jRlzw0JV8ehPF+hwWlnAt3P8yHMGU="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-Jy3KBsHIh/HctSze3We04aisBjq67LZt0Z+HrBdDeIs="; + hash = "sha256-qdOR7A8ku8qJyJ3rdzH1okt+P1aekGfdtZbxjYOqehA="; }; yarnBuildScript = "build-report"; diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index 449361d4fdee..22b72675f74b 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -16,27 +16,27 @@ let gpt-4o-tokenizer = fetchurl { url = "https://huggingface.co/Xenova/gpt-4o/resolve/31376962e96831b948abe05d420160d0793a65a4/tokenizer.json"; hash = "sha256-Q6OtRhimqTj4wmFBVOoQwxrVOmLVaDrgsOYTNXXO8H4="; - meta.license = lib.licenses.unfree; + meta.license = lib.licenses.mit; }; claude-tokenizer = fetchurl { url = "https://huggingface.co/Xenova/claude-tokenizer/resolve/cae688821ea05490de49a6d3faa36468a4672fad/tokenizer.json"; hash = "sha256-wkFzffJLTn98mvT9zuKaDKkD3LKIqLdTvDRqMJKRF2c="; - meta.license = lib.licenses.unfree; + meta.license = lib.licenses.mit; }; in rustPlatform.buildRustPackage rec { pname = "goose-cli"; - version = "1.0.15"; + version = "1.0.17"; src = fetchFromGitHub { owner = "block"; repo = "goose"; tag = "v${version}"; - hash = "sha256-9uIpwJaRpYvsWW8ysFQWgogp/4hh5b72+5dNwYQKrM8="; + hash = "sha256-l/lcwTNUq2xJHh0MKhnDZjRJ/5cANbdar/Vusf38esQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5qMciAnX34fbiV5Oy/+V3o7S3NwubxyRRNFXWcQK+kE="; + cargoHash = "sha256-1xKWzgptnM1ZP0nQXILBoaKVwL2FyXpldTUIa1ITQO0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index b6971a73f4dd..2f57022ee15d 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.68"; + version = "0.17.70"; in buildGoModule { pname = "gqlgen"; @@ -16,7 +16,7 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-zu9Rgxua19dZNLUeJeMklKB0C95E8UVWGu/I5Lkk66E="; + hash = "sha256-VpZQBmQKxqrWC9pD90V4hMO6mYgbCCbrenyCEbGTHtA="; }; vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk="; diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 84383c352580..4e9b416979d9 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -146,7 +146,6 @@ buildGoModule rec { maintainers = with maintainers; [ azahi flokli - emilylange hbjydev ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index 4ed069e3a31c..b7ae540a4696 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -1,49 +1,4 @@ { - lib, - fetchFromGitHub, - rustPlatform, python3Packages, - libiconv, }: - -python3Packages.buildPythonApplication rec { - pname = "granian"; - version = "1.7.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "emmett-framework"; - repo = "granian"; - rev = "v${version}"; - hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI="; - }; - - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]; - - buildInputs = [ - libiconv - ]; - - dependencies = [ - python3Packages.uvloop - python3Packages.click - ]; - - meta = { - description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; - homepage = "https://github.com/emmett-framework/granian"; - license = lib.licenses.bsd3; - mainProgram = "granian"; - maintainers = with lib.maintainers; [ lucastso10 ]; - platforms = lib.platforms.unix; - }; -} +python3Packages.toPythonApplication python3Packages.granian diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 951d7b453687..177d4fecddd3 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.9"; + version = "0.2.11"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-ORyczdynAAr2hYzXove/IXRngkRIhKgXLQg5VbvvGS8="; + hash = "sha256-KHM/r4zDJrZMIC7+Kp+98xhV5r4zkpxc1ffqf0jgnLs="; }; - vendorHash = "sha256-UY79Fex8hwaXtFLefBUeyO7PxJevWWaQU5MEOAMLPkA="; + vendorHash = "sha256-g3/WuLDb4mAzklT+nxQ1U/l+JDzSubENMB5hWjIaIIU="; subPackages = [ "cmd/greenmask/" ]; diff --git a/pkgs/by-name/gt/gtk-layer-shell/package.nix b/pkgs/by-name/gt/gtk-layer-shell/package.nix index 079f525bd712..195c4a56f236 100644 --- a/pkgs/by-name/gt/gtk-layer-shell/package.nix +++ b/pkgs/by-name/gt/gtk-layer-shell/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.9.0"; + version = "0.9.1"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY="; + hash = "sha256-TObAo/YgS6ObYrNLitxMwneGzLxwnnBIOhBVAeAzbt4="; }; strictDeps = true; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 9f39d078b7b5..2f6765b866ab 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-y1DjkHGTXQPLot/sdUQ6nP3cf29yFJa1vUjlQQTcUwY="; + hash = "sha256-g+noAc+vKli2T8C2EAK4ejw/2DWZPhtKbezyt53iHYg="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-1ofAsWckkI1AvMat28ZqWLZh2dHwalBW7kw7tBrebQ8="; + cargoHash = "sha256-Ql1WdwDnXBC4JHO/uzJJlacQC44bOaHo2i3M9atjf3I="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index e7b26d6214b1..704a7415e350 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; tag = "v${version}"; - hash = "sha256-zZiBVuA6rjsCfn0Ih3Sum0VsmtyXbfPG9fwK2zkwJaA="; + hash = "sha256-SXsCJzKfm77/IH3H7L5STylusmlN9DN4xd12Vt6L3TM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-j84DF6LJ9q56u4QgMFk9c6089Ghk5K0EatvonGjImjU="; + cargoHash = "sha256-SwqajiyYrN0VTGtQo9+Tux8sBvEmWzOQQknQ9zTQ0hY="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix index 6ae12bfda411..d7a3df6d6053 100644 --- a/pkgs/by-name/he/hercules/package.nix +++ b/pkgs/by-name/he/hercules/package.nix @@ -61,8 +61,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "crypto"; - rev = "a5096e5dd79f46b568806240c0824cd8cb2fcda2"; - hash = "sha256-VWjM8WxPMynyW49Z8U/r6SsF7u7Xbk7Dd0gR35lIw28="; + rev = "9ac58405c2b91fb7cd230aed474dc7059f0fcad9"; + hash = "sha256-hWNowhKP26+HMIL4facOCrZAJ1bR0rRTRc+2R9AM2cc="; }; }); @@ -71,8 +71,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "decNumber"; - rev = "3aa2f4531b5fcbd0478ecbaf72ccc47079c67280"; - hash = "sha256-PfPhnYUSIw1sYiGRM3iHRTbHHbQ+sK7oO12pH/yt+MQ="; + rev = "995184583107625015bb450228a5f3fb781d9502"; + hash = "sha256-3PAJ+HZasf3fr6F1cmqIk+Jjv3Gzkki7AFrAHBaEATo="; }; }); @@ -81,8 +81,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "SoftFloat"; - rev = "4b0c326008e174610969c92e69178939ed80653d"; - hash = "sha256-DEIT5Xk6IqUXCIGD2Wj0h9xPOR0Mid2Das7aKMQMDaM="; + rev = "e053494d988ec0648c92f683abce52597bfae745"; + hash = "sha256-1UCRYzf24U3zniKnatPvYKSmTEsx3YCrtv1tBR5lvw8="; }; }); @@ -91,8 +91,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "telnet"; - rev = "729f0b688c1426018112c1e509f207fb5f266efa"; - hash = "sha256-ED0Cl+VcK6yl59ShgJBZKy25oAFC8eji36pNLwMxTM0="; + rev = "384b2542dfc9af67ca078e2bc13487a8fc234a3f"; + hash = "sha256-dPgLK7nsRZsqY4fVMdlcSHKC2xkGdNmayyK2FW5CNiI="; }; }); @@ -108,13 +108,13 @@ let in stdenv.mkDerivation rec { pname = "hercules"; - version = "4.7"; + version = "4.8"; src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "hyperion"; rev = "Release_${version}"; - hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM"; + hash = "sha256-3Go5m4/K8d4Vu7Yi8ULQpX83d44fu9XzmG/gClWeUKo="; }; postPatch = '' diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix index ed160a6a1823..3859f013e290 100644 --- a/pkgs/by-name/he/heynote/package.nix +++ b/pkgs/by-name/he/heynote/package.nix @@ -7,11 +7,11 @@ }: let pname = "heynote"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage"; - sha256 = "sha256-O8loDE2GzXQofh3iNQeP5OAWh7i0QCSxl4I++ERcjbU="; + sha256 = "sha256-nei4akpXA5MWpQSL/oIcwfNILTKE3lwSi1ij68FMMtQ="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index a57e4d65794f..2feeef5c1829 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,15 +2,16 @@ lib, appimageTools, fetchurl, + version ? "0.9.9.23", + hash ? "sha256-BTHiLTgLqtUCuxnpPeI5nwe8tYMp+uxFKm01qHnC8A0=", }: let - version = "0.9.9.19"; pname = "hifile"; src = fetchurl { url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; - hash = "sha256-WrPNH7N8nYr/zd6RGsX3mL1P+nYUzXMPgIoBtC6tGo0="; + inherit hash; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/hi/hifile/update.sh b/pkgs/by-name/hi/hifile/update.sh index 95a0ae8440db..e65e3cb7f7f6 100755 --- a/pkgs/by-name/hi/hifile/update.sh +++ b/pkgs/by-name/hi/hifile/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl nix-update latestVersion=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '

All downloads

' | grep -m 1 '
  • .*AppImage.*' | sed -n 's/.*HiFile-\([0-9.]*\)\.AppImage.*/\1/p') currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hifile.version" | tr -d '"') @@ -13,10 +13,4 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then fi -prefetch=$(nix-prefetch-url "https://www.hifile.app/files/HiFile-$latestVersion.AppImage") -hash=$(nix-hash --type sha256 --to-sri "$prefetch") - -update-source-version hifile 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="x86_64-linux" -update-source-version hifile "$latestVersion" "$hash" --system="x86_64-linux" - - +nix-update hifile --version $latestVersion diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index ca3ad3eb69a6..165d09db6700 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -21,7 +21,7 @@ }: let - version = "3.6.11"; + version = "3.6.12"; icon = fetchurl { url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; - hash = "sha256-ZQNJm7xbOdVSnxtx4krOnM9QBsxibFXo8wx1fCn1gJA="; + hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E="; }; dontUnpack = true; diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch index 5634f03dfb79..2320b53976cf 100644 --- a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch +++ b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch @@ -12,21 +12,20 @@ Signed-off-by: Christoph Heiss 3 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 patches/sass-embedded.patch -diff --git a/package.json b/package.json -index 87e57b9..723e0b6 100644 ---- a/package.json -+++ b/package.json -@@ -28,5 +28,10 @@ - "vite-plugin-pwa": "^0.21.1" - }, +diff --git i/package.json w/package.json +index 897b42e..7a91a85 100644 +--- i/package.json ++++ w/package.json +@@ -32,6 +32,9 @@ "license": "Apache-2.0", -- "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0" -+ "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0", -+ "pnpm": { + "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af", + "pnpm": { +- "neverBuiltDependencies": [] ++ "neverBuiltDependencies": [], + "patchedDependencies": { + "sass-embedded": "patches/sass-embedded.patch" + } -+ } + } } diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch new file mode 100644 @@ -49,10 +48,10 @@ index 0000000..f941a8e + const platform = process.platform === 'linux' && isLinuxMusl(process.execPath) + ? 'linux-musl' + : process.platform; -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index f347757..d054bea 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml +diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml +index 5df58fb..bb27c4b 100644 +--- i/pnpm-lock.yaml ++++ w/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false @@ -65,80 +64,79 @@ index f347757..d054bea 100644 importers: .: -@@ -26,7 +31,7 @@ importers: - devDependencies: +@@ -29,7 +34,7 @@ importers: + version: 9.21.0 '@vitejs/plugin-vue': specifier: ^5.2.1 -- version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13) -+ version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13) +- version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13) ++ version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13) '@vue/eslint-config-prettier': specifier: ^10.2.0 - version: 10.2.0(eslint@9.19.0)(prettier@3.4.2) -@@ -44,13 +49,13 @@ importers: - version: 3.4.2 + version: 10.2.0(eslint@9.21.0)(prettier@3.5.2) +@@ -50,13 +55,13 @@ importers: + version: 3.5.2 sass-embedded: - specifier: ^1.83.4 -- version: 1.83.4 -+ version: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) + specifier: ^1.85.0 +- version: 1.85.0 ++ version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) vite: - specifier: ^6.0.11 -- version: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) -+ version: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) + specifier: ^6.1.3 +- version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) ++ version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) vite-plugin-pwa: specifier: ^0.21.1 -- version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0) -+ version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0) +- version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0) ++ version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0) packages: -@@ -3683,9 +3688,9 @@ snapshots: +@@ -3477,9 +3482,9 @@ snapshots: '@types/trusted-types@2.0.7': {} -- '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)': -+ '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)': +- '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)': ++ '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)': dependencies: -- vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) -+ vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) +- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) ++ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) vue: 3.5.13 '@vue/compiler-core@3.5.13': -@@ -4965,7 +4970,7 @@ snapshots: - sass-embedded-win32-x64@1.83.4: +@@ -4702,7 +4707,7 @@ snapshots: + sass-embedded-win32-x64@1.85.0: optional: true -- sass-embedded@1.83.4: -+ sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): +- sass-embedded@1.85.0: ++ sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): dependencies: - '@bufbuild/protobuf': 2.2.0 + '@bufbuild/protobuf': 2.2.3 buffer-builder: 0.2.0 -@@ -5286,18 +5291,18 @@ snapshots: +@@ -5001,25 +5006,25 @@ snapshots: varint@6.0.0: {} -- vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0): -+ vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0): +- vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0): ++ vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0): dependencies: - debug: 4.3.7 + debug: 4.4.0 pretty-bytes: 6.1.1 - tinyglobby: 0.2.10 -- vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) -+ vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) - workbox-build: 7.1.0 - workbox-window: 7.1.0 + tinyglobby: 0.2.12 +- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) ++ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) + workbox-build: 7.3.0 + workbox-window: 7.3.0 transitivePeerDependencies: - supports-color -- vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0): -+ vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0): +- vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0): ++ vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0): dependencies: esbuild: 0.24.2 - postcss: 8.5.1 -@@ -5305,7 +5310,7 @@ snapshots: + postcss: 8.5.3 + rollup: 4.38.0 optionalDependencies: fsevents: 2.3.3 - sass: 1.79.5 -- sass-embedded: 1.83.4 -+ sass-embedded: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) - terser: 5.37.0 +- sass-embedded: 1.85.0 ++ sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) + terser: 5.39.0 yaml: 2.7.0 diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index eaad9c42bd8f..0579e37fbd94 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -10,12 +10,12 @@ }: stdenvNoCC.mkDerivation rec { pname = "homer"; - version = "25.02.1"; + version = "25.04.1"; src = fetchFromGitHub { owner = "bastienwirtz"; repo = "homer"; rev = "v${version}"; - hash = "sha256-Fh6qV2eU7VRskbPun7OcJmqgjILVE8w5lV70xH6znmc="; + hash = "sha256-hvDrFGv6Mht9whA2lJbDLQnP2LkOiCo3NtjMpWr/q6A="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { src patches ; - hash = "sha256-qeMmPI2B5FW82qLVtbREDjQh76THMCOZRQCM0DgvCqI="; + hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y="; }; # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable. diff --git a/pkgs/by-name/ho/hours/package.nix b/pkgs/by-name/ho/hours/package.nix new file mode 100644 index 000000000000..48c2ab726889 --- /dev/null +++ b/pkgs/by-name/ho/hours/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "hours"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "dhth"; + repo = "hours"; + tag = "v${finalAttrs.version}"; + hash = "sha256-B9M02THTCrr7ylbbflpkpTFMuoIwV2O0PQKOKbyxYPg="; + }; + + vendorHash = "sha256-5lhn0iTLmXUsaedvtyaL3qWLosmQaQVq5StMDl7pXXI="; + + doCheck = !stdenv.hostPlatform.isDarwin; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "No-frills time tracking toolkit for command line nerds"; + homepage = "https://github.com/dhth/hours"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ilarvne ]; + platforms = lib.platforms.unix; + mainProgram = "hours"; + }; +}) diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index c1458d5b16b9..e8734388ad8c 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.46.6"; + version = "0.46.7"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = version; - hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM="; + hash = "sha256-GSYkgDDDkvQnuW8zeLL703L8tlgklhB3OKulJdmrRoY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dIF3Qi8rK+H07x4uhi8uXs1Pdr8p3KIkVUrXqEQpCsc="; + cargoHash = "sha256-UxOm6G0hQfi7L49YQEshfNkPMy7LPNX2VBg0F9uLMiY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 7e2c45fd4c40..84ae45ccbb6a 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -47,7 +47,6 @@ fetchFromGitHub, nixosTests, unstableGitUpdater, - nixVersions, }: let @@ -80,6 +79,7 @@ let CryptRandPasswd DBDPg DBDSQLite + DBIxClassHelpers DataDump DateTime DigestSHA1 @@ -122,34 +122,21 @@ let UUID4Tiny XMLSimple YAML - nix.perl-bindings + (nix.libs.nix-perl-bindings or nix.perl-bindings) git ]; }; - nix-eval-jobs' = - (nix-eval-jobs.override { - nix = nixVersions.nix_2_25; - }).overrideAttrs - (_: { - version = "2.25.0-unstable-2025-02-13"; - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nix-eval-jobs"; - rev = "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7"; - hash = "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA="; - }; - }); in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-04-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "c6f98202cd1b091475ae51b6a093d00b4c8060d4"; - hash = "sha256-CEDUtkA005PiLt1wSo3sgmxfxUBikQSE74ZudyWNxfE="; + rev = "1c52c4c0ed596ea71de370562ed5af1604bd2183"; + hash = "sha256-pcZA2SA7nskxsvDYp3nzF5V258b67YrZONv9G3PhLCE="; }; outputs = [ @@ -182,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { subversion openssh nix - nix-eval-jobs' + nix-eval-jobs coreutils findutils pixz @@ -220,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales python3 libressl.nc - nix-eval-jobs' + nix-eval-jobs openldap postgresql ]; @@ -257,7 +244,7 @@ stdenv.mkDerivation (finalAttrs: { --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} \ - --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs'.name or "unknown"} + --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs.name or "unknown"} done ''; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index a695361fca0a..bb1930f77332 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprgraphics"; tag = "v${finalAttrs.version}"; - hash = "sha256-U62Fo0w+aIXBAsSSYsfDsoe3YmoxWMArJ7pN2HNOAqo="; + hash = "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 4159f9ab4552..74d105fafb7c 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-U+8HOPgfrNkFEadoyB9GXSPPFW/Uytvb3TxyqW3JOw4="; + hash = "sha256-KTRgq+0rMBz31AAjrDvQprPHbVobCwIo9+gkcUujglw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index a818df4cdef6..9591ae16b4d0 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14="; + hash = "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index 59a4f509feac..0f8399f9e4a5 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -8,7 +8,6 @@ openssl, upnpSupport ? true, miniupnpc, - aesniSupport ? stdenv.hostPlatform.aesSupport, }: stdenv.mkDerivation rec { @@ -37,14 +36,9 @@ stdenv.mkDerivation rec { installShellFiles ]; - makeFlags = - let - ynf = a: b: a + "=" + (if b then "yes" else "no"); - in - [ - (ynf "USE_AESNI" aesniSupport) - (ynf "USE_UPNP" upnpSupport) - ]; + makeFlags = [ + "USE_UPNP=${if upnpSupport then "yes" else "no"}" + ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 22e540f1182c..a7e1c389581d 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.27.1"; + version = "1.27.2"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; tag = "v${version}"; - hash = "sha256-gJ1Vx0p8GiJ4esJuOanojlCHvqzOz8ttgAVn6idrLPM="; + hash = "sha256-XRQadI2NCtjJ02uRoigDP92TmfAUoItmG42fM3QE6kI="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix index 400eec45f1a8..ecca1b5159a5 100644 --- a/pkgs/by-name/il/ilmbase/package.nix +++ b/pkgs/by-name/il/ilmbase/package.nix @@ -3,16 +3,17 @@ lib, buildPackages, cmake, - openexr, + # explicitely depending on openexr_2 because ilmbase doesn't exist for v3 + openexr_2, }: stdenv.mkDerivation { pname = "ilmbase"; - version = lib.getVersion openexr; + version = lib.getVersion openexr_2; # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. - inherit (openexr) src patches; + inherit (openexr_2) src patches; outputs = [ "out" @@ -37,5 +38,6 @@ stdenv.mkDerivation { homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; + insecure = true; }; } diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index e230987a0e9e..01138c9e3517 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "n0-computer"; repo = "iroh"; rev = "v${version}"; - hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE="; + hash = "sha256-kOqmkuKOP2dWrUVaGwHckWjaFVZkSoXqqUgn+2KaWkc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7tQbfXVdgoxACF6qtesbUQ3AtVFAI2IbGO720PjwZCc="; + cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix index 5b97c7225290..3b62b7f45950 100644 --- a/pkgs/by-name/ir/irqbalance/package.nix +++ b/pkgs/by-name/ir/irqbalance/package.nix @@ -7,6 +7,8 @@ glib, ncurses, libcap_ng, + enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, + systemdMinimal, }: stdenv.mkDerivation rec { @@ -24,21 +26,27 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = [ - glib - ncurses - libcap_ng - ]; + buildInputs = + [ + glib + ncurses + libcap_ng + ] + ++ (lib.optionals enableSystemd [ + systemdMinimal + ]); - LDFLAGS = "-lncurses"; + configureFlags = lib.optionals enableSystemd [ + "--with-systemd" + ]; postInstall = '' # Systemd service - mkdir -p $out/lib/systemd/system - grep -vi "EnvironmentFile" misc/irqbalance.service >$out/lib/systemd/system/irqbalance.service - substituteInPlace $out/lib/systemd/system/irqbalance.service \ - --replace /usr/sbin/irqbalance $out/bin/irqbalance \ - --replace ' $IRQBALANCE_ARGS' "" + mkdir -p "$out/lib/systemd/system" + grep -vi "EnvironmentFile" misc/irqbalance.service >"$out/lib/systemd/system/irqbalance.service" + substituteInPlace "$out/lib/systemd/system/irqbalance.service" \ + --replace-fail /usr/sbin/irqbalance "$out/bin/irqbalance --journal" \ + --replace-fail ' $IRQBALANCE_ARGS' "" ''; meta = with lib; { diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix index 9247d8596b47..930b8fb38aef 100644 --- a/pkgs/by-name/it/itgmania/package.nix +++ b/pkgs/by-name/it/itgmania/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "itgmania"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "itgmania"; repo = "itgmania"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-GzpsyyjR7NhgCQ9D7q8G4YU7HhV1C1es1C1355gHnV8="; + hash = "sha256-OGOvC7/NmEsWXVw4bFjqdT/Hg3Ypbwct//uWuW3/f1o="; }; nativeBuildInputs = [ @@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Fork of StepMania 5.1, improved for the post-ITG community"; platforms = lib.platforms.linux; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ftsimas ]; + maintainers = with lib.maintainers; [ + ftsimas + maxwell-lt + ]; mainProgram = "itgmania"; }; }) diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index c99ebe9e3c4d..3de35f8e43a2 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "yamafaktory"; repo = "jql"; rev = "jql-v${version}"; - hash = "sha256-J+Zqmfev2DyD0SLFGaI0egVgmEC+a2nqBrNDGX4zNnE="; + hash = "sha256-0sQEC2kUnuuKp73DJsNBFB0VL0rkBkudmr7ZQpS1v04="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tMxy0bi3518VjzJuy4Agpq+UydMEyJRqavX5kIsBYjY="; + cargoHash = "sha256-10eM7tczFoQVYagyP1btsCp4PHm+zRoh2oAEVVxsROA="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 61d5cd071ced..14af7bc7b2f8 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-LDMHMFg9fjEMi8I2Fc3TEyWMctqJurAbckubCgkkZiM="; + hash = "sha256-EAD40ZZr6VK4w9OuYzx2YcVgOODopF7IWN7GVjTlblE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-y/GQSzI7bVPieuAmQKdZY1qticmmRYibBtgXSEJ7dU4="; + cargoHash = "sha256-WOzzBhZLV4kfsmTGreg1m+sPcDjznB4Kh8ONVNZkp5A="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index aaa3a3cca342..7c33e7e0b9eb 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -10,19 +10,19 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; + hash = "sha256-14yFGa8y8w3wbCmx0JOSN0TShXLZZpTdVynEfUKkjuE="; }; sourceRoot = "${src.name}/kclvm"; useFetchCargoVendor = true; - cargoHash = "sha256-xQgCiNt0lUvB5XmVB45l0GuIiVp5Jm6dZY7396Rsnqw="; + cargoHash = "sha256-o7YFyqRWAMjq23mcAqDrcN4infdBgp1KNvviYOLR35s="; buildInputs = [ rustc ] diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index b508947814e0..d58fef547d01 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fftwFloat, chafa, + curl, glib, libopus, opusfile, @@ -13,24 +14,25 @@ libogg, pkg-config, versionCheckHook, - gitUpdater, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "kew"; - version = "3.0.3"; + version = "3.1.2"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; tag = "v${finalAttrs.version}"; - hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc="; + hash = "sha256-64xdxRx4OanAcLgir9N7p/q71+gQYhffnWnxZzz93h8="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwFloat.dev chafa + curl.dev glib.dev libopus opusfile @@ -51,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; passthru = { - updateScript = gitUpdater { }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index a191e193905d..889edefebdbb 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.11.1"; + version = "4.11.4"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; - rev = finalAttrs.version; - hash = "sha256-Dq9oyCMMXWBDxX2Bj/IsrjBIxREwMQ12F5/SJ+sQfNY="; + tag = finalAttrs.version; + hash = "sha256-H2JdGfS+MMh6EDac2bjfcCtjdDSobClAgsqYbZYuSAo="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/by-name/ko/kopia-ui/fix-paths.patch b/pkgs/by-name/ko/kopia-ui/fix-paths.patch new file mode 100644 index 000000000000..22744100099e --- /dev/null +++ b/pkgs/by-name/ko/kopia-ui/fix-paths.patch @@ -0,0 +1,42 @@ +diff --git a/public/utils.js b/public/utils.js +index 3cd38b63..54152694 100644 +--- a/public/utils.js ++++ b/public/utils.js +@@ -17,7 +17,7 @@ const osShortName = function () { + + export function iconsPath() { + if (!app.isPackaged) { +- return path.join(__dirname, "..", "resources", osShortName, "icons"); ++ return path.join(__dirname, "..", "..", "icons"); + } + + return path.join(process.resourcesPath, "icons"); +@@ -25,26 +25,14 @@ export function iconsPath() { + + export function publicPath() { + if (!app.isPackaged) { +- return path.join(__dirname, "..", "public"); ++ return path.join(__dirname, "..", "..", "public"); + } + + return process.resourcesPath; + } + + export function defaultServerBinary() { +- if (!app.isPackaged) { +- return { +- "mac": path.join(__dirname, "..", "..", "dist", "kopia_darwin_amd64", "kopia"), +- "win": path.join(__dirname, "..", "..", "dist", "kopia_windows_amd64", "kopia.exe"), +- "linux": path.join(__dirname, "..", "..", "dist", "kopia_linux_amd64", "kopia"), +- }[osShortName] +- } +- +- return { +- "mac": path.join(process.resourcesPath, "server", "kopia"), +- "win": path.join(process.resourcesPath, "server", "kopia.exe"), +- "linux": path.join(process.resourcesPath, "server", "kopia"), +- }[osShortName] ++ return "KOPIA" + } + export function selectByOS(x) { + return x[osShortName] diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix new file mode 100644 index 000000000000..0a74ec1bc8c5 --- /dev/null +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -0,0 +1,94 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron, + copyDesktopItems, + makeDesktopItem, + nix-update-script, + makeWrapper, + kopia, +}: +let + version = "0.19.0"; + src = fetchFromGitHub { + owner = "kopia"; + repo = "kopia"; + tag = "v${version}"; + hash = "sha256-PfxMs9MwoI+4z8vZ1sVlIEal3TOmA06997jWwShNfrE="; + }; +in +buildNpmPackage { + pname = "kopia-ui"; + inherit version src; + + sourceRoot = "${src.name}/app"; + + npmDepsHash = "sha256-3K5dwAQeAo98rz2gxGw3k/D+VkDJNe5pmAyEo4boetU="; + makeCacheWritable = true; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteInPlace public/utils.js --replace-fail KOPIA ${lib.getExe kopia} + ''; + + buildPhase = '' + runHook preBuild + cp -r ${electron.dist} electron-dist + chmod -R u+w .. + npm exec electron-builder -- \ + --dir \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} \ + -c.extraMetadata.version=v${version} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/kopia + cp -r ../dist/kopia-ui/*-unpacked/{locales,resources{,.pak}} $out/share/kopia + install -Dm644 $src/icons/kopia.svg $out/share/icons/hicolor/scalable/apps/kopia.svg + makeWrapper ${lib.getExe electron} $out/bin/kopia-ui \ + --prefix PATH : ${lib.makeBinPath [ kopia ]} \ + --add-flags $out/share/kopia/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "kopia-ui"; + type = "Application"; + desktopName = "KopiaUI"; + comment = "Fast and secure open source backup."; + icon = "kopia-ui"; + exec = "kopia-ui"; + categories = [ "Utility" ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; + mainProgram = "kopia-ui"; + homepage = "https://kopia.io"; + downloadPage = "https://github.com/kopia/kopia"; + changelog = "https://github.com/kopia/kopia/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ blenderfreaky ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index af32830388e7..9f419bb5e0ff 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kor"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-VK5G8J851rsIEt2ljrTWFPCxhIBTgLkMlEMVb9kJcOs="; + hash = "sha256-jqP2GsqliltjabbHDcRseMz7TOWl9YofAG/4Y7ADub8="; }; - vendorHash = "sha256-iJtZ/t4VCVPqMKwV7jCKwqxitkZ/pTlP6mz9ElGcSsY="; + vendorHash = "sha256-HZS1PPlra1uGBuerGs5X9poRzn7EGhTopKaC9tkhjlo="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix index 30e5da39200f..d6873e804dc6 100644 --- a/pkgs/by-name/ku/kubelogin-oidc/package.nix +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.32.2"; + version = "1.32.3"; src = fetchFromGitHub { owner = "int128"; repo = "kubelogin"; - rev = "v${version}"; - hash = "sha256-fX0Hjb0j6KbdGuFdy5MaZc3zL/EOVXFTTNlIUQZjnsc="; + tag = "v${version}"; + hash = "sha256-ZmNiFO1YGZC+vxpeliNuXfL8Azy2YmLgKqga/a3/9U8="; }; subPackages = [ "." ]; @@ -22,7 +22,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-93B2TzptvXNevNLGGpWhUoLfefwb6uFk7tObnEf2wNg="; + vendorHash = "sha256-b8d06JhapPF8HwP1twgkcSR6RzM9x1G4zW3YBqmM3YM="; # test all packages preCheck = '' diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index ed290491877c..aa9d0843fabc 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -168,16 +168,16 @@ }, { "name": "illuminate/collections", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "0094b162fa505126c1391222f27fd98734d24525" + "reference": "f1d8ae882c014673b1f7bedab6435989553776e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/0094b162fa505126c1391222f27fd98734d24525", - "reference": "0094b162fa505126c1391222f27fd98734d24525", + "url": "https://api.github.com/repos/illuminate/collections/zipball/f1d8ae882c014673b1f7bedab6435989553776e3", + "reference": "f1d8ae882c014673b1f7bedab6435989553776e3", "shasum": "" }, "require": { @@ -220,20 +220,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-16T23:50:18+00:00" + "time": "2025-04-03T17:58:47+00:00" }, { "name": "illuminate/conditionable", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d" + "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d", - "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/251ef166c6ee46cc8a141403253f83fe7ee50507", + "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507", "shasum": "" }, "require": { @@ -266,20 +266,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-02-19T19:08:33+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/contracts", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6" + "reference": "bbaec083da240396f2186f4c3a9952da207f28a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/88962e0a73fb837e048ebdbbc67afd2f6b30e8e6", - "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/bbaec083da240396f2186f4c3a9952da207f28a0", + "reference": "bbaec083da240396f2186f4c3a9952da207f28a0", "shasum": "" }, "require": { @@ -314,20 +314,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-16T23:56:53+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/filesystem", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857" + "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/e59cfec3c16d71be2da85cf9385ddd82f0c15857", - "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/4fa2995bad173c1a0067b285bb7fef47a4b441c6", + "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6", "shasum": "" }, "require": { @@ -381,11 +381,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-12T14:22:47+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/macroable", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -431,16 +431,16 @@ }, { "name": "illuminate/support", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57" + "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/bcba98dcdbc758261b3b872a9b9dc789aed1eb57", - "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57", + "url": "https://api.github.com/repos/illuminate/support/zipball/1d5d07534bb2d9f16e655c2cb99607517ad43e8f", + "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f", "shasum": "" }, "require": { @@ -504,7 +504,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-13T14:51:35+00:00" + "time": "2025-04-02T19:35:42+00:00" }, { "name": "laravel/prompts", @@ -567,16 +567,16 @@ }, { "name": "nesbot/carbon", - "version": "3.8.6", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd" + "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd", - "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d", + "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d", "shasum": "" }, "require": { @@ -669,7 +669,7 @@ "type": "tidelift" } ], - "time": "2025-02-20T17:33:38+00:00" + "time": "2025-03-27T12:57:33+00:00" }, { "name": "psr/clock", @@ -899,16 +899,16 @@ }, { "name": "symfony/console", - "version": "v7.2.1", + "version": "v7.2.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" + "reference": "e51498ea18570c062e7df29d05a7003585b19b88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", + "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88", + "reference": "e51498ea18570c062e7df29d05a7003585b19b88", "shasum": "" }, "require": { @@ -972,7 +972,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.2.1" + "source": "https://github.com/symfony/console/tree/v7.2.5" }, "funding": [ { @@ -988,7 +988,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T03:49:26+00:00" + "time": "2025-03-12T08:11:12+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1517,16 +1517,16 @@ }, { "name": "symfony/process", - "version": "v7.2.4", + "version": "v7.2.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf" + "reference": "87b7c93e57df9d8e39a093d32587702380ff045d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", + "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d", + "reference": "87b7c93e57df9d8e39a093d32587702380ff045d", "shasum": "" }, "require": { @@ -1558,7 +1558,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.2.4" + "source": "https://github.com/symfony/process/tree/v7.2.5" }, "funding": [ { @@ -1574,7 +1574,7 @@ "type": "tidelift" } ], - "time": "2025-02-05T08:33:46+00:00" + "time": "2025-03-13T12:21:46+00:00" }, { "name": "symfony/service-contracts", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index 1608936e9aa1..4e673700be57 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -7,19 +7,19 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.14.1"; + version = "5.14.2"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-3DgiOybYN9G8BONK7kmyO21B5WqeY7DcHunWcT6h124="; + hash = "sha256-A/uyYi2CAlj8ozX65frCM32kNM2kZ/FpV1ZHr6UXWWY="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-6oPbR6cpsdr2aJWjJvLWVD1NfuZF38sUMJEdBAjl/aA="; + vendorHash = "sha256-yj0AfN+jCDMtuAQ69yEyI+dGTHgeRNGj86YnvKVKkqQ="; # Adding npm (nodejs) and php composer to path postInstall = '' diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index e4d904894c0c..e7ec4e9f6393 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1615"; + version = "1638"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-1opYdV4nszLSuHNCo0HuURuPYby8oVGXwQvDd68mDOM="; + hash = "sha256-lOdXlAoLSrUb32GohfQGvmtwQsKDFGH4ImYMi8EZqU0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/layan-cursors/package.nix b/pkgs/by-name/la/layan-cursors/package.nix new file mode 100644 index 000000000000..c74853a85914 --- /dev/null +++ b/pkgs/by-name/la/layan-cursors/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "layan-cursors"; + version = "2021-08-01"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "Layan-cursors"; + tag = finalAttrs.version; + hash = "sha256-Izc5Q3IuM0ryTIdL+GjhRT7JKbznyxS2Fc4pY5dksq4="; + }; + + installPhase = '' + runHook preInstall + + install -dm 0755 $out/share/icons + cp -R dist $out/share/icons/layan-cursors + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cursor theme inspired by layan gtk theme and based on capitaine-cursors"; + changelog = "https://github.com/vinceliuice/Layan-cursors/releases/tag/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/vinceliuice/Layan-cursors/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ idlip ]; + }; + +}) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index f8ad9df8f55f..59306559958e 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -4,7 +4,13 @@ cmake, fetchFromGitHub, tbb_2021_11, - useTBB ? true, + + # Until we have a release with + # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those + # PRs are patched onto this current release. Even then, I think we + # still need to disable for MinGW build because + # https://github.com/BLAKE3-team/BLAKE3/issues/467 + useTBB ? false, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index fce99820962a..95822525c670 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.158.0"; + version = "1.159.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-0po4nPCunq9cBaVFSsS1uo18dv6Y6IHGzL1zC2zwXdI="; + hash = "sha256-Pdrb2A4OhW2+XsBuwTQfIjZms9byaMg/KV2fGWD35/w="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-k8TN6YtCVPR8RnFoiGX9APvKwpQzj7T53DlKMD9r/e0="; + hash = "sha256-5xihycfIdZ/DINoKZ7kiRB46xKyEB4aAQz2OkejoXJc="; }; nativeBuildInputs = diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index e9860f5867f2..0a91d21f128e 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -12,7 +12,7 @@ libpng, libwebp, gdk-pixbuf, - openexr_3, + openexr, pkg-config, makeWrapper, zlib, @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libpng libwebp gdk-pixbuf - openexr_3 + openexr zlib ]; diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix index 98a9ee3cff59..0905289e695c 100644 --- a/pkgs/by-name/li/libmaddy-markdown/package.nix +++ b/pkgs/by-name/li/libmaddy-markdown/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "libmaddy-markdown"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "progsource"; repo = "maddy"; tag = finalAttrs.version; - hash = "sha256-sVUXACT94PSPcohnOyIp7KK8baCBuf6ZNMIyk6Cfdjg="; + hash = "sha256-cc0RggNYn0wZpeCn5QU9C+sqv7CTJkiQVB3LSQ/3YQw="; }; dontBuild = true; diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index c1ed853b834f..c3b8c302b84c 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "libmamba-${finalAttrs.version}"; - hash = "sha256-o5shAmsplJS2WZ4HhAt1U27KqUheVxZTkjlyxR7EYxI="; + tag = finalAttrs.version; + hash = "sha256-7YR3ToPz80I9d1pRNiEaoIacVyaz2mqzdm0h5WGSb2g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix index f3fa7d72f1c6..8f38eaf8847e 100644 --- a/pkgs/by-name/li/libphidget22/package.nix +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -7,7 +7,7 @@ }: let # This package should be updated together with libphidget22extra - version = "1.21.20241122"; + version = "1.22.20250324"; in stdenv.mkDerivation { pname = "libphidget22"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz"; - hash = "sha256-6Sib9CSaPUbAdyHfoSgQ6g4oik7+pjb7g79QftSeVIk="; + hash = "sha256-FR/+b4z73LtGQdT4gypre9SZmZSiWzP/Q+00uia1lhA="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/li/libphidget22extra/package.nix b/pkgs/by-name/li/libphidget22extra/package.nix index 1072b798b42f..ffe239d5570e 100644 --- a/pkgs/by-name/li/libphidget22extra/package.nix +++ b/pkgs/by-name/li/libphidget22extra/package.nix @@ -9,7 +9,7 @@ let # This package should be updated together with libphidget22 - version = "1.21.20241122"; + version = "1.22.20250324"; in stdenv.mkDerivation { pname = "libphidget22extra"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra/libphidget22extra-${version}.tar.gz"; - hash = "sha256-l8lwEpdR87U2pb0jOAkrI/157B+87QvSVtAtOfedaBo="; + hash = "sha256-8FTd/hyqzZKWN68FAxrV1N0pPglNAbZ/aRH4V6hEgBM="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix index 8ef17056ad05..5eb9d2763e7d 100644 --- a/pkgs/by-name/li/libresplit/package.nix +++ b/pkgs/by-name/li/libresplit/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "libresplit"; - version = "0-unstable-2024-09-24"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "wins1ey"; repo = "LibreSplit"; - rev = "b56ce6743378fc09c9ab621713423754eac945a1"; - hash = "sha256-mhX5xyBmElPV6NUQRTz8KKL+H1on3WJ4DYatv89MRPo="; + rev = "2dd5dfc684b777b814b4cbd3ea7fee8028157cd5"; + hash = "sha256-FHOX6trRjn+IoiVRdbV6mHUUAzxbRLDWluxGM1GxFVk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libyafaray/package.nix b/pkgs/by-name/li/libyafaray/package.nix index 3f6ba6312623..69d2aaad0466 100644 --- a/pkgs/by-name/li/libyafaray/package.nix +++ b/pkgs/by-name/li/libyafaray/package.nix @@ -2,7 +2,6 @@ cmake, fetchFromGitHub, freetype, - ilmbase, lib, libjpeg, libtiff, @@ -33,10 +32,6 @@ stdenv.mkDerivation { include/geometry/poly_double.h include/noise/noise_generator.h # gcc12 ''; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -44,7 +39,6 @@ stdenv.mkDerivation { buildInputs = [ freetype - ilmbase libjpeg libtiff libxml2 diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 08e697c17fbc..6490d3ebb9d1 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "9.2.1"; + version = "9.2.2"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-yHr8FMOKlWlSkkmkGADC6R4PHO7tHk38gwrJS/nPvvs="; + hash = "sha256-uD3s117/uhAeRCex78gXSM9zIByFvjbjeVygkPXwgIM="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index fad8352a9d78..88f7c84e4afa 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lls"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "jcaesar"; repo = "lls"; tag = "v${version}"; - hash = "sha256-7biyctXeTTZi8PQqKKYn7Qkuw1CxJ9lT6Wo1+rpnjVs="; + hash = "sha256-OszKEWrpXEyi+0ayTzqy6O+cMZ/AVmesN3QJWCAHF7Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v4AW6kL546LNdBh9GEJfC5lKJBvVhfF52MS4bOkUbdU="; + cargoHash = "sha256-GIAGy0yLV7hRUk7cMEKxjmXJxpZSNyMXICEGr4vfIxc="; meta = with lib; { description = "Tool to list listening sockets"; diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix index 3b4ea626225e..4964f7e31e2e 100644 --- a/pkgs/by-name/lo/logstalgia/package.nix +++ b/pkgs/by-name/lo/logstalgia/package.nix @@ -7,7 +7,7 @@ pkg-config, libpng, libjpeg, - pcre, + pcre2, SDL2_image, glew, libGLU, @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "logstalgia"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; + hash = "sha256-wEnv9AXpJANSIu2ya8xse18AoIkmq9t7Rn4kSSQnkKk="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ftgl libpng libjpeg - pcre + pcre2 SDL2_image libGLU libGL @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { freetype ]; + configureFlags = [ + "--with-boost-system=boost_system" + "--with-boost-filesystem=boost_filesystem" + ]; + meta = with lib; { homepage = "https://logstalgia.io/"; description = "Website traffic visualization tool"; diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 561fb1af2ed6..2a874f42a756 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.16.0-1"; + version = "2.16.2-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; rev = "v${finalAttrs.version}"; - hash = "sha256-zw/n/Q1wwTiwhk6Q3xrMl2pEFBAk/BqSa/p0LTDbGBA="; + hash = "sha256-E6g9BqP8KniCBfYC1xOMqLA5RiAacsslgWAkvTop3CA="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch b/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch deleted file mode 100644 index 57c58ac9255f..000000000000 --- a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/lxterminal.c b/src/lxterminal.c -index 015f5e4..32e3b68 100644 ---- a/src/lxterminal.c -+++ b/src/lxterminal.c -@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); - ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0); - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); -+ vte_regex_unref(dingus1); -+ vte_regex_unref(dingus2); - #else - GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); - GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); -@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); - ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0); - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); --#endif - g_regex_unref(dingus1); - g_regex_unref(dingus2); -+#endif - - /* Create a horizontal box inside an event box as the toplevel for the tab label. */ - term->tab = gtk_event_box_new(); diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix index 956d3e3b121a..9fb97945ae4e 100644 --- a/pkgs/by-name/lx/lxterminal/package.nix +++ b/pkgs/by-name/lx/lxterminal/package.nix @@ -18,15 +18,15 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxterminal"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lxde"; repo = "lxterminal"; - rev = version; - sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0="; + tag = finalAttrs.version; + sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U="; }; configureFlags = [ @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ]; patches = [ - ./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122 ./respect-xml-catalog-files-var.patch ]; @@ -73,10 +72,10 @@ stdenv.mkDerivation rec { desktop-independent VTE-based terminal emulator for LXDE without any unnecessary dependencies. ''; - homepage = "https://wiki.lxde.org/en/LXTerminal"; - license = lib.licenses.gpl2; + homepage = "https://www.lxde.org/"; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.linux; mainProgram = "lxterminal"; }; -} +}) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index af8bc1189280..21d545518bfb 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-Zc6DTqIVU4shmZ9csg4nzwjn7ut/D6FrBXATQqwHI8o="; + hash = "sha256-78lnNbUKjQYS2BSRGiGmFfnu85Mz+xAwaDG5pVCBqkQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wppfZNsAFzXMJzcIOHL8Lj2FCgPp/i/TZcHP4VYsGCk="; + cargoHash = "sha256-lwL+5HuT6xiiittGlRDaFWfS9qum4xHginHT/TUMcco="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix index 3d501df085ed..f541eb67dd4b 100644 --- a/pkgs/by-name/ma/mamba-cpp/package.nix +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -13,16 +13,17 @@ tl-expected, libmamba, python3, + versionCheckHook, }: stdenv.mkDerivation rec { pname = "mamba-cpp"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "micromamba-${version}"; - hash = "sha256-o5shAmsplJS2WZ4HhAt1U27KqUheVxZTkjlyxR7EYxI="; + tag = version; + hash = "sha256-7YR3ToPz80I9d1pRNiEaoIacVyaz2mqzdm0h5WGSb2g="; }; nativeBuildInputs = [ cmake ]; @@ -46,6 +47,8 @@ stdenv.mkDerivation rec { (lib.cmakeBool "BUILD_LIBMAMBA" false) ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = with lib; { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 18fe73e6260c..af215b99a4dd 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -10,7 +10,7 @@ nix-update-script, }: let - version = "0.6.0"; + version = "0.7.0"; in rustPlatform.buildRustPackage { pname = "manga-tui"; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { owner = "josueBarretogit"; repo = "manga-tui"; rev = "v${version}"; - hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU="; + hash = "sha256-1WFg2hG3UnOO9+HpUcdPkZNhsNYa2QG1PhzLZ4bQiQM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gmG/gDozYizwjcm3SGs2m8oLiuWp6oxJPOB3FlHfW+4="; + cargoHash = "sha256-1nERwIZCR/afgfGdronpy145GnDkbsB7YjF6XyDcfEY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index d6624fde408d..408848d22ca8 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -18,11 +18,14 @@ # the version regex here as well. # # Ensure you also check ../mattermostLatest/package.nix. - regex = "^v(9\\.11\\.[0-9]+)$"; - version = "9.11.11"; - srcHash = "sha256-ugFGb85Oolg9pXeNi2JFKWQ4eebmdr/O3xIGbKGFSvQ="; - vendorHash = "sha256-h/hcdVImU3wFp7BGHS/TxYBEWGv9v06y8etaz9OrHTA="; - npmDepsHash = "sha256-Kk0Bbx/Rs5xpwSpgpm9BSMMEMKmO6kgKgyv/oDIAZ7w="; + regex = "^v(10\\.5\\.[0-9]+)$"; + version = "10.5.2"; + srcHash = "sha256-wC8tkplOntZpucCe2QPmnlrecwcqkzyEiTni8lO0p1I="; + vendorHash = "sha256-7jghoXFKA+WZ/ywOT0wWDMTfqAcBqp5gswOvpB7weL0="; + npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0="; + lockfileOverlay = '' + unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") + ''; }, }: @@ -80,7 +83,7 @@ let tests.mattermostWithTests = withTests; }; in - finalPassthru.withTests; + finalPassthru.withoutTests; in buildMattermost rec { pname = "mattermost"; diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index 0eaf1c8966a9..60cf915ad92f 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/pkgs/by-name/ma/mattermost/tests.nix @@ -146,6 +146,10 @@ mattermost.overrideAttrs ( ++ optionals (!stdenv.hostPlatform.isx86_64) [ # aarch64: invalid operating system or processor architecture "TestCanIUpgradeToE0" + + # aarch64: thumbnail previews are nondeterministic + "TestUploadFiles/multipart_Happy_image_thumbnail" + "TestUploadFiles/simple_Happy_image_thumbnail" ]; preCheck = '' diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 4e25aa18430d..44c7f32ab990 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.7.6"; + version = "4.8.0"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-PGdxwq20nSc7TPBlfo6HWxx6DmbZ1OFyeh4cZvsQ3Hg="; + sha256 = "sha256-BV3O+HwZc8Bin3G+DoV/nxmroCxSinvuy+bW11TrTrY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index eff21c563892..393045e5ff2b 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA="; + hash = "sha256-jZvF0vagzQRhw2vPhY61/ayki/gneG66e2MPBaqwlyk="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; diff --git a/pkgs/by-name/mi/mission-planner/package.nix b/pkgs/by-name/mi/mission-planner/package.nix index 626f499f9e15..ccf1af203c1a 100644 --- a/pkgs/by-name/mi/mission-planner/package.nix +++ b/pkgs/by-name/mi/mission-planner/package.nix @@ -34,7 +34,17 @@ stdenv.mkDerivation rec { mono unzip ]; - sourceRoot = "."; + + # zip has no outer directory, so make one and unpack there + unpackPhase = '' + runHook preUnpack + + mkdir -p source + cd source + unzip -q $src + + runHook postUnpack + ''; AOT_FILES = [ "MissionPlanner.exe" diff --git a/pkgs/by-name/mo/mobilecoin-wallet/package.nix b/pkgs/by-name/mo/mobilecoin-wallet/package.nix index 1fba3f5a3f17..c6c972a0e78d 100644 --- a/pkgs/by-name/mo/mobilecoin-wallet/package.nix +++ b/pkgs/by-name/mo/mobilecoin-wallet/package.nix @@ -6,10 +6,10 @@ let pname = "mobilecoin-wallet"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; - hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0="; + hash = "sha256-JfG+eHsPFXZKi9Vjbw7CPvhmeMvfPWSDS65Ey4Lb8iQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix index 403f29e54f9c..c8b151af3aba 100644 --- a/pkgs/by-name/mo/mockgen/package.nix +++ b/pkgs/by-name/mo/mockgen/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "mockgen"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "uber-go"; repo = "mock"; rev = "v${version}"; - sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw="; + sha256 = "sha256-xzPuy+KH40FDnjir/aROYlgWzLBY8qKDbYmkFMzHVkc="; }; vendorHash = "sha256-0OnK5/e0juEYrNJuVkr+tK66btRW/oaHpJSDakB32Bc="; diff --git a/pkgs/by-name/mo/mongodb-cli/package.nix b/pkgs/by-name/mo/mongodb-cli/package.nix index 8d023508f77d..7de8eca4cdde 100644 --- a/pkgs/by-name/mo/mongodb-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-cli/package.nix @@ -4,6 +4,7 @@ lib, buildGoModule, installShellFiles, + nix-update-script, }: buildGoModule rec { @@ -30,6 +31,8 @@ buildGoModule rec { --zsh <($out/bin/mongocli completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "MongoDB CLI enable you to manage your MongoDB via ops manager and cloud manager"; homepage = "https://github.com/mongodb/mongodb-cli"; diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix index 0a2a79e61f27..4d09844c386e 100644 --- a/pkgs/by-name/mp/mpb/package.nix +++ b/pkgs/by-name/mp/mpb/package.nix @@ -19,13 +19,13 @@ assert !lapack.isILP64; stdenv.mkDerivation rec { pname = "mpb"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = "mpb"; tag = "v${version}"; - hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k="; + hash = "sha256-naxVKD7pxefb/ht5Pa4e/T9eDzlZ0raNYPSvKNaZUn8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 1dbc8f69ab0b..ff9a67cc6be2 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "mpls"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${version}"; - hash = "sha256-jcSi/ZdHP9kJRUaMkQdS6BuScp2GM4+iNGIoclYMljI="; + hash = "sha256-sr0NZGQoaJw8LYJy13iNNos06KDHXNPbYSw3UAHi6eg="; }; vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE="; diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix index da132595b4cb..01d4cddc5bbc 100644 --- a/pkgs/by-name/mq/mqttui/package.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = "mqttui"; tag = "v${version}"; - hash = "sha256-q4C4YAs8Q1jHA5P2OApkFZnYM4/aZGxnE8Pd6Hmwd1I="; + hash = "sha256-wKqIDKng4pfqDuYtqFRh3UIeZQ4QzzFlLkQn5MXcVlU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pn4wmlMW8p6IAHrYjmvmZxNMjIJwJ2MYRsANz4D6xCU="; + cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/by-name/mq/mqttx-cli/package.nix b/pkgs/by-name/mq/mqttx-cli/package.nix index 025e63baaec6..dd10d69c9d7a 100644 --- a/pkgs/by-name/mq/mqttx-cli/package.nix +++ b/pkgs/by-name/mq/mqttx-cli/package.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, fetchYarnDeps, - fetchpatch, lib, mqttx-cli, nodejs, @@ -13,25 +12,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mqttx-cli"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "emqx"; repo = "MQTTX"; tag = "v${finalAttrs.version}"; - hash = "sha256-IPIiSav6MPJmzetBgVw9fLGPjJ+JKS3oWMEfCJmEY84="; + hash = "sha256-kxK/c1tOwK9hCxX19um0z1MWBZQOwADYEh4xEqJNgWI="; }; - patches = [ - # moves @faker-js/faker from devDependencies to dependencies - # because the final package depends on it - # https://github.com/emqx/MQTTX/pull/1801 - (fetchpatch { - url = "https://github.com/emqx/MQTTX/commit/3d89c3a08477e9e2b5d83f2a222ceaa8c08e50ce.patch"; - hash = "sha256-Rd6YpGHsvAYD7/XCJq6dgvGeKfOiLh7IUQFr/AQz0mY="; - }) - ]; - yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/cli/yarn.lock"; hash = "sha256-vwPwSE6adxM1gkdsJBq3LH2eXze9yXADvnM90LsKjjo="; diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 9a9d1019e5cb..acd55a8d8e4e 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -25,15 +25,15 @@ writeScript, }: let - id = "232635194"; + id = "243289393"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.38.1"; + version = "1.43.2"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-3UgpjQdZYr48MPoqgHci6Yvo+jxK7oa3THl/JuL8tRo="; + sha256 = "sha256-wdA5f/80GkKP6LrrP2E6M9GY5bl6rg7Spz7NWB7cQjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index d518bb0a0a24..1fee9eac799a 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -42,6 +42,10 @@ let pythonPath = python.pkgs.makePythonPath providerDependencies; in +assert + (lib.elem "airplay" providers) + -> throw "music-assistant: airplay support is missing libraop, a library we will not package because it depends on OpenSSL 1.1."; + python.pkgs.buildPythonApplication rec { pname = "music-assistant"; version = "2.5.0"; @@ -154,6 +158,11 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "music_assistant" ]; + postFixup = '' + # binary native code, segfaults when autopatchelf'd, requires openssl 1.1 to build + rm $out/${python3.sitePackages}/music_assistant/providers/airplay/bin/cliraop-* + ''; + passthru = { inherit python diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 5eb57965676d..439e618e584a 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.6.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-xHWiE0SCv5LbObAa4Ha/U1uTFe9z11nhpB/eMj5qYoA="; + hash = "sha256-B2arJ7m7q/vf1YcaYquhkBU3anekZAwRd1ZIvwvYnmM="; }; - vendorHash = "sha256-tgshaSrh5o28uiSMF7sv4AP57xYkaHq6B8sQTrnteqQ="; + vendorHash = "sha256-/LpBb0wbK7OP8HmL2/uMVeilIs4P51Pf+sg23zbPqtI="; subPackages = "."; diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix index 895c538bc67a..d0b543fa0a37 100644 --- a/pkgs/by-name/na/nano/package.nix +++ b/pkgs/by-name/na/nano/package.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.3"; + version = "8.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-VRtxey4o9+kPdJMjaGobW7vYTPoTkGBNhUo8o3ePER4="; + hash = "sha256-WtKSIrvVViTYfqZ3kosxBqdDEU1sb5tB82yXviqOYo0="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; @@ -46,11 +46,15 @@ stdenv.mkDerivation rec { "info" ]; - configureFlags = [ - "--sysconfdir=/etc" - (lib.enableFeature enableNls "nls") - (lib.enableFeature enableTiny "tiny") - ]; + configureFlags = + [ + "--sysconfdir=/etc" + (lib.enableFeature enableNls "nls") + (lib.enableFeature enableTiny "tiny") + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "gl_cv_func_strcasecmp_works=yes" + ]; postInstall = if enableTiny then @@ -61,6 +65,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + strictDeps = true; passthru = { tests = { diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix new file mode 100644 index 000000000000..49cffba090e0 --- /dev/null +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -0,0 +1,51 @@ +{ + fetchzip, + jre, + lib, + stdenvNoCC, +}: + +let + version = "0.31.1-17664948"; + urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; + +in +stdenvNoCC.mkDerivation { + pname = "necesse-server"; + inherit version; + + src = fetchzip { + url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; + hash = "sha256-H7/fc3zkuEMuv9Uq00TLSLF4rT8+UWsofnuCFrmUtjU="; + }; + + # removing packaged jre since we use our own + postUnpack = '' + rm -rf "$sourceRoot/jre" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r . $out + params='-nogui "$@"' + cat >$out/bin/necesse-server < - - - - - ''; -in buildDotnetModule (finalAttrs: { pname = "recyclarr"; version = "7.4.1"; @@ -47,8 +37,6 @@ buildDotnetModule (finalAttrs: { enableParallelBuilding = false; - dotnetRestoreFlags = [ "--configfile=${nuget-config}" ]; - doCheck = false; dotnet-sdk = dotnetCorePackages.sdk_9_0; diff --git a/pkgs/by-name/re/redfang/include-pthread.patch b/pkgs/by-name/re/redfang/include-pthread.patch new file mode 100644 index 000000000000..6e895df84ac4 --- /dev/null +++ b/pkgs/by-name/re/redfang/include-pthread.patch @@ -0,0 +1,12 @@ +diff --git a/fang.c b/fang.c +index cda61bf..52f9659 100755 +--- a/fang.c ++++ b/fang.c +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/pkgs/by-name/re/redfang/package.nix b/pkgs/by-name/re/redfang/package.nix index 014e62ac328f..5bb42b53b109 100644 --- a/pkgs/by-name/re/redfang/package.nix +++ b/pkgs/by-name/re/redfang/package.nix @@ -6,7 +6,7 @@ bluez, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redfang"; version = "2.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "kalilinux"; owner = "packages"; repo = "redfang"; - rev = "upstream/${version}"; + rev = "upstream/${finalAttrs.version}"; hash = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE="; }; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff"; sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M="; }) + # error: implicit declaration of function 'pthread_create' [] + ./include-pthread.patch ]; installFlags = [ "DESTDIR=$(out)" ]; @@ -32,11 +34,11 @@ stdenv.mkDerivation rec { buildInputs = [ bluez ]; - meta = with lib; { + meta = { description = "Small proof-of-concept application to find non discoverable bluetooth devices"; homepage = "https://gitlab.com/kalilinux/packages/redfang"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ moni ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ moni ]; mainProgram = "fang"; }; -} +}) diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 4f5638a43986..645589dd8abd 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -1,49 +1,55 @@ { lib, + nodejs, buildNpmPackage, fetchFromGitHub, - makeWrapper, redocly, testers, }: buildNpmPackage rec { pname = "redocly"; - version = "1.29.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-Oa4R4R7Obg26DKWZkccqjIcrD35pBw1AYIPe2/KN8f4="; + hash = "sha256-1iyE0LYbVEleCdSw6fWvIHqCkWMEZrjK6tum+qytcCY="; }; - npmDepsHash = "sha256-V0NklVsPRqRJ479nIMWqs/sXciXOm6LAlIh3YcPPDEc="; + npmDepsHash = "sha256-TIsVjdohsmvAAn9xQeeD5pu4CjXtYlD7bmKeDp113Lc="; npmBuildScript = "prepare"; - nativeBuildInputs = [ makeWrapper ]; - postBuild = '' npm --prefix packages/cli run copy-assets ''; postInstall = '' - rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core} + rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core,respect-core} cp -R packages/cli $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core + cp -R packages/respect-core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/respect-core - mkdir $out/bin - makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \ - $out/bin/redocly \ - --set-default REDOCLY_TELEMETRY off \ - --set-default REDOCLY_SUPPRESS_UPDATE_NOTICE true + # Create a wrapper script to force the correct command name (Nodejs uses argv[1] for command name) + mkdir -p $out/bin + cat < $out/bin/redocly + #!${lib.getBin nodejs}/bin/node + // Override argv[1] to show "redocly" instead of "cli.js" + process.argv[1] = 'redocly'; + + // Set environment variables directly + process.env.REDOCLY_TELEMETRY = process.env.REDOCLY_TELEMETRY || "off"; + process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE = process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE || "true"; + + require('$out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js'); + EOF + chmod +x $out/bin/redocly ''; passthru = { - tests.version = testers.testVersion { - package = redocly; - }; + tests.version = testers.testVersion { package = redocly; }; }; meta = { diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 0bb772f90eaf..56994b141155 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "24.3.8"; + version = "25.1.1"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-7ufF1OXFtT+OZY6UiDDiaohe4witVPEaO9zZaM6wldA="; + sha256 = "sha256-HjcgyDEm6m6/ab75GLFy6B5hu3Q7CQDIjxVnTVfCgbA="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-MdfCc3XdoMv3nnyaCbqU7mwJSgtusw9wVWjYqqJJmHA="; + vendorHash = "sha256-syAv40Coxy4uRQ6n20ikL7BTdP81N6Un1VKHpICv458="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index c5bee1e438de..6445c28e9359 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -23,6 +23,7 @@ let libadwaita' = libadwaita.overrideAttrs (oldAttrs: { version = "1.6.2-unstable-2025-01-02"; src = oldAttrs.src.override { + tag = null; rev = "f5f0e7ce69405846a8f8bdad11cef2e2a7e99010"; hash = "sha256-n5RbGHtt2g627T/Tg8m3PjYIl9wfYTIcrplq1pdKAXk="; }; diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 0470a12b2cc9..3e5ad769353d 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.03.24.00"; + version = "2025.03.31.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-Rv6EtrsDISR/lHo0Fimh2cNToSxUE5bxVdURmjs8/g4="; + hash = "sha256-ocnd/4bIZwrGik2r8HSeyPfLQycmJJrKikgLIZhsb6A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mzYpqI+PT5083exelS+kyGLZ+M8bTiTSxAoTwqV2ubc="; + cargoHash = "sha256-DguWlibOB8z0Blj5ZVFycyJrxJHK3uUROt8hGxacxOY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 9e00c8711a80..08a9379b4cef 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.19.8"; + version = "1.19.11"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-xMr+UftIWxtlYzzdOtidCJWisSwJd+xEtaKyoZnyVXc="; + hash = "sha256-rKvbh4TihITP+M4znObUU+80YfG9gookilLpIBUxt9U="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index d9f3c163ecf6..05da4f6c520c 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-a0FZaATQ4U9KtRY1m/Bi/1P9hDoNbcracZagm9EMSew="; + hash = "sha256-vK+Fn9gmPUTWkUHmNAX9OAoGxhG4tiVwqK6P+f8hcJQ="; }; - npmDepsHash = "sha256-BD0JBwZ3FSMpJRRTKQinPuaSBjX/RrkwXUqDr1wXEhk="; + npmDepsHash = "sha256-ihC4SCl0J5trz84ixUq12BjGtPMsfv5Ngs+QzkbjJbQ="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 0cdb557714ca..c19c0f013ebd 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -5,6 +5,7 @@ jre_headless, linkFarm, makeWrapper, + nixosTests, plugins ? [ ], }: let @@ -41,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + tests = nixosTests.reposilite; + updateScript = ./update.sh; + }; meta = { description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem"; diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 0986cbfe5fb1..9fdb07b342a5 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -22,19 +22,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; tag = "v${finalAttrs.version}"; - hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; + hash = "sha256-z4ZVj/nS4n3oqENSK87YJ8sQRnqK7c4tWzKHUD0Qw2s="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - name = "resources-${finalAttrs.version}"; - hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI="; + inherit (finalAttrs) pname version src; + hash = "sha256-jHdEiK3nu9mN2A6biHq9Iu4bSniD74hGnKFBTt5xVDM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix index 6c06584d7968..9b319231ad05 100644 --- a/pkgs/by-name/rk/rkdeveloptool/package.nix +++ b/pkgs/by-name/rk/rkdeveloptool/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "rkdeveloptool"; - version = "unstable-2021-04-08"; + version = "unstable-2025-03-07"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkdeveloptool"; - rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a"; - sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0="; + rev = "304f073752fd25c854e1bcf05d8e7f925b1f4e14"; + sha256 = "sha256-GcSxkraJrDCz5ADO0XJk4xRrYTk0V5dAAim+D7ZiMJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix index 17b863a4678f..aa28141583e3 100644 --- a/pkgs/by-name/rp/rpm-sequoia/package.nix +++ b/pkgs/by-name/rp/rpm-sequoia/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "rpm-sequoia"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "rpm-sequoia"; - rev = "v${version}"; - hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k="; + tag = "v${version}"; + hash = "sha256-Z2falZxewgMrrAyh8sDlIr9NfCzNs8GA+RHmfNYfzio="; }; useFetchCargoVendor = true; - cargoHash = "sha256-X+5Ww+cnt08mleA6FzxVGprjIEQVInQPSvTWGjXuGI8="; + cargoHash = "sha256-LJyq2gWP/I6+4lArhsWmcAHlub0Ww76jkq2gagP86ao="; patches = [ ./objdump.patch diff --git a/pkgs/by-name/ru/rush/package.nix b/pkgs/by-name/ru/rush/package.nix index ad9250729f72..3e94ac44c970 100644 --- a/pkgs/by-name/ru/rush/package.nix +++ b/pkgs/by-name/ru/rush/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { + mainProgram = "rush"; broken = stdenv.hostPlatform.isDarwin; description = "Restricted User Shell"; @@ -51,9 +52,11 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/rush/"; license = lib.licenses.gpl3Plus; - - maintainers = [ ]; platforms = lib.platforms.all; + + maintainers = with lib.maintainers; [ + c4f3z1n + ]; }; passthru = { diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 15f533a890b7..f71f41315b77 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -1,23 +1,29 @@ { lib, fetchFromGitHub, - flutter327, + flutter329, gst_all_1, libunwind, orc, webkitgtk_4_1, autoPatchelfHook, xorg, + runCommand, + yq, + saber, + _experimental-update-script-combinators, + gitUpdater, }: -flutter327.buildFlutterApplication rec { + +flutter329.buildFlutterApplication rec { pname = "saber"; - version = "0.25.3"; + version = "0.25.4"; src = fetchFromGitHub { owner = "saber-notes"; repo = "saber"; tag = "v${version}"; - hash = "sha256-plBcZo67/x8KcND28jqfrwbvI9IZz8ptLZoGl2y2vW4="; + hash = "sha256-3ZTvGF5Ip6VTmyeuuZoJaGO1dDOee5GuRp6/YxSz27c="; }; gitHashes = { @@ -27,9 +33,7 @@ flutter327.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; - nativeBuildInputs = [ - autoPatchelfHook - ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gst_all_1.gstreamer @@ -41,8 +45,8 @@ flutter327.buildFlutterApplication rec { ]; postInstall = '' - install -Dm0644 ./flatpak/com.adilhanney.saber.desktop $out/share/applications/com.adilhanney.saber.desktop - install -Dm0644 ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg + install -Dm0644 flatpak/com.adilhanney.saber.desktop $out/share/applications/saber.desktop + install -Dm0644 assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg ''; preFixup = '' @@ -50,6 +54,22 @@ flutter327.buildFlutterApplication rec { patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (saber) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "saber.pubspecSource" ./pubspec.lock.json) + ]; + }; + meta = { description = "Cross-platform open-source app built for handwriting"; homepage = "https://github.com/saber-notes/saber"; diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json index 4fa55a1e38a3..359273655523 100644 --- a/pkgs/by-name/sa/saber/pubspec.lock.json +++ b/pkgs/by-name/sa/saber/pubspec.lock.json @@ -4,11 +4,11 @@ "dependency": "direct main", "description": { "name": "abstract_sync", - "sha256": "40c83f10dc670e6c6c7f1999fd9ddd0a32dcc61454ed6c202bd59cb6befd81c4", + "sha256": "f88f85bfecf2171d8756556b8d7992cf8d31d076a6d0ebbfd9f8ee559d8a18bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.3.1" }, "animated_vector": { "dependency": "transitive", @@ -44,11 +44,11 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "528579c7e4579719f04b21eeeeddfd73a18b31dabc22766893b7d1be7f49b967", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.3" }, "args": { "dependency": "direct main", @@ -64,71 +64,71 @@ "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", + "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.8" + "version": "1.5.9" }, "assorted_layout_widgets": { "dependency": "transitive", "description": { "name": "assorted_layout_widgets", - "sha256": "5b7f7c76a1a4c7cf95edfb854c3ed09ce9cb7f25a372f2d9a8d4c1569d42ecfb", + "sha256": "86eacbd25f7dd14a8182003935b07d94205ae4b0e6bedee03bde1404746bb7a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.2" + "version": "10.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audioplayers": { "dependency": "direct main", "description": { "name": "audioplayers", - "sha256": "c346ba5a39dc208f1bab55fc239855f573d69b0e832402114bf0b793622adc4d", + "sha256": "b3d02a23918b980073d4a76c4e5659eaf5127251ca91a6a804869ba88ef1c8bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "6.2.0" }, "audioplayers_android": { "dependency": "transitive", "description": { "name": "audioplayers_android", - "sha256": "de576b890befe27175c2f511ba8b742bec83765fa97c3ce4282bba46212f58e4", + "sha256": "56830454da1a943f33c686cdbfca52a8d24f4c6fd6ce88c6b3501020dbaaf48b", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "5.0.3" }, "audioplayers_darwin": { "dependency": "transitive", "description": { "name": "audioplayers_darwin", - "sha256": "e507887f3ff18d8e5a10a668d7bedc28206b12e10b98347797257c6ae1019c3b", + "sha256": "34e1fb3a88ba02566615c6ca7173aa93b39cf61a38a05a729b60ba14c4899169", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "6.1.0" }, "audioplayers_linux": { "dependency": "transitive", "description": { "name": "audioplayers_linux", - "sha256": "3d3d244c90436115417f170426ce768856d8fe4dfc5ed66a049d2890acfa82f9", + "sha256": "ce8383c1ff0db1ba93b5b0b8ef5b260ec2d0ce2598ad37dc8b946b773dd2c5fa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.1.0" }, "audioplayers_platform_interface": { "dependency": "transitive", @@ -154,21 +154,21 @@ "dependency": "transitive", "description": { "name": "audioplayers_windows", - "sha256": "8605762dddba992138d476f6a0c3afd9df30ac5b96039929063eceed416795c2", + "sha256": "52b57c706a20fc85daa911be67381b3a5c9d03f8e27cb9fdb226de5bddf293b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.1.0" }, "barcode": { "dependency": "transitive", "description": { "name": "barcode", - "sha256": "ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003", + "sha256": "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.8" + "version": "2.2.9" }, "bidi": { "dependency": "transitive", @@ -184,11 +184,11 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "bson": { "dependency": "direct main", @@ -214,21 +214,31 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.3" + }, + "chalkdart": { + "dependency": "transitive", + "description": { + "name": "chalkdart", + "sha256": "08c910ee341fcdd1e46f20ddce59b13c1d85f5d97f2fd2f12014c46ede670e40", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charcode": { "dependency": "transitive", @@ -244,11 +254,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "collapsible": { "dependency": "direct main", @@ -264,11 +274,11 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", @@ -354,11 +364,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "decimal": { "dependency": "transitive", @@ -394,11 +404,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431", + "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.2.0" + "version": "11.3.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -464,11 +474,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "fast_image_resizer": { "dependency": "direct main", @@ -484,31 +494,31 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c", + "sha256": "6f6bfa8797f296965bdc3e1f702574ab49a540c19b9237b401e7c2b25dfe594c", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.4" + "version": "9.0.0" }, "file_selector_linux": { "dependency": "transitive", @@ -534,11 +544,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+3" + "version": "0.9.3+4" }, "fixnum": { "dependency": "direct main", @@ -554,21 +564,21 @@ "dependency": "direct main", "description": { "name": "flex_color_picker", - "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79", + "sha256": "c083b79f1c57eaeed9f464368be376951230b3cb1876323b784626152a86e480", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.0" + "version": "3.7.0" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334", + "sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.1" + "version": "3.5.0" }, "flutter": { "dependency": "direct main", @@ -626,11 +636,11 @@ "dependency": "transitive", "description": { "name": "flutter_keyboard_visibility_temp_fork", - "sha256": "cecc44a350a8a369efbc960bb2126386af53cb0597ca6789607cbfb88081b9f4", + "sha256": "e3d02900640fbc1129245540db16944a0898b8be81694f4bf04b6c985bed9048", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4" + "version": "0.1.5" }, "flutter_keyboard_visibility_windows": { "dependency": "transitive", @@ -662,91 +672,91 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.23" + "version": "2.0.24" }, "flutter_quill": { "dependency": "direct main", "description": { "name": "flutter_quill", - "sha256": "6274834823e61291c0cedee9dd7f73fc7836ea07a12596de8f5fa08598b5eb74", + "sha256": "3765d057bb63e6e5b7d5aba7c8fb048ec1b38c8a3428ded8c22e57cf2682a580", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.8.5" + "version": "11.0.0" }, "flutter_quill_delta_from_html": { "dependency": "transitive", "description": { "name": "flutter_quill_delta_from_html", - "sha256": "63873b5391b56daa999ce8fa7dd23dfd7d0417a70e00a647ba450f4a8988afd0", + "sha256": "79405765612016de9de2361be86383360b0b43a6bf88b818c079a953583f1849", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.3" + "version": "1.5.0" }, "flutter_secure_storage": { "dependency": "direct main", "description": { "name": "flutter_secure_storage", - "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0", + "sha256": "f7eceb0bc6f4fd0441e29d43cab9ac2a1c5ffd7ea7b64075136b718c46954874", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.2" + "version": "10.0.0-beta.4" + }, + "flutter_secure_storage_darwin": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_darwin", + "sha256": "f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" }, "flutter_secure_storage_linux": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_linux", - "sha256": "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b", + "sha256": "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" - }, - "flutter_secure_storage_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_secure_storage_macos", - "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" + "version": "2.0.1" }, "flutter_secure_storage_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_platform_interface", - "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "sha256": "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "2.0.1" }, "flutter_secure_storage_web": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_web", - "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "sha256": "4c3f233e739545c6cb09286eeec1cc4744138372b985113acc904f7263bef517", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "2.0.0" }, "flutter_secure_storage_windows": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_windows", - "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "sha256": "ff32af20f70a8d0e59b2938fc92de35b54a74671041c814275afd80e27df9f21", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "4.0.0" }, "flutter_speed_dial": { "dependency": "direct main", @@ -772,11 +782,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.16" + "version": "2.0.17" }, "flutter_test": { "dependency": "direct dev", @@ -826,25 +836,35 @@ "source": "sdk", "version": "0.0.0" }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, "go_router": { "dependency": "direct main", "description": { "name": "go_router", - "sha256": "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539", + "sha256": "04539267a740931c6d4479a10d466717ca5901c6fdfd3fcda09391bbb8ebd651", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.2" + "version": "14.8.0" }, "golden_screenshot": { "dependency": "direct dev", "description": { "name": "golden_screenshot", - "sha256": "6c800c8e1338434ccb68dec788b5121bf97d256aa6a98b43a4330190572f144a", + "sha256": "548b49cb2d7ee57664ed8cfd44df764182c59b04a437c7d695ed784e3a21569f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "3.2.0" }, "golden_toolkit": { "dependency": "transitive", @@ -890,21 +910,21 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "4.1.2" }, "icons_launcher": { "dependency": "direct dev", @@ -920,11 +940,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "sha256": "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.5.3" }, "integration_test": { "dependency": "direct dev", @@ -966,11 +986,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.2" }, "json2yaml": { "dependency": "direct overridden", @@ -1007,21 +1027,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1037,11 +1057,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.0" + "version": "5.1.1" }, "list_utilities": { "dependency": "transitive", @@ -1067,21 +1087,21 @@ "dependency": "transitive", "description": { "name": "markdown", - "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.2" + "version": "7.3.0" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1097,31 +1117,31 @@ "dependency": "direct main", "description": { "name": "material_symbols_icons", - "sha256": "64404f47f8e0a9d20478468e5decef867a688660bad7173adcd20418d7f892c9", + "sha256": "1403944c2a68dbdf934fca2b2115a372e70a4a185c136ab71a9d16e2108d0b14", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2801.0" + "version": "4.2805.1" }, "matrix4_transform": { "dependency": "transitive", "description": { "name": "matrix4_transform", - "sha256": "42c42610deecc382be2653f4a21358537401bd5b027c168a174c7c6a64959908", + "sha256": "1346e53517e3081d3e8362377be97e285e2bd348855c177eae2a18aa965cafa0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "4.0.1" }, "meta": { "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1167,11 +1187,11 @@ "dependency": "direct main", "description": { "name": "one_dollar_unistroke_recognizer", - "sha256": "fa47695d7318542401cd29a35829011dafa0d0b3cb401803e6d78d55d382a96c", + "sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3" }, "onyxsdk_pen": { "dependency": "direct main", @@ -1273,14 +1293,14 @@ "version": "0.1.1" }, "path": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_drawing": { "dependency": "direct main", @@ -1376,11 +1396,11 @@ "dependency": "direct main", "description": { "name": "pdf", - "sha256": "05df53f8791587402493ac97b9869d3824eccbc77d97855f4545cf72df3cae07", + "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.11.1" + "version": "3.11.3" }, "pdf_widget_wrapper": { "dependency": "transitive", @@ -1396,11 +1416,11 @@ "dependency": "direct main", "description": { "name": "pdfrx", - "sha256": "1a9cb7c6c6ac9b6e8b441d6a956697894dc4d10a9452ca9d640490c26c07cbfc", + "sha256": "7feafb9f5f2af8743d24d0b04e3b46bca6571c975e4697446f9692c7553c4e31", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.97" + "version": "1.1.11" }, "perfect_freehand": { "dependency": "direct main", @@ -1416,31 +1436,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1456,11 +1476,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1476,11 +1496,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "pixel_snap": { "dependency": "transitive", @@ -1496,11 +1516,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "platform_linux": { "dependency": "transitive", @@ -1532,6 +1552,16 @@ "source": "hosted", "version": "3.9.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, "power_extensions": { "dependency": "transitive", "description": { @@ -1546,21 +1576,21 @@ "dependency": "direct main", "description": { "name": "printing", - "sha256": "b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906", + "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.4" + "version": "5.14.2" }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "provider": { "dependency": "transitive", @@ -1586,11 +1616,11 @@ "dependency": "transitive", "description": { "name": "quill_native_bridge", - "sha256": "0b3200c57bb4f1f12d6c764648d42482891f20f12024c75fe3479cafc1e132c9", + "sha256": "bda0f0ad9bc160dcdd4bd2b378a7ae8bdb55c3d4b7301bf739d5e3b065ee5e82", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.7.11" + "version": "11.0.0" }, "quill_native_bridge_android": { "dependency": "transitive", @@ -1636,11 +1666,11 @@ "dependency": "transitive", "description": { "name": "quill_native_bridge_platform_interface", - "sha256": "2d71b6c5106db0a4b1d788640d1b949ccdd0e570b5a5e0384f7b28be9630a94a", + "sha256": "ea48bd12bf426741747ec8a575b122350971f338a75049099b349c63447582a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.1" + "version": "0.0.1+1" }, "quill_native_bridge_web": { "dependency": "transitive", @@ -1787,11 +1817,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.3" + "version": "10.1.4" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1807,31 +1837,31 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82", + "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.5.2" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549", + "sha256": "a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4" + "version": "2.4.6" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1857,11 +1887,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -1877,11 +1907,11 @@ "dependency": "direct dev", "description": { "name": "simplytranslate", - "sha256": "632b78778c5016b51ee3e5af778ad27f90d350d3153993d107fcb51fde1493c8", + "sha256": "3137b221b088c589cd68d26192d753a3a6fe314b83d95fc9c96cd0a40b270772", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1+3" + "version": "2.2.2" }, "sky_engine": { "dependency": "transitive", @@ -1893,31 +1923,31 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "e02feadc1291280e755ed01da39817213247295368671da67570e28ac0120aa8", + "sha256": "2778b88f05ffc23fd0a37436f607bf2a541d0b6b922e69a8ea5bbd50c2427d18", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.4.1" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "493456b7c4f842ec2e7519c2358a4653b3198b84e9b2656b03a648f7f3405471", + "sha256": "819637a23348adbc4f4e8faee3f274d8908f9af31d57bf1e277cd730b14bacde", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.4.0" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1933,51 +1963,51 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "super_clipboard": { "dependency": "direct main", "description": { "name": "super_clipboard", - "sha256": "687ef5d4ceb2cb1e0e36a4af37683936609f424f0767b46fee5fc312b0aeb595", + "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.0-dev.5" + "version": "0.9.0-dev.6" }, "super_native_extensions": { "dependency": "transitive", "description": { "name": "super_native_extensions", - "sha256": "1cb6baecf529300ae7f59974bdc33a53b947ecc4ce374c00126df064c10e4e51", + "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.0-dev.5" + "version": "0.9.0-dev.6" }, "sync_http": { "dependency": "transitive", @@ -1993,31 +2023,31 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timezone": { "dependency": "transitive", @@ -2123,21 +2153,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -2153,21 +2183,21 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.15" + "version": "1.1.18" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.12" + "version": "1.1.13" }, "vector_graphics_compiler": { "dependency": "transitive", @@ -2203,21 +2233,21 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", @@ -2243,11 +2273,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.11.0" }, "win32_registry": { "dependency": "transitive", @@ -2333,21 +2363,21 @@ "dependency": "direct dev", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "yaru": { "dependency": "direct main", "description": { "name": "yaru", - "sha256": "afc659f78a0bef5e06ebbbd516979afceca7526b7703daa444bf419a54b2dc85", + "sha256": "f149399d81ecd3d20bfcc79afd5ddd9bcd7e4c901d5e602a8577fe59c71c8617", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.3.2" + "version": "7.0.0" }, "yaru_window": { "dependency": "transitive", @@ -2401,7 +2431,7 @@ } }, "sdks": { - "dart": ">=3.6.0-0 <4.0.0", - "flutter": ">=3.24.3" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.0" } } diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index fdafea5a5403..73a8d0ca78dc 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; - rev = version; - hash = "sha256-X5QA27y/7bJoGC1qDNhvbh5Cqm4StiZ9jkdsed+oVL4="; + tag = version; + hash = "sha256-9jsn7oydaOYOAq6XYYlPjzzy6LSiKOpRtp+PxMlzwz0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 3dfbd7f562ec..9f239af4f2f9 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sequoia-sq"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; tag = "v${finalAttrs.version}"; - hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0="; + hash = "sha256-lM+j1KtH3U/lbPXnKALAP75YokDufbdz8s8bjb0VXUY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s="; + cargoHash = "sha256-3z1Qm/eeVlH0/x3C8PSSPIlQaRKk1U6mRlEiKk0AaVQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index cfffab29a406..750f31fe0c4d 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.15.9"; + version = "0.15.10"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst"; - hash = "sha256-+9pZUDszPYJmFgHbZH0aKtZ6qLcJjh73jG2CFoRKxWc="; + hash = "sha256-sPABtKfIpamGNWELnCnkVagHeuHq/1KoT364/aLHDu0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-FdUrivumG5R69CwZedpkBzds5PcZr4zSsA6QW/+rDBM="; + hash = "sha256-57NcGm46aggPO+/54P1arCSPV3BHlAWwmWIzbpkT2js="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 29c51230a730..37c97a8ba41b 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.2.1"; + version = "6.4.2"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-nWJOqMCP75E9E0fZ63OILroDS4bUMrJPM7h2IQ0K+aU="; + hash = "sha256-at1MBvbsgu7Z7UJQqVaakT1Ux16jJVP5JSVubrqF7VY="; }; # Fix build on darwin diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index fc12436e786f..1e387991d622 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -4,7 +4,7 @@ installShellFiles, fetchFromGitHub, freetype, - nix-update-script, + unstableGitUpdater, gumbo, harfbuzz, jbig2dec, @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2025-02-20"; + version = "2.0.0-unstable-2025-03-11"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "a64ad82b2c14e1ef821c13ddf1291ebb6aaafca6"; - hash = "sha256-aI8GqXAgyh5VkayEQbaXOK+JQKzqVqQs8RO3CdOsgX8="; + rev = "b3575d9634d6c305cdf555a383e019a1e9013f2a"; + hash = "sha256-a6zIgFe8bHrqXAtCC4/LC5jl3hy2Cs1xZBI91sKQgqw="; }; buildInputs = @@ -74,11 +74,9 @@ stdenv.mkDerivation (finalAttrs: { installManPage resources/sioyek.1 ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "branch=development" - ]; + passthru.updateScript = unstableGitUpdater { + branch = "development"; + tagPrefix = "v"; }; meta = with lib; { diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index 0c9b24b22ef2..c24eaf61edde 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "slackdump"; - version = "3.0.8"; + version = "3.0.10"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; tag = "v${version}"; - hash = "sha256-ufoksglrOPdvFb86rcc9kfOMC/koyHCRAXxaqUge6cU="; + hash = "sha256-+Q79DauC+hnUCxBa9muVsq03D9ph7lEB5pmU7ujv3Mo="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix index 84436b9a732a..9962bb5fa571 100644 --- a/pkgs/by-name/sl/sleek-todo/package.nix +++ b/pkgs/by-name/sl/sleek-todo/package.nix @@ -4,7 +4,7 @@ fetchurl, undmg, appimageTools, - + makeWrapper, }: let @@ -66,8 +66,10 @@ else src meta ; - + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' + wrapProgram $out/bin/sleek-todo \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" mkdir -p $out/share/{applications,sleek} cp -a ${appimageContents}/{locales,resources} $out/share/sleek cp -a ${appimageContents}/usr/share/icons $out/share diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix index a833e4d0ff05..a6c3d9ac231d 100644 --- a/pkgs/by-name/sm/smartgit/package.nix +++ b/pkgs/by-name/sm/smartgit/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smartgit"; - version = "24.1.2"; + version = "24.1.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.tar.gz"; - hash = "sha256-bPiPb/k5f9dRpwm4Wj+c2mhFhH9WOz2hzKeDfQLRLHQ="; + hash = "sha256-YhgE1Y0L8lzefJnvswKwIFnx6XIo40DszAr/cxOoOds="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix new file mode 100644 index 000000000000..afcf8fdd2273 --- /dev/null +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -0,0 +1,37 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: +let + version = "8.0.0"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "source-meta-json-schema"; + inherit version; + + src = fetchFromGitHub { + owner = "sourcemeta"; + repo = "jsonschema"; + rev = "v${version}"; + hash = "sha256-EH+wi8MAgAxTy7OPQK/faX6OVY38/Z5fXhaK92xKkyA="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + homepage = "https://github.com/sourcemeta/jsonschema"; + description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines "; + changelog = "https://github.com/sourcemeta/jsonschema/releases"; + license = with lib.licenses; [ + agpl3Plus + ]; + maintainers = with lib.maintainers; [ + amerino + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix index 172979803507..3a55cfa171b5 100644 --- a/pkgs/by-name/sq/squashfuse/package.nix +++ b/pkgs/by-name/sq/squashfuse/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, libtool, - fuse, + fuse3, pkg-config, lz4, xz, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { zlib lzo zstd - fuse + fuse3 ]; meta = { diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index a5deb0054c14..e0a6044e78b6 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sscg"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "sgallagher"; repo = "sscg"; tag = "sscg-${finalAttrs.version}"; - hash = "sha256-NzS9EV7DyQzPt4mvuEMs3zKRaQnyKzLNxmeheY7WHm4="; + hash = "sha256-BT9qytO9M3uymsHak4FtBapYLSNJcF96/8LxqXXiwxE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index 9abb9da75c03..d00bce066590 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { owner = "stac-utils"; repo = "stac-validator"; tag = "v${version}"; - hash = "sha256-/MConEN+fcY3JKqP/24k0l/m2FHNhIqG7k42ldSPZ1U="; + hash = "sha256-j29Bo8n+/85fzJtif0eWYxDP86k9n4Osl9/piWmTxSs="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index cd678c8f98a9..7bce2ce7a466 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-EPjQrPt6m7yOFgYqHOaWAZN7CjlsOgl2jsEuRB8+1fE="; + hash = "sha256-S+lmNVZafa0BFN0rhmhBU2ez28ATDFDF2TApt32c9Z8="; }; - vendorHash = "sha256-NiaY0HKDerYqehZkYToAHazaJe0eMUuue+8h6QdQDHM="; + vendorHash = "sha256-y3wztN/exexIwsAnQAlQu81rGTJZrgNmeVj45MVSxk0="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 53c44fa5d017..5ed67c2b45c2 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "webadmin"; - version = "0.1.24"; + version = "0.1.25"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; tag = "v${version}"; - hash = "sha256-KtCSP7PP1LBTcP1LFdEmom/4G8or87oA6ml6MXOhATk="; + hash = "sha256-Hv7FojY/SZgbzS8XGVj0uRfynZCZPEbPiSHRuBtt/Jc="; }; npmDeps = fetchNpmDeps { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-VXbFQLMtqypQlisirKhlfu9PYgmEryJx85GRqlRslNY="; + cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0="; postPatch = '' # Using local tailwindcss for compilation diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index 1778f16b97d7..bf082e1b358f 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.29"; + version = "1.0.30"; src = fetchCrate { inherit pname version; - hash = "sha256-RpGR4DlAvSuaecHPiD367rRR7H5zQs0JOgtvh/PXgpM="; + hash = "sha256-QTTBWuRXjx7UEMjnrIb4KQW+rtyKy4Q0Hu7OLt1Dph0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lVwH8NnmBl3ZakVbFYslvH39mjAOhmPRmXdshbwkx1Y="; + cargoHash = "sha256-2GwZtNbUbdzxK31Gh4U2LsFkzV1ylXkZnP5r5FQ/hvU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix index a6a8584e3675..7b34b80c8a8c 100644 --- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix +++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage { pname = "stardust-xr-magnetar"; - version = "0-unstable-2024-12-29"; + version = "0-unstable-2025-04-03"; src = fetchFromGitHub { owner = "stardustxr"; repo = "magnetar"; - rev = "d00c5ecf0bcaf2b4382ec3b4f3373ea5b761ee7b"; - hash = "sha256-2I6BRjw5t68OMc93cis4/qnyYT9OBYIr1S+ZF8LmFCc="; + rev = "63ff648bb64c23023a0047ea3ff2c0b6b1fd3caf"; + hash = "sha256-LRI3HKuOUfUb93mHB8DUpp0hvES+GbzsKAxpkLCLzKQ="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/st/stown/package.nix b/pkgs/by-name/st/stown/package.nix index 7a85908e97b0..b4a5013a10f5 100644 --- a/pkgs/by-name/st/stown/package.nix +++ b/pkgs/by-name/st/stown/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, tree, versionCheckHook, + nix-update-script, }: let version = "1.2.0"; @@ -30,6 +31,8 @@ python3Packages.buildPythonApplication { versionCheckHook ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Manage file system object mapping via symlinks. Lightweight alternative to GNU Stow"; homepage = "https://www.seichter.de/stown/"; diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 71bb01cb86e2..58e61329b4b9 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "stripe"; repo = "stripe-cli"; rev = "v${version}"; - hash = "sha256-WlLrWMDOwpSoHUixkJbCoewt/4UgnTbwIMBD5p5SI3c="; + hash = "sha256-gnV7BPHtbv6wFcgVUhKfIrskfAZIyZq6LtQwQYAkFCQ="; }; - vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o="; + vendorHash = "sha256-T8vrEbR240ihkLDG4vu0s+MxKJ5nOLm0aseDgK9EPPE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 1f595bdb0103..8cf61f05298c 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "stylelint"; - version = "16.17.0"; + version = "16.18.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; tag = version; - hash = "sha256-oCNgBS9yTOCrqI/35KWgim1cW62+91xwAMpWORUQVAQ="; + hash = "sha256-DtNZHxWmOwStUAYqfF37QoUpHjrDU1C7Tzmya4OCibc="; }; - npmDepsHash = "sha256-JZT7PXbEd7jSx0WGPLh0GtUthkMfgHR17c451k515Rc="; + npmDepsHash = "sha256-h8ryKrh5A+PWMLcDFq7xC/NRmLUhsWqjsw4pIwtcy6g="; dontNpmBuild = true; diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 1420a6374fe0..369c7897ef7c 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -23,7 +23,7 @@ libavif, libsixel, libraw, - openexr_3, + openexr, bash-completion, testers, nix-update-script, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { libavif libsixel libraw - openexr_3 + openexr ]; passthru = { diff --git a/pkgs/by-name/sw/swego/package.nix b/pkgs/by-name/sw/swego/package.nix index 71e814cfb5a7..0d7b69bdf048 100644 --- a/pkgs/by-name/sw/swego/package.nix +++ b/pkgs/by-name/sw/swego/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "swego"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; tag = "v${version}"; - hash = "sha256-JILdtmTdDZzcjsDfH0rZo4HpTp26EPP8WKPbHhQeNN8="; + hash = "sha256-28PU7jAVnWfRbFmTE2pmwJO1Zi+ceyFrzY5MiRt+91Y="; }; vendorHash = "sha256-w2OhZq7vaVDVoRfnWPH0bFO85yGTFcO6KpDo5ulTifo="; diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index 74193b6a7eaa..e2968a05f31d 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.58.2"; + version = "0.59.0"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-rQcdWjbX9Ddt/pLX7Z9LrvizvedbdRMdwofPNPEDU6U="; + hash = "sha256-rsGt9hy2EklZEA7eQ/Tp9eztVLVlVn9LMPTeZz9fQYA="; }; dontPatch = true; diff --git a/pkgs/by-name/sy/synapse-admin/package.json b/pkgs/by-name/sy/synapse-admin/package.json deleted file mode 100644 index 851fba613b30..000000000000 --- a/pkgs/by-name/sy/synapse-admin/package.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "name": "synapse-admin", - "version": "0.10.0", - "description": "Admin GUI for the Matrix.org server Synapse", - "type": "module", - "author": "Awesome Technologies Innovationslabor GmbH", - "license": "Apache-2.0", - "homepage": ".", - "repository": { - "type": "git", - "url": "https://github.com/Awesome-Technologies/synapse-admin" - }, - "devDependencies": { - "@babel/preset-env": "^7.24.4", - "@babel/preset-react": "^7.24.1", - "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^15.0.2", - "@testing-library/user-event": "^14.5.2", - "@vitejs/plugin-react": "^4.0.0", - "babel-jest": "^29.7.0", - "eslint": "^8.57.0", - "eslint-config-prettier": "^9.1.0", - "eslint-config-react-app": "^7.0.1", - "eslint-plugin-prettier": "^5.1.3", - "jest": "^29.7.0", - "jest-environment-jsdom": "^29.7.0", - "jest-fetch-mock": "^3.0.3", - "prettier": "^3.2.5", - "react-test-renderer": "^18.2.0", - "vite": "^5.0.0", - "vite-plugin-version-mark": "^0.0.13" - }, - "dependencies": { - "@haleos/ra-language-german": "^1.0.0", - "@haxqer/ra-language-chinese": "^4.16.2", - "@mui/icons-material": "^5.15.15", - "@mui/material": "^5.15.15", - "@mui/styles": "^5.15.15", - "papaparse": "^5.4.1", - "ra-language-farsi": "^4.2.0", - "ra-language-french": "^4.16.15", - "ra-language-italian": "^3.13.1", - "react": "^18.0.0", - "react-admin": "^4.16.15", - "react-dom": "^18.0.0" - }, - "scripts": { - "start": "vite serve", - "build": "vite build", - "fix:other": "yarn prettier --write", - "fix:code": "yarn test:lint --fix", - "fix": "yarn fix:code && yarn fix:other", - "prettier": "prettier --ignore-path .gitignore \"**/*.{js,jsx,json,md,scss,yaml,yml}\"", - "test:code": "jest", - "test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .", - "test:style": "yarn prettier --list-different", - "test": "yarn test:style && yarn test:lint && yarn test:code" - }, - "babel": { - "presets": [ - "@babel/preset-env", - [ - "@babel/preset-react", - { - "runtime": "automatic" - } - ] - ] - }, - "eslintConfig": { - "extends": "react-app" - }, - "jest": { - "testEnvironment": "jsdom", - "setupFilesAfterEnv": [ - "/src/setupTests.js" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - } -} diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix index cee42efa4fbc..b7d050e645ef 100644 --- a/pkgs/by-name/sy/synapse-admin/package.nix +++ b/pkgs/by-name/sy/synapse-admin/package.nix @@ -1,67 +1,145 @@ { lib, + stdenv, fetchFromGitHub, - fetchYarnDeps, - mkYarnPackage, + nodejs, + yarn-berry, + cacert, + nix-update-script, + formats, baseUrl ? null, - writeShellScriptBin, }: -mkYarnPackage rec { +let + config = lib.optionalAttrs (baseUrl != null) { restrictBaseUrl = baseUrl; }; + configFormat = formats.json { }; + configFile = configFormat.generate "synapse-admin-config" config; +in + +stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin"; - version = "0.10.0"; + version = "0.10.3"; + src = fetchFromGitHub { owner = "Awesome-Technologies"; repo = "synapse-admin"; - rev = version; - sha256 = "sha256-3MC5PCEwYfZzJy9AW9nHTpvU49Lk6wbYC4Rcv9J9MEg="; + tag = finalAttrs.version; + hash = "sha256-o2HzGuKjmIeJ+Kxd9KiFWmQgGVtvRdydiQJlr6P0+s8="; }; - packageJSON = ./package.json; + # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles + yarnOfflineCache = stdenv.mkDerivation { + pname = "yarn-deps"; + inherit (finalAttrs) version src; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-vpCwPL1B+hbIaVSHtlkGjPAteu9BFNNmCTE66CSyFkg="; + nativeBuildInputs = [ yarn-berry ]; + + dontInstall = true; + + env = { + YARN_ENABLE_TELEMETRY = 0; + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + + supportedArchitectures = builtins.toJSON { + os = [ + "darwin" + "linux" + ]; + cpu = [ + "arm" + "arm64" + "ia32" + "x64" + ]; + libc = [ + "glibc" + "musl" + ]; + }; + + configurePhase = '' + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + yarn config set enableGlobalCache false + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures "$supportedArchitectures" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p $out + yarn install --immutable --mode skip-build + + runHook postBuild + ''; + + outputHash = "sha256-hIz+tWaDiq9qslEKjRyNzC0z1zA5TFgVr/hf3/T6YGw="; + outputHashMode = "recursive"; }; nativeBuildInputs = [ - (writeShellScriptBin "git" "echo ${version}") + nodejs + yarn-berry ]; - NODE_ENV = "production"; - ${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl; + env = { + NODE_ENV = "production"; + }; - # error:0308010C:digital envelope routines::unsupported - NODE_OPTIONS = "--openssl-legacy-provider"; + postPatch = '' + substituteInPlace vite.config.ts \ + --replace-fail "git describe --tags" "echo ${finalAttrs.version}" + ''; + + configurePhase = '' + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + runHook postConfigure + ''; buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) - yarn --offline run build + yarn install --immutable --immutable-cache + yarn build runHook postBuild ''; - distPhase = '' - runHook preDist + installPhase = '' + runHook preInstall - cp -r deps/synapse-admin/dist $out + cp -r dist $out + cp ${configFile} $out/config.json - runHook postDist + runHook postInstall ''; - dontFixup = true; - dontInstall = true; + passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Admin UI for Synapse Homeservers"; homepage = "https://github.com/Awesome-Technologies/synapse-admin"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ + changelog = "https://github.com/Awesome-Technologies/synapse-admin/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + maintainers = with lib.maintainers; [ mkg20001 ma27 ]; }; -} +}) diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix index 8a2713a5fc47..1210546d1332 100644 --- a/pkgs/by-name/tr/treefmt/package.nix +++ b/pkgs/by-name/tr/treefmt/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "treefmt"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-097qAvJnMpxvhXNEjk54TXQHIODXP8lpitbN0ekWN+U="; + hash = "sha256-gNGDqCRPvXjbfDQkEP8UsEStL9fsvUVYWPv3d8o1Bq0="; }; - vendorHash = "sha256-UfZqxknX2tgfH8SSYQBm71FkcMRY6PVjBHzb5ZcPk4Q="; + vendorHash = "sha256-47yOjk3eO5K0T01GUDvheJxoAJz0ZmiV2RdqTv01pYQ="; subPackages = [ "." ]; diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index df7650f46460..9c31a076fdd2 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.21.12"; + version = "0.21.13"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-GFRNbrfI0sJ/GuvT924/gxmzbnf0s0QNf+Mpv1+5rbc="; + hash = "sha256-Kj0XUO8GSLBUwkvskOidA489cvcHdf9IKSVZ/OqlAnE="; }; nativeBuildInputs = [ pkg-config ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; useFetchCargoVendor = true; - cargoHash = "sha256-XQyHGavGUnWCTim2jC+kKKNYaWzwXg0slXxABSrKqJg="; + cargoHash = "sha256-oXLB/Jbb/J8oXl0IyECIjjv4pdKz94pocD/iTBv4GRs="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/pkgs/by-name/tt/ttf2pt1/package.nix b/pkgs/by-name/tt/ttf2pt1/package.nix index 75b32dc70a2c..67f27ccb9bd3 100644 --- a/pkgs/by-name/tt/ttf2pt1/package.nix +++ b/pkgs/by-name/tt/ttf2pt1/package.nix @@ -4,14 +4,15 @@ fetchurl, perl, freetype, + fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ttf2pt1"; version = "3.4.4"; src = fetchurl { - url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz"; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${finalAttrs.version}.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; @@ -28,7 +29,20 @@ stdenv.mkDerivation rec { buildInputs = [ freetype ]; nativeBuildInputs = [ perl ]; - patches = ./gentoo-makefile.patch; # also contains the freetype patch + patches = [ + ./gentoo-makefile.patch # also contains the freetype patch + + # fix build with c99 + # https://src.fedoraproject.org/rpms/ttf2pt1/c/070de5269475785d27ae7996513bee12cb9a0f53 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/ttf2pt1/raw/070de5269475785d27ae7996513bee12cb9a0f53/f/ttf2pt1-c99.patch"; + hash = "sha256-7+RnExqxED+fUJSj3opfYi0eQ5zqswOZnKjQMvlF020="; + }) + + # fix build with gcc14 + # https://src.fedoraproject.org/rpms/ttf2pt1/c/1ebb612acb7088095c6bd7242209f0ce848895fb + ./ttf2pt1-gcc14.patch + ]; meta = { description = "True Type to Postscript Type 3 converter, fpdf"; @@ -36,4 +50,4 @@ stdenv.mkDerivation rec { license = "ttf2pt1"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch b/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch new file mode 100644 index 000000000000..22503463c87a --- /dev/null +++ b/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch @@ -0,0 +1,47 @@ +diff --git a/ft.c b/ft.c +index 4ca1ca6..3ae9ac9 100644 +--- a/ft.c ++++ b/ft.c +@@ -457,7 +457,7 @@ static double lastx, lasty; + + static int + outl_moveto( +- FT_Vector *to, ++ const FT_Vector *to, + void *unused + ) + { +@@ -477,7 +477,7 @@ outl_moveto( + + static int + outl_lineto( +- FT_Vector *to, ++ const FT_Vector *to, + void *unused + ) + { +@@ -493,8 +493,8 @@ outl_lineto( + + static int + outl_conicto( +- FT_Vector *control1, +- FT_Vector *to, ++ const FT_Vector *control1, ++ const FT_Vector *to, + void *unused + ) + { +@@ -514,9 +514,9 @@ outl_conicto( + + static int + outl_cubicto( +- FT_Vector *control1, +- FT_Vector *control2, +- FT_Vector *to, ++ const FT_Vector *control1, ++ const FT_Vector *control2, ++ const FT_Vector *to, + void *unused + ) + { + diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix index 61b9651dada6..67103615d4db 100644 --- a/pkgs/by-name/tu/tuisky/package.nix +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -8,19 +8,19 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuisky"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "sugyan"; repo = "tuisky"; - tag = "v${version}"; - hash = "sha256-s0eKWP4cga82Fj7KGIG6yLk67yOqGoAqfhvJINzytTw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7SkY2n5nfqGDxbaSYmWwwmksA8eNY9SjRLLfCUP3qtc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-F/gEBEpcgNT0Q55zUTf8254yYIZI6RmiW9heCuljAEY="; + cargoHash = "sha256-rkIc/dRvuuOUq2v3bHLAL//DmiEBbBAhTxR0MHxAL/U="; nativeBuildInputs = [ pkg-config @@ -43,9 +43,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "TUI client for bluesky"; homepage = "https://github.com/sugyan/tuisky"; - changelog = "https://github.com/sugyan/tuisky/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/sugyan/tuisky/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "tuisky"; }; -} +}) diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index 1e13fe0a3505..5b1bb7d3e935 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "1.0.3"; + version = "1.0.6"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-94av3EW96qApCYWpo08QjrxoneuqGrE98aE7YXQEaT4="; + hash = "sha256-5XGcB003fYAQi8r+IjPxKVRtFgGFkfP2hOIxptlXn9E="; }; vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index a46416c8c21c..dee37a99cc6b 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -1,7 +1,7 @@ rec { - version = "0.15.0"; + version = "0.15.1"; tag = version; - hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M="; - cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4="; + hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8="; + cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno="; updateScript = ./update-stable.sh; } diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index a245509ec20c..99978a95e8bc 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.15.0"; + version = "0.15.1"; tag = version; - hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M="; - cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4="; + hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8="; + cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno="; updateScript = ./update-unstable.sh; } diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix index e3f2ff9be845..cbcfe71b52d0 100644 --- a/pkgs/by-name/un/unshield/package.nix +++ b/pkgs/by-name/un/unshield/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "unshield"; - version = "1.5.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "twogood"; repo = "unshield"; rev = version; - sha256 = "1p2inn93svm83kr5p0j1al0rx47f1zykmagxsblgy04gi942iza3"; + sha256 = "sha256-CYlrPwNPneJIwvQCnzyfi6MZiXoflMDfUDCRL79+yBk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 78f402585aea..24ee7fbd4f40 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-I7SRCw36xXkNnOe1+qDik3p9IeNo70DKMbJpqaoRhhQ="; + hash = "sha256-vJvF8ioEtiriWh120WhMxkYSody04PuXA6EISjWWvYA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZCdwyjGM9z3GBlwF6TunmNT7IKyn9pssUaBMyZJxLhE="; + cargoHash = "sha256-pwbqYe2zdQJQGoqrIwryBHmnS8spPgQ0qdpmxdT+9sk="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index 33bf556a4031..67abc5317743 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "vale"; - version = "3.11.1"; + version = "3.11.2"; subPackages = [ "cmd/vale" ]; src = fetchFromGitHub { owner = "errata-ai"; repo = "vale"; - rev = "v${version}"; - hash = "sha256-UPbeml7W90ICmbDjvNIy+DmolAAYF6Tci4R/kZa5cr8="; + tag = "v${version}"; + hash = "sha256-7wBMdATN2kAXUG6fWwq/8JifLrhxDjjPWlZSA47yrxM="; }; vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0="; diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix index 5ee4df9747da..1d6608c77ad1 100644 --- a/pkgs/by-name/ve/vendir/package.nix +++ b/pkgs/by-name/ve/vendir/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.43.1"; + version = "0.43.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-VIP1NkSZMoTZfvl6xAAbs0sL9rBc6FDaZHgOmRViStY="; + sha256 = "sha256-OCFXgVMFEKh3ImKQy4m2HVycyvt9IWJKd5Ng6rjNuzA="; }; vendorHash = null; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index a1aa47f9bda0..ec4f19b3da86 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "versatiles"; - version = "0.15.3"; # When updating: Replace with current version + version = "0.15.4"; # When updating: Replace with current version src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${version}"; # When updating: Replace with long commit hash of new version - hash = "sha256-xIZ/9l/wvl2Gh7vmxTGUxhZ9KIPSPLoqqC8DRN3PiQs="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. + hash = "sha256-C9LTfRi6FRRg4yUIbs1DMtOtILTO/ItjWGnuKwUSHeU="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. }; useFetchCargoVendor = true; - cargoHash = "sha256-UkPKwXPQW/M7AgNTMx4OqTLQCc9+c+RkzcCPyEHJayw="; # When updating: Same as above + cargoHash = "sha256-B9QCkAjyak2rX3waMG74KBbBVKn2veliMl7tAS41HQQ="; # When updating: Same as above __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix index 3f493f01dcbb..89487a913eae 100644 --- a/pkgs/by-name/ve/veryfasttree/package.nix +++ b/pkgs/by-name/ve/veryfasttree/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo="; + hash = "sha256-xoz2mK72gvNRpA4kGInAb3WHa/D8HvXprUQiJClLwh8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix index a045ff8ed78e..f7f7c1b0ed15 100644 --- a/pkgs/by-name/vi/vi-mongo/package.nix +++ b/pkgs/by-name/vi/vi-mongo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "vi-mongo"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "kopecmaciej"; repo = "vi-mongo"; tag = "v${version}"; - hash = "sha256-OKeflsr823Z9KBgymJG2Z9C4OFxdbW8LzVCWLahMJ0s="; + hash = "sha256-zQgGclK6iUtN1PMBSuYVYE8tS1qHTKcTDWDYqhVp3Hg="; }; vendorHash = "sha256-rKXrmK0ns3FB6EGyCJ2nYrCUsQ7yPm8dmzJioiVzHIc="; diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index c76857b0a371..0c1785e560a6 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -38,7 +38,7 @@ libtiff, libwebp, matio, - openexr_3, + openexr, openjpeg, openslide, pango, @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp matio - openexr_3 + openexr openjpeg openslide pango diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index f5f47bb2456f..d22026b9ec9d 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "25.1.4"; + version = "25.2.0"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - hash = "sha256-pu9iEAhQE7eHmrjzsyWtIecT79vcZyr5QfPq/Ce3Xxg="; + hash = "sha256-fQAnyUh9xuWsR8+yLtDdalJhW6kmBj1GBF20UZM7M6w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index 3648df610461..f7febba5cbfa 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wasmi"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "wasmi"; tag = "v${version}"; - hash = "sha256-h8eViInYiq0HhdYtqjurOOw93to+J5NsOdFXJYZsl8g="; + hash = "sha256-tKUkcuVT2945+pf7qdCgbUYbtiZmfE7tfzRlf8H/GkU="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-f4oN82T/PepntbDsFTugZkYclaeQXMPAxoV7R7gtqf0="; + cargoHash = "sha256-1p/cibicoH39+/Xrf28W2jOWK23LVu7L0nnsVDgvIV8="; passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 31fb7254e5b9..98b7f159bd24 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -8,21 +8,19 @@ installShellFiles, versionCheckHook, }: - -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "werf"; - version = "2.31.1"; + version = "2.34.1"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; - tag = "v${version}"; - hash = "sha256-eEdhAY3vN6hsgggakYpGFiVjR2BBGrg1UF18gFXc8g8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hWkU3tyh0kQ9GNl5gQIs4wTRBQV0B3/0oOAhKLo1hOo="; }; - vendorHash = "sha256-g+QZI0mfXSIU+iBnKzMeTGuF5UB1cwOixvRhcrBGrpE="; - proxyVendor = true; + vendorHash = "sha256-x9ehxBfyk5sMg71yJcyjcrBAi5bzEnENAaqLXFoGQck="; subPackages = [ "cmd/werf" ]; @@ -41,9 +39,9 @@ buildGoModule rec { [ "-s" "-w" - "-X github.com/werf/werf/v2/pkg/werf.Version=v${version}" + "-X github.com/werf/werf/v2/pkg/werf.Version=${finalAttrs.src.rev}" ] - ++ lib.optionals (env.CGO_ENABLED == 1) [ + ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [ "-extldflags=-static" "-linkmode external" ]; @@ -56,7 +54,7 @@ buildGoModule rec { "dfrunsecurity" "dfssh" ] - ++ lib.optionals (env.CGO_ENABLED == 1) [ + ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [ "cni" "exclude_graphdriver_devicemapper" "netgo" @@ -72,13 +70,14 @@ buildGoModule rec { # Test all packages. unset subPackages - # Remove tests that require external services, usually a Docker daemon. + # Remove tests that fail or require external services. rm -rf \ integration/suites \ pkg/true_git/*_test.go \ + pkg/werf/exec/*_test.go \ test/e2e '' - + lib.optionalString (env.CGO_ENABLED == 0) '' + + lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) '' # A workaround for osusergo. export USER=nixbld ''; @@ -104,9 +103,9 @@ buildGoModule rec { Buildah. ''; homepage = "https://werf.io"; - changelog = "https://github.com/werf/werf/releases/tag/${src.rev}"; + changelog = "https://github.com/werf/werf/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.azahi ]; mainProgram = "werf"; }; -} +}) diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix index 10c1719b1c3e..72c82c5b78c6 100644 --- a/pkgs/by-name/wl/wl-kbptr/package.nix +++ b/pkgs/by-name/wl/wl-kbptr/package.nix @@ -6,6 +6,8 @@ libxkbcommon, meson, ninja, + opencv, + pixman, pkg-config, stdenv, wayland, @@ -14,7 +16,7 @@ }: let pname = "wl-kbptr"; - version = "0.2.3"; + version = "0.3.0"; in stdenv.mkDerivation { inherit pname version; @@ -22,7 +24,7 @@ stdenv.mkDerivation { owner = "moverest"; repo = "wl-kbptr"; tag = "v${version}"; - hash = "sha256-4OWy5Q+NSKgzDn12aflZ+YAfacLeOTIhOojiJ2WiqQg="; + hash = "sha256-T7vxD5FW6Hjqc6io7Hypr6iJRM32KggQVMOGsy2Lg4Q="; }; depsBuildBuild = [ pkg-config ]; @@ -37,10 +39,14 @@ stdenv.mkDerivation { buildInputs = [ gtk3 libxkbcommon + opencv + pixman wayland wayland-protocols ]; + mesonFlags = [ "-Dopencv=enabled" ]; + strictDeps = true; passthru = { @@ -53,7 +59,10 @@ stdenv.mkDerivation { changelog = "https://github.com/moverest/wl-kbptr/releases/tag/v${version}"; license = lib.licenses.gpl3; mainProgram = "wl-kbptr"; - maintainers = [ lib.maintainers.luftmensch-luftmensch ]; + maintainers = [ + lib.maintainers.luftmensch-luftmensch + lib.maintainers.clementpoiret + ]; inherit (wayland.meta) platforms; }; } diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix index 8f1322c323e9..1a84f57c656f 100644 --- a/pkgs/by-name/wo/workrave/package.nix +++ b/pkgs/by-name/wo/workrave/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "workrave"; - version = "1.10.52"; + version = "1.10.53"; src = fetchFromGitHub { repo = "workrave"; owner = "rcaelers"; rev = "v" + lib.concatStringsSep "_" (lib.splitVersion version); - sha256 = "sha256-U39zr8XGIDbyY480bla2yTaRQLP3wMrL8RLWjlTa5uY="; + sha256 = "sha256-Dt0KY6nchcGZLyiUGGS4pnVagreIhuQpSq2DdvWqtn8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index a1e2ca6b7a5d..06f0148e13d7 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -4,6 +4,7 @@ curl, expat, fetchFromGitHub, + gspell, gst_all_1, gtk3, libGL, @@ -12,9 +13,12 @@ libXinerama, libXtst, libXxf86vm, + libnotify, libpng, + libsecret, libtiff, libjpeg_turbo, + libxkbcommon, zlib, pcre2, pkg-config, @@ -66,11 +70,15 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ curl + gspell # wxTextCtrl spell checking gtk3 libSM libXinerama libXtst libXxf86vm + libnotify # wxNotificationMessage backend + libsecret # wxSecretStore backend + libxkbcommon # proper key codes in key events xorgproto ] ++ lib.optional withMesa libGLU @@ -142,7 +150,10 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ tfmoraes ]; + maintainers = with maintainers; [ + tfmoraes + fliegendewurst + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index abe32972b3b6..d9ce146f6a07 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -12,6 +12,7 @@ gst_all_1, coreutils, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -71,13 +72,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 5004a4b6f130..03d0655b1fd5 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -5,24 +5,25 @@ fixup-yarn-lock, makeWrapper, nodejs, + writableTmpDirAsHomeHook, stdenv, yarn, }: stdenv.mkDerivation rec { pname = "yaml-language-server"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "yaml-language-server"; - rev = version; - hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA="; + tag = version; + hash = "sha256-YGPktMZxYi6eihCDc8JIfN/Ht2uu3wGKoKPJWlDKu+g="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; + hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { fixup-yarn-lock yarn nodejs + writableTmpDirAsHomeHook ]; # NodeJS is also needed here so that script interpreter get patched @@ -40,7 +42,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror "$offlineCache" fixup-yarn-lock yarn.lock yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 1d6bca02300e..efd8965208dc 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -10,18 +10,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "yazi"; - version = "25.3.2"; + version = "25.4.8"; srcs = builtins.attrValues finalAttrs.passthru.srcs; sourceRoot = finalAttrs.passthru.srcs.code_src.name; useFetchCargoVendor = true; - cargoHash = "sha256-3uQ+DDEzi4mo8yTv21ftoSjjFqjQfWMzjUczP6dasO4="; + cargoHash = "sha256-RqAolwIQqJQo9cVZ1uA0D+6yAmQKN2a7Uk3f4b/FjHU="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; - env.VERGEN_BUILD_DATE = "2025-03-02"; + env.VERGEN_BUILD_DATE = "2025-04-08"; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "sxyazi"; repo = "yazi"; tag = "v${finalAttrs.version}"; - hash = "sha256-xx/SGINyvbXZh0J8LgG2/jjFT1l6krNOzM5JAsRtxGE="; + hash = "sha256-oxO7nT4AZJilxA2DliYk57NETHu78xQ8nFdV+UwyKHE="; }; man_src = fetchFromGitHub { diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index de7be8884cc6..7b45631d0b2d 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -16,6 +16,7 @@ zoxide imagemagick chafa + resvg ], # deps @@ -33,6 +34,7 @@ zoxide, imagemagick, chafa, + resvg, settings ? { }, plugins ? { }, diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 4f9e10a3d812..30e7202c3c2e 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -10,7 +10,7 @@ let vPath = v: lib.elemAt (lib.splitString "-" v) 0; - version = "2024.9-b164"; + version = "2025.3-b134"; arches = { aarch64-linux = "arm64"; @@ -20,8 +20,8 @@ let arch = arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); hashes = { - arm64 = "sha256-tqo9QgIQUg6/OIoX0Cfr4srzPUoySEslNvfusR+IoyM="; - x64 = "sha256-L+wj4bAABbo+4Lto+AGR+Aq4fKn26Hg2sN9ATcYhefg="; + arm64 = "sha256-n6G04Gf+jIRfamo0B+EAfpNT0YDT0Mt9PTnxItlC06c="; + x64 = "sha256-RHGJd3GkP2bA9c/fhfFd9JLFK90mqt5hCbZmN0Ht0jE="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix index 800163372b0a..81093351ea6a 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-extras"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-extras"; - rev = finalAttrs.version; - hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o="; + tag = finalAttrs.version; + hash = "sha256-fN9rZC8J8xyAStvBNTpLqAcssaiQQpu6INwMLlnkvfw="; }; postPatch = '' substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" ''; strictDeps = true; @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" ( lib.concatStringsSep ";" [ # Exclude tests @@ -103,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Lomiri UI Extra Components"; longDescription = '' A collection of UI components that for various reasons can't be included in @@ -112,8 +113,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras"; changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 9c4750440566..3c68690302e9 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, pkg-config, gettext, m4, @@ -29,15 +30,24 @@ withGtk3 ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxpanel"; version = "0.10.1"; src = fetchurl { - url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; + url = "mirror://sourceforge/lxde/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug="; }; + patches = [ + # fix build with gcc14 + # https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c + (fetchpatch2 { + url = "https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c.patch?full_index=1"; + hash = "sha256-lj4CWdiUQhEc9J8UNKcP7/tmsGnPjA5pwXAok5YFW4M="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext @@ -72,11 +82,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optional withGtk3 "--enable-gtk3"; - meta = with lib; { + meta = { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.ryneeverett ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.ryneeverett ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh index 76f8734d4e12..fc4a5ba9f315 100644 --- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh +++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -85,6 +85,7 @@ configureNuget() { rootConfig=$(find . -maxdepth 1 -iname nuget.config -print -quit) if [[ -z $rootConfig ]]; then dotnet new nugetconfig + rootConfig=nuget.config fi ( @@ -100,6 +101,12 @@ configureNuget() { -i /configuration/packageSources/__new -t attr -n value -v "$nugetSource" -r /configuration/packageSources/__new -v add) + if [[ -n ${keepNugetConfig-} ]] && + ! @xmlstarlet@/bin/xmlstarlet select -t -i "/configuration/packageSources/clear" -nl "$rootConfig" && + ! @xmlstarlet@/bin/xmlstarlet select -t -i "/configuration/packageSources/add[@value='https://api.nuget.org/v3/index.json' or @key='nuget.org']" -nl "$rootConfig"; then + dotnet nuget add source https://api.nuget.org/v3/index.json --name nuget.org --configfile "$rootConfig" + fi + if [[ -z ${keepNugetConfig-} ]]; then xmlConfigArgs+=(-d '//configuration/*') xmlRootConfigArgs+=("${xmlSourceConfigArgs[@]}") diff --git a/pkgs/development/compilers/factor-lang/0.100.nix b/pkgs/development/compilers/factor-lang/0.100.nix new file mode 100644 index 000000000000..64751dad76a9 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/0.100.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchurl }: + +callPackage ./unwrapped.nix (rec { + version = "0.100"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + hash = "sha256-ei1x6mgEoDVe1mKfoWSGC9RgZCONovAPYfIdAlOGi+0="; + }; +}) diff --git a/pkgs/development/compilers/factor-lang/0.99.nix b/pkgs/development/compilers/factor-lang/0.99.nix new file mode 100644 index 000000000000..88c234213af9 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/0.99.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchurl }: + +callPackage ./unwrapped.nix (rec { + version = "0.99"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; + }; +}) diff --git a/pkgs/development/compilers/factor-lang/unwrapped.nix b/pkgs/development/compilers/factor-lang/unwrapped.nix index 8d7b6dae6661..a8b733a0a2bd 100644 --- a/pkgs/development/compilers/factor-lang/unwrapped.nix +++ b/pkgs/development/compilers/factor-lang/unwrapped.nix @@ -8,16 +8,16 @@ ncurses, tzdata, unzip, + + # Version-specific attributes + version, + src, }: stdenv.mkDerivation (finalAttrs: { pname = "factor-lang"; - version = "0.99"; - src = fetchurl { - url = "https://downloads.factorcode.org/releases/${finalAttrs.version}/factor-src-${finalAttrs.version}.zip"; - sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; - }; + inherit src version; patches = [ # Use full path to image while bootstrapping diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json index 021ec288e0e3..5111395d5990 100644 --- a/pkgs/development/compilers/flutter/versions/3_24/data.json +++ b/pkgs/development/compilers/flutter/versions/3_24/data.json @@ -1,17 +1,17 @@ { - "version": "3.24.4", - "engineVersion": "db49896cf25ceabc44096d5f088d86414e05a7aa", + "version": "3.24.5", + "engineVersion": "a18df97ca57a249df5d8d68cd0820600223ce262", "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=", - "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" + "aarch64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8=", + "x86_64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8=" }, "x86_64-linux": { - "aarch64-linux": "sha256-aQK3uD8n/V1ZH5+RbCNVZ1Fxx0Z33y5IEG4B0MVKh58=", - "x86_64-linux": "sha256-aQK3uD8n/V1ZH5+RbCNVZ1Fxx0Z33y5IEG4B0MVKh58=" + "aarch64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q=", + "x86_64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q=" } }, "dartVersion": "3.5.4", @@ -21,13 +21,13 @@ "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=", "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk=" }, - "flutterHash": "sha256-ykR2ul5JWEvopTMqXvRCAfqZ8ZlirNu0txVczWc/Nvg=", + "flutterHash": "sha256-9aA0HU/c32ixhnqAGwm1v87uDnYhNbe5laFbed1XPw8=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=", - "aarch64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=", - "x86_64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=", - "x86_64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=" + "aarch64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=", + "aarch64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk=", + "x86_64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=", + "x86_64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -36,38 +36,38 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", - "aarch64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", - "x86_64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", - "x86_64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=" + "aarch64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=", + "aarch64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=", + "x86_64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=", + "x86_64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=" }, "linux": { - "aarch64-darwin": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=", - "aarch64-linux": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=", - "x86_64-darwin": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=", - "x86_64-linux": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=" + "aarch64-darwin": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=", + "aarch64-linux": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=", + "x86_64-darwin": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig=", + "x86_64-linux": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig=" }, "macos": { - "aarch64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", - "aarch64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", - "x86_64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", - "x86_64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=" + "aarch64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=", + "aarch64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=", + "x86_64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=", + "x86_64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=" }, "universal": { - "aarch64-darwin": "sha256-SVrhfvGunkEKraIapt2PcNr4VzWI9d5DYMwkE82hKC8=", - "aarch64-linux": "sha256-N4/BCd8JTXqMdfX65IhKlZo7EK88t0I47QVoqdlOg7s=", - "x86_64-darwin": "sha256-GdBinxPZHgYZdmHvtcT9+qPGadZKqWTOIHJcIJwN2rU=", - "x86_64-linux": "sha256-a/AMUZC3n4e/TAquu076vXq+4cuODYJyvIrayTw4o5U=" + "aarch64-darwin": "sha256-o2dT/b6mWm34I3uGrrONVljGr6ApH6oOJbhTuUHQ664=", + "aarch64-linux": "sha256-M78yC1x+LXBnvTNogC6xrQ1QM+wu5hxMna5Ii50HcMA=", + "x86_64-darwin": "sha256-4Gx4SPvm+kJnDUJSA5DmYuMluhNp3qulA+dkM+XkDVY=", + "x86_64-linux": "sha256-AM8fDpGb4BLl/xbvq5IjXZqrtrUTW340WqUGAPguep8=" }, "web": { - "aarch64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", - "aarch64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", - "x86_64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", - "x86_64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=" + "aarch64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=", + "aarch64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=", + "x86_64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=", + "x86_64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=" }, "windows": { - "x86_64-darwin": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=", - "x86_64-linux": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=" + "x86_64-darwin": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I=", + "x86_64-linux": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I=" } }, "pubspecLock": { diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index d256295f2f2a..b0b7068d3c40 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -33,9 +33,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.2".officialRelease.sha256 = "sha256-t30Jh8ckp5qD6XDxtvnSaYiAWbEi6L6hAWh6tN8JjtY="; "21.0.0-git".gitRelease = { - rev = "65734de9b93bef5b3211298b4fcc5dc79d18d31e"; - rev-version = "21.0.0-unstable-2025-03-30"; - sha256 = "sha256-v7/Goj8lc+8AUX/nJeqRcaudZAQoAwBZ9FtrDYX87ns="; + rev = "6ce0fd7f74502a75120bef43f12f56e3a5d80dfd"; + rev-version = "21.0.0-unstable-2025-04-06"; + sha256 = "sha256-1GjWjJeU/RgXkBBfT6+wcfLnM4O6FiqkppuL+JfjDbI="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 8f523f14735b..011675a1f31b 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,6 @@ { lib, + lark, asttokens, buildPythonPackage, cbor2, @@ -28,21 +29,20 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-locUXGoL9C3lLpIgLOmpE2SNPGV6yOXPubNaEA3EfjQ="; + hash = "sha256-KiGbiVybWtanEjem+30DpuzKqAD6owujJBiEfjUKleM="; }; postPatch = '' # pythonRelaxDeps doesn't work substituteInPlace setup.py \ - --replace-fail "setuptools_scm>=7.1.0,<8.0.0" "setuptools_scm>=7.1.0" \ - --replace-fail '"pytest-runner",' "" + --replace-fail "setuptools_scm>=7.1.0,<8.0.0" "setuptools_scm>=7.1.0" ''; nativeBuildInputs = [ @@ -59,6 +59,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + lark asttokens cbor2 importlib-metadata diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 86521085307a..f908456749ad 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -62,7 +62,7 @@ libxml2, lz4, netcdf, - openexr_3, + openexr, openjpeg, openssl, pcre2, @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ( [ # tests for formats enabled by these packages fail on macos - openexr_3 + openexr xercesc ] ++ arrowDeps diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b6ad921a3768..fabdf20404ed 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -62,7 +62,7 @@ libusb1, neon, openal, - openexr_3, + openexr, openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264, openh264, libopenmpt, @@ -192,7 +192,7 @@ stdenv.mkDerivation rec { libusb1 neon openal - openexr_3 + openexr rtmpdump pango soundtouch diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index d07bb36ea100..bc1b86099939 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -30,7 +30,6 @@ mkDerivation { qtbase ]; outputs = [ "out" ]; # plugins only - CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; cmakeFlags = [ "-DKIMAGEFORMATS_HEIF=ON" ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 997fb3025a03..e36402b68b5a 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -8,7 +8,7 @@ libmng, lcms1, libtiff, - openexr_3, + openexr, libGL, libX11, pkg-config, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libmng lcms1 libtiff - openexr_3 + openexr ] ++ lib.optionals withXorg [ libX11 diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 09d7ac023648..d3ba36cff93a 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -40,13 +40,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer; stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2024-10-17"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "7b694e53e42a75ce48b846c53d08e4a33f627842"; - hash = "sha256-u+mBzmEixJT3rwuipITktFI4iVswnXftfF7syBw4t/w="; + rev = "4464b6d59f1afe99a0f7679dff50c5ada4a31654"; + hash = "sha256-btKg65haGhuz+xh4eWlujzUIhjjdUg9RelLX/ouLx68="; }; outputs = [ diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 5b5a45b6c372..00e041aafb0a 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -22,7 +22,7 @@ # Build apps buildApps ? true, # Utility applications lcms2, - openexr_3, + openexr, }: stdenv.mkDerivation rec { @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals buildApps [ lcms2 - openexr_3 + openexr ]; cmakeFlags = diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/2.nix similarity index 99% rename from pkgs/development/libraries/openexr/default.nix rename to pkgs/development/libraries/openexr/2.nix index 84dc7fb990e7..7a71776aba89 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/2.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; + insecure = true; }; } diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index c52dac8dab25..dff5ba112bca 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit libjxl; - musl = pkgsCross.musl64.openexr_3; + musl = pkgsCross.musl64.openexr; }; meta = with lib; { diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index c28beee8645c..df568d649494 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -25,7 +25,7 @@ jpegSupport ? true, libjpeg, exrSupport ? false, - openexr_3, + openexr, gifSupport ? true, giflib, pngSupport ? true, @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optional jpegSupport libjpeg - ++ lib.optional exrSupport openexr_3 + ++ lib.optional exrSupport openexr ++ lib.optional gifSupport giflib ++ lib.optional pngSupport libpng ++ lib.optional tiffSupport libtiff diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix index bbfb4e1e8f7e..ae695a3d5ed0 100644 --- a/pkgs/development/ocaml-modules/metadata/default.nix +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "metadata"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-metadata"; - rev = "v${version}"; - sha256 = "sha256-SQ8fNl62fvoCgbIt0axQyE3Eqwl8EOtYiz3xN96al+g="; + tag = "v${version}"; + sha256 = "sha256-CsmKk14jk/PuTibEmlFr/QZbmDIkLJ5QJSIZQXLRmGw="; }; minimalOCamlVersion = "4.14"; diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index 23ec41875319..073cb0423682 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -11,11 +11,11 @@ buildPerlPackage rec { pname = "Image-ExifTool"; - version = "13.00"; + version = "13.25"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-SJV4jzT4NHZfhr5KWtWjJDP1ctdXFg7Ne2Eur17TfoQ="; + hash = "sha256-HNVVFEhGooKYeDvr86tFIjUnPHg1hBCBPj1Ok8ZTsfo="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index c1cd0dcb8452..1988a026f087 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "berkeleydb"; - version = "18.1.13"; + version = "18.1.14"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PPxNayvSqi8iMDnvh3dzys+RaSyYb9GuFKU/kT7nSrg="; + hash = "sha256-jCYCgvV+vVucPOU9oOt1vllXrdswPjGQk1txZEjzL30="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0737837d581f..8beb92b16a52 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.28"; + version = "1.37.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-+FkmPOdsszpMed6lRc1EdYjKI6H9CQg8FvjlhgX4lRU="; + hash = "sha256-NkRGBqfBwQyXAN3lkPevsTRUYGVVP3YfNiB8H+uEfgs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index f4a29c68f6a0..eca5c6af828d 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.28"; + version = "1.37.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-FsTll2y4O4Y4hHIDUOJF3d5zvTnP4slI1axXxwquyJ4="; + hash = "sha256-xZiYvx0Jv2qfSR9HBcVpbnS4MVa3ZqoXFoZ/EbigTqE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 3cddd564499d..d049b05bf594 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -24,7 +24,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.8.14"; + version = "0.8.16"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; tag = "v${version}"; - hash = "sha256-srUNIjoov2kIzfvFkyyktKjn5UNfxS5aqRlmgeJvljw="; + hash = "sha256-qPlxgBWISd3hb2L5fgFDo1fREJ3DRgQeayzv9EkIVY0="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix new file mode 100644 index 000000000000..1c6c0cc37be0 --- /dev/null +++ b/pkgs/development/python-modules/colcon/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build-system + setuptools, + # dependencies + distlib, + empy, + packaging, + python-dateutil, + pyyaml, + # tests + pytestCheckHook, + pytest-cov-stub, + pytest-repeat, + pytest-rerunfailures, +}: +buildPythonPackage rec { + pname = "colcon-core"; + version = "0.19.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "colcon"; + repo = "colcon-core"; + tag = version; + hash = "sha256-R/TVHPT305PwaVSisP0TtbgjCFBwCZkXOAgkYhCKpyY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + empy + distlib + packaging + python-dateutil + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pytest-repeat + pytest-rerunfailures + ]; + + disabledTestPaths = [ + # Skip the linter and spell check tests that require additional dependencies + "test/test_flake8.py" + "test/test_spell_check.py" + ]; + + pythonImportsCheck = [ "colcon_core" ]; + + pythonRemoveDeps = [ + # We use pytest-cov-stub instead (and it is not a runtime dependency anyways) + "pytest-cov" + ]; + + meta = { + description = "Command line tool to build sets of software packages"; + homepage = "https://github.com/colcon/colcon-core"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + mainProgram = "colcon"; + }; +} diff --git a/pkgs/development/python-modules/dirsearch/default.nix b/pkgs/development/python-modules/dirsearch/default.nix index 74b97e1f9ce3..f29892dec108 100644 --- a/pkgs/development/python-modules/dirsearch/default.nix +++ b/pkgs/development/python-modules/dirsearch/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { ]; pythonRemoveDeps = [ # not available, see above - "ntlm-auth" + "ntlm_auth" ]; pythonRelaxDeps = [ # version checker doesn't recognize 0.8.0.rc2 as >=0.7.0 @@ -110,7 +110,7 @@ buildPythonPackage rec { # probably not but we don't have old charset-normalizer versions in nixpkgs # and requests also depends on it so we can't just override it with an # older version due to package duplication - "charset-normalizer" + "charset_normalizer" ]; meta = { diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix index 728585d24e54..bec6596c64a7 100644 --- a/pkgs/development/python-modules/django-cms/default.nix +++ b/pkgs/development/python-modules/django-cms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-cms"; - version = "4.1.4"; + version = "4.1.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "django-cms"; tag = version; - hash = "sha256-2vA1teV6IkjtDo44uwEts1OGsBZ4dXRFGrasAHmgnRA="; + hash = "sha256-XxLg6IkoC/LT6eCeEx8Bd4u2Q63fObD/lv8p1+jhYdw="; }; patches = [ @@ -94,7 +94,7 @@ buildPythonPackage rec { meta = { description = "Lean enterprise content management powered by Django"; homepage = "https://django-cms.org"; - changelog = "https://github.com/django-cms/django-cms/releases/tag/${version}"; + changelog = "https://github.com/django-cms/django-cms/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.onny ]; }; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index db3305a312c5..bd69a1f647ac 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.1.4"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; tag = version; - hash = "sha256-VYhXW3aqjDN7J+OkhYAOC0hGG5RkuFL0I7d6jbGKBvY="; + hash = "sha256-+i+/WMHdz4HPKDlRPV1Aq9QqrTo5gZiulSc7Hinn+kI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index b3d82a2e15bd..7bcb99458521 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.8"; + version = "0.12.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-gR8nZnD/+foKTCNtxzPIitw4HyR0hwN9YeZg/0kIAco="; + hash = "sha256-S2nCFFqsLDkx7f50VxcfIF1qHO+VLiV79752UDvIcDM="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 0c436028f48e..ad04d1c42273 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.52.0"; + version = "3.54.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; tag = version; - hash = "sha256-BjfpohzVbtPk2AjhSeTVgyJ5BF2m/HeXr3pjfJx+Qws="; + hash = "sha256-Be3sHPGd0//8jz2U6Ew/EsOQVXnJ7L7gJ07+QCLK9VM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix new file mode 100644 index 000000000000..5a2953607dde --- /dev/null +++ b/pkgs/development/python-modules/granian/default.nix @@ -0,0 +1,91 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cacert, + buildPythonPackage, + uvloop, + click, + setproctitle, + watchfiles, + versionCheckHook, + pytestCheckHook, + pytest-asyncio, + websockets, + httpx, + sniffio, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "granian"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "emmett-framework"; + repo = "granian"; + tag = "v${version}"; + hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + dependencies = [ + click + ]; + + optional-dependencies = { + pname = [ setproctitle ]; + reload = [ watchfiles ]; + # rloop = [ rloop ]; # not packaged + uvloop = [ uvloop ]; + }; + + nativeCheckInputs = [ + versionCheckHook + pytestCheckHook + pytest-asyncio + websockets + httpx + sniffio + ]; + + preCheck = '' + # collides with the one installed in $out + rm -rf granian/ + ''; + + # needed for checks + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + __darwinAllowLocalNetworking = true; + + pytestFlagsArray = [ "tests/" ]; + + pythonImportCheck = [ "granian" ]; + + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; + homepage = "https://github.com/emmett-framework/granian"; + license = lib.licenses.bsd3; + mainProgram = "granian"; + maintainers = with lib.maintainers; [ + lucastso10 + pbsds + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index bda79ee5f34d..dac2158d8a07 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; tag = version; - hash = "sha256-V8QiBnOz5l/vjTFf9gKjxth4YsGCYuADlbwiWc7VFds="; + hash = "sha256-EaVE70lzjvMqMJlXObz450FwunaPZv86kJCKgI174a8="; }; build-system = [ @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP Cache implementation for HTTPX and HTTP Core"; homepage = "https://github.com/karpetrosyan/hishel"; - changelog = "https://github.com/karpetrosyan/hishel/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/karpetrosyan/hishel/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 6da0f8e7123b..2307843d00d2 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = pname; tag = "v${version}"; - hash = "sha256-J0xrqAGwH0bAs59T7zA8irMWOGbE2+Zd9kwqxYUYYMA="; + hash = "sha256-aWm+rj/9A7oNBW5jkMg/BRuEw2gQUJ88At1wB75FgNQ="; }; build-system = [ setuptools ]; @@ -93,7 +93,7 @@ buildPythonPackage rec { meta = { description = "High-level training library for PyTorch"; homepage = "https://pytorch-ignite.ai"; - changelog = "https://github.com/pytorch/ignite/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/ignite/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index f66188ed579f..1d29ce17352a 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitea, + fetchpatch, replaceVars, colord, setuptools, @@ -34,6 +35,11 @@ buildPythonPackage rec { }; patches = [ + (fetchpatch { + name = "exiftool-13.23-compat.patch"; + url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/59132f20f8a40f6ed4e5cd2a3719bf55473ba4d7.patch"; + hash = "sha256-A36YSZ6kBFzEa2lSKIVHRg9r6Oi8FGkOnmt2YxlkwWw="; + }) (replaceVars ./default-icc-profile.patch { srgbProfile = if stdenv.hostPlatform.isDarwin then diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index 2ec947be0268..3304ed3e82fe 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -21,7 +21,10 @@ buildPythonPackage rec { hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; - patches = [ ./use-pytest.patch ]; + patches = [ + ./fix-packaging.patch + ./use-pytest.patch + ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaconv/fix-packaging.patch b/pkgs/development/python-modules/jaconv/fix-packaging.patch new file mode 100644 index 000000000000..f970b4e6c969 --- /dev/null +++ b/pkgs/development/python-modules/jaconv/fix-packaging.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index 297357b..12b861f 100644 +--- a/setup.py ++++ b/setup.py +@@ -39,7 +42,6 @@ + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Text Processing' + ], +- data_files=[('', ['README.rst', 'CHANGES.rst'])], + long_description='%s\n\n%s' % + (open('README.rst', encoding='utf8').read(), + open('CHANGES.rst', encoding='utf8').read()), diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index b800f60141f1..ebd5eb24b6d0 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -2,28 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + stdenvNoCC, + + # build system + poetry-core, + + # dependencies langgraph-checkpoint, - langgraph-sdk, - orjson, + ormsgpack, psycopg, psycopg-pool, - poetry-core, - pythonOlder, + + # testing pgvector, postgresql, postgresqlTestHook, pytestCheckHook, pytest-asyncio, - stdenvNoCC, + + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "2.0.15"; + version = "2.0.19"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; @@ -43,7 +48,7 @@ buildPythonPackage rec { dependencies = [ langgraph-checkpoint - orjson + ormsgpack psycopg psycopg-pool ]; @@ -83,11 +88,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langgraph.checkpoint.postgres" ]; - passthru = { - updateScript = langgraph-sdk.updateScript; - - # multiple tags confuse the bulk updater - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "checkpointpostgres==(\\d+\\.\\d+\\.\\d+)" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 7bd37f352d69..54efb25d7ca8 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -2,24 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - langgraph-checkpoint, + + # build system + poetry-core, + + # dependencies aiosqlite, + langgraph-checkpoint, + + # testing pytest-asyncio, pytestCheckHook, - langgraph-sdk, - poetry-core, + + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "2.0.5"; + version = "2.0.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointsqlite==${version}"; - hash = "sha256-8JNPKaaKDM7VROd1n9TDALN6yxKRz1CuAultBcqBMG0="; + hash = "sha256-UUlrhQS0C2rPp//+LwU2rgR4R3AM5fM9X3CYvi/DAy8="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; @@ -45,9 +53,11 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru = { - inherit (langgraph-sdk) updateScript; - skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "checkpoint-sqlite==(\\d+\\.\\d+\\.\\d+)" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 31b175ff1e9f..a6ead03a494d 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -1,39 +1,49 @@ { lib, buildPythonPackage, - dataclasses-json, fetchFromGitHub, - langchain-core, - langgraph-sdk, - msgpack, + + # build system poetry-core, + + # dependencies + langchain-core, + msgpack, + ormsgpack, + + # testing + dataclasses-json, pytest-asyncio, pytest-mock, pytestCheckHook, + + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "2.0.16"; + version = "2.0.24"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpoint==${version}"; - hash = "sha256-HieCzNM+z7d0UGL8QOyjNP5P2IbLf0x0xhaUCWM/c0k="; + hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo="; }; sourceRoot = "${src.name}/libs/checkpoint"; build-system = [ poetry-core ]; - dependencies = [ langchain-core ]; + dependencies = [ + langchain-core + ormsgpack + ]; propagatedBuildInputs = [ msgpack ]; - pythonRelaxDeps = [ "msgpack" ]; # Can drop after msgpack 1.0.10 lands in nixpkgs - pythonImportsCheck = [ "langgraph.checkpoint" ]; nativeCheckInputs = [ @@ -48,9 +58,11 @@ buildPythonPackage rec { "test_serde_jsonplus" ]; - passthru = { - updateScript = langgraph-sdk.updateScript; - skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "checkpoint==(\\d+\\.\\d+\\.\\d+)" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 9403d86784db..4b4cddcb998a 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -1,33 +1,33 @@ { lib, buildPythonPackage, - click, fetchFromGitHub, + + # build-system poetry-core, - # for update script - langgraph-sdk, + # dependencies + click, # testing pytest-asyncio, pytestCheckHook, docker-compose, - pythonOlder, + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.1.74"; + version = "0.1.84"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${version}"; - hash = "sha256-9/lL2TyOPiRIy6PfWEcd2fBNjn3n3Rpg0/7DL/4+Qpc="; + hash = "sha256-nb6u3YooDujRc6BKl35ZQPrKDlZkCreFn82TGxt4m5M="; }; sourceRoot = "${src.name}/libs/cli"; @@ -59,9 +59,11 @@ buildPythonPackage rec { "test_dockerfile_command_with_docker_compose" ]; - passthru = { - inherit (langgraph-sdk) updateScript; - skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "cli==(\\d+\\.\\d+\\.\\d+)" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix new file mode 100644 index 000000000000..995c7f552494 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + langchain-core, + langgraph-checkpoint, + + # tests + langgraph-checkpoint-postgres, + langgraph-checkpoint-sqlite, + postgresql, + postgresqlTestHook, + psycopg, + psycopg-pool, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + xxhash, + + # passthru + nix-update-script, +}: +# langgraph-prebuilt isn't meant to be a standalone package but is bundled into langgraph at build time. +# It exists so the langgraph team can iterate on it without having to rebuild langgraph. +buildPythonPackage rec { + pname = "langgraph-prebuilt"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + tag = "prebuilt==${version}"; + hash = "sha256-mYcj7HRbB5H6G0CVLOICKgdtR5Wlv9WeTIBjQJqlhOE="; + }; + + sourceRoot = "${src.name}/libs/prebuilt"; + + build-system = [ poetry-core ]; + + dependencies = [ + langchain-core + langgraph-checkpoint + ]; + + skipPythonImportsCheck = true; # This will be packaged with langgraph + + # postgresql doesn't play nicely with the darwin sandbox: + # FATAL: could not create shared memory segment: Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; + + nativeCheckInputs = [ + langgraph-checkpoint + langgraph-checkpoint-postgres + langgraph-checkpoint-sqlite + postgresql + postgresqlTestHook + psycopg + psycopg-pool + pytest-asyncio + pytest-mock + pytestCheckHook + xxhash + ]; + + preCheck = '' + export PYTHONPATH=${src}/libs/langgraph:$PYTHONPATH + ''; + + pytestFlagsArray = [ + "-W" + "ignore::pytest.PytestDeprecationWarning" + "-W" + "ignore::DeprecationWarning" + ]; + + disabledTestPaths = [ + # psycopg.OperationalError: connection failed: connection to server at "127.0.0.1", port 5442 failed: Connection refused + # Is the server running on that host and accepting TCP/IP connections? + "tests/test_react_agent.py" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "prebuilt==(\\d+\\.\\d+\\.\\d+)" + ]; + }; + + meta = { + description = "Prebuilt agents add-on for Langgraph. Should always be bundled with langgraph"; + homepage = "https://github.com/langchain-ai/langgraph"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index ab0c5fbb4340..563e0babce35 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -13,19 +13,19 @@ typing-extensions, # passthru - writeScript, + nix-update-script, }: buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.53"; + version = "0.1.61"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-Mx/36+FYZi/XNHJwlNRKE/lVo6nRTXUQwtYkq7HmBu0="; + hash = "sha256-cwoJ/1D+oAxqt6DEmpRBxDiR2nRAqBIOfqwLOmgUcZQ="; }; sourceRoot = "${src.name}/libs/sdk-py"; @@ -43,20 +43,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langgraph_sdk" ]; - passthru = { - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p nix-update - - set -eu -o pipefail +e - nix-update --commit --version-regex '(.*)' python3Packages.langgraph - nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk - nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint - nix-update --commit --version-regex 'checkpointduckdb==(.*)' python3Packages.langgraph-checkpoint-duckdb - nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres - nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite - ''; - skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "sdk==(\\d+\\.\\d+\\.\\d+)" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 855d854f3d8c..708da84981d8 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -10,7 +10,9 @@ # dependencies langchain-core, langgraph-checkpoint, + langgraph-prebuilt, langgraph-sdk, + xxhash, # tests aiosqlite, @@ -21,7 +23,6 @@ langgraph-checkpoint-sqlite, langsmith, psycopg, - psycopg-pool, pydantic, pytest-asyncio, pytest-mock, @@ -32,80 +33,16 @@ postgresql, postgresqlTestHook, }: -let - # langgraph-prebuilt isn't meant to be a standalone package but is bundled into langgraph at build time. - # It exists so the langgraph team can iterate on it without having to rebuild langgraph. - langgraph-prebuilt = buildPythonPackage rec { - pname = "langgraph-prebuilt"; - version = "0.1.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "langchain-ai"; - repo = "langgraph"; - tag = "prebuilt==${version}"; - hash = "sha256-Kyyr4BSrUReC6jBp4LItuS/JNSzGK5IUaPl7UaLse78="; - }; - - sourceRoot = "${src.name}/libs/prebuilt"; - - build-system = [ poetry-core ]; - - dependencies = [ - langchain-core - langgraph-checkpoint - ]; - - skipPythonImportsCheck = true; # This will be packaged with langgraph - - # postgresql doesn't play nicely with the darwin sandbox: - # FATAL: could not create shared memory segment: Operation not permitted - doCheck = !stdenv.hostPlatform.isDarwin; - - nativeCheckInputs = [ - pytestCheckHook - postgresql - postgresqlTestHook - ]; - - checkInputs = [ - langgraph-checkpoint - langgraph-checkpoint-postgres - langgraph-checkpoint-sqlite - psycopg - psycopg-pool - pytest-asyncio - pytest-mock - ]; - - preCheck = '' - export PYTHONPATH=${src}/libs/langgraph:$PYTHONPATH - ''; - - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestDeprecationWarning" - "-W" - "ignore::DeprecationWarning" - ]; - - disabledTestPaths = [ - # psycopg.OperationalError: connection failed: connection to server at "127.0.0.1", port 5442 failed: Connection refused - # Is the server running on that host and accepting TCP/IP connections? - "tests/test_react_agent.py" - ]; - }; -in buildPythonPackage rec { pname = "langgraph"; - version = "0.3.2"; + version = "0.3.24"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "${version}"; - hash = "sha256-EawVIzG+db2k6/tQyUHCF6SzlO77QTXsYRUm3XpLu/c="; + hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo="; }; postgresqlTestSetupPost = '' @@ -122,6 +59,7 @@ buildPythonPackage rec { langgraph-checkpoint langgraph-prebuilt langgraph-sdk + xxhash ]; pythonImportsCheck = [ "langgraph" ]; @@ -176,10 +114,11 @@ buildPythonPackage rec { disabledTestPaths = [ # psycopg.errors.InsufficientPrivilege: permission denied to create database - "tests/test_pregel_async.py" - "tests/test_pregel.py" + "tests/test_checkpoint_migration.py" "tests/test_large_cases.py" "tests/test_large_cases_async.py" + "tests/test_pregel.py" + "tests/test_pregel_async.py" ]; passthru = { diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix index 3fb3de5bd5f8..5b158ac41713 100644 --- a/pkgs/development/python-modules/libbs/default.nix +++ b/pkgs/development/python-modules/libbs/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "libbs"; - version = "2.11.1"; + version = "2.11.3"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "libbs"; tag = "v${version}"; - hash = "sha256-hYRRmnxA6K7O6suaP1eGRnY89gok3JNNsL70XRGWYBU="; + hash = "sha256-Ztn4AYnDlHpUYsr8jMvzmQ4zlRpDVsL+J6F1ipLbwwI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 77e82746e77d..65a086fae242 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchPypi, - CoreFoundation, - CoreServices, }: buildPythonPackage rec { @@ -16,10 +14,7 @@ buildPythonPackage rec { hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; }; - buildInputs = [ - CoreFoundation - CoreServices - ]; + patches = [ ./fix-packaging.patch ]; # Some tests fail under nix build directory doCheck = false; diff --git a/pkgs/development/python-modules/macfsevents/fix-packaging.patch b/pkgs/development/python-modules/macfsevents/fix-packaging.patch new file mode 100644 index 000000000000..21569c63ade5 --- /dev/null +++ b/pkgs/development/python-modules/macfsevents/fix-packaging.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index d7f9bb0..7707e38 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,11 +21,6 @@ def read(fname): + description = "Thread-based interface to file system observation primitives.", + long_description = "\n\n".join((read('README.rst'), read('CHANGES.rst'))), + license = "BSD", +- data_files = [("", [ +- "compat.h", +- "LICENSE.txt", +- "CHANGES.rst" +- ])], + author = "Malthe Borch", + author_email = "mborch@gmail.com", + url = 'https://github.com/malthe/macfsevents', diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 4f781d6109c5..f998632610d5 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pytestCheckHook, fetchFromGitLab, + fetchpatch, replaceVars, bubblewrap, exiftool, @@ -36,6 +37,11 @@ buildPythonPackage rec { patches = [ + (fetchpatch { + name = "exiftool-13.25-compat.patch"; + url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch"; + hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok="; + }) # hardcode paths to some binaries (replaceVars ./paths.patch { exiftool = lib.getExe exiftool; diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index 654a284178f8..d303e82b3ee6 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "mcp"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o="; + hash = "sha256-APm3x4tcDbp8D2ygW43wFyP0llJ6fXZiINHRYShp9ZY="; }; postPatch = '' @@ -93,6 +93,6 @@ buildPythonPackage rec { description = "Official Python SDK for Model Context Protocol servers and clients"; homepage = "https://github.com/modelcontextprotocol/python-sdk"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ josh ]; }; } diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 76a433c60782..81cd5385ed8d 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.0.19"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-CQK9Nv12E3jBcHI/RwJOaD2E6DbTWwVvTZ31kpsNGXg="; + hash = "sha256-hSmE53LfpLAZosVWHqy3795UPqqLdknMVfWrIxAxWBM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 76b7f4f7b5b4..a3c16b2972ea 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.8.20"; + version = "0.8.25"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-NSgsMKjnZIRrzLZJD9XlXgsc92Gx1VmeKmyuz5WyHc4="; + hash = "sha256-4SQRapViYU0uCtKEhXHpNXcJQBplE6r40ChzeTrX0/c="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5c39b6079d78..c5f832f2a229 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-nVAeLXy2hjJZDjNTjFccKClY7DS0oLv9Q9QLlngkX6M="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.37.26" - "sha256-gHSdYTzGKq5U3L3kqNCtl6JW8zzIBTbQeHRmLsPIYGg="; + buildMypyBoto3Package "codebuild" "1.37.29" + "sha256-iUO4pxG9wJexwwnD3KUie9TeLP1D6Mu3RjP11zYxHp4="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.37.0" @@ -574,8 +574,8 @@ rec { "sha256-JSVZVCZ6P5A+EqjXHmbbDIdE1rKrdSwNcZvUbYxKpSA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.37.13" - "sha256-FrJfuU55fUM3pxt4ey/KLmgXD3wTs6PlksCOBCQ1ibA="; + buildMypyBoto3Package "glue" "1.37.29" + "sha256-LL7zn9WjB7NyFYN2bs54X9v5i+ax2GpDDFzMcm6t5N0="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.37.0" @@ -866,8 +866,8 @@ rec { "sha256-Ltzv3h+NATTcKsyd1PfnUdjIhT3V0OS3woGsStyI/qA="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.37.26" - "sha256-fJHjUBVtXAeNth2fAzBdcLwaFNN6ma+3eQpwFnZU6B4="; + buildMypyBoto3Package "medialive" "1.37.29" + "sha256-X8jdJi7XRidW2DsyFRM+6jMUtu3jNJDNm0h7HMOxp/E="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.37.0" @@ -1014,8 +1014,8 @@ rec { "sha256-e9sP379VsbZeKUhLURtsMsSPxfIvCsYVNqZhUg67+MY="; mypy-boto3-personalize = - buildMypyBoto3Package "personalize" "1.37.0" - "sha256-qUtv4DOn0Hle7QGBr3cgphQXDNj9iC0xwOhCGHaayW8="; + buildMypyBoto3Package "personalize" "1.37.29" + "sha256-A7TLIG3TYVkSAAIRcn6OLoNSUpiwIEItwk4JI+f0nAc="; mypy-boto3-personalize-events = buildMypyBoto3Package "personalize-events" "1.37.0" @@ -1370,8 +1370,8 @@ rec { "sha256-UW0b40n+M8za5guDPxhU5cRvtbkqzX6G7M2UaxNq5ws="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.37.24" - "sha256-0+oRkebGHtwR7NXxXfdVMlF1+11+yFQyDBPJGuaz9k4="; + buildMypyBoto3Package "transfer" "1.37.29" + "sha256-sTjua+D1wGOa/8lod+/cafll9lk3NFI6vkE7NlGKmyU="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.37.0" diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 84a2c7bc58d9..724c6a808208 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "nexia"; tag = version; - hash = "sha256-1rhbVXQ7a9YxW/w6Hbp8QbD1h1kKwtpS+lViOdxJJYc="; + hash = "sha256-q7g4MIMW4yIUhvSMN3EmMU/9EsT+jOiJ9gV9P7sjVhg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 305b2d4e3f62..e748d6f6549f 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -25,18 +25,16 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.10"; + version = "2.9.11"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hLdq5AlTaCZ9x/x5VL4Q673th2HnE7haAaOp5zOQdjQ="; + hash = "sha256-Ca+xjr1aqCX7MmEb7MXD63Dhib/8hggnudj32pjiTyw="; }; - pythonRelaxDeps = [ "aenum" ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index 2aae0e744a93..d9b06c1d2130 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -29,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.31.0"; + version = "2.32.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; tag = "v${version}"; - hash = "sha256-VOfjxQjIC6IL7WyhTc8JpIAa9eknmU4LpnA9DtQJ+oQ="; + hash = "sha256-HXzorEAVPieCHfW3xzXqNTTIzJSbIuaZhcfcp0htdCk="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 33689c5344fc..034a6bd31e83 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-2ENP67OD466T6jLyyUxOz5CXKzVRhucpEycOXj42Ue0="; + hash = "sha256-egkXrTKqUz6AiOr55QRUTkz/3CnhTO2GeBDcd40QGvQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index ba221650503f..f6b516d4c2c6 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -23,6 +23,7 @@ typing-extensions, # tests + aiofiles, chex, google-cloud-logging, mock, @@ -34,14 +35,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.10"; + version = "0.11.11"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-bS4JmS8NkYkf6YUN9JLcIjMco94QuAw/7H0SguCWH+Y="; + hash = "sha256-KEh1w2lVQKch5QMwqLoAFnnaMOPqWX6WA7QM9sfunUU="; }; sourceRoot = "${src.name}/checkpoint"; @@ -69,6 +70,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aiofiles chex google-cloud-logging mock diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 7b4feb7ac8b2..a30535f53217 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.25.1"; + version = "2.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; tag = version; - hash = "sha256-vZPxpbR8O3XIyGcp2rn4skjy2xMQb6+5BHc4tjO84tw="; + hash = "sha256-Nq+xXzi5PeDDNTtkTaMTWO4HpxkjSUptE4jwfjBoauY="; }; postPatch = '' @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line utility to show dependency tree of packages"; homepage = "https://github.com/tox-dev/pipdeptree"; - changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${version}"; + changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ charlesbaynham ]; mainProgram = "pipdeptree"; diff --git a/pkgs/development/python-modules/pixel-font-knife/default.nix b/pkgs/development/python-modules/pixel-font-knife/default.nix index c8ca0cbd2c07..6f3a81554113 100644 --- a/pkgs/development/python-modules/pixel-font-knife/default.nix +++ b/pkgs/development/python-modules/pixel-font-knife/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pixel-font-knife"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_knife"; inherit version; - hash = "sha256-tm5cAaeUBL9vbdvq73N2HCytlwYe0Q2Tovo+6XU59GQ="; + hash = "sha256-raVWoMRHmaVaxAzxo+k1r3ldqSOBMbMvcEyuWHq7AaM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index d814ad05ab5e..815964658c8c 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cryptography" + "docx2txt" "fastapi" "llama-index-core" "llama-index-readers-file" diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 677b89f0fe07..59c2ddfd32bd 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250329"; + version = "1.0.2.20250408"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HinLmgjEHCmoW3tNTQF8vKWSh7IExxaGbdcztQsPuSk="; + hash = "sha256-LDbUgmHbow6IRI0I2s2eyRv9l/hUpH9ubMxcz1rp4uI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index cfc4a2e8673b..32c92136fb16 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.74"; + version = "0.2.75"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-pQRyIv1wu78vNjxl5tt0kI34RvCEycEMMEtaOnlaa10="; + hash = "sha256-rQP9OuWK+kEyc5DipPo0tPagvHm1Rl1YVUiALL7OKvQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix new file mode 100644 index 000000000000..5919b94fbeb9 --- /dev/null +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + wheel, + cryptography, + python-dateutil, + six, + pbr, + coverage, + oslotest, + stestr, +}: + +buildPythonPackage rec { + pname = "pyghmi"; + version = "1.5.76"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nJEL9x/+fZT/vpAKL5qVLXYVPcMvUXT9WSEvHzOrGZU="; + }; + + build-system = [ + pbr + setuptools + ]; + + nativeCheckInputs = [ + coverage + oslotest + stestr + ]; + + dependencies = [ + cryptography + python-dateutil + six + pbr + ]; + + pythonImportsCheck = [ "pyghmi" ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + meta = { + description = "Pure Python (mostly IPMI) server management library"; + homepage = "https://opendev.org/x/pyghmi/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ codgician ]; + }; +} diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 9986c26c4902..fdcc302faaa0 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "8.12.2"; + version = "8.12.3"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; tag = "v${version}"; - hash = "sha256-1m7d1eLnoIDrja83sGKBh/u8ryZuw6lb1FEO+XNc03M="; + hash = "sha256-DhzeEYdI/hrx6Stq77aOBJsl5AEtZO4ssbthmW4u/sE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index e197395d1d2a..b51b86d660c8 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, poetry-core, pythonOlder, + reflex, + pytestCheckHook, }: buildPythonPackage rec { @@ -20,22 +22,25 @@ buildPythonPackage rec { hash = "sha256-foIXPLWcxNf33y39BgiRpvwRnZOTcfAjhCvC4TD8ZMs="; }; - pythonRemoveDeps = [ - # Circular dependency - "reflex" - ]; - build-system = [ poetry-core ]; - # pythonImportsCheck = [ "reflex_chakra" ]; + dependencies = [ + reflex + ]; + pythonImportsCheck = [ "reflex_chakra" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # there are no "test_*.py" files, and the + # other files with `test_*` functions are not maintained it seems doCheck = false; - meta = with lib; { + meta = { description = "Chakra Implementation in Reflex"; homepage = "https://github.com/reflex-dev/reflex-chakra"; changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index be714a1d1df0..07ed325d19ec 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -9,6 +9,7 @@ dill, distro, fastapi, + granian, gunicorn, hatchling, httpx, @@ -25,6 +26,7 @@ pydantic, pytest-asyncio, pytest-mock, + python-dotenv, pytestCheckHook, python-engineio, python-multipart, @@ -48,14 +50,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.7.4a0"; + version = "0.7.5"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-KFNcdPoZc+Zps8OV3aLIkk9rlbfy6rx0I9JrYFt2b5E="; + hash = "sha256-uHlLItjONHGnuE4t2UOcVRYxcDDbRldUwHd8mPn7JfY="; }; pythonRelaxDeps = [ @@ -77,6 +79,8 @@ buildPythonPackage rec { dill distro fastapi + granian + granian.optional-dependencies.reload gunicorn httpx jinja2 @@ -106,6 +110,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-mock + python-dotenv playwright attrs numpy diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index c1fbf0c5b36d..c6f86a1eb3ed 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.27"; + version = "0.28"; pyproject = true; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; tag = version; - hash = "sha256-aba2f+7I/Lo3Vr7u9VCDRXQ5BRbQpJlQCCnib+Wp9Vs="; + hash = "sha256-hzdgG2/bTkzTUPK/Rnch4q12R5kY+qlr6gRwx54vbcE="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix index acf4b9332b95..4dd13a0edaef 100644 --- a/pkgs/development/python-modules/scikit-base/default.nix +++ b/pkgs/development/python-modules/scikit-base/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "scikit-base"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "sktime"; repo = "skbase"; tag = "v${version}"; - hash = "sha256-UGYkYhgo6LzlZTg6YDehJXd4D5p8FfUgWPdlW4PPOdI="; + hash = "sha256-Bkvk3x76DuLr7Q3NkD7z0ycXK6+K+24hawWeBrX6t1w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix index d61a2e529406..9069f0f539a0 100644 --- a/pkgs/development/python-modules/simsimd/default.nix +++ b/pkgs/development/python-modules/simsimd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "simsimd"; - version = "6.4.0"; + version = "6.4.1"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "simsimd"; tag = "v${version}"; - hash = "sha256-o9GhLfFuH3mTE4V6DGyGwU7o3EfP4iEoxUfFvR5gtLc="; + hash = "sha256-4t3uCxQG0zSa2JLKE1d2G3OQLr+8E3ZDNnTf9LAYXsk="; }; build-system = [ @@ -44,7 +44,11 @@ buildPythonPackage rec { changelog = "https://github.com/ashvardanian/SimSIMD/releases/tag/${src.tag}"; description = "Portable mixed-precision BLAS-like vector math library for x86 and ARM"; homepage = "https://github.com/ashvardanian/simsimd"; - license = lib.licenses.asl20; + license = with lib.licenses; [ + asl20 + # or + bsd3 + ]; maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix index 34dc9f7b9dec..d9fabf1dc0de 100644 --- a/pkgs/development/python-modules/speechbrain/default.nix +++ b/pkgs/development/python-modules/speechbrain/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "speechbrain"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "speechbrain"; repo = "speechbrain"; tag = "v${version}"; - hash = "sha256-Un7RPxMq1sD7uD3jcw3Bjp+Oo8ld+XC5g2I89gF6jxs="; + hash = "sha256-H45kTOIO6frbrRu+TP+udn1z60ZEcrShNB9iTCLInQs="; }; dependencies = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8b192d4f7ff5..cbc33570fbec 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1354"; + version = "3.0.1356"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-Z6py2Uc17Gv4Lj5pEPLQZaKir4S4vX1OFUqYzDgsfzM="; + hash = "sha256-sxmrymOkZCfvb1THOHNOz0PLv5MigcJeZsZ4UylgTG0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix new file mode 100644 index 000000000000..9449d2295752 --- /dev/null +++ b/pkgs/development/python-modules/textual-image/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # dependencies + rich, + + # tests + pillow, + pytestCheckHook, + + setuptools, +}: + +buildPythonPackage rec { + pname = "textual-image"; + version = "0.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lnqs"; + repo = "textual-image"; + tag = "v${version}"; + hash = "sha256-ik/zvnxXN5u2jXHfsGsCLnymZZ+IQiixagOJdEMRDlw="; + }; + + buildInputs = [ setuptools ]; + + dependencies = [ + pillow + rich + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "textual_image" ]; + + doCheck = false; # tests require [syrupy](https://github.com/syrupy-project/syrupy) + + meta = { + description = "Render images in the terminal with Textual and rich"; + homepage = "https://github.com/lnqs/textual-image/"; + changelog = "https://github.com/lnqs/textual-image/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ gaelj ]; + }; +} diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 8c2ade0628f9..e9a5d5efd7de 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "tldextract"; - version = "5.1.3"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "john-kurkowski"; repo = "tldextract"; tag = version; - hash = "sha256-gcgQGZS/dsTTC4Szpjreb2fAsVZxxOCE1erVvU1q4xM="; + hash = "sha256-5/o/9XRIe1BpLJCiTln0C80aT9V9sg308SDtCae6HAE="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { from the registered domain and subdomains of a URL. ''; homepage = "https://github.com/john-kurkowski/tldextract"; - changelog = "https://github.com/john-kurkowski/tldextract/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/john-kurkowski/tldextract/blob/${src.tag}/CHANGELOG.md"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; mainProgram = "tldextract"; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 132bd67caea3..7b2eb68b21b4 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-OrNYkvaTU1Zm1634eaLQqESkmLmPGgIBN2mAd1xmMP0="; + hash = "sha256-pjUGv064xVOfXiLDMTaFu6Fu4kt/2tfg2l2YGKlhjfw="; }; dependencies = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index fd83e5e252ba..4b7b59fc1209 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.5.1"; + version = "9.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-qmXvs9CjHjkd/DsbqMPA90wCDiS+pMwaHXCRBUNnv30="; + hash = "sha256-zHy/EqoWuQ3fZuA8wqatmcg+YwQB7w+kAGTWY453PnY="; }; build-system = [ setuptools ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; - changelog = "https://github.com/twilio/twilio-python/blob/${version}/CHANGES.md"; + changelog = "https://github.com/twilio/twilio-python/blob/${src.tag}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index f664f3142bd2..0bb1901cc4a8 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.24.2"; + version = "0.25.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-WCa69prV0px2vkn8ffACIigfoxsU+Z6ftEktceyY/qU="; + hash = "sha256-4RKYdQyZZH9/O5jW1tZIeQCWzTLURf0NSaYEGmMzbJo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix index f31733bd045d..450f3df1a06d 100644 --- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix @@ -9,6 +9,7 @@ # dependencies dunamai, eval-type-backport, + jinja2, pydantic, returns, tomlkit, @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "uv-dynamic-versioning"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { @@ -30,7 +31,7 @@ buildPythonPackage rec { tag = "v${version}"; # Tests perform mock operations on the local repo leaveDotGit = true; - hash = "sha256-rcvNQ6QrVu2pp1aWTalNK2R7CW/NfFGmu4Dea1EN2ZA="; + hash = "sha256-DO10OGij7koV5VYqywRR28pg0sEOAuGpqz1Ksf39MQo="; }; build-system = [ @@ -41,6 +42,7 @@ buildPythonPackage rec { dunamai eval-type-backport hatchling + jinja2 pydantic returns tomlkit diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 9a3a3cf63d07..77236a576649 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -53,6 +53,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "webdataset" ]; + preCheck = '' + export WIDS_CACHE=$TMPDIR + ''; + disabledTests = [ # requires network @@ -77,8 +81,6 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [ "test_concurrent_access" - # fails to patch 'init_process_group' from torch.distributed - "TestDistributedChunkedSampler" ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # segfaults on aarch64-linux @@ -89,9 +91,6 @@ buildPythonPackage rec { ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # AttributeError: httpx.Response: +- return httpx.post( ++ return httpx.Client(mounts=self.proxy).post( + self.url, + headers={"User-Agent": userAgent}, + json=self.data, +- timeout=self.timeout, +- proxies=self.proxy ++ timeout=self.timeout + ) + + async def asyncPostRequest(self) -> httpx.Response: +- async with httpx.AsyncClient(proxies=self.proxy) as client: ++ async with httpx.AsyncClient(mounts=self.proxy) as client: + r = await client.post(self.url, headers={"User-Agent": userAgent}, json=self.data, timeout=self.timeout) + return r + + def syncGetRequest(self) -> httpx.Response: +- return httpx.get(self.url, headers={"User-Agent": userAgent}, timeout=self.timeout, cookies={'CONSENT': 'YES+1'}, proxies=self.proxy) ++ return httpx.Client(mounts=self.proxy).get(self.url, headers={"User-Agent": userAgent}, timeout=self.timeout, cookies={'CONSENT': 'YES+1'}) + + async def asyncGetRequest(self) -> httpx.Response: +- async with httpx.AsyncClient(proxies=self.proxy) as client: ++ async with httpx.AsyncClient(mounts=self.proxy) as client: + r = await client.get(self.url, headers={"User-Agent": userAgent}, timeout=self.timeout, cookies={'CONSENT': 'YES+1'}) + return r diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 25e379eaa01f..ac8e2f1f705f 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -11,7 +11,7 @@ let pname = "surrealdb-migrations"; - version = "2.2.0"; + version = "2.2.1"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-OiH3O74tJQFAW+ZyyspvOXUMcWkqjpd4GVU4cKn1jBg="; + hash = "sha256-MeHNBtzl2bNJFGKtM1o9mGnX0vbmnpUPc18ecqG6J+8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dx5fGtKE0wfjQgTi5HBce6Afmc+0rJA24IRhrBirZbo="; + cargoHash = "sha256-l59RbKohfPsAp/70UaT/bhy5Z4orVf7fuJgU+0fuyk4="; buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index d19f1fb1f5aa..0b44a8b05395 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -32,13 +32,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - hash = "sha256-Jb+Y/Cbapw2ZCXMwXMw1hsy0vT/K8mM/A/Z1all7y+A="; + hash = "sha256-Qb9GMAFjQBsPItwkiWSMWv8WJyc5hOz9Yrq5PPOFVQo="; }; buildTools = [ hpack ]; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index a398aec7a14f..75d9dc6f5449 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -21,7 +21,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.36.22"; + version = "0.36.23"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index f2fe7635124c..619cbae8448c 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-slxWIdEqZRF07H5nDXj7YAXoX/K10v3FE+C8NgfpgPU=" -, "x86_64-darwin": "sha256-KCEAiFQqmVQ9ifxQs/4tr3qB2EUH3A0wnAvf6//kkVg=" -, "aarch64-linux": "sha256-syxTmj56gy8JKmvV1201jLQSRsWZY0cYEL91pukSTeQ=" -, "aarch64-darwin": "sha256-zedOyZ33PgKflECdhjAFkotfEXG5r3dmgBJ8awFuuTQ=" +, "x86_64-linux": "sha256-lUnvumfma4gBxbOzKBdjdSMRvCjgzzdRdisIB0c+U30=" +, "x86_64-darwin": "sha256-wN8IWlbhMVMYj9jxtqOZksjinPCHrrAFjIV24cv5vNw=" +, "aarch64-linux": "sha256-NPBgtEJ8pzxHG0D21EE0ngZAxbETAfJpmIoWp2BokPw=" +, "aarch64-darwin": "sha256-wlfz6LOn2Ri5m1ID8kXnlFN/zzNgDpC4zUgiWziUUC0=" } diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index a56c47b59b31..6dc9ff0fb969 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -8,7 +8,7 @@ llvmPackages, meson, ninja, - nixForLinking, + nixVersions, nix-update-script, nixd, nixf, @@ -101,12 +101,12 @@ in ]; buildInputs = [ - nixForLinking + nixVersions.nix_2_24 gtest boost ]; - env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h"; + env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h"; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = nixt; @@ -127,7 +127,7 @@ in sourceRoot = "${common.src.name}/nixd"; buildInputs = [ - nixForLinking + nixVersions.nix_2_24 nixf nixt llvmPackages.llvm @@ -137,7 +137,7 @@ in nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ]; - env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h"; + env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h"; # See https://github.com/nix-community/nixd/issues/519 doCheck = false; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index d3c4d70dce74..b7dc82ca8cf1 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.7.1"; - hash = "sha256-3FFIkOpxkAPLelfWshryT9r63Z8XHnVn7KFmXXz873Y="; + version = "10.8.0"; + hash = "sha256-Kb8sXOrqeZHugu7BX+cWLg+tgW0MSms1oWwB05J0v2k="; }; }; diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 4787cefc379b..fe6621ab0468 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.98a-RC5"; + version = "0.98a-RC7"; src = fetchzip { url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; - sha256 = "sha256-otssjDpc4FjhTjS2A/JttlglJtMNVyDfhyTv9X+NiX0="; + sha256 = "sha256-qA4/9AvRWBOIbNKA9U8U7PoPmIwz8wgJZyYFln7LZHw="; }; nativeBuildInputs = [ diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 0b3d049dc185..71e6d884af98 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -5,7 +5,7 @@ libjxl, libavif, libraw, - openexr_3, + openexr, }: mkKdeDerivation { pname = "kimageformats"; @@ -17,6 +17,6 @@ mkKdeDerivation { libjxl libavif libraw - openexr_3 + openexr ]; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 0e3702ce7360..2260feeac62c 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -9,7 +9,7 @@ libimobiledevice, gperf, libtirpc, - openexr_3, + openexr, taglib, shared-mime-info, libappimage, @@ -34,7 +34,7 @@ mkKdeDerivation { libimobiledevice gperf libtirpc - openexr_3 + openexr taglib libappimage xorg.libXcursor diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index add6b08de399..886ae1a62777 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -10,7 +10,7 @@ libimobiledevice, gperf, libtirpc, - openexr_3, + openexr, taglib, libappimage, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libimobiledevice gperf libtirpc - openexr_3 + openexr taglib libappimage ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 08d2291d686c..0c5ee542de44 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -89,7 +89,7 @@ let # Easier debugging of NFS issues. SUNRPC_DEBUG = yes; # Provide access to tunables like sched_migration_cost_ns - SCHED_DEBUG = yes; + SCHED_DEBUG = whenOlder "6.15" yes; # Count IRQ and steal CPU time separately IRQ_TIME_ACCOUNTING = yes; diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix index 364060ca90d2..beea275ace20 100644 --- a/pkgs/servers/authelia/default.nix +++ b/pkgs/servers/authelia/default.nix @@ -51,6 +51,11 @@ buildGoModule rec { "-X ${p}.BuildExtra=nixpkgs" ]; + # It is required to set this to avoid a change in the + # handling of sync map in go 1.24+ + # Upstream issue: https://github.com/authelia/authelia/issues/8980 + env.GOEXPERIMENT = "nosynchashtriemap"; + # several tests with networking and several that want chromium doCheck = false; diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index fd8f627fa316..19ea2892e999 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; + hash = "sha256-U7uanUE/xdmXqtpvnG6b+oDKamNZkCH04OCy3Y5UIhQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8K4Jn2A9OREwLRyFddHREcylapoFr+/AMT7Wq4o2Ue4="; + cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk="; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 0cd87d208c20..9d2ca1603f78 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -22,19 +22,21 @@ let x86_64-linux = "x64"; aarch64-linux = "arm64"; x86_64-darwin = "x64"; + aarch64-darwin = "arm64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-fgOe0xZMepec+DDi/6Kq1j5EVuw45Igvrvucdnklj1w="; - arm64-linux_hash = "sha256-Jhjwpwgo1vRluWTzpn0gd17uII3rw6OPV/+SW8TMolQ="; - x64-osx_hash = "sha256-htSMl+Y22YE2SnUOsx+2ZfRvWCeF4K9b+wVfDoxK4+M="; + x64-linux_hash = "sha256-PwHIUbXxk9VOKd+I7EcrTEYlikfw2NUdO6IQdiQWhWs="; + arm64-linux_hash = "sha256-uu7iVexyss29Q7mZ280KeDLZWp6wwCh+TJj9XeZc/lQ="; + x64-osx_hash = "sha256-POjIY2iPoYOQQci6AV/7X8t7GGbxVqROjlMzwERH/3c="; + arm64-osx_hash = "sha256-JSdiyA0opa4dy5/RTSn/QvnKJ9VCWJcGhTkH5YIi5lg="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.9.6.4552"; + version = "2.10.3.4602"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; @@ -79,6 +81,7 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "x86_64-darwin" + "aarch64-darwin" ]; }; } diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh index 0da098f89bed..e87f6888a8dd 100755 --- a/pkgs/servers/lidarr/update.sh +++ b/pkgs/servers/lidarr/update.sh @@ -40,3 +40,4 @@ updateVersion $latestVersion updateHash $latestVersion x64 linux updateHash $latestVersion arm64 linux updateHash $latestVersion x64 osx +updateHash $latestVersion arm64 osx diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix index ef9d3232e875..855a733a363b 100644 --- a/pkgs/servers/web-apps/kavita/default.nix +++ b/pkgs/servers/web-apps/kavita/default.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + fetchpatch2, buildDotnetModule, buildNpmPackage, dotnetCorePackages, @@ -10,13 +11,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kavita"; - version = "0.8.4.2"; + version = "0.8.5.11"; src = fetchFromGitHub { owner = "kareadita"; repo = "kavita"; rev = "v${finalAttrs.version}"; - hash = "sha256-iJ9ocTWcKSUvgN48s5a2N2tz83uid2N4vg1bHAQmnH4="; + hash = "sha256-HSVdEB0yhmm/SZseHQ5kTRBaVqCZZx934Ovq1pTmQkM="; }; backend = buildDotnetModule { @@ -32,6 +33,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { # On update: check if more migrations need to be restored! # Migrations should at least allow updates from previous NixOS versions ./restore-migrations.diff + # Our nixos test depends on /api/locale; this patch fixes an upstream bug where the first response always fails + # https://github.com/Kareadita/Kavita/pull/3686 remove once upstream is fixed + (fetchpatch2 { + name = "fix-locale-cache.patch"; + url = "https://github.com/Kareadita/Kavita/commit/5af07b9525c2164a6548092244bbdf66815b3e95.patch?full_index=1"; + hash = "sha256-aFZRxijAbA2mXJM+3kC4P4p76d0p5fEXLiaRhNmjOAA="; + }) ]; postPatch = '' substituteInPlace API/Services/DirectoryService.cs --subst-var out @@ -44,8 +52,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { projectFile = "API/API.csproj"; nugetDeps = ./nuget-deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; }; frontend = buildNpmPackage { @@ -57,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { npmBuildScript = "prod"; npmFlags = [ "--legacy-peer-deps" ]; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers - npmDepsHash = "sha256-ttEAoLg8OmA4lA7IJS4+5QwpMJdFIoJrWZryFhTZUdI="; + npmDepsHash = "sha256-9SfiH567+q3Id6/7pqWeX0y934V2YFQ4EWIJ+66smgI="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/kavita/nuget-deps.json b/pkgs/servers/web-apps/kavita/nuget-deps.json index 23a141deb399..263289860b7f 100644 --- a/pkgs/servers/web-apps/kavita/nuget-deps.json +++ b/pkgs/servers/web-apps/kavita/nuget-deps.json @@ -11,13 +11,13 @@ }, { "pname": "BouncyCastle.Cryptography", - "version": "2.4.0", - "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA=" + "version": "2.5.0", + "hash": "sha256-4JTx7QKSu3BE7kPuspN1KK2LtA9BWKLHZRLfOBEzWHY=" }, { "pname": "Cronos", - "version": "0.8.4", - "hash": "sha256-L9rLcqnQybPoJCcg60h49bjXfqEarM9SFHqOJUMvxz8=" + "version": "0.9.0", + "hash": "sha256-yDYBfqSXqvT/VPUf6UT3XOgqqPmOMYqhjCBxpF5i15c=" }, { "pname": "CsvHelper", @@ -51,28 +51,23 @@ }, { "pname": "Flurl", - "version": "3.0.6", - "hash": "sha256-PqpYY1vlXC/tbpelm+sH81gYzClT32CGvG4+8NSiAvk=" - }, - { - "pname": "Flurl", - "version": "3.0.7", - "hash": "sha256-Jnxss3qPP8KCJMnoDrMXwsEC5WX773HKpFh4Lck5psQ=" + "version": "4.0.0", + "hash": "sha256-qCbO6ELAw+OP/RyrJhrxys5b+Kk2xR4RbzpLOsZYheg=" }, { "pname": "Flurl.Http", - "version": "3.2.4", - "hash": "sha256-s3DKhQu+iHTHBH890eSfMbNsElPutHKOjUhEl3NQ5W4=" + "version": "4.0.2", + "hash": "sha256-V1tlyjoCB9ZyTiwEV3ZYiSP/0q2R2+bqRI+wZLVJATA=" }, { "pname": "Hangfire", - "version": "1.8.15", - "hash": "sha256-42y8ywFu5cPD9qN4bM4Pa8/W1H0B+xKxPDPg5z22oug=" + "version": "1.8.18", + "hash": "sha256-Ty2nF3qL5VQyZZcAaCBuBVohT7eMtwrKwFSv9TZCx0k=" }, { "pname": "Hangfire.AspNetCore", - "version": "1.8.15", - "hash": "sha256-LSSGantQQrOf7DPUQitrUyVAfNxyAKo+dWLZ3F59gM4=" + "version": "1.8.18", + "hash": "sha256-tQx6bh68ZJk+kG2d3hszAzAY+9yPzoNqvlfgccsXfxc=" }, { "pname": "Hangfire.Core", @@ -86,8 +81,8 @@ }, { "pname": "Hangfire.Core", - "version": "1.8.15", - "hash": "sha256-jnHP60tTlWbpHNZ5hIlYTrQ6uyFtBsUqJliw6tJF3EQ=" + "version": "1.8.18", + "hash": "sha256-erTLLsfI1Vo58zke9qqI1n2PCFqCGBoH0J0/f+WCwnQ=" }, { "pname": "Hangfire.InMemory", @@ -101,13 +96,13 @@ }, { "pname": "Hangfire.NetCore", - "version": "1.8.15", - "hash": "sha256-l99cRfSCnDlFrhRWRDqJMWf9Hy0DjiVCsiYz6eLFEHA=" + "version": "1.8.18", + "hash": "sha256-pensGJ3OJTydVhi5ziaVPCKNpOe9EMlimohtFmBw0bo=" }, { "pname": "Hangfire.SqlServer", - "version": "1.8.15", - "hash": "sha256-aIYnrHvJQtrOPJj15ltOOPgDk2kj1KdMYfd0bjbieME=" + "version": "1.8.18", + "hash": "sha256-mirQEgFPCXdvxE9XqXGUDizjixAlkUZ6WSJIk0Ovpuc=" }, { "pname": "Hangfire.Storage.SQLite", @@ -116,8 +111,8 @@ }, { "pname": "HtmlAgilityPack", - "version": "1.11.70", - "hash": "sha256-V/SI2N1+jNkwjSQRd2Y/XVVhdOKvSNz3/NeIFE9V3wY=" + "version": "1.11.74", + "hash": "sha256-kp9Hd6H6YfVI8xGOQXTcpcLXDen85tzI423vsJkL6Zo=" }, { "pname": "Humanizer.Core", @@ -126,8 +121,8 @@ }, { "pname": "MailKit", - "version": "4.8.0", - "hash": "sha256-ONvrVOwjxyNrIQM8FMzT5mLzlU56Kc8oOwkzegNAiXM=" + "version": "4.10.0", + "hash": "sha256-LnpMn+yD5gWrEmZ8dsHf80aBV1KM508uM91C4TftPsk=" }, { "pname": "MarkdownDeep.NET.Core", @@ -136,168 +131,183 @@ }, { "pname": "Microsoft.AspNetCore.Authentication.Abstractions", - "version": "2.2.0", - "hash": "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24=" + "version": "2.3.0", + "hash": "sha256-UwMVhuE3TBEO7G0QJrghhYrgkYw2p9WR87yHQ1ty2RI=" }, { "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", - "version": "8.0.10", - "hash": "sha256-FNUdNGdNG/a1PAFh9SADmCF0h8+Be4r/Q3izKML3tas=" + "version": "9.0.2", + "hash": "sha256-X/n1/FojwBdgJpAwgfUjTzt6sStEsjTX5KyZWXm1cGA=" }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "8.0.10", - "hash": "sha256-Ygtk026vu/i9ZoxrLGSiDNmDZqCJBwsvM9jNpJz9IPU=" + "version": "9.0.2", + "hash": "sha256-xqyfZOksphmvaN71bM5on4xf8usOSiKvGZ1j8F250IE=" }, { "pname": "Microsoft.AspNetCore.Authorization", - "version": "2.2.0", - "hash": "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY=" + "version": "2.3.0", + "hash": "sha256-UbxzeOIh76eCOMgC8A92KwfgOAljyT0k8En+l4PZDtA=" }, { "pname": "Microsoft.AspNetCore.Authorization.Policy", - "version": "2.2.0", - "hash": "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q=" + "version": "2.3.0", + "hash": "sha256-nMV4Yt6810pXITTxMysPIpfenu+3AnY7jq2LkPrkV00=" }, { "pname": "Microsoft.AspNetCore.Connections.Abstractions", - "version": "2.2.0", - "hash": "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY=" + "version": "2.3.0", + "hash": "sha256-qvA9LDr8vOLaERoxia/KRnVmf2q15n7OHKNsBY6t6xw=" }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", - "version": "8.0.10", - "hash": "sha256-zR9xbcGD4yU/oo/c9dQ4AKTMFT+HSBsfu0oNV6bjPNo=" + "version": "9.0.2", + "hash": "sha256-rGpA88L92YFSNeMZCoO74QTGOpmcgNqhYJ6norXX3eU=" }, { "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation", - "version": "8.0.10", - "hash": "sha256-S4klWSZI+QeQkXNXnzr91JMyKCmWSekqV1tvlFgHljo=" + "version": "9.0.2", + "hash": "sha256-crQVw+JYWjOshBokx2W5fUEa+6oitZIJKEhXIsDg70g=" }, { "pname": "Microsoft.AspNetCore.Hosting.Abstractions", - "version": "2.2.0", - "hash": "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA=" + "version": "2.3.0", + "hash": "sha256-gtiRMQA5kO1biIVaBLjSq0/jVVpiI8WzS136z/Ex1zs=" }, { "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions", - "version": "2.2.0", - "hash": "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s=" + "version": "2.3.0", + "hash": "sha256-ltKZ02L3cXu2dCx1JGEt1X8gQgwTABn45QkBsREYxaw=" }, { "pname": "Microsoft.AspNetCore.Http", - "version": "2.2.0", - "hash": "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk=" + "version": "2.3.0", + "hash": "sha256-ubPGvFwMjXbydY1gzo/m31pWq5/SsS/tGRtOotHFfBU=" }, { "pname": "Microsoft.AspNetCore.Http.Abstractions", - "version": "2.2.0", - "hash": "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8=" + "version": "2.3.0", + "hash": "sha256-NrAFzk5IcxmeRk3Zu+rLcq0+KKiAYfygJbAdIt2Zpfk=" }, { "pname": "Microsoft.AspNetCore.Http.Connections", - "version": "1.1.0", - "hash": "sha256-mPo2jkfWmeA1yz87Vv/jwWMOkHFR+yPHNntkJShDkA8=" + "version": "1.2.0", + "hash": "sha256-uev0FzYG2Ppl09h//B3BFxooD0uRm0ENO2jgOsABedM=" }, { "pname": "Microsoft.AspNetCore.Http.Connections.Common", - "version": "1.1.0", - "hash": "sha256-PooDjJHsIcZkL2IOp530pJr4GLGlre2sIdboNRrAcHQ=" + "version": "1.2.0", + "hash": "sha256-eXIg7vJSl1x0xWcxTKmgUiGRJnEfnp/TEe0xqL0629w=" }, { "pname": "Microsoft.AspNetCore.Http.Extensions", - "version": "2.2.0", - "hash": "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U=" + "version": "2.3.0", + "hash": "sha256-sOVwC5wK5w85R+HbYkBlfPpmknyAEig3g0uVnTSGwhI=" }, { "pname": "Microsoft.AspNetCore.Http.Features", - "version": "2.2.0", - "hash": "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc=" + "version": "2.3.0", + "hash": "sha256-QkNFS3ScDLyt0XppATSogbF1raSQJN+wStcnAsSoUJw=" }, { "pname": "Microsoft.AspNetCore.Identity.EntityFrameworkCore", - "version": "8.0.10", - "hash": "sha256-1Tpim7X/sglHkUMP3R07jioVgcy+4C+hKWf8FKusnBo=" + "version": "9.0.2", + "hash": "sha256-0AAxLKe2QwrfdGzBVWImKYSZyz8JLEErjf+/vFVVYzU=" }, { "pname": "Microsoft.AspNetCore.Routing", - "version": "2.2.0", - "hash": "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o=" + "version": "2.3.0", + "hash": "sha256-bXrYeVgI+sm2e5eOCwOkdWyCf5b7dQ8kv+pJRaeLiHI=" }, { "pname": "Microsoft.AspNetCore.Routing.Abstractions", - "version": "2.2.0", - "hash": "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU=" + "version": "2.3.0", + "hash": "sha256-pSPpwAU/zEidmBcRjSuz71fs5CIBRWF8yp/ujsIBXok=" }, { "pname": "Microsoft.AspNetCore.SignalR", - "version": "1.1.0", - "hash": "sha256-VCTxQAWRKBk640FhkGu4XUcfWXWSV8x4jEfezDoM4Jo=" + "version": "1.2.0", + "hash": "sha256-83ogiJwoHL0XBOnGFQYopGTlzEyen1ep4aXesWSl/sg=" }, { "pname": "Microsoft.AspNetCore.SignalR.Common", - "version": "1.1.0", - "hash": "sha256-XSltgjH11X4a1mhtcVHR7dL4EOpbIZ/oWfP587jBzD0=" + "version": "1.2.0", + "hash": "sha256-ULMhoU12HCOE6BMAjdZpsbgIPGjtHeggnn7RkyPHmag=" }, { "pname": "Microsoft.AspNetCore.SignalR.Core", "version": "1.1.0", "hash": "sha256-8NYrz6J0cVF+eBW/2B6oObwtD82Ze74H6TV+a1xRPtM=" }, + { + "pname": "Microsoft.AspNetCore.SignalR.Core", + "version": "1.2.0", + "hash": "sha256-FbLZ4BbD5wYOoEyfqZ9C7Y5hJldXlbm1q3QJlkxgp68=" + }, { "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json", - "version": "1.1.0", - "hash": "sha256-JIG9czeHrRRruPNNOYF/ct8fQSGDzbePG4Dfn9dYnn0=" + "version": "1.2.0", + "hash": "sha256-j2oYNJEX9r4owDiHMI83cglxkyP5Gty0Y0aFzA7avBo=" }, { "pname": "Microsoft.AspNetCore.WebSockets", - "version": "2.2.0", - "hash": "sha256-YxlVwhhqRtABF9BAxlJJFITcMUf1w6m45Br2Qto0MUI=" + "version": "2.3.0", + "hash": "sha256-D3h1Im37SQlDnIl3LiKb7Roje34qPeaRoeP3nEm0p3Y=" }, { "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "2.2.0", - "hash": "sha256-UdfOwSWqOUXdb0mGrSMx6Z+d536/P+v5clSRZyN5QTM=" + "version": "2.3.0", + "hash": "sha256-oJMEP44Q9ClhbyZUPtSb9jqQyJJ/dD4DHElRvkYpIOo=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "version": "7.0.0", + "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" }, { - "pname": "Microsoft.Bcl.TimeProvider", - "version": "8.0.1", - "hash": "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c=" + "pname": "Microsoft.Build.Framework", + "version": "16.10.0", + "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.8.3", + "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34=" + }, + { + "pname": "Microsoft.Build.Locator", + "version": "1.7.8", + "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.5.0", - "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I=" + "version": "4.8.0", + "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.5.0", - "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A=" + "version": "4.8.0", + "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "4.5.0", - "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o=" + "version": "4.8.0", + "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE=" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "4.5.0", - "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI=" + "version": "4.8.0", + "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM=" }, { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" + "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild", + "version": "4.8.0", + "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU=" }, { "pname": "Microsoft.CSharp", @@ -306,43 +316,43 @@ }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.10", - "hash": "sha256-YBjY88KAC4ShfcGXcNHL6y1A9NH2xvk4d/qTMfuLuoE=" + "version": "9.0.2", + "hash": "sha256-ZUVDe+oy7fAWcnQDRdhkVeN7YZkJewwqBNaxdZcykiM=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.10", - "hash": "sha256-kj/PFfEdCxygb8AYuD0U6F1VPo7jBicxC3N3p/U74rM=" + "version": "9.0.2", + "hash": "sha256-ew+vhHqu+4Hgc5xKiIwEHYWD8dsXqtHmu8Ctre5MrXc=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.10", - "hash": "sha256-OwqqkvChI8qSIabo17MNmcWyby6TT5ZXv5cnOeyVFGw=" + "version": "9.0.2", + "hash": "sha256-FNTvIJPkG6jlEE+3p4/qeL7NPDKNDgDCYlIrSn1gQ4E=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.10", - "hash": "sha256-8qxvGV3dQMM8vGxEi7YqOimfWDQYFp3QVMNe3ryiO7g=" + "version": "9.0.2", + "hash": "sha256-qXwOxUCeg4b4NSLFD3Ws/D161uQoozM+EiBThp7IeBY=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.10", - "hash": "sha256-Nbwn3aeVyDl7rGftchEzFcqnTNkvArqKafaarQiCWQw=" + "version": "9.0.2", + "hash": "sha256-f5LMTlXnb13wKQOofCJJ+TyEPOnHi9FpTaHaiYwJF80=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.10", - "hash": "sha256-n9xRg8WYjNLB92wMVNL/I5D3AKvtM9w0ICJ+Tieq5VQ=" + "version": "9.0.2", + "hash": "sha256-IGc3xy455dFu+z6M0Vaqqm09VXehb/XFquOgtpTLcGk=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "8.0.10", - "hash": "sha256-Y0OghTa4r7VSV3jE8ZXzP8zU2eIDx/9CLAnPoNzP+vE=" + "version": "9.0.2", + "hash": "sha256-ucYyVaLWpRk6Xl0OtX9qp8Nr0gktElgIML5b/JPItX4=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "8.0.10", - "hash": "sha256-NYoX3vaq687M1VfJWBMzItsBqSuRPnrL/IOIRpy6W9c=" + "version": "9.0.2", + "hash": "sha256-LqWVpwwj837DHoQuk/aq78Y9lwD/oWDJAxwLNdYN1No=" }, { "pname": "Microsoft.Extensions.ApiDescription.Server", @@ -351,13 +361,13 @@ }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "8.0.0", - "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI=" + "version": "9.0.2", + "hash": "sha256-fSHzO0OgH+bSuq7vxMhe8gw17Cx2ouMLen9IsJAOD7c=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "8.0.1", - "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps=" + "version": "9.0.2", + "hash": "sha256-QBqH+WqnJrzjLFekeu8yCGyRBRfiMUPihfhLi+Wtm7w=" }, { "pname": "Microsoft.Extensions.Configuration", @@ -365,29 +375,29 @@ "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" }, { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.2.0", - "hash": "sha256-5Jjn+0WZQ6OiN8AkNlGV0XIaw8L+a/wAq9hBD88RZbs=" + "pname": "Microsoft.Extensions.Configuration", + "version": "9.0.2", + "hash": "sha256-AUNaLhYTcHUkqKGhSL7QgrifV9JkjKhNQ4Ws8UtZhlM=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "3.0.0", "hash": "sha256-GJDvt3qFAif5ToFjHgs8imCaUER7yvYJghnlYXiHrHU=" }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "6.0.0", - "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" - }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "6.0.0", - "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y=" + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.2", + "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", @@ -399,45 +409,45 @@ "version": "8.0.2", "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.2", + "hash": "sha256-lYWUfvSnpp9M4N4wIfFnMlB+8K79g9uUa1NXsgnxs0k=" + }, { "pname": "Microsoft.Extensions.Configuration.CommandLine", - "version": "8.0.0", - "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg=" + "version": "9.0.2", + "hash": "sha256-qsEwiAO/n2+k8Q8/AftqdSlvvQWDx7WKb+9VlP8Nuxw=" }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", - "version": "8.0.0", - "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48=" + "version": "9.0.2", + "hash": "sha256-XgSdv8+zh2vXmhP+a31/+Y+mNLwQwLflfCiEtDemea0=" }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "8.0.1", - "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" + "version": "9.0.2", + "hash": "sha256-eeZbwf2lcV74mjXtOX8q0MxvP4QzEYyHXr1EGFS/orU=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "8.0.1", - "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" + "version": "9.0.2", + "hash": "sha256-7/ewyjh0gXu798fYcJxOCkdaAPIzrJ8reuTzqz93IJ0=" }, { "pname": "Microsoft.Extensions.Configuration.UserSecrets", - "version": "8.0.1", - "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0=" + "version": "9.0.2", + "hash": "sha256-0OmAQn8gIqTPN4s0NkcidXivjq5LsEGiNVxmp3qxGoo=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.1", - "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.0.0", - "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.2.0", - "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s=" + "version": "9.0.2", + "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -464,6 +474,16 @@ "version": "8.0.2", "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.0", + "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.2", + "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" + }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "3.1.6", @@ -471,28 +491,28 @@ }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.2", - "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + "version": "9.0.0", + "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.2", + "hash": "sha256-KqR0yrNi7S8rDje4RYjTEC98XG0rBreO4wkHGO6Llks=" }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.1", - "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + "version": "9.0.2", + "hash": "sha256-ImTZ6PZyKEdq1XvqYT5DPr6cG0BSTrsrO7rTDuy29fc=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "8.0.0", - "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" + "version": "9.0.0", + "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "8.0.1", - "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "2.2.0", - "hash": "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k=" + "version": "9.0.2", + "hash": "sha256-JTJ8LCW3aYUO86OPgXRQthtDTUMikOfILExgeOF8CX4=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", @@ -504,145 +524,135 @@ "version": "8.0.0", "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "9.0.0", + "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "9.0.2", + "hash": "sha256-RmVshMCWW1/RE/Wk8AeT4r6uZ+XFuwDFYzdxYKSm440=" + }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "8.0.0", - "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + "version": "9.0.2", + "hash": "sha256-vQBgVLW813wOnJ1+943ArDWReok6p0jAl7fhwvyFtL8=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "8.0.0", - "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + "version": "9.0.2", + "hash": "sha256-oH6X8SQjqi5Q2HLRILcUr9iPqnC1Ky5m5GbYYCKCxag=" }, { "pname": "Microsoft.Extensions.Hosting", - "version": "8.0.1", - "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4=" - }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "2.2.0", - "hash": "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U=" + "version": "9.0.2", + "hash": "sha256-eI9ckarRX0UCX+mBsEBYdvHZrmN86bXyTRvbH4gU9JM=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "3.0.0", "hash": "sha256-iUMCRR9uHSoub48MboewTxokP5QwrC47X5t+C+JUMo4=" }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "8.0.0", - "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" - }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "8.0.1", "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "9.0.0", + "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "9.0.2", + "hash": "sha256-PUCam4g5g84qIqfPA9sVBNVPA26rWFq7js9nHF3WLZc=" + }, { "pname": "Microsoft.Extensions.Identity.Core", - "version": "8.0.10", - "hash": "sha256-vL4KIPHHCWfTJp+aozejVqLuDw1MK9Fw6LFyfRxnY1s=" + "version": "9.0.2", + "hash": "sha256-5aLS+VE+FqHozXW4qFu5gyGpV8HqIfGzRnUV/zXM2/Q=" }, { "pname": "Microsoft.Extensions.Identity.Stores", - "version": "8.0.10", - "hash": "sha256-Z6GZXZiheTcxi4GuGqP4DtqtVuEchI66IlX2UAyqxMU=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "2.0.0", - "hash": "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo=" + "version": "9.0.2", + "hash": "sha256-Em/aKN8WTmwg79RdK6+QDx1iVTR0qCK6/f54GW2HCjo=" }, { "pname": "Microsoft.Extensions.Logging", "version": "6.0.0", "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" - }, { "pname": "Microsoft.Extensions.Logging", "version": "8.0.1", "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" }, { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.0.0", - "hash": "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ=" + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.0", + "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" }, { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.2.0", - "hash": "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws=" + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.2", + "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "3.0.0", "hash": "sha256-p70uTENWQc0J7ibLHlRHWk3RYZg0DMP3g2m4kAUaoxA=" }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "6.0.0", - "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.0", - "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" - }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.2", "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" }, { - "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "8.0.0", - "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.0", + "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.2", + "hash": "sha256-mCxeuc+37XY0bmZR+z4p1hrZUdTZEg+FRcs/m6dAQDU=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", "version": "8.0.1", "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE=" }, + { + "pname": "Microsoft.Extensions.Logging.Configuration", + "version": "9.0.2", + "hash": "sha256-SeNQ8us2cZ8xbJx8TK7xm3IxQR95EanSfMYhqvP2pWU=" + }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "8.0.1", - "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU=" + "version": "9.0.2", + "hash": "sha256-yD30lW3ax4JHmZ9QIp1b0ELrXiwykP5KHF/feJGweyE=" }, { "pname": "Microsoft.Extensions.Logging.Debug", - "version": "8.0.1", - "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg=" + "version": "9.0.2", + "hash": "sha256-0WP9jFTsbXCIhYx/2IFL69mv2+K3Ld7C4QvwY00iOD0=" }, { "pname": "Microsoft.Extensions.Logging.EventLog", - "version": "8.0.1", - "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8=" + "version": "9.0.2", + "hash": "sha256-e4q/Z6xLq2HzQiKI7npagyEZdkfUe+FbIz3Tg+hPH9g=" }, { "pname": "Microsoft.Extensions.Logging.EventSource", - "version": "8.0.1", - "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" + "version": "9.0.2", + "hash": "sha256-W7yidllNOKxTvgIUqjJ3h55PAIR/XREfbuH+8TUhD0o=" }, { "pname": "Microsoft.Extensions.ObjectPool", - "version": "2.2.0", - "hash": "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.0.0", - "hash": "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.2.0", - "hash": "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw=" + "version": "8.0.11", + "hash": "sha256-xutYzUA86hOg0NfLcs/NPylKvNcNohucY1LpSEkkaps=" }, { "pname": "Microsoft.Extensions.Options", @@ -659,6 +669,16 @@ "version": "8.0.2", "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.0", + "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.2", + "hash": "sha256-y2jZfcWx/H6Sx7wklA248r6kPjZmzTTLGxW8ZxrzNLM=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "6.0.0", @@ -670,19 +690,9 @@ "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" }, { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.0.0", - "hash": "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.2.0", - "hash": "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "3.0.0", - "hash": "sha256-cwlj0X19gngcOB7kpODhF/h96/L6psMLBIOd2pf3CbU=" + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "9.0.2", + "hash": "sha256-xOYLRlXDI4gMEoQ+J+sQBNRT2RPDNrSCZkob7qBiV10=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -695,49 +705,49 @@ "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, { - "pname": "Microsoft.IdentityModel.Abstractions", - "version": "7.1.2", - "hash": "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY=" + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.2", + "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s=" }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.2.0", - "hash": "sha256-e+BmN/Et9mTqWt4M38udL47M4wHHs25Ob299gJSBZIM=" + "version": "8.6.0", + "hash": "sha256-0mXOkDKvUikcyCMUcmA7PWl4RlAwwUciKSqTTgLDa3o=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.2.0", - "hash": "sha256-tOzI2GmMISuWO/vDtJIeKmYAaFPYjrB5NhpzCWWcIw4=" + "version": "8.6.0", + "hash": "sha256-Wey0xjL0n6NCi4HiVFGcDS6+ONPp+ogzb5ZTF7sFt3k=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "7.1.2", - "hash": "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o=" - }, - { - "pname": "Microsoft.IdentityModel.Logging", - "version": "8.2.0", - "hash": "sha256-JdrIo2Dg9UPu/eK5TIPKLWfRmvPGhKZrBCQL+MIv72I=" + "version": "8.6.0", + "hash": "sha256-4M4EUJDMDgmqdBxlbptnrLNWOLbmzatypDpl30CBUlk=" }, { "pname": "Microsoft.IdentityModel.Protocols", - "version": "7.1.2", - "hash": "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI=" + "version": "8.0.1", + "hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg=" }, { "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", - "version": "7.1.2", - "hash": "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs=" + "version": "8.0.1", + "hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "7.1.2", - "hash": "sha256-qf8y8KCo1ysrK+jCrnR+ARHwlfMWPXLxe7a41FVg4OA=" + "version": "8.0.1", + "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.2.0", - "hash": "sha256-QxhnZVUrKKUZEKZgok2+4HjawuXZtVhXCJ2+BDomja8=" + "version": "8.6.0", + "hash": "sha256-gyZpy8h9I09fr7icHaIXaxRTzhstHrrrq2wkd/5vz78=" }, { "pname": "Microsoft.IO.RecyclableMemoryStream", @@ -746,59 +756,19 @@ }, { "pname": "Microsoft.Net.Http.Headers", - "version": "2.2.0", - "hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA=" - }, - { - "pname": "Microsoft.NETCore.Jit", - "version": "1.0.2", - "hash": "sha256-T92T+bmdXfpAe73OKFTYXGJW1gTHuwcryBSgV7mwSkk=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + "version": "2.3.0", + "hash": "sha256-XY3OyhKTzUVbmMnegp0IxApg8cw97RD9eXC2XenrOqE=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.0.0", - "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, - { - "pname": "Microsoft.NETCore.Portable.Compatibility", - "version": "1.0.1", - "hash": "sha256-xQ1YqrDXB0cg6u9v8MHM+Ygv2c7lxLVIGZRfsWXIiuM=" - }, - { - "pname": "Microsoft.NETCore.Runtime.CoreCLR", - "version": "1.0.2", - "hash": "sha256-7K5EruLlrFmN3rAfXZMPK3hfhS728k5Gew0e+L3Ur8M=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" - }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, - { - "pname": "Microsoft.NETCore.Windows.ApiSets", - "version": "1.0.1", - "hash": "sha256-6PR4o/wQxBaJ5eRdt/awSO80EP3QqpWIk0XkCR9kaJo=" - }, { "pname": "Microsoft.OpenApi", "version": "1.3.1", @@ -806,8 +776,8 @@ }, { "pname": "Microsoft.OpenApi", - "version": "1.6.14", - "hash": "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM=" + "version": "1.6.22", + "hash": "sha256-DDyPc6DAD/X4PgXlVIYqqU5KLwaIaMpvBml1fACKdjY=" }, { "pname": "Microsoft.Win32.Primitives", @@ -816,13 +786,13 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "8.0.0", - "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ=" + "version": "9.0.2", + "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI=" }, { "pname": "MimeKit", - "version": "4.8.0", - "hash": "sha256-4EB54ktBXuq5QRID9i8E7FzU7YZTE4wwH+2yr7ivi/Q=" + "version": "4.10.0", + "hash": "sha256-SLQ7+Yh3o8bbxyRsA5yJgeAOkR8SqMI0vB8VwjQDzl8=" }, { "pname": "MimeTypeMapOfficial", @@ -831,8 +801,8 @@ }, { "pname": "Mono.TextTemplating", - "version": "2.2.1", - "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY=" + "version": "3.0.0", + "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0=" }, { "pname": "Nager.ArticleNumber", @@ -914,20 +884,10 @@ "version": "11.0.2", "hash": "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0=" }, - { - "pname": "Newtonsoft.Json", - "version": "12.0.2", - "hash": "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA=" - }, - { - "pname": "Newtonsoft.Json", - "version": "9.0.1", - "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" - }, { "pname": "NReco.Logging.File", - "version": "1.2.1", - "hash": "sha256-zFAeY5b3Bdy9EOxJcx8eyaXE4gMSRg6auDhQLm+/oLY=" + "version": "1.2.2", + "hash": "sha256-guI+h8t26u/DfYq354CXbdKIBqrKsDAyDZh1wFtDshw=" }, { "pname": "runtime.any.System.Collections", @@ -1141,13 +1101,13 @@ }, { "pname": "Serilog", - "version": "4.1.0", - "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k=" + "version": "4.2.0", + "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" }, { "pname": "Serilog.AspNetCore", - "version": "8.0.3", - "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I=" + "version": "9.0.0", + "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ=" }, { "pname": "Serilog.Enrichers.Thread", @@ -1156,8 +1116,8 @@ }, { "pname": "Serilog.Extensions.Hosting", - "version": "8.0.0", - "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E=" + "version": "9.0.0", + "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw=" }, { "pname": "Serilog.Extensions.Logging", @@ -1166,18 +1126,18 @@ }, { "pname": "Serilog.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA=" + "version": "9.0.0", + "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw=" }, { "pname": "Serilog.Formatting.Compact", - "version": "2.0.0", - "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g=" + "version": "3.0.0", + "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY=" }, { "pname": "Serilog.Settings.Configuration", - "version": "8.0.4", - "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ=" + "version": "9.0.0", + "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I=" }, { "pname": "Serilog.Sinks.AspNetCore.SignalR", @@ -1191,8 +1151,8 @@ }, { "pname": "Serilog.Sinks.Debug", - "version": "2.0.0", - "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" + "version": "3.0.0", + "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE=" }, { "pname": "Serilog.Sinks.File", @@ -1206,23 +1166,18 @@ }, { "pname": "SharpCompress", - "version": "0.38.0", - "hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM=" + "version": "0.39.0", + "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE=" }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.5", - "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw=" + "version": "3.1.7", + "hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4=" }, { "pname": "SonarAnalyzer.CSharp", - "version": "10.3.0.106239", - "hash": "sha256-42ODQdtI3JHem4zhkty2Kk9DrAWICxFDoTCnmULraf0=" - }, - { - "pname": "SonarAnalyzer.CSharp", - "version": "9.32.0.97167", - "hash": "sha256-F8f9YjBZekwIowIm6LKfjowqmCyhLUuTFQIcjEEVDPg=" + "version": "10.7.0.110445", + "hash": "sha256-HIG3Us7EnfaZOLKjxDRCJjaoqwqCdrFuDI2GlMGadp4=" }, { "pname": "sqlite-net-pcl", @@ -1231,8 +1186,8 @@ }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", - "version": "2.1.6", - "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718=" + "version": "2.1.10", + "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ=" }, { "pname": "SQLitePCLRaw.bundle_green", @@ -1246,8 +1201,8 @@ }, { "pname": "SQLitePCLRaw.core", - "version": "2.1.6", - "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E=" + "version": "2.1.10", + "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8=" }, { "pname": "SQLitePCLRaw.lib.e_sqlite3", @@ -1256,8 +1211,8 @@ }, { "pname": "SQLitePCLRaw.lib.e_sqlite3", - "version": "2.1.6", - "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0=" + "version": "2.1.10", + "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc=" }, { "pname": "SQLitePCLRaw.provider.dynamic_cdecl", @@ -1266,13 +1221,13 @@ }, { "pname": "SQLitePCLRaw.provider.e_sqlite3", - "version": "2.1.6", - "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" + "version": "2.1.10", + "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" }, { "pname": "Swashbuckle.AspNetCore", - "version": "6.9.0", - "hash": "sha256-fmJjAfVHzbw/31IFPFUP31g46Y1XXIc1kr6VvYW5pCc=" + "version": "7.3.1", + "hash": "sha256-ZcTjOzUbSEIrlGPO/7M5C3wRqyhjZggNGJ3Sg6aUjf0=" }, { "pname": "Swashbuckle.AspNetCore.Filters", @@ -1286,13 +1241,8 @@ }, { "pname": "Swashbuckle.AspNetCore.Swagger", - "version": "5.0.0", - "hash": "sha256-TnAjQpCdwSH3rm1m3ptdoOGS4/9a8OOH3srAatG2gYw=" - }, - { - "pname": "Swashbuckle.AspNetCore.Swagger", - "version": "6.9.0", - "hash": "sha256-8KM21CWckFghGaqWahMa3V64+hUBrifAJnQ6P2VXlEk=" + "version": "7.3.1", + "hash": "sha256-ifpw7iIFjFD1tqWuJeFxxQ9AQv4VKKbg7uk+EMzCISg=" }, { "pname": "Swashbuckle.AspNetCore.SwaggerGen", @@ -1301,13 +1251,13 @@ }, { "pname": "Swashbuckle.AspNetCore.SwaggerGen", - "version": "6.9.0", - "hash": "sha256-Ni8Z9CFs+ybTX8IgDuSKA580ISQ55w032EeqWYQXwoc=" + "version": "7.3.1", + "hash": "sha256-ZgPqUgcK8iO+1cDqm4JxkJwg9atuj6f9uR2ty5z54Do=" }, { "pname": "Swashbuckle.AspNetCore.SwaggerUI", - "version": "6.9.0", - "hash": "sha256-V+3bEEpxSXPi9Sy1hHZEjY9qxuIpRWV5dKzaqYMSu40=" + "version": "7.3.1", + "hash": "sha256-0VmUWgbdW9L7YO+Xb79RsPsEJjXpDj/twLas1OlHlUs=" }, { "pname": "System.AppContext", @@ -1321,18 +1271,13 @@ }, { "pname": "System.Buffers", - "version": "4.5.0", - "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs=" + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" }, { "pname": "System.CodeDom", - "version": "4.4.0", - "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0=" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + "version": "6.0.0", + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { "pname": "System.Collections", @@ -1346,54 +1291,44 @@ }, { "pname": "System.Collections.Immutable", - "version": "6.0.0", - "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.5.0", - "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" }, { "pname": "System.Composition", - "version": "6.0.0", - "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw=" + "version": "7.0.0", + "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao=" }, { "pname": "System.Composition.AttributedModel", - "version": "6.0.0", - "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc=" + "version": "7.0.0", + "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM=" }, { "pname": "System.Composition.Convention", - "version": "6.0.0", - "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo=" + "version": "7.0.0", + "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk=" }, { "pname": "System.Composition.Hosting", - "version": "6.0.0", - "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4=" + "version": "7.0.0", + "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M=" }, { "pname": "System.Composition.Runtime", - "version": "6.0.0", - "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8=" + "version": "7.0.0", + "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0=" }, { "pname": "System.Composition.TypedParts", - "version": "6.0.0", - "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k=" + "version": "7.0.0", + "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s=" }, { "pname": "System.Console", "version": "4.3.0", "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" - }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", @@ -1409,20 +1344,10 @@ "version": "6.0.0", "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.0", - "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs=" - }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.1", - "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" + "version": "9.0.2", + "hash": "sha256-IoiQbH8To9UqzYgJzYpFbuiRV3KGU85y4ccPTyttP/w=" }, { "pname": "System.Diagnostics.Tools", @@ -1436,24 +1361,14 @@ }, { "pname": "System.Drawing.Common", - "version": "8.0.10", - "hash": "sha256-GOmBRym8DI9J3t2apGV0fTdpTgFL3hCJtzeUvgDDGD4=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" + "version": "9.0.2", + "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54=" }, { "pname": "System.Formats.Asn1", "version": "8.0.1", "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" - }, { "pname": "System.Globalization", "version": "4.3.0", @@ -1471,13 +1386,8 @@ }, { "pname": "System.IdentityModel.Tokens.Jwt", - "version": "8.2.0", - "hash": "sha256-Htz1I19N0/IWHF8tbyZC90wCqI5xLh42jMXI3GXkCP4=" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + "version": "8.6.0", + "hash": "sha256-9usJvCIfrtI6T94wSXKGoL3UjZlE+F4LE4Y5zsD3LxI=" }, { "pname": "System.IO", @@ -1486,8 +1396,8 @@ }, { "pname": "System.IO.Abstractions", - "version": "21.1.3", - "hash": "sha256-qgbg9Y5CUcll+mjJyeYp6xPED4FxwLbthr6b8Q64m4E=" + "version": "22.0.11", + "hash": "sha256-jFfPplSHoc8HfmLDexMustNaljMFiXK/CdH35vzju+4=" }, { "pname": "System.IO.Compression", @@ -1499,21 +1409,11 @@ "version": "4.3.0", "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, { "pname": "System.IO.FileSystem", "version": "4.3.0", "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", @@ -1521,39 +1421,24 @@ }, { "pname": "System.IO.Pipelines", - "version": "4.5.2", - "hash": "sha256-AXsErCMtJnoT1ZhYlChyObzAimwEp1Cl1L6X6fewuhA=" + "version": "7.0.0", + "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" }, { "pname": "System.IO.Pipelines", - "version": "6.0.3", - "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" - }, - { - "pname": "System.Linq", - "version": "4.1.0", - "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { "pname": "System.Linq", "version": "4.3.0", "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.0", - "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" - }, { "pname": "System.Linq.Expressions", "version": "4.3.0", "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, - { - "pname": "System.Memory", - "version": "4.5.1", - "hash": "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg=" - }, { "pname": "System.Memory", "version": "4.5.3", @@ -1581,13 +1466,8 @@ }, { "pname": "System.Net.WebSockets.WebSocketProtocol", - "version": "4.5.1", - "hash": "sha256-5g6C2vb0RCUiSBw/tlCUbmrIbCvT9zQ+w/45o3l6Ctg=" - }, - { - "pname": "System.ObjectModel", - "version": "4.0.12", - "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" + "version": "5.1.0", + "hash": "sha256-TCcPu94+/BpZ94sTdBA20RgD+qJvMsaTOqYKN+HxZBc=" }, { "pname": "System.ObjectModel", @@ -1599,51 +1479,31 @@ "version": "4.3.0", "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, - { - "pname": "System.Reflection", - "version": "4.1.0", - "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" - }, { "pname": "System.Reflection", "version": "4.3.0", "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, { "pname": "System.Reflection.Emit", "version": "4.3.0", "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" + "pname": "System.Reflection.Emit", + "version": "4.7.0", + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" - }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", @@ -1651,94 +1511,44 @@ }, { "pname": "System.Reflection.Metadata", - "version": "6.0.1", - "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" - }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" - }, { "pname": "System.Runtime", "version": "4.3.0", "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.4.0", - "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.1", - "hash": "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.2", - "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" - }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, { "pname": "System.Runtime.Handles", "version": "4.3.0", "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", @@ -1754,11 +1564,6 @@ "version": "4.3.0", "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" - }, { "pname": "System.Security.Claims", "version": "4.3.0", @@ -1791,8 +1596,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -1814,36 +1619,11 @@ "version": "4.3.0", "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.5.0", - "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" - }, { "pname": "System.Text.Encoding", "version": "4.3.0", "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" - }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", @@ -1851,29 +1631,24 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "4.5.0", - "hash": "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs=" + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" }, { "pname": "System.Text.Json", - "version": "4.7.2", - "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" + "version": "7.0.3", + "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" }, { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" + "pname": "System.Text.Json", + "version": "9.0.2", + "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, - { - "pname": "System.Threading", - "version": "4.0.11", - "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" - }, { "pname": "System.Threading", "version": "4.3.0", @@ -1881,39 +1656,24 @@ }, { "pname": "System.Threading.Channels", - "version": "4.5.0", - "hash": "sha256-34I/eRNA/R8tazesCaE0yzYf80n3iEN3UQIeFSUf31g=" + "version": "7.0.0", + "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" }, { "pname": "System.Threading.Channels", - "version": "6.0.0", - "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" + "version": "8.0.0", + "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, - { - "pname": "System.Threading.Thread", - "version": "4.0.0", - "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" - }, { "pname": "System.Threading.ThreadPool", "version": "4.3.0", @@ -1924,21 +1684,11 @@ "version": "4.3.0", "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" - }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" - }, { "pname": "System.Xml.XDocument", "version": "4.3.0", @@ -1946,13 +1696,18 @@ }, { "pname": "TestableIO.System.IO.Abstractions", - "version": "21.1.3", - "hash": "sha256-ZD+4JKFD6c50Kfd8AmPCO6g5jrkUFM6hGhA1W/0WvAA=" + "version": "22.0.11", + "hash": "sha256-zW1WYq/rHJF9DFzbSrVSejepEE32jtO6E0M6xSW3ZTI=" }, { "pname": "TestableIO.System.IO.Abstractions.Wrappers", - "version": "21.1.3", - "hash": "sha256-mS3xbH8p9rMNNpYxUb6Owb2CkDSfgnTr2XLxPKvL+6A=" + "version": "22.0.11", + "hash": "sha256-iy8sWpCe2+mG6zICnUT1qMEIz97DPcA6/P6KNonm9aM=" + }, + { + "pname": "Testably.Abstractions.FileSystem.Interface", + "version": "9.0.0", + "hash": "sha256-6JW+qDtqQT9StP4oTR7uO0NnmVc2xcjSZ6ds2H71wtg=" }, { "pname": "VersOne.Epub", @@ -1961,17 +1716,17 @@ }, { "pname": "xunit.assert", - "version": "2.9.2", - "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4=" + "version": "2.9.3", + "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA=" }, { "pname": "YamlDotNet", - "version": "16.1.3", - "hash": "sha256-xsti5h1ZUCS9Jvb4UGKdHrEudJIQXrbOe0USxSjWqjc=" + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" }, { "pname": "ZstdSharp.Port", - "version": "0.8.1", - "hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg=" + "version": "0.8.4", + "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo=" } ] diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 3ce35050642e..074df2f75d76 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.10", - "uiVersion": "0.19.10", - "serverHash": "sha256-RKXub6mpsDjm7kA/B+kMzLb/BZM4NuVRA3bPIPmc+vg=", - "serverCargoHash": "sha256-E+rml4PGJ3b/6Z22eZlhcudl2hfAS7OV2h7hqpsBoKQ=", - "uiHash": "sha256-QALxc4tKsflRcVJ99JYs7SSbgBWU9Y7SPIwxvLoVvM0=", - "uiPNPMDepsHash": "sha256-sEN8NUlXWuvfmuAaoy/Vx3X+xG/TbeAdYG2LfctcOGc=" + "serverVersion": "0.19.11", + "uiVersion": "0.19.11", + "serverHash": "sha256-veF+fJTjsB543PyBnnBN4rmejTWrnlnLghnP6mLDP7U=", + "serverCargoHash": "sha256-H9Eu/nKxK27OXvzPi5ItTbKcHqISKAjN17MRWsw5xlc=", + "uiHash": "sha256-K8nNb/HQy/s5S5h9Ndt3t8F9/h1D2zOGrTEKhv+Z4Ks=", + "uiPNPMDepsHash": "sha256-SqU/kYadwszogaBErP2v1VXIMhJj9AHRKdrHLc99fMw=" } diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index fa3fcc55ad95..26253b679db7 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_net"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; rev = "refs/tags/${version}"; - hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw="; + hash = "sha256-Cop2gI5xhhWhw5Cyb4CABSzqs2bxDreohOzgGh/wPXg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nQILwEZaVL1xJ/CKGGObogFGPmW0UPq0v3vFP2kHqWo="; + cargoHash = "sha256-8IlCUI0HOsr06vsSv0WBxfoaEe1Dz21tZdWZ6jrNkaw="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 33ef120c40bc..369eec6c9f88 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, - nixForLinking, + nixVersions, nlohmann_json, boost, graphviz, @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { doCheck = true; nativeCheckInputs = [ - nixForLinking + nixVersions.nix_2_24 graphviz ]; buildInputs = [ boost - nixForLinking + nixVersions.nix_2_24 nlohmann_json ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 4924db5e6fd6..d229bc50e301 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -13,25 +13,26 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.26.0"; + version = "2.28.0"; + src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0="; + hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA="; }; + buildInputs = [ boost nix curl nlohmann_json ]; + nativeBuildInputs = [ meson ninja pkg-config - # nlohmann_json can be only discovered via cmake files - cmake ]; # Since this package is intimately tied to a specific Nix release, we diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common-autoconf.nix similarity index 100% rename from pkgs/tools/package-management/nix/common.nix rename to pkgs/tools/package-management/nix/common-autoconf.nix diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix new file mode 100644 index 000000000000..d6d27f18ebd4 --- /dev/null +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -0,0 +1,287 @@ +{ + lib, + fetchFromGitHub, + version, + suffix ? "", + hash ? null, + src ? fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = version; + inherit hash; + }, + patches ? [ ], + maintainers ? lib.teams.nix.members ++ [ + lib.maintainers.lovesegfault + lib.maintainers.artturin + ], + self_attribute_name, +}@args: +assert (hash == null) -> (src != null); +{ + stdenv, + bison, + boehmgc, + boost, + brotli, + busybox-sandbox-shell, + bzip2, + callPackage, + cmake, + curl, + darwin, + doxygen, + editline, + flex, + git, + gtest, + jq, + lib, + libarchive, + libblake3, + libcpuid, + libgit2, + libsodium, + lowdown, + lowdown-unsandboxed, + toml11, + man, + meson, + ninja, + mdbook, + mdbook-linkcheck, + nlohmann_json, + nixosTests, + openssl, + perl, + python3, + pkg-config, + rapidcheck, + rsync, + Security, + sqlite, + util-linuxMinimal, + xz, + enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + enableStatic ? stdenv.hostPlatform.isStatic, + withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + aws-sdk-cpp, + withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, + libseccomp, + + confDir, + stateDir, + storeDir, + + # passthru tests + pkgsi686Linux, + pkgsStatic, + runCommand, + pkgs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nix"; + + version = "${version}${suffix}"; + VERSION_SUFFIX = suffix; + + inherit src patches; + + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals enableDocumentation [ + "man" + "doc" + ]; + + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; + + hardeningDisable = [ + "shadowstack" + ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify"; + + nativeCheckInputs = [ + git + man + ]; + + nativeBuildInputs = + [ + bison + cmake + flex + jq + meson + ninja + pkg-config + rsync + ] + ++ lib.optionals enableDocumentation [ + (lib.getBin lowdown-unsandboxed) + mdbook + mdbook-linkcheck + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + util-linuxMinimal + ] + ++ lib.optionals enableDocumentation [ + python3 + doxygen + ]; + + buildInputs = + [ + boost + brotli + bzip2 + curl + editline + libgit2 + libsodium + lowdown + openssl + sqlite + toml11 + xz + ] + ++ lib.optionals (lib.versionAtLeast version "2.26") [ + libblake3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + libcpuid + ] + ++ lib.optionals withLibseccomp [ + libseccomp + ] + ++ lib.optionals withAWS [ + aws-sdk-cpp + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + darwin.apple_sdk.libs.sandbox + ]; + + propagatedBuildInputs = [ + boehmgc + nlohmann_json + libarchive + ]; + + checkInputs = [ + gtest + rapidcheck + ]; + + postPatch = '' + patchShebangs --build tests + ''; + + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + lib.optionalString (!enableStatic) '' + mkdir -p $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.hostPlatform.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* + ''} + ''; + + dontUseCmakeConfigure = true; + + mesonFlags = + [ + (lib.mesonBool "bindings" false) + (lib.mesonOption "libstore:store-dir" storeDir) + (lib.mesonOption "libstore:localstatedir" stateDir) + (lib.mesonOption "libstore:sysconfdir" confDir) + (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64) + (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp) + (lib.mesonBool "libstore:embedded-sandbox-shell" ( + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic + )) + (lib.mesonBool "doc-gen" enableDocumentation) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") + # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 + ] + ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [ + # TODO: do we still need this? + # "--enable-lto" + ]; + + doCheck = true; + + # socket path becomes too long otherwise + preInstallCheck = + lib.optionalString stdenv.hostPlatform.isDarwin '' + export TMPDIR=$NIX_BUILD_TOP + '' + # See https://github.com/NixOS/nix/issues/5687 + + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + echo "exit 0" > tests/functional/flakes/show.sh + '' + + '' + # nixStatic otherwise does not find its man pages in tests. + export MANPATH=$man/share/man:$MANPATH + ''; + + separateDebugInfo = stdenv.hostPlatform.isLinux && enableStatic; + + passthru = { + inherit aws-sdk-cpp boehmgc; + + # TODO: + perl-bindings = perl.pkgs.toPerlModule ( + callPackage ./nix-perl.nix { + nix = finalAttrs.finalPackage; + inherit Security; + } + ); + + tests = import ./tests.nix { + inherit + runCommand + version + src + lib + stdenv + pkgs + pkgsi686Linux + pkgsStatic + nixosTests + self_attribute_name + ; + nix = finalAttrs.finalPackage; + }; + }; + + # point 'nix edit' and ofborg at the file that defines the attribute, + # not this common file. + pos = builtins.unsafeGetAttrPos "version" args; + meta = with lib; { + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; + homepage = "https://nixos.org/"; + license = licenses.lgpl21Plus; + inherit maintainers; + platforms = platforms.unix; + outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + mainProgram = "nix"; + }; +}) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 14ef652e076e..6fd7f3e18dbf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -20,20 +20,35 @@ let # Called for Nix < 2.26 - common = + commonAutoconf = args: - nixDependencies.callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) { + nixDependencies.callPackage + (import ./common-autoconf.nix ({ inherit lib fetchFromGitHub; } // args)) + { + inherit + Security + storeDir + stateDir + confDir + ; + aws-sdk-cpp = + if lib.versionAtLeast args.version "2.12pre" then + nixDependencies.aws-sdk-cpp + else + nixDependencies.aws-sdk-cpp-old; + }; + + # Called for Nix == 2.28. Transitional until we always use + # per-component packages. + commonMeson = + args: + nixDependencies.callPackage (import ./common-meson.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit Security storeDir stateDir confDir ; - aws-sdk-cpp = - if lib.versionAtLeast args.version "2.12pre" then - nixDependencies.aws-sdk-cpp - else - nixDependencies.aws-sdk-cpp-old; }; # https://github.com/NixOS/nix/pull/7585 @@ -140,7 +155,7 @@ lib.makeExtensible ( ( { nix_2_3 = - (common { + (commonAutoconf { version = "2.3.18"; hash = "sha256-jBz2Ub65eFYG+aWgSI3AJYvLSghio77fWQiIW1svA9U="; patches = [ @@ -155,63 +170,45 @@ lib.makeExtensible ( enableParallelChecking = false; }; - nix_2_24 = common { - version = "2.24.13"; - hash = "sha256-lUsK8lAwaaTEM+KFML/6sYwaVAiSf70g1EfSDJNNrU0="; + nix_2_24 = commonAutoconf { + version = "2.24.14"; + hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY="; self_attribute_name = "nix_2_24"; }; - nix_2_25 = common { + nix_2_25 = commonAutoconf { version = "2.25.5"; hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ="; self_attribute_name = "nix_2_25"; }; - nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix { + nix_2_26 = commonMeson { version = "2.26.3"; + hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; + self_attribute_name = "nix_2_28"; + }; + + nix_2_28 = commonMeson { + version = "2.28.1"; + hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; + self_attribute_name = "nix_2_28"; + }; + + nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.29pre20250407_${lib.substring 0 8 src.rev}"; inherit (self.nix_2_24.meta) maintainers; - otherSplices = generateSplicesForNixComponents "nixComponents_2_26"; + otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "42fc03dd1f12df2d9152303f3fb8bf22b746462c"; - hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY="; + rev = "73d3159ba0b4b711c1f124a587f16e2486d685d7"; + hash = "sha256-9wJXUGqXIqMjNyKWJKCcxrDHM/KxDkvJMwo6S3s+WuM="; }; }; - # Note, this might eventually become an alias, as packages should - # depend on the components they need in `nixComponents_2_26`. - nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything; + git = addTests "git" self.nixComponents_git.nix-everything; - nixComponents_2_27 = nixDependencies.callPackage ./modular/packages.nix { - version = "2.27.1"; - inherit (self.nix_2_24.meta) maintainers; - otherSplices = generateSplicesForNixComponents "nixComponents_2_27"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = "9cb662df7442a1e2c4600fb8ecb2ad613ebc5a95"; - hash = "sha256-rBPulEBpn4IiqkPsetuh7BRzT2iGCzZYnogTAsbrvhU="; - }; - }; - - nix_2_27 = addTests "nix_2_27" self.nixComponents_2_27.nix-everything; - - nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix { - version = "2.28.1pre"; - inherit (self.nix_2_24.meta) maintainers; - otherSplices = generateSplicesForNixComponents "nixComponents_2_28"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = "9cdf72beaa77f1e6c0faed44872b83783051f20d"; - hash = "sha256-0sk7cGOdfUA6/AamSsuURHdILxSyw+s2zl7CDaSsawo="; - }; - }; - - nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything; - - latest = self.nix_2_26; + latest = self.nix_2_28; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, @@ -231,7 +228,7 @@ lib.makeExtensible ( nix; # Read ./README.md before bumping a major release - stable = addFallbackPathsCheck self.nix_2_24; + stable = addFallbackPathsCheck self.nix_2_28; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs ( @@ -244,8 +241,10 @@ lib.makeExtensible ( ) (lib.range 4 23) ) // { + nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_28."; + nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28."; + unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake."; - git = throw "nixVersions.git has been removed. use nixVersions.latest or the nix flake."; } ) ) diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 99ce5101265b..f3b42e4c7c2e 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -14,11 +14,13 @@ meson, ninja, bzip2, + libarchive, }: let atLeast223 = lib.versionAtLeast nix.version "2.23"; atLeast224 = lib.versionAtLeast nix.version "2.24"; + atLeast226 = lib.versionAtLeast nix.version "2.26"; mkConfigureOption = { @@ -39,21 +41,24 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = "sourceRoot=$sourceRoot/${lib.optionalString atLeast224 "src"}/perl"; # TODO: Remove this once the nix build also uses meson - postPatch = lib.optionalString atLeast224 '' + postPatch = lib.optionalString (atLeast224 && lib.versionOlder nix.version "2.27") '' substituteInPlace lib/Nix/Store.xs \ --replace-fail 'config-util.hh' 'nix/config.h' \ --replace-fail 'config-store.hh' 'nix/config.h' ''; - buildInputs = [ - boost - bzip2 - curl - libsodium - nix - perl - xz - ] ++ lib.optional (stdenv.hostPlatform.isDarwin) Security; + buildInputs = + [ + boost + bzip2 + curl + libsodium + nix + perl + xz + ] + ++ lib.optional (stdenv.hostPlatform.isDarwin) Security + ++ lib.optional atLeast226 libarchive; # Not cross-safe since Nix checks for curl/perl via # NEED_PROG/find_program, but both seem to be needed at runtime diff --git a/pkgs/tools/package-management/nix/update-all.sh b/pkgs/tools/package-management/nix/update-all.sh index 547721d8b392..a2b459e67e7f 100755 --- a/pkgs/tools/package-management/nix/update-all.sh +++ b/pkgs/tools/package-management/nix/update-all.sh @@ -36,3 +36,9 @@ for name in $nix_versions; do break fi done + +commit_json=$(curl -s https://api.github.com/repos/NixOS/nix/commits/master) # format: 2024-11-01T10:18:53Z +date_of_commit=$(echo "$commit_json" | jq -r '.commit.author.date') +suffix="pre$(date -d "$date_of_commit" +%Y%m%d)_" +sed -i -e "s|\"pre[0-9]\{8\}_|\"$suffix|g" "$SCRIPT_DIR/default.nix" +nix-update --override-filename "$SCRIPT_DIR/default.nix" --version branch --build --commit "nixVersions.git" diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 42a048b78ca4..bba82db3d967 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -14,13 +14,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-9hUf6J3kTI0nvLExReUUovW8pZjlaoqgFmLd5mShZzU="; + hash = "sha256-QvU+JpIcE9EX+ehRWvs2bS2VGgGVekNX8f5+mITIwU0="; }; buildInputs = @@ -32,7 +32,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-jNRNjAecf84XzkPLWHjCYPxh1igUs7Yd0MSAmRcPtlc="; + vendorHash = "sha256-qIi+Pp4XZg1GxOhM9fCyD9rPaIiQHhoQudB50gzWgrM="; subPackages = [ "cmd/cosign" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ef6d5c20330d..cfa503f620ba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -546,6 +546,7 @@ mapAliases { emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06 emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17 @@ -1270,6 +1271,7 @@ mapAliases { opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 + openexr_3 = openexr; # Added 2025-03-12 openimageio2 = openimageio; # Added 2023-01-05 openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8419bbeab63..78392b5294eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -125,9 +125,7 @@ with pkgs; defaultPkgConfigPackages = # We don't want nix-env -q to enter this, because all of these are aliases. - dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs) // { - __attrsFailEvaluation = true; - }; + dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs); ### Nixpkgs maintainer tools @@ -361,10 +359,6 @@ with pkgs; copilot-language-server-fhs = copilot-language-server.fhs; - curv = callPackage ../by-name/cu/curv/package.nix { - openexr = openexr_3; - }; - databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { }; deck = callPackage ../by-name/de/deck/package.nix { @@ -3070,10 +3064,6 @@ with pkgs; cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; - chafa = callPackage ../tools/misc/chafa { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; clamav = callPackage ../tools/security/clamav { @@ -4736,7 +4726,6 @@ with pkgs; libclang = llvmPackages_15.libclang; clang = clang_15; llvm = llvm_15; - openexr = openexr_3; }; ossec-agent = callPackage ../tools/security/ossec/agent.nix { }; @@ -8921,7 +8910,7 @@ with pkgs; }; yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix { - jre = jdk17; + jre = jdk21; }; yq = python3.pkgs.toPythonApplication python3.pkgs.yq; @@ -9258,8 +9247,17 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; }; - factorPackages = callPackage ./factor-packages.nix { }; - factor-lang = factorPackages.factor-lang; + factorPackages-0_99 = callPackage ./factor-packages.nix { + factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { }; + }; + factorPackages-0_100 = callPackage ./factor-packages.nix { + factor-unwrapped = callPackage ../development/compilers/factor-lang/0.100.nix { }; + }; + factorPackages = factorPackages-0_100; + + factor-lang-0_99 = factorPackages-0_99.factor-lang; + factor-lang-0_100 = factorPackages-0_100.factor-lang; + factor-lang = factor-lang-0_100; far2l = callPackage ../applications/misc/far2l { inherit (darwin.apple_sdk.frameworks) @@ -9352,6 +9350,10 @@ with pkgs; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; + freeimage = callPackage ../by-name/fr/freeimage/package.nix { + openexr = openexr_2; + }; + freeipa = callPackage ../os-specific/linux/freeipa { # NOTE: freeipa and sssd need to be built with the same version of python kerberos = krb5.override { @@ -9395,6 +9397,7 @@ with pkgs; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenCL; + openexr = openexr_2; }; gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { }; @@ -9843,7 +9846,7 @@ with pkgs; hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; }; - hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; }; + hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_28; }; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) @@ -10783,6 +10786,7 @@ with pkgs; # TODO: LTO does not work. # https://github.com/NixOS/nixpkgs/issues/343123 enableLto = false; + openexr = openexr_2; }; opencv4WithoutCuda = opencv4.override { @@ -10791,9 +10795,8 @@ with pkgs; opencv = opencv4; - openexr = openexr_2; - openexr_2 = callPackage ../development/libraries/openexr { }; - openexr_3 = callPackage ../development/libraries/openexr/3.nix { }; + openexr = callPackage ../development/libraries/openexr/3.nix { }; + openexr_2 = callPackage ../development/libraries/openexr/2.nix { }; opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; @@ -11432,7 +11435,6 @@ with pkgs; vigra = callPackage ../development/libraries/vigra { hdf5 = hdf5.override { usev110Api = true; }; - openexr = openexr_3; }; vllm = with python3Packages; toPythonApplication vllm; @@ -12417,6 +12419,7 @@ with pkgs; withMysql = false; withNotification = false; withIcingadb = false; + withPerfdata = false; }; nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { }); @@ -13792,9 +13795,7 @@ with pkgs; airwave = libsForQt5.callPackage ../applications/audio/airwave { }; - alembic = callPackage ../development/libraries/alembic { - openexr = openexr_3; - }; + alembic = callPackage ../development/libraries/alembic { }; amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility @@ -13893,7 +13894,6 @@ with pkgs; }; blender = callPackage ../by-name/bl/blender/package.nix { - openexr = openexr_3; python3Packages = python311Packages; inherit (darwin.apple_sdk.frameworks) Cocoa @@ -14082,6 +14082,8 @@ with pkgs; hamlib = hamlib_4; }; + djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; + djview = libsForQt5.callPackage ../applications/graphics/djview { }; djview4 = djview; @@ -14174,7 +14176,6 @@ with pkgs; emacs30-nox emacs30-pgtk - emacs28-macport emacs29-macport ; @@ -14720,7 +14721,6 @@ with pkgs; hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK32; - openexr = openexr_3; }; huggle = libsForQt5.callPackage ../applications/misc/huggle { }; @@ -14929,7 +14929,6 @@ with pkgs; imagemagick = lowPrio ( callPackage ../applications/graphics/ImageMagick { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; - openexr = openexr_3; } ); @@ -15086,7 +15085,7 @@ with pkgs; }; kubelogin-oidc = callPackage ../by-name/ku/kubelogin-oidc/package.nix { - buildGoModule = buildGo123Module; + buildGoModule = buildGo124Module; }; kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { }; @@ -15247,7 +15246,9 @@ with pkgs; portaudio = null; }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { + openexr = openexr_2; + }; luddite = with python3Packages; toPythonApplication luddite; @@ -15683,7 +15684,6 @@ with pkgs; }; openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - openexr = openexr_3; }; open-music-kontrollers = lib.recurseIntoAttrs { @@ -18993,7 +18993,7 @@ with pkgs; nixosOptionsDoc = attrs: (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs); nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_26; + nix = nixVersions.nix_2_28; }; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; diff --git a/pkgs/top-level/factor-packages.nix b/pkgs/top-level/factor-packages.nix index eae05e694130..5ddc4ad86599 100644 --- a/pkgs/top-level/factor-packages.nix +++ b/pkgs/top-level/factor-packages.nix @@ -1,6 +1,7 @@ { lib, pkgs, + factor-unwrapped, overrides ? (self: super: { }), }: @@ -17,7 +18,7 @@ let { }; buildFactorVocab = callPackage ../development/compilers/factor-lang/mk-vocab.nix { }; - factor-unwrapped = callPackage ../development/compilers/factor-lang/unwrapped.nix { }; + inherit factor-unwrapped; factor-lang = callPackage ../development/compilers/factor-lang/wrapper.nix { }; factor-no-gui = callPackage ../development/compilers/factor-lang/wrapper.nix { diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 0def6c5b74b1..1b2c7126781a 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -7,38 +7,48 @@ with pkgs; compiler = let - mkOpenjdk = - featureVersion: path-darwin: - if stdenv.hostPlatform.isLinux then - mkOpenjdkLinuxOnly featureVersion - else - let - openjdk = callPackage path-darwin { }; - in - openjdk // { headless = openjdk; }; - - mkOpenjdkLinuxOnly = - featureVersion: - let - openjdk = callPackage ../development/compilers/openjdk/generic.nix { inherit featureVersion; }; - in - assert stdenv.hostPlatform.isLinux; - openjdk + # merge meta.platforms of both packages so that dependent packages and hydra build them + mergeMetaPlatforms = + jdk: other: + jdk // { - headless = openjdk.override { headless = true; }; + meta = jdk.meta // { + platforms = lib.unique (jdk.meta.platforms ++ other.meta.platforms); + }; }; + mkLinuxDarwin = + linux: darwin: + if stdenv.hostPlatform.isLinux then + mergeMetaPlatforms linux darwin + else + mergeMetaPlatforms darwin linux; + + mkOpenjdk = + featureVersion: + let + openjdkLinux = + (callPackage ../development/compilers/openjdk/generic.nix { inherit featureVersion; }) + // { + headless = mergeMetaPlatforms openjdkLinuxHeadless openjdkDarwin; + }; + openjdkLinuxHeadless = openjdkLinux.override { headless = true; }; + openjdkDarwin = (callPackage ../development/compilers/zulu/${featureVersion}.nix { }) // { + headless = mergeMetaPlatforms openjdkDarwin openjdkLinuxHeadless; + }; + in + mkLinuxDarwin openjdkLinux openjdkDarwin; in rec { corretto11 = callPackage ../development/compilers/corretto/11.nix { }; corretto17 = callPackage ../development/compilers/corretto/17.nix { }; corretto21 = callPackage ../development/compilers/corretto/21.nix { }; - openjdk8 = mkOpenjdk "8" ../development/compilers/zulu/8.nix; - openjdk11 = mkOpenjdk "11" ../development/compilers/zulu/11.nix; - openjdk17 = mkOpenjdk "17" ../development/compilers/zulu/17.nix; - openjdk21 = mkOpenjdk "21" ../development/compilers/zulu/21.nix; - openjdk23 = mkOpenjdk "23" ../development/compilers/zulu/23.nix; + openjdk8 = mkOpenjdk "8"; + openjdk11 = mkOpenjdk "11"; + openjdk17 = mkOpenjdk "17"; + openjdk21 = mkOpenjdk "21"; + openjdk23 = mkOpenjdk "23"; # Legacy aliases openjdk8-bootstrap = temurin-bin.jdk-8; @@ -46,21 +56,27 @@ with pkgs; openjdk17-bootstrap = temurin-bin.jdk-17; temurin-bin = recurseIntoAttrs ( - callPackage ( - if stdenv.hostPlatform.isLinux then - ../development/compilers/temurin-bin/jdk-linux.nix - else - ../development/compilers/temurin-bin/jdk-darwin.nix - ) { } + let + temurinLinux = import ../development/compilers/temurin-bin/jdk-linux.nix { + inherit (pkgs) lib callPackage stdenv; + }; + temurinDarwin = import ../development/compilers/temurin-bin/jdk-darwin.nix { + inherit (pkgs) lib callPackage; + }; + in + lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux ); semeru-bin = recurseIntoAttrs ( - callPackage ( - if stdenv.hostPlatform.isLinux then - ../development/compilers/semeru-bin/jdk-linux.nix - else - ../development/compilers/semeru-bin/jdk-darwin.nix - ) { } + let + semeruLinux = import ../development/compilers/semeru-bin/jdk-linux.nix { + inherit (pkgs) lib callPackage; + }; + semeruDarwin = import ../development/compilers/semeru-bin/jdk-darwin.nix { + inherit (pkgs) lib callPackage; + }; + in + lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux ); }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 10b69fde6708..0a41596ff0e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8068,15 +8068,16 @@ with self; }; }; - DataEntropy = buildPerlModule { + DataEntropy = buildPerlPackage { pname = "Data-Entropy"; - version = "0.007"; + version = "0.008"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz"; - hash = "sha256-JhHEoaMDhZTXnqTtFNnhWpr493EF9RZneV/k+KU0J+Q="; + url = "mirror://cpan/authors/id/R/RR/RRWO/Data-Entropy-0.008.tar.gz"; + hash = "sha256-GKUrE4boLGuM2zhKOYYdYCIKRCp5DgdwEL5y3YU7Z7M="; }; propagatedBuildInputs = [ CryptRijndael + CryptURandom DataFloat HTTPLite ParamsClassify diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 5705c8ad4c70..83885cd85cb5 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -395,7 +395,7 @@ }, "javascriptcoregtk-4.0": { "attrPath": [ - "webkitgtk" + "webkitgtk_4_0" ] }, "lapack": { @@ -837,12 +837,12 @@ }, "webkit2gtk-4.0": { "attrPath": [ - "webkitgtk" + "webkitgtk_4_0" ] }, "webkit2gtk-web-extension-4.0": { "attrPath": [ - "webkitgtk" + "webkitgtk_4_0" ] }, "x11": { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adb6667984aa..7f725c55c9c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2649,6 +2649,8 @@ self: super: with self; { colbert-ai = callPackage ../development/python-modules/colbert-ai { }; + colcon = callPackage ../development/python-modules/colcon { }; + collections-extended = callPackage ../development/python-modules/collections-extended { }; collidoscope = callPackage ../development/python-modules/collidoscope { }; @@ -5873,6 +5875,8 @@ self: super: with self; { grandalf = callPackage ../development/python-modules/grandalf { }; + granian = callPackage ../development/python-modules/granian { }; + graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal; }; grapheme = callPackage ../development/python-modules/grapheme { }; @@ -7472,6 +7476,8 @@ self: super: with self; { langgraph-cli = callPackage ../development/python-modules/langgraph-cli { }; + langgraph-prebuilt = callPackage ../development/python-modules/langgraph-prebuilt { }; + langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { }; langid = callPackage ../development/python-modules/langid { }; @@ -8234,9 +8240,7 @@ self: super: with self; { macaroonbakery = callPackage ../development/python-modules/macaroonbakery { }; - macfsevents = callPackage ../development/python-modules/macfsevents { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; - }; + macfsevents = callPackage ../development/python-modules/macfsevents { }; macholib = callPackage ../development/python-modules/macholib { }; @@ -12235,6 +12239,8 @@ self: super: with self; { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; + pyghmi = callPackage ../development/python-modules/pyghmi { }; + pygit2 = callPackage ../development/python-modules/pygit2 { }; pygitguardian = callPackage ../development/python-modules/pygitguardian { }; @@ -17082,6 +17088,8 @@ self: super: with self; { textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; + textual-image = callPackage ../development/python-modules/textual-image { }; + textual-serve = callPackage ../development/python-modules/textual-serve { }; textual-slider = callPackage ../development/python-modules/textual-slider { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index f15758260d33..340c8b92f133 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -79,6 +79,7 @@ let gmp = nativePlatforms; libcCross = nativePlatforms; nix = nativePlatforms; + nixVersions.git = nativePlatforms; mesa = nativePlatforms; rustc = nativePlatforms; cargo = nativePlatforms;