diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ce0ea992d7c..13fabf116258 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8029,6 +8029,13 @@ github = "hatch01"; githubId = 42416805; }; + Ezjfc = { + name = "EndermanbugZJFC"; + email = "endermanbugzjfc@gmail.com"; + github = "Ezjfc"; + githubId = 175898536; + keys = [ { fingerprint = "4319 2667 85A9 E6BD 9A84 4BC7 1313 15C2 0524 200C"; } ]; + }; ezrizhu = { name = "Ezri Zhu"; email = "me@ezrizhu.com"; @@ -15186,6 +15193,13 @@ github = "m1dugh"; githubId = 42266017; }; + m3l6h = { + email = "admin@michaelhollingworth.io"; + name = "Michael Hollingworth"; + github = "m3l6h"; + githubId = 8094643; + keys = [ { fingerprint = "BAA9 7711 58CA D457 B4AE 8B06 8188 423D 2FA2 0A65"; } ]; + }; ma27 = { email = "maximilian@mbosch.me"; matrix = "@ma27:nicht-so.sexy"; @@ -27725,6 +27739,12 @@ githubId = 474343; name = "Xavier Zwirtz"; }; + xavwe = { + email = "git@xavwe.dev"; + github = "xavwe"; + githubId = 125409009; + name = "Xaver Wenhart"; + }; XBagon = { name = "XBagon"; email = "xbagon@outlook.de"; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 892c9400406b..557cf59aa291 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -608,6 +608,12 @@ "module-services-suwayomi-server-extra-config": [ "index.html#module-services-suwayomi-server-extra-config" ], + "module-services-immich": [ + "index.html#module-services-immich" + ], + "module-services-immich-vectorchord-migration": [ + "index.html#module-services-immich-vectorchord-migration" + ], "module-services-paisa": [ "index.html#module-services-paisa" ], diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4ef84b41b94b..a123644d028f 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -174,7 +174,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable). -- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](#opt-services.pds.enable). +- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as {option}`services.pds`. - [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](#opt-services.anubis.defaultOptions). diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 9ac6c7502842..89d785f36a46 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -204,6 +204,8 @@ - `services.ntpd-rs` now performs configuration validation. +- Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](#module-services-immich-vectorchord-migration) + - `services.postsrsd` now automatically integrates with the local Postfix instance, when enabled. This behavior can disabled using the [services.postsrsd.configurePostfix](#opt-services.postsrsd.configurePostfix) option. - `services.pfix-srsd` now automatically integrates with the local Postfix instance, when enabled. This behavior can disabled using the [services.pfix-srsd.configurePostfix](#opt-services.pfix-srsd.configurePostfix) option. @@ -212,6 +214,8 @@ - `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`, +- `services.pds` has been renamed to `services.bluesky-pds`. + - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip). With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8754c3a0ad2c..8713082efb4c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1537,6 +1537,7 @@ ./services/web-apps/audiobookshelf.nix ./services/web-apps/baikal.nix ./services/web-apps/bluemap.nix + ./services/web-apps/bluesky-pds.nix ./services/web-apps/bookstack.nix ./services/web-apps/c2fmzq-server.nix ./services/web-apps/calibre-web.nix @@ -1655,7 +1656,6 @@ ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix ./services/web-apps/part-db.nix - ./services/web-apps/pds.nix ./services/web-apps/peering-manager.nix ./services/web-apps/peertube-runner.nix ./services/web-apps/peertube.nix diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix index b37c8bd2feae..3b98408ec9cc 100644 --- a/nixos/modules/services/home-automation/ebusd.nix +++ b/nixos/modules/services/home-automation/ebusd.nix @@ -49,7 +49,7 @@ in configpath = lib.mkOption { type = lib.types.str; - default = "https://cfg.ebusd.eu/"; + default = "https://ebus.github.io/"; description = '' Directory to read CSV config files from. This can be a local folder or a URL. ''; diff --git a/nixos/modules/services/networking/x2goserver.nix b/nixos/modules/services/networking/x2goserver.nix index 53e938d11554..8ea2c50e2bd2 100644 --- a/nixos/modules/services/networking/x2goserver.nix +++ b/nixos/modules/services/networking/x2goserver.nix @@ -37,6 +37,15 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.x2goserver; + defaultText = literalExpression "pkgs.x2goserver"; + description = '' + The x2goserver package to use. + ''; + }; + superenicer = { enable = mkEnableOption "superenicer" // { description = '' @@ -87,7 +96,7 @@ in icons.enable = true; }; - environment.systemPackages = [ pkgs.x2goserver ]; + environment.systemPackages = [ cfg.package ]; users.groups.x2go = { }; users.users.x2go = { @@ -97,14 +106,14 @@ in }; security.wrappers.x2gosqliteWrapper = { - source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl"; + source = "${cfg.package}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl"; owner = "x2go"; group = "x2go"; setuid = false; setgid = true; }; security.wrappers.x2goprintWrapper = { - source = "${pkgs.x2goserver}/bin/x2goprint"; + source = "${cfg.package}/bin/x2goprint"; owner = "x2go"; group = "x2go"; setuid = false; @@ -123,7 +132,7 @@ in # x2goclient sends SSH commands with preset PATH set to # "/usr/local/bin;/usr/bin;/bin". Since we cannot filter arbitrary ssh # commands, we have to make the following executables available. - map (f: "L+ /usr/local/bin/${f} - - - - ${x2goserver}/bin/${f}") [ + map (f: "L+ /usr/local/bin/${f} - - - - ${cfg.package}/bin/${f}") [ "x2goagent" "x2gobasepath" "x2gocleansessions" @@ -173,7 +182,7 @@ in unitConfig.Documentation = "man:x2goserver.conf(5)"; serviceConfig = { Type = "forking"; - ExecStart = "${pkgs.x2goserver}/bin/x2gocleansessions"; + ExecStart = "${cfg.package}/bin/x2gocleansessions"; PIDFile = "/run/x2go/x2goserver.pid"; User = "x2go"; Group = "x2go"; @@ -184,10 +193,10 @@ in if [ ! -e /var/lib/x2go/setup_ran ] then mkdir -p /var/lib/x2go/conf - cp -r ${pkgs.x2goserver}/etc/x2go/* /var/lib/x2go/conf/ + cp -r ${cfg.package}/etc/x2go/* /var/lib/x2go/conf/ ln -sf ${x2goServerConf} /var/lib/x2go/conf/x2goserver.conf ln -sf ${x2goAgentOptions} /var/lib/x2go/conf/x2goagent.options - ${pkgs.x2goserver}/bin/x2godbadmin --createdb + ${cfg.package}/bin/x2godbadmin --createdb touch /var/lib/x2go/setup_ran fi ''; diff --git a/nixos/modules/services/web-apps/pds.nix b/nixos/modules/services/web-apps/bluesky-pds.nix similarity index 86% rename from nixos/modules/services/web-apps/pds.nix rename to nixos/modules/services/web-apps/bluesky-pds.nix index b17cd628c157..56611917f0c8 100644 --- a/nixos/modules/services/web-apps/pds.nix +++ b/nixos/modules/services/web-apps/bluesky-pds.nix @@ -5,7 +5,7 @@ ... }: let - cfg = config.services.pds; + cfg = config.services.bluesky-pds; inherit (lib) getExe @@ -21,7 +21,7 @@ let pdsadminWrapper = let - cfgSystemd = config.systemd.services.pds.serviceConfig; + cfgSystemd = config.systemd.services.bluesky-pds.serviceConfig; in pkgs.writeShellScriptBin "pdsadmin" '' DUMMY_PDS_ENV_FILE="$(mktemp)" @@ -29,15 +29,26 @@ let env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE" \ ${escapeShellArgs cfgSystemd.Environment} \ ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \ - ${getExe pkgs.pdsadmin} "$@" + ${getExe pkgs.bluesky-pdsadmin} "$@" ''; in # All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh { - options.services.pds = { + imports = [ + (lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ]) + (lib.mkRenamedOptionModule [ "services" "pds" "package" ] [ "services" "bluesky-pds" "package" ]) + (lib.mkRenamedOptionModule [ "services" "pds" "settings" ] [ "services" "bluesky-pds" "settings" ]) + (lib.mkRenamedOptionModule + [ "services" "pds" "environmentFiles" ] + [ "services" "bluesky-pds" "environmentFiles" ] + ) + (lib.mkRenamedOptionModule [ "services" "pds" "pdsadmin" ] [ "services" "bluesky-pds" "pdsadmin" ]) + ]; + + options.services.bluesky-pds = { enable = mkEnableOption "pds"; - package = mkPackageOption pkgs "pds" { }; + package = mkPackageOption pkgs "bluesky-pds" { }; settings = mkOption { type = types.submodule { @@ -154,7 +165,7 @@ in enable = mkOption { type = types.bool; default = cfg.enable; - defaultText = literalExpression "config.services.pds.enable"; + defaultText = literalExpression "config.services.bluesky-pds.enable"; description = "Add pdsadmin script to PATH"; }; }; @@ -165,8 +176,8 @@ in systemPackages = [ pdsadminWrapper ]; }; - systemd.services.pds = { - description = "pds"; + systemd.services.bluesky-pds = { + description = "bluesky pds"; after = [ "network-online.target" ]; wants = [ "network-online.target" ]; diff --git a/nixos/modules/services/web-apps/immich.md b/nixos/modules/services/web-apps/immich.md new file mode 100644 index 000000000000..2987d584e646 --- /dev/null +++ b/nixos/modules/services/web-apps/immich.md @@ -0,0 +1,32 @@ +# Immich {#module-services-immich} + +[Immich](https://immich.app/) is a self-hosted photo and video management +solution, similar to SaaS offerings like Google Photos. + +## Migrating from `pgvecto-rs` to VectorChord (pre-25.11 installations) {#module-services-immich-vectorchord-migration} + +Immich instances that were setup before 25.11 (as in +`system.stateVersion = 25.11;`) will be automatically migrated to VectorChord. +Note that this migration is not reversible, so database dumps should be created +if desired. + +See [Immich documentation][vectorchord-migration-docs] for more details about +the automatic migration. + +After a successful migration, `pgvecto-rs` should be removed from the database +installation, unless other applications depend on it. + +1. Make sure VectorChord is enabled ([](#opt-services.immich.database.enableVectorChord)) and Immich has completed the migration. Refer to the [Immich documentation][vectorchord-migration-docs] for details. +2. Run the following two statements in the PostgreSQL database using a superuser role in Immich's database. + + ```sql + DROP EXTENSION vectors; + DROP SCHEMA vectors; + ``` + + - You may use the following command to run these statements against the database: `sudo -u postgres psql immich` (Replace `immich` with the value of [](#opt-services.immich.database.name)) + +3. Disable `pgvecto-rs` by setting [](#opt-services.immich.database.enableVectors) to `false`. +4. Rebuild and switch. + +[vectorchord-migration-docs]: https://immich.app/docs/administration/postgres-standalone/#migrating-to-vectorchord diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index a31a2eeef048..6fdfb0c831b5 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -182,6 +182,17 @@ in // { default = true; }; + enableVectorChord = + mkEnableOption "the new VectorChord extension for full-text search in Postgres" + // { + default = true; + }; + enableVectors = + mkEnableOption "pgvecto.rs in the database. You may disable this, if you have migrated to VectorChord and deleted the `vectors` schema." + // { + default = lib.versionOlder config.system.stateVersion "25.11"; + defaultText = lib.literalExpression "lib.versionOlder config.system.stateVersion \"25.11\""; + }; createDB = mkEnableOption "the automatic creation of the database for immich." // { default = true; }; @@ -233,8 +244,14 @@ in } { # When removing this assertion, please adjust the nixosTests accordingly. - assertion = cfg.database.enable -> lib.versionOlder config.services.postgresql.package.version "17"; - message = "Immich doesn't support PostgreSQL 17+, yet."; + assertion = + (cfg.database.enable && cfg.database.enableVectors) + -> lib.versionOlder config.services.postgresql.package.version "17"; + message = "Immich doesn't support PostgreSQL 17+ when using pgvecto.rs. Consider disabling it using services.immich.database.enableVectors if it is not needed anymore."; + } + { + assertion = cfg.database.enable -> (cfg.database.enableVectorChord || cfg.database.enableVectors); + message = "At least one of services.immich.database.enableVectorChord and services.immich.database.enableVectors has to be enabled."; } ]; @@ -248,27 +265,46 @@ in ensureClauses.login = true; } ]; - extensions = ps: with ps; [ pgvecto-rs ]; + extensions = + ps: + lib.optionals cfg.database.enableVectors [ ps.pgvecto-rs ] + ++ lib.optionals cfg.database.enableVectorChord [ + ps.pgvector + ps.vectorchord + ]; settings = { - shared_preload_libraries = [ "vectors.so" ]; + shared_preload_libraries = + lib.optionals cfg.database.enableVectors [ + "vectors.so" + ] + ++ lib.optionals cfg.database.enableVectorChord [ "vchord.so" ]; search_path = "\"$user\", public, vectors"; }; }; systemd.services.postgresql-setup.serviceConfig.ExecStartPost = let + extensions = [ + "unaccent" + "uuid-ossp" + "cube" + "earthdistance" + "pg_trgm" + ] + ++ lib.optionals cfg.database.enableVectors [ + "vectors" + ] + ++ lib.optionals cfg.database.enableVectorChord [ + "vector" + "vchord" + ]; sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" '' - CREATE EXTENSION IF NOT EXISTS unaccent; - CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; - CREATE EXTENSION IF NOT EXISTS vectors; - CREATE EXTENSION IF NOT EXISTS cube; - CREATE EXTENSION IF NOT EXISTS earthdistance; - CREATE EXTENSION IF NOT EXISTS pg_trgm; + ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions} ALTER SCHEMA public OWNER TO ${cfg.database.user}; - ALTER SCHEMA vectors OWNER TO ${cfg.database.user}; + ${lib.optionalString cfg.database.enableVectors "ALTER SCHEMA vectors OWNER TO ${cfg.database.user};"} GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user}; - ALTER EXTENSION vectors UPDATE; + ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions} ''; in [ @@ -335,7 +371,8 @@ in systemd.services.immich-server = { description = "Immich backend server (Self-hosted photo and video backup solution)"; - after = [ "network.target" ]; + requires = lib.mkIf cfg.database.enable [ "postgresql.target" ]; + after = [ "network.target" ] ++ lib.optionals cfg.database.enable [ "postgresql.target" ]; wantedBy = [ "multi-user.target" ]; inherit (cfg) environment; path = [ @@ -362,7 +399,8 @@ in systemd.services.immich-machine-learning = mkIf cfg.machine-learning.enable { description = "immich machine learning"; - after = [ "network.target" ]; + requires = lib.mkIf cfg.database.enable [ "postgresql.target" ]; + after = [ "network.target" ] ++ lib.optionals cfg.database.enable [ "postgresql.target" ]; wantedBy = [ "multi-user.target" ]; inherit (cfg.machine-learning) environment; serviceConfig = commonServiceConfig // { @@ -398,5 +436,8 @@ in }; users.groups = mkIf (cfg.group == "immich") { immich = { }; }; }; - meta.maintainers = with lib.maintainers; [ jvanbruegge ]; + meta = { + maintainers = with lib.maintainers; [ jvanbruegge ]; + doc = ./immich.md; + }; } diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index b0f703f122b2..9a3138ff37eb 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -496,7 +496,6 @@ in with config.lib.kernelConfig; [ # !!! Should this really be needed? - (isYes "MODULES") (isYes "BINFMT_ELF") ] ++ (optional (randstructSeed != "") (isYes "GCC_PLUGIN_RANDSTRUCT")); diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index c2b1b1ab005c..be0b8aaefd51 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -464,9 +464,9 @@ in initrdBin = [ pkgs.bashInteractive pkgs.coreutils - cfg.package.kmod cfg.package - ]; + ] + ++ lib.optional (config.system.build.kernel.config.isYes "MODULES") cfg.package.kmod; extraBin = { less = "${pkgs.less}/bin/less"; mount = "${cfg.package.util-linux}/bin/mount"; @@ -490,10 +490,6 @@ in ${attrsToSection cfg.settings.Manager} ''; - "/lib".source = "${config.system.build.modulesClosure}/lib"; - - "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules; - # We can use either ! or * to lock the root account in the # console, but some software like OpenSSH won't even allow you # to log in with an SSH key if you use ! so we use * instead @@ -508,11 +504,6 @@ in "/bin".source = "${initrdBinEnv}/bin"; "/sbin".source = "${initrdBinEnv}/sbin"; - "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; - "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; - "/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; - "/etc/os-release".source = config.boot.initrd.osRelease; "/etc/initrd-release".source = config.boot.initrd.osRelease; @@ -522,6 +513,16 @@ in } // optionalAttrs (config.environment.etc ? "modprobe.d/nixos.conf") { "/etc/modprobe.d/nixos.conf".source = config.environment.etc."modprobe.d/nixos.conf".source; + } + // optionalAttrs (with config.system.build.kernel.config; isSet "MODULES" -> isYes "MODULES") { + "/lib".source = "${config.system.build.modulesClosure}/lib"; + + "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules; + + "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; + "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; + "/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; }; storePaths = [ diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 695db26c6d02..9f0046d49d9c 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -228,8 +228,6 @@ in inherit assertions; # needed for systemd-remount-fs system.fsPackages = [ pkgs.bcachefs-tools ]; - # FIXME: Remove this line when the LTS (default) kernel is at least version 6.7 - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; services.udev.packages = [ pkgs.bcachefs-tools ]; systemd = { @@ -316,7 +314,7 @@ in scrubTimer = fs: let - fs' = utils.escapeSystemdPath fs; + fs' = if fs == "/" then "root" else utils.escapeSystemdPath fs; in lib.nameValuePair "bcachefs-scrub-${fs'}" { description = "regular bcachefs scrub timer on ${fs}"; @@ -336,7 +334,7 @@ in scrubService = fs: let - fs' = utils.escapeSystemdPath fs; + fs' = if fs == "/" then "root" else utils.escapeSystemdPath fs; in lib.nameValuePair "bcachefs-scrub-${fs'}" { description = "bcachefs scrub on ${fs}"; diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 1c14b03a0a30..92d5ffd00d6f 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -82,7 +82,9 @@ in # Needed for mounting filesystems with new checksums "xxhash_generic" "blake2b_generic" - "sha256_generic" # Should be baked into our kernel, just to be sure + + # `sha256` is always available, whereas `sha256_generic` is not available from 6.17 onwards + "sha256" # Should be baked into our kernel, just to be sure ]; boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 86ed83962494..55671262457e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -276,6 +276,7 @@ in blint = runTest ./blint.nix; blockbook-frontend = runTest ./blockbook-frontend.nix; blocky = runTest ./blocky.nix; + bluesky-pds = runTest ./bluesky-pds.nix; bookstack = runTest ./bookstack.nix; boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { }; bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { }; @@ -741,6 +742,7 @@ in ifm = runTest ./ifm.nix; iftop = runTest ./iftop.nix; immich = runTest ./web-apps/immich.nix; + immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix; incron = runTest ./incron.nix; incus = pkgs.recurseIntoAttrs ( @@ -771,6 +773,7 @@ in isso = runTest ./isso.nix; jackett = runTest ./jackett.nix; jellyfin = runTest ./jellyfin.nix; + jellyseerr = runTest ./jellyseerr.nix; jenkins = runTest ./jenkins.nix; jenkins-cli = runTest ./jenkins-cli.nix; jibri = runTest ./jibri.nix; @@ -1151,7 +1154,6 @@ in parsedmarc = handleTest ./parsedmarc { }; password-option-override-ordering = runTest ./password-option-override-ordering.nix; pdns-recursor = runTest ./pdns-recursor.nix; - pds = runTest ./pds.nix; peerflix = runTest ./peerflix.nix; peering-manager = runTest ./web-apps/peering-manager.nix; peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { }; diff --git a/nixos/tests/pds.nix b/nixos/tests/bluesky-pds.nix similarity index 89% rename from nixos/tests/pds.nix rename to nixos/tests/bluesky-pds.nix index a07a2c1fcf72..b74c74955f54 100644 --- a/nixos/tests/pds.nix +++ b/nixos/tests/bluesky-pds.nix @@ -3,7 +3,7 @@ name = "PDS"; nodes.machine = { - services.pds = { + services.bluesky-pds = { enable = true; settings = { PDS_PORT = 3000; @@ -18,7 +18,7 @@ }; testScript = '' - machine.wait_for_unit("pds.service") + machine.wait_for_unit("bluesky-pds.service") machine.wait_for_open_port(3000) machine.succeed("curl --fail http://localhost:3000") ''; diff --git a/nixos/tests/jellyseerr.nix b/nixos/tests/jellyseerr.nix new file mode 100644 index 000000000000..6fb0c2c9dd4b --- /dev/null +++ b/nixos/tests/jellyseerr.nix @@ -0,0 +1,18 @@ +{ lib, ... }: +{ + name = "jellyseerr"; + meta.maintainers = with lib.maintainers; [ matteopacini ]; + + nodes.machine = + { pkgs, ... }: + { + services.jellyseerr.enable = true; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("jellyseerr.service") + machine.wait_for_open_port(5055) + machine.succeed("curl --fail http://localhost:5055/") + ''; +} diff --git a/nixos/tests/web-apps/immich-vectorchord-migration.nix b/nixos/tests/web-apps/immich-vectorchord-migration.nix new file mode 100644 index 000000000000..786a624c4ec3 --- /dev/null +++ b/nixos/tests/web-apps/immich-vectorchord-migration.nix @@ -0,0 +1,71 @@ +{ ... }: +{ + name = "immich-vectorchord-migration"; + + nodes.machine = + { lib, pkgs, ... }: + { + # These tests need a little more juice + virtualisation = { + cores = 2; + memorySize = 2048; + diskSize = 4096; + }; + + environment.systemPackages = with pkgs; [ immich-cli ]; + + services.immich = { + enable = true; + environment.IMMICH_LOG_LEVEL = "verbose"; + # Simulate an existing setup + database.enableVectorChord = lib.mkDefault false; + database.enableVectors = lib.mkDefault true; + }; + + # TODO: Remove when PostgreSQL 17 is supported. + services.postgresql.package = pkgs.postgresql_16; + + specialisation."immich-vectorchord-enabled".configuration = { + services.immich.database.enableVectorChord = true; + }; + + specialisation."immich-vectorchord-only".configuration = { + services.immich.database = { + enableVectorChord = true; + enableVectors = false; + }; + }; + }; + + testScript = + { nodes, ... }: + let + specBase = "${nodes.machine.system.build.toplevel}/specialisation"; + vectorchordEnabled = "${specBase}/immich-vectorchord-enabled"; + vectorchordOnly = "${specBase}/immich-vectorchord-only"; + in + '' + def psql(command: str): + machine.succeed(f"sudo -u postgres psql -d ${nodes.machine.services.immich.database.name} -c '{command}'") + + def immich_works(): + machine.wait_for_unit("immich-server.service") + + machine.wait_for_open_port(2283) # Server + machine.wait_for_open_port(3003) # Machine learning + machine.succeed("curl --fail http://localhost:2283/") + + immich_works() + + machine.succeed("${vectorchordEnabled}/bin/switch-to-configuration test") + + immich_works() + + psql("DROP EXTENSION vectors;") + psql("DROP SCHEMA vectors;") + + machine.succeed("${vectorchordOnly}/bin/switch-to-configuration test") + + immich_works() + ''; +} diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix index d716e50b8906..550a1630bda8 100644 --- a/nixos/tests/web-apps/immich.nix +++ b/nixos/tests/web-apps/immich.nix @@ -18,9 +18,6 @@ enable = true; environment.IMMICH_LOG_LEVEL = "verbose"; }; - - # TODO: Remove when PostgreSQL 17 is supported. - services.postgresql.package = pkgs.postgresql_16; }; testScript = '' diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 07904e06871f..001f8138a7ac 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -335,6 +335,10 @@ in blink-cmp-words = super.blink-cmp-words.overrideAttrs { dependencies = [ self.blink-cmp ]; + meta = { + description = "Offline word and synonym completion provider for Neovim"; + maintainers = with lib.maintainers; [ m3l6h ]; + }; }; bluloco-nvim = super.bluloco-nvim.overrideAttrs { @@ -1011,6 +1015,11 @@ in nvim-treesitter nvim-treesitter-textobjects ]; + meta = { + description = "Overloaded ; and , keys in Neovim"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ m3l6h ]; + }; }; denops-vim = super.denops-vim.overrideAttrs { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d645a1afa484..151db564e6dd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -411,8 +411,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.23"; - hash = "sha256-x8amgtsyWMtlV4lHgr0rfBAYzVMpQGzyBqMVTV8hs60="; + version = "1.18.24"; + hash = "sha256-oqsqcB2i8zS2pBElTFHh/diffTLFE9IRDjcQv/IcMgU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -4580,8 +4580,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.10.1"; - hash = "sha256-nkQ+ianTCMGWKy5NfnuXSWcR7xi6+KkbMCK075nXluE="; + version = "109.11.0"; + hash = "sha256-k0Aka0RxMDyezseyktcwnDvQAtg/ZTkMRk39M76xi20="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 763063b464da..d630487fb56d 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-08-07"; + version = "0-unstable-2025-08-18"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "92313128c3e2afdb9b3decf6642d342af18a1ab5"; - hash = "sha256-b1GaRB9Iv3qqyb3I9XKmEbkiplV+Wi3TflJdnQboLbw="; + rev = "ad52b906d91e20adc5e2c287ae567de2317adcb5"; + hash = "sha256-9qgK3N3h+1iZSsqVwfDvZPHc4VJ3GY7ekAqnLozNayw="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fc3cb37872e4..a2d9ff5f716b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -335,13 +335,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-Fi1Ip/Uy89s8XeX5yT55LKjMw/Bk/B/Vwvc0qXTaYbw=", + "hash": "sha256-kn9qUKvCV0vbOHDsgByO8MAJA/xwEzoBzRO9poWs0V0=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.70.0", + "rev": "v3.71.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IW7v9w3/X+v+AF8eRE4n1KI7MnLWlxkXzTvAJtsQ4Ik=" + "vendorHash": "sha256-0aYkDyqpXzGXZR4ua4rru9Bwt5R+UjDdozO8ZnHm1xQ=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", @@ -534,13 +534,13 @@ "vendorHash": "sha256-IwUmrRZC2KXNzbKajKisaqKbv0RMIH8tgiKsOOlduIo=" }, "google-beta": { - "hash": "sha256-8woiWjYYaojpKykxd9eMT4qXfpHVkXFA9eN3qzhEu+8=", + "hash": "sha256-288cK94lKkgSKTs0YuHvoyp/Z3rPr4qDo7AZE6ndJZo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.47.0", + "rev": "v6.48.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-BzmaCp0QL2BbYn+NwlvPGV2CoDjKXr75HaPFVdrS5e4=" + "vendorHash": "sha256-etnuDVoCrGySDh6cSCO24GCqRVD2UiK4Zcrbf+y12vQ=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -552,13 +552,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-mL+05LpobDrXl483QOmo1k6n/UmLkg3fR64LQBnfrfo=", + "hash": "sha256-x1IlmhaQ4vvP1InH68WgBBtwzhyCdF1tsJ0n5Koks1M=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.3.0", + "rev": "v4.5.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-FQF36Rx+7PzVtbV7eNbvBX4ovqPj6iRlZi0YmB3P6EU=" + "vendorHash": "sha256-LkWUyuQYJYK5RK5DNKhbOQyfrg0qcM5Z+0oB65La3GQ=" }, "gridscale": { "hash": "sha256-zD3KiTLKALVOvFOewWyrd65p0XmLOi/bSIP27dXwveU=", @@ -831,13 +831,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-k7W/oaZeBY5/Wi1vRCD641DKc0KQbBa834WDmtBp5wY=", + "hash": "sha256-crrJ76Ou+4waqMnd6SYP5B6dXW2kE6c+PrSnDjm9sZ0=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.8.7", + "rev": "2025.8.14", "spdx": "0BSD", - "vendorHash": "sha256-CokSZ4CgWBCb/MnGK410Lt9rwBq3luceoFAPLLrwT5U=" + "vendorHash": "sha256-lw+aJdj7VwHmF4hwDRLhf4gmkPX+exiyhqVjYrPcok4=" }, "minio": { "hash": "sha256-TLWbbWYTjnvxT1LaV3FsL31xHHov8LpDYhA/nchMyMo=", @@ -985,13 +985,13 @@ "vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE=" }, "opentelekomcloud": { - "hash": "sha256-lBaer+ZI4kYHocgLlDDOVJnr3EwVhLEHO9JXqbLcH9E=", + "hash": "sha256-B5Rp3C343Doq48dO+sid5P9Z0vXN6THdhEGdHnHvKD0=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.44", + "rev": "v1.36.45", "spdx": "MPL-2.0", - "vendorHash": "sha256-+OT7y7YN8xT9MJqzVGlGxR1cEK6PYSNZLeSVNp9yOvI=" + "vendorHash": "sha256-CWQRfXZuD4MrP8qvrZb98HMN9cRY3Gt4nF0cc+c7hnc=" }, "openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -1445,13 +1445,13 @@ "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4=" }, "venafi": { - "hash": "sha256-699jmdrQHo2tbpRbxvsGWVx9wFwKKTrIr8ZJGo5RS2I=", + "hash": "sha256-7JKsSAiZufOLVMpWVWI+lyWucJ/eqO7OWdSTkQC6VEc=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.22.3", + "rev": "v0.22.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-jlaqJxBQmyuCQeMW3k9Uo8SosUmRJnDHcE9+GEM7WQI=" + "vendorHash": "sha256-3fuH/8dqf4jzORN6/ajapj/WclbwD65Nojs+cEdgJ7I=" }, "vinyldns": { "hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=", @@ -1499,13 +1499,13 @@ "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4=" }, "vultr": { - "hash": "sha256-1ZzydEpNF06NUC0wYtFcPHpdj4FFPI+qF6pVRNsUxTs=", + "hash": "sha256-Vxp8Uv6W6nKGvypPAvlY+TI5O77How79c7xBTJWg/5Q=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.26.0", + "rev": "v2.27.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-i9RzGR03pRhRDDGKBROVSB1aK1EMCYQkYsjeczP8AE4=" + "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8=" }, "wavefront": { "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=", diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix index 06fa3481c0c2..0ce1045ab2aa 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "obs-teleport"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-teleport"; rev = version; - sha256 = "sha256-mHHPlmUyR9NDdQHqw1YNgThGl/8DH/aiCE9rdZhrIK4="; + sha256 = "sha256-r1CB9wzw1tuRHWpx5PXyuh1y3Tue34Wpgys7LSEh62s="; }; - vendorHash = "sha256-U/5smUMpcVEFWB+xMxLKF9E6N7dyh67QoB+Afq5Ga2Q="; + vendorHash = "sha256-o7PL3qnZ13L8+7mVx2yyDIlw/0s+NHNwy9DaRZxVKLc="; buildInputs = [ libjpeg diff --git a/pkgs/build-support/fetchpijul/nix-prefetch-pijul b/pkgs/build-support/fetchpijul/nix-prefetch-pijul new file mode 100755 index 000000000000..beffca26d31c --- /dev/null +++ b/pkgs/build-support/fetchpijul/nix-prefetch-pijul @@ -0,0 +1,137 @@ +#!/bin/sh +set -eu + +name="fetchpijul" +remote= +channel="main" +change= +state= +exp_hash= + +usage() { + echo "Usage: nix-prefetch-pijul [options] [REMOTE] [STATE [EXPECTED-HASH]]" + echo + echo "Options:" + echo " --name Symbolic store path name to use for the result." + echo " --remote URL for the Pijul repository." + echo " --change Clone a specific change." + echo " --state Clone a specific state." + echo " --channel Channel name (default: ‘main’)." + echo " --hash Expected hash." + echo " --help Show this help message." +} + +# Argument parsing +while [ $# -gt 0 ]; do + case "$1" in + --name) + name="$2"; shift 2 ;; + --remote) + remote="$2"; shift 2 ;; + --channel) + channel="$2"; shift 2 ;; + --change) + change="$2"; shift 2 ;; + --state) + state="$2"; shift 2 ;; + --hash) + exp_hash="$2"; shift 2 ;; + --help) + usage; exit 0 ;; + *) + # Positional arguments + if [ -z "$remote" ]; then + remote="$1" + shift + elif [ -z "$state" ]; then + state="$1" + shift + elif [ -z "$exp_hash" ]; then + exp_hash="$1" + shift + else + echo "Error: Too many arguments" >&2 + usage + exit 1 + fi + ;; + esac +done + +if [ -z "$remote" ]; then + echo "Error: URL for remote is required." >&2 + echo >&2 + usage + exit 1 +elif [ -n "$change" -a -n "$state" ]; then + echo "Error: Only one of ‘change’ or ‘state’ can be set" >&2 + echo >&2 + usage + exit 1 +fi + +hash= +hash_algo="${NIX_HASH_ALGO:-"sha256"}" +hash_format="${hashFormat:-"--base32"}" +final_path= + +# If the hash was given, a file with that hash may already be in the +# store. +if [ -n "$exp_hash" ]; then + final_path=$(nix-store --print-fixed-path --recursive "$hash_algo" "$exp_hash" "$name") + if ! nix-store --check-validity "$final_path" 2> /dev/null; then + final_path="" + fi + hash="$exp_hash" +fi + +# If we don’t know the hash or a path with that hash doesn’t exist, +# download the file and add it to the store. +if [ -z "$final_path" ]; then + tmp_clone="$(realpath "$(mktemp -d --tmpdir pijul-clone-tmp-XXXXXXXX)")" + trap "rm -rf \"$tmp_clone\"" EXIT + + clone_args="--channel $channel" + if [ -n "$change" ]; then + clone_args="$clone_args --change $change" + elif [ -n "$state" ]; then + clone_args="$clone_args --state $state" + fi + + cd "$tmp_clone" + pijul clone $clone_args "$remote" "$name" + rm -rf "$tmp_clone/$name/.pijul" + + hash="$(nix-hash --type "$hash_algo" "$hash_format" "$tmp_clone/$name")" + final_path=$(nix-store --add-fixed --recursive "$hash_algo" "$tmp_clone/$name") + + if [ -n "$exp_hash" -a "$exp_hash" != "$hash" ]; then + echo "Hash mismatch for “$remote” @ “$channel”" >&2 + echo "Expected: $exp_hash" >&2 + echo "Got: $hash" >&2 + exit 1 + fi +fi + +json_escape() { + printf '%s' "$1" | jq -Rs . +} + +cat < par2cmdline != null; let - version = "0.33.7"; + version = "0.33.8"; pythonDeps = with python3.pkgs; @@ -38,7 +38,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - hash = "sha256-tuOUml4gF4i7bE2xtjJJol1gRAfYv73RghUYwIDsGyM="; + hash = "sha256-FIIzD+7QUwNYhJQhOPzGQxjiSlMsnA6lahh/kn3eGrg="; }; buildInputs = [ diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index 1764287a5932..e2a9b7ef3426 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cedar"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "cedar-policy"; repo = "cedar"; tag = "v${version}"; - hash = "sha256-CkrrpaAS7CZk2eboGXXDPtpfil5d+4Cg4Ldkw/Zwr8c="; + hash = "sha256-f8d7KL1DzEfJqEJ5uwwOJCgePE/frOXIFcXuoybIp2U="; }; - cargoHash = "sha256-OLTKAFTqjgw5Dix2B0bPzRYjP2EQLgCXjfiB3Reirok="; + cargoHash = "sha256-MK6Zcpf12mGzntEv632kQjH7YOx31QBCmSJHxjE3l1c="; passthru = { tests.version = testers.testVersion { package = cedar; }; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/by-name/ch/charybdis/package.nix similarity index 100% rename from pkgs/servers/irc/charybdis/default.nix rename to pkgs/by-name/ch/charybdis/package.nix diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 32ceaeed06ed..46234501c520 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "civo"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-U//qnxLD4DR6hIUJBIYtkbUkXVmIiHxLfTeza+bTYL4="; + hash = "sha256-0F8RF2vbuuLv39yIYQk7TdBw8CImcnMFQ9r+GSHGGiY="; }; vendorHash = "sha256-TsaGXDUTvTsfDIBhM9+JwL2swEw/qSivn3NTA0tWkZw="; diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index de3b3cdaad1d..fdef0f99a316 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.83" + "@anthropic-ai/claude-code": "^1.0.84" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.83", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.83.tgz", - "integrity": "sha512-Mm+88khPbg9eAUbrWGirigWeC4xu2hH0ns3+lnfKWX3e8RJDOV9vnCHjzbEIVXvvvw1YmeIO7TxsFk5/MVuhGA==", + "version": "1.0.84", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.84.tgz", + "integrity": "sha512-+Qu+z1jTdZPu0UL4dalntkofDGL0BgWqs6XmRlq+RuxurHJy58zKae4PL8naevrkbgazauIPYDDGmHF3u+B0uQ==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 10add7889ac0..66a91cf74352 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.83"; + version = "1.0.84"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-h6bAP6nMifQ6cfM80A1QxSYM53LYbEX1WsyPiNPby0M="; + hash = "sha256-Uu6K2Fq4MT0jb4GsAaHo0UbjnK2bXxjQEjND3ftcFMo="; }; - npmDepsHash = "sha256-vxy4FvwEQrtrVzlfmZCY8EDC22yG04GYzBrN0U65gsw="; + npmDepsHash = "sha256-G1Jrjds7Il+gmQ5SYRgbW3faB2gJd3x0r576IGwFNys="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/development/tools/corundum/Gemfile b/pkgs/by-name/co/corundum/Gemfile similarity index 100% rename from pkgs/development/tools/corundum/Gemfile rename to pkgs/by-name/co/corundum/Gemfile diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/by-name/co/corundum/Gemfile.lock similarity index 100% rename from pkgs/development/tools/corundum/Gemfile.lock rename to pkgs/by-name/co/corundum/Gemfile.lock diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/by-name/co/corundum/gemset.nix similarity index 100% rename from pkgs/development/tools/corundum/gemset.nix rename to pkgs/by-name/co/corundum/gemset.nix diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/by-name/co/corundum/package.nix similarity index 100% rename from pkgs/development/tools/corundum/default.nix rename to pkgs/by-name/co/corundum/package.nix diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile b/pkgs/by-name/da/danger-gitlab/Gemfile similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/Gemfile rename to pkgs/by-name/da/danger-gitlab/Gemfile diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile.lock b/pkgs/by-name/da/danger-gitlab/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/Gemfile.lock rename to pkgs/by-name/da/danger-gitlab/Gemfile.lock diff --git a/pkgs/applications/version-management/danger-gitlab/gemset.nix b/pkgs/by-name/da/danger-gitlab/gemset.nix similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/gemset.nix rename to pkgs/by-name/da/danger-gitlab/gemset.nix diff --git a/pkgs/applications/version-management/danger-gitlab/default.nix b/pkgs/by-name/da/danger-gitlab/package.nix similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/default.nix rename to pkgs/by-name/da/danger-gitlab/package.nix diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 096c1176dcdd..f725fc4a95a8 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-boS8Awxp9Z/4TrYfqRF77K01dAcEZOfr+oOqMOEeUig="; + hash = "sha256-W1DEG72Fk98pp0lm5+AyVb9zcpE5c2mqElOHFpofx58="; }; cargoDeps = rustPlatform.fetchCargoVendor { - pname = "deltachat-core-rust"; + pname = "chatmail-core"; inherit version src; - hash = "sha256-fSuVq0ODYvKLU2peQuutfuSerZl2cfRCu/w0E6eQRV8="; + hash = "sha256-P/wIat9sflXfloboMdN15EGo1cqxgPZ0OBDYF/iB/7A="; }; }; electron = electron_37; @@ -37,19 +37,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-97a82xHoFWCdO6dB1nhTYqosWA2Cf6cRfg2eTaiZd8g="; + hash = "sha256-M/QqD+g85o4xHF8BmusqU2sNIk9NFzOtCnz+MAk9/74="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-SJyLLsUH1tm/ADJ6yJo5yCTE/rjHVOhHw3plGQUgD3M="; + hash = "sha256-2EKu0ju/TTyVTYPjmStXsGoFdJEq5NkHqtQZggY2xbE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 63dbcc94db1e..9ba6982bebac 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -12,20 +12,20 @@ }: let pname = "dependabot-cli"; - version = "1.68.0"; + version = "1.71.0"; # `tag` is what `dependabot` uses to find the relevant docker images. tag = "nixpkgs-dependabot-cli-${version}"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} - updateJobProxy.imageDigest = "sha256:83834c9a112c3e29c4bc357e17ee057c32232f443bc295130b024077acbcca4e"; - updateJobProxy.hash = "sha256-ej6AEvnp7n8O6eArrVAJgXzeco/Rz+tXg7gVxo0OsW8="; + updateJobProxy.imageDigest = "sha256:a42f9b9845929ae044b8cd51b5335195c33fd610405e558552408287c5295827"; + updateJobProxy.hash = "sha256-pEtwBoJ+wF2TdQCcCyigLg4NYqOp2oNCEB7oCJOkwYc="; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - updaterGitHubActions.imageDigest = "sha256:90a65d2c98f8fc8ac1fd6291ea0be02a911818d4fa8ec788ceb1c9227fa844f4"; - updaterGitHubActions.hash = "sha256-uc/yetek6XHTWQb1+DJiOWEHS2nea+/jd/lJdpI6m7E="; + updaterGitHubActions.imageDigest = "sha256:ca93364b87b6a803d0005409cdb4c61d9c6d808dca33de47de14ef8c30811b51"; + updaterGitHubActions.hash = "sha256-TnV8IaBrGPpd06YYmvazGMlZTAVJIMCSWdOgi6hkpRE="; in buildGoModule { inherit pname version; @@ -34,10 +34,10 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Pd9Q5ipwcj7KQ+Nr7Tyga3xwGKLPFJIPc23fob0EQeA="; + hash = "sha256-RZNZ72FG4KQr52X0No6iXU4NMUQs7k000KYpw2Kuz5U="; }; - vendorHash = "sha256-vitkSAvc7TAXcqXQPbnIE0z4tYlSvdx072hzAB50O3I="; + vendorHash = "sha256-5zOMTe8Sa/nkIGtwm4FbAqv3/9Mg5Du2ixxF84VQbXE="; ldflags = [ "-s" diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix index 5bb59786d869..ceac8aaab008 100644 --- a/pkgs/by-name/dg/dgraph/package.nix +++ b/pkgs/by-name/dg/dgraph/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "dgraph"; - version = "24.1.3"; + version = "24.1.4"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-d6HKhA07l6rT+8TktEWaOFw4YTfDz8O5ZhgEQkVcE/M="; + sha256 = "sha256-tvzX5pkaad/DrJkFIIjxAIJME9KHi/2KONw6fXcml18="; }; vendorHash = "sha256-eOo2ihaabdhDRATIc5C4YEMBcA0Xl5xzBKW5GJhrTOA="; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 5d16685fafe1..188c467f17a3 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.27"; + version = "1.1.28"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-YHaxynBIxoirFDKvGEECKIAJezuex3DBoU8snEdbhhg="; + hash = "sha256-RbDAWpJy4+7VNJkuY+LB27nQFbThUCaH+Bcsqdrlp5g="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/by-name/du/duff/package.nix similarity index 100% rename from pkgs/tools/filesystems/duff/default.nix rename to pkgs/by-name/du/duff/package.nix diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index 61e6aa5cc169..261dc50b2238 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.10.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-B6iEssB9+BUXO4p1aSzrOGlBA8TiUOZY7a9U8F9SXaQ="; + hash = "sha256-aQbvuLcgZX+bLegGhwrlO2unOFXi2MIGHjSvdhzxhYM="; }; - cargoHash = "sha256-qfKNxLtvVaXGVP0wzOoZ5jaViO4hcMoZIOqxrpXiWzc="; + cargoHash = "sha256-6/nIktM0E5MHo3Badrt0nMq5EFcK/LUS9k81Cjq7NSU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/pkgs/by-name/ei/eid-mw/eid-nssdb.in similarity index 100% rename from pkgs/tools/security/eid-mw/eid-nssdb.in rename to pkgs/by-name/ei/eid-mw/eid-nssdb.in diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/by-name/ei/eid-mw/package.nix similarity index 100% rename from pkgs/tools/security/eid-mw/default.nix rename to pkgs/by-name/ei/eid-mw/package.nix diff --git a/pkgs/servers/nosql/eventstore/deps.json b/pkgs/by-name/ev/eventstore/deps.json similarity index 100% rename from pkgs/servers/nosql/eventstore/deps.json rename to pkgs/by-name/ev/eventstore/deps.json diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/by-name/ev/eventstore/package.nix similarity index 100% rename from pkgs/servers/nosql/eventstore/default.nix rename to pkgs/by-name/ev/eventstore/package.nix diff --git a/pkgs/servers/nosql/eventstore/updater.sh b/pkgs/by-name/ev/eventstore/updater.sh similarity index 100% rename from pkgs/servers/nosql/eventstore/updater.sh rename to pkgs/by-name/ev/eventstore/updater.sh diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index 19c9260bdc57..1ab69ee74b86 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gost"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "go-gost"; repo = "gost"; tag = "v${finalAttrs.version}"; - hash = "sha256-B2ffIGS0tURZI7uVALih7YM9thBWAjihdIdSHhQFnE8="; + hash = "sha256-zFGoM+fYO/o70LJ2fbzhMv4qbjLozJGmGbudqHjCFRU="; }; - vendorHash = "sha256-WvCNvmH/KpFivKMBqBMgKi9VieOegGIrh463YC9WwAg="; + vendorHash = "sha256-W3CHttD9iGpl2wG/Pa21YY6ACf5M894p25nLfMX0+F4="; # Based on ldflags in upstream's .goreleaser.yaml ldflags = [ diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/by-name/ha/hasura-cli/package.nix similarity index 100% rename from pkgs/servers/hasura/cli.nix rename to pkgs/by-name/ha/hasura-cli/package.nix diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/by-name/hc/hci/package.nix similarity index 97% rename from pkgs/development/tools/continuous-integration/hci/default.nix rename to pkgs/by-name/hc/hci/package.nix index a1ce297d14f3..2429e32d1d76 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/by-name/hc/hci/package.nix @@ -58,6 +58,6 @@ in pkg // { meta = pkg.meta // { - position = toString ./default.nix + ":1"; + position = toString ./package.nix + ":1"; }; } diff --git a/pkgs/by-name/hc/hcxtools/package.nix b/pkgs/by-name/hc/hcxtools/package.nix index 0511130b276a..7c9bdc8d483f 100644 --- a/pkgs/by-name/hc/hcxtools/package.nix +++ b/pkgs/by-name/hc/hcxtools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxtools"; rev = version; - sha256 = "sha256-gL1OnNtd6cqW0kM3w2wHc0UU3JvC6H2kQg1aBDaN11U="; + sha256 = "sha256-WV5+1PQF999qSIMrIYApmIx6C+ovbKOtJDFglzxzSB4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/by-name/he/hercules-ci-agent/package.nix similarity index 98% rename from pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix rename to pkgs/by-name/he/hercules-ci-agent/package.nix index 84b63e689f9f..00a0fc7cfad3 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/by-name/he/hercules-ci-agent/package.nix @@ -41,7 +41,7 @@ in pkg.overrideAttrs ( finalAttrs: o: { meta = o.meta // { - position = toString ./default.nix + ":1"; + position = toString ./package.nix + ":1"; }; passthru = o.passthru // { tests = { diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/pkgs/by-name/hi/hivex/hivex-syms.patch similarity index 100% rename from pkgs/development/libraries/hivex/hivex-syms.patch rename to pkgs/by-name/hi/hivex/hivex-syms.patch diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/by-name/hi/hivex/package.nix similarity index 100% rename from pkgs/development/libraries/hivex/default.nix rename to pkgs/by-name/hi/hivex/package.nix diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 9eefd4d2450f..d6889a2a0412 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -273,7 +273,7 @@ buildNpmPackage' { passthru = { tests = { - inherit (nixosTests) immich; + inherit (nixosTests) immich immich-vectorchord-migration; }; machine-learning = immich-machine-learning; diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index fde3b9dbefdf..39b380d04f5c 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-08-07"; + version = "1.21.1-unstable-2025-08-13"; nativeBuildInputs = [ mtools @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "8460dc4e8ffc98db62377d1c5502d6aac40f5a64"; - hash = "sha256-Xk1lbExR4dyiba4tF0Dm9/KtTVxc78Fs8gjmZU7pdpI="; + rev = "a53ec449327788e2015642bff21443d3a399c05b"; + hash = "sha256-rcRWkuOgtHs6ZzcECbsVXCN+HS5cG/HlrVPP5+ZF+EM="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 52f7428e5aa5..2478508925ec 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -9,6 +9,7 @@ python3Packages, sqlite, nix-update-script, + nixosTests, }: let @@ -17,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jellyseerr"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; tag = "v${finalAttrs.version}"; - hash = "sha256-MaLmdG98WewnNJt7z6OP9xv6zlNwwu/+YnPM0Iebxj4="; + hash = "sha256-a3lhQ33Zb+vSu1sQjuqO3bITiQEIOVyFTecmJAhJROU="; }; pnpmDeps = pnpm.fetchDeps { @@ -78,7 +79,10 @@ stdenv.mkDerivation (finalAttrs: { --set NODE_ENV production ''; - passthru.updateScript = nix-update-script { }; + passthru = { + inherit (nixosTests) jellyseerr; + updateScript = nix-update-script { }; + }; meta = { description = "Fork of overseerr for jellyfin support"; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/by-name/jm/jmol/package.nix similarity index 92% rename from pkgs/applications/science/chemistry/jmol/default.nix rename to pkgs/by-name/jm/jmol/package.nix index 423d4f1c676a..c1c9d5aefbf9 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -4,7 +4,7 @@ fetchurl, unzip, makeDesktopItem, - jre, + jre8, }: let @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i -e "4s:.*:command=${jre}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol + sed -i -e "4s:.*:command=${jre8}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol ''; installPhase = '' diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 97327fb6c0ce..bd44c3ccebc2 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; rev = "refs/tags/v${version}"; - hash = "sha256-C2Tv/R8bIKAG0E1vcZyS2fs2Pr26+luinPsjCqbboR0="; + hash = "sha256-ZTwe6S0AH1yQt5mABtIeWuMbiVSKeOZWMFI26fthLsM="; }; bazelapi = fetchurl { diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index b14c42fe032a..a9353f17bcc8 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "keepass"; - version = "2.57.1"; + version = "2.59"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip"; - hash = "sha256-97ZX1EzhMv4B3YZ3HoUqlGTEMsQn3cmNGr+uvS6AKYY="; + hash = "sha256-esJxGCGDb8AZi28Z7NeHMYyL8GWFpKOusua9UxlgSns="; }; sourceRoot = "."; @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - xbuild /p:Configuration=Release + xbuild KeePass.sln /p:Configuration=Release runHook postBuild ''; diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index aa58ad0bb3c0..29852289a46b 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.8.0"; + version = "52.8.1"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-p7kTawHggRR1fdd8nAPRCGuvVgRKZ6n8U22D/731xJ8="; + hash = "sha256-o11gVE+s2tVd2RLD6Otd23wt3l6HxBwoOfwhaaqttn8="; }; vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4="; diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/by-name/la/laurel/package.nix similarity index 100% rename from pkgs/servers/monitoring/laurel/default.nix rename to pkgs/by-name/la/laurel/package.nix diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix index 14cf36810b94..c0e2eaac6ff7 100644 --- a/pkgs/by-name/li/libmsquic/package.nix +++ b/pkgs/by-name/li/libmsquic/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsquic"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "msquic"; tag = "v${finalAttrs.version}"; - hash = "sha256-GWkdwPms0jqVADp8D4HtvOi+9YORZpqbJ7OqKnS/jB0="; + hash = "sha256-rL4uKcPx3IUzBDp8uGW2VprVyYuTD5p73WbdW+ebSGg="; fetchSubmodules = true; }; diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/by-name/li/librepo/package.nix similarity index 100% rename from pkgs/tools/package-management/librepo/default.nix rename to pkgs/by-name/li/librepo/package.nix diff --git a/pkgs/tools/networking/maphosts/Gemfile b/pkgs/by-name/ma/maphosts/Gemfile similarity index 100% rename from pkgs/tools/networking/maphosts/Gemfile rename to pkgs/by-name/ma/maphosts/Gemfile diff --git a/pkgs/tools/networking/maphosts/Gemfile.lock b/pkgs/by-name/ma/maphosts/Gemfile.lock similarity index 100% rename from pkgs/tools/networking/maphosts/Gemfile.lock rename to pkgs/by-name/ma/maphosts/Gemfile.lock diff --git a/pkgs/tools/networking/maphosts/gemset.nix b/pkgs/by-name/ma/maphosts/gemset.nix similarity index 100% rename from pkgs/tools/networking/maphosts/gemset.nix rename to pkgs/by-name/ma/maphosts/gemset.nix diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/by-name/ma/maphosts/package.nix similarity index 100% rename from pkgs/tools/networking/maphosts/default.nix rename to pkgs/by-name/ma/maphosts/package.nix diff --git a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop b/pkgs/by-name/ma/marvin/LicenseManager.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/LicenseManager.desktop rename to pkgs/by-name/ma/marvin/LicenseManager.desktop diff --git a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop b/pkgs/by-name/ma/marvin/MarvinSketch.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop rename to pkgs/by-name/ma/marvin/MarvinSketch.desktop diff --git a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop b/pkgs/by-name/ma/marvin/MarvinView.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/MarvinView.desktop rename to pkgs/by-name/ma/marvin/MarvinView.desktop diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/by-name/ma/marvin/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/marvin/default.nix rename to pkgs/by-name/ma/marvin/package.nix diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index d3ea2b2bf12a..9c7404eac37e 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -18,21 +18,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "0.20.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-BLEbEDZRh7fgcnkH/YUHPPdKM1FtZdjvsL1rJ57BP3w="; + hash = "sha256-v3M/MrBwa4XBfsDYt9BCmt0MBEnIjrCck/Cpv79dXLw="; }; - cargoHash = "sha256-1jLiCCZUj/rBHd1huqZdmgKayoSZoOt3tptyZlOcWJA="; + cargoHash = "sha256-D1LBPwPdkTV35cDrKaygRoiBYWRSYv4KtkAdvs5+S/o="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-+n9P2P88G3neHJqmJi/VWpaQ/UkUzBtihfeKy5lju4U="; + hash = "sha256-1yxxzxhefviOQX6lXWFW/bmkOcJeetE1sCPsDUT4UJM="; }; npmRoot = "frontend"; diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 79e591b3441b..3a5fd86699f4 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.5.2"; + version = "0.5.3"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-S/HWCN9d3Nhbl73RoFD684OG3CbdNWXU8QReJoSYJK0="; + hash = "sha256-k23ygwKQjKFov/8TJ6BKlcgIv5Jsy7oSBjcCCS5YVm4="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-m0s99gl49NzGEpuDPB5tL92krt2Zho36NsIEXJk+nCw="; + vendorHash = "sha256-xibBQNwXzpbvS9nVBBRyJK95I5EqF1Xde1TL1BEZmnA="; passthru = { tests = { diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 9a005213d546..8383509f898d 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-huJt0UtaKs/F4v7FJXb0fILqBd+OaTL9X0MUb9KZsX8="; + hash = "sha256-6Sfj0v0mYg7j0C0H3ntX8+ydRslOW9b3xzFo3Ti3a5g="; }; - vendorHash = "sha256-4TqbAUZQNwlfP44rRlmx+6ZaiOPEKcJ+K7qYja3pL/4="; + vendorHash = "sha256-zevHaGR0Lipyn9KzdEQOHC0yqMmSl0/Wp02GTI3MmSw="; ldflags = [ "-s" diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 20ac11ad8da0..c0cafc47ed27 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, nixosTests, nix-update-script, - version ? "1.15.2", + version ? "1.17.1", }: let @@ -15,11 +15,11 @@ let # the meilisearch module accordingly and to remove the meilisearch_1_11 # attribute from all-packages.nix at that point too. hashes = { - "1.15.2" = "sha256-aTgfgPuyRcjr/DxxyuKOFXfBcDponVmKz5PpGbnsmd0="; + "1.17.1" = "sha256-krl8993p7fm3x7mJTrEDPjifB4sbmXb5gtLqHMYoIc0="; "1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U="; }; cargoHashes = { - "1.15.2" = "sha256-eBGxVtE25txA17zxXdlSC6Vbrm+/v1fA7iTIBDvQ71M="; + "1.17.1" = "sha256-4g9CpdBAjMv8mQ1dXj02lCyTFaMp62HlcdcsdhIL744="; "1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8="; }; in diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 14b662d2dc2a..77ffecd8c3b6 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; tag = "v${version}"; - hash = "sha256-TKt6uwj3RdhSEjGnWmYybJFaQ82qf3tXY4PPUAm6juQ="; + hash = "sha256-S0GrM8uKfWJh0/oAQp2f7P+yj99N0bovCNscM8b7tB8="; }; buildInputs = [ olm ]; - vendorHash = "sha256-rFk4QUAI/Brclt/X/T7O0T6v2dTxpqbNLtoi0twYliw="; + vendorHash = "sha256-gzigJ2gg9jaREbFdX+38sUV8I/gcB5x+lYaABnS2Mbk="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 7c9f91a7456f..d6b921e8de88 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-xSgwCKjYuF6nUo4P7NrGocyhqBbBV/sx2BGKjWCEtB0="; + hash = "sha256-hBbqlL5E0iSMtnGFCdVnKkCUcNwmBPkOnyEY+aAlw0o="; }; - cargoHash = "sha256-dwaW69Mxn4GVFqOI+UUGkJG9yc3SWob0FcC1oMGsHg8="; + cargoHash = "sha256-tk+WJaYBUteFfNfRuD45KNK0QaFMFUiDbaaqmwtPORQ="; # require running database doCheck = false; diff --git a/pkgs/by-name/mo/mod/package.nix b/pkgs/by-name/mo/mod/package.nix index 3e631c81e2b9..a93b5ec89be8 100644 --- a/pkgs/by-name/mo/mod/package.nix +++ b/pkgs/by-name/mo/mod/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mod"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-P0FE0Sl4IXH6DAETnlBwQ2CR0X0AP9Z0noW99By7mxU="; + sha256 = "sha256-s/i2S1BbIUEXclQlv0uXlzjEvrT+udo0uzec2Una0uY="; }; - vendorHash = "sha256-GiE2RNAxbKpIekn54bfYlNvIcQo8D3ysmPSvxQhujYI="; + vendorHash = "sha256-drGfJFuEsJyZJ1x40ww0rFYsl0AkjLbznCWgluwOCYs="; doCheck = false; diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix index 70adacdba0dc..d6842b9ef28b 100644 --- a/pkgs/by-name/mp/mprisence/package.nix +++ b/pkgs/by-name/mp/mprisence/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mprisence"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "lazykern"; repo = "mprisence"; tag = "v${finalAttrs.version}"; - hash = "sha256-eUUUHjR6wnbaPb1QD9luEVvu5qSAxG5c4TuMjnzRV40="; + hash = "sha256-XZgc5eaBo/FwRCTJnm6lKzp824/XckIMK5P4aTohiuE="; }; - cargoHash = "sha256-BnzDMvwqQ56VFc7AuzsfyZ002qcmRaAOMfipynZ1/Mc="; + cargoHash = "sha256-zbycof7QBI2Ua3rO24aCDZcxX8yoPKpAAFeQI4b2YjM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix index e8494a0c1493..f29ebe190556 100644 --- a/pkgs/by-name/ns/nsc/package.nix +++ b/pkgs/by-name/ns/nsc/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "nats-io"; repo = "nsc"; rev = "v${version}"; - hash = "sha256-/xfNl91cb82kV2IC/m56p94nb3WLDPU5O+1H+sTZnW4="; + hash = "sha256-9HHrAT4LKVLb2+IDmXoPRtOKo1DRFznAbxJZp/B1uRY="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-Ms+chBbQCo3TGWPgIy4OSXNpxO5jpm1zxEe9upiPmnY="; + vendorHash = "sha256-sTaiaLJyokasaf1Mbaz4RkgspTd3VphZat8Bavg/Y9A="; nativeBuildInputs = [ installShellFiles ]; @@ -47,7 +47,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.11.0.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.11.1.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix index 2d2949f161cd..f103e3a010a2 100644 --- a/pkgs/by-name/nv/nvidia-modprobe/package.nix +++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "nvidia-modprobe"; - version = "580.65.06"; + version = "580.76.05"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = version; - hash = "sha256-peEklk7lSnwz/RC6UlUEQf47clbTRL8M1xz8z4MgdHE="; + hash = "sha256-NGVd+uur4jYcnmhIuK5qy0ktm95da89adUQpJbRT3VI="; }; nativeBuildInputs = [ gnum4 ]; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/by-name/oi/oilrush/package.nix similarity index 100% rename from pkgs/games/oilrush/default.nix rename to pkgs/by-name/oi/oilrush/package.nix diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index 3c0bc4477e74..80ee16757d6b 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -31,9 +31,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "25.07.26.04"; - buildId = "4981"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "31ee2ad97fd48ec122733c2bdd600913695673b9"; + version = "25.08.17.03"; + buildId = "5045"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "977e47bd2addb50ced3a81ee8a006bfc050e8afa"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -44,7 +44,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-bflkZdp7qA0/DM+8UEudgJJ5imfd3QbEBkMbzvv2WGM="; + hash = "sha256-VnHuFL+EDHfYdjYNhLQDiNQGK/X97HD3hJ8xAftFzFk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index ff09474e8a53..69340a142f9d 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.14.1"; + version = "0.14.3"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-Fkr0oabFSkgUkqO3cqZANP3xUSD0uO2F8I/VEzkhvis="; + hash = "sha256-zCxuAhgbUpsVoCquFp8MsDYgJ7yANPtWlHhpdGuxOPY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index 186b9b245453..06baea3e7fa4 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "peazip"; - version = "10.6.0"; + version = "10.6.1"; src = fetchFromGitHub { owner = "peazip"; repo = "peazip"; rev = finalAttrs.version; - hash = "sha256-oRgsT2j5P6jbaBAgLMGArJ+pCVSgC/CJcHM45mRw6Bs="; + hash = "sha256-y+q4S3XHkN2dvHMaRxPQwK9l9LaA5rGvrzzZ+x76qUQ="; }; sourceRoot = "${finalAttrs.src.name}/peazip-sources"; diff --git a/pkgs/by-name/pi/pigment/package.nix b/pkgs/by-name/pi/pigment/package.nix index 95135595e94b..5363109558c5 100644 --- a/pkgs/by-name/pi/pigment/package.nix +++ b/pkgs/by-name/pi/pigment/package.nix @@ -15,7 +15,7 @@ nix-update-script, }: let - version = "0.5.0"; + version = "0.5.1"; in python3Packages.buildPythonApplication { pname = "pigment"; @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication { owner = "Jeffser"; repo = "Pigment"; tag = version; - hash = "sha256-VwqCv2IPxPKT/6PDk8sosAIZlyu8zl5HDQEaIRWlJKg="; + hash = "sha256-tWWDX1njnI1FOZhTUE1i+5pqZeLZFzHBrfoGFHCKnX0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/by-name/pi/pinnwand/package.nix similarity index 100% rename from pkgs/servers/pinnwand/default.nix rename to pkgs/by-name/pi/pinnwand/package.nix diff --git a/pkgs/tools/misc/polar/Gemfile b/pkgs/by-name/po/polar/Gemfile similarity index 100% rename from pkgs/tools/misc/polar/Gemfile rename to pkgs/by-name/po/polar/Gemfile diff --git a/pkgs/tools/misc/polar/Gemfile.lock b/pkgs/by-name/po/polar/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/polar/Gemfile.lock rename to pkgs/by-name/po/polar/Gemfile.lock diff --git a/pkgs/tools/misc/polar/gemset.nix b/pkgs/by-name/po/polar/gemset.nix similarity index 100% rename from pkgs/tools/misc/polar/gemset.nix rename to pkgs/by-name/po/polar/gemset.nix diff --git a/pkgs/tools/misc/polar/default.nix b/pkgs/by-name/po/polar/package.nix similarity index 100% rename from pkgs/tools/misc/polar/default.nix rename to pkgs/by-name/po/polar/package.nix diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 443a87ffd76b..c26d366ae150 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -2,27 +2,30 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cacert, meson, ninja, pkg-config, freetype, libgit2, + libkqueue, libuchardet, libzip, lua5_4, luajit, mbedtls_2, pcre2, - SDL2, + sdl3, xz, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.6.0"; + version = "3.7.0"; pluginManagerVersion = "1.4.0"; + linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42"; src = fetchFromGitHub { owner = "pragtical"; @@ -37,17 +40,28 @@ stdenv.mkDerivation (finalAttrs: { export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt substituteInPlace subprojects/ppm.wrap \ - --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' + --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' + substituteInPlace subprojects/linenoise.wrap \ + --replace-fail 'revision = master' 'revision = ${finalAttrs.linenoiseRev}' ${lib.getExe meson} subprojects download \ - colors widget plugins ppm + colors linenoise plugins ppm widget find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-rJEUTLjMTv19W1wSvW2HJaxHrzrBQHiG74v8XlcqgMc="; + hash = "sha256-oqXv08TvZWVRsSCX6V9oAGHkFS0hL/gm3tGdiivOI6Q="; }; + patches = [ + # https://github.com/pragtical/pragtical/pull/334 + (fetchpatch { + name = "fix-dirmonitor-backend-detection.patch"; + url = "https://github.com/pragtical/pragtical/commit/5cf26e1f6a491f28d761390309dd77a795bdae9d.patch"; + hash = "sha256-eD17ItcsyRTKn6jydyW3J2lFq/hl3qHUmQ2LC4LXKC0="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ @@ -60,13 +74,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype libgit2 + libkqueue # optional libuchardet libzip lua5_4 luajit mbedtls_2 pcre2 - SDL2 + sdl3 xz zlib ]; diff --git a/pkgs/tools/text/reckon/Gemfile b/pkgs/by-name/re/reckon/Gemfile similarity index 100% rename from pkgs/tools/text/reckon/Gemfile rename to pkgs/by-name/re/reckon/Gemfile diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/by-name/re/reckon/Gemfile.lock similarity index 100% rename from pkgs/tools/text/reckon/Gemfile.lock rename to pkgs/by-name/re/reckon/Gemfile.lock diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/by-name/re/reckon/gemset.nix similarity index 100% rename from pkgs/tools/text/reckon/gemset.nix rename to pkgs/by-name/re/reckon/gemset.nix diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/by-name/re/reckon/package.nix similarity index 100% rename from pkgs/tools/text/reckon/default.nix rename to pkgs/by-name/re/reckon/package.nix diff --git a/pkgs/development/tools/redis-dump/.bundle/config b/pkgs/by-name/re/redis-dump/.bundle/config similarity index 100% rename from pkgs/development/tools/redis-dump/.bundle/config rename to pkgs/by-name/re/redis-dump/.bundle/config diff --git a/pkgs/development/tools/redis-dump/Gemfile b/pkgs/by-name/re/redis-dump/Gemfile similarity index 100% rename from pkgs/development/tools/redis-dump/Gemfile rename to pkgs/by-name/re/redis-dump/Gemfile diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/by-name/re/redis-dump/Gemfile.lock similarity index 100% rename from pkgs/development/tools/redis-dump/Gemfile.lock rename to pkgs/by-name/re/redis-dump/Gemfile.lock diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/by-name/re/redis-dump/gemset.nix similarity index 100% rename from pkgs/development/tools/redis-dump/gemset.nix rename to pkgs/by-name/re/redis-dump/gemset.nix diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/by-name/re/redis-dump/package.nix similarity index 100% rename from pkgs/development/tools/redis-dump/default.nix rename to pkgs/by-name/re/redis-dump/package.nix diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/by-name/ri/riemann-dash/Gemfile similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/Gemfile rename to pkgs/by-name/ri/riemann-dash/Gemfile diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/by-name/ri/riemann-dash/Gemfile.lock similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/Gemfile.lock rename to pkgs/by-name/ri/riemann-dash/Gemfile.lock diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/by-name/ri/riemann-dash/gemset.nix similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/gemset.nix rename to pkgs/by-name/ri/riemann-dash/gemset.nix diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/by-name/ri/riemann-dash/package.nix similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/default.nix rename to pkgs/by-name/ri/riemann-dash/package.nix diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/by-name/ri/riemann-tools/Gemfile similarity index 100% rename from pkgs/tools/misc/riemann-tools/Gemfile rename to pkgs/by-name/ri/riemann-tools/Gemfile diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/by-name/ri/riemann-tools/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/riemann-tools/Gemfile.lock rename to pkgs/by-name/ri/riemann-tools/Gemfile.lock diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/by-name/ri/riemann-tools/gemset.nix similarity index 100% rename from pkgs/tools/misc/riemann-tools/gemset.nix rename to pkgs/by-name/ri/riemann-tools/gemset.nix diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/by-name/ri/riemann-tools/package.nix similarity index 100% rename from pkgs/tools/misc/riemann-tools/default.nix rename to pkgs/by-name/ri/riemann-tools/package.nix diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 9a6716c742ba..7d066f224410 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; tag = version; - hash = "sha256-b2Jgj/QABRd6BN3PhTEK6pid74oRknx0/CUg2UfQWS8="; + hash = "sha256-IpEgWbmWFW4X09EeAfWadncH4ptzSom2+7kvh8h3hcM="; }; - cargoHash = "sha256-Pt+SL3R28Gr54hgN3jZ1ZaH3L4JKEZz7hhtuX45P3IY="; + cargoHash = "sha256-I0hBh9FFoy+RhEUAHfgQa+UiSgOS0mYJy+2W/0/9kG4="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; diff --git a/pkgs/by-name/ro/rofi-nerdy/package.nix b/pkgs/by-name/ro/rofi-nerdy/package.nix new file mode 100644 index 000000000000..34ba2842c133 --- /dev/null +++ b/pkgs/by-name/ro/rofi-nerdy/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + glib, + cairo, + pango, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rofi-nerdy"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "rofi-nerdy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RiQ8bP7Q1ItZfCO94R95aTenqVOD45ohfUdmtDn0r9k="; + }; + + cargoHash = "sha256-NvS38uTqlBTUmRg2z0Faa5bTlRC/DTXQU3MCcSmPerA="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + glib + cairo + pango + ]; + + meta = { + description = "Nerd font icon selector plugin for rofi"; + homepage = "https://github.com/Rolv-Apneseth/rofi-nerdy"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ xavwe ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/networking/rosenpass/tools.nix b/pkgs/by-name/ro/rosenpass-tools/package.nix similarity index 100% rename from pkgs/tools/networking/rosenpass/tools.nix rename to pkgs/by-name/ro/rosenpass-tools/package.nix diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/by-name/ro/rosenpass/package.nix similarity index 100% rename from pkgs/tools/networking/rosenpass/default.nix rename to pkgs/by-name/ro/rosenpass/package.nix diff --git a/pkgs/by-name/ro/roxctl/package.nix b/pkgs/by-name/ro/roxctl/package.nix index 1ceeecd72d6e..e63f876f0991 100644 --- a/pkgs/by-name/ro/roxctl/package.nix +++ b/pkgs/by-name/ro/roxctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "roxctl"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-HtxRMcPFs80OpVAM3CnUBnQjBFm+5Sl/kL3SrzKmjf0="; + sha256 = "sha256-5k1i17zji76JybVGbYsyBOmL2pZvD1li3+AdzXFrWpU="; }; vendorHash = "sha256-Mra4hfg5nW/8CSQK/h6nnsZhN2GLdMg14kBvkFW3Y0w="; diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index e000881423d9..32edb0ef3617 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "8.43.2"; + version = "8.43.3"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-A/PP9jOEelELM3v36/b4YPbd/duzV3C/IXfHgmbjltY="; + hash = "sha256-nueJOmb/xjslkp+W95HacBRIRCuG00iAz3sNl3gJ1ww="; }; - vendorHash = "sha256-3BdRYAc/gbtOtEMfBMOK5scP58r85WNq0In7qNBwY0E="; + vendorHash = "sha256-ioXNmVqYfje1Lg0mI4XofnD8CuHkU3+3uFQCzuQn998="; subPackages = [ "cmd/rqlite" diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index e987e3b041d0..48d0f4a3b684 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-y4t63lb14WdUjzhjv/mx90ThaTfE7KFyRkg+CG+66TE="; + hash = "sha256-Z5bGAmMPZlLk5gXnl+aozeGEIbMsa554PWSVXtG6bHs="; }; - cargoHash = "sha256-DK3es0GjKurCwGmr/6gAk+ccJc1dUP64kK+UzvS+Mi0="; + cargoHash = "sha256-g8nIM54uHdDIfnZ2JV93ILVKkrMqKlia64pEwZ8/CzQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/schleuder/cli/Gemfile b/pkgs/by-name/sc/schleuder-cli/Gemfile similarity index 100% rename from pkgs/tools/security/schleuder/cli/Gemfile rename to pkgs/by-name/sc/schleuder-cli/Gemfile diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/by-name/sc/schleuder-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/security/schleuder/cli/Gemfile.lock rename to pkgs/by-name/sc/schleuder-cli/Gemfile.lock diff --git a/pkgs/tools/security/schleuder/cli/gemset.nix b/pkgs/by-name/sc/schleuder-cli/gemset.nix similarity index 100% rename from pkgs/tools/security/schleuder/cli/gemset.nix rename to pkgs/by-name/sc/schleuder-cli/gemset.nix diff --git a/pkgs/tools/security/schleuder/cli/default.nix b/pkgs/by-name/sc/schleuder-cli/package.nix similarity index 100% rename from pkgs/tools/security/schleuder/cli/default.nix rename to pkgs/by-name/sc/schleuder-cli/package.nix diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/by-name/sc/schleuder/Gemfile similarity index 100% rename from pkgs/tools/security/schleuder/Gemfile rename to pkgs/by-name/sc/schleuder/Gemfile diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/by-name/sc/schleuder/Gemfile.lock similarity index 100% rename from pkgs/tools/security/schleuder/Gemfile.lock rename to pkgs/by-name/sc/schleuder/Gemfile.lock diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/by-name/sc/schleuder/gemset.nix similarity index 100% rename from pkgs/tools/security/schleuder/gemset.nix rename to pkgs/by-name/sc/schleuder/gemset.nix diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/by-name/sc/schleuder/package.nix similarity index 100% rename from pkgs/tools/security/schleuder/default.nix rename to pkgs/by-name/sc/schleuder/package.nix diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix index 9771f41e87a1..9ae60f31b7e9 100644 --- a/pkgs/by-name/sc/scraper/package.nix +++ b/pkgs/by-name/sc/scraper/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.23.1"; + version = "0.24.0"; src = fetchCrate { inherit pname version; - hash = "sha256-s38EnVooSCL6TNjU90x2Q7lXDyOf9sWjOpxAxangyAU="; + hash = "sha256-/WdzwqwxTZiWyLV/W0nsMgVJ+o3wJU6u0gOMZva+WSM="; }; - cargoHash = "sha256-cijkLybvjwdz3k2CG0hYwSTisbJUpyI7QUG0l8xLfKQ="; + cargoHash = "sha256-0k8tYJbsWRAWn7stsodC8qkzzl3O8AZ1QrQ7i/n2YzY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/se/seqkit/package.nix b/pkgs/by-name/se/seqkit/package.nix index faeb50394a31..1ae14c39ff43 100644 --- a/pkgs/by-name/se/seqkit/package.nix +++ b/pkgs/by-name/se/seqkit/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "seqkit"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-W272ymy56aHRSOmi/0nCaU+AeaC0U/RyxzHOKR9meo4="; + sha256 = "sha256-rWmz9dPGCLY2d7aifRrz/GDiFTcc49+eB1xJLxs+Fyc="; }; - vendorHash = "sha256-mmefX3SpQoSdpuwoxFmlYocE9ETOHz3fh/IDG5LlY7E="; + vendorHash = "sha256-v8aAY6MQS8jsyd7eVm5liAG5ChPELNKu4b8U/3y6bL4="; meta = with lib; { description = "Cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; diff --git a/pkgs/tools/misc/serverspec/Gemfile b/pkgs/by-name/se/serverspec/Gemfile similarity index 100% rename from pkgs/tools/misc/serverspec/Gemfile rename to pkgs/by-name/se/serverspec/Gemfile diff --git a/pkgs/tools/misc/serverspec/Gemfile.lock b/pkgs/by-name/se/serverspec/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/serverspec/Gemfile.lock rename to pkgs/by-name/se/serverspec/Gemfile.lock diff --git a/pkgs/tools/misc/serverspec/gemset.nix b/pkgs/by-name/se/serverspec/gemset.nix similarity index 100% rename from pkgs/tools/misc/serverspec/gemset.nix rename to pkgs/by-name/se/serverspec/gemset.nix diff --git a/pkgs/tools/misc/serverspec/default.nix b/pkgs/by-name/se/serverspec/package.nix similarity index 100% rename from pkgs/tools/misc/serverspec/default.nix rename to pkgs/by-name/se/serverspec/package.nix diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 69e1d6d7adcc..19dce23a62f1 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250817"; + version = "20250818-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = version; - hash = "sha256-MClQUM0yr1gUE1gVFczHr5fcSF+TTKrQ6sqw0B0zSL4="; + hash = "sha256-qVKtFgSnxXZEwmzVen62BLnLsklyoFdYCX1bVp8TNMI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/by-name/so/sommelier/package.nix similarity index 100% rename from pkgs/applications/window-managers/sommelier/default.nix rename to pkgs/by-name/so/sommelier/package.nix diff --git a/pkgs/applications/window-managers/sommelier/update.py b/pkgs/by-name/so/sommelier/update.py similarity index 100% rename from pkgs/applications/window-managers/sommelier/update.py rename to pkgs/by-name/so/sommelier/update.py diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/by-name/so/sonobuoy/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/sonobuoy/default.nix rename to pkgs/by-name/so/sonobuoy/package.nix diff --git a/pkgs/applications/networking/cluster/sonobuoy/update.sh b/pkgs/by-name/so/sonobuoy/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/sonobuoy/update.sh rename to pkgs/by-name/so/sonobuoy/update.sh diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/by-name/st/steck/package.nix similarity index 100% rename from pkgs/servers/pinnwand/steck.nix rename to pkgs/by-name/st/steck/package.nix diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/by-name/te/teamocil/Gemfile similarity index 100% rename from pkgs/tools/misc/teamocil/Gemfile rename to pkgs/by-name/te/teamocil/Gemfile diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/by-name/te/teamocil/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/teamocil/Gemfile.lock rename to pkgs/by-name/te/teamocil/Gemfile.lock diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/by-name/te/teamocil/gemset.nix similarity index 100% rename from pkgs/tools/misc/teamocil/gemset.nix rename to pkgs/by-name/te/teamocil/gemset.nix diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/by-name/te/teamocil/package.nix similarity index 100% rename from pkgs/tools/misc/teamocil/default.nix rename to pkgs/by-name/te/teamocil/package.nix diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index f0808cbad3b0..dd9909881ce2 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.35.3"; + version = "1.35.4"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-EwO7dvPJkLCxO9xZCW7gX57tCO7RIpJ23vqwOkMOVnw="; + hash = "sha256-4/7lhqdK8JgIpMHFHRajNT/Lz3E1SShYB99PxoeGuz8="; }; - vendorHash = "sha256-DHtgN8yf+4YYrDJKnFasICScYqq65iPGi7pFoxQawv8="; + vendorHash = "sha256-NfkZutoa2LH3q/kYQCVvd3ExtV7RMu0sXKX/RNJLkPU="; proxyVendor = true; ldflags = [ diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/by-name/tr/truvari/package.nix similarity index 100% rename from pkgs/applications/science/biology/truvari/default.nix rename to pkgs/by-name/tr/truvari/package.nix diff --git a/pkgs/by-name/tt/ttyplot/package.nix b/pkgs/by-name/tt/ttyplot/package.nix index b3a30e588634..74c37dbd0e1c 100644 --- a/pkgs/by-name/tt/ttyplot/package.nix +++ b/pkgs/by-name/tt/ttyplot/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - hash = "sha256-IWOdl9tMGaX1C92zh/p/BWkXJxuUZbSOnazHHiD7Gzg="; + hash = "sha256-hWjjl11NGhbv0VrLpdJ/W+a8tJPjg8OtUTKgDIqpsfs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 1649ab92c681..49df195edecd 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.35.3"; + version = "1.35.5"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-eyP88wUtjF7c6tjV3lBk7pYvdF8ur8zuyaxynqaQiN4="; + hash = "sha256-fXgid1pLhIb1xxvKlOQ2T3o/5tsmIiv4zIqvBwsXAnU="; }; - cargoHash = "sha256-3cKYgun2vP1otdEudUeaBQMh6vfVqeVgQm+/eBcCL5c="; + cargoHash = "sha256-8MbxBghyg7ZoqYYftIiUBvxewFvCa/5clvyiNyeLGyQ="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/by-name/ve/veusz/package.nix similarity index 100% rename from pkgs/applications/graphics/veusz/default.nix rename to pkgs/by-name/ve/veusz/package.nix diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/by-name/vo/vorbis-tools/package.nix similarity index 100% rename from pkgs/applications/audio/vorbis-tools/default.nix rename to pkgs/by-name/vo/vorbis-tools/package.nix diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index e7196b87d103..6921b3798077 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.16.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-fpr6GMUYRkHqy0e9M2qU4qKTiziSmfrHH+EBav7mgeA="; + hash = "sha256-9IPs8XIHPpYO6ukrzHw7qvuogNUj74tn6Jb4UTMTGFo="; }; - cargoHash = "sha256-8+gOEpeM2n3H1nboZgtaMnWXX90eRom1ERnfItPqmFA="; + cargoHash = "sha256-ow6huWumG0xz4AAM/D2v0MaZ0SzmbUnrEkL5ieNS4Io="; checkFlags = [ # Skip tests requiring network diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix index 33ea5180ba81..d5f83a72b7ca 100644 --- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix @@ -32,13 +32,13 @@ lib.checkListOfEnum "${pname}: theme variants" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2025-02-10"; + version = "2025-08-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "WhiteSur-icon-theme"; - tag = "v${version}"; - hash = "sha256-spTmS9Cn/HAnbgf6HppwME63cxWEbcKwWYMMj8ajFyY="; + tag = "${version}"; + hash = "sha256-oBKDvCVHEjN6JT0r0G+VndzijEWU9L8AvDhHQTmw2E4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/by-name/xd/xdelta/package.nix similarity index 100% rename from pkgs/tools/compression/xdelta/default.nix rename to pkgs/by-name/xd/xdelta/package.nix diff --git a/pkgs/by-name/yo/youtubeuploader/package.nix b/pkgs/by-name/yo/youtubeuploader/package.nix index 29d6aca72f0b..803e5b2fa57b 100644 --- a/pkgs/by-name/yo/youtubeuploader/package.nix +++ b/pkgs/by-name/yo/youtubeuploader/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "youtubeuploader"; - version = "1.25.3"; + version = "1.25.5"; src = fetchFromGitHub { owner = "porjo"; repo = "youtubeuploader"; tag = "v${version}"; - hash = "sha256-89vVorUPgutIp+k2YmUrQXs8tF4eLQt5zupKu1BArkw="; + hash = "sha256-KG0x2+nTTB+d7Yon2xRdlhEqYr74jNPD4+3dKyccOdc="; }; vendorHash = "sha256-wVfJnN9QgF7c2aI3OghfJW9Z6McZ+irgMRSkWvVi1DM="; diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index fa4d7a7b4afe..2d4b3f507a0a 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2025-08-05"; + version = "3.7.2-2-unstable-2025-08-18"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "87bb21ae49ead6e0cd19ee57425fd3bc72b11743"; - hash = "sha256-MArhNROlJqHcosqN+huInfmcHT+7IOAc50zLRbBUClU="; + rev = "69b7ba714f8ab8f2083731464f169e7ca8234acd"; + hash = "sha256-CnjIP7+HeZEfG9b2UyC1mms2CSIijZC6Y4Gu1r1AXyU="; }; vendorHash = "sha256-Yc1NZKb1V9NaZddnTnNOaqdNxOHKagl7Xpxj+mZf81I="; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/by-name/zp/zpaq/package.nix similarity index 100% rename from pkgs/tools/archivers/zpaq/default.nix rename to pkgs/by-name/zp/zpaq/package.nix diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/by-name/zp/zpaqd/package.nix similarity index 100% rename from pkgs/tools/archivers/zpaq/zpaqd.nix rename to pkgs/by-name/zp/zpaqd/package.nix diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index e47a4160f8ba..9cf3bb9d13cb 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -1,6 +1,6 @@ let majorMinorToVersionMap = { - "15" = "15.1.0"; + "15" = "15.2.0"; "14" = "14.3.0"; "13" = "13.4.0"; "12" = "12.4.0"; @@ -17,7 +17,7 @@ let { # 3 digits: releases (14.2.0) # 4 digits: snapshots (14.2.1.20250322) - "15.1.0" = "sha256-4rCewhZg8B/s/7cV4BICZSFpQ/A40OSKmGhxPlTwbOo="; + "15.2.0" = "sha256-Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4="; "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo="; "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU="; "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU="; diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 73281ff48f95..5b4fbdaeff6e 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "argparse-manpage"; - version = "4.6"; + version = "4.7"; pyproject = true; src = fetchFromGitHub { owner = "praiskup"; repo = "argparse-manpage"; tag = "v${version}"; - hash = "sha256-2GJDFLCaPTb8sQCAv9qZ+pIysFE7IaKh9co3Mb8Dutc="; + hash = "sha256-nonC0oK3T/8+gSa0lRaCf2wvvXoRBPP8b1jioNmW4qI="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically build man-pages for your Python project"; homepage = "https://github.com/praiskup/argparse-manpage"; - changelog = "https://github.com/praiskup/argparse-manpage/blob/${src.rev}/NEWS"; + changelog = "https://github.com/praiskup/argparse-manpage/blob/${src.tag}/NEWS"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; mainProgram = "argparse-manpage"; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index f78eba4dc99f..42e8c64fcf58 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.16.1"; + version = "3.16.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = "djangorestframework-stubs"; tag = version; - hash = "sha256-TTv6v7G3LODrUDSYSNNa4+dujih7QElmvK3mMQg9EuQ="; + hash = "sha256-A6IyRJwuc0eqRtkCHtWN5C5yCMdgxfygqmpHV+/MJhE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 820008e94ea7..e562ba4de484 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.23.6"; + version = "0.23.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; tag = "v${version}"; - hash = "sha256-62uWRr1n3C51OeHeCKKJrB1KLcjRGnwBCgpC0RPWum8="; + hash = "sha256-NxGLxHs6OVHB3S3B/1qyAgqrS+aiRmt/yx7itWtlumo="; }; build-system = [ diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix index da2282506af1..c8569e645056 100644 --- a/pkgs/development/python-modules/openrgb-python/default.nix +++ b/pkgs/development/python-modules/openrgb-python/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openrgb-python"; - version = "0.3.3"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XQnxYfs7VouABBNBg7mXT3XGfbEP3PNZzVO8TlTpSUc="; + hash = "sha256-06efPdVHkZG9uR1W+bQcZzxqqEYXlKpmuXmiRk36TZA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 2a8af9ff4074..c4053d4371cf 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "35.0.0"; + version = "36.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-p9fGxQ3aPLfbYz3rrsl1TSvz3PCOQhgng8DY0YFB+Qc="; + hash = "sha256-l3Lc4Qn3+XE7qKwRwWkZtiP9EURL/lahp3yV4upCsyw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index a561e6c59f08..466e885bb0ea 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "6.5.0"; + version = "6.6.0"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-Y215wLsPOa6lzpZ5KTYwrPkjPbBrEerLbhsHWaxFZ7E="; + hash = "sha256-/rcE8XqYiyHvDzaolGX9D0Z6aPuXen71/resZdjyxzk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix index d1cd454b9ccd..0471fbe99ee4 100644 --- a/pkgs/development/python-modules/pyscreeze/default.nix +++ b/pkgs/development/python-modules/pyscreeze/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pillow, @@ -20,12 +21,13 @@ buildPythonPackage { }; pythonImportsCheck = [ "pyscreeze" ]; - nativeCheckInputs = [ + doCheck = stdenv.hostPlatform.isLinux; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ scrot xlib xvfb-run ]; - checkPhase = '' + checkPhase = lib.optionalString stdenv.hostPlatform.isLinux '' python -m unittest tests.test_pillow_unavailable xvfb-run python -m unittest tests.test_pyscreeze ''; diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 4a826e65aa47..70e5c6bc02a2 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -31,6 +31,7 @@ rich, sqlmodel, starlette-admin, + stdenv, typer, typing-extensions, unzip, @@ -124,8 +125,14 @@ buildPythonPackage rec { # tries to run bun or npm "test_output_system_info" # Comparison with magic string - # TODO Recheck on next update as it appears to be fixed in 8.0.x "test_background_task_no_block" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 1] Operation not permitted (fails in sandbox) + "test_is_process_on_port_free_port" + "test_is_process_on_port_occupied_port" + "test_is_process_on_port_both_protocols" + "test_is_process_on_port_concurrent_access" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 340bbb82ef4f..dd536885ace8 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,72 +1,72 @@ { - version = "2.19.1"; + version = "2.19.0"; version_jetson = "2.16.1+nv24.08"; x86_64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow_cpu-2.19.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1bhnz7w6xsh0qvnv8a4yq9n47jnp12b6k0ddhxy8xf5w1f7acj5s"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "13xvghhqjlq5l6gnnlkslqyk7iwy2lbhblz70pa0wrsvdiwp9k86"; }; x86_64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow_cpu-2.19.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1slbr25402zxwg6lmvxxvnb4iq6dwlwlyl6hnjf8ggxfjj8j1rwa"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0lgjy7frlh5ax97pc5x2cdq560ybizjrdxms57rcx8r9x8wskrff"; }; x86_64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow_cpu-2.19.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1bjd3r0s3wsilwfrjfbkaw1dnb0ybfgk1gap6xbyfry216yp4v8b"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0l8wgqjhp0srqs4rkij881nxifdzaxkin237wfjqh8h1wdd312ck"; }; x86_64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow_cpu-2.19.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0xn4a3knjm122b7hfxmlqc68bv09dm3gs5hnvdkc213bm07v5d1c"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1wxpgzs3d0wblvvg02267j0bw9b8j4dlfspfmp6r8hd6dk9bx78b"; }; x86_64-linux_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1bzxqd4h8p9xd5sf31462kmzwalp31cwn1f4sv20rviyripvcrks"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "14vgkx1wjf0jiali4lm3x8n6z29m8vdhjva4yvabzc9b1s1757w4"; }; x86_64-linux_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1niiz477vliyk5imw3zlc6s81swc19jlnlkhwcamarnwxi67sdqi"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1s1myi67iqhjxvfvjv8pl26hxjcgya9k1r1hblh8hm0h933xdql3"; }; x86_64-linux_311_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "03km8nasrm9367w908iza0ik2rfw5m3vpagfbrp5fq1197mj8mcf"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1r4ghr51h2bb7dj8q6wydgnvzw0f48b6kkygl6gq0yf9d9w4f1rr"; }; x86_64-linux_312_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1yzq9q0j5sk0z7pcn4xnrrp2wvv7hhbd6hc2cv8x42pf7w7rb9im"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1xm66mwrdxrqs9i68dlahqrd5imgibcz5f3i4ksyg4yp9icjd2z2"; }; aarch64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "068nyc9frm19n569kg67c2r04c6azi6q5h16mb6pr9wr6adv93wk"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "121amcj78mkkvs2fclc7z669q45x4sa7x6vlzggrm09b0nr7zf4w"; }; aarch64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "0jvz6w04wz624wi78nf2701l4lskwbyb189fp2zmivi8356l0xwh"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "0p4fjsal8kfizcz456lbbqg2i35ljxhdqij7vhsfbvismqy2jf9b"; }; aarch64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "127i5gh411y0g15jgckrmyzqkc2wf02wg1xjsa126zw3a71fvpi2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1670dv3kbmxiz4v0ivmkbiiiaa1sbc2x841z6kmy03mcb3wkybf9"; }; aarch64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1fz3l95gp3i9zig04cdhznkskrh2x0f7ymacjf8gsi8522v7h3jc"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "020kppmgmv4hnz3dqmam01gq95s69xjn6zn6k25l08zf6fyvzx0h"; }; aarch64-linux_310_jetson = { url = "https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow/tensorflow-2.16.1+nv24.08-cp310-cp310-linux_aarch64.whl"; sha256 = "0z18zdcjc2dingl94kivhd5cpzbvkjp9j12q57acjppp4hyd6g7f"; }; aarch64-darwin_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp39-cp39-macosx_12_0_arm64.whl"; - sha256 = "0kdmpsghc7lyi2ny44rls92073bg24nzpv1xhmym0jyfngdv9wq4"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-macosx_12_0_arm64.whl"; + sha256 = "02fb702d2wmdgrjq8jj46bp51sh1l9j4q9z231x151z2i3sdn5dd"; }; aarch64-darwin_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp310-cp310-macosx_12_0_arm64.whl"; - sha256 = "1r7r07f2ysx8jki2s23yvfdnn1dngxmlm80fsfnnpd1wabp4hcgd"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-macosx_12_0_arm64.whl"; + sha256 = "0d6anjqkm5vq22awxhcwivjdshnlzmby80by3icyjcihbkr08mn9"; }; aarch64-darwin_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp311-cp311-macosx_12_0_arm64.whl"; - sha256 = "0w4p4vi61srkg5fiqccw1lq2wd4xia0sabq4gq7fy6q56q9ll9wa"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-macosx_12_0_arm64.whl"; + sha256 = "05f12garj6ad4vcxxpi0vihps4gh9y30bffp2qy1k36qi8kn5m38"; }; aarch64-darwin_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.1/tensorflow-2.19.1-cp312-cp312-macosx_12_0_arm64.whl"; - sha256 = "0m4k4i136yn42z61j0r3jw9wskg9grlwc62jd9y84297m1lr7ih2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-macosx_12_0_arm64.whl"; + sha256 = "1bibid6mrgmjra291pmb7b5sf49f8jpi3n8x8mdwjhfmxfz1c6c2"; }; } diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index d168c04629c5..9bdf9bf3930e 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.19.1" +version="2.19.0" version_jetson="2.16.1+nv24.08" bucket="https://storage.googleapis.com/tensorflow/versions/${version}" diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 09e39f46b6bd..6383e937979a 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.7.3"; + version = "4.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-LpUMPdQcNa7lU+nP0+7NPTHZJxS24PESHBpPy6h+Nko="; + hash = "sha256-z3n0BDhUXO5GFPT1zE2GI2Fx+xFDJgOfe4w5Swy80Lk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wgnlpy/default.nix b/pkgs/development/python-modules/wgnlpy/default.nix index 11cb4e38b046..b1eed14963bf 100644 --- a/pkgs/development/python-modules/wgnlpy/default.nix +++ b/pkgs/development/python-modules/wgnlpy/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { description = "Netlink connector to WireGuard"; homepage = "https://github.com/ArgosyLabs/wgnlpy"; license = with lib.licenses; [ mit ]; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ marcel ]; }; } diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index b1d6101f9947..93b29865173d 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "hopper"; - version = "5.18.0"; + version = "5.19.4"; rev = "v4"; src = fetchurl { - url = "https://www.hopperapp.com/downloader/hopperv4/Hopper-${finalAttrs.rev}-${finalAttrs.version}-Linux-demo.pkg.tar.xz"; + url = "https://www.hopperapp.com/downloader/public/Hopper-${finalAttrs.rev}-${finalAttrs.version}-Linux-demo.pkg.tar.xz"; curlOptsList = [ "--user-agent" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "--referer" "https://www.hopperapp.com" ]; - hash = "sha256-Z/Y+il5DTdssa2T0RDkDyco098o4JHKeLuwFUpJjgZ0="; + hash = "sha256-NYnMJK9F3YxspjriyiLM+vV1HpEunGvznOesQ/FpTl4="; }; sourceRoot = "."; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index e2c8c4f5b456..f96af31e73b6 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "jetify-com"; repo = pname; rev = version; - hash = "sha256-ANbIwR3XiphHbaeg3YtwtHZ9UbwK3BOnPb5ZF1EJtEw="; + hash = "sha256-+OsFKBtc4UkkI37YJM9uKIJZC1+KkuDJJKjipRzyF7k="; }; ldflags = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a07de798509e..9866c0d36c85 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "580.76.05"; - sha256_64bit = "sha256-IZvmNrYJMbAhsujB4O/4hzY8cx+KlAyqh7zAVNBdl/0="; - sha256_aarch64 = "sha256-NL2DswzVWQQMVM092NmfImqKbTk9VRgLL8xf4QEvGAQ="; - openSha256 = "sha256-xEPJ9nskN1kISnSbfBigVaO6Mw03wyHebqQOQmUg/eQ="; - settingsSha256 = "sha256-ll7HD7dVPHKUyp5+zvLeNqAb6hCpxfwuSyi+SAXapoQ="; - persistencedSha256 = "sha256-bs3bUi8LgBu05uTzpn2ugcNYgR5rzWEPaTlgm0TIpHY="; + version = "570.181"; + sha256_64bit = "sha256-8G0lzj8YAupQetpLXcRrPCyLOFA9tvaPPvAWurjj3Pk="; + sha256_aarch64 = "sha256-1pUDdSm45uIhg0HEhfhak9XT/IE/XUVbdtrcpabZ3KU="; + openSha256 = "sha256-U/uqAhf83W/mns/7b2cU26B7JRMoBfQ3V6HiYEI5J48="; + settingsSha256 = "sha256-iBx/X3c+1NSNmG+11xvGyvxYSMbVprijpzySFeQVBzs="; + persistencedSha256 = "sha256-RoAcutBf5dTKdAfkxDPtMsktFVQt5uPIPtkAkboQwcQ="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 24ce7ec4bda7..5889a2270838 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.26.3"; + version = "1.27.0"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-/573UMMALfU46uJefxf/DMhEcIMiI+CVR9lg9kXFdF0="; + hash = "sha256-jz9MFWkZBjiBu6jr1jp+bDpthB/OWE0pfrXhY5B08Jo="; }; postPatch = '' diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 87671f4bc798..e91649233c91 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -16,11 +16,6 @@ # `extraDependencies` that are not in the closure of `packages`. extraDependencies = p: { libraryHaskellDepends = [ p.conduit ]; }; nativeBuildInputs = [ cabal-install ]; - phases = [ - "unpackPhase" - "buildPhase" - "installPhase" - ]; unpackPhase = '' sourceRoot=$(pwd)/scratch mkdir -p "$sourceRoot" diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 8c88fcb6bb30..158d18d70cc9 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -5,6 +5,7 @@ buildEnv, bash, breezy, + cacert, coreutils, cvs, findutils, @@ -12,7 +13,9 @@ git, git-lfs, gnused, + jq, mercurial, + pijul, subversion, }: @@ -73,6 +76,11 @@ rec { nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ]; + nix-prefetch-pijul = mkPrefetchScript "pijul" ../../../build-support/fetchpijul/nix-prefetch-pijul [ + pijul + cacert + jq + ]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; @@ -83,6 +91,7 @@ rec { nix-prefetch-git nix-prefetch-hg nix-prefetch-svn + nix-prefetch-pijul ]; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b997bcb93b6d..9005d8ff1f42 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1583,6 +1583,8 @@ mapAliases { pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02 + pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20 + pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20 peach = asouldocs; # Added 2022-08-28 percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f25db38a306..059770f4269b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -806,8 +806,6 @@ with pkgs; closureInfo = callPackage ../build-support/closure-info.nix { }; - serverspec = callPackage ../tools/misc/serverspec { }; - setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; shortenPerlShebang = makeSetupHook { @@ -2710,8 +2708,6 @@ with pkgs; cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { }; - danger-gitlab = callPackage ../applications/version-management/danger-gitlab { }; - dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; @@ -2746,8 +2742,6 @@ with pkgs; dub-to-nix ; - duff = callPackage ../tools/filesystems/duff { }; - dvtm = callPackage ../tools/misc/dvtm { # if you prefer a custom config, write the config.h in dvtm.config.h # and enable @@ -2756,8 +2750,6 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; - eid-mw = callPackage ../tools/security/eid-mw { }; - engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; @@ -2765,14 +2757,6 @@ with pkgs; rocmPackages = rocmPackages_6; rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { }); - sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - - schleuder = callPackage ../tools/security/schleuder { }; - - schleuder-cli = callPackage ../tools/security/schleuder/cli { }; - - teamocil = callPackage ../tools/misc/teamocil { }; - tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.hostPlatform.isLinux; }; @@ -4000,8 +3984,6 @@ with pkgs; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { }; - pinnwand = callPackage ../servers/pinnwand { }; - plan9port = callPackage ../tools/system/plan9port { inherit (darwin) DarwinTools; }; @@ -4152,8 +4134,6 @@ with pkgs; recoll-nox = recoll.override { withGui = false; }; - reckon = callPackage ../tools/text/reckon { }; - remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { }; reptor = with python3.pkgs; toPythonApplication reptor; @@ -4166,16 +4146,10 @@ with pkgs; reuse = with python3.pkgs; toPythonApplication reuse; - riemann-tools = callPackage ../tools/misc/riemann-tools { }; - rmlint = callPackage ../tools/misc/rmlint { inherit (python3Packages) sphinx; }; - rosenpass = callPackage ../tools/networking/rosenpass { }; - - rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { }; - rpm = callPackage ../tools/package-management/rpm { lua = lua5_4; }; @@ -4260,8 +4234,6 @@ with pkgs; soundkonverter = libsForQt5.soundkonverter; - steck = callPackage ../servers/pinnwand/steck.nix { }; - stm32loader = with python3Packages; toPythonApplication stm32loader; solc-select = with python3Packages; toPythonApplication solc-select; @@ -4574,7 +4546,6 @@ with pkgs; # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap. xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; }; - xdelta = callPackage ../tools/compression/xdelta { }; xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { }; xdot = with python3Packages; toPythonApplication xdot; @@ -4629,9 +4600,6 @@ with pkgs; nvidiaSupport = true; }; - zpaq = callPackage ../tools/archivers/zpaq { }; - zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; - zstd = callPackage ../tools/compression/zstd { cmake = buildPackages.cmakeMinimal; }; @@ -6892,8 +6860,6 @@ with pkgs; bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - bore-cli = callPackage ../tools/networking/bore-cli/default.nix { }; - bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; buildkite-test-collector-rust = @@ -6968,8 +6934,6 @@ with pkgs; cookiecutter = with python3Packages; toPythonApplication cookiecutter; - corundum = callPackage ../development/tools/corundum { }; - ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { }; @@ -7321,8 +7285,6 @@ with pkgs; portableService = callPackage ../build-support/portable-service { }; - polar = callPackage ../tools/misc/polar { }; - pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; premake4 = callPackage ../development/tools/misc/premake { }; @@ -7360,8 +7322,6 @@ with pkgs; inherit (callPackages ../development/tools/parsing/ragel { }) ragelStable ragelDev; - redis-dump = callPackage ../development/tools/redis-dump { }; - inherit (regclient) regbot regctl regsync; reno = with python312Packages; toPythonApplication reno; @@ -7561,8 +7521,6 @@ with pkgs; appstream = callPackage ../development/libraries/appstream { }; - apr = callPackage ../development/libraries/apr { }; - argparse-manpage = with python3Packages; toPythonApplication argparse-manpage; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; @@ -7639,10 +7597,6 @@ with pkgs; }; }); - hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; - - hci = callPackage ../development/tools/continuous-integration/hci { }; - niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); @@ -8200,8 +8154,6 @@ with pkgs; highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; - hivex = callPackage ../development/libraries/hivex { }; - hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -8333,8 +8285,6 @@ with pkgs; } ); - laurel = callPackage ../servers/monitoring/laurel/default.nix { }; - lcms = lcms2; libagar = callPackage ../development/libraries/libagar { }; @@ -8467,8 +8417,6 @@ with pkgs; inherit (lomiri) cmake-extras; }; - librepo = callPackage ../tools/package-management/librepo { }; - libretranslate = with python3.pkgs; toPythonApplication libretranslate; librsb = callPackage ../development/libraries/librsb { @@ -9864,10 +9812,6 @@ with pkgs; ### SERVERS - alerta = callPackage ../servers/monitoring/alerta/client.nix { }; - - alerta-server = callPackage ../servers/monitoring/alerta { }; - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -9948,8 +9892,6 @@ with pkgs; dnsutils = bind.dnsutils; dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils; - charybdis = callPackage ../servers/irc/charybdis { }; - clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; couchdb3 = callPackage ../servers/http/couchdb/3.nix { @@ -9995,8 +9937,6 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - eventstore = callPackage ../servers/nosql/eventstore { }; - felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; @@ -10013,8 +9953,6 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/grafana/plugins { }); - hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase { }) hbase_2_4 hbase_2_5 @@ -10317,8 +10255,6 @@ with pkgs; nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { }); - riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; - qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; @@ -13317,8 +13253,6 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - sommelier = callPackage ../applications/window-managers/sommelier { }; - spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { }; sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; @@ -13650,8 +13584,6 @@ with pkgs; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - veusz = callPackage ../applications/graphics/veusz { }; - vim = vimUtils.makeCustomizable ( callPackage ../applications/editors/vim { } @@ -13772,8 +13704,6 @@ with pkgs; onlyLibVLC = true; }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; @@ -14460,8 +14390,6 @@ with pkgs; npush = callPackage ../games/npush { }; run-npush = callPackage ../games/npush/run.nix { }; - oilrush = callPackage ../games/oilrush { }; - openloco = pkgsi686Linux.callPackage ../games/openloco { }; openmw = libsForQt5.callPackage ../games/openmw { }; @@ -14820,12 +14748,6 @@ with pkgs; avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { }; - jmol = callPackage ../applications/science/chemistry/jmol { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - - marvin = callPackage ../applications/science/chemistry/marvin { }; - molbar = with python3Packages; toPythonApplication molbar; nwchem = callPackage ../applications/science/chemistry/nwchem { @@ -14901,8 +14823,6 @@ with pkgs; }; }; - truvari = callPackage ../applications/science/biology/truvari { }; - ### SCIENCE/MACHINE LEARNING sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; @@ -16014,8 +15934,6 @@ with pkgs; pinentry = pinentry-curses; }; - maphosts = callPackage ../tools/networking/maphosts { }; - tora = libsForQt5.callPackage ../development/tools/tora { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };