diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 900be674c46e..4dbbecef0c3b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,3 +5,5 @@ updates: schedule: interval: "weekly" labels: [] + commit-message: + prefix: ".github" diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 42e9a8ef635b..daf2c138c106 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,7 +27,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 3ace94a957ef..1d8d349ead30 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -56,7 +56,7 @@ jobs: run: npm install @actions/artifact@5.0.3 bottleneck@2.19.5 # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour. - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml index 36897d8f1a77..7894d704723b 100644 --- a/.github/workflows/comment.yml +++ b/.github/workflows/comment.yml @@ -30,7 +30,7 @@ jobs: ci/github-script # Use the GitHub App to make sure the reaction happens with the same user who will later merge. - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml index cf16302421d9..a60cede7b26d 100644 --- a/.github/workflows/edited.yml +++ b/.github/workflows/edited.yml @@ -36,7 +36,7 @@ jobs: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs # We only need Pull Requests: write here, but the app is also used for backports. - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index de58f692f54e..69780b53957c 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -263,7 +263,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Download output paths and eval stats for all systems - uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: pattern: ${{ inputs.artifact-prefix }}diff-* path: diff @@ -353,7 +353,7 @@ jobs: needs: [versions, eval] steps: - name: Download output paths and eval stats for all versions - uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: pattern: "*-diff-*" path: versions diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index d2c4a396291c..2eb0e347a0c1 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -26,7 +26,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 277029c825bf..db3b1d464b46 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -27,7 +27,7 @@ jobs: ci/github-script # Use the GitHub App to make sure the reaction happens with the same user who will later merge. - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index 9533b90f2bdd..a924a1291212 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered and to # request team member lists. - - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 + - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index cd0f4185500a..06e6b8552d72 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -95,6 +95,8 @@ - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained. +- `duckstation` package has been removed, as it was requested by upstream and build source were changed to be incompatible with NixOS. + - `nodePackages.coc-go` and `nodePackages.coc-tsserver`, along with their vim plugins, have been removed from nixpkgs due to being unmaintained. - `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs. diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 32d107c1594a..7e43a17490d3 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -230,6 +230,7 @@ "kloenk": 12898828, "konradmalik": 13033392, "kubukoz": 894884, + "lilyball": 714, "lutzmor": 9321736, "magistau": 43097806, "maljub01": 350635, @@ -268,6 +269,7 @@ "willcohen": 5185341, "willjr": 5904828, "wldhx": 15619766, + "yamashitax": 99486674, "yeongsheng-tan": 809030, "youhaveme9": 58213083, "yzx9": 41458459, @@ -278,9 +280,11 @@ "documentation-team": { "description": "Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation", "id": 6590023, - "maintainers": {}, + "maintainers": { + "hsjobeki": 50398876 + }, "members": { - "hsjobeki": 50398876, + "friedow": 17351844, "wamirez": 24505474 }, "name": "Documentation Team" @@ -486,8 +490,7 @@ "frederictobiasc": 26125115, "heywoodlh": 18178614, "maevii": 41077433, - "rorosen": 76747196, - "superherointj": 5861043 + "rorosen": 76747196 }, "name": "k3s" }, @@ -616,9 +619,8 @@ }, "members": { "aanderse": 7755101, - "jnsgruk": 668505, - "megheaiulian": 1788114, - "mkg20001": 7735145 + "herbetom": 15121114, + "megheaiulian": 1788114 }, "name": "LXC" }, @@ -684,12 +686,11 @@ "description": "Maintain the official Nix formatter and apply it to Nixpkgs: https://nixos.org/community/teams/formatting/", "id": 9676823, "maintainers": { - "infinisil": 20525370, + "MattSturgeon": 5046562, "jfly": 277474 }, "members": { "0x4A6F": 9675338, - "MattSturgeon": 5046562, "Sereja313": 112060595, "dyegoaurelio": 42411160 }, @@ -716,7 +717,7 @@ "id": 3620128, "maintainers": { "jopejoe1": 34899572, - "leona-ya": 11006031 + "yayayayaka": 73759599 }, "members": {}, "name": "nixos-release-managers" @@ -926,7 +927,9 @@ "balsoft": 18467667, "infinisil": 20525370 }, - "members": {}, + "members": { + "pyrox0": 35778371 + }, "name": "Security review" }, "static": { @@ -968,7 +971,8 @@ "description": "Maintain systemd for NixOS", "id": 3894007, "maintainers": { - "flokli": 183879 + "flokli": 183879, + "nikstur": 61635709 }, "members": { "ElvishJerricco": 1365692, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2cd61c69ecec..cc686617e69b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9698,10 +9698,10 @@ keys = [ { fingerprint = "275F 6749 AFD2 379D 1033 548C 1237 AB12 2E6F 4761"; } ]; }; gigglesquid = { - email = "jack.connors@protonmail.com"; + email = "jack.connors@gigglesquid.tech"; github = "GiggleSquid"; githubId = 3685154; - name = "Jack connors"; + name = "Jack Connors"; keys = [ { fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; } ]; }; gila = { @@ -10078,6 +10078,13 @@ githubId = 11212268; name = "gruve-p"; }; + gs-101 = { + email = "gabrielsantosdesouza@disroot.org"; + github = "gs-101"; + githubId = 172639817; + keys = [ { fingerprint = "D1D3 37F6 CB32 02DC B9BA 337B F9D8 EABC F57E ED58"; } ]; + name = "Gabriel Santos"; + }; gschwartz = { email = "gsch@pennmedicine.upenn.edu"; github = "GregorySchwartz"; @@ -13739,6 +13746,12 @@ githubId = 41012641; name = "Benjamin Kaylor"; }; + kaynetik = { + email = "aleksandar@nesovic.dev"; + github = "kaynetik"; + githubId = 48174247; + name = "Aleksandar Nesovic"; + }; kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; @@ -24528,6 +24541,12 @@ githubId = 75371; name = "Stig Palmquist"; }; + sgomezsal = { + email = "contact@sgomezsal.com"; + github = "sgomezsal"; + githubId = 79657820; + name = "Santiago Gomez"; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fb2e7e186093..9201540632cb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -880,7 +880,6 @@ ./services/misc/ihaskell.nix ./services/misc/iio-niri.nix ./services/misc/input-remapper.nix - ./services/misc/inventree.nix ./services/misc/invidious-router.nix ./services/misc/irkerd.nix ./services/misc/jackett.nix diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 66633efef193..15421ef2f532 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -275,7 +275,10 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProtectSystem = "full"; + ProtectSystem = "strict"; + ReadWritePaths = [ + cfg.home + ]; RemoveIPC = true; RestrictAddressFamilies = [ "AF_UNIX" diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix index abdd6e2ddf3b..5706c900c6f2 100644 --- a/nixos/modules/services/display-managers/dms-greeter.nix +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -22,6 +22,7 @@ let cfg = config.services.displayManager.dms-greeter; cfgDms = config.programs.dms-shell; cfgAutoLogin = config.services.displayManager.autoLogin; + sessionData = config.services.displayManager.sessionData; cacheDir = "/var/lib/dms-greeter"; @@ -52,6 +53,38 @@ let } ${optionalString cfg.logs.save "> ${cfg.logs.path} 2>&1"} ''; + autoLoginCommand = + pkgs.runCommand "dms-greeter-autologin-command" + { + nativeBuildInputs = [ + pkgs.gnugrep + pkgs.coreutils + ]; + } + '' + set -euo pipefail + + session="${sessionData.autologinSession}" + desktops="${sessionData.desktops}" + + for sessionFile in \ + "$desktops/share/wayland-sessions/$session.desktop" \ + "$desktops/share/xsessions/$session.desktop" + do + if [ -f "$sessionFile" ]; then + command="$(grep -m1 '^Exec=' "$sessionFile" | cut -d= -f2- || true)" + + if [ -n "$command" ]; then + printf '%s\n' "$command" > "$out" + exit 0 + fi + fi + done + + echo "dms-greeter autologin: could not resolve Exec for session '$session'" >&2 + exit 1 + ''; + jq = getExe pkgs.jq; configFilesFromHome = @@ -217,6 +250,13 @@ in programs.${cfg.compositor.name}.enable = true; ''; } + { + assertion = cfgAutoLogin.enable -> sessionData.autologinSession != null; + message = '' + dms-greeter auto-login requires services.displayManager.defaultSession to be set, + or at least one session in services.displayManager.sessionPackages. + ''; + } ]; services.greetd = { @@ -227,7 +267,8 @@ in command = getExe greeterScript; }; initial_session = mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) { - inherit (cfgAutoLogin) user command; + inherit (cfgAutoLogin) user; + command = ''${getExe pkgs.bash} -lc "${pkgs.systemd}/bin/systemd-cat $(<${autoLoginCommand})"''; }; }; }; @@ -290,7 +331,9 @@ in fi if [ -f settings.json ]; then - if cp "$(${jq} -r '.customThemeFile' settings.json)" custom-theme.json; then + theme_file="$(${jq} -r '.customThemeFile // empty' settings.json)" + if [ -f "$theme_file" ] && [ -r "$theme_file" ]; then + cp "$theme_file" custom-theme.json mv settings.json settings.orig.json ${jq} '.customThemeFile = "${cacheDir}/custom-theme.json"' settings.orig.json > settings.json fi diff --git a/nixos/modules/services/misc/inventree.nix b/nixos/modules/services/misc/inventree.nix deleted file mode 100644 index 15476e20b167..000000000000 --- a/nixos/modules/services/misc/inventree.nix +++ /dev/null @@ -1,446 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.services.inventree; - pkg = cfg.package; - - mysqlLocal = cfg.database.createLocally && cfg.database.dbtype == "mysql"; - pgsqlLocal = cfg.database.createLocally && cfg.database.dbtype == "postgresql"; - - manage = pkgs.writeShellScriptBin "inventree-manage" '' - set -a - ${lib.toShellVars cfg.settings} - ${lib.optionalString ( - cfg.database.passwordFile != null - ) ''INVENTREE_DB_PASSWORD="$(<"${cfg.database.passwordFile}")"''} - set +a - - pushd "${cfg.dataDir}" - sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - ${ - if config.security.sudo.enable then - "sudo='exec ${config.security.wrapperDir}/sudo -u ${cfg.user} -E'" - else - ">&2 echo 'Aborting, inventree-manage must be run as user `${cfg.user}`!'; exit 2" - } - fi - $sudo ${cfg.package}/bin/inventree "$@" - popd - ''; - -in -{ - meta.buildDocsInSandbox = false; - meta.maintainers = with lib.maintainers; [ - kurogeek - ]; - - options.services.inventree = with lib; { - enable = lib.mkEnableOption "inventree"; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/inventree"; - description = "Inventree's data storage path. Will be `/var/lib/inventree` by default."; - }; - - package = mkOption { - type = types.package; - description = "Which package to use for the InvenTree instance."; - default = pkgs.inventree; - defaultText = literalExpression "pkgs.inventree"; - }; - - adminPasswordFile = mkOption { - type = types.nullOr lib.types.path; - default = null; - example = "/run/keys/inventree-password"; - description = "Path to a file containing admin password"; - }; - - secretKeyFile = mkOption { - type = types.path; - default = "${cfg.dataDir}/secret_key.txt"; - defaultText = lib.literalExpression ''"''${cfg.dataDir}/secret_key.txt"''; - example = "/run/keys/inventree-secret-key"; - description = '' - Path to a file containing the secret key - ''; - }; - - database = { - dbtype = mkOption { - type = lib.types.nullOr ( - lib.types.enum [ - "postgresql" - "mysql" - ] - ); - default = "postgresql"; - description = "Database type."; - }; - dbhost = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = - if pgsqlLocal then - "/run/postgresql" - else if mysqlLocal then - "/run/mysqld/mysqld.sock" - else - "localhost"; - defaultText = "localhost"; - example = "localhost"; - description = '' - Database host or socket path. - If [](#opt-services.inventree.database.createLocally) is true and - [](#opt-services.inventree.database.dbtype) is either `postgresql` or `mysql`, - defaults to the correct Unix socket instead. - ''; - }; - dbport = mkOption { - type = types.port; - default = 5432; - description = "Database host port."; - }; - dbname = mkOption { - type = types.str; - default = "inventree"; - description = "Database name."; - }; - dbuser = mkOption { - type = types.str; - default = "inventree"; - description = "Database username."; - }; - passwordFile = mkOption { - type = with types; nullOr path; - default = null; - example = "/run/keys/inventree-dbpassword"; - description = '' - A file containing the password corresponding to - . - ''; - }; - createLocally = mkOption { - type = types.bool; - default = true; - description = "Create the database and database user locally."; - }; - }; - - domain = mkOption { - type = types.str; - default = "localhost"; - example = "inventree.example.com"; - description = '' - The INVENTREE_SITE_URL option defines the base URL for the - InvenTree server. This is a critical setting, and it is required - for correct operation of the server. If not specified, the - server will attempt to determine the site URL automatically - - but this may not always be correct! - - The site URL is the URL that users will use to access the - InvenTree server. For example, if the server is accessible at - `https://inventree.example.com`, the site URL should be set to - `https://inventree.example.com`. Note that this is not - necessarily the same as the internal URL that the server is - running on - the internal URL will depend entirely on your - server configuration and may be obscured by a reverse proxy or - other such setup. - ''; - }; - - user = mkOption { - type = types.str; - default = "inventree"; - description = "User under which InvenTree runs."; - }; - - group = mkOption { - type = types.str; - default = "inventree"; - description = "Group under which InvenTree runs."; - }; - - settings = mkOption { - type = - with lib.types; - attrsOf ( - nullOr (oneOf [ - path - str - ]) - ); - default = { }; - description = '' - InvenTree config options. - - See [the documentation](https://docs.inventree.org/en/stable/start/config/) for available options. - ''; - example = { - INVENTREE_CACHE_ENABLED = true; - INVENTREE_CACHE_HOST = "localhost"; - - INVENTREE_EMAIL_HOST = "smtp.example.com"; - INVENTREE_EMAIL_PORT = 25; - }; - }; - - }; - - config = lib.mkIf cfg.enable ( - lib.mkMerge [ - { - services.inventree.settings = { - INVENTREE_DB_ENGINE = cfg.database.dbtype; - INVENTREE_DB_NAME = cfg.database.dbname; - INVENTREE_DB_HOST = cfg.database.dbhost; - INVENTREE_DB_USER = cfg.database.dbuser; - INVENTREE_DB_PORT = toString cfg.database.dbport; - - INVENTREE_CONFIG_FILE = lib.mkDefault "${cfg.dataDir}/config/config.yaml"; - INVENTREE_OIDC_PRIVATE_KEY_FILE = lib.mkDefault "${cfg.dataDir}/config/oidc_private_key.txt"; - INVENTREE_STATIC_ROOT = lib.mkDefault "${cfg.dataDir}/data/static_root"; - INVENTREE_MEDIA_ROOT = lib.mkDefault "${cfg.dataDir}/data/media"; - INVENTREE_BACKUP_DIR = lib.mkDefault "${cfg.dataDir}/data/backups"; - INVENTREE_SITE_URL = lib.mkDefault "http://${cfg.domain}"; - INVENTREE_PLUGIN_FILE = lib.mkDefault "${cfg.dataDir}/data/plugins/plugins.txt"; - INVENTREE_PLUGIN_DIR = lib.mkDefault "${cfg.dataDir}/data/plugins"; - INVENTREE_ADMIN_PASSWORD_FILE = lib.mkDefault cfg.adminPasswordFile; - INVENTREE_SECRET_KEY_FILE = lib.mkDefault cfg.secretKeyFile; - INVENTREE_AUTO_UPDATE = lib.mkDefault "false"; - }; - environment.systemPackages = [ manage ]; - systemd.tmpfiles.rules = ( - map (dir: "d ${dir} 0755 inventree inventree") [ - "${cfg.dataDir}" - "${cfg.dataDir}/config" - "${cfg.dataDir}/data" - "${cfg.dataDir}/data/static_root" - "${cfg.dataDir}/data/media" - "${cfg.dataDir}/data/backups" - "${cfg.dataDir}/data/plugins" - ] - ); - - services.postgresql = lib.mkIf pgsqlLocal { - enable = true; - ensureDatabases = [ cfg.database.dbname ]; - ensureUsers = [ - { - name = cfg.database.dbuser; - ensureDBOwnership = true; - } - ]; - }; - - services.mysql = lib.mkIf mysqlLocal { - enable = true; - package = lib.mkDefault pkgs.mariadb; - ensureDatabases = [ cfg.database.dbname ]; - ensureUsers = [ - { - name = cfg.database.dbuser; - ensurePermissions = { - "${cfg.database.dbname}.*" = "ALL PRIVILEGES"; - }; - } - ]; - }; - - services.nginx.enable = true; - services.nginx.virtualHosts.${cfg.domain} = { - locations = - let - unixPath = config.systemd.sockets.inventree-server.socketConfig.ListenStream; - in - { - "/" = { - extraConfig = '' - proxy_set_header Host $host; - proxy_set_header X-Forwarded-By $server_addr:$server_port; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header CLIENT_IP $remote_addr; - - proxy_pass_request_headers on; - - proxy_redirect off; - - client_max_body_size 100M; - - proxy_buffering off; - proxy_request_buffering off; - ''; - proxyPass = "http://unix:${unixPath}"; - }; - "/auth" = { - extraConfig = '' - internal; - proxy_pass_request_body off; - proxy_set_header Content-Length ""; - proxy_set_header X-Original-URI $request_uri; - ''; - proxyPass = "http://unix:${unixPath}:/auth/"; - }; - "/static/" = { - alias = "${cfg.settings.INVENTREE_STATIC_ROOT}/"; - extraConfig = '' - autoindex on; - - # Caching settings - expires 30d; - add_header Pragma public; - add_header Cache-Control "public"; - ''; - }; - "/media/" = { - alias = "${cfg.settings.INVENTREE_MEDIA_ROOT}/"; - extraConfig = '' - auth_request /auth; - add_header Content-disposition "attachment"; - ''; - }; - }; - }; - - systemd.services.inventree-setup = { - description = "Inventree setup"; - wantedBy = [ "inventree.target" ]; - partOf = [ "inventree.target" ]; - after = lib.optional mysqlLocal "mysql.service" ++ lib.optional pgsqlLocal "postgresql.target"; - requires = lib.optional mysqlLocal "mysql.service" ++ lib.optional pgsqlLocal "postgresql.target"; - before = [ - "inventree-static.service" - "inventree-server.service" - "inventree-qcluster.service" - ]; - serviceConfig = { - Type = "oneshot"; - User = cfg.user; - Group = cfg.group; - RemainAfterExit = true; - PrivateTmp = true; - } - // lib.optionalAttrs (cfg.database.passwordFile != null) { - LoadCredential = "db_password:${cfg.database.passwordFile}"; - }; - environment = cfg.settings; - script = '' - set -euo pipefail - umask u=rwx,g=,o= - - ${ - lib.optionalString (cfg.database.passwordFile != null) '' - INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password") - '' - } \ - exec ${pkg}/bin/inventree migrate - ''; - }; - - systemd.services.inventree-static = { - description = "Inventree static migration"; - wantedBy = [ "inventree.target" ]; - partOf = [ "inventree.target" ]; - before = [ "inventree-server.service" ]; - environment = cfg.settings; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - StateDirectory = "inventree"; - PrivateTmp = true; - } - // lib.optionalAttrs (cfg.database.passwordFile != null) { - LoadCredential = "db_password:${cfg.database.passwordFile}"; - }; - script = '' - ${ - lib.optionalString (cfg.database.passwordFile != null) '' - INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password") - '' - } \ - exec ${pkg}/bin/inventree collectstatic --no-input - ''; - }; - - systemd.services.inventree-server = { - description = "Inventree Gunicorn service"; - requiredBy = [ "inventree.target" ]; - partOf = [ "inventree.target" ]; - environment = cfg.settings; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - StateDirectory = "inventree"; - PrivateTmp = true; - } - // lib.optionalAttrs (cfg.database.passwordFile != null) { - LoadCredential = "db_password:${cfg.database.passwordFile}"; - }; - script = '' - ${ - lib.optionalString (cfg.database.passwordFile != null) '' - INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password") - '' - } \ - exec ${pkg}/bin/gunicorn InvenTree.wsgi - ''; - }; - - systemd.sockets.inventree-server = { - wantedBy = [ "sockets.target" ]; - partOf = [ "inventree.target" ]; - socketConfig.ListenStream = "/run/inventree/gunicorn.socket"; - }; - - systemd.services.inventree-qcluster = { - description = "InvenTree qcluster server"; - requiredBy = [ "inventree.target" ]; - wantedBy = [ "inventree.target" ]; - partOf = [ "inventree.target" ]; - environment = cfg.settings; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - StateDirectory = "inventree"; - PrivateTmp = true; - } - // lib.optionalAttrs (cfg.database.passwordFile != null) { - LoadCredential = "db_password:${cfg.database.passwordFile}"; - }; - script = '' - ${ - lib.optionalString (cfg.database.passwordFile != null) '' - INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password") - '' - } \ - exec ${pkg}/bin/inventree qcluster - ''; - }; - - systemd.targets.inventree = { - description = "Target for all InvenTree services"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - }; - - users = lib.optionalAttrs (cfg.user == cfg.user) { - users.${cfg.user} = { - group = cfg.group; - isSystemUser = true; - home = cfg.dataDir; - }; - groups.${cfg.group}.members = [ cfg.user ]; - }; - } - ] - ); -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d7863112185c..cd7d3b61325c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -797,7 +797,6 @@ in installer = handleTest ./installer.nix { }; installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { }; intune = runTest ./intune.nix; - inventree = runTest ./inventree.nix; invidious = runTest ./invidious.nix; invoiceplane = runTest ./invoiceplane.nix; iodine = runTest ./iodine.nix; diff --git a/nixos/tests/inventree.nix b/nixos/tests/inventree.nix deleted file mode 100644 index 34fe8730ae67..000000000000 --- a/nixos/tests/inventree.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, ... }: -{ - name = "inventree"; - meta.maintainers = with lib.maintainers; [ - kurogeek - ]; - - nodes = { - psqlTest = { - services.inventree = { - enable = true; - }; - }; - mysqlTest = { - services.inventree = { - enable = true; - database.dbtype = "mysql"; - }; - }; - }; - testScript = '' - start_all() - psqlTest.wait_for_unit("inventree.target") - psqlTest.wait_for_unit("inventree-server.service") - psqlTest.wait_for_open_unix_socket("/run/inventree/gunicorn.socket") - psqlTest.wait_until_succeeds("curl -sf http://localhost/web") - - mysqlTest.wait_for_unit("inventree.target") - mysqlTest.wait_for_unit("inventree-server.service") - mysqlTest.wait_for_open_unix_socket("/run/inventree/gunicorn.socket") - mysqlTest.wait_until_succeeds("curl -sf http://localhost/web") - ''; -} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c0d98e235bc0..0f6deaab651e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -572,8 +572,8 @@ let mktplcRef = { name = "comment-tagged-templates"; publisher = "bierner"; - version = "0.3.3"; - hash = "sha256-M2XdMQ2l6oMYiHTdfRJ/n/Ys3LecEPwAozQtLBcn7FY="; + version = "0.4.0"; + hash = "sha256-mI2VogA6JVEfFL5B3+Od23//uPmXeqP8Om2AnhCs2Hs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.comment-tagged-templates/changelog"; @@ -1967,8 +1967,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.71.4"; - hash = "sha256-GIqokG+RFFmUHzrtln0PFHuSYsITZfw21WQspj2AT6U="; + version = "6.71.9"; + hash = "sha256-8+5Njd4s3iSrZwwdEVvr/R+uv8i16wDdsbiv3xPISWc="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -4324,8 +4324,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.44.0"; - hash = "sha256-6P29hCcOpEWNXSArnMPiWVwbbyhzlS1LCh3uSDWEfJo="; + version = "4.45.0"; + hash = "sha256-itrjHAA3gseflNzOd8UKB8DbhwJ/cWkGuuopLOD83GM="; }; meta.license = lib.licenses.lgpl3Only; }; @@ -4772,8 +4772,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.107.5"; - hash = "sha256-8rsj1a/Tj4QpvGN83F3aMHNQVC/9TE61AFS5KhiIpy8="; + version = "0.109.1"; + hash = "sha256-ndhIA9g0cONzs+nDPcY0wLjnelfyBUXV9HWfZL/nfmg="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -5360,8 +5360,8 @@ let mktplcRef = { name = "pretty-ts-errors"; publisher = "yoavbls"; - version = "0.8.3"; - hash = "sha256-YhYHtn0/en0hOts+s/Imln9WzwSrUhwBJPH1qdISUrM="; + version = "0.8.4"; + hash = "sha256-FyoT9S58aBkq9Q95fC8NaaHlCoUOpCBcOO8+/I33V70="; }; meta = { description = "Make TypeScript errors prettier and human-readable in VSCode"; diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 00a8af822126..3afa2eff65ed 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.14.6"; - hash = "sha256-MACP/IvSk4JwD9DUWRD6pGYbgVQVzuCz8FvXdfHcphs="; + version = "1.15.1"; + hash = "sha256-wdZ4Ro+L6We9GScVIlOBghPFv41xJD7x11Ni3iPshOI="; }; meta = { diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index e4cd4eea1d1b..eb10f1dc59c2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.13.1"; + version = "3.15.2"; src = fetchFromGitHub { owner = "databus23"; repo = "helm-diff"; rev = "v${version}"; - hash = "sha256-7LkXoPhLqZtc1jy8JOkZrHWSIqB2oZLHsEyeNk3vl60="; + hash = "sha256-gcIwg/EZ8A3RKSPuk3Ot6hPDS0m65V/IVqUs3VPbrSQ="; }; - vendorHash = "sha256-QSbml6M+ftQy4n+ybYWf2gCsbVmrnhX09w3ffW/JgUM="; + vendorHash = "sha256-7Qw5ggvyhffmVZH7jKF21y+m1KTroucQ/ZGP67D+EjY="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 53b7969254d7..0788779e1d90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,11 +45,11 @@ "vendorHash": "sha256-btxzZZtvgeih+OUhc5QnF8ac22TxpGibffGNkljjq6c=" }, "aliyun_alicloud": { - "hash": "sha256-5KqzbCVLtpLo22BPOuZexkOS8Qv9i3/B9UCBWtGI5G8=", + "hash": "sha256-MkFDIGixsjQ6NfzI1X6fiLX4ozi7QA82jGryne/TcBU=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.272.1", + "rev": "v1.273.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0=" }, @@ -1004,11 +1004,11 @@ "vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo=" }, "okta_okta": { - "hash": "sha256-2uQgmzz2dRkOb6OgM3w+IKe1/AY435wZbNmQmkiy8dM=", + "hash": "sha256-sr3Q39Lx47+OT4alUEic7PBvtZKTwQ9Do15YfbVn9b4=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v6.6.0", + "rev": "v6.6.1", "spdx": "MPL-2.0", "vendorHash": "sha256-EqXLfVayaOG/G3c6EkgQoPGNwnG2qKSlDo2ai/onmQE=" }, diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 09aaac6e9ad1..678300d97168 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "profanity"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = finalAttrs.version; - hash = "sha256-h+R+hasc45NZOneuqZ+z+yjfpsPm317OXq0LYe3t+cQ="; + hash = "sha256-/1ae2+iY01C0TyrvviZIcwUQDJvr2qq2DM0GVbjoynI="; }; patches = [ diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 889613593601..d26ca2578397 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -6,21 +6,21 @@ # the following are non-haskell dependencies makeWrapper, which, + buildNpmPackage, maude, graphviz, glibcLocales, - fetchpatch, }: let inherit (haskellPackages) mkDerivation; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; - rev = version; - hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI="; + tag = version; + hash = "sha256-yXJIJENygr/lmkrVap4ohb8Pua4kri+yaD/Dy0Hpwn4="; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -141,6 +141,20 @@ let } ); + tamarin-frontend = buildNpmPackage { + pname = "tamarin-frontend"; + inherit version src; + + sourceRoot = "source/frontend"; + + npmDepsHash = "sha256-GJiOCyTUfseZXd5WU018MKjxvrc+UOr7l7ZZSpzCS54="; + + installPhase = '' + mkdir -p $out + cp dist/* $out/ + ''; + }; + in mkDerivation ( common "tamarin-prover" src @@ -148,21 +162,16 @@ mkDerivation ( isLibrary = false; isExecutable = true; - patches = [ - # Allows tamarin-prover to run with Maude 3.5.1 - # This should be removed on the next release - (fetchpatch { - url = "https://github.com/tamarin-prover/tamarin-prover/commit/1a41b507e7f60d081d8c91cd465386d57f814f11.patch"; - includes = [ "src/Main/Console.hs" ]; - hash = "sha256-X8qhscwy+efATrl3rLtn0Xi9M5a2CsFrjBbiqvVRtSE="; - }) - ]; - # strip out unneeded deps manually doHaddock = false; enableSharedExecutables = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + preBuild = '' + cp ${tamarin-frontend}/*.js data/js/ + cp ${tamarin-frontend}/*.css data/css/ + ''; + # wrap the prover to be sure it can find maude, sapic, etc executableToolDepends = [ makeWrapper diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 363137c4bdad..f7b5e575c0e2 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -6,7 +6,6 @@ ninja, nv-codec-headers-12, fetchFromGitHub, - fetchpatch2, fetchurl, addDriverRunpath, autoAddDriverRunpath, @@ -99,13 +98,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "32.0.4"; + version = "32.1.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-OiLlYnHaW+ehHtz4N20ctkfL4WmCzI45+VUG5hHOga4="; + hash = "sha256-edmDqavmDT8+bl0nXmDqYPpkuitg9T8u2fI/j6mWoFc="; fetchSubmodules = true; }; @@ -113,11 +112,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-nix-plugin-path.patch - # Fix build with Qt 6.10 https://github.com/obsproject/obs-studio/pull/12328 - (fetchpatch2 { - url = "https://github.com/obsproject/obs-studio/commit/26dfacbd4f5217258a2f1c5472a544c65a182d10.patch?full_index=1"; - hash = "sha256-gEWDzZ+GPCR+rmytXcbiBcvzLg8VwZCveMKkvho3COI="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index ccf4580bc029..b8588d89af30 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2026-02-22"; + version = "0-unstable-2026-03-14"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "e78819e1ec1d77a93057c6bf8ef0eba0293ed782"; - hash = "sha256-TH5FOTtnYNzlM1tysCbSO1wNFxyPSg5n9jUmFli5NJw="; + rev = "36106b00885d81efa9ac9a8c387e3431abac0471"; + hash = "sha256-xf+gRy8t3uXpGwsVhPyO8J4YQ806KDZ1muR6A/7AhGM="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/al/alcarin-tengwar/package.nix b/pkgs/by-name/al/alcarin-tengwar/package.nix new file mode 100644 index 000000000000..d792aaf678a4 --- /dev/null +++ b/pkgs/by-name/al/alcarin-tengwar/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + installFonts, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "alcarin-tengwar"; + version = "0.83"; + + src = fetchFromGitHub { + owner = "Tosche"; + repo = "Alcarin-Tengwar"; + rev = "a4530d430ea01871b0b0a54d1de218d2ffde0ea5"; + hash = "sha256-W1PJ2ABjtGUhWp6XBUq6Zox7uG81tMEs13GidfwgD6Q="; + }; + + nativeBuildInputs = [ installFonts ]; + + meta = { + description = "Typeface designed to provide Tengwar symbols"; + homepage = "https://github.com/Tosche/Alcarin-Tengwar"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ gs-101 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 245c9e1cf03b..8968c3d98c7f 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2379"; + version = "2.0.2387"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-W1c0xFm6ZIpykfMegmc3PAX8X1SNhSpsN37ZhXn4424="; + hash = "sha256-0DuHzZdPjzoUXGgn7Kt7CGjvNXuYYAZqpuuQS86ECXM="; }; - npmDepsHash = "sha256-3sWgNa6ez5lZHQj6tThxXTYVpkDXHulb7mkiqVVyTlg="; + npmDepsHash = "sha256-CzWF/CbyVGGogeEFQOjldBWGP98q4q/x/KukAE4EJPo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ap/apt-dater/package.nix b/pkgs/by-name/ap/apt-dater/package.nix index 4fbbc8b70fec..1d2d482e9274 100644 --- a/pkgs/by-name/ap/apt-dater/package.nix +++ b/pkgs/by-name/ap/apt-dater/package.nix @@ -12,17 +12,18 @@ popt, libxslt, screen, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "apt-dater"; - version = "1.0.4-unstable-2024-10-04"; + version = "1.0.4-unstable-2026-02-15"; src = fetchFromGitHub { owner = "DE-IBH"; repo = "apt-dater"; - rev = "113ea9b72d318f316ea7cac8ddad5be004787a22"; - hash = "sha256-/Ufa/pEbqD25kp+k0zm9MuLS1zG+xWqhpBkL7ng2+Bo="; + rev = "eb3df6923262051082df2e9377516553da9ba508"; + hash = "sha256-I5TQ6sPIWD7jllelkvYjLa/7FI2IpWsGRS4FsxXQKGs="; }; nativeBuildInputs = [ @@ -66,6 +67,12 @@ stdenv.mkDerivation { doCheck = true; + # Use unstable to pull in gcc-15 fixes: + # https://github.com/DE-IBH/apt-dater/pull/187 + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + meta = { homepage = "https://github.com/DE-IBH/apt-dater"; description = "Terminal-based remote package update manager"; diff --git a/pkgs/by-name/az/azure-functions-core-tools/deps.json b/pkgs/by-name/az/azure-functions-core-tools/deps.json index 4037b5b48b65..aceacf1528e3 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/deps.json +++ b/pkgs/by-name/az/azure-functions-core-tools/deps.json @@ -79,21 +79,6 @@ "version": "12.20.1", "hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w=" }, - { - "pname": "Azure.Storage.Queues", - "version": "12.19.1", - "hash": "sha256-EskLp1RYDvnRpOMsTRylalh5VP5fUddTdG4eR9i1tO4=" - }, - { - "pname": "Castle.Core", - "version": "4.2.0", - "hash": "sha256-B25CLu7UhAuu7ITddB9wgqfrFtJD8BEsZO/tCBKxGyU=" - }, - { - "pname": "Castle.Core", - "version": "4.2.1", - "hash": "sha256-FPDdJfRQkjBQC8JwbXALf71HJfFMciJyenIIqJSWC6M=" - }, { "pname": "Colors.Net", "version": "1.1.0", @@ -104,16 +89,6 @@ "version": "2.0.9.136", "hash": "sha256-wRvKTW4WisziZmglLOqbUXVv9pPh9MmF7HS/hcoj7fM=" }, - { - "pname": "FluentAssertions", - "version": "5.2.0", - "hash": "sha256-S1k2Z3EBlGYSc9ofDm0hSVUUt9xog5rejfoXWLNXcpE=" - }, - { - "pname": "FSharp.Core", - "version": "3.1.2.5", - "hash": "sha256-MMIyGbKBNZFOgr4z8dC8jhICWtRPBCNzWc7ll2uU210=" - }, { "pname": "Google.Protobuf", "version": "3.23.1", @@ -244,56 +219,6 @@ "version": "2.2.0", "hash": "sha256-NBUF/oT5TYVvuUW4/lws//1OfX8ldrAxY4+CLnmT3Ag=" }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "8.0.24", - "hash": "sha256-S8WKO+yB9fF56M2DOaqEOUzKL0/iXtCZQWcXeAV7zWE=" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "9.0.13", - "hash": "sha256-uhcJ9ll5PEg4bX2PhIrxPZ270j2W2bYREarQCihyW7w=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "8.0.24", - "hash": "sha256-K+AQgKYpIKFYxPSOKNm2hYyDlEhQCj8KN5FV9xdV8nY=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "9.0.13", - "hash": "sha256-zPiQ1KhNkdc9w9B5bq9EWBrjBXJMBmdn5qUqubp+Xyo=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.24", - "hash": "sha256-qNw/gjM/JGjL3K6bxr0xhF4tLcGVScMOnk4M6O8eezU=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "9.0.13", - "hash": "sha256-RMGZEBbjAgzoZIf878drIgb33Q0+NYX6euOIV34BjQk=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "8.0.24", - "hash": "sha256-bS8XRDQ7cGOzqb5i43S4LjanOAfZXbsWOI4n/tnrBi0=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "9.0.13", - "hash": "sha256-NkAx5OX1eGgd+jr5a0z4Uys/l9AkI4CyqXQfGi7GNKs=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "8.0.24", - "hash": "sha256-Ek789mAUCy/sYZY9ZhBYrVitFk/QCLHPp9+2WHZ9Wvc=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "9.0.13", - "hash": "sha256-blbl3C1tBmx+u9paJVHhgX3y8IaHZI2RwZEidgIZVtU=" - }, { "pname": "Microsoft.AspNetCore.Authentication.Abstractions", "version": "2.2.0", @@ -796,11 +721,6 @@ "hash": "sha256-w59GMXgyodWUFJauwFOzWUydz+76iiXXzVMqjvFS7XQ=", "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.websites.dataprotection/2.1.91-alpha/microsoft.azure.websites.dataprotection.2.1.91-alpha.nupkg" }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "1.1.1", - "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" - }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", @@ -866,11 +786,6 @@ "version": "3.3.1", "hash": "sha256-rgPXlePpLyrkdyVxwmVZef3go/BTxCRGfu+639g6BFA=" }, - { - "pname": "Microsoft.CodeCoverage", - "version": "1.0.3", - "hash": "sha256-vO0DJv2QNYfus4VzqVkNcnWQqmuUrM5le7supZRl/Uk=" - }, { "pname": "Microsoft.CSharp", "version": "4.3.0", @@ -891,16 +806,6 @@ "version": "4.7.0", "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, - { - "pname": "Microsoft.DotNet.ILCompiler", - "version": "9.0.13", - "hash": "sha256-yB24drjo/WDEU/nIgePA1UPgtFSb0oNBQrU6iXs1NRM=" - }, - { - "pname": "Microsoft.DotNet.PlatformAbstractions", - "version": "1.0.3", - "hash": "sha256-tE+2/zJAOpwaINSnmsq070K5xHQAzzqcrVkCxBFiXtk=" - }, { "pname": "Microsoft.DotNet.PlatformAbstractions", "version": "2.1.0", @@ -1111,11 +1016,6 @@ "version": "9.0.6", "hash": "sha256-40rY38OwSqueIWr/KMvJX9u+vipN+AaRQ6eNCZLqrog=" }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "1.0.3", - "hash": "sha256-NEcjABwtUqoDs6mrYKHJZ8Rn0EN5krHitnxghez6lO0=" - }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "2.1.0", @@ -1581,116 +1481,11 @@ "version": "2.2.0", "hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA=" }, - { - "pname": "Microsoft.NET.ILLink.Tasks", - "version": "9.0.13", - "hash": "sha256-1fx7XZRRB//5B4GZlJuNsVKBin1UuTlijn49truBxn0=" - }, { "pname": "Microsoft.NET.StringTools", "version": "1.0.0", "hash": "sha256-smmwm1XbKsk0SPW74rd2uDubWzfd7RhfSkPr932cyhs=" }, - { - "pname": "Microsoft.NET.Test.Sdk", - "version": "15.6.2", - "hash": "sha256-YlhxcIvjI3MZ8EidG8chXhlTsHE59U0nkbMUVDsQMYI=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "8.0.24", - "hash": "sha256-/dAJ/5dleJlkxMWd3kJSiME7Yq/QdlE73DZwM1C9KGQ=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "9.0.13", - "hash": "sha256-hyLmW3K44AcouG0o5iH7dF06+pgqcs29DoplRYFxeqI=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.24", - "hash": "sha256-REGiuRAPAOZl0arcP/QCYH9gdiCBDGu0Vnp5LD5qPmE=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "9.0.13", - "hash": "sha256-OQenvUHKKS0h1c2EirYATJIEgGpVCJvxHIykIV6NCaE=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "8.0.24", - "hash": "sha256-C3F39k9qyKPAASiaacsvER4GN2Ryw2dxKKpRECaylto=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "9.0.13", - "hash": "sha256-JAFf+vSH7jUnjhKPGPBzgsauq29Ux+aIYi/k8W2kzBs=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "8.0.24", - "hash": "sha256-FHorC+fd57T98l+8CrcBCeuGye11IJdGBKeY2rM1fNM=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "9.0.13", - "hash": "sha256-yFizMrUqfMUGV1uxUoAOJP4f5m2jAVAS+mt9SFSRhf4=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "8.0.24", - "hash": "sha256-1dP3uWhHcbXPI3kA4b14ZulF9m1lU9OPZ+hQ8TnZveY=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "9.0.13", - "hash": "sha256-igu/tb7UIgqgP8+hGThU0N+nowgeKBOGdRxam+zrJvM=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "8.0.24", - "hash": "sha256-oe/yKNEiAJwio7fZs0Hf+AfIkIuKsB+rpbyr1DGEx9I=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "9.0.13", - "hash": "sha256-8yfXrHaOJZdC6oOrHvLEwhx2YWhQZRlfMAzI2KG0R9E=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.24", - "hash": "sha256-tliAyrTeTUdQIe5CkwQLvQMNKIesn303oS3EYzV9IjE=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "9.0.13", - "hash": "sha256-yoB2mCxdhsE/grReVIyeH4Q2WpUA9hHxUyZemCC2Cuc=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "8.0.24", - "hash": "sha256-v20On/+Xs3U0EHlxmx0BqJXEhBLErOCb2ynmi7VGIa0=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "9.0.13", - "hash": "sha256-yWhIeOq7w5UTbxM27N6/pg/zqyj31ZcpaHUi4Ca2QD4=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "8.0.24", - "hash": "sha256-JG1fpGbqOXqs6fYkeABAsZpdLUuOaeJVvk648DeGyew=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "9.0.13", - "hash": "sha256-+LIth4iOI4rQwZTRvR+Y0bA3qxM4TUuZg72cqY5I0LA=" - }, - { - "pname": "Microsoft.NETCore.DotNetAppHost", - "version": "8.0.8", - "hash": "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.0.1", @@ -1741,16 +1536,6 @@ "version": "1.3.0", "hash": "sha256-9nJA7a43OhJKCzFJPYfTJHL0JmVxVkNsYPexln8pFKE=" }, - { - "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "15.6.2", - "hash": "sha256-O4FJRxBPtUHE1IEd6/IepmkRHlwtTAJ2UbECqGzOpvo=" - }, - { - "pname": "Microsoft.TestPlatform.TestHost", - "version": "15.6.2", - "hash": "sha256-aTsuaMw1YvLqQhsb3JttF7w6PK31M/jDZMHOqkGz+uA=" - }, { "pname": "Microsoft.Win32.Primitives", "version": "4.0.1", @@ -1761,11 +1546,6 @@ "version": "4.3.0", "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.0.0", - "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo=" - }, { "pname": "Microsoft.Win32.Registry", "version": "4.3.0", @@ -1786,11 +1566,6 @@ "version": "1.0.0", "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY=" }, - { - "pname": "Moq", - "version": "4.8.2", - "hash": "sha256-eNFJeuk4nmYOoBiu4zOtcIyk96NYXr38vvthNLO4OCA=" - }, { "pname": "NCrontab.Signed", "version": "3.3.3", @@ -1826,11 +1601,6 @@ "version": "1.0.2", "hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA=" }, - { - "pname": "NSubstitute", - "version": "3.1.0", - "hash": "sha256-aO5dsxr6fOTeWWseQkxx4+qkoErPP3UbBKDrH/uEmIk=" - }, { "pname": "NuGet.Common", "version": "5.11.6", @@ -1956,21 +1726,11 @@ "version": "2.3.3", "hash": "sha256-Jeq5LBMWIormTaamIRR5aLl/mRuYmX9XiSBLnXmhDkA=" }, - { - "pname": "RichardSzalay.MockHttp", - "version": "5.0.0", - "hash": "sha256-jwFUQe9HdC+gu9W/r4eipYgqbGr0eVA7F3sj2k25+40=" - }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", @@ -2041,61 +1801,21 @@ "version": "4.3.0", "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" }, - { - "pname": "runtime.linux-arm64.Microsoft.DotNet.ILCompiler", - "version": "9.0.13", - "hash": "sha256-vwIqC7MmdxuwprvPg5kxpl12HASsUSQdOsbC+UrrSxA=" - }, - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost", - "version": "8.0.8", - "hash": "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4=" - }, - { - "pname": "runtime.linux-x64.Microsoft.DotNet.ILCompiler", - "version": "9.0.13", - "hash": "sha256-0jqd1+Q/0/JgekLDBdsGchsg/5BN5x88JzJS1iqVodE=" - }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", - "version": "8.0.8", - "hash": "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw=" - }, { "pname": "runtime.native.System", "version": "4.0.0", @@ -2106,31 +1826,11 @@ "version": "4.3.0", "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.1.0", - "hash": "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.0.1", - "hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E=" - }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, - { - "pname": "runtime.native.System.Security.Cryptography", - "version": "4.0.0", - "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" - }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", @@ -2146,96 +1846,41 @@ "version": "4.3.2", "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" }, - { - "pname": "runtime.osx-arm64.Microsoft.DotNet.ILCompiler", - "version": "9.0.13", - "hash": "sha256-imtP20skhTnzSGXqCzVt57SqkM0btTet9g1OHm7QGV8=" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost", - "version": "8.0.8", - "hash": "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY=" - }, - { - "pname": "runtime.osx-x64.Microsoft.DotNet.ILCompiler", - "version": "9.0.13", - "hash": "sha256-Mds6EWafCVVuMp1mKQcreRGajlIMVJSU5qO5zZ4hrTw=" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost", - "version": "8.0.8", - "hash": "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE=" - }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", @@ -2246,11 +1891,6 @@ "version": "4.3.0", "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.1", - "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" - }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", @@ -2266,11 +1906,6 @@ "version": "4.3.0", "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", @@ -2291,16 +1926,6 @@ "version": "1.2.0.556", "hash": "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc=" }, - { - "pname": "Suave", - "version": "1.1.3", - "hash": "sha256-z730a3DmRHKn9kYkd49Zk4/9Qk+/1GpZNuiCk+18hqg=" - }, - { - "pname": "SuaveServerWrapper", - "version": "0.0.3", - "hash": "sha256-3+lml7VSoYlbUMSxCoAetoGOPIKZVy+T0Xu8HFNI924=" - }, { "pname": "System.AppContext", "version": "4.1.0", @@ -2311,11 +1936,6 @@ "version": "4.3.0", "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, - { - "pname": "System.Buffers", - "version": "4.0.0", - "hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8=" - }, { "pname": "System.Buffers", "version": "4.3.0", @@ -2326,11 +1946,6 @@ "version": "4.5.0", "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs=" }, - { - "pname": "System.ClientModel", - "version": "1.0.0", - "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y=" - }, { "pname": "System.ClientModel", "version": "1.1.0", @@ -2376,22 +1991,6 @@ "version": "5.0.0", "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" }, - { - "pname": "System.Collections.NonGeneric", - "version": "4.3.0", - "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" - }, - { - "pname": "System.Collections.Specialized", - "version": "4.3.0", - "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" - }, - { - "pname": "System.CommandLine", - "version": "2.0.0-beta5.25306.101", - "hash": "sha256-Gn1MRpeHkduwDPtoZmQoIItMWwRKFDkFtFGyH2+AtpE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta5.25306.101/system.commandline.2.0.0-beta5.25306.101.nupkg" - }, { "pname": "System.ComponentModel", "version": "4.0.1", @@ -2412,31 +2011,6 @@ "version": "4.5.0", "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, - { - "pname": "System.ComponentModel.EventBasedAsync", - "version": "4.0.11", - "hash": "sha256-kAOQ9dEg+yDh5h56qSf36OTLJYRIcKftIcOqxfuJJR8=" - }, - { - "pname": "System.ComponentModel.Primitives", - "version": "4.3.0", - "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus=" - }, - { - "pname": "System.ComponentModel.TypeConverter", - "version": "4.1.0", - "hash": "sha256-HmzGTU2NVj8qUn1xCGxifOQ/e/HZCVvgIECzcJPaDJ0=" - }, - { - "pname": "System.ComponentModel.TypeConverter", - "version": "4.3.0", - "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54=" - }, - { - "pname": "System.Configuration.ConfigurationManager", - "version": "4.4.0", - "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" - }, { "pname": "System.Configuration.ConfigurationManager", "version": "4.5.0", @@ -2472,11 +2046,6 @@ "version": "4.3.0", "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.0.0", - "hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg=" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", @@ -2527,16 +2096,6 @@ "version": "6.0.0", "hash": "sha256-tmAXwujLlc+F/SIVJvJYnSuUjCQ4ylytHTHV4Ly5EN8=" }, - { - "pname": "System.Diagnostics.Process", - "version": "4.1.0", - "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" - }, - { - "pname": "System.Diagnostics.TextWriterTraceListener", - "version": "4.0.0", - "hash": "sha256-GmInHGlq5ZTnT7qsxpKnXid11hcRXVBhA1N1zyePL/Y=" - }, { "pname": "System.Diagnostics.Tools", "version": "4.0.1", @@ -2547,11 +2106,6 @@ "version": "4.3.0", "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, - { - "pname": "System.Diagnostics.TraceSource", - "version": "4.0.0", - "hash": "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U=" - }, { "pname": "System.Diagnostics.TraceSource", "version": "4.3.0", @@ -2617,11 +2171,6 @@ "version": "4.3.0", "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, - { - "pname": "System.Globalization.Extensions", - "version": "4.0.1", - "hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI=" - }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", @@ -2742,11 +2291,6 @@ "version": "4.3.0", "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, - { - "pname": "System.Linq.Queryable", - "version": "4.3.0", - "hash": "sha256-EioRexhnpSoIa96Un0syFO9CP6l1jNaXYhp5LlnaLW4=" - }, { "pname": "System.Memory", "version": "4.5.1", @@ -2842,11 +2386,6 @@ "version": "4.3.0", "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" }, - { - "pname": "System.Private.DataContractSerialization", - "version": "4.1.1", - "hash": "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY=" - }, { "pname": "System.Private.Uri", "version": "4.3.0", @@ -2927,11 +2466,6 @@ "version": "4.3.0", "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, - { - "pname": "System.Reflection.Metadata", - "version": "1.3.0", - "hash": "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg=" - }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", @@ -3042,11 +2576,6 @@ "version": "4.3.0", "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, - { - "pname": "System.Runtime.Loader", - "version": "4.0.0", - "hash": "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI=" - }, { "pname": "System.Runtime.Loader", "version": "4.3.0", @@ -3062,16 +2591,6 @@ "version": "4.3.0", "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, - { - "pname": "System.Runtime.Serialization.Json", - "version": "4.0.2", - "hash": "sha256-thmzgYbyxoPYtkDdDwoG7wnVuVhFNwLUE2AsDfRf1yM=" - }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" - }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.3.0", @@ -3107,11 +2626,6 @@ "version": "4.3.0", "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.2.0", - "hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU=" - }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", @@ -3127,11 +2641,6 @@ "version": "5.0.0", "hash": "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo=" }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.0.0", - "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" - }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", @@ -3147,11 +2656,6 @@ "version": "4.3.0", "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.0.0", - "hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs=" - }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -3387,26 +2891,11 @@ "version": "4.5.4", "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" }, - { - "pname": "System.Threading.Thread", - "version": "4.0.0", - "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" - }, { "pname": "System.Threading.Thread", "version": "4.3.0", "hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg=" }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.0.10", - "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, { "pname": "System.Threading.Timer", "version": "4.0.1", @@ -3417,11 +2906,6 @@ "version": "4.3.0", "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, - { - "pname": "System.ValueTuple", - "version": "4.4.0", - "hash": "sha256-LqpI3bSaXqVPqfEdfsWE2qX9tzFV6VPU6x4A/fVzzfM=" - }, { "pname": "System.Windows.Extensions", "version": "4.7.0", @@ -3452,101 +2936,21 @@ "version": "4.3.0", "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" }, - { - "pname": "System.Xml.XmlDocument", - "version": "4.0.1", - "hash": "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY=" - }, { "pname": "System.Xml.XmlDocument", "version": "4.3.0", "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4=" }, - { - "pname": "System.Xml.XmlSerializer", - "version": "4.0.11", - "hash": "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY=" - }, { "pname": "System.Xml.XmlSerializer", "version": "4.3.0", "hash": "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4=" }, - { - "pname": "System.Xml.XPath", - "version": "4.0.1", - "hash": "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo=" - }, - { - "pname": "System.Xml.XPath.XmlDocument", - "version": "4.0.1", - "hash": "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA=" - }, - { - "pname": "Validation", - "version": "2.4.15", - "hash": "sha256-UpT+aE6yD48RMwXZZpAaUn71CBaBBZ1tLvzgk/YHxvM=" - }, { "pname": "WindowsAzure.Storage", "version": "9.3.1", "hash": "sha256-tNXGq1PYJcGXzlGC+W32dzWxIAt0ZsOWIRbnewX8k/8=" }, - { - "pname": "xunit", - "version": "2.4.0", - "hash": "sha256-xRxQfuu87qJYTIeRZf4OdAUTwf8dL8Am6cQgk6tRHrs=" - }, - { - "pname": "xunit.abstractions", - "version": "2.0.2", - "hash": "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E=" - }, - { - "pname": "xunit.analyzers", - "version": "0.10.0", - "hash": "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY=" - }, - { - "pname": "xunit.assert", - "version": "2.4.0", - "hash": "sha256-WqB8mVJUAsvLdZTOoSLmNhk0DKM2DSZqHFDDzwD9Jt0=" - }, - { - "pname": "xunit.core", - "version": "2.4.0", - "hash": "sha256-dt59aoFjpqlbcPFGwPrzOSEBSPIn33tLcLraK8xEntE=" - }, - { - "pname": "xunit.extensibility.core", - "version": "2.2.0", - "hash": "sha256-et3Se7paKJlg8Ha4Xr9+He40M6vblxyOwS2BQxOgLlE=" - }, - { - "pname": "xunit.extensibility.core", - "version": "2.4.0", - "hash": "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE=" - }, - { - "pname": "xunit.extensibility.execution", - "version": "2.2.0", - "hash": "sha256-BCt7rslK7jGH6xFSVTDrE3R3qyHgumC65hpilDwqKpI=" - }, - { - "pname": "xunit.extensibility.execution", - "version": "2.4.0", - "hash": "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4=" - }, - { - "pname": "xunit.runner.visualstudio", - "version": "2.4.0", - "hash": "sha256-qjRuSbBkV1qMOM7n8eNDhoP7gdt4zuKyuiyUxldG8uE=" - }, - { - "pname": "Xunit.SkippableFact", - "version": "1.3.6", - "hash": "sha256-GKcQkNM2bUEO0fWB8wciipNjBQ5AukUub5SkstvnlLw=" - }, { "pname": "YamlDotNet", "version": "6.0.0", diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix index fad1ce9d4e26..c053b385b704 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/package.nix +++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix @@ -30,7 +30,16 @@ buildDotnetModule { executables = [ "func" ]; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0 // { + inherit + (dotnetCorePackages.combinePackages [ + dotnetCorePackages.sdk_9_0 + dotnetCorePackages.sdk_8_0 + ]) + packages + targetPackages + ; + }; nativeBuildInputs = [ go ]; linkNuGetPackagesAndSources = true; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index d39098774fb0..cd0e5ccdf6c0 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.36.1"; + version = "1.37.1"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-15Z1lHNeXTToDpdVc/YB5ojhoiB5qdgWs47O1aKoyFM="; + hash = "sha256-6w7Ig6wJKmWxkS730CZKFkEqefIQDJI+OJHPPJ3aPEk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY="; + hash = "sha256-mNexPIDeUwJYKsM8Hzeh5opfLk9Wf4bHRlwUZLnLAKo="; }; postPatch = '' diff --git a/pkgs/by-name/bg/bgpq4/package.nix b/pkgs/by-name/bg/bgpq4/package.nix index 276b95752c10..e420026ddb73 100644 --- a/pkgs/by-name/bg/bgpq4/package.nix +++ b/pkgs/by-name/bg/bgpq4/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bgpq4"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "bgp"; repo = "bgpq4"; tag = finalAttrs.version; - sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY="; + sha256 = "sha256-6pUwfySR7EWr53V0kj+cHXNFYoUZphhnbTs9TVrZzVk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix index c3c76b1def2f..24fc2ab9ca05 100644 --- a/pkgs/by-name/bu/buildkite-cli/package.nix +++ b/pkgs/by-name/bu/buildkite-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "buildkite-cli"; - version = "3.32.0"; + version = "3.32.2"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-ug7hgHQe+opQwQl3cdyqJR/JVq+pnw2cVe766Fwgqxk="; + hash = "sha256-7jBYi9KGkeB6Pu4VDR8QSTG3U4QFFVih3MUp2Sldpqo="; }; - vendorHash = "sha256-pYdo9jAJldAwGmWup27BDZ9Wd9BpK6ILTXioAGWOERo="; + vendorHash = "sha256-yi77gGlBIGEQQbYVVsQP74IVFuZo5GAPOdgYmaDnBAs="; ldflags = [ "-s" diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index b516143dd652..ac34f9190626 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; - version = "10.4.1"; + version = "11.0.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "bumpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-cYtk7gE2TYgrFUoa2HV56/qTSX/Dojlo+eDwWRGQr1c="; + hash = "sha256-opZYlEQSZo6V+McFy6gFMfchLYuu5oEP4XuqEkd18F0="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-/Yz5Gas3OsqdLAiuZRwGTTcIS/UR1WWms01vU1WxlCo="; + hash = "sha256-rI0DhnncVWd4Wp5pvTnL8IerXbFDwJzkhC4uIe6WJto="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buteo-syncfw/package.nix b/pkgs/by-name/bu/buteo-syncfw/package.nix index 995c1c2ab369..fcfce62754b1 100644 --- a/pkgs/by-name/bu/buteo-syncfw/package.nix +++ b/pkgs/by-name/bu/buteo-syncfw/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "buteo-syncfw"; - version = "0.11.10"; + version = "0.11.11"; outputs = [ "out" @@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "sailfishos"; repo = "buteo-syncfw"; tag = finalAttrs.version; - hash = "sha256-WZ70dFrQeHO0c9MM3wS8aWMd0DDhTW9Ks4hhw7pPmu8="; + hash = "sha256-t69jUOTCyVWlbEinCesm8YVnYuT+SQ10z+2GXAtAPTA="; }; postPatch = '' # Wildcard breaks file installation (tries to run ~ "install source/* target/*") - substituteInPlace doc/doc.pri \ + substituteInPlace doc/doc.pro \ --replace-fail 'htmldocs.files = $${PWD}/html/*' 'htmldocs.files = $${PWD}/html' \ --replace-fail '/usr/share/doc' "$doc/share/doc" diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index e75cf0a1873e..5af87ab879ad 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.623" + "codebuff": "^1.0.630" } }, "node_modules/@isaacs/fs-minipass": { @@ -30,9 +30,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.623", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.623.tgz", - "integrity": "sha512-2X9DAYduW0uWmEgXFPnq1fS+/aqsFiW38eHSDy2b0Zs18qx623VBx/Stu39sSWrwj20nH0Gzua1YYXXzxoen9A==", + "version": "1.0.630", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.630.tgz", + "integrity": "sha512-KzPlptopDjOKgsFyii+amJR9iLbbhi4DVDZ++aFyMMz9piEqmnXh4oT6/PlOeWdHqFfMNZ1NURzxPa1QCcDv9A==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 63f85d46c0ba..6c24a6f56685 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.623"; + version = "1.0.630"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-UWYEgtxBIau8a0VN24J+ms4czUj0Dt0PVVq5v5RLfFc="; + hash = "sha256-4MXdEd1/wff6tpBg3ZWvDgK5l4ru4NBW3/Lnsl8a+MU="; }; - npmDepsHash = "sha256-kcbYnpyXHLAaVZkay1254SghxdFy/cuUpyt8hLDSISI="; + npmDepsHash = "sha256-s7+koNYCKeQ8dGEihm/3We8ZD0nhBXyrQ9oEzhohpL4="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/codespell/package.nix b/pkgs/by-name/co/codespell/package.nix index 99f0d1300498..d033c7beb9f7 100644 --- a/pkgs/by-name/co/codespell/package.nix +++ b/pkgs/by-name/co/codespell/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "codespell"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-9hr/QZcBESLukujzNKNjWGG3nXx+wkvQvoUYmYgtXv0="; + sha256 = "sha256-OMnkTXt6ok3ll9ocZMY4jdpYl3PlI2ZZtLuiMYrCRNI="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 604195389af5..6ee21ab29367 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.448.0"; + version = "1.453.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-0baWiU6fwJFprJG05YpsXFWXj17ff920sL7hCGV83GI="; + hash = "sha256-TOzJhXCogARHgljy6DDG0AbsboAAwwReWEVVlAXzMss="; stripRoot = false; }; diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 3978fb8333c9..775871d8567b 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.1"; + version = "10.4.2"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-BUwb/M4+iXffZt2285fjw2UYBeqA5QVqUgQPy74EOtg="; + hash = "sha256-JZV02QZAS4OhnFdEB/EKm2FL0o4VmNSJIWNBdmIIdrE="; }; vendorHash = "sha256-/qPBHpCdEu1uBFFwE7uzmCcm4EL8TxUWdjiaFlUSxIU="; diff --git a/pkgs/by-name/cr/cropgui/package.nix b/pkgs/by-name/cr/cropgui/package.nix new file mode 100644 index 000000000000..faf9579e5749 --- /dev/null +++ b/pkgs/by-name/cr/cropgui/package.nix @@ -0,0 +1,63 @@ +{ + lib, + python3Packages, + fetchFromGitea, + makeWrapper, + libjpeg, + exiftool, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "cropgui"; + version = "0.9"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "jepler"; + repo = "cropgui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pmo36mWTwDzqE5osXUsM3YzOAPXewLjfrDHIg6hCYjY="; + }; + + pyproject = false; + + nativeBuildInputs = [ + makeWrapper + ]; + + dependencies = with python3Packages; [ + pillow + tkinter + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python3Packages.python.sitePackages} + cp *.py $out/${python3Packages.python.sitePackages} + + install -Dm755 cropgui.desktop $out/share/applications/cropgui.desktop + install -Dm644 cropgui.png $out/share/icons/hicolor/48x48/apps/cropgui.png + + mkdir -p $out/bin + makeWrapper $out/${python3Packages.python.sitePackages}/cropgui.py $out/bin/cropgui \ + --prefix PATH : ${ + lib.makeBinPath [ + libjpeg + exiftool + ] + } \ + --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH" + + runHook postInstall + ''; + + meta = { + description = "Gtk frontend for lossless cropping of jpeg images"; + homepage = "https://codeberg.org/jepler/cropgui"; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.dwoffinden ]; + mainProgram = "cropgui"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index e6c802714072..7012377ac761 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.14.0"; + version = "4.14.1"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-rNtCCnssMQgiTU4BrH8uUHjOuTyvrHqlKKFclhRrnZE="; + hash = "sha256-zlouZc7DtMYTHiDOLSCtawEKTMOKgqJe01gieRxeiFI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 1ffea7aff27f..0f6156f36741 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGo126Module (finalAttrs: { pname = "crush"; - version = "0.47.2"; + version = "0.49.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lmp2DYrlzxVnll9x1jcnw/QgYjhA9RHpciQZ7mAUK5Y="; + hash = "sha256-/1Z5S28yJCxjpQwM5hLTmgKU7OxAcxjmBROktQSstTE="; }; - vendorHash = "sha256-pBZdmQRnPfvhz66+DGQx/ZMMiYeKBfWThybw4RXsjno="; + vendorHash = "sha256-xakV5Alm3EwDk5VkSINxJM1C3uF492QzA+BQkqZ6qB4="; ldflags = [ "-s" diff --git a/pkgs/by-name/da/dasel/package.nix b/pkgs/by-name/da/dasel/package.nix index ee0843778331..cd05842b4fd2 100644 --- a/pkgs/by-name/da/dasel/package.nix +++ b/pkgs/by-name/da/dasel/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "dasel"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${finalAttrs.version}"; - hash = "sha256-3gLOAca5C4HfLqmF+1c1fDytA58JNml+18FYsWUhIQ0="; + hash = "sha256-h6AIu1Yavqezpl6yeMwdZ168SV7Rz19Mr7GtNeyDzpk="; }; vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE="; diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix index 726770fe7844..3f1ead4a195c 100644 --- a/pkgs/by-name/dc/dcp/package.nix +++ b/pkgs/by-name/dc/dcp/package.nix @@ -15,13 +15,13 @@ buildGoModule (finalAttrs: { pname = "dcp"; - version = "0.22.8"; + version = "0.22.9"; src = fetchFromGitHub { owner = "microsoft"; repo = "dcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-fhRTJYtkvPaPw73VZYvm8/GMhUqvnlBoazQziWXrH2U="; + hash = "sha256-DCrGMWoHmjV774dBAaqDR/B1SDZ8LVMm1GkZOOyWtP0="; }; vendorHash = "sha256-MRsd0+ySmZ8FlX6RBfW1LSYc1RcTMYu0Ji+0uFEWH3M="; diff --git a/pkgs/by-name/dd/ddev/cli-system-plugin-dir-from-env.patch b/pkgs/by-name/dd/ddev/cli-system-plugin-dir-from-env.patch new file mode 100644 index 000000000000..4e0705df3b2d --- /dev/null +++ b/pkgs/by-name/dd/ddev/cli-system-plugin-dir-from-env.patch @@ -0,0 +1,31 @@ +diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go +index f546dc3849..5e3ae08dbc 100644 +--- a/cli-plugins/manager/manager_unix.go ++++ b/cli-plugins/manager/manager_unix.go +@@ -2,6 +2,11 @@ + + package manager + ++import ( ++ "os" ++ "path/filepath" ++) ++ + // defaultSystemPluginDirs are the platform-specific locations to search + // for plugins in order of preference. + // +@@ -12,9 +17,8 @@ + // 3. Platform-specific defaultSystemPluginDirs (as defined below). + // + // [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs +-var defaultSystemPluginDirs = []string{ +- "/usr/local/lib/docker/cli-plugins", +- "/usr/local/libexec/docker/cli-plugins", +- "/usr/lib/docker/cli-plugins", +- "/usr/libexec/docker/cli-plugins", ++var defaultSystemPluginDirs []string ++ ++func init() { ++ defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS")) + } + diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index f08789fabcb6..4fa3e20b55da 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -2,12 +2,22 @@ lib, stdenv, buildGoModule, + docker-buildx, fetchFromGitHub, installShellFiles, + makeBinaryWrapper, versionCheckHook, writableTmpDirAsHomeHook, }: +let + dockerCliPlugins = [ + docker-buildx + ]; + dockerCliPluginsDirs = lib.strings.concatStringsSep ":" ( + map (p: "${p}/libexec/docker/cli-plugins") dockerCliPlugins + ); +in buildGoModule (finalAttrs: { pname = "ddev"; version = "1.25.1"; @@ -19,7 +29,12 @@ buildGoModule (finalAttrs: { hash = "sha256-kHGGUFX/xlmQsYxKPxSuRJHk2na9gU1Kd2jhNclAp5s="; }; + postPatch = '' + (cd vendor/github.com/docker/cli && patch ${./cli-system-plugin-dir-from-env.patch}) + ''; + nativeBuildInputs = [ + makeBinaryWrapper installShellFiles ]; @@ -34,7 +49,13 @@ buildGoModule (finalAttrs: { # Tests need docker. doCheck = false; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + postInstall = '' + # make buildx available, it is a docker plugin which docker-compose uses and thus DDEV requires + # https://github.com/NixOS/nixpkgs/blob/43fc054052db6ca5df042dcbe823740aa6c9a7c2/pkgs/applications/virtualization/docker/default.nix#L339 + wrapProgram $out/bin/ddev \ + --prefix DOCKER_CLI_PLUGIN_DIRS : "${dockerCliPluginsDirs}" + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary # directory. export HOME=$(mktemp -d) diff --git a/pkgs/by-name/dd/ddhx/dub-lock.json b/pkgs/by-name/dd/ddhx/dub-lock.json new file mode 100644 index 000000000000..18a1e415e562 --- /dev/null +++ b/pkgs/by-name/dd/ddhx/dub-lock.json @@ -0,0 +1,3 @@ +{ + "dependencies": {} +} diff --git a/pkgs/by-name/dd/ddhx/package.nix b/pkgs/by-name/dd/ddhx/package.nix new file mode 100644 index 000000000000..fbc156530902 --- /dev/null +++ b/pkgs/by-name/dd/ddhx/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildDubPackage, + fetchFromGitHub, +}: +buildDubPackage (finalAttrs: { + pname = "ddhx"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "dd86k"; + repo = "ddhx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AFhxrYncqVnHfro4sUgCT1ZBeL3CUwcwhnGXVuFQ9ak="; + }; + + dubLock = ./dub-lock.json; + + installPhase = '' + runHook preInstall + install -Dm755 ddhx -t $out/bin + runHook postInstall + ''; + + doCheck = true; + + meta = { + description = "Console text-mode hex editor, inspired by GNU nano and vim"; + homepage = "https://github.com/dd86k/ddhx"; + changelog = "https://github.com/dd86k/ddhx/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ryand56 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index c2a8ea156e3c..70e99e738bd6 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.3.6"; + version = "2.3.7"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-CNcZd/wIUg4fKnCeT0O7k6Svldg+1RY0xGmp+Y+UFA8="; + hash = "sha256-E/g2xOB8rdu1Wa8bEI2dzAgHmS+36Q0oVm3v25tTzYE="; }; - cargoHash = "sha256-Yrf9vAVMLoWJpnKaM87gvQUPX2nw3USnU9/l1kYJpaY="; + cargoHash = "sha256-ndQpILbt4f4YFEV+KfwQ5Pr2QM+7RkmwzKYPLR4fQfo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 8b52081296b5..a6f69e4f19c1 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-nQbW2UUzd/Nz9NNjwQfbmbE/ywHSmadUmGJ/BDy/IuY="; + hash = "sha256-fp+BXT/HpoceFogn8oeRVEKGCqOVLTc8lca2epn3D78="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 0579c318570d..bb6009c46336 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.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-/R13Fwn3019uy+UUtih/CLiXHpFBSKKKKVYdOp29eXs="; + hash = "sha256-tnPNq6Ms5hzu5FLVg7QCzSMfRbfZ/HRPfitJI6zP8+8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index b3f6354772d1..e6aecac386cd 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dpkg"; - version = "1.23.5"; + version = "1.23.7"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf .git popd ''; - hash = "sha256-Ug82hdskTvWSzMZ8l+EdWhWAmt9OhS2pUpwOYa/9FLw="; + hash = "sha256-8Joo/pcizlbtuuiUL8ev6/00ru+lh8/hzEPsO7fm2R0="; }; configureFlags = [ diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index adc406274a78..639c2f854596 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; - version = "0.52.0"; + version = "0.52.1"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dprint"; repo = "dprint"; tag = finalAttrs.version; - hash = "sha256-IVqHaqpoMXM1xHFCyh1lbRjKQbt7ZuX4u9Q9AoWOyWU="; + hash = "sha256-CV0txMWYL9s11pA59D/RCt/s8GZ9LpUqOpEhK0yOhfA="; }; - cargoHash = "sha256-eLIkzAWt/7G73Fr2EXdVTYFd2QXqaYJvMM8SrKowbmU="; + cargoHash = "sha256-ca5e5wWRfMz+qCMbAUlMls8u+txcHgZ0R9dzN+dm1L4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/du/duckstation/cubeb-remove-vendor.patch b/pkgs/by-name/du/duckstation/cubeb-remove-vendor.patch deleted file mode 100644 index 7199e4be85b4..000000000000 --- a/pkgs/by-name/du/duckstation/cubeb-remove-vendor.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt -index 633267c66..b5ab0904c 100644 ---- a/dep/CMakeLists.txt -+++ b/dep/CMakeLists.txt -@@ -25,9 +25,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(rcheevos) - add_subdirectory(rapidyaml EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(rapidyaml) --add_subdirectory(cubeb EXCLUDE_FROM_ALL) --disable_compiler_warnings_for_target(cubeb) --disable_compiler_warnings_for_target(speex) -+find_package(cubeb REQUIRED GLOBAL) -+add_library(cubeb ALIAS cubeb::cubeb) - - if(ENABLE_OPENGL) - add_subdirectory(glad EXCLUDE_FROM_ALL) -diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp -index 52c7299c9..e20b52426 100644 ---- a/src/util/cubeb_audio_stream.cpp -+++ b/src/util/cubeb_audio_stream.cpp -@@ -262,9 +262,9 @@ std::vector> AudioStream::GetCubebDriverName - std::vector> names; - names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); - -- const char** cubeb_names = cubeb_get_backend_names(); -- for (u32 i = 0; cubeb_names[i] != nullptr; i++) -- names.emplace_back(cubeb_names[i], cubeb_names[i]); -+ cubeb_backend_names backends = cubeb_get_backend_names(); -+ for (u32 i = 0; i < backends.count; i++) -+ names.emplace_back(backends.names[i], backends.names[i]); - return names; - } - diff --git a/pkgs/by-name/du/duckstation/git-version-info.patch b/pkgs/by-name/du/duckstation/git-version-info.patch deleted file mode 100644 index 6708d98afcf2..000000000000 --- a/pkgs/by-name/du/duckstation/git-version-info.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh -index 0f8fa4239..2cc91a4a8 100755 ---- a/src/scmversion/gen_scmversion.sh -+++ b/src/scmversion/gen_scmversion.sh -@@ -10,11 +10,11 @@ else - fi - - --HASH=$(git rev-parse HEAD) --BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') --TAG=$(git describe --dirty | tr -d '\r\n') -+HASH="@gitHash@" -+BRANCH="@gitBranch@" -+TAG="@gitTag@" - VERSION=$(echo "${TAG}" | sed -E 's/-g[0-9a-f]+//') --DATE=$(git log -1 --date=iso8601-strict --format=%cd) -+DATE="@gitDate@" - - cd $CURDIR - diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix deleted file mode 100644 index c6c7bef1f66d..000000000000 --- a/pkgs/by-name/du/duckstation/package.nix +++ /dev/null @@ -1,340 +0,0 @@ -{ - lib, - llvmPackages, - stdenvNoCC, - fetchFromGitHub, - cmake, - pkg-config, - ninja, - extra-cmake-modules, - wayland-scanner, - qt6, - sdl3, - zstd, - libwebp, - zlib, - libpng, - libjpeg, - freetype, - plutosvg, - cpuinfo, - soundtouch, - rapidjson, - libzip, - curl, - libx11, - wayland, - shaderc, - spirv-cross, - udev, - libbacktrace, - ffmpeg-headless, - cubeb, - fetchurl, - zip, - unzip, -}: - -let - passthru = { - updateScript = ./update.sh; - }; - - meta = { - description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64/RV64"; - longDescription = '' - DISCLAIMER: This is an **unofficial** package, do not report any - issues to duckstation developers. Instead, please report them to - or use the officially - supported platform build at or other - upstream-approved distribution mechanism not listed here. - ''; - homepage = "https://duckstation.org"; - license = lib.licenses.cc-by-nc-nd-40; - maintainers = [ ]; - }; - - pkgSources = lib.importJSON ./sources.json; - - linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: { - pname = "duckstation"; - version = "0.1-10413"; - - src = fetchFromGitHub { - owner = "stenzek"; - repo = "duckstation"; - tag = "v${finalAttrs.version}"; - deepClone = true; - hash = "sha256-ytJ0vaXXbbgSmZ42gQPlQY7p30hz7hx/+09TSvCKyEg="; - - postFetch = '' - cd $out - mkdir -p .nixpkgs-auxfiles/ - git rev-parse HEAD > .nixpkgs-auxfiles/git_hash - git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch - git describe | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag - git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date - rm -rf .git - ''; - }; - - patches = [ - ./cubeb-remove-vendor.patch - ./git-version-info.patch - ]; - - postPatch = - # Fixes compilation error with nixpkgs libapng - '' - substituteInPlace src/util/animated_image.cpp \ - --replace-fail "png_write_frame_head(png_ptr, info_ptr," \ - "png_write_frame_head(png_ptr, info_ptr, 0," - '' - # Fills in git-info obtained in the `postFetch` step for version - # information in the UI - + '' - gitHash=$(cat .nixpkgs-auxfiles/git_hash) \ - gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \ - gitTag=$(cat .nixpkgs-auxfiles/git_tag) \ - gitDate=$(cat .nixpkgs-auxfiles/git_date) \ - substituteAllInPlace src/scmversion/gen_scmversion.sh - ''; - - vendorDiscordRPC = llvmPackages.stdenv.mkDerivation { - pname = "discord-rpc-duckstation"; - inherit (finalAttrs) version; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "discord-rpc"; - inherit (pkgSources.discord_rpc) rev hash; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ rapidjson ]; - meta = { - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; - }; - - vendorShaderc = shaderc.overrideAttrs (oldAttrs: { - pname = "shaderc-duckstation"; - inherit (finalAttrs) version; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "shaderc"; - inherit (pkgSources.shaderc) rev hash; - }; - - patches = (oldAttrs.patches or [ ]); - cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ - (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true) - (lib.cmakeBool "SHADERC_SKIP_TESTS" true) - ]; - outputs = [ - "out" - "lib" - "dev" - ]; - postFixup = null; - }); - - soundtouch = llvmPackages.stdenv.mkDerivation { - inherit (soundtouch) - pname - version - src - meta - ; - nativeBuildInputs = [ cmake ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "\''${prefix}/''${CMAKE_INSTALL_LIBDIR}" \ - "''${CMAKE_INSTALL_FULL_LIBDIR}" - ''; - - cmakeFlags = [ - (lib.cmakeBool "SOUNDTOUCH_DLL" true) - ]; - }; - - chtdb = stdenvNoCC.mkDerivation { - pname = "chtdb-duckstation"; - version = "0-unstable-${pkgSources.chtdb.date}"; - - src = fetchFromGitHub { - owner = "duckstation"; - repo = "chtdb"; - inherit (pkgSources.chtdb) rev hash; - }; - - nativeBuildInputs = [ - zip - ]; - - buildPhase = '' - runHook preBuild - - pushd cheats - zip -r cheats.zip *.cht - popd - pushd patches - zip -r patches.zip *.cht - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 cheats/cheats.zip -t $out/lib/duckstation - install -Dm644 patches/patches.zip -t $out/lib/duckstation - - install -Dm644 LICENSE -t $out/share/doc/duckstation - install -Dm644 README.md -t $out/share/doc/duckstation - - runHook postInstall - ''; - - meta = { - description = "Collection of cheats and patches for PSX games"; - longDescription = '' - Collection of cheats and patches for PSX games, primarily intended for - use with the DuckStation emulator, but can also be used by other - emulators that support GameShark codes. - - Patches show in the UI in a separate section to cheats, and are - intended for modifications to the game that do not provide any - "advantage" to the player, including: - - - Improving performance. - - Fixing game-breaking bugs. - - Unlocking the frame rate (e.g. "60 FPS patches"). - - Widescreen rendering where the built-in widescreen - rendering rendering is insufficient. - ''; - license = lib.licenses.mit; - inherit (meta) maintainers; - platforms = lib.platforms.all; - }; - }; - - preConfigure = '' - cp ${finalAttrs.chtdb}/lib/duckstation/cheats.zip data/resources - cp ${finalAttrs.chtdb}/lib/duckstation/patches.zip data/resources - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ninja - extra-cmake-modules - wayland-scanner - qt6.wrapQtAppsHook - qt6.qttools - ]; - - buildInputs = [ - sdl3 - zstd - libwebp - zlib - libpng - libjpeg - freetype - plutosvg - cpuinfo - libzip - curl - libx11 - wayland - spirv-cross - qt6.qtbase - udev - libbacktrace - ffmpeg-headless - cubeb - ] - ++ [ - finalAttrs.vendorDiscordRPC - finalAttrs.vendorShaderc - finalAttrs.soundtouch - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{lib,bin,share/{applications,icons/hicolor/512x512/apps}} - cp -r bin $out/lib/duckstation - ln -s $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt - - pushd .. - install -Dm644 scripts/packaging/org.duckstation.DuckStation.desktop \ - -t $out/share/applications - install -Dm644 scripts/packaging/org.duckstation.DuckStation.png \ - -t $out/share/icons/hicolor/512x512/apps - install -Dm644 LICENSE -t $out/share/doc/duckstation - install -Dm644 README.* -t $out/share/doc/duckstation - install -Dm644 CONTRIBUTORS.md -t $out/share/doc/duckstation - popd - - runHook postInstall - ''; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - (lib.makeLibraryPath [ - ffmpeg-headless - finalAttrs.vendorShaderc - ]) - }" - ]; - - inherit passthru; - - meta = meta // { - mainProgram = "duckstation-qt"; - platforms = lib.platforms.linux; - }; - }); - - darwinDrv = stdenvNoCC.mkDerivation (finalAttrs: { - pname = "duckstation"; - version = pkgSources.duckstation.version; - - src = fetchurl { - url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip"; - hash = pkgSources.duckstation.hash_darwin; - }; - - nativeBuildInputs = [ unzip ]; - - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r DuckStation.app $out/Applications/DuckStation.app - - runHook postInstall - ''; - - inherit passthru; - - meta = meta // { - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = lib.platforms.darwin; - }; - }); -in -if stdenvNoCC.hostPlatform.isLinux then - linuxDrv -else if stdenvNoCC.hostPlatform.isDarwin then - darwinDrv -else - throw "duckstation is not supported on ${stdenvNoCC.hostPlatform.system}." diff --git a/pkgs/by-name/du/duckstation/sources.json b/pkgs/by-name/du/duckstation/sources.json deleted file mode 100644 index ced0c94438c6..000000000000 --- a/pkgs/by-name/du/duckstation/sources.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "duckstation": { - "version": "0.1-10413", - "hash_darwin": "sha256-TGXLpbTFkrFQ42LpRx0TKBsbdIRuYtseR+v3W/t9M10=" - }, - "discord_rpc": { - "rev": "cc59d26d1d628fbd6527aac0ac1d6301f4978b92", - "hash": "sha256-8xXcx5w36eiJqtWm6qQfhEHgchVJbhP/jR94eMNNjHU=" - }, - "shaderc": { - "rev": "85cd26cc38e3e8b5e3c649f4551900ee330d6552", - "hash": "sha256-7PVrpS69pI5mi4aM1eNTAzZCMq6vuVl3mhTrc4U942w=" - }, - "chtdb": { - "date": "2025-12-31", - "rev": "696e985e027d8d43a84c65bd349802dfe0944674", - "hash": "sha256-4t0x0YYp7rURBqVWyMZpnOATpIYoILQagyMASaSWKWM=" - } -} diff --git a/pkgs/by-name/du/duckstation/update.sh b/pkgs/by-name/du/duckstation/update.sh deleted file mode 100755 index 770a3d7f697d..000000000000 --- a/pkgs/by-name/du/duckstation/update.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils nix nix-update curl jq -# shellcheck shell=bash - -set -euo pipefail -location="$(dirname "${BASH_SOURCE[0]}")" - -echo "checking for new tagged release (github:stenzek/duckstation)..." -old_version=$(nix --extra-experimental-features nix-command eval --raw -f . duckstation.src.tag) -new_version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/stenzek/duckstation/tags?per_page=1" | jq -r '.[0].name') - -if [[ $old_version == "$new_version" ]]; then - echo "'duckstation' is up-to-date ($old_version == $new_version)" - exit 0 -fi - -echo "Updating duckstation from $old_version -> $new_version" -nix-update --src-only --version "$new_version" duckstation -duckstation_darwin_hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/${new_version}/duckstation-mac-release.zip")") - -echo "Vendor library update..." -duckstation_storepath=$(nix --extra-experimental-features "nix-command flakes" flake prefetch github:stenzek/duckstation/"$new_version" --json | jq -r '.storePath') -pinned_versions=$duckstation_storepath/scripts/deps/versions - -echo "Using pinned discord_rpc..." -discord_rpc_rev=$(grep "DISCORD_RPC_COMMIT=" "$pinned_versions" | sed 's|.*=||g') -discord_rpc_hash=$(nix --extra-experimental-features "nix-command flakes" \ - flake prefetch github:stenzek/discord-rpc/"$discord_rpc_rev" --json | - jq -r '.hash') - -echo "Using pinned shaderc..." -shaderc_rev=$(grep "SHADERC_COMMIT=" "$pinned_versions" | sed 's|.*=||g') -shaderc_hash=$(nix --extra-experimental-features "nix-command flakes" flake prefetch github:stenzek/shaderc/"$shaderc_rev" --json | jq -r '.hash') - -echo "Fetching latest chtdb commit..." -chtdb_json=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/duckstation/chtdb/commits?per_page=1") -chtdb_rev=$(echo "$chtdb_json" | jq -r '.[0].sha') -chtdb_date=$(echo "$chtdb_json" | jq -r '.[0].commit.author.date') -chtdb_hash=$(nix --extra-experimental-features "nix-command flakes" \ - flake prefetch github:duckstation/chtdb/"$chtdb_rev" --json | - jq -r '.hash') - -echo "Regenerating '""$location""/sources.json'" -JSON=$( - jq --null-input \ - --arg new_version "${new_version:1}" \ - --arg duckstation_darwin_hash "$duckstation_darwin_hash" \ - --arg discord_rpc_rev "$discord_rpc_rev" \ - --arg discord_rpc_hash "$discord_rpc_hash" \ - --arg shaderc_rev "$shaderc_rev" \ - --arg shaderc_hash "$shaderc_hash" \ - --arg chtdb_rev "$chtdb_rev" \ - --arg chtdb_date "${chtdb_date::10}" \ - --arg chtdb_hash "$chtdb_hash" \ - '{ "duckstation": { - "version": $new_version, - "hash_darwin": $duckstation_darwin_hash - }, - "discord_rpc": { - "rev": $discord_rpc_rev, - "hash": $discord_rpc_hash - }, - "shaderc": { - "rev": $shaderc_rev, - "hash": $shaderc_hash - }, - "chtdb": { - "date": $chtdb_date, - "rev": $chtdb_rev, - "hash": $chtdb_hash - } - }' -) - -echo "$JSON" | jq >"$location"/sources.json diff --git a/pkgs/by-name/ea/easyaudiosync/0005-fix-ffmpeg-dep-functions.patch b/pkgs/by-name/ea/easyaudiosync/0005-fix-ffmpeg-dep-functions.patch new file mode 100644 index 000000000000..b7d1a1527ebf --- /dev/null +++ b/pkgs/by-name/ea/easyaudiosync/0005-fix-ffmpeg-dep-functions.patch @@ -0,0 +1,70 @@ +commit 5bf22927f9e83dc3043e09370bb54815085a00ba +Author: complexlogic +Date: Tue Aug 12 07:19:29 2025 -0700 + + Replace deprecated FFmpeg functions + +diff --git a/src/config.hpp b/src/config.hpp +index ea9723c..1f6cc30 100644 +--- a/src/config.hpp ++++ b/src/config.hpp +@@ -133,7 +133,11 @@ struct Config { + }; + FDK fdk; + LAVC lavc; ++#if LIBAVCODEC_VERSION_MAJOR >= 62 ++ int profile = AV_PROFILE_AAC_LOW; ++#else + int profile = FF_PROFILE_AAC_LOW; ++#endif + }; + struct OGG { + int quality = VORBIS_DEFAULT_QUALITY; +diff --git a/src/transcode.cpp b/src/transcode.cpp +index 1ea286c..a0d6292 100644 +--- a/src/transcode.cpp ++++ b/src/transcode.cpp +@@ -171,7 +171,16 @@ bool Transcoder::OutputFile::open(Codec out_codec, const InputFile &in_file, con + const auto &preset = config.opus.get_preset(); + codec_ctx->bit_rate = determine_bitrate(preset.bit_rate, codec_ctx->ch_layout.nb_channels); + } ++#if LIBAVCODEC_VERSION_MAJOR >= 62 ++ AVSampleFormat *fmts = nullptr; ++ if ((avcodec_get_supported_config(codec_ctx, codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, const_cast(reinterpret_cast(&fmts)), nullptr) < 0) || !fmts) { ++ transcoder->logger.error("Could not find a valid sample format for the encoder"); ++ return false; ++ } ++ codec_ctx->sample_fmt = fmts[0]; ++#else + codec_ctx->sample_fmt = codec->sample_fmts[0]; ++#endif + stream->time_base.den = codec_ctx->sample_rate; + stream->time_base.num = 1; + +diff --git a/src/util.cpp b/src/util.cpp +index 6a52903..fa69d3a 100644 +--- a/src/util.cpp ++++ b/src/util.cpp +@@ -158,13 +158,19 @@ int determine_sample_rate(Codec codec, const AVCodec *avcodec, int in_rate) + { + if (codec == Codec::MP3) + return std::min(48000, in_rate); +- if (!avcodec->supported_samplerates) ++ int *supported_samplerates = nullptr; ++#if LIBAVCODEC_VERSION_MAJOR >= 62 ++ if ((avcodec_get_supported_config(nullptr, avcodec, AV_CODEC_CONFIG_SAMPLE_RATE, 0, const_cast(reinterpret_cast(&supported_samplerates)), nullptr) < 0) || !supported_samplerates) ++#else ++ supported_samplerates = avcodec->supported_samplerates; ++ if (!supported_samplerates) ++#endif + return in_rate; + +- const int *rate = avcodec->supported_samplerates; ++ const int *rate = supported_samplerates; + while (*(rate + 1)) + rate++; +- while (rate > avcodec->supported_samplerates && (*rate - in_rate < 0)) ++ while (rate > supported_samplerates && (*rate - in_rate < 0)) + rate--; + return *rate; + } diff --git a/pkgs/by-name/ea/easyaudiosync/package.nix b/pkgs/by-name/ea/easyaudiosync/package.nix index d57c432005e4..27eccb8f6ae9 100644 --- a/pkgs/by-name/ea/easyaudiosync/package.nix +++ b/pkgs/by-name/ea/easyaudiosync/package.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: { ./0001-fix-project-name.patch ./0003-fix-darwin-app.patch ./0004-force-qt6.patch + # This has been committed upstream, but hasn't been released + # https://github.com/complexlogic/EasyAudioSync/commit/5bf22927f9e83dc3043e09370bb54815085a00ba + ./0005-fix-ffmpeg-dep-functions.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/easyjson/package.nix b/pkgs/by-name/ea/easyjson/package.nix index 34017effea48..9e833efe4657 100644 --- a/pkgs/by-name/ea/easyjson/package.nix +++ b/pkgs/by-name/ea/easyjson/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "easyjson"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; rev = "v${finalAttrs.version}"; - hash = "sha256-aKufvebodIy0UtecpjZ9+5MOUTWKFIqFI3SYgVPWdhQ="; + hash = "sha256-6QfPxh3Kx9d2a93LsIehgjwkSDMGR8VuSzk58mblvTo="; }; vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE="; diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix index 5ca591caf836..91d458c54ca3 100644 --- a/pkgs/by-name/ea/easyrsa/package.nix +++ b/pkgs/by-name/ea/easyrsa/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "easyrsa"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${finalAttrs.version}"; - hash = "sha256-GD4KL8CqQ8U0ISrLm8zlnfi1AuYK0AZLiLuufEhZ7B0="; + hash = "sha256-xzCaUR97kS5pbUCTyV9i4lF59nudPJqnI7T2VkReJko="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 5613977152eb..c54b852902c4 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.250"; + version = "0.0.251"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-wyvYVI/HmCtBwIb1mIYJ/p2YQTH8fleP3xPUZsMeb1U="; + hash = "sha256-vUpBwl1HxMHVywJeoKp9YAWcNo8GSaq7ZjjcMfq9XNs="; }; postPatch = '' diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index 9f60ccc5e8d3..ed6f8d65485a 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fasmg"; - version = "l2fx"; + version = "l45p"; src = fetchzip { url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip"; - sha256 = "sha256-np7HhVp1SaII25nPPJGtBB4325K/1S3rKqOudsBNeCk="; + sha256 = "sha256-0/P20DiRZbqZHoxWiBPs6wXqpbvRroisyF0dCdmd+j8="; stripRoot = false; }; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index a4f8452b6ab2..ed391521ac57 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20260209"; + version = "20260315"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-ZpuAcS6KgVRL8ru+U///Zi7jiXLGIbSx6dPF0KWLvwQ="; + hash = "sha256-YnN1ArHyikV0kADquH2kwpk7cpiXKcL6YwUxVJXlQKM="; }; dontUnpack = true; diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index a26a5982c617..f6e064bf4597 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -16,13 +16,13 @@ }: let pname = "feishin"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; tag = "v${version}"; - hash = "sha256-sd6j3gPtNFN1hMiOMIiTICNH8mYJvO9FSXPqUFotis8="; + hash = "sha256-LcSe7aEtTDs4JIk50zI0IFgN4ZCSJ6NClfk02uO2Sg8="; }; electron = electron_39; diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index 0199e9e7dde0..75eaeebe97aa 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ferron"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ferronweb"; repo = "ferron"; tag = finalAttrs.version; - hash = "sha256-ljAt3ntKY0OR56QVWb1UQ/Id1OJaoM7CwkkAdNVs2sI="; + hash = "sha256-pKZ/oWmPzVvnGXTyTQ3VcgISH3hSReR+RdIvD4tzPso="; }; # ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md @@ -25,7 +25,9 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '#![doc = include_str!("../../README.md")]' "" ''; - cargoHash = "sha256-/ffeFawpcHA/wfrKY+Ub0EHeMMJb8+W4lhlVMAgICNQ="; + strictDeps = true; + + cargoHash = "sha256-FimBeq21JhCSSkkSmSO3i7UEqOzJY2r36GXJFcorRT0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fi/finalmouse-udev-rules/package.nix b/pkgs/by-name/fi/finalmouse-udev-rules/package.nix index d21d8e4bfb53..ef6e1ee4b15b 100644 --- a/pkgs/by-name/fi/finalmouse-udev-rules/package.nix +++ b/pkgs/by-name/fi/finalmouse-udev-rules/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "finalmouse-udev-rules"; - version = "0-unstable-2025-08-15"; + version = "0-unstable-2026-01-27"; src = fetchFromGitHub { owner = "teamfinalmouse"; repo = "xpanel-linux-permissions"; - rev = "6b200ec39f1fa31edf6648f5ec3d5738c3770530"; - hash = "sha256-Bo8XBvrUlZe0eVQlNQGb0xuTb+wecipsHwLdZpK0dUQ="; + rev = "49ba1bf19e7d1f05306baaf72e4514c1f12f139a"; + hash = "sha256-+tStBzGrPop0zKNf0qIp2PCrVRy2CcFpIrvgft9YkbE="; }; dontUnpack = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -Dpm644 $src/99-finalmouse.rules $out/lib/udev/rules.d/70-finalmouse.rules + install -Dpm644 $src/70-finalmouse.rules $out/lib/udev/rules.d/70-finalmouse.rules runHook postInstall ''; diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index 21f0eb67e920..cc6adf916652 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -13,14 +13,14 @@ let # These files can be found in Stockfish/src/evaluate.h - nnueBigFile = "nn-7e1657811c6d.nnue"; - nnueBigHash = "sha256-fhZXgRxtckbnYk49wbxfUwnmzqctY+yJM706ewrUv6s="; + nnueBigFile = "nn-9a0cc2a62c52.nnue"; + nnueBigHash = "sha256-mgzCpixSClN6rTrG6QiowJiqkAidyny8h0zCGXYYvyM="; nnueBig = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; hash = nnueBigHash; }; - nnueSmallFile = "nn-37f18f62d772.nnue"; - nnueSmallHash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; + nnueSmallFile = "nn-47fc8b7fff06.nnue"; + nnueSmallHash = "sha256-R/yLf/8GfSQEdJO4TkKrhVwPzrUFjAFsafjuXE7kvWk="; nnueSmall = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}"; hash = nnueSmallHash; @@ -28,13 +28,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "fishnet"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "lichess-org"; repo = "fishnet"; tag = "v${finalAttrs.version}"; - hash = "sha256-59hAohEw6TQU8rKbYx9LdZKWaE5HNOWiYMouTqj4Hjo="; + hash = "sha256-0ArTovfr9znjudo53W5hnnSZlzfEnAd7E+7DXTqtN6w="; fetchSubmodules = true; }; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}' ''; - cargoHash = "sha256-lI+1HVR8xQwAgH3CB1Y9JQmfw0taoLBTEz14zFxeiCg="; + cargoHash = "sha256-mkioBmawYR5GvR0WSlaicGyXV4EVVVQuai5UF5+Thk8="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/fl/fleng/package.nix b/pkgs/by-name/fl/fleng/package.nix index d48866bb6629..f1b14a8807f9 100644 --- a/pkgs/by-name/fl/fleng/package.nix +++ b/pkgs/by-name/fl/fleng/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fleng"; - version = "20"; + version = "23"; src = fetchurl { url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz"; - hash = "sha256-kkouDNbdVGE7vskmu8kISA/RHIGed5vLY/ch4qgew3g="; + hash = "sha256-I8ksy3UAah/LTvtNrzjhw5vNUM55ba80ivo4S/r5yHg="; }; doCheck = true; diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index c3fb383b9465..1a80b2158a99 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "forgejo-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromCodeberg { owner = "forgejo-contrib"; repo = "forgejo-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-EJr/7me2wiOBSFw0VFSxyqnQKy3kpOMGJmxD7wxmWPc="; + hash = "sha256-tWb5h0i3Z8qSHqFL7FofwljMdXgV1Z6x8ojut9pm6Yg="; }; - cargoHash = "sha256-DpQt76o3ZnIJwHR1DQ/mn9f8XiWHKVB4h3NNbvCIMZ8="; + cargoHash = "sha256-7gCzU7U8kIxWnwLksXIUkgfFWWjZ/0QiaHnCD+H8sGQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix index a042203b94db..5dc8cf6dca2d 100644 --- a/pkgs/by-name/fo/foxglove-cli/package.nix +++ b/pkgs/by-name/fo/foxglove-cli/package.nix @@ -11,13 +11,13 @@ }: buildGoModule (finalAttrs: { pname = "foxglove-cli"; - version = "1.0.29"; + version = "1.0.30"; src = fetchFromGitHub { owner = "foxglove"; repo = "foxglove-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-VPL6WdolcdymPWgsyBaISGDT8tkAJa6lH073D5dZI3Y="; + hash = "sha256-1PfCiCayRJYian+KY6A3WB68o+m+QAufPUx9X4uVqvc="; }; vendorHash = "sha256-nRd9d3LJIrWoO+CQdbWLs249rOYmzfIf4u6x5dBDA2Y="; diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index 023ee486b57b..47b40684aaea 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-hTNSpjY0WkyXZpDGEM1eKQLFt/bhB5l/PSGd6bbDPAo="; + hash = "sha256-aB1VO6BCIGd3tWNWBytpvH6yr9+T6tw8I3P+ZYrNDQo="; }; - cargoHash = "sha256-SkZpYFu9yJX2qTeTNoCEFJP1jQNqfK7DQj3JlBCqDmo="; + cargoHash = "sha256-rl0TQERv7ykog8Eu9wj30oLEg9lqtVCVEFSAbeL1Zek="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix index 0f1176e02b27..659e80b0802a 100644 --- a/pkgs/by-name/g3/g3proxy/package.nix +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "g3proxy"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "bytedance"; repo = "g3"; tag = "g3proxy-v${finalAttrs.version}"; - hash = "sha256-zh++wptu1hukQ+Bm5AWhjrLLyLuAb4owfJwDztfKnwY="; + hash = "sha256-oVjHJPLNWV2bSJcm7La1z0M93kooYBZ+lSayYQ4aUxg="; }; - cargoHash = "sha256-JNRH2IFUwzHarZZLxmYgyWr5lO1UX8H38EbmGoXebKo="; + cargoHash = "sha256-zHnvrSI3NLyL7eP5PjB0xvLC7SjG/4UifR3OlqwwVIg="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix index ab447dabb11e..b95111ba1fa9 100644 --- a/pkgs/by-name/ga/galaxy-buds-client/package.nix +++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix @@ -30,7 +30,7 @@ buildDotnetModule rec { projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0_1xx; dotnet-runtime = dotnetCorePackages.runtime_10_0; dotnetFlags = lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ] diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix index f7200f4d12c2..d26a749842c7 100644 --- a/pkgs/by-name/gg/ggml/package.nix +++ b/pkgs/by-name/gg/ggml/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ggml"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "ggml-org"; repo = "ggml"; tag = "v${finalAttrs.version}"; - hash = "sha256-xTNDenY+1Tf7Nqr/EnXtYejpqU/guemySKR2WFvY9d0="; + hash = "sha256-XYBlyIALMNEZ54KiKqxczOCUnUckSqPUJ+xQYCJAMpE="; }; # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix index e6ee6cc036e4..419f9672fbea 100644 --- a/pkgs/by-name/gl/gleam/package.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gleam"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam"; tag = "v${finalAttrs.version}"; - hash = "sha256-KAk5tz7Dlq6cxNv3CTd8lOx7lxuK5do6aSajp0NFBw0="; + hash = "sha256-y4D4e2zpa3WxUcO0XtuiY8KP+Y1LkNHKK675ZqbOHDU="; }; - cargoHash = "sha256-v7+D8mlvJbEjJZinLYHum93PuHOWBVzJKno19qPbZWs="; + cargoHash = "sha256-e0MwqNJHiKoPaWxI38codA3BcYp3j1kcnrvFzPc8roE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index a876d7e362df..2f4277a315cc 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "glrnvim"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "beeender"; repo = "glrnvim"; rev = "v${finalAttrs.version}"; - hash = "sha256-fyJ3k1CBrxL6It8x9jNumzCuhXug6eB/fuvPUQYEc4A="; + hash = "sha256-gfcSii45EH6+3nwoUqZv47EPh3ISQE7SeHJWeTXOQz8="; }; - cargoHash = "sha256-xDa2aMWx09dEbRDops2HwYSl/KMA7CeFqS2bnxX/8w8="; + cargoHash = "sha256-8sKY5uqWap01klJlZ3CnLAqRFeRSbt7K7jRL8XPDBQ4="; postInstall = '' install -Dm644 glrnvim.desktop -t $out/share/applications diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 99ba63a9502c..aee1dd67fe56 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -9,26 +9,26 @@ buildGoModule (finalAttrs: { pname = "gnmic"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "openconfig"; repo = "gnmic"; tag = "v${finalAttrs.version}"; - hash = "sha256-aAVjc5U0/fd9hOKCyVMopInkX4geJvuy48nHecKKzUQ="; + hash = "sha256-O8Vf6aiSqljSGOpWfgXCgeE7j6jDz7wXuPaDD9OliMA="; }; - vendorHash = "sha256-V6tnsCszkruLnAOCCysOYmPioHNQpdsQu0GZUf+36SE="; + vendorHash = "sha256-HU+SvdjVOixsUot2rV8NNQCc+X1o4Moyr7B2BOBStYY="; ldflags = [ "-s" "-w" "-X" - "github.com/openconfig/gnmic/pkg/app.version=${finalAttrs.version}" + "github.com/openconfig/gnmic/pkg/version.Version=${finalAttrs.version}" "-X" - "github.com/openconfig/gnmic/pkg/app.commit=${finalAttrs.src.rev}" + "github.com/openconfig/gnmic/pkg/version.Commit=${finalAttrs.src.rev}" "-X" - "github.com/openconfig/gnmic/pkg/app.date=1970-01-01T00:00:00Z" + "github.com/openconfig/gnmic/pkg/version.Date=1970-01-01T00:00:00Z" ]; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix index ca5b1bec1a2f..d6eec08ba451 100644 --- a/pkgs/by-name/go/go-swagger/package.nix +++ b/pkgs/by-name/go/go-swagger/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-swagger"; - version = "0.33.1"; + version = "0.33.2"; src = fetchFromGitHub { owner = "go-swagger"; repo = "go-swagger"; tag = "v${finalAttrs.version}"; - hash = "sha256-CVfGKkqneNgSJZOptQrywCioSZwJP0XGspVM3S45Q/k="; + hash = "sha256-8BMO7rItteXSc0qdfjrgYN/Zfm2hIzTvI2SHY3nxyX4="; }; - vendorHash = "sha256-x3fTIXmI5NnOKph1D84MHzf1Kod+WLYn1JtnWLr4x+U="; + vendorHash = "sha256-3eebNmeYz207chEej/2jcjgqq/zcckm1KwuWHA8O6cw="; doCheck = false; diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index 3b8a5b19bdeb..32cdce4c077b 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "goeland"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "slurdge"; repo = "goeland"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Yw9FRI4TdfqCLdZCTA+y1y8TaD0flp1sP1aKYvd8PGM="; + sha256 = "sha256-7npQ04o2GvbOJt1zS7W+VFs38OnNG8VS7Qs7jM79yBg="; }; - vendorHash = "sha256-FfdHOYrpVilter80arOtwn+qJV56gIh6Ml64ekPs+DE="; + vendorHash = "sha256-OLgE9PU1/swoHZZG82zAEB1XygZjpK0wrqoGG/4Akvw="; ldflags = [ "-s" diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index aa4972bdb927..b0db33032e12 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - buildGoModule, + buildGo126Module, fetchFromGitHub, autoPatchelfHook, copyDesktopItems, @@ -18,13 +18,13 @@ let pname = "gui-for-singbox"; - version = "1.19.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.SingBox"; tag = "v${version}"; - hash = "sha256-CY5i5+ObqPVCPiqHLttjxhMOi9fiHp5HWX33fq43txw="; + hash = "sha256-IGsH8QHoj2CvrSEc9eIisxySXQkjPSDBXsCPOXqANVM="; }; metaCommon = { @@ -54,7 +54,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-AHGPAYw/6FRKO2FY1J84NrLcp+bZOclOF6UFY61npFI="; + hash = "sha256-dWqwEnXPT+5N+36szm4AF1ChM9M6UJltct+EtQAofGQ="; }; buildPhase = '' @@ -80,7 +80,7 @@ let }); in -buildGoModule { +buildGo126Module { inherit pname version src; patches = [ ./xdg-path-and-restart-patch.patch ]; @@ -91,7 +91,7 @@ buildGoModule { --subst-var out ''; - vendorHash = "sha256-xQ6TeVoBe8906+/5X1q4e5QHVo+KHymB+yoxM+Obk18="; + vendorHash = "sha256-EeIxt0BzSaZh1F38btUXN9kAvj12nlqEerVgWVGkiuk="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch b/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch index 0044effd817a..b5d9ed7175c1 100644 --- a/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch +++ b/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch @@ -1,27 +1,9 @@ --- a/bridge/bridge.go +++ b/bridge/bridge.go -@@ -55,9 +55,14 @@ func CreateApp(fs embed.FS) *App { - - app := NewApp() - -- if Env.OS == "darwin" { -- createMacOSSymlink() -- createMacOSMenus(app) -+ if Env.OS == "linux" || Env.OS == "darwin" { -+ userConfigDir, err := os.UserConfigDir() -+ if err == nil { -+ targetPath := filepath.Join(userConfigDir, Env.AppName) -+ if err := os.MkdirAll(targetPath, 0755); err == nil { -+ Env.BasePath = targetPath -+ } -+ } - } - - if Env.OS == "windows" { -@@ -80,7 +85,10 @@ func (a *App) IsStartup() bool { - } +@@ -93,7 +93,10 @@ func (a *App) RestartApp() FlagResult { + log.Printf("RestartApp") - exePath := Env.BasePath + "/" + Env.AppName + exePath, err := os.Executable() + if err != nil { diff --git a/pkgs/by-name/gu/guitarix/package.nix b/pkgs/by-name/gu/guitarix/package.nix index 55cc36dfde98..a1cc284088ce 100644 --- a/pkgs/by-name/gu/guitarix/package.nix +++ b/pkgs/by-name/gu/guitarix/package.nix @@ -8,19 +8,20 @@ curl, eigen, faust, + fetchpatch2, fftwSinglePrec, gettext, glib, glib-networking, glibmm, - adwaita-icon-theme, - gsettings-desktop-schemas, + gperf, gtk3, gtkmm3, hicolor-icon-theme, intltool, ladspaH, libjack2, + liblo, libsndfile, lilv, lrdf, @@ -28,19 +29,30 @@ pkg-config, python3, sassc, - serd, - sord, - sratom, wafHook, + which, wrapGAppsHook3, zita-convolver, zita-resampler, - optimizationSupport ? false, # Enable support for native CPU extensions + + enableFaust ? false, # Transpiles Faust DSP code to C++ + enableGperf ? false, # Regenerates gperf files + enableOptimization ? # Enables support for native CPU extensions + if optimizationSupport != null then + lib.warn "`optimizationSupport` is deprecated in guitarix; use `enableOptimization` instead." optimizationSupport + else + false, + enableNSM ? true, # Enables NSM support + enableSse ? stdenv.hostPlatform.isx86, # Enables support for SSE CPU extensions + optimizationSupport ? null, + withAvahi ? true, + withBluez ? stdenv.hostPlatform.isLinux, + withLiblo ? enableNSM, + withZitaConvolver ? true, + withZitaResampler ? true, }: -let - inherit (lib) optional; -in +assert enableNSM -> withLiblo; stdenv.mkDerivation (finalAttrs: { pname = "guitarix"; @@ -49,36 +61,40 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "brummer10"; repo = "guitarix"; - rev = "V${finalAttrs.version}"; + tag = "V${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-YQqcpdehfC9UE1OowC1/YUw2eWgbLWMbAJ3V5tVmtiU="; }; sourceRoot = "${finalAttrs.src.name}/trunk"; + strictDeps = true; + nativeBuildInputs = [ gettext hicolor-icon-theme intltool pkg-config python3 + sassc wafHook wrapGAppsHook3 - ]; + ] + ++ lib.optionals enableFaust [ + faust + which + ] + ++ lib.optional enableGperf gperf; buildInputs = [ - avahi - bluez boost curl eigen - faust fftwSinglePrec + gettext glib glib-networking.out glibmm - adwaita-icon-theme - gsettings-desktop-schemas gtk3 gtkmm3 ladspaH @@ -87,14 +103,34 @@ stdenv.mkDerivation (finalAttrs: { lilv lrdf lv2 - sassc - serd - sord - sratom - zita-convolver - zita-resampler + ] + ++ lib.optional withAvahi avahi + ++ lib.optional withBluez bluez + ++ lib.optional withLiblo liblo + ++ lib.optional withZitaConvolver zita-convolver + ++ lib.optional withZitaResampler zita-resampler; + + patchFlags = [ "-p2" ]; + patches = [ + # Remove the mandatory check for `boost_system` which was removed in boost 1.89 + (fetchpatch2 { + name = "make-boost-system-stub-optional.patch"; + url = "https://github.com/brummer10/guitarix/compare/v0.47.0..187670358ffc47a0fa09e140586b2e88dfdcf043.patch?full_index=1"; + hash = "sha256-9Z0sAM/oTm3ejv9chDbXEpkjNvlX/SN+k48XaJTqdy0="; + includes = [ + "trunk/waf" + "*/wscript" + "trunk/waftools/*.py" + ]; + }) ]; + # There are many bad shebangs which can fail builds. + # See `https://github.com/brummer10/guitarix/issues/246`. + postPatch = '' + patchShebangs --build tools/** + ''; + wafConfigureFlags = [ "--no-font-cache-update" "--shared-lib" @@ -102,34 +138,34 @@ stdenv.mkDerivation (finalAttrs: { "--enable-nls" "--install-roboto-font" ] - ++ optional optimizationSupport "--optimization"; - - env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; + # Use explicit flags to guarantee correct configuration + ++ lib.optional enableFaust "--faust" # Force waf to use the provided faust + ++ lib.optional (!enableFaust) "--no-faust" + ++ lib.optional (!enableNSM) "--no-nsm" + ++ lib.optional enableOptimization "--optimization" + ++ lib.optional (!enableSse) "--disable-sse" + ++ lib.optional (!withAvahi) "--no-avahi" + ++ lib.optional (!withBluez) "--no-bluez" + ++ lib.optional (!withZitaConvolver) "--includeconvolver" + ++ lib.optional (!withZitaResampler) "--includeresampler"; meta = { description = "Virtual guitar amplifier for Linux running with JACK"; mainProgram = "guitarix"; longDescription = '' - guitarix is a virtual guitar amplifier for Linux running with - JACK (Jack Audio Connection Kit). It is free as in speech and - free as in beer. Its free sourcecode allows to build it for - other UNIX-like systems also, namely for BSD and for MacOSX. + Guitarix takes the signal from your guitar as any real amp would do: as a + mono-signal from your sound card. Your tone is processed by a main amp and + a rack-section. Both can be routed separately and deliver a processed + stereo-signal via JACK. You may fill the rack with effects from more than + 25 built-in modules spanning from a simple noise-gate to brain-slashing + modulation-fx like flanger, phaser or auto-wah. Your signal is processed + with minimum latency. On a properly set-up Linux-system you do not need to + wait for more than 10 milliseconds for your playing to be delivered, + processed by guitarix. - It takes the signal from your guitar as any real amp would do: - as a mono-signal from your sound card. Your tone is processed by - a main amp and a rack-section. Both can be routed separately and - deliver a processed stereo-signal via JACK. You may fill the - rack with effects from more than 25 built-in modules spanning - from a simple noise-gate to brain-slashing modulation-fx like - flanger, phaser or auto-wah. Your signal is processed with - minimum latency. On any properly set-up Linux-system you do not - need to wait for more than 10 milli-seconds for your playing to - be delivered, processed by guitarix. - - guitarix offers the range of sounds you would expect from a - full-featured universal guitar-amp. You can get crisp - clean-sounds, nice overdrive, fat distortion and a diversity of - crazy sounds never heard before. + Guitarix offers the range of sounds you would expect from a full-featured + universal guitar-amp. You can get crisp clean-sounds, nice overdrive, fat + distortion and a diversity of crazy sounds never heard before. ''; homepage = "https://github.com/brummer10/guitarix"; license = lib.licenses.gpl3Plus; @@ -137,6 +173,7 @@ stdenv.mkDerivation (finalAttrs: { lord-valen anderscs ]; + # TODO: This potentially also works on darwin and BSD. platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/gw/gws/package.nix b/pkgs/by-name/gw/gws/package.nix index 1e6d45cc66b8..589987a93dff 100644 --- a/pkgs/by-name/gw/gws/package.nix +++ b/pkgs/by-name/gw/gws/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gws"; - version = "0.6.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "googleworkspace"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-8vRBW7RUwHHAvAiF8WahkRh0pH205UiuJloY0DgFwLM="; + hash = "sha256-yirGdRHIexO9I0KLyU5jnNqWUG7Xw/iQ0F93SkkzNi0="; }; - cargoHash = "sha256-tIJikoRFbUYYlkOjfWoPogoB+yhY80TTtSzEXgSEP8A="; + cargoHash = "sha256-M9uflVP8J7vRPYoBZ9GE/aq7nj6dFJa636HQrvR3nXs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix index c5995dae8250..34d9fefd9806 100644 --- a/pkgs/by-name/gz/gz-cmake/package.nix +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, cmake, + cppcheck, doxygen, graphviz, pkg-config, @@ -10,7 +11,7 @@ nix-update-script, }: let - version = "4.2.0"; + version = "5.0.0"; versionPrefix = "gz-cmake${lib.versions.major version}"; in stdenv.mkDerivation (finalAttrs: { @@ -21,33 +22,42 @@ stdenv.mkDerivation (finalAttrs: { owner = "gazebosim"; repo = "gz-cmake"; tag = "${versionPrefix}_${finalAttrs.version}"; - hash = "sha256-+bMOcGWfcwPhxR9CBp4iH02CZC4oplCjsTDpPDsDnSs="; + hash = "sha256-XF7oglj9Xr6F8a+6uowrY5a040yl4FZlFfW/Y0BJwOs="; }; postPatch = '' patchShebangs examples/test_c_child_requires_c_no_deps.bash - substituteInPlace examples/CMakeLists.txt --replace-fail \ - "$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.hostPlatform.isDarwin then "lib" else "lib64"}" + substituteInPlace examples/CMakeLists.txt \ + --replace-fail "$""{CMAKE_INSTALL_LIBDIR}" "${ + if stdenv.hostPlatform.isDarwin then "lib" else "lib64" + }" ''; nativeBuildInputs = [ cmake + cppcheck doxygen graphviz pkg-config + python3 ]; + doBuildExamples = false; + cmakeFlags = [ (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples) ]; - nativeCheckInputs = [ python3 ]; - doCheck = true; - # Extract the version by matching the tag's prefix. - passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex=${versionPrefix}_([\\d\\.]+)" ]; + passthru = { + # bulk updater selects wrong tag + skipBulkUpdates = true; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=gz-cmake(.*)" ]; + }; }; meta = { @@ -57,5 +67,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ guelakais ]; + badPlatforms = lib.platforms.darwin; # hard replicable building error }; }) diff --git a/pkgs/by-name/gz/gz-utils/package.nix b/pkgs/by-name/gz/gz-utils/package.nix index c41ec4ef71d7..6ce8d479f672 100644 --- a/pkgs/by-name/gz/gz-utils/package.nix +++ b/pkgs/by-name/gz/gz-utils/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gz-utils"; - version = "3.1.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "gazebosim"; repo = "gz-utils"; tag = "gz-utils${lib.versions.major finalAttrs.version}_${finalAttrs.version}"; - hash = "sha256-fYzysdB608jfMb/EbqiGD4hXmPxcaVTUrt9Wx0dBlto="; + hash = "sha256-fZonC/o5CNHdK/R3IgEoo1llehy36MwvXPQCgFnP8Ls="; }; outputs = [ diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix index 7bbdb2dd0af2..b4cbc96ce4fb 100644 --- a/pkgs/by-name/he/helmfile/package.nix +++ b/pkgs/by-name/he/helmfile/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "helmfile"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${finalAttrs.version}"; - hash = "sha256-GnqpeeBGAQ/ZuL/BuVEo+FJfiTck9V4WO/SS8NcR+vU="; + hash = "sha256-rv7C/2CExlMO6fXaMMMAgSxqKP5iwLyMFI2huHeFVe0="; }; - vendorHash = "sha256-lHDp7feUr6rN4LLGw1cKZfcChsTsnJQ3DtClpAxwrTU="; + vendorHash = "sha256-uHzDxhJynjijm6dXW9fgiLilxUkch/IBmtQpOXTvA9M="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/by-name/hy/hyprviz/package.nix b/pkgs/by-name/hy/hyprviz/package.nix index a796cbfabea1..59414bac320b 100644 --- a/pkgs/by-name/hy/hyprviz/package.nix +++ b/pkgs/by-name/hy/hyprviz/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprviz"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "timasoft"; repo = "hyprviz"; tag = "v${finalAttrs.version}"; - hash = "sha256-73KcrKlnmdFNllRe7V3MO2FEn95G/pKtFNwRuIjCkew="; + hash = "sha256-UvFtZzQuUgqxY/pMfFaMEM/5VRJuMjSBOXiViwLB0TE="; }; - cargoHash = "sha256-gkLWqvd/4xVFkluv0Q16PjHUckHmMH9eoNxPU8qN+WE="; + cargoHash = "sha256-QuwxJw77ccUnvHcPNrPD5EwgZ3MJV4VvGb7MtUnYu88="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/by-name/im/imapfilter/package.nix similarity index 88% rename from pkgs/applications/networking/mailreaders/imapfilter.nix rename to pkgs/by-name/im/imapfilter/package.nix index cacb0e5f4253..cbe340c0d1de 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/by-name/im/imapfilter/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imapfilter"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ZuyRnN4khdE+z54Ag0b/coiGdUzn/9yT49GpDI4kr8Q="; + sha256 = "sha256-EiYVkEyOrgX2WwWzFyQcuVheYZs1s3CGl01fMwtXBog="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index aaf8391516fe..a6307722357e 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "infrastructure-agent"; - version = "1.72.7"; + version = "1.72.8"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = finalAttrs.version; - hash = "sha256-XpUgv63q1zukjQq/LhPw3vecV0pMbyhtxUCR6oT+e14="; + hash = "sha256-NnMUFNSKf8Z7bLspIfxZp+MzZe1TUoGlfQCuITEwEfw="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/in/inventree/package.nix b/pkgs/by-name/in/inventree/package.nix deleted file mode 100644 index 81b09762966a..000000000000 --- a/pkgs/by-name/in/inventree/package.nix +++ /dev/null @@ -1,291 +0,0 @@ -{ - fetchFromGitHub, - fetchYarnDeps, - lib, - nodejs, - python312, - stdenv, - yarnBuildHook, - yarnConfigHook, - yarnInstallHook, -}: -let - python3 = python312.override { - self = python3; - packageOverrides = self: super: { - django = super.django_4; - }; - }; - - version = "1.1.10"; - src = fetchFromGitHub { - owner = "inventree"; - repo = "inventree"; - tag = "${version}"; - hash = "sha256-TPB/3pFIU+ui4c+CbqIKTyAfJ/Xepm/RIhZeYhTrgI4="; - }; - - frontend = - let - frontendSource = src + "/src/frontend"; - in - stdenv.mkDerivation (finalAttrs: { - - pname = "inventree-frontend"; - inherit version; - - src = frontendSource; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Ijbkx+INZgsvMhkzo8h/FUY75W3UHnKAdUjQRD8kJZw="; - }; - - nativeBuildInputs = [ - nodejs - yarnConfigHook - yarnBuildHook - yarnInstallHook - ]; - - buildPhase = '' - mkdir -p $out - - export PATH=$PATH:$TMP/frontend/node_modules/.bin - substituteInPlace $TMP/frontend/vite.config.ts --replace-warn "../../src/backend/InvenTree/web/static/web" "$out/static/web" - - npm run extract - npm run compile - npm run build - ''; - }); -in -python3.pkgs.buildPythonApplication rec { - pname = "inventree"; - pyproject = true; - inherit version src; - - dependencies = - with python3.pkgs; - [ - django - dj-rest-auth - django-allauth - django-cleanup - django-cors-headers - django-crispy-forms - django-dbbackup - django-error-report-2 - django-filter - django-flags - django-formtools - django-ical - django-import-export - django-maintenance-mode - django-markdownify - django-money - django-mptt - django-mailbox - django-anymail - django-q2 - django-redis - django-sesame - django-sql-utils - django-sslserver - django-stdimage - django-storages - django-structlog - django-taggit - django-oauth-toolkit - django-otp - django-user-sessions - django-weasyprint - standard-imghdr - django-xforwardedfor-middleware - djangorestframework-simplejwt - djangorestframework - drf-spectacular - - bleach - cryptography - distutils - dulwich - feedparser - gunicorn - jinja2 - pdf2image - pillow - pint - python-barcode - python-dotenv - qrcode - pytz - pyyaml - rapidfuzz - sentry-sdk - structlog - tablib - tinycss2 - weasyprint - whitenoise - pypdf - ppf-datamatrix - psycopg2 - mysqlclient - requests-mock - - opentelemetry-api - opentelemetry-sdk - opentelemetry-exporter-otlp - opentelemetry-instrumentation-django - opentelemetry-instrumentation-requests - opentelemetry-instrumentation-redis - opentelemetry-instrumentation-sqlite3 - opentelemetry-instrumentation-system-metrics - opentelemetry-instrumentation-wsgi - ] - ++ tablib.optional-dependencies.all - ++ tablib.optional-dependencies.xls - ++ tablib.optional-dependencies.xlsx - ++ djangorestframework-simplejwt.optional-dependencies.crypto - ++ django-anymail.optional-dependencies.amazon-ses - ++ django-allauth.optional-dependencies.socialaccount - ++ django-allauth.optional-dependencies.saml - ++ django-allauth.optional-dependencies.openid - ++ django-allauth.optional-dependencies.mfa; - - build-system = [ python3.pkgs.setuptools ]; - - prePatch = - let - skippedCheckFunctions = [ - "test_task_check_for_updates" - "test_download_image" - "test_commit_info" - "test_rates" - "test_download_build_orders" - "test_valid_url" - "test_refresh_endpoint" - "test_download_csv" - "test_download_line_items" - "test_export" - "test_download_xlsx" - "test_download_csv" - "test_export" - "test_part_label_translation" - "test_part_download" - "test_date_filters" - "test_bom_export" - "test_hash" - "test_date" - "test_api_call" - "test_function_errors" - "test_stocktake_exporter" - "test_return" - "test_plugin_install" - "test_full_process" - "test_package_loading" - "test_export" - "test_users_exist" - "test_import_part" - "test_model_names" - ]; - skippedFuncScripts = builtins.map (funcName: '' - grep -rlZ ${funcName} . | while IFS= read -r -d "" file; do - substituteInPlace "$file" --replace-fail "${funcName}" "skip_${funcName}" - done - '') skippedCheckFunctions; - in - '' - ${lib.concatStringsSep "\n" skippedFuncScripts} - ''; - - installPhase = - let - pythonPath = python3.pkgs.makePythonPath dependencies; - in - '' - runHook preInstall - - # Don't need to bother with a non-maintained library from ages ago - substituteInPlace src/backend/InvenTree/InvenTree/settings.py --replace-fail "django_slowtests.testrunner.DiscoverSlowestTestsRunner" "django.test.runner.DiscoverRunner" - - mkdir -p $out/lib/${pname}/src/backend/InvenTree/web/ - cp -r src $out/lib/${pname} - ln -s ${frontend}/static $out/lib/${pname}/src/backend/InvenTree/web - # cp -r ${frontend}/static $out/lib/${pname}/src/backend/InvenTree/web - - chmod +x $out/lib/${pname}/src/backend/InvenTree/manage.py - - makeWrapper $out/lib/${pname}/src/backend/InvenTree/manage.py $out/bin/${pname} \ - --prefix PYTHONPATH : "${pythonPath}:$out/lib/${pname}/src/backend/InvenTree" - - makeWrapper ${lib.getExe python3.pkgs.gunicorn} $out/bin/gunicorn \ - --prefix PYTHONPATH : "${pythonPath}:$out/${python3.sitePackages}":"${pythonPath}:$out/lib/${pname}/src/backend/InvenTree" - - runHook postInstall - ''; - doCheck = true; - env = { - DJANGO_SETTINGS_MODULE = "InvenTree.settings"; - }; - - checkPhase = '' - runHook preCheck - - tmpDir=$(mktemp -d) - mkdir -p $tmpDir/media - mkdir -p $tmpDir/.cache/fontconfig - export HOME=$tmpDir - export INVENTREE_STATIC_ROOT=$tmpDir - export INVENTREE_MEDIA_ROOT=$tmpDir/media - export INVENTREE_BACKUP_DIR=$tmpDir - export INVENTREE_DB_ENGINE=django.db.backends.sqlite3 - export INVENTREE_DB_NAME=inventree.db - export INVENTREE_SITE_URL="http://localhost:8000" - - export INVENTREE_PLUGINS_ENABLED=true - export INVENTREE_PLUGIN_TESTING=true - export INVENTREE_PLUGIN_TESTING_SETUP=true - - pushd src/backend/InvenTree - ${python3.interpreter} ./manage.py check - ${python3.interpreter} ./manage.py migrate - - ${python3.interpreter} ./manage.py test --failfast - popd - - runHook postCheck - ''; - - nativeCheckInputs = with python3.pkgs; [ - django-test-migrations - pytest-django - pytest-env - pytestCheckHook - invoke - coverage - pytest-cov - pdfminer-six - ]; - passthru = - let - pythonPath = python3.pkgs.makePythonPath dependencies; - in - { - inherit frontend; - pythonPath = pythonPath; - }; - - meta = { - description = "Open Source Inventory Management System"; - homepage = "https://inventree.org/"; - changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/${src.tag}"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - mainProgram = "inventree"; - maintainers = with lib.maintainers; [ - kurogeek - ]; - }; -} diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix index 890e71fdb362..1f4e03cc7e6d 100644 --- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -41,9 +41,10 @@ python3Packages.buildPythonPackage { aiohttp jinja2 pyyaml - prometheus-client + prometheus-client # optional, for prometheus metrics supervisor typing-extensions + watchdog # optional, watching changes in files (TLS certs, RPZs) ]; # set up (additional) Lua dependencies diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 066fc52f6cab..5322f07a6ebe 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -54,7 +54,6 @@ python3Packages.buildPythonApplication (finalAttrs: { stestr oslotest hacking - coverage bashate ]; diff --git a/pkgs/by-name/kr/kreya/package.nix b/pkgs/by-name/kr/kreya/package.nix index 5743473e71ce..be353c90ee5a 100644 --- a/pkgs/by-name/kr/kreya/package.nix +++ b/pkgs/by-name/kr/kreya/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kreya"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { url = "https://stable-downloads.kreya.app/${finalAttrs.version}/Kreya-linux-x64.tar.gz"; - hash = "sha256-JyUdTLW6dYwYTVlyhCph7LDuCF4mdrQTnhcv/qmeuIc="; + hash = "sha256-l1LeQv2QKI57bXwqi9KMCDtuDiuawLLq1ysx6SbmHKI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix index f93b808a2fda..37c978317973 100644 --- a/pkgs/by-name/la/lazyworktree/package.nix +++ b/pkgs/by-name/la/lazyworktree/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "lazyworktree"; - version = "1.38.1"; + version = "1.43.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "lazyworktree"; tag = "v${finalAttrs.version}"; - hash = "sha256-rNTzmvfVAToPzOvP+3wnL+zyQzL2mXQCnRY0cLKuQ6c="; + hash = "sha256-fzYUQY6MbKRM7lSjBlhWx3U2J53EkJqSBeC/+V1Xkmg="; }; - vendorHash = "sha256-Y4TZZ7Fhn1YSxG6YH0l0y0iWxgml93gOwKyTXWkjpqg="; + vendorHash = "sha256-EZY4flrYM3JRY5i1qsjp5vvGW32IvDHeINdYuQJgUuQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 240b3fce189b..40094fee9f77 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -29,7 +29,7 @@ buildDotnetModule rec { env.AVALONIA_TELEMETRY_OPTOUT = "1"; - dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0_1xx; dotnet-runtime = dotnetCorePackages.runtime_10_0; diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix index f44f339399c0..221a6794f6d9 100644 --- a/pkgs/by-name/li/lichess-bot/package.nix +++ b/pkgs/by-name/li/lichess-bot/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "lichess-bot"; - version = "2026.3.6.3"; + version = "2026.3.7.1"; pyproject = false; src = fetchFromGitHub { owner = "lichess-bot-devs"; repo = "lichess-bot"; - rev = "02ab2363c707cf0f3ff60a6ee914f131c5d05a94"; - hash = "sha256-S0ezzzA0Ft0YSp3knuahjwjvXUGPsrAzG2jqPKrWsRA="; + rev = "96a8f74d87a42db8039e847548fec0d9528bb079"; + hash = "sha256-dHs+eoGOVCqHhFGEjCLKcDfndr6gIdvRoxLjwWz0j5o="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 51215c80a32f..6ca86582dd98 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.8.3"; + version = "10.8.5"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-6MAlspPwPIdHbhAOPufUASckRFcuBA2c6HwyKw8DQpo="; + hash = "sha256-+56yc0JYpq/TXxKdrCnASHm5bSkwr5QPSWC+ILMDPs4="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index b163a64f69f6..442a822ebe41 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.709"; + version = "0.712"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-qqexX0d/YFBbn/l59l3OI7KMpwScAtdmeJbGWk8ZEuE="; + hash = "sha256-pReKrGXO7cZrSCO9ZKv4ikzs45ApZlJ0mvZPUt6+TOU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/marvin/package.nix b/pkgs/by-name/ma/marvin/package.nix index ebb7083d79b4..a79d348ff80d 100644 --- a/pkgs/by-name/ma/marvin/package.nix +++ b/pkgs/by-name/ma/marvin/package.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "marvin"; - version = "25.3.5"; + version = "25.5.0"; src = fetchurl { name = "marvin-${finalAttrs.version}.deb"; url = "http://dl.chemaxon.com/marvin/${finalAttrs.version}/marvin_linux_${finalAttrs.version}.deb"; - hash = "sha256-OiTHMGKAuHadoKQMTTPRcYl/zKL+bc0ts/UNsJlHn0Q="; + hash = "sha256-+fTO6cEJL4QRFpLQ9CXZFt7Jg3otR3ZMWN5vH+3QXmA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index e794f24eb58c..46655b01a201 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 = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-fHAho52KO43Vot+JliR80glC0AY1cqZzz/ZxecGk9P8="; + hash = "sha256-fG38JMOQY988b6l7lPSf5rCu52ZdgcOd3edxB5TJR2E="; }; - cargoHash = "sha256-H8ZXf8h7JWhhDTjOJSIBtc2R2Cdlt9+3wJpJrxAnQ8o="; + cargoHash = "sha256-AOWtPElfn3T88LxgcWpLTLOIzoGhMPZBCjeWp61T7Fo="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-LiuAlyZerLQgOAl7n2MnDQrRFg7aQTncB1iXtnSOLzc="; + hash = "sha256-aneS64awfjhkUpkVWNmzVPb5kshrONVvUnom7rxdU1k="; }; npmRoot = "frontend"; diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index 7c125d99f8e5..27efbf01f718 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -15,16 +15,16 @@ in buildGo126Module (finalAttrs: { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "bluenviron"; repo = "mediamtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-F7DFDN+2hPHJAzRiodo5yR9evtUmtmvMtwgfeUqumAE="; + hash = "sha256-TjeNm6gfhw+5IWtlojdO24k/N8oDZddFgQY7/e+dlPY="; }; - vendorHash = "sha256-6ICHZ4Q/nOP/e1GKguLDcC+42Q6lxO6OdeK/8a1F+Uo="; + vendorHash = "sha256-JHM7yNUaT1UjK0t97ppxW9dTAwcSdF8gmPat5+k3uzo="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index 8b082e746322..83a8b819e5f5 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -1,24 +1,24 @@ { lib, - buildGoModule, + buildGo126Module, fetchFromGitHub, installShellFiles, nixosTests, nix-update-script, }: -buildGoModule (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "miniflux"; - version = "2.2.17"; + version = "2.2.18"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = finalAttrs.version; - hash = "sha256-Ru9yhI7EhLEdxmB3umOyub/SjmRY+tYxGsh2tEdZGCQ="; + hash = "sha256-r5MFYdWV17u2ogxN01w9FpP/ErgqQmTEl5Nizg9FzCY="; }; - vendorHash = "sha256-BRgS58D8G6TGo7+jGjlmHrNUvVLgBE5Mm7/A/PekoI8="; + vendorHash = "sha256-F1FbenWzokNnF6xiZeqpu5HWs1PZo0WtlZX/ePTvBTE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index f8f85c6b3b67..a6418934b0aa 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -12,14 +12,14 @@ let pname = "mochi"; - version = "1.20.10"; + version = "1.21.1"; linux = appimageTools.wrapType2 rec { inherit pname version meta; src = fetchurl { url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage"; - hash = "sha256-oC53TXgK6UUgsHbLo0Ri/+2/UajYwpoXxHwqO1xY91U="; + hash = "sha256-JgKzq4iUqpFiB6TpC5Wv7vx+pjeqr9EzNwftiNjEl/I="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -44,9 +44,9 @@ let url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg"; hash = if stdenv.hostPlatform.isAarch64 then - "sha256-nLz73G6vthiXex7+y6bLVhe/RvK3fE3UHuzHf8lcilE=" + "sha256-b6lANyQWbovy2XegEJ/cNFrhh3YA4G6jzl5rpexi0oQ=" else - "sha256-MuvzijF2eDELcSfOyqffKk5tx2a51vU8cGV2/ShSfTg="; + "sha256-iHNBD8MDmH+OzM2xUVOErB3aPypFN0wCkLKgfSjzfSQ="; }; sourceRoot = "."; @@ -74,7 +74,10 @@ let license = lib.licenses.unfree; mainProgram = "mochi"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ poopsicles ]; + maintainers = with lib.maintainers; [ + piotrkwiecinski + poopsicles + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; in diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml b/pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml new file mode 100644 index 000000000000..a8f22189f513 --- /dev/null +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml @@ -0,0 +1,8 @@ + + + + MSBuild Structured Log + + + + diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index 95af07f541d6..1b9766f3d535 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -4,23 +4,20 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, - autoPatchelfHook, + writeText, copyDesktopItems, - icu, - openssl, - libkrb5, makeDesktopItem, nix-update-script, }: buildDotnetModule (finalAttrs: { pname = "msbuild-structured-log-viewer"; - version = "2.3.143"; + version = "2.3.150"; src = fetchFromGitHub { owner = "KirillOsenkov"; repo = "MSBuildStructuredLog"; rev = "v${finalAttrs.version}"; - hash = "sha256-Gjk6hxgFSiSLDP9B4UUsNEaadLjTn8WrPmFRbIUerAA="; + hash = "sha256-HTWPsVl/pMi+lMSax5JNtbPXHeqD8QxfvLp2bhVxfPs="; }; env.AVALONIA_TELEMETRY_OPTOUT = "1"; @@ -31,19 +28,22 @@ buildDotnetModule (finalAttrs: { projectFile = [ "src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj" ]; nugetDeps = ./deps.json; - # HACK: Clear out RuntimeIdentifiers that's set in StructuredLogViewer.Avalonia.csproj, otherwise our --runtime has no effect - dotnetFlags = [ "-p:RuntimeIdentifiers=" ]; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - autoPatchelfHook - copyDesktopItems + dotnetBuildFlags = [ + "-p:CustomAfterDirectoryBuildTargets=${writeText "StubGitVersioning.targets" '' + + + + $(Version) + $(FileVersion) + $(InformationalVersion) + + + + ''}" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - stdenv.cc.cc.lib - icu - openssl - libkrb5 + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems ]; dontDotnetFixup = true; @@ -53,6 +53,7 @@ buildDotnetModule (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/msbuild-structured-log-viewer.png + install -Dm444 ${./mimetype.xml} $out/share/mime/packages/binlog.xml '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \ @@ -71,6 +72,9 @@ buildDotnetModule (finalAttrs: { icon = "msbuild-structured-log-viewer"; exec = finalAttrs.meta.mainProgram; categories = [ "Development" ]; + mimeTypes = [ + "application/x-binlog" + ]; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index 18ab5746dbd1..fe21998606af 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -13,6 +13,7 @@ zeromq, flex, bison, + nix-update-script, # for tests python3, @@ -49,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.24.10"; + version = "0.24.11"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; tag = finalAttrs.version; - hash = "sha256-2laH4qJo4sQtjsUDEljUoipAXs+LRH+xmOP4a0zz1Y8="; + hash = "sha256-I2SLc/KbkBvqbbWuLr8ARmmg4DeE7ZbTqcM1tw8WhwQ="; fetchSubmodules = true; }; @@ -120,6 +121,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + passthru.updateScript = nix-update-script { }; + passthru.tests = { withInstallChecks = finalAttrs.finalPackage.overrideAttrs (_: { doInstallCheck = true; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index 51abfafae5ba..fdb581dcd5ef 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.20.22"; + version = "1.52.0"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = version; - hash = "sha256-TuYLNjogR3psb1B9zonHzRQext0ROS4ueD2WcWkseJk="; + hash = "sha256-5EIG/5fexhrcOOQE+31+TJKMtINGVL+EI32m9tEhYVo="; }; patches = [ diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 5190d8eef435..439941237a0d 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextcloud-client"; - version = "4.0.6"; + version = "4.0.7"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-GPNJ2zrHzHQgJvj1ANi6LYsTlkuc5splFAwC5XaR3+0="; + hash = "sha256-cur50O//LSZwXvbE7qeaNa0BgpdR25NIpCUF5NDDObY="; }; patches = [ diff --git a/pkgs/by-name/ne/nextpnr-xilinx/package.nix b/pkgs/by-name/ne/nextpnr-xilinx/package.nix index 09d2fc588f53..44482a1aacbe 100644 --- a/pkgs/by-name/ne/nextpnr-xilinx/package.nix +++ b/pkgs/by-name/ne/nextpnr-xilinx/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nextpnr-xilinx"; - version = "0.8.2-unstable-2026-02-25"; + version = "0.8.2-unstable-2026-03-13"; src = fetchFromGitHub { owner = "openXC7"; repo = "nextpnr-xilinx"; - rev = "72d8217b80cafed22cbac1253a2f23ca1ee10806"; - hash = "sha256-YIwJfh6epUDGfWwHS0zjfcrx5A68NUY6gxyuEBb0g3A="; + rev = "96bb068afdb941e9292509a28b079c14c26ceca6"; + hash = "sha256-l9V7glWRtt9NUAKV00zeacA4vyFjwhfxv3mfDEF4lgI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index d648a19b1412..6704a7e1202a 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nfs-ganesha"; - version = "9.7"; + version = "9.8"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "nfs-ganesha"; repo = "nfs-ganesha"; tag = "V${finalAttrs.version}"; - hash = "sha256-MGDt78UnkPaNc2YD/GHlFnvZNo0ZBbtvG+vxcplH+fI="; + hash = "sha256-os0juaxJGOB1Ugh+7MvK0Gg11PSKkesCq6TgaFR+sDE="; }; patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch; diff --git a/pkgs/by-name/ni/nixpkgs-vet/package.nix b/pkgs/by-name/ni/nixpkgs-vet/package.nix index b86de7fa4578..008784db740f 100644 --- a/pkgs/by-name/ni/nixpkgs-vet/package.nix +++ b/pkgs/by-name/ni/nixpkgs-vet/package.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; mainProgram = "nixpkgs-vet"; maintainers = with lib.maintainers; [ + mdaniels5757 philiptaron willbush ]; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index cd2c676bca30..3017c65cd548 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nuclei-templates"; - version = "10.3.9"; + version = "10.4.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${finalAttrs.version}"; - hash = "sha256-ORKHxs2IdbQIc668A23BKkz3lPUodBEwI07dNfxLuDk="; + hash = "sha256-XhzaBVNIKJ5khNNER69tqBYCMzc7G+pDiibgyNRWwEA="; }; installPhase = '' diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix index 55639dbc1880..53c1ab2d7599 100644 --- a/pkgs/by-name/nw/nwg-look/package.nix +++ b/pkgs/by-name/nw/nwg-look/package.nix @@ -47,15 +47,11 @@ buildGoModule (finalAttrs: { env.CGO_ENABLED = 1; postInstall = '' - mkdir -p $out/share mkdir -p $out/share/nwg-look/langs - mkdir -p $out/share/applications - mkdir -p $out/share/pixmaps - mkdir -p $out/share/icons cp stuff/main.glade $out/share/nwg-look/ cp langs/* $out/share/nwg-look/langs - cp stuff/nwg-look.desktop $out/share/applications - cp stuff/nwg-look.svg $out/share/pixmaps + install -D -m 644 stuff/nwg-look.desktop -t $out/share/applications + install -D -m 644 stuff/nwg-look.svg -t $out/share/icons/hicolor/scalable/apps ''; preFixup = '' diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 167dbb8970c1..eeb9c0c9046b 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.2.26"; + version = "1.2.27"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-+bQEfrqv9tAmXUMcvyUM0hJGpXgt09IWoKYt8I/jBlU="; + hash = "sha256-JUlFfILzcUCME3mOxdxDbcCXphNVEfVGIKhwAwtJPl8="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 72d0d731c257..40d295c8f7e0 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "openfga"; - version = "1.11.6"; + version = "1.12.0"; src = fetchFromGitHub { owner = "openfga"; repo = "openfga"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hb4oyfCpgIr7CtvX0MI65HiWRKrHFD9GzzqsC6X93iw="; + hash = "sha256-8cRsn1KjCgDPSMy5YVIFXGb+7lQekcrLKmZ28PbH5Z0="; }; - vendorHash = "sha256-BpnlR3YICUX0AFegsc42QucBGlM+qEZGSlyhl39o2zA="; + vendorHash = "sha256-r4lE+LAwoc5xb60hBSryfprDUK5+O97jF6h3NwOybcs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index 193f518bf497..2982de88dea1 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimagedenoise"; - version = "2.3.3"; + version = "2.4.1"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-JzAd47fYGLT6DeOep8Wag29VY9HOTpqf0OSv1v0kGQU="; + sha256 = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; }; patches = lib.optional cudaSupport ./cuda.patch; diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index 74d9d1c303f5..20e2eeafd1a7 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "openpgp-card-tools"; - version = "0.11.11"; + version = "0.11.12"; src = fetchFromCodeberg { owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-4kmBWbfB9A36359zhR5fz0XFcN839gTtJFRFhJL1lL0="; + hash = "sha256-vnyDgFs195QMZtcjBu/fOj5YnqpF1jyCS0KzR1k2HWM="; }; - cargoHash = "sha256-kXBPDwHkoB/W2sSIjChf4VnoNykvIKSSIv8YsW3iu1Y="; + cargoHash = "sha256-T0ehazHODSMpQqVx/6rQS+1cWNaYaojLyiHOYwchuwY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ow/owocr/package.nix b/pkgs/by-name/ow/owocr/package.nix index 8071dccc5e44..c05a5605c9ca 100644 --- a/pkgs/by-name/ow/owocr/package.nix +++ b/pkgs/by-name/ow/owocr/package.nix @@ -3,19 +3,26 @@ python3Packages, fetchFromGitHub, }: - -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication (finalAttrs: { pname = "owocr"; - version = "1.7.5-unstable-2024-06-26"; + version = "1.26.3"; pyproject = true; src = fetchFromGitHub { owner = "AuroraWright"; repo = "owocr"; - rev = "743c64aa16a760f87bf5ea1f54364d828eb3eddb"; # no tags - hash = "sha256-TXQwJRgRp7fZBN0r4XGVtlb+iOMRqEUf+LbfBG/vsr8="; + tag = finalAttrs.version; + hash = "sha256-/eee0uOWZgjHKhN3Ie75qxXqlSH1Fm3ipDYkvyIK5LM="; }; + # we use pystray directly to avoid making a new package + # that only carries a single patch for windows double click support. + # pythonRelaxDeps was not successful in patching + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "pystrayfix>=0.19.8" "pystray" + ''; + build-system = [ python3Packages.setuptools ]; dependencies = with python3Packages; [ @@ -41,6 +48,13 @@ python3Packages.buildPythonApplication { manga-ocr rapidocr requests # winRT OCR + python3Packages.obsws-python + python3Packages.pystray + python3Packages.pynputfix + curl-cffi + pygobject3 + dbus-python + pywayland ]; doCheck = false; # no tests @@ -51,4 +65,4 @@ python3Packages.buildPythonApplication { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix index 16bbe72c9a3e..45a8ea83c610 100644 --- a/pkgs/by-name/ox/oxigraph/package.nix +++ b/pkgs/by-name/ox/oxigraph/package.nix @@ -14,17 +14,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "oxigraph"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "oxigraph"; repo = "oxigraph"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sg4C9NW2grrlLFY2mDGOdsucX7cdT2028erJL8xaqLE="; + hash = "sha256-EF4Lor7Z+ADsmTAswUtd8M+IIrMZIvQbrhj/vsX0afs="; fetchSubmodules = true; }; - cargoHash = "sha256-fR3s3RSYlpUVqsPOyPwZaCjTSNWoOYwFDBzcYxTE8kY="; + cargoHash = "sha256-JAbGkVIkeku50c8WMLBgAsagIZT35AjYynD8k2gRAv0="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix index 5fb2a595f136..ccd5837c2d00 100644 --- a/pkgs/by-name/pe/perfect_dark/package.nix +++ b/pkgs/by-name/pe/perfect_dark/package.nix @@ -22,13 +22,13 @@ assert lib.assertOneOf "romID" romID roms; stdenv.mkDerivation (finalAttrs: { pname = "perfect_dark"; - version = "0-unstable-2026-01-07"; + version = "0-unstable-2026-03-14"; src = fetchFromGitHub { owner = "fgsfdsfgs"; repo = "perfect_dark"; - rev = "246d737663c3eae4c1cfdc0cb32f92b3fd353d8a"; - hash = "sha256-tSB4OAZv31zbyPy5MbQmnar1ev2FkJyA6FecnFds79I="; + rev = "11df50b3ad0f500eab21bd05eab48880b908946f"; + hash = "sha256-lQO9CVeKBhstz2xz3F32+MOW+7WXQ2AbfDEAmdxRjCI="; postFetch = '' pushd $out diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix index 4dfbf3c946b8..04daf5710983 100644 --- a/pkgs/by-name/ph/phpstan/package.nix +++ b/pkgs/by-name/ph/phpstan/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "phpstan"; - version = "2.1.40"; + version = "2.1.41"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan"; tag = finalAttrs.version; - hash = "sha256-AlM5lJPHlO0BAkav1PluP/bIkZBzaWTsm4HA72y59iI="; + hash = "sha256-qmexB+JpL9mpWVmTeXmffM+oChdNCRc6be1O+WJcML0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix new file mode 100644 index 000000000000..de44ccb6e0c7 --- /dev/null +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -0,0 +1,93 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + typescript-go, + nix-update-script, + versionCheckHook, + writableTmpDirAsHomeHook, + ripgrep, + makeBinaryWrapper, +}: +buildNpmPackage (finalAttrs: { + pname = "pi-coding-agent"; + version = "0.58.3"; + + src = fetchFromGitHub { + owner = "badlogic"; + repo = "pi-mono"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3GrE60n+EY5G50iRrbH7R74e+LQIy1M9+huZTp0ZTns="; + }; + + npmDepsHash = "sha256-EC5fXZTtBTRkYXLg5p4xWE/ghi2iw30XwnSqJs/PT8I="; + + npmWorkspace = "packages/coding-agent"; + + # Skip native module rebuild for unneeded workspaces (e.g. canvas from web-ui) + npmRebuildFlags = [ "--ignore-scripts" ]; + + nativeBuildInputs = [ + typescript-go + makeBinaryWrapper + ]; + + # Build workspace dependencies in order, then the coding-agent. + # We invoke tsgo directly for workspace deps to skip pi-ai's + # generate-models script which requires network access + # (models.generated.ts is committed to the repo). + buildPhase = '' + runHook preBuild + + tsgo -p packages/ai/tsconfig.build.json + tsgo -p packages/tui/tsconfig.build.json + tsgo -p packages/agent/tsconfig.build.json + npm run build --workspace=packages/coding-agent + + runHook postBuild + ''; + + # npm workspace symlinks in the output point into packages/ which + # doesn't exist there. Replace runtime deps with built content and + # delete the rest. + postInstall = '' + local nm="$out/lib/node_modules/pi-monorepo/node_modules" + + # Replace workspace deps needed at runtime with real copies + for ws in @mariozechner/pi-ai:packages/ai \ + @mariozechner/pi-agent-core:packages/agent \ + @mariozechner/pi-tui:packages/tui; do + IFS=: read -r pkg src <<< "$ws" + rm "$nm/$pkg" + cp -r "$src" "$nm/$pkg" + done + + # Delete remaining workspace symlinks + find "$nm" -type l -lname '*/packages/*' -delete + + # Clean up now-dangling .bin symlinks + find "$nm/.bin" -xtype l -delete + ''; + postFixup = "wrapProgram $out/bin/pi --prefix PATH : ${lib.makeBinPath [ ripgrep ]}"; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgram = "${placeholder "out"}/bin/pi"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Coding agent CLI with read, bash, edit, write tools and session management"; + homepage = "https://shittycodingagent.ai/"; + downloadPage = "https://www.npmjs.com/package/@mariozechner/pi-coding-agent"; + changelog = "https://github.com/badlogic/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ munksgaard ]; + mainProgram = "pi"; + }; +}) diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix index 4c4d1727d401..78120415c44a 100644 --- a/pkgs/by-name/pl/playwright-mcp/package.nix +++ b/pkgs/by-name/pl/playwright-mcp/package.nix @@ -18,11 +18,13 @@ buildNpmPackage rec { npmDepsHash = "sha256-Qsln4llNpfXYXhSEfHnvdsFIF7adHKEyC1eGHtVY2Qk="; + # Codex MCP smoke test (after `codex mcp add playwright-nix --env DISPLAY=:0 -- $out/bin/mcp-server-playwright --headless --isolated`): + # timeout 45s codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check "Use only playwright-nix MCP tools. Navigate to https://example.com and return only the page title." postInstall = '' - rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright - rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright-core - ln -s ${playwright-test}/lib/node_modules/playwright $out/lib/node_modules/@playwright/mcp/node_modules/playwright - ln -s ${playwright-test}/lib/node_modules/playwright-core $out/lib/node_modules/@playwright/mcp/node_modules/playwright-core + rm -rf "$out/lib/node_modules/@playwright/mcp/node_modules/playwright" + rm -rf "$out/lib/node_modules/@playwright/mcp/node_modules/playwright-core" + ln -s ${playwright-test}/lib/node_modules/playwright "$out/lib/node_modules/@playwright/mcp/node_modules/playwright" + ln -s ${playwright-test}/lib/node_modules/playwright-core "$out/lib/node_modules/@playwright/mcp/node_modules/playwright-core" wrapProgram $out/bin/mcp-server-playwright \ --set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers} \ diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix index 6b32e2b2f27c..9c876530d1d8 100644 --- a/pkgs/by-name/pl/plugdata/package.nix +++ b/pkgs/by-name/pl/plugdata/package.nix @@ -35,13 +35,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plugdata"; - version = "0.9.3"; + version = "0.9.3-2"; src = fetchFromGitHub { owner = "plugdata-team"; repo = "plugdata"; tag = "v${finalAttrs.version}"; - hash = "sha256-GjaJCg9FhsvUWHFfEk1a/Ef5gMglWKqEWaCLqazooto="; + hash = "sha256-V08xlc14JZZgmXb4Dernnt9vxWDd5l/GHMzolnmCK8Y="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pl/plzip/package.nix b/pkgs/by-name/pl/plzip/package.nix index 2c78db0facfc..891952e63d87 100644 --- a/pkgs/by-name/pl/plzip/package.nix +++ b/pkgs/by-name/pl/plzip/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "plzip"; - version = "1.12"; + version = "1.13"; outputs = [ "out" "man" @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://savannah/lzip/plzip/plzip-${finalAttrs.version}.tar.lz"; - hash = "sha256-RLvt4rLiOPBbmSEon5194ia3lYKmN2pdEOv8u4dxOoQ="; + hash = "sha256-f+AUG3Lq8ITYKq07FLOk2W3/C97698OJ91XYlIs2N8g="; # hash from release email }; diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index fd01abdc59c8..a014cbd87449 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -8,7 +8,7 @@ let pname = "postman"; - version = "11.87.4"; + version = "11.88.3"; src = let @@ -27,10 +27,10 @@ let name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}"; url = "https://dl.pstmn.io/download/version/${version}/${system}"; hash = selectSystem { - aarch64-darwin = "sha256-1ilYfvduHTh5tvIrIXmrwQgfiWnYhdXhNv/o19wUNrE="; - aarch64-linux = "sha256-JdO/gBT7B+FQ8mguyw7oD2hfQACfyDVxF714iVkTW2I="; - x86_64-darwin = "sha256-Sb66zJQJzixk032fsdAfU88Yw9t7xeFoPBlQ+pRcdmU="; - x86_64-linux = "sha256-a8jsIFlJD12tydTZM9Mibv+m7bcSqAN4JVQgQxB4WJo="; + aarch64-darwin = "sha256-BYdEwE96SdxPwn8bTcIZcHcClAjPgrFd2rSO1zs/X5Y="; + aarch64-linux = "sha256-nWS4cPV6m/h1+RLkl1i9FZxCol/GPxFb2S+GRoL87QM="; + x86_64-darwin = "sha256-8lDFOysRuJMEJ5Ff2mkTZx+Mu+duiDq8EAdibi7yYL8="; + x86_64-linux = "sha256-98NRSIOpgsDZ9tehbgQi1Ms5U04ylWIh4A2qY0yasPA="; }; }; diff --git a/pkgs/by-name/pr/prmers/package.nix b/pkgs/by-name/pr/prmers/package.nix index 1ef0945508ae..2a6d309ed209 100644 --- a/pkgs/by-name/pr/prmers/package.nix +++ b/pkgs/by-name/pr/prmers/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prmers"; - version = "4.16.11-alpha"; + version = "4.18.00-alpha"; src = fetchFromGitHub { owner = "cherubrock-seb"; repo = "PrMers"; tag = "v${finalAttrs.version}"; - hash = "sha256-yyfPnDacU8VBqVq8gwPflxCPmbSRqMr5N6zFu5pm6x4="; + hash = "sha256-FoZd/eBXnHGUZxJ206ExaBuHwzAYyylf+3sE6xPot5I="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index efa30d77540e..ceef547ef68c 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pyradio"; - version = "0.9.3.11.27"; + version = "0.9.3.11.28"; pyproject = true; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = finalAttrs.version; - hash = "sha256-0NcVjXkGhWYqgllEsbV+I8RzDgPn8CTPkRWRPUsmw0M="; + hash = "sha256-a5nRSpGEbRNCZY5q2/QdlksuIXv+31OpifXY1a449ls="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qo/qobuz-player/package.nix b/pkgs/by-name/qo/qobuz-player/package.nix index 433d03d51450..fe07042357ec 100644 --- a/pkgs/by-name/qo/qobuz-player/package.nix +++ b/pkgs/by-name/qo/qobuz-player/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qobuz-player"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "SofusA"; repo = "qobuz-player"; tag = "v${finalAttrs.version}"; - hash = "sha256-PQhuMGUKKquxZn/Tru8rYapzcoWiZR2Q7q6R+XT2z1s="; + hash = "sha256-1y4VvrxcUOCqOOcMgBuf7VsZ4CZTpF/3TQiVyZPZpcE="; }; - cargoHash = "sha256-H2dZJgNTMqLvQ4PMF0JRngTBK4hFF8a/Z/8jAhL7NDM="; + cargoHash = "sha256-uOQflE3dYNOrpcg1W23MN7t8CW+3h4Z3Vp00LxBP0pk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix index d287a48510bb..ede24baca36a 100644 --- a/pkgs/by-name/re/redumper/package.nix +++ b/pkgs/by-name/re/redumper/package.nix @@ -9,13 +9,13 @@ # redumper is using C++ modules, this requires latest C++20 compiler and build tools llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: { pname = "redumper"; - version = "703"; + version = "705"; src = fetchFromGitHub { owner = "superg"; repo = "redumper"; tag = "b${finalAttrs.version}"; - hash = "sha256-GYzfVWwNRclIMZX/7kY5F/dheMBGnYgKP9xCtXbTWtg="; + hash = "sha256-g824KEdIK/B1DtNPe09AL839DTKeE3xy+NbI1DOkm+U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix index 41fbdafbb80b..abd6a6b9fd37 100644 --- a/pkgs/by-name/re/retool/package.nix +++ b/pkgs/by-name/re/retool/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "retool"; - version = "2.4.8"; + version = "2.4.9"; pyproject = true; src = fetchFromGitHub { owner = "unexpectedpanda"; repo = "retool"; tag = "v${finalAttrs.version}"; - hash = "sha256-SSSHYwQtDtCONvM5Ze3G5JJ4TW5aCziS3EbxhliXx+g="; + hash = "sha256-FVBqmhU7nZpoFJSZBCtkmkcSLCAysNgwzOYyOwfOuGA="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/re/revanced-cli/package.nix b/pkgs/by-name/re/revanced-cli/package.nix index f260c2e80c13..791be6d2e9e7 100644 --- a/pkgs/by-name/re/revanced-cli/package.nix +++ b/pkgs/by-name/re/revanced-cli/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "revanced-cli"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { url = "https://github.com/revanced/revanced-cli/releases/download/v${finalAttrs.version}/revanced-cli-${finalAttrs.version}-all.jar"; - hash = "sha256-tq+DSWAPVupR2W1Jqk0vKI4ox5zWSTSbpwyLcs4EXa8="; + hash = "sha256-wlVJvBfVnS65T6X4bmDpt3oCdyyoj3BQ+PEnb5I6mVg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index 9dcb3d6679ed..d2e1852f6fd6 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20260209"; + version = "20260315"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-mzvxFW/lwrAnoBTQsfB1cnfUvn0D9666iWgUDpaYrcI="; + hash = "sha256-iNRDQsDg8G58mSkDnzoGUVfWX3YezIWVwl5CJMKB+wE="; }; dontUnpack = true; diff --git a/pkgs/by-name/rs/rsshub/0001-fix-git-hash.patch b/pkgs/by-name/rs/rsshub/0001-fix-git-hash.patch index cec83ecd3802..3cfa677a428b 100644 --- a/pkgs/by-name/rs/rsshub/0001-fix-git-hash.patch +++ b/pkgs/by-name/rs/rsshub/0001-fix-git-hash.patch @@ -8,12 +8,12 @@ Subject: [PATCH] fix git hash 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/utils/git-hash.ts b/lib/utils/git-hash.ts -index 9a8131696..f1f568fb4 100644 +index 458651a..795bb88 100644 --- a/lib/utils/git-hash.ts +++ b/lib/utils/git-hash.ts @@ -1,14 +1,6 @@ - import { execSync } from 'child_process'; - + import { execSync } from 'node:child_process'; + -let gitHash = process.env.HEROKU_SLUG_COMMIT?.slice(0, 8) || process.env.VERCEL_GIT_COMMIT_SHA?.slice(0, 8); -let gitDate: Date | undefined; -if (!gitHash) { @@ -26,5 +26,5 @@ index 9a8131696..f1f568fb4 100644 -} +let gitHash = '@GIT_HASH@'.slice(0, 8); +let gitDate = new Date('Thu Jan 1 00:00:00 1970 +0000'); - - export { gitHash, gitDate }; + + export { gitDate, gitHash }; diff --git a/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch b/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch index e14f44ef14f7..1e2fb6c90605 100644 --- a/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch +++ b/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch @@ -1,45 +1,31 @@ -diff --git a/scripts/workflow/build-routes.ts b/scripts/workflow/build-routes.ts -index 1bbb64cc5..941d86149 100644 ---- a/scripts/workflow/build-routes.ts -+++ b/scripts/workflow/build-routes.ts -@@ -1,5 +1,6 @@ - import fs from 'node:fs'; - import path from 'node:path'; -+import { exit } from 'node:process'; +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: RSSHub Nix packagers +Date: Mon, 10 Mar 2026 00:00:00 +0000 +Subject: [PATCH] support BUILD_ROUTES_MODE for offline builds + +Add BUILD_ROUTES_MODE environment variable support to lib/registry.ts +so that route metadata can be built using directoryImport without +executing module-level code that would trigger network requests. +This is required for building in the Nix sandbox (no network access). + +--- + lib/registry.ts | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/registry.ts b/lib/registry.ts +--- a/lib/registry.ts ++++ b/lib/registry.ts +@@ -56,7 +56,12 @@ - import { parse } from 'tldts'; - import toSource from 'tosource'; -@@ -11,17 +12,7 @@ import { getCurrentPath } from '../../lib/utils/helpers'; + let namespaces: NamespacesType = {}; - const __dirname = getCurrentPath(import.meta.url); - --const foloAnalysis = await ( -- await fetch('https://raw.githubusercontent.com/RSSNext/rsshub-docs/refs/heads/main/rsshub-analytics.json', { -- headers: { -- 'user-agent': config.trueUA, -- }, -- }) --).json(); --const foloAnalysisResult = foloAnalysis.data as Record; --const foloAnalysisTop100 = Object.entries(foloAnalysisResult) -- .sort((a, b) => b[1].subscriptionCount - a[1].subscriptionCount) -- .slice(0, 150); -+const foloAnalysisTop100: any[] = []; - - const maintainers: Record = {}; - const radar: { -@@ -100,7 +91,7 @@ const uniquePaths = [...allRoutePaths].toSorted(); - const routePathsType = `// This file is auto-generated by scripts/workflow/build-routes.ts - // Do not edit manually - --export type RoutePath = -+export type RoutePath = - ${uniquePaths.map((path) => ` | \`${path}\``).join('\n')}; - `; - -@@ -110,3 +101,5 @@ fs.writeFileSync(path.join(__dirname, '../../assets/build/maintainers.json'), JS - fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.json'), JSON.stringify(namespaces, null, 2)); - fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.js'), `export default ${JSON.stringify(namespaces, null, 2)}`.replaceAll(/"module": "(.*)"\n/g, `"module": $1\n`)); - fs.writeFileSync(path.join(__dirname, '../../assets/build/route-paths.ts'), routePathsType); -+ -+exit(0); +-if (config.isPackage) { ++if (process.env.BUILD_ROUTES_MODE) { ++ modules = directoryImport({ ++ targetDirectoryPath: path.join(__dirname, './routes'), ++ importPattern: /\.tsx?$/, ++ }) as typeof modules; ++} else if (config.isPackage) { + namespaces = (await import('../assets/build/routes.js')).default; + } else { + switch (process.env.NODE_ENV || process.env.VERCEL_ENV) { diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index cf622baec21a..2a77e1c4ac50 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -2,8 +2,9 @@ lib, fetchFromGitHub, makeBinaryWrapper, + nix-update-script, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, replaceVars, @@ -11,39 +12,43 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2025-11-28"; + version = "0-unstable-2026-03-16"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "b6dbafe33e0c3e3a4ba5a1edd2da29b70412389f"; - hash = "sha256-FsevO2nb6leuuRmzCLIy093FCafl3Y/CsSp1ydJOnKY="; + rev = "85b5444d07ed23e1e7e57511ed65d028bcab71eb"; + hash = "sha256-CMcKIXqchbBzE8ENehPDt/F4BErTsYHCnWJObImTkLc="; }; patches = [ (replaceVars ./0001-fix-git-hash.patch { - "GIT_HASH" = finalAttrs.src.rev; + GIT_HASH = finalAttrs.src.rev; }) ./0002-fix-network-call.patch ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-jV+MpdNeaVHut0eUP7F9SmJZuLDGQE8ULR8LsiOE7Ug="; + hash = "sha256-wjCPiw+DMcqP6qEc0V9sA1vM5uZbz+sNyMGbGwjt9JY="; + pnpm = pnpm_10; }; nativeBuildInputs = [ makeBinaryWrapper nodejs pnpmConfigHook - pnpm_9 + pnpm_10 ]; buildPhase = '' runHook preBuild - pnpm build + # First build route metadata using directoryImport (avoids executing + # module-level code that would trigger network requests) + BUILD_ROUTES_MODE=1 pnpm run build:routes + # Then build the application + pnpm run build runHook postBuild ''; @@ -57,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' makeWrapper ${lib.getExe nodejs} $out/bin/rsshub \ - --chdir "$out/lib/rsshub" \ --set "NODE_ENV" "production" \ --set "NO_LOGFILES" "true" \ - --set "TSX_TSCONFIG_PATH" "$out/lib/rsshub/tsconfig.json" \ - --append-flags "$out/lib/rsshub/dist/index.mjs" + --add-flags "$out/lib/rsshub/dist/index.mjs" ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; }; + meta = { description = "RSS feed generator"; longDescription = '' @@ -75,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { new features and bug fixes. ''; homepage = "https://docs.rsshub.app"; - license = lib.licenses.mit; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ xinyangli ]; mainProgram = "rsshub"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix new file mode 100644 index 000000000000..38000f7873b6 --- /dev/null +++ b/pkgs/by-name/rt/rtk/package.nix @@ -0,0 +1,51 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + sqlite, + writableTmpDirAsHomeHook, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rtk"; + version = "0.29.0"; + + src = fetchFromGitHub { + owner = "rtk-ai"; + repo = "rtk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QGHCa8rO4YBFXdrz78FhWKFxY7DmRxCXM8iYQv4yTYE="; + }; + + strictDeps = true; + + cargoHash = "sha256-gNJjtQah7NFSgFVYJftK19dECzDvLCi2E33na2PtKmc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + sqlite + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + description = "CLI proxy that reduces LLM token consumption by 60-90% on common dev commands"; + homepage = "https://github.com/rtk-ai/rtk"; + changelog = "https://github.com/rtk-ai/rtk/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "rtk"; + }; +}) diff --git a/pkgs/by-name/ru/runn/package.nix b/pkgs/by-name/ru/runn/package.nix index ddba8128ee62..9576971be311 100644 --- a/pkgs/by-name/ru/runn/package.nix +++ b/pkgs/by-name/ru/runn/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "runn"; - version = "1.3.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "runn"; tag = "v${finalAttrs.version}"; - hash = "sha256-hDPXYGKDTvVFyMU08OeIxp70w9gimgY9qp9j38Ea5bc="; + hash = "sha256-zxlPm27RwSXBSq/k7gxY/d4oozU/bpD7AIKZHzGxwh8="; }; - vendorHash = "sha256-gLemeaNAmFVm9Ld2b3QTjdlKMye0TpKVSuQHj0ToMN4="; + vendorHash = "sha256-RHJkMKCz39M4LEEyicO4SQDL7thcCr93Cj2NrkrkM0c="; subPackages = [ "cmd/runn" ]; diff --git a/pkgs/by-name/ru/rust-rpxy/package.nix b/pkgs/by-name/ru/rust-rpxy/package.nix index 3f32839e4227..c3eda7b94e85 100644 --- a/pkgs/by-name/ru/rust-rpxy/package.nix +++ b/pkgs/by-name/ru/rust-rpxy/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-rpxy"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "junkurihara"; repo = "rust-rpxy"; tag = finalAttrs.version; - hash = "sha256-9YieB+ZlO4lrNv+yAswv0/t/RAYfmhi5s9NGtESJjjg="; + hash = "sha256-v0FkNs/WAmFlRD8r4x5Am21Thtr5RwhMlXWeTEgV6Nw="; fetchSubmodules = true; }; - cargoHash = "sha256-mFXXWdpUtDnxo6NB5Oh5PdHPE513Ks/H8UqzeplXQ+s="; + cargoHash = "sha256-t85C185qKJAMwnoLJFOKdGPtoLVc//U4hNqfMOZpJ/s="; meta = { description = "Http reverse proxy serving multiple domain names and terminating TLS for http/1.1, 2 and 3, written in Rust"; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 3516898c3ea1..aa446dccc044 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2026-03-07"; + version = "11.7-unstable-2026-03-14"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "5dfb990344f8edb463591e2e444daa1e004eb25f"; - hash = "sha256-XFzhMWfzQXrA87zioes+MzHjLnu+wseQTWJCPORkoU8="; + rev = "18e645b614e053482a8721a0c84c4621586a1676"; + hash = "sha256-8FGb12BSKZkx9oKg2D2udP7j4V9ZLAhVtWICIDSp7v0="; }; buildInputs = diff --git a/pkgs/by-name/sb/sbarlua/package.nix b/pkgs/by-name/sb/sbarlua/package.nix index 1d7bdfc4a870..5c43c7e88674 100644 --- a/pkgs/by-name/sb/sbarlua/package.nix +++ b/pkgs/by-name/sb/sbarlua/package.nix @@ -2,31 +2,34 @@ lib, fetchFromGitHub, gcc, - lua54Packages, + lua55Packages, readline, }: -lua54Packages.buildLuaPackage { +lua55Packages.buildLuaPackage { pname = "sbarLua"; - version = "0-unstable-2024-08-12"; + version = "0-unstable-2026-03-06"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SbarLua"; - rev = "437bd2031da38ccda75827cb7548e7baa4aa9978"; - hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg="; + rev = "dba9cc421b868c918d5c23c408544a28aadf2f2f"; + hash = "sha256-lhLTrdufA3ALJ2S5HLdgNOr5seWIWEHkVhZNPObzbvI="; }; nativeBuildInputs = [ gcc ]; buildInputs = [ readline ]; - makeFlags = [ "INSTALL_DIR=$(out)/lib/lua/${lua54Packages.lua.luaversion}" ]; + makeFlags = [ "INSTALL_DIR=$(out)/lib/lua/${lua55Packages.lua.luaversion}" ]; meta = { description = "Lua API for SketchyBar"; homepage = "https://github.com/FelixKratz/SbarLua/"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.khaneliman ]; + maintainers = [ + lib.maintainers.khaneliman + lib.maintainers.kaynetik + ]; platforms = lib.platforms.darwin; }; } diff --git a/pkgs/by-name/sc/schemesh/package.nix b/pkgs/by-name/sc/schemesh/package.nix index 783033bea528..6d7b5f8344ba 100644 --- a/pkgs/by-name/sc/schemesh/package.nix +++ b/pkgs/by-name/sc/schemesh/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemesh"; - version = "0.9.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cosmos72"; repo = "schemesh"; tag = "v${finalAttrs.version}"; - hash = "sha256-OhQpXFg3eroVpw4zkENM4zwqHqGNolstlq9oLhQ2cbY="; + hash = "sha256-Tt3pxzti/Vv5JiP0kiplv6gOPiFU75tKoKyvpEPPztw="; }; buildInputs = [ diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index a88bf8931871..b57cda2fc17f 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-02-26"; + version = "0-unstable-2026-03-13"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "23873434e9ce207ff2622a4161e70f78263dbcc7"; - hash = "sha256-WBMHjEDj5y0sVNqASZbn0cICJ1IwKD6N39WXeUQ9tn8="; + rev = "ff46b15524f72e75d4b258343e77d0db6c5d351d"; + hash = "sha256-NhfSXulYuzJK2IWlf3vB1lmszLwpFjau7bCUMaKwuj8="; }; dontBuild = true; diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix index 313acfe71c04..1d53f5334791 100644 --- a/pkgs/by-name/se/see-cat/package.nix +++ b/pkgs/by-name/se/see-cat/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "see-cat"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "guilhermeprokisch"; repo = "see"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Ej8lk9btUcIhhgpSmnHo2n33wQtyEkmuWVFoahYgAaI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-BlceC8XgKvSLOTKHlfQHxn0rhaFKL8rHqUcYBNntB5s="; }; - cargoHash = "sha256-gADA6Ioxz8YM/SRYsT+43bKNS2Ov1XtTElDr7vx8T14="; + cargoHash = "sha256-ccSuJqENO8DElZM5Nz+/rt7yAIMipcVJ3qOi9JR0CQY="; meta = { description = "Cute cat(1) for the terminal"; diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix index 7e1547ba437a..a6d7ac6fb8e6 100644 --- a/pkgs/by-name/sf/sftpgo/package.nix +++ b/pkgs/by-name/sf/sftpgo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; tag = "v${version}"; - hash = "sha256-9WdgBipMb+7/XtNxLzaU36RNiMprlk44Ix/RcC/+VsA="; + hash = "sha256-y5Khka7r1Mostg8qPdTlSOieO+x7AdvJFIefILT97OI="; }; - vendorHash = "sha256-pbYmkIu5b3odCR+rnGQy3+xsMy1Lru37sbxRoIlv77E="; + vendorHash = "sha256-yIrI0yN+htfC+yORILt8oB+iu2UYWxxL6tzb4dzxtD0="; ldflags = [ "-s" diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix index 6af924ba4e74..d217cdb2461e 100644 --- a/pkgs/by-name/sh/shellhub-agent/package.nix +++ b/pkgs/by-name/sh/shellhub-agent/package.nix @@ -12,18 +12,18 @@ buildGoModule (finalAttrs: { pname = "shellhub-agent"; - version = "0.21.5"; + version = "0.22.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${finalAttrs.version}"; - hash = "sha256-0adBDz9oHb+Wo1/BucMPavX/4xZidjQYNVA3O475JEo="; + hash = "sha256-Ngb6n1P5Bb11et5x1mTF4rQjx/TdfE93nLc2NRz4aSg="; }; modRoot = "./agent"; - vendorHash = "sha256-zBT3kQhn6RhgcP/5FBEhKo1oPl9GgFQqWGsBUgrDwW4="; + vendorHash = "sha256-FlbSHLkJlOdbgfS+B5f8GLihw2KNQCh3G8kt8E+eb3w="; ldflags = [ "-s" diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index a54838f71deb..8a7a3d2e26dc 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -14,23 +14,23 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.88.0"; + version = "0.88.2"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-te88kmhMzZWzNNnH5Mn6/lo3v6ZKNq0bC5ZFvvSH7po="; + hash = "sha256-hHBxHvAaJ3clCjFwKbyavO1ixe9k8DLdEa5+2AWy+Kk="; }; - cargoHash = "sha256-ebEiReugsUrnBOimv90iqRrSjgOG+rgkraS2nb1aFD0="; + cargoHash = "sha256-wV9gKdxOcgW1M/cEbRhre9ReDBX+TgQbxVBw1cVZwGY="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-wsZNXlFGsZB46evQCRowmy9yU0Au3XwHQXQ6IHLJcWg="; + hash = "sha256-lAS45lXz8gAI96Nge1RdF4zPuOz/Z/8L1EMgob1lUZU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 874e886fc531..d0c0a280dbad 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -55,13 +55,13 @@ let ''; }); - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-KejUmkTko5xg9LhswYy6qSb+8S+FhqK2cWHYSngUnVs="; + hash = "sha256-Fti57SjU0LAQsJth01rTlsmDoaOTVpN56t7FGuPM8nc="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -163,15 +163,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 3; hash = if withAppleEmojis then - "sha256-0Cfhd5s3c4cnUv/YY07fUnsG0WKfYT+EGrHlFIkS1Zw=" + "sha256-gfMqGzO0bvDCfcbb4gvGVA62zk8MyAYlZ2zcQrwVT88=" else - "sha256-WYyGBA6y/vxf1nPwiNIuXYkuk1ZbZPrM1+7VXupidjA="; + "sha256-soPMTGqg4drhiEtGp2SJOZdGOEXKpH2oWYVPTPhIkQg="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1773262210; + SOURCE_DATE_EPOCH = 1773422147; } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Disable code signing during local macOS builds. diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index b61a15c3a545..0ed59725427a 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-hoqEaliddv9G91QdU1DQTag/HsViqRBML2a9iGNEcaI="; + hash = "sha256-Kf9aVnCvN6wSegBzFyix+sUtvl/b+zUrbXDf7baxfNo="; }; - vendorHash = "sha256-HAfBXVwwWM6x2Dj1jYXKrmeKtDMXRcYwkbondWkUonI="; + vendorHash = "sha256-oQst3UHdQ2aHc/yS2w72mSu8Set+CsgNZgYLnwUcmNo="; tags = [ "with_gvisor" diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix index ec2f086eb4e0..bc0535e188c1 100644 --- a/pkgs/by-name/sl/slack/sources.nix +++ b/pkgs/by-name/sl/slack/sources.nix @@ -1,26 +1,26 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-12-15 +# Last updated: 2026-03-14 { fetchurl }: { aarch64-darwin = { - version = "4.47.72"; + version = "4.48.100"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.72/Slack-4.47.72-macOS.dmg"; - hash = "sha256-AihMQAjMMRWJftQOp9gnIC/df8nnrKnkpRym8sdtUkA="; + url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.48.100/Slack-4.48.100-macOS.dmg"; + hash = "sha256-vzgxVBRncNQ4mchSgbe9vm3kEiPXHeMlhm3Xq4COi7A="; }; }; x86_64-darwin = { - version = "4.47.72"; + version = "4.48.100"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.72/Slack-4.47.72-macOS.dmg"; - hash = "sha256-H1Dqtlqz1FxDqq4iAZJsTkugLp+WVU9fKB+H19l+vug="; + url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.48.100/Slack-4.48.100-macOS.dmg"; + hash = "sha256-5IEIgDxdE2Pnpy3gkJT3Cwzo3hRoTPziFAj30SnapVQ="; }; }; x86_64-linux = { - version = "4.47.72"; + version = "4.48.100"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.72/slack-desktop-4.47.72-amd64.deb"; - hash = "sha256-o1WOTBG5u4jL+NGbTEZq+afM2UwUJZ0gtsWKsnsOkvE="; + url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.48.100/slack-desktop-4.48.100-amd64.deb"; + hash = "sha256-un+GE8zKDrag6YQMYN8+0ki7J3877FfMFqqucHhPBgk="; }; }; } diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index a27061d35b07..4cc485caf0d5 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -8,12 +8,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "snakefmt"; - version = "0.11.4"; + version = "0.11.5"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y="; + hash = "sha256-27tt5KlTrpc463j5m6pUz89S6FqIKrtT9PA5EXeC1pM="; }; build-system = with python3.pkgs; [ hatchling ]; diff --git a/pkgs/by-name/so/soco-cli/package.nix b/pkgs/by-name/so/soco-cli/package.nix index 164b03a09991..64b24edf3b52 100644 --- a/pkgs/by-name/so/soco-cli/package.nix +++ b/pkgs/by-name/so/soco-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "soco-cli"; - version = "0.4.82"; + version = "0.4.83"; pyproject = true; src = fetchFromGitHub { owner = "avantrec"; repo = "soco-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kD+78dNQ/dff8y9/A3qdIrARStkal3Eu7/plG0T1CrQ="; + hash = "sha256-sVu6mizqUy9AdwGRciez1wnBPTnUcIRBjkAM+IY3n0E="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix index 355ffee3cdb1..2d53b53cb9d1 100644 --- a/pkgs/by-name/sp/splash/package.nix +++ b/pkgs/by-name/sp/splash/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "splash"; - version = "3.11.7"; + version = "3.12.0"; src = fetchFromGitHub { owner = "danieljprice"; repo = "splash"; rev = "v${finalAttrs.version}"; - hash = "sha256-V5p2MZIpM3uVww8sWzwRX4Df2z0tk15C4R3Jlzy7qEk="; + hash = "sha256-7wzFYaceryxbNRLRv7EikWr4yYjrK89S7Kct8kpKvz8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 6b6a2dc5a31a..24d603e9232d 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -9,13 +9,13 @@ }: let pname = "sql-studio"; - version = "0.1.50"; + version = "0.1.51"; src = fetchFromGitHub { owner = "frectonz"; repo = "sql-studio"; tag = version; - hash = "sha256-sXlOnqzi3N+56sdJdkpcVq1mKgdhhu0KdU1Xdoyr10w="; + hash = "sha256-LooRM7KlNmRHG5M18MLnV+hraQ1kRVEZp2GVYnwNScI="; }; ui = buildNpmPackage { @@ -35,7 +35,7 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-+hf0GtD5lfa//JYFQZFvO+2m9FgOn9jV6NQ0rQejRXg="; + cargoHash = "sha256-SJiPVvRYRkMHprGXtObNVSsO//2VNTpouCB+qcXlbjc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index c0b18b15c760..55f86a00399c 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "sqlfluff"; - version = "4.0.0"; + version = "4.0.4"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; tag = finalAttrs.version; - hash = "sha256-hXiy3PGoBe6O9FaACN31Tss3xMBfiw4YuVLxbGi+/tA="; + hash = "sha256-0Zu3hx35LPG6+v1D7fAenuh8tI6M4oJw6XxKU833cr8="; }; pythonRelaxDeps = [ "click" ]; diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix index 944d670e60b5..9c9158c1c5fc 100644 --- a/pkgs/by-name/st/streamrip/package.nix +++ b/pkgs/by-name/st/streamrip/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "streamrip"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "nathom"; repo = "streamrip"; rev = "v${finalAttrs.version}"; - hash = "sha256-Klrkz0U36EIGO2sNxTnKPACvvqu1sslLFFrQRjFdxiE="; + hash = "sha256-OeU1KBGcmpryOlDmW1aFNAgSP484ZAcc4CVsgfrsKVI="; }; patches = [ diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix index cb6197bf03e4..abc2506d0392 100644 --- a/pkgs/by-name/sw/swaylock-plugin/package.nix +++ b/pkgs/by-name/sw/swaylock-plugin/package.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "swaylock-plugin"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "mstoeckl"; repo = "swaylock-plugin"; rev = "v${finalAttrs.version}"; - hash = "sha256-CdxOOfKqPm/rWuZjaLOGcFaJpvdjT7GIhx24etPHH5I="; + hash = "sha256-JSFxWpSUt6ekX/owk9I6CdGBTF6F1pOTtFAls7kZrsc="; }; strictDeps = true; diff --git a/pkgs/by-name/sw/swh/package.nix b/pkgs/by-name/sw/swh/package.nix index 95828a6665d4..b8492d8c4803 100644 --- a/pkgs/by-name/sw/swh/package.nix +++ b/pkgs/by-name/sw/swh/package.nix @@ -1,4 +1,5 @@ { + lib, python3Packages, writeShellApplication, withSwhPythonPackages ? [ @@ -19,7 +20,7 @@ in writeShellApplication { name = "swh"; text = '' - ${python3'}/bin/swh "$@" + ${lib.getExe' python3' "swh"} "$@" ''; meta = { inherit (python3Packages.swh-core.meta) license mainProgram platforms; diff --git a/pkgs/by-name/ta/tailsnitch/package.nix b/pkgs/by-name/ta/tailsnitch/package.nix index 265f381d9f9a..d2bcb93cd7e2 100644 --- a/pkgs/by-name/ta/tailsnitch/package.nix +++ b/pkgs/by-name/ta/tailsnitch/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "tailsnitch"; - version = "1.4.0"; + version = "1.5"; src = fetchFromGitHub { owner = "Adversis"; repo = "tailsnitch"; tag = "v${finalAttrs.version}"; - hash = "sha256-LvAOIDM1YIB4LmOm6zXrzr5SOH7tyF4t79XCLDg6p2Q="; + hash = "sha256-5gS9IQfu525ZtNQ74WWLQoqfXPJ2clm3pCz+/Ujmr4Y="; }; vendorHash = "sha256-khw9K4sKhubhkccoC4f923Aw2Cj9eKpVqLHZICdkTXw="; diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix index 13b49f446d5e..c4809666f9c1 100644 --- a/pkgs/by-name/th/theharvester/package.nix +++ b/pkgs/by-name/th/theharvester/package.nix @@ -6,21 +6,21 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "theharvester"; - version = "4.10.0"; + version = "4.10.1"; pyproject = true; src = fetchFromGitHub { owner = "laramies"; repo = "theharvester"; tag = finalAttrs.version; - hash = "sha256-PDFKDm1amqmdYo/avxudWZ9Xhp16Cw4ejmUAQ+BlvC0="; + hash = "sha256-ajXGf8wH8WoVGNHDAUJ+fC3FN2OtUuKaIrXJ4KuRif0="; }; pythonRelaxDeps = true; pythonRemoveDeps = [ "winloop" ]; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3.pkgs; [ flit-core ]; dependencies = with python3.pkgs; [ aiodns diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 7818dd74ba4c..2a497759271e 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-zunGCwesR0Twx83q0/2xj1z0ejVJ/7wseR65udTe9Jg="; - "x86_64-linux" = "sha256-31RabUcONzxt4E3FkHXHjuq9cCYYjlYt/8C7ElWO8zo="; - "aarch64-linux" = "sha256-rAgXpuWHcQL3bUcqKKfmCC+Zq4XoegDUyYn0TrVBgk4="; + "universal-macos" = "sha256-yUiw0y2unr65LUkin0NvdzjCer5YilmRPCmpdoLqWlU="; + "x86_64-linux" = "sha256-GgmjNac0Y+8z45+6er8UvmZ74I0i92Yamkei0D66q+k="; + "aarch64-linux" = "sha256-zh0qTdvifjjCSyIyIUYrqE6RZ23sln0AZAC2Te1ZWRY="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.75"; + version = "0.16.76"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 55ba0f243555..39ed70a74b5c 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.9.2"; + version = "0.9.6"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-K3kdIGOUADliz0X2UMwFpzOnQ9/q0HnmHCz45A2Zi8w="; + hash = "sha256-sqzdZqs8qMCA3VSXPsBTVZ4fgZUogVl7mQKnbateV/Y="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-+MKyDJIbPyfnQPJV3pM+USdMrxIgloTGbSwpi1R+eTg="; + cargoHash = "sha256-bW7VfL/3XIGVhQOPNDXURsolGG3gBHAsTEC7FO2P0bI="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 9fc1e7d8ee20..1e4743fb91a4 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -18,6 +18,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { }; pythonRelaxDeps = [ + "codespell" "pontos" "validators" ]; diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 10b001406bbf..d113cbf9a24d 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -46,10 +46,7 @@ appimageTools.wrapType2 rec { changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; license = lib.licenses.gpl3Only; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ - da157 - s0ssh - ]; + maintainers = with lib.maintainers; [ s0ssh ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix index 3ff2091acec5..4bf1d44ddca8 100644 --- a/pkgs/by-name/ty/typesetter/package.nix +++ b/pkgs/by-name/ty/typesetter/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "typesetter"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromCodeberg { owner = "haydn"; repo = "typesetter"; tag = "v${finalAttrs.version}"; - hash = "sha256-aZhtynRB/zL3i6LRnm2OXPJt1ERUXxnRXmHYvfLZyWU="; + hash = "sha256-9OSwjv02ULH42j3WDl9VS3+V37F/XclBYWiJoNty/eo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cQWKj2vQHaz9vx6UvukxLaV6qZlLXvvVbmIeKSMpAns="; + hash = "sha256-U+or3ZbR5d8KzGJUYLqJ0L9vohe1fCCnvG8FRe1cGeo="; }; strictDeps = true; diff --git a/pkgs/by-name/uu/uutils-acl/package.nix b/pkgs/by-name/uu/uutils-acl/package.nix index 5a4e89dbb369..3f0aa8d88529 100644 --- a/pkgs/by-name/uu/uutils-acl/package.nix +++ b/pkgs/by-name/uu/uutils-acl/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-acl"; - version = "0.0.1-unstable-2026-02-24"; + version = "0.0.1-unstable-2026-03-13"; src = fetchFromGitHub { owner = "uutils"; repo = "acl"; - rev = "b3e1a9ea9f9eaab2b9a877fba5b6b00e1a170341"; - hash = "sha256-6sopMhh1swsoORjnFTzMB0Q8SqtIjRTHxGfFyw6L7rM="; + rev = "4a80f872ef659f6406c1ce70266ed68a502eb8b7"; + hash = "sha256-hrE2At1heNwxAQ9wjtJCS+ecX1hm3Y+2T202jYlk9rQ="; }; - cargoHash = "sha256-dfJibUOjSsxY5cfwy6khc5IXWA/AtoAZAmzCledB59s="; + cargoHash = "sha256-dQ+G3aXVRRwWD94WpGCpt3nHQEK77He2UDQYZSpSWRM="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 5fc279880460..4cb084c17172 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + cargo rustPlatform.bindgenHook rustPlatform.cargoSetupHook python3Packages.sphinx ]; makeFlags = [ - "CARGO=${lib.getExe cargo}" "PREFIX=${placeholder "out"}" "PROFILE=release" "SELINUX_ENABLED=${if selinuxSupport then "1" else "0"}" @@ -75,11 +75,15 @@ stdenv.mkDerivation (finalAttrs: { ]) ) }" + "SKIP_UTILS=${lib.optionalString stdenv.hostPlatform.isStatic "stdbuf"}" ] ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ] ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; - env = lib.optionalAttrs selinuxSupport { + env = { + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + } + // lib.optionalAttrs selinuxSupport { SELINUX_INCLUDE_DIR = "${libselinux.dev}/include"; SELINUX_LIB_DIR = lib.makeLibraryPath [ libselinux diff --git a/pkgs/by-name/uu/uutils-hostname/package.nix b/pkgs/by-name/uu/uutils-hostname/package.nix index df57f96f061c..512c4a2adeea 100644 --- a/pkgs/by-name/uu/uutils-hostname/package.nix +++ b/pkgs/by-name/uu/uutils-hostname/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-hostname"; - version = "0-unstable-2026-02-24"; + version = "0-unstable-2026-03-08"; src = fetchFromGitHub { owner = "uutils"; repo = "hostname"; - rev = "b5efd550762655d4483d70fbc54f5829a8f94a11"; - hash = "sha256-ipjI6E5x3ORr5H1YQA7NvoTk894fQWLiMdjnb7iaubc="; + rev = "ecf119d03ab203ad828b4e48161f870dd704a503"; + hash = "sha256-ynGGk44Ildztqx956NJYvD5+1SBLCPjD8VsI7Nmcxrk="; }; - cargoHash = "sha256-wR8nRDljztDLdxVFb2pdy4wfqw3zWj3mHUpKrAPCFrw="; + cargoHash = "sha256-K0TEsAWyDVfqMkRYuOaisI3k0S6IMYu4XzQTtvvx5XQ="; cargoBuildFlags = [ "--package uu_hostname" ]; diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix index fdb71539edbb..ccba1aa8f6cd 100644 --- a/pkgs/by-name/uu/uutils-login/package.nix +++ b/pkgs/by-name/uu/uutils-login/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-login"; - version = "0-unstable-2026-02-24"; + version = "0-unstable-2026-03-13"; src = fetchFromGitHub { owner = "uutils"; repo = "login"; - rev = "85c14bdfff7668421c1b59bbab7ed9046bf9a5de"; - hash = "sha256-ntqv4Woc7X4jrw4/LUG2nOEhaBtTQh0wEFV97Jaan14="; + rev = "48edf37818d005a49fd3b90fd29aeb21a4bcc5da"; + hash = "sha256-cBpKoXgcEZcQWqOK2+yZnlWCWTTYK4z6PKgi4MDeOQk="; }; - cargoHash = "sha256-uACq1EnUs3fbV2x8QGYx1mKCr+rWfzNOgFx5eJi8cQ4="; + cargoHash = "sha256-bvLQ6C6VySK/X+46kehOm5NOcgZnfQK9iz9cYbyPPu8="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix index 1f35eb3ca28b..722867a68626 100644 --- a/pkgs/by-name/uu/uutils-procps/package.nix +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-procps"; - version = "0.0.1-unstable-2026-03-04"; + version = "0.0.1-unstable-2026-03-13"; src = fetchFromGitHub { owner = "uutils"; repo = "procps"; - rev = "367fa3cfc7106dfbc54e279a7be614c2e99dd4b5"; - hash = "sha256-pJUWnzROl7WpaXcenYsnJRiQURJji0aEHsh9dG8+7ic="; + rev = "e74801e5d9769bc07b66825d1bcc78b526aa7e61"; + hash = "sha256-8LbGiE0l/oVDfWkPZJvAcIUmoEwIQgjoMLQn2pygrRA="; }; - cargoHash = "sha256-13vb8RlOd78igEj1NXnwrQ11CnUBwfQaNzxh6KUQozM="; + cargoHash = "sha256-e49VmVtE/9weQcac8nxGRnpQ0ii44nfDZAug+IscTx8="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix index b148dba9af68..60cba385df27 100644 --- a/pkgs/by-name/uu/uutils-util-linux/package.nix +++ b/pkgs/by-name/uu/uutils-util-linux/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-util-linux"; - version = "0.0.1-unstable-2026-03-06"; + version = "0.0.1-unstable-2026-03-13"; src = fetchFromGitHub { owner = "uutils"; repo = "util-linux"; - rev = "0012dc812c29fcb214d2cf8f72822db984f6bab6"; - hash = "sha256-WFpqkFAuZua+Cb7Q7AxtNkMd1LocbzvWtD4XKArkTiA="; + rev = "aab78223c814231c1e424b82d56d73fb008b5f1b"; + hash = "sha256-QHQlC7IxxurZqFYEN9hRbhTTupPScZ/y0w+jxM6xEkY="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"' ''; - cargoHash = "sha256-v7+I9Futg8FRNM0Tssfgr0zgxJ4t9cnmuwTvM7GnrnI="; + cargoHash = "sha256-4Cw7ymydXtb3z9IxfxUYb1I6hB0RlkQAMq11QUvZ3to="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 27e056a12cd7..91e0b0b8d74b 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20260307133324"; + version = "20260315135612"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-m4IrAU4hTg89+1BYjiuCGQ/1facqajGUBs32VvjCPz0="; + hash = "sha256-lo/g2/zBf6+vx1KzZ8Pyc/MAhukcVrz2XnO+nFbj1wg="; }; vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk="; meta = { diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index e29c0c3ae79b..0e800a5daa09 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGo126Module (finalAttrs: { pname = "VictoriaLogs"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-SrM6lDhbsGOJohmAFIALyzSAh/9C3A8/EQ2pFDlOEAw="; + hash = "sha256-10tLXgcKdjaHkoA4E7bNS2pBpebv+Exh2yMKlTOFlCw="; }; vendorHash = null; diff --git a/pkgs/by-name/vi/visual-paradigm-ce/package.nix b/pkgs/by-name/vi/visual-paradigm-ce/package.nix index 3d06bf435ded..04e0d38884b6 100644 --- a/pkgs/by-name/vi/visual-paradigm-ce/package.nix +++ b/pkgs/by-name/vi/visual-paradigm-ce/package.nix @@ -5,11 +5,12 @@ copyDesktopItems, makeDesktopItem, openjdk, + writeScript, }: stdenv.mkDerivation (finalAttrs: { pname = "visual-paradigm-ce"; - version = "17.3.20260101"; + version = "18.0.20260303"; src = let @@ -21,9 +22,20 @@ stdenv.mkDerivation (finalAttrs: { url = "https://eu10-dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${ builtins.replaceStrings [ "." ] [ "_" ] majorMinor }_${suffix}_Linux64_InstallFree.tar.gz"; - hash = "sha256-RAujr6tws3HTyoZc6/MTbc5HEqyX9XmSl4IPJNayjQA="; + hash = "sha256-n6cijv9ndliqcvcbIOnMB/mwIjkOzWe1AcJZB+HdHBg="; }; + passthru.updateScript = writeScript "update-visual-paradigm-ce" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnused common-updater-scripts + + set -eu -o pipefail + + version = "$(curl -Ls -o /dev/null -w %{url_effective} https://www.visual-paradigm.com/downloads/vpce/checksum.html | sed -E 's#.*/vpce([0-9]+\.[0-9]+)/([0-9]+)/.*#\1.\2#')" + + update-source-version visual-paradigm-ce "$version" + ''; + nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/by-name/vu/vulkan-caps-viewer/Fix-darwin-metal-layer.patch b/pkgs/by-name/vu/vulkan-caps-viewer/Fix-darwin-metal-layer.patch new file mode 100644 index 000000000000..fd59563a9b08 --- /dev/null +++ b/pkgs/by-name/vu/vulkan-caps-viewer/Fix-darwin-metal-layer.patch @@ -0,0 +1,17 @@ +diff --git a/appleutils.mm b/appleutils.mm +index 52058b5..afc568f 100644 +--- a/appleutils.mm ++++ b/appleutils.mm +@@ -45,7 +45,11 @@ extern "C" void *makeViewMetalCompatible(void* handle) + NSView* view = (__bridge NSView*)handle; + assert([view isKindOfClass:[NSView class]]); + +- void *pLayer = (__bridge void *)view.layer; ++ // In Qt 6.10+, the window has an intermediate QContainerLayer in which ++ // the actual Metal CALayer is nested. ++ // https://github.com/qt/qtbase/commit/0bdbf4688e4265a1ddf42efbe4c780770809d365 ++ id containerLayer = view.layer; ++ void *pLayer = (__bridge void*)[containerLayer contentLayer]; + return pLayer; + #endif + } diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/by-name/vu/vulkan-caps-viewer/package.nix similarity index 50% rename from pkgs/tools/graphics/vulkan-caps-viewer/default.nix rename to pkgs/by-name/vu/vulkan-caps-viewer/package.nix index bfaf01b1620e..97aa395e7692 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/by-name/vu/vulkan-caps-viewer/package.nix @@ -2,48 +2,73 @@ lib, stdenv, fetchFromGitHub, - qmake, + qt6, vulkan-loader, wayland, - wrapQtAppsHook, + xcbuild, + + waylandSupport ? lib.meta.availableOn stdenv.hostPlatform wayland, x11Support ? !stdenv.hostPlatform.isDarwin, - qtx11extras, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vulkan-caps-viewer"; - version = "4.03"; + version = "4.11"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; - rev = version; - hash = "sha256-LaZdQ5w7QYaD3Nxl9ML30kGws8Yyr3c0jzO3ElUvJ/I="; + tag = finalAttrs.version; + hash = "sha256-Vc4zK1Kurirp+xK7A2D3CC4veJSghE9mS7YzRA3CnHM="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. fetchSubmodules = true; }; + patches = [ + # In Qt 6.10+, the path of the Metal layer has changed. + # Without this patch, the application fails to launch on darwin. + # Upstream PR: https://github.com/SaschaWillems/VulkanCapsViewer/pull/270 + ./Fix-darwin-metal-layer.patch + ]; + + postPatch = '' + # These paths are appended to the install target, so we strip the /usr/ prefix + substituteInPlace vulkanCapsViewer.pro \ + --replace-fail '/usr/' '/' \ + --replace-fail '$(VULKAN_SDK)/lib/libvulkan.dylib' '${lib.getLib vulkan-loader}/lib/libvulkan.dylib' + ''; + nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt6.qmake + qt6.wrapQtAppsHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild ]; buildInputs = [ vulkan-loader ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [ wayland ] - ++ lib.lists.optionals x11Support [ qtx11extras ]; - - patchPhase = '' - substituteInPlace vulkanCapsViewer.pro \ - --replace-fail '/usr/' "/" \ - --replace-fail '$(VULKAN_SDK)/lib/libvulkan.dylib' '${lib.getLib vulkan-loader}/lib/libvulkan.dylib' - ''; + ++ lib.optionals waylandSupport [ + wayland + ]; qmakeFlags = [ "CONFIG+=release" + ] + # The README incorrectly states that these should not be defined simultaneously. + # Enabling both WAYLAND and X11 at the same time doesn't cause any issues + # and is actually required to automatically fallback to the X11 surface test + # when no Wayland display is available. + # These two variables only control the surface presentation tests for the + # queue families of a GPU and are not related to how the Qt application is rendered. + ++ lib.optionals waylandSupport [ + "DEFINES+=WAYLAND" + ] + ++ lib.optionals x11Support [ + "DEFINES+=X11" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; @@ -62,8 +87,11 @@ stdenv.mkDerivation rec { ''; homepage = "https://vulkan.gpuinfo.org/"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ pedrohlc ]; - changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ + pedrohlc + niklaskorz + ]; + changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 4fe5afe4f9d3..a265c5ae7384 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -44,18 +44,21 @@ let { aarch64-darwin = any-darwin; x86_64-darwin = any-darwin; + # use https://web.archive.org/save to archive the Linux versions + # add `if_` at the end of timestamps to avoid toolbar insertion + # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine aarch64-linux = { - version = "4.1.0.13"; + version = "4.1.1.4"; src = fetchurl { - url = "https://web.archive.org/web/20251209092116if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; - hash = "sha256-/d5crM6IGd0k0fSlBSQx4TpIVX/8iib+an0VMkWMNdw="; + url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; + hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo="; }; }; x86_64-linux = { - version = "4.1.0.13"; + version = "4.1.1.4"; src = fetchurl { - url = "https://web.archive.org/web/20251219062558if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; - hash = "sha256-+r5Ebu40GVGG2m2lmCFQ/JkiDsN/u7XEtnLrB98602w="; + url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; + hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8="; }; }; }; diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 68c843866a17..744cc737fd99 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wit-bindgen"; - version = "0.53.1"; + version = "0.54.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${finalAttrs.version}"; - hash = "sha256-TAM3d3Pg6UhfkqnTCtRuXDnjydCevAXedsOYdjYgvwc="; + hash = "sha256-hVdQoqQfrVjxwSdpwwxpJApwURp74CSPYFt170RuxWk="; }; - cargoHash = "sha256-KHggzHa39Oaz2RyEWQDna9KfXtWiVmOd3YYEftylcMQ="; + cargoHash = "sha256-ENWHRF+74kpIhdY8A+LDHRJy1hTQO+l5vvmVPsKYdlY="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index a7b3d12f4c67..4d05e75d0b37 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wttrbar"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; tag = finalAttrs.version; - hash = "sha256-tOsyPBpZaotlwzV1atW9FnfFbemtR3v51cg7UFIwI6U="; + hash = "sha256-AgNWz8GiJKyfhvv6+8NZPMcaxPNaufw/k/yVVLoJl7U="; }; - cargoHash = "sha256-C1PkpKYsb62s6H4VgRSo7WzHFBaUv1Yk6IXm9ep20p8="; + cargoHash = "sha256-ZDP9EEQiW57O/Pgjja1/4cb513naymx6quSRLgCpphM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix index 87ef4af2c23c..f5f7f07d7a99 100644 --- a/pkgs/by-name/ya/yaookctl/package.nix +++ b/pkgs/by-name/ya/yaookctl/package.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication { pname = "yaookctl"; - version = "0-unstable-2026-02-25"; + version = "0-unstable-2026-03-11"; src = fetchFromGitLab { owner = "yaook"; repo = "yaookctl"; - rev = "60758d872c6444a840de1263f94418ddc91a7005"; - hash = "sha256-f9pIY0/Be0zBb0flTT16e/4HzMwiJb557FqyMW9Q0rc="; + rev = "710b87f607a0ac9416367eed65f96965c9816cd5"; + hash = "sha256-kDFnFl1/CuLcW080EbtpBd55QOj2qgcKkW4iiXS/2+U="; }; pyproject = true; diff --git a/pkgs/by-name/ya/yascreen/package.nix b/pkgs/by-name/ya/yascreen/package.nix index 548e1c008e15..67483c4b6f1a 100644 --- a/pkgs/by-name/ya/yascreen/package.nix +++ b/pkgs/by-name/ya/yascreen/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yascreen"; - version = "2.06"; + version = "2.11"; src = fetchFromGitHub { owner = "bbonev"; repo = "yascreen"; tag = "v${finalAttrs.version}"; - hash = "sha256-CIeWghtOnuQmEMwIpC1Xo1zLsuV4c0V7YAXTqUAzX1g="; + hash = "sha256-SkJPq1xeC2XU8zP9uPdXECotgvG4siKvvHfi7z0APio="; }; nativeBuildInputs = [ go-md2man ]; diff --git a/pkgs/by-name/ys/ysfx/package.nix b/pkgs/by-name/ys/ysfx/package.nix index 1b220e0eac10..edeacea28146 100644 --- a/pkgs/by-name/ys/ysfx/package.nix +++ b/pkgs/by-name/ys/ysfx/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ysfx"; - version = "0-unstable-2022-07-31"; + version = "0-unstable-2026-03-13"; src = fetchFromGitHub { - owner = "jpcima"; + owner = "JoepVanlier"; repo = "ysfx"; - rev = "8077347ccf4115567aed81400281dca57acbb0cc"; - hash = "sha256-pObuOb/PA9WkKB2FdMDCOd9TKmML+Sj2MybLP0YwT+8="; + rev = "370c91915b0f26f5051705620b0712d06753bd41"; + hash = "sha256-9PFBDUOvLCQcZvL8TsG8MVZYzdHsaKK/Pb7S5A1dJBE="; }; # Provide latest dr_libs. @@ -33,9 +33,20 @@ stdenv.mkDerivation rec { hash = "sha256-rWabyCP47vd+EfibBWy6iQY/nFN/OXPNhkuOTSboJaU="; }; + # Provide latest clap-juce-extensions. + clap-juce-extensions = fetchFromGitHub { + fetchSubmodules = true; + owner = "free-audio"; + repo = "clap-juce-extensions"; + rev = "e1f67893cc409a40c1154fa2e78c97046da24ce0"; + hash = "sha256-JHHK9GcW0CUgUbDZeOavNRKOaAI+9pECVo9UfksPnLg="; + }; + prePatch = '' rmdir thirdparty/dr_libs ln -s ${dr_libs} thirdparty/dr_libs + rmdir thirdparty/clap-juce-extensions + ln -s ${clap-juce-extensions} thirdparty/clap-juce-extensions ''; nativeBuildInputs = [ @@ -64,15 +75,16 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cp -r ysfx_plugin_artefacts/Release/VST3 $out/lib/vst3 + cp -r ysfx_plugin_artefacts/Release/CLAP $out/lib/clap runHook postInstall ''; meta = { description = "Hosting library for JSFX"; - homepage = "https://github.com/jpcima/ysfx"; + homepage = "https://github.com/JoepVanlier/ysfx"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ lib.maintainers.bitbloxhub ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix index 8ff433db8ad7..427ce1f41f95 100644 --- a/pkgs/by-name/za/zarf/package.nix +++ b/pkgs/by-name/za/zarf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "zarf"; - version = "0.73.0"; + version = "0.73.1"; src = fetchFromGitHub { owner = "zarf-dev"; repo = "zarf"; tag = "v${finalAttrs.version}"; - hash = "sha256-zl33nIUsThq1+uuT7C6OVkoICsQwx+RM8xGqZQt8Tm8="; + hash = "sha256-vXvq4uzDzv9xCxIwv8GMaIfNUe0Df8qtEs9ZjCqtmBA="; }; - vendorHash = "sha256-K8natFIvEomIcPTu73NsMWbN8D0qzWqLTLGjHrLSaK0="; + vendorHash = "sha256-xjX96ZCRhLCtLffu1YHvhh4c79y9ZGp8jURNf00rM28="; proxyVendor = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zeroclaw/package.nix b/pkgs/by-name/ze/zeroclaw/package.nix index 454cf0b435ca..8a93ac25e7c6 100644 --- a/pkgs/by-name/ze/zeroclaw/package.nix +++ b/pkgs/by-name/ze/zeroclaw/package.nix @@ -14,25 +14,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zeroclaw"; - version = "0.1.8"; + version = "0.3.2"; src = fetchFromGitHub { owner = "zeroclaw-labs"; repo = "zeroclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-6EVUk+wp3Rjhk/q2htXq41TMD+rGFO0nJbVWNbLWj5U="; + hash = "sha256-4AcWGEnSXdFmq4Fn/ecMrDVoUxSRYxqwiLQ3pcfCKv8="; }; postPatch = let - zeroclaw-web = callPackage ./zeroclaw-web { inherit (finalAttrs) version; }; + zeroclaw-web = callPackage ./zeroclaw-web { inherit (finalAttrs) src version; }; in '' mkdir -p web ln -s ${zeroclaw-web} web/dist ''; - cargoHash = "sha256-pJbWbqbvO2CF0jKhfD8VK9z+Gn9vY1UR4OV+XMt1n80="; + cargoHash = "sha256-NDE+OuYVs9j/wl+nK9hmAEPTbfF6ZOKkANhb+C+dAns="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix b/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix index 0eccd8c67b49..559460b0974c 100644 --- a/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix +++ b/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix @@ -1,23 +1,16 @@ { - fetchFromGitHub, buildNpmPackage, + src, version, ... }: buildNpmPackage (finalAttrs: { pname = "zeroclaw-web"; - inherit version; - - src = fetchFromGitHub { - owner = "zeroclaw-labs"; - repo = "zeroclaw"; - tag = "v${finalAttrs.version}"; - hash = "sha256-D4/2h7TlOwAU4tl1xcdULRfO21KmP+zLlqQ8DzLqnjQ="; - }; + inherit src version; sourceRoot = "${finalAttrs.src.name}/web"; - npmDepsHash = "sha256-H3extDaq4DgNYTUcw57gqwVWc3aPCWjIJEVYRMzdFdM="; + npmDepsHash = "sha256-4+raDJ7+w+RpdeZs2PJL10IWzfoT5B3EpOxsLUnlrRc="; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index ac09a23bd3b1..877ea5379d04 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -3,10 +3,14 @@ stdenv, fetchFromGitHub, rustPlatform, + runCommandLocal, withFzf ? true, fzf, installShellFiles, libiconv, + testers, + nushell, + zoxide, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -31,6 +35,28 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-4BXZ5NnwY2izzJFkPkECKvpuyFWfZ2CguybDDk0GDU0="; + passthru = { + tests = { + version = testers.testVersion { + package = zoxide; + }; + nushell-integration = + runCommandLocal "test-${zoxide.name}-nushell-integration" + { + nativeBuildInputs = [ + nushell + zoxide + ]; + meta.platforms = nushell.meta.platforms; + } + '' + mkdir $out + nu -c "zoxide init nushell | save zoxide.nu" + nu -c "source zoxide.nu" + ''; + }; + }; + postInstall = '' installManPage man/man*/* installShellCompletion --cmd zoxide \ diff --git a/pkgs/by-name/zs/zsign/package.nix b/pkgs/by-name/zs/zsign/package.nix index fb76fb5a4982..9c54ff4ea46c 100644 --- a/pkgs/by-name/zs/zsign/package.nix +++ b/pkgs/by-name/zs/zsign/package.nix @@ -5,6 +5,7 @@ openssl, pkg-config, minizip, + nix-update-script, zlib, versionCheckHook, }: @@ -13,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zsign"; - version = "0.7"; + version = "0.9.6"; src = fetchFromGitHub { owner = "zhlynn"; repo = "zsign"; tag = "v${finalAttrs.version}"; - hash = "sha256-CAG9ewROyIGN5VOZbs0X1W88HdZ3H1sxaRJ7JpDbw3o="; + hash = "sha256-e4k3W+FkdydqPy3DuhH6MbC+IilLZfqOb7FAbIiv/kM="; }; sourceRoot = "${finalAttrs.src.name}/build/${platformName}"; @@ -50,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Cross-platform codesign alternative for iOS 12+"; homepage = "https://github.com/zhlynn/zsign"; diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix index f75d7baa5b55..6c1700919d66 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix @@ -1,22 +1,18 @@ # Generated by update.sh script { - "version" = "25.0.1"; + "version" = "25.0.2"; "hashes" = { + "aarch64-darwin" = { + sha256 = "0dqlg95762j8b375lnvsy0hrrxwzap61mxn8cy9z7r2kgwn84sdq"; + url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.2/graaljs-community-25.0.2-macos-aarch64.tar.gz"; + }; "aarch64-linux" = { - sha256 = "0222y7brl8yfx6lwl64a0l0apn0ixg9svfvvkv51hy52k2syj71z"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graaljs-community-25.0.1-linux-aarch64.tar.gz"; + sha256 = "1wl9i9m18p0nc5lpg2idfplyqrfy10m41x6nn8gawhmzp2l7f35p"; + url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.2/graaljs-community-25.0.2-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0g165jicbk6hi47kpl0xd0x8y2j00kicf4p67xjcq2f8hqfvxc8l"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graaljs-community-25.0.1-linux-amd64.tar.gz"; - }; - "x86_64-darwin" = { - sha256 = "1z612lkxh90f8al4j6lbg1n3lycyfnkfrqi5qhzky195xg5hfknh"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graaljs-community-25.0.1-macos-amd64.tar.gz"; - }; - "aarch64-darwin" = { - sha256 = "0909x327m65qv5fmrk5i8adhahr92cbjypfman47b0sz4kyc00sq"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graaljs-community-25.0.1-macos-aarch64.tar.gz"; + sha256 = "092jgg2qadv4v06f6wqg9smxrid0wrhyr45b8km420ay345wjd1s"; + url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.2/graaljs-community-25.0.2-linux-amd64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix index c97fd610485f..3dbc6b24a954 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix @@ -1,22 +1,18 @@ # Generated by update.sh script { - "version" = "25.0.1"; + "version" = "25.0.2"; "hashes" = { + "aarch64-darwin" = { + sha256 = "0vndj84rsscw78wl0a140gxx686c78zqcjnl3wq3xdqfz7w3jf9d"; + url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.2/graalnodejs-community-25.0.2-macos-aarch64.tar.gz"; + }; "aarch64-linux" = { - sha256 = "14gz8b6z00b85r5ff0c761mgsg2bg42b10dfyi275bcaxl7bf0yx"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graalnodejs-community-25.0.1-linux-aarch64.tar.gz"; + sha256 = "0wq0iy5c1dnywlnq4lzbr1qas2ns5l8ag3bqirvdik4x66an8819"; + url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.2/graalnodejs-community-25.0.2-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "003y0adq96m7j4pzkiaxxvlpchdfp4aprdwmsy2qzcm19a75ddpf"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graalnodejs-community-25.0.1-linux-amd64.tar.gz"; - }; - "x86_64-darwin" = { - sha256 = "1z96245r8fgrgqvwkqmb14zxagjiwbc4ax2kky2dqic25apr1hx5"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graalnodejs-community-25.0.1-macos-amd64.tar.gz"; - }; - "aarch64-darwin" = { - sha256 = "0203invnb6m0rh0dr886i5hsyljzbmfywgbssz844nllfiv272jw"; - url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.1/graalnodejs-community-25.0.1-macos-aarch64.tar.gz"; + sha256 = "1d5y05isnbwh88gsqary8bvkyi0ca7mv6qm2cqh020jlpxwzczzp"; + url = "https://github.com/oracle/graaljs/releases/download/graal-25.0.2/graalnodejs-community-25.0.2-linux-amd64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index cfb80134356d..2eecf5d5f04e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -1,22 +1,18 @@ # Generated by update.sh script { - "version" = "25.0.1"; + "version" = "25.0.2"; "hashes" = { + "aarch64-darwin" = { + sha256 = "05ymx4fbaj8ipzv6d0ycacv1qyfzxl2hrr1zbiyk4hjdycbyyjy6"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.2/graalpy-community-25.0.2-macos-aarch64.tar.gz"; + }; "aarch64-linux" = { - sha256 = "1r9x67qjhw19zz6lyhbilpfc34ffjjr169qavlgb49bf5s9mz89f"; - url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.1/graalpy-community-25.0.1-linux-aarch64.tar.gz"; + sha256 = "02fisn48xlykr7r8cdd95wmj8ryj9dabg1i8bkg5ri37m3gbkxwq"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.2/graalpy-community-25.0.2-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0cldr1q1m31p57s3z4y1zs7jg567vxcix1c1mpp096rsw7ilkh2s"; - url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.1/graalpy-community-25.0.1-linux-amd64.tar.gz"; - }; - "x86_64-darwin" = { - sha256 = "0jr9wl81lj8p933cvp2dqdbc9kx8xm1h22xf8vkps265lzq4v0zp"; - url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.1/graalpy-community-25.0.1-macos-amd64.tar.gz"; - }; - "aarch64-darwin" = { - sha256 = "1jghcm5d6k2avh28l2c5xrqp6dd7i890c3nmkl440qj5byvib6zq"; - url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.1/graalpy-community-25.0.1-macos-aarch64.tar.gz"; + sha256 = "0yfcsha5sq06v8hrrp1zp043qc20582j320fg2qbl0dpq09nzf4d"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.2/graalpy-community-25.0.2-linux-amd64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 1e449683ac9a..a7a9c2308f9f 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,18 @@ # Generated by update.sh script { - "version" = "25.0.1"; + "version" = "25.0.2"; "hashes" = { + "aarch64-darwin" = { + sha256 = "0pv3c49va6vyvx2lzj305ss39mkaddx8fmfrafifflz6x2w1y82h"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_macos-aarch64_bin.tar.gz"; + }; "aarch64-linux" = { - sha256 = "1qlazj9k18f1rgg12s12yav3n4mx7lwphmh2qqvpzrl0ba9vk83s"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.1/graalvm-community-jdk-25.0.1_linux-aarch64_bin.tar.gz"; + sha256 = "0waa7395f53lrg2my43ywr8bj7aczwc8prap2wx4n2ix4aghsn5l"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "1yy7pb40cqaaj8xyk9lglnixqi5mx5xvgqz4ld1bha3zm3hrzqq1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.1/graalvm-community-jdk-25.0.1_linux-x64_bin.tar.gz"; - }; - "x86_64-darwin" = { - sha256 = "0c7c3asbmc5fvdh2l3fa5w8d8sw0142cfzi7pnnkny0wrns9bn53"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.1/graalvm-community-jdk-25.0.1_macos-x64_bin.tar.gz"; - }; - "aarch64-darwin" = { - sha256 = "0xmwsl8yzivnksbzhihy39vffi3k1x0ak4c4aihw3dca9br3jqq6"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.1/graalvm-community-jdk-25.0.1_macos-aarch64_bin.tar.gz"; + sha256 = "1w3ac0cl9d2ja98klyq5f1hp6j9ixx7q5jx0n2v06kfsiwf7kgp0"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_linux-x64_bin.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 65d36514bcd0..b499659965c8 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -43,7 +43,7 @@ declare -r -A update_urls=( [truffleruby]="https://api.github.com/repos/oracle/truffleruby/releases/latest" ) -current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A "graalvmCEPackages.${product}.version" --json | jq -r)" +current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A "graalvmPackages.${product}.version" --json | jq -r)" readonly current_version if [[ -z "${VERSION:-}" ]]; then diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 32daa28bbe57..4dd2e20ca4c8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,9 +28,9 @@ let "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; "22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU="; "23.0.0-git".gitRelease = { - rev = "0704b68a027a84863bbdc654df1e2989b4de3ab7"; - rev-version = "23.0.0-unstable-2026-03-02"; - sha256 = "sha256-kOA9DNn3v/LOwrY/cMag3FLeRGdVBnZQoYtw4EwocoU="; + rev = "696e82db339ce6dc907378bd977ec7857cc892e9"; + rev-version = "23.0.0-unstable-2026-03-15"; + sha256 = "sha256-rX5GMsPJcKLkePHryT+Ru3X0S6BzM71uRoKT1ftmnO4="; }; } // llvmVersions; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index ca6a5fd2d849..8debce1f98c2 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rakudo"; - version = "2025.12"; + version = "2026.02"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "rakudo"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-rCLlLxFexk2fzuuSMrJjbwhgU+HgJNX6Ect6uCsuJmo="; + hash = "sha256-CqDZ+izOHNxi7sTt6jYqeF/ql5+2WdWBHvkS3N4JjNc="; }; postPatch = '' diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 3507e52a10ac..81b9c8be8c33 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "moarvm"; - version = "2025.12"; + version = "2026.02"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "MoarVM"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-hftskJ+5p/XHahAJTG28ifWkExb8Z8u7J5CeoQooUYE="; + hash = "sha256-vxEtNiQH7XQ3gDlETJsjsSZ2cVJrjFb5TtoNKVB8F0U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index d688bb5f93c9..0cb4d508e641 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nqp"; - version = "2025.12"; + version = "2026.02"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "nqp"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Ofu6mf2Vx7a1OrqWLnVvgnChWHFK+cSr803VZY2TYC8="; + hash = "sha256-zEnUbVLrWCkRq28L6LFc7ryEZS6tFMy8sGnVlDTwkj8="; }; configureScript = "${lib.getExe perl} ./Configure.pl"; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 43a54152f3da..4c701d85148a 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -10,4 +10,9 @@ in version = "9.5.2"; sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk="; }; + + vtk_9_6 = mkVtk { + version = "9.6.0"; + sourceSha256 = "sha256-130YBpT6r9yBZXi5pTZR9nkOeZYVgRv7uRAYZho7uPI="; + }; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 4ee650fb3a38..1fb35db46b36 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -39,6 +39,7 @@ # filters openturns, openslide, + onnxruntime, # io modules cgns, @@ -65,6 +66,7 @@ hdf5, netcdf, opencascade-occt, + openusd, # threading onetbb, @@ -113,6 +115,9 @@ let viskores = self.callPackage viskores.override { }; gdal = self.callPackage gdal.override { useMinimalFeatures = true; }; pdal = self.callPackage pdal.override { }; + # vtk fail to configure with openusd with materialX support + # see https://github.com/AcademySoftwareFoundation/MaterialX/pull/2752 + openusd = openusd.override { withMaterialX = false; }; }); vtkBool = feature: bool: lib.cmakeFeature feature "${if bool then "YES" else "NO"}"; in @@ -155,6 +160,10 @@ stdenv.mkDerivation (finalAttrs: { vtkPackages.gdal vtkPackages.pdal ] + ++ lib.optionals (lib.versionAtLeast finalAttrs.version "9.6.0") [ + vtkPackages.openusd + onnxruntime + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxfixes libxrender @@ -169,7 +178,11 @@ stdenv.mkDerivation (finalAttrs: { eigen boost verdict + ] + ++ lib.optionals (lib.versionOlder finalAttrs.version "9.6.0") [ double-conversion + ] + ++ [ freetype lz4 xz diff --git a/pkgs/development/python-modules/ai-edge-litert/release.json b/pkgs/development/python-modules/ai-edge-litert/release.json index ba9bdbe2b860..1150be93a675 100644 --- a/pkgs/development/python-modules/ai-edge-litert/release.json +++ b/pkgs/development/python-modules/ai-edge-litert/release.json @@ -1,58 +1,58 @@ { - "version": "2.1.2", + "version": "2.1.3", "src": { "aarch64-darwin": { "3.10": { - "url": "https://files.pythonhosted.org/packages/6c/a5/0fbc63f8e076008481bc21af0d5085501555757194c7c1daaf2542cd7a82/ai_edge_litert-2.1.2-cp310-cp310-macosx_12_0_arm64.whl", - "hash": "sha256-Cn3V07eHS6ZqOCsmG//io9nvdyuEH0eqvtCYLWAl4OU=" + "url": "https://files.pythonhosted.org/packages/e9/23/566fd9cb3ea67291d89635f068f99e4f93ce8514f12424fc4c88d4e9c61c/ai_edge_litert-2.1.3-cp310-cp310-macosx_12_0_arm64.whl", + "hash": "sha256-IbmtZwXWrigtun07rHxbEWuHyCVJqzyAjDilc7mAz3c=" }, "3.11": { - "url": "https://files.pythonhosted.org/packages/dd/f9/ba44382f353a2b845e9b6242750a7d56b0054ab6c6bcf53d20823bae58e4/ai_edge_litert-2.1.2-cp311-cp311-macosx_12_0_arm64.whl", - "hash": "sha256-B8P0QiEt4YWd3bzVH/kPL8swSNlAob3b1vE7BOWnkIM=" + "url": "https://files.pythonhosted.org/packages/30/46/528963117c883d4ca4e4dcdf2f01da8cddc833378bce330240f59a7057e4/ai_edge_litert-2.1.3-cp311-cp311-macosx_12_0_arm64.whl", + "hash": "sha256-0/EABqnywXWnhD+dGpMpkNonPWYA2s0JhQyRWMNLl8c=" }, "3.12": { - "url": "https://files.pythonhosted.org/packages/6d/59/5f65a091340c6abf26c66a11fc0c8ecbd264e93ad7293aaf1f1b6892cc00/ai_edge_litert-2.1.2-cp312-cp312-macosx_12_0_arm64.whl", - "hash": "sha256-IMljV6fGFgDn7JSowTH+5MCplBMuXm5DbHx+k9PzGyI=" + "url": "https://files.pythonhosted.org/packages/aa/61/3e2ab90ed658d32246e3433157f1a9d45ff657e7425aecc89d84d7ea1dd2/ai_edge_litert-2.1.3-cp312-cp312-macosx_12_0_arm64.whl", + "hash": "sha256-lQhhsTAAPH7w/MkySPmF7lA64gKOa+9Sm9WOH09W2+o=" }, "3.13": { - "url": "https://files.pythonhosted.org/packages/a0/c3/c004708dc361609e76788e2e0a46f598bb523fc301144e483121818f8798/ai_edge_litert-2.1.2-cp313-cp313-macosx_12_0_arm64.whl", - "hash": "sha256-U7xyFjinSb38D1vOkCMT7GmHHgUQiTtWPuc/GaFatpA=" + "url": "https://files.pythonhosted.org/packages/73/b2/c3820149ed1c97c362c7445008782210a49bb318b6575952449eb5c5dd39/ai_edge_litert-2.1.3-cp313-cp313-macosx_12_0_arm64.whl", + "hash": "sha256-vyP73WkZTL/H8Uq7eu4cOTNQfb9SWmv9mFmScCZ6EW0=" } }, "aarch64-linux": { "3.10": { - "url": "https://files.pythonhosted.org/packages/3e/50/c55cc44c71fce9ef9a567928cdb80f03719b4c5b8309cceb8fad8f549e52/ai_edge_litert-2.1.2-cp310-cp310-manylinux_2_27_aarch64.whl", - "hash": "sha256-FkQ1vHqzQmsMI/RzK9Ti649J093hMkkB3KXXScxlqck=" + "url": "https://files.pythonhosted.org/packages/6e/45/c89f041acb2c60d667acf8deaa137e35a6ddf9a5151829f12f835e0c6b24/ai_edge_litert-2.1.3-cp310-cp310-manylinux_2_27_aarch64.whl", + "hash": "sha256-ENq3vH8mhib5ZDhDzMK7uSXUgMTJ6bYg1zmMHcO7cn0=" }, "3.11": { - "url": "https://files.pythonhosted.org/packages/ee/5a/57d9b8967fa5a2f3055ad3e7666446c8d2271446319e7f17c897b151544c/ai_edge_litert-2.1.2-cp311-cp311-manylinux_2_27_aarch64.whl", - "hash": "sha256-fcSvxLZ3l+d9h541rVWOYPdGvnweYWpmU70svx/++a0=" + "url": "https://files.pythonhosted.org/packages/63/85/49534037b187156960f966279506bbb65b67542e86d5a0382976d1b37998/ai_edge_litert-2.1.3-cp311-cp311-manylinux_2_27_aarch64.whl", + "hash": "sha256-b1SWcnoWhQ2r0hs+1oYMOm0KH6xUA/9I1boarfPs7QY=" }, "3.12": { - "url": "https://files.pythonhosted.org/packages/7e/36/8ff07084091272db4df8de3859149be3913a6eaf2939575bb4200379b808/ai_edge_litert-2.1.2-cp312-cp312-manylinux_2_27_aarch64.whl", - "hash": "sha256-G0EjaJgLQEqgUdCUBavUc9OhUTDbAwk40mlm8aHnxBM=" + "url": "https://files.pythonhosted.org/packages/e1/d3/0d7eae29fe0742f5a496a90ae38d67236764b1f85fa6e5a22452d7d28cc3/ai_edge_litert-2.1.3-cp312-cp312-manylinux_2_27_aarch64.whl", + "hash": "sha256-s5G5ZqkUDxrJTL5KKonacyp69FnrnYC7k4h0L8JJGLE=" }, "3.13": { - "url": "https://files.pythonhosted.org/packages/b8/ed/6763310cb4ea2d2e6cc61184127467e4c277ebbb8c49130eb3dfc6c1bb5c/ai_edge_litert-2.1.2-cp313-cp313-manylinux_2_27_aarch64.whl", - "hash": "sha256-bXYO9Rxy9Wswf6bxZ1pi+HClRlFbHaDA8oLKFf8YNsU=" + "url": "https://files.pythonhosted.org/packages/d2/db/f0d3c7e98231f5b0c6bf161dbe936e92e2b8ae1219de50f44a233d01c3f6/ai_edge_litert-2.1.3-cp313-cp313-manylinux_2_27_aarch64.whl", + "hash": "sha256-TslvnZvGMbzNc/MrSwPLmUcM2tOoqN3Dlop9CEFXZoo=" } }, "x86_64-linux": { "3.10": { - "url": "https://files.pythonhosted.org/packages/c6/35/52fae12e74e9ee8c8e4e6a99cf478f3379e10a0a272e717b7915e2fa8922/ai_edge_litert-2.1.2-cp310-cp310-manylinux_2_27_x86_64.whl", - "hash": "sha256-5UyKkAbMvkNaG0zZGVP/yb6kHkLXvohsqAo/MZLN0ww=" + "url": "https://files.pythonhosted.org/packages/94/3b/00d20f07e83ebf93c4e6609cf03158ae69c9a28ba43c0e164079c05487f9/ai_edge_litert-2.1.3-cp310-cp310-manylinux_2_27_x86_64.whl", + "hash": "sha256-m9JldcNTVTG7oNVxKtxpXxGKyc0CKvimsxzx9HI7U8k=" }, "3.11": { - "url": "https://files.pythonhosted.org/packages/6a/a8/c8024c9657a76e3589cf2b8b21cbccdef0b9a64b74d98eebcabbbdfaeb7a/ai_edge_litert-2.1.2-cp311-cp311-manylinux_2_27_x86_64.whl", - "hash": "sha256-s/87Et9F38VAk04zvemvR0sLTBLDu2ESslGqrk0pMKA=" + "url": "https://files.pythonhosted.org/packages/86/0b/03ba13900d5efc90c9a52c0e583b80e75359b61f98d9f585dc67f665f784/ai_edge_litert-2.1.3-cp311-cp311-manylinux_2_27_x86_64.whl", + "hash": "sha256-j0aujUodle5bhtlOO4+rYjuCYf7CUF6Z50tR2EHIQ28=" }, "3.12": { - "url": "https://files.pythonhosted.org/packages/0f/05/072e76dfa2bfd6aa4c5751f1b6d5ad11f74bba70177ad4c973b49678d4c2/ai_edge_litert-2.1.2-cp312-cp312-manylinux_2_27_x86_64.whl", - "hash": "sha256-Z9tt58cpu+WjHCCtxXPOR7iqbqS2vP7gq3f/GlHiDy4=" + "url": "https://files.pythonhosted.org/packages/a9/c7/3ec3a47ebcf4986077e0fb8aa30d3408b53c2b614e0b557914db9106f7f1/ai_edge_litert-2.1.3-cp312-cp312-manylinux_2_27_x86_64.whl", + "hash": "sha256-1MI039+h6ZZwUH34XpdgG76TW/WKCtO9EiEHf6nc51E=" }, "3.13": { - "url": "https://files.pythonhosted.org/packages/68/a3/e2bd759dc0fd3895b778b0480e6cae37bf5d4e50b611cb6a16d598992d02/ai_edge_litert-2.1.2-cp313-cp313-manylinux_2_27_x86_64.whl", - "hash": "sha256-vPlqDivXgbThJxVeOvM4BhdxnqidQbZfwhDRA53PpQ4=" + "url": "https://files.pythonhosted.org/packages/c2/6e/162314aff6229d6c1e15600b4d3f6b428011b946d7e818ed22c654915373/ai_edge_litert-2.1.3-cp313-cp313-manylinux_2_27_x86_64.whl", + "hash": "sha256-TITn8w2kASdEArnTLKLoxsBS7VV5LkPu4g0+ic1kkjI=" } } } diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix deleted file mode 100644 index 240fa2e6cb94..000000000000 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - attrs, - bidict, - bitstruct, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - more-itertools, - pendulum, - poetry-core, - pprintpp, - tbm-utils, -}: - -buildPythonPackage rec { - pname = "audio-metadata"; - version = "0.11.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "thebigmunch"; - repo = "audio-metadata"; - tag = version; - hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg="; - }; - - patches = [ - # Switch to poetry-core, https://github.com/thebigmunch/audio-metadata/pull/41 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/thebigmunch/audio-metadata/commit/dfe91a69ee37e9dcefb692165eb0f9cd36a7e5b8.patch"; - hash = "sha256-ut3mqgZQu0YFbsTEA13Ch0+aSNl17ndMV0fuIu3n5tc="; - }) - ]; - - pythonRelaxDeps = [ - "attrs" - "more-itertools" - "pendulum" - ]; - - build-system = [ poetry-core ]; - - dependencies = [ - attrs - bidict - bitstruct - more-itertools - pendulum - pprintpp - tbm-utils - ]; - - # Tests require ward which is not ready to be used - doCheck = false; - - pythonImportsCheck = [ "audio_metadata" ]; - - meta = { - description = "Library for handling the metadata from audio files"; - homepage = "https://github.com/thebigmunch/audio-metadata"; - changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix index b7f7e416aa11..a483b927ef28 100644 --- a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix +++ b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bgutil-ytdlp-pot-provider"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Brainicism"; repo = "bgutil-ytdlp-pot-provider"; tag = version; - hash = "sha256-WPLNjfVYDbPsEMVhjuF3dVarahdIKT7pt518SePfB8A="; + hash = "sha256-dhpataQ1HSCRPnm4k3K/NMaQPQdNrx8C4q855l7kbbQ="; }; sourceRoot = "${src.name}/plugin"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 31fb11bb7007..ffb316f0f91e 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.67"; + version = "1.42.68"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-wN6+zsf6+sQbeXcGjSuw1uGdCEh7PScvzUrV1aSwRcQ="; + hash = "sha256-lq0QIHNWGUg/ubTael5pS0YL8uGPhKNNXRddD/6MRlM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix deleted file mode 100644 index c822d07d3318..000000000000 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - mock, - plotly, - requests, - retrying, - setuptools, - pytestCheckHook, -}: - -buildPythonPackage { - pname = "chart-studio"; - version = "1.1.0-unstable-2025-01-30"; - pyproject = true; - - src = fetchFromGitHub { - owner = "plotly"; - repo = "chart-studio"; - rev = "44c7c43be0fe7e031ec281c86ee7dae0efa0619e"; - hash = "sha256-RekcZzUcunIqXOSriW+RvpLdvATQWTeRAiR8LFodfQg="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - plotly - requests - retrying - ]; - - nativeCheckInputs = [ - mock - plotly - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - # most tests talk to a network service, so only run ones that don't do that. - enabledTestPaths = [ - "chart_studio/tests/test_core" - ]; - - meta = { - description = "Utilities for interfacing with Plotly's Chart Studio service"; - homepage = "https://github.com/plotly/chart-studio"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ sarahec ]; - }; -} diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index f986458855bb..c6bb903a9832 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchurl, - pythonAtLeast, # build inputs cargo, @@ -36,6 +35,7 @@ posthog, pybase64, pydantic, + pydantic-settings, pypika, pyyaml, requests, @@ -68,23 +68,19 @@ buildPythonPackage (finalAttrs: { pname = "chromadb"; - version = "1.5.2"; + version = "1.5.5"; pyproject = true; src = fetchFromGitHub { owner = "chroma-core"; repo = "chroma"; tag = finalAttrs.version; - hash = "sha256-fIlev0B1PapZAO9PgrFIfIh429lcmh/dQ9aGHSNJSLw="; + hash = "sha256-Y/M7awTi2AJTh4xRY0MIfnC9ygy62fG7X3W9QUxW2XE="; }; - # https://github.com/chroma-core/chroma/issues/5996 - # https://github.com/chroma-core/chroma/issues/6546 - disabled = pythonAtLeast "3.14"; - cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-zoyn2IBeM5FlDpA0blYU5tpu8KFXHLG/KzvQN6Hsf2I="; + hash = "sha256-yx5OMZSWRAP732lRypap79vr2I72aT+TWooo+5e0wDQ="; }; # Can't use fetchFromGitHub as the build expects a zipfile @@ -145,6 +141,7 @@ buildPythonPackage (finalAttrs: { posthog pybase64 pydantic + pydantic-settings pypika pyyaml requests @@ -250,9 +247,11 @@ buildPythonPackage (finalAttrs: { # ValueError: An instance of Chroma already exists for ephemeral with different settings "chromadb/test/test_chroma.py" - # pytest can't tell which test_schema.py to load - # https://github.com/chroma-core/chroma/issues/6031 - "chromadb/test/property/test_schema.py" + # RuntimeError: There is no current event loop in thread 'MainThread'. + # https://github.com/chroma-core/chroma/issues/6659 + "chromadb/test/test_client.py::test_http_client_with_inconsistent_host_settings[async_client]" + "chromadb/test/test_client.py::test_http_client_with_inconsistent_port_settings[async_client]" + "chromadb/test/test_client.py::test_http_client[async_client]" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index 576616aea55b..1dd61d2e9498 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { pname = "compressed-tensors"; - version = "0.14.0"; + version = "0.14.0.1"; pyproject = true; # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { owner = "neuralmagic"; repo = "compressed-tensors"; tag = finalAttrs.version; - hash = "sha256-auiVCTL4WpfaD2cwdG3kt08+nW77T/txWZP4SAW00mk="; + hash = "sha256-bncglC6qRE4D6rjoNOXRKh+7ZMSTc9zc3NVzA+NaXuE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 09900c370bdc..5b481604f95a 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "cyclopts"; - version = "4.8.0"; + version = "4.10.0"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${finalAttrs.version}"; - hash = "sha256-pup2QOn9vqi5hIM+ei+TXQ5Bo/KMxZp+BXETqpguMBI="; + hash = "sha256-wUNqysXUP0vzQBgb6EOVBh/3/bJf2Tgf5lHeNXucyPk="; }; build-system = [ diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 0ae4dce1fb7e..6c60062871df 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -59,6 +59,10 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; + disabledTestPaths = [ + "scripts/download_data.py" + ]; + pythonImportsCheck = [ "datashader" ]; meta = { @@ -67,6 +71,9 @@ buildPythonPackage rec { homepage = "https://datashader.org"; changelog = "https://github.com/holoviz/datashader/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nickcao ]; + maintainers = with lib.maintainers; [ + nickcao + locnide + ]; }; } diff --git a/pkgs/development/python-modules/django-dbbackup/default.nix b/pkgs/development/python-modules/django-dbbackup/default.nix deleted file mode 100644 index 3e9fe5a9a379..000000000000 --- a/pkgs/development/python-modules/django-dbbackup/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - buildPythonPackage, - coverage, - django, - django-storages, - fetchFromGitHub, - flake8, - gnupg, - lib, - pep8, - psycopg2, - pylint, - pytest-django, - pytestCheckHook, - python-dotenv, - python-gnupg, - pytz, - setuptools, - testfixtures, - tox, - pythonOlder, -}: -buildPythonPackage rec { - pname = "django-dbbackup"; - version = "4.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "django-dbbackup"; - repo = "django-dbbackup"; - tag = version; - hash = "sha256-w+LfU5I7swnCJpwqBqoCTRUCZjKoIxK3OC+8CrihLEI="; - }; - - disabled = pythonOlder "3.9"; - - dependencies = [ - django - python-gnupg - pytz - ]; - - build-system = [ setuptools ]; - doCheck = true; - preCheck = '' - tempDir=$(mktemp -d) - export HOME=$tempDir - export DJANGO_SETTINGS_MODULE=dbbackup.tests.settings - ''; - pythonImportsCheck = [ "dbbackup" ]; - disabledTestPaths = [ - # Specific gnupg version required, which aren't provided in upstream - "dbbackup/tests/commands/test_dbrestore.py::DbrestoreCommandRestoreBackupTest::test_decrypt" - "dbbackup/tests/test_connectors/test_base.py::BaseCommandDBConnectorTest::test_run_command_with_parent_env" - "dbbackup/tests/test_utils.py::Encrypt_FileTest::test_func" - "dbbackup/tests/test_utils.py::Compress_FileTest::test_func" - ]; - nativeCheckInputs = [ - coverage - django-storages - flake8 - gnupg - pep8 - psycopg2 - pylint - pytest-django - pytestCheckHook - python-dotenv - testfixtures - tox - ]; - - meta = with lib; { - description = "Management commands to help backup and restore your project database and media files"; - homepage = "https://github.com/Archmonger/django-dbbackup"; - changelog = "https://github.com/Archmonger/django-dbbackup/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-error-report-2/default.nix b/pkgs/development/python-modules/django-error-report-2/default.nix deleted file mode 100644 index be1803e3a798..000000000000 --- a/pkgs/development/python-modules/django-error-report-2/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - setuptools, - pythonOlder, -}: -buildPythonPackage rec { - pname = "django-error-report-2"; - version = "0.4.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "matmair"; - repo = "django-error-report-2"; - tag = version; - hash = "sha256-ZCaslqgruJxM8345/jSlZGruM+27H9hvwL0wtPkUzc0="; - }; - - disabled = pythonOlder "3.6"; - - dependencies = [ - django - ]; - - build-system = [ setuptools ]; - # There is no tests on upstream - doCheck = false; - pythonImportsCheck = [ "error_report" ]; - - meta = with lib; { - description = "Log/View Django server errors."; - homepage = "https://github.com/matmair/django-error-report-2"; - changelog = "https://github.com/matmair/django-error-report-2/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-flags/default.nix b/pkgs/development/python-modules/django-flags/default.nix deleted file mode 100644 index a239a4aa7988..000000000000 --- a/pkgs/development/python-modules/django-flags/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - buildPythonPackage, - coverage, - django, - django-debug-toolbar, - fetchFromGitHub, - jinja2, - lib, - pytest-django, - pytestCheckHook, - setuptools-scm, - setuptools, -}: -buildPythonPackage rec { - pname = "django-flags"; - version = "5.2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "cfpb"; - repo = "django-flags"; - tag = version; - hash = "sha256-4UOueNXfDouTqpLpG391zcGHTTJ8GfznYmEl33YKdv8="; - }; - - dependencies = [ - django - ]; - - build-system = [ - setuptools - setuptools-scm - ]; - doCheck = true; - preCheck = '' - export DJANGO_SETTINGS_MODULE=flags.tests.settings - ''; - pythonImportsCheck = [ "flags" ]; - nativeCheckInputs = [ - coverage - (django-debug-toolbar.overrideAttrs (old: rec { - version = "5.2.0"; - src = old.src.override { - tag = version; - hash = "sha256-/oWirfJaiHVRI1m3N1QveutX2sag8fjYqJYCZ8BnMa0="; - }; - })) - jinja2 - pytest-django - pytestCheckHook - ]; - - meta = with lib; { - description = "Feature flags for Django projects"; - homepage = "https://github.com/cfpb/django-flags"; - changelog = "https://github.com/cfpb/django-flags/releases/tag/${version}"; - license = licenses.cc0; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-ical/default.nix b/pkgs/development/python-modules/django-ical/default.nix deleted file mode 100644 index 78a74319752d..000000000000 --- a/pkgs/development/python-modules/django-ical/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - pytest-django, - pytestCheckHook, - setuptools-scm, - icalendar, - django-recurrence, - pythonOlder, -}: -buildPythonPackage rec { - pname = "django-ical"; - version = "1.9.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "jazzband"; - repo = "django-ical"; - tag = version; - hash = "sha256-DUe0loayGcUS7MTyLn+g0KBxbIY7VsaoQNHGSMbMI3U="; - }; - - disabled = pythonOlder "3.7"; - - dependencies = [ - django - django-recurrence - # Latest version didn't pass the test - (icalendar.overrideAttrs (old: rec { - version = "6.0.0"; - src = old.src.override { - tag = "v${version}"; - hash = "sha256-eWFDY/pNVfcUk3PfB0vXqh9swuSGtflUw44IMDJI+yI="; - }; - })) - ]; - - build-system = [ setuptools-scm ]; - doCheck = true; - preCheck = '' - export DJANGO_SETTINGS_MODULE=test_settings - ''; - pythonImportsCheck = [ - "icalendar" - "django_ical" - ]; - nativeCheckInputs = [ - pytest-django - pytestCheckHook - ]; - - meta = with lib; { - description = "iCal feeds for Django based on Django's syndication feed framework."; - homepage = "https://github.com/jazzband/django-ical"; - changelog = "https://github.com/jazzband/django-ical/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-mailbox/default.nix b/pkgs/development/python-modules/django-mailbox/default.nix deleted file mode 100644 index a6f397145474..000000000000 --- a/pkgs/development/python-modules/django-mailbox/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - pytest-django, - pytestCheckHook, - setuptools, - six, - pythonOlder, -}: -buildPythonPackage rec { - pname = "django-mailbox"; - version = "4.10.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "coddingtonbear"; - repo = "django-mailbox"; - tag = version; - hash = "sha256-7CBUnqveTSfdc+8x8sZUqvwYW3vKjZKfOPVWFSo4es0="; - }; - - disabled = pythonOlder "3.8"; - - dependencies = [ - django - six - ]; - - build-system = [ setuptools ]; - doCheck = true; - preCheck = '' - substituteInPlace setup.cfg --replace-fail "pytest" "tool:pytest" - export DJANGO_SETTINGS_MODULE=django_mailbox.tests.settings - ''; - pythonImportsCheck = [ "django_mailbox" ]; - nativeCheckInputs = [ - pytest-django - pytestCheckHook - ]; - - meta = with lib; { - description = "Import mail from POP3, IMAP, local email mailboxes or directly from Postfix or Exim4 into your Django application automatically."; - homepage = "https://github.com/coddingtonbear/django-mailbox"; - changelog = "https://github.com/coddingtonbear/django-mailbox/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-markdownify/default.nix b/pkgs/development/python-modules/django-markdownify/default.nix deleted file mode 100644 index 5adb99e29c1f..000000000000 --- a/pkgs/development/python-modules/django-markdownify/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - pytest-django, - pytestCheckHook, - setuptools, - markdown, - bleach, - tinycss2, -}: -buildPythonPackage rec { - pname = "django-markdownify"; - version = "0.9.6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "erwinmatijsen"; - repo = "django-markdownify"; - tag = version; - hash = "sha256-L/N0jjxBz7aQletOg+qairgq4utifPz4oqjT9AcljLI="; - }; - - dependencies = [ - django - markdown - bleach - ]; - - build-system = [ setuptools ]; - doCheck = true; - preCheck = '' - export DJANGO_SETTINGS_MODULE=markdownify.checks - ''; - nativeCheckInputs = [ - tinycss2 - pytest-django - pytestCheckHook - ]; - pythonImportsCheck = [ "markdownify" ]; - disabledTests = [ - # Test settings didn't setup DjangoTemplates - "test_markdownify_nodelist" - ]; - - meta = with lib; { - description = "Markdown template filter for Django"; - homepage = "https://github.com/erwinmatijsen/django-markdownify"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-money/default.nix b/pkgs/development/python-modules/django-money/default.nix deleted file mode 100644 index 698cab66fe54..000000000000 --- a/pkgs/development/python-modules/django-money/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - fetchFromGitHub, - buildPythonPackage, - setuptools, - lib, - django, - py-moneyed, - certifi, - pytestCheckHook, - pytest-django, - pytest-cov, -}: -buildPythonPackage rec { - pname = "django-money"; - version = "3.6.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "django-money"; - repo = "django-money"; - tag = version; - hash = "sha256-VxAKTtrbDMRhiLxqjVYt7pLGl0sy9F1iwswP/hxQ01k="; - }; - - dependencies = [ - django - certifi - py-moneyed - ]; - - build-system = [ setuptools ]; - doCheck = true; - nativeCheckInputs = [ - pytestCheckHook - pytest-django - pytest-cov - ]; - pythonImportsCheck = [ "djmoney" ]; - - # avoid tests which import mixer, an abandoned library - disabledTests = [ - "test_mixer_blend" - ]; - - meta = with lib; { - description = "Money fields for Django forms and models."; - homepage = "https://github.com/django-money/django-money"; - changelog = "https://github.com/django-money/django-money/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-recurrence/default.nix b/pkgs/development/python-modules/django-recurrence/default.nix deleted file mode 100644 index 507f70aa6ac9..000000000000 --- a/pkgs/development/python-modules/django-recurrence/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - python-dateutil, - pytest-django, - pytestCheckHook, - pytest-cov, - pytest-sugar, - setuptools-scm, - pythonOlder, -}: -buildPythonPackage rec { - pname = "django-recurrence"; - version = "1.11.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "jazzband"; - repo = "django-recurrence"; - tag = version; - hash = "sha256-Ytf4fFTVFIQ+6IBhwRMtCkonP0POivv4TrYok37nghA="; - }; - - disabled = pythonOlder "3.7"; - - dependencies = [ - django - python-dateutil - ]; - - build-system = [ setuptools-scm ]; - doCheck = true; - pythonImportsCheck = [ "recurrence" ]; - nativeCheckInputs = [ - pytest-django - pytest-cov - pytest-sugar - pytestCheckHook - ]; - - meta = with lib; { - description = "Utility for working with recurring dates in Django."; - homepage = "https://github.com/jazzband/django-recurrence"; - changelog = "https://github.com/jazzband/django-recurrence/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-sslserver/default.nix b/pkgs/development/python-modules/django-sslserver/default.nix deleted file mode 100644 index 0077fafee8ab..000000000000 --- a/pkgs/development/python-modules/django-sslserver/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - buildPythonPackage, - django, - lib, - fetchurl, - setuptools-scm, - pythonOlder, -}: -buildPythonPackage { - pname = "django-sslserver"; - version = "0.22"; - format = "wheel"; - - src = fetchurl { - url = "https://files.pythonhosted.org/packages/6f/97/e4011f3944f83a7d2aaaf893c3689ad70e8d2ae46fb6e14fd0e3b0c6ce0b/django_sslserver-0.22-py3-none-any.whl"; - hash = "sha256-xZijY9LM3CQhwI3bPYsJc/gOjkejpbdOSiiW8hwpR8U="; - }; - - disabled = pythonOlder "3.4"; - - dependencies = [ - django - ]; - - build-system = [ setuptools-scm ]; - doCheck = true; - - meta = with lib; { - description = "A SSL-enabled development server for Django"; - homepage = "https://github.com/teddziuba/django-sslserver"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-stdimage/default.nix b/pkgs/development/python-modules/django-stdimage/default.nix deleted file mode 100644 index b3fed998628d..000000000000 --- a/pkgs/development/python-modules/django-stdimage/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - pytest-django, - pytestCheckHook, - setuptools-scm, - pillow, - pytest-cov, - gettext, - pythonOlder, - pythonAtLeast, -}: -buildPythonPackage rec { - pname = "django-stdimage"; - version = "6.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "codingjoe"; - repo = "django-stdimage"; - tag = version; - hash = "sha256-uwVU3Huc5fitAweShJjcMW//GBeIpJcxqKKLGo/EdIs="; - }; - - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; - - dependencies = [ - django - pillow - ]; - - build-system = [ setuptools-scm ]; - nativeBuildInputs = [ gettext ]; - - doCheck = true; - preCheck = '' - export DJANGO_SETTINGS_MODULE=tests.settings - ''; - disabledTests = [ - # SuspiciousFileOperation: Detected path traversal attempt (Even appear in upstream) - "test_variations_override" - ]; - pythonImportsCheck = [ - "stdimage" - "stdimage.validators" - "stdimage.models" - ]; - nativeCheckInputs = [ - pytest-django - pytest-cov - pytestCheckHook - ]; - - meta = with lib; { - description = "Django Standardized Image Field"; - homepage = "https://github.com/codingjoe/django-stdimage"; - changelog = "https://github.com/codingjoe/django-stdimage/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-structlog/default.nix b/pkgs/development/python-modules/django-structlog/default.nix deleted file mode 100644 index 55f207871db1..000000000000 --- a/pkgs/development/python-modules/django-structlog/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - buildPythonPackage, - fetchFromGitHub, - lib, - setuptools, - python, - pkgs, -}: -buildPythonPackage rec { - pname = "django-structlog"; - version = "10.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "jrobichaud"; - repo = "django-structlog"; - tag = version; - hash = "sha256-BNZ+nk2NK5x2YsTDZjH5BVizXAyLZhKp8zRvkWi068k="; - }; - - dependencies = with python.pkgs; [ - colorama - django - django-allauth - crispy-bootstrap5 - django-crispy-forms - django-environ - django-extensions - django-ipware - django-model-utils - django-ninja - django-redis - djangorestframework - structlog - ]; - - optional-dependencies.celery = with python.pkgs; [ celery ]; - - build-system = [ setuptools ]; - doCheck = true; - preCheck = '' - export DJANGO_SETTINGS_MODULE=config.settings.test_demo_app - - ${pkgs.valkey}/bin/redis-server & - REDIS_PID=$! - ''; - postCheck = '' - kill $REDIS_PID - ''; - - pytestFlags = [ - "-x" - "--cov=./django_structlog_demo_project" - "--cov-append django_structlog_demo_project" - ]; - pythonImportsCheck = [ - "structlog" - "django_structlog" - ]; - - nativeCheckInputs = with python.pkgs; [ - celery - factory-boy - pytest-asyncio - pytest-cov - pytest-django - pytest-mock - pytest-sugar - pytestCheckHook - ]; - - __darwinAllowLocalNetworking = true; - - meta = with lib; { - description = "Structured Logging for Django"; - homepage = "https://github.com/jrobichaud/django-structlog"; - changelog = "https://github.com/jrobichaud/django-structlog/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-user-sessions/default.nix b/pkgs/development/python-modules/django-user-sessions/default.nix deleted file mode 100644 index 3c679e54c725..000000000000 --- a/pkgs/development/python-modules/django-user-sessions/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - fetchFromGitHub, - buildPythonPackage, - setuptools-scm, - lib, - django, -}: -buildPythonPackage rec { - pname = "django-user-sessions"; - version = "3.0.3"; - pyproject = true; - - src = fetchFromGitHub { - owner = "jazzband"; - repo = "django-user-sessions"; - tag = version; - hash = "sha256-vHLeEmlVil1iJi+YkxL5c04Vq/b5b43tjC2ZcjH4/Ys="; - }; - - dependencies = [ - django - ]; - - build-system = [ setuptools-scm ]; - - meta = with lib; { - description = "Extend Django sessions with a foreign key back to the user, allowing enumerating all user's sessions."; - homepage = "https://github.com/jazzband/django-user-sessions"; - license = licenses.mit; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix b/pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix deleted file mode 100644 index e6806a4d28f2..000000000000 --- a/pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - buildPythonPackage, - django, - fetchFromGitHub, - lib, - setuptools, -}: -buildPythonPackage rec { - pname = "django-xforwardedfor-middleware"; - version = "2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "allo-"; - repo = "django-xforwardedfor-middleware"; - tag = "v${version}"; - hash = "sha256-dDXSb17kXOSeIgY6wid1QFHhUjrapasWgCEb/El51eA="; - }; - - dependencies = [ - django - ]; - - build-system = [ setuptools ]; - doCheck = true; - - meta = with lib; { - description = "Use the X-Forwarded-For header to get the real ip of a request"; - homepage = "https://github.com/allo-/django-xforwardedfor-middleware"; - license = licenses.publicDomain; - maintainers = with maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix index ed82a24db2c3..21864dfe0891 100644 --- a/pkgs/development/python-modules/firedrake/default.nix +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -59,20 +59,20 @@ let in buildPythonPackage (finalAttrs: { pname = "firedrake"; - version = "2025.10.2"; + version = "2025.10.3"; pyproject = true; src = fetchFromGitHub { owner = "firedrakeproject"; repo = "firedrake"; tag = finalAttrs.version; - hash = "sha256-A0dr9A1fm74IzpYiVxzdo4jtELYH7JBeRMOD9uYJODQ="; + hash = "sha256-9AkyVM0dpjdQqpuOBN60lCKIZJR0HXpp0g1Am/xUwbI="; }; # relax build-dependency petsc4py postPatch = '' substituteInPlace pyproject.toml --replace-fail \ - "petsc4py==3.24.0" "petsc4py" + "petsc4py==3.24.5" "petsc4py" ''; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix index 1faba0f4d8a8..f858980e5b76 100644 --- a/pkgs/development/python-modules/gerbonara/default.nix +++ b/pkgs/development/python-modules/gerbonara/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gerbonara"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "jaseg"; repo = "gerbonara"; tag = "v${version}"; - hash = "sha256-kzEjfM9QrT+izwyCnNdN6Bv6lk1rzqs7tfDvERzJzzI="; + hash = "sha256-fT13JMoOvKMxdHoagZAmIsGhU3M1S4bEmKUHae+EJcI="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index 5256c53e1e2a..cfbe550e4b1b 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "gguf"; - version = "8147"; + version = "8292"; pyproject = true; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-/r/lWt+G14BsNqTBqeK4Po4QHU0GkpEBbIvt5rqB4jc="; + hash = "sha256-nlUG9b+LGKdQ4kfUTqWUPgqavOMVhD8mAYwf3WARO3s="; }; sourceRoot = "${finalAttrs.src.name}/gguf-py"; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 480ea1bd24bd..2ee22af0229c 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "glyphslib"; - version = "6.12.7"; + version = "6.13.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { owner = "googlefonts"; repo = "glyphsLib"; tag = "v${finalAttrs.version}"; - hash = "sha256-Vqgk5DNy3rKMOi+A6zvYTvcI0K5TdepUJhc5oF9SXbE="; + hash = "sha256-3dlG7eOnMehRjki1kdGUs34wNunk+MiVy9pw3y+gRMc="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index 4d20b8ab00b6..a5422c038bc0 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "groq"; - version = "1.0.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-M/W06O2xBvn7iU+62AwvyM7W54arxXViPOK4Jj4uje0="; + hash = "sha256-rXKuQKrpI3cnJbADDgvL/3vwC25ydTNEbKCwVhjYtFg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 9c8938660083..906d45383c30 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202603151"; + version = "0.1.202603161"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-V4+X7VRTUlX2iXapty+VZDqtcw9q6eudbmLfGQkjkDQ="; + hash = "sha256-8s/E3s8EGGYaHQLOw0MZYas6EZhj+kU9Wr+HQvlSn1Y="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 719cdc343263..8e1aed5d963c 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "ical"; - version = "13.2.1"; + version = "13.2.2"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "ical"; tag = finalAttrs.version; - hash = "sha256-SSOonK+iFD3JT9aTceyM/nHiGrp3/7ud8NLMXsgqlI8="; + hash = "sha256-7EKnwfXRU7hzFVre5EVil8/HN+XnCh2qz0BF69sLDHc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix index 07f88a41176e..948c910b96fe 100644 --- a/pkgs/development/python-modules/kml2geojson/default.nix +++ b/pkgs/development/python-modules/kml2geojson/default.nix @@ -1,27 +1,27 @@ { lib, buildPythonPackage, - poetry-core, - fetchFromGitHub, - pytestCheckHook, click, + fetchFromGitHub, + hatchling, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kml2geojson"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "mrcagney"; repo = "kml2geojson"; - rev = version; - hash = "sha256-iJEcXpvy+Y3MkxAF2Q1Tkcx8GxUVjeVzv6gl134zdiI="; + tag = finalAttrs.version; + hash = "sha256-50hKosd4tgTV5GUXHAdTsz4S5QFtM7FTqUHy5TGcq0c="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ click ]; + dependencies = [ click ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,9 +29,9 @@ buildPythonPackage rec { meta = { description = "Library to convert KML to GeoJSON"; - mainProgram = "k2g"; homepage = "https://github.com/mrcagney/kml2geojson"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "k2g"; }; -} +}) diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index b93c9c035f6d..afa7092d857d 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -42,21 +42,21 @@ buildPythonPackage (finalAttrs: { pname = "lancedb"; - version = "0.27.1"; + version = "0.29.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; tag = "python-v${finalAttrs.version}"; - hash = "sha256-pWrwv3VtfkfOKnkiiu26yRDrDrsNxb+0r/kcNHwzmhU="; + hash = "sha256-sOgRGn0romt5xJ70c+GSqNoRAp0D9F9hEq6bm7JRK/Y="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-U1Od4lhaaGdYF3TISfRWY7sRmyyniZqLofBCnYAo1ew="; + hash = "sha256-GQA5RuxpYmrNqNrpW4GLZlXrphflErmR5PeeVcs6ZJQ="; }; build-system = [ rustPlatform.maturinBuildHook ]; @@ -110,6 +110,17 @@ buildPythonPackage (finalAttrs: { # Requires internet access # RuntimeError: lance error: LanceError(IO): Generic S3 error "test_bucket_without_dots_passes" + + # lance_namespace.errors.UnsupportedOperationError: Not supported: create_empty_table + "TestAsyncNamespaceConnection" + "TestNamespaceConnection" + + # Failed: DID NOT RAISE + "test_merge_insert" + + # TypeError: FFILanceTableProvider.__datafusion_table_provider__() missing 1 required positional + # argument: 'session' + "test_sql_query" ] ++ lib.optionals (pythonAtLeast "3.14") [ # TypeError: Converting Pydantic type to Arrow Type: unsupported type diff --git a/pkgs/development/python-modules/lastversion/default.nix b/pkgs/development/python-modules/lastversion/default.nix index 6f66dd01be13..f7a893dc8692 100644 --- a/pkgs/development/python-modules/lastversion/default.nix +++ b/pkgs/development/python-modules/lastversion/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "lastversion"; - version = "3.6.8"; + version = "3.6.9"; pyproject = true; src = fetchFromGitHub { owner = "dvershinin"; repo = "lastversion"; tag = "v${version}"; - hash = "sha256-obd0Q0mVaRIL3muj7MfwGciz65TshlJCvvVWwSwznhM="; + hash = "sha256-NyNa9x2sJqx65sntchWnpnyJiluDIUxxGMRIimH4SIs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index b24bfc9b9822..e0dc3078edc3 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-ggwpTUnfP1aZhAyZ1wTsoNpW52dt0y5/59JT6RSUMNQ="; + hash = "sha256-315Uzbm3CuRJQpAwnrLxQ6zr0e1pCmM3JKMV6KhrEs8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mammoth/default.nix b/pkgs/development/python-modules/mammoth/default.nix index b0f28ff68a1e..ae8023b0c55e 100644 --- a/pkgs/development/python-modules/mammoth/default.nix +++ b/pkgs/development/python-modules/mammoth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mammoth"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-mammoth"; tag = version; - hash = "sha256-x1wSudTD/C1uHnudaCCrhi9fyQInCej+Kd7CyBI2sus="; + hash = "sha256-8aqO5JPiyONu5rfR76qrutPHGE4nJn+716uPtYlZ+xA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix index 468fad747d7f..f46a8786a06d 100644 --- a/pkgs/development/python-modules/mlx-lm/default.nix +++ b/pkgs/development/python-modules/mlx-lm/default.nix @@ -24,14 +24,14 @@ buildPythonPackage (finalAttrs: { pname = "mlx-lm"; - version = "0.31.0"; + version = "0.31.1"; pyproject = true; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx-lm"; tag = "v${finalAttrs.version}"; - hash = "sha256-1YZt2HtHyhP4h3WOcSytbN0sN2x58OYAmQtoxisNt1o="; + hash = "sha256-5KGXLpzGEmyay6HvEM8qOe5zUmFRo1VbZKzOQvfr7Sk="; }; build-system = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9824d92f0a0c..18f7b2661f22 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -75,8 +75,8 @@ in "sha256-Q8nkt2PJnip62r2lbCZcB9qGE6sSg28ZAycLI8gIQ7s="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.42.3" - "sha256-JVGKx+VCoE4EvUrxsmFsdXwu6gaprva+q1xrsSl5EDA="; + buildMypyBoto3Package "apigateway" "1.42.68" + "sha256-cjHTz3Q9T7NBcr/p00heOzlBVlnVMfzWylivg37dtWk="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.42.3" @@ -331,12 +331,12 @@ in "sha256-M8vUOtM7Q5gnwi9ZPGu6n+I4Twl02Su4eRGqq2+Ow1o="; mypy-boto3-config = - buildMypyBoto3Package "config" "1.42.32" - "sha256-HQUL0R1NWP6DXQ26iS9k6lIAVdwK899fwLGH4/Z4U8Q="; + buildMypyBoto3Package "config" "1.42.68" + "sha256-UNxmIK9UD6AVmT4nyQzunNAKjp2YmV1wQ5oloHOwcXw="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.42.63" - "sha256-dZUnInRs0ndWy4jNbZLmUUswZZPC4GwUeBlTqm6JxJI="; + buildMypyBoto3Package "connect" "1.42.68" + "sha256-jppL6jpw0/Wb+cOW3GQ62h65l+/ZX8c6OFvyJfzVLtA="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.42.3" @@ -571,8 +571,8 @@ in "sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.42.43" - "sha256-PBFrSU7QbOuaU5kWjYe6eA8k9BHdAZUuD3jMYLlFwF0="; + buildMypyBoto3Package "glue" "1.42.68" + "sha256-HvL13TFg9jP3iSqyxDdsOaBv7shpkMqIQURe9e+ACVA="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.42.51" "sha256-QHAuRJrioMD7ASgV1Wobm81Gb+Z87c78yBs9X1+Kz+E="; @@ -698,8 +698,8 @@ in "sha256-TzudGWLWWzTRWZb3585Tkar1iXmt5TtFNox+DJzvhS4="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.42.6" - "sha256-MjfhT4KcLIDO4iQVo7eyq2K4lqM4anHaDJosPqZdaGw="; + buildMypyBoto3Package "ivs-realtime" "1.42.68" + "sha256-Q+++H+qR9OKMnbyZVL06+uDV9KuPuEabZDVXcrkAozM="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.42.3" @@ -858,12 +858,12 @@ in "sha256-NYn/N65sVAUxA4kTCi/IJNP/QQeutFjH8S7N2AeK3g8="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.42.37" - "sha256-Z+TiVg/mjr0vTU+awHlS7GCynOeSl+IPl0n9GaLTsYE="; + buildMypyBoto3Package "mediaconvert" "1.42.68" + "sha256-aRJIk0hzRVvbGQHbXxCoLl/6xReo2f4CZHdRo2YN364="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.42.56" - "sha256-MshslPZEBNOuIPrs0w2No6g8UzXNouSdRgM7WAkXlbc="; + buildMypyBoto3Package "medialive" "1.42.68" + "sha256-J9NnMG0prpzU+1dNQcH396UcZ0tCoNCbRXqVI42Qfz0="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.42.3" @@ -906,8 +906,8 @@ in "sha256-kFHGogiCfbftZr67o8zT7eb8na74J4AGneac03q+Pvc="; mypy-boto3-mgn = - buildMypyBoto3Package "mgn" "1.42.64" - "sha256-F12y2J72+c2VRP9sMdXVjeXZ7vlZqkEFpwm/dNWhkbU="; + buildMypyBoto3Package "mgn" "1.42.68" + "sha256-zrUwEeofbz+Tj7GgHzOzodYzsnPKqAISOuRGG6B7rpY="; mypy-boto3-migration-hub-refactor-spaces = buildMypyBoto3Package "migration-hub-refactor-spaces" "1.42.3" @@ -1070,8 +1070,8 @@ in "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.42.61" - "sha256-3ZA5BRq6lgqNM8tt02E7fXSrwf0gfF4JE6lfaw6cYWo="; + buildMypyBoto3Package "quicksight" "1.42.68" + "sha256-TrlvFHHGdfpGIk7MV17EAeaJD+Sf0Tfys/J0o1THx/Y="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.42.59" diff --git a/pkgs/development/python-modules/obsws-python/default.nix b/pkgs/development/python-modules/obsws-python/default.nix new file mode 100644 index 000000000000..f5beeab35a55 --- /dev/null +++ b/pkgs/development/python-modules/obsws-python/default.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + hatchling, + tomli, + websocket-client, +}: +buildPythonPackage (finalAttrs: { + pname = "obsws-python"; + version = "5.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aatikturk"; + repo = "obsws-python"; + rev = "f70583d7ca250c1f3a0df768d3cfd41663a6023b"; # no tags + hash = "sha256-krIiSmn/56Ao4fH6Y7JSQ11Euqt0tIq4JJjxqrt8MZc="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + tomli + websocket-client + ]; + + doCheck = false; # attempts to connect to OBS + + meta = { + description = "Python SDK for OBS Studio WebSocket v5.0"; + homepage = "https://github.com/aatikturk/obsws-python"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +}) diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index ee2fbd18f4a8..a8c0e4075e5b 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-vNC7fXsTVCYizQnucyWOanYRoDCTfCfGD0zxGyigizk="; + hash = "sha256-V95lfq8GnuitdFbY8MPpX0kyvj8Gx24W2NFeKp0FsSo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-sqlite3/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-sqlite3/default.nix index 5e4901083006..5fdbdb75e7cf 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-sqlite3/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-sqlite3/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - pythonOlder, hatchling, opentelemetry-instrumentation, opentelemetry-instrumentation-dbapi, @@ -13,8 +12,6 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-sqlite3"; pyproject = true; - disabled = pythonOlder "3.8"; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-sqlite3"; build-system = [ hatchling ]; @@ -33,6 +30,6 @@ buildPythonPackage { meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-sqlite3"; - description = "OpenTelemetry Instrumentation for Django"; + description = "OpenTelemetry SQLite3 instrumentation"; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-system-metrics/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-system-metrics/default.nix index 3f2ec8350c26..1dbb8482f801 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-system-metrics/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-system-metrics/default.nix @@ -14,8 +14,6 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-system-metrics"; pyproject = true; - disabled = pythonOlder "3.8"; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-system-metrics"; build-system = [ hatchling ]; @@ -35,6 +33,6 @@ buildPythonPackage { meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-system-metrics"; - description = "OpenTelemetry Instrumentation for Django"; + description = "OpenTelemetry System Metrics Instrumentation"; }; } diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f38cc9c48a4f..16174e934857 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -36,9 +36,10 @@ stdenv, onetbb, withDocs ? false, - withOsl ? true, + withOsl ? !stdenv.hostPlatform.isDarwin, withTools ? false, withUsdView ? false, + withMaterialX ? true, writeShellScriptBin, }: @@ -96,8 +97,8 @@ buildPythonPackage rec { (lib.cmakeBool "PXR_BUILD_PYTHON_DOCUMENTATION" withDocs) (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) - (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" true) - (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.hostPlatform.isDarwin && withOsl)) + (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" withMaterialX) + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" withOsl) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/peakrdl-rust/default.nix b/pkgs/development/python-modules/peakrdl-rust/default.nix index fdca6b390897..b8857bd053df 100644 --- a/pkgs/development/python-modules/peakrdl-rust/default.nix +++ b/pkgs/development/python-modules/peakrdl-rust/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "peakrdl-rust"; - version = "0.5.1"; + version = "0.6.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "darsor"; repo = "PeakRDL-rust"; tag = "v${version}"; - hash = "sha256-rcVM7ljFWlEXLxG7ASXE2iZ+WYazeMFE0sgTzkviOP0="; + hash = "sha256-YU2JZGC8AF3mhzwozItgqtWsrs4YEltZiP1rNkPfZ7M="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 6a00e0e55300..7e5f9082a9ed 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -2,32 +2,43 @@ lib, stdenv, buildPythonPackage, - gitMinimal, - greenlet, fetchFromGitHub, - pyee, - python, + + # patches + replaceVars, + nodejs, + playwright-driver, + + # build-system setuptools, setuptools-scm, - playwright-driver, + + # nativeBuildInputs + gitMinimal, + writableTmpDirAsHomeHook, + + # dependencies + greenlet, + pyee, + + python, nixosTests, - nodejs, }: let driver = playwright-driver; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "playwright"; - # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.57.0"; + # run ./pkgs/development/web/playwright/update.sh to update + version = "1.58.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "playwright-python"; - tag = "v${version}"; - hash = "sha256-LXTMVC6ytjo7l0QDkNPxtoMTYjmYMjCVqHz61BgAn6A="; + tag = "v${finalAttrs.version}"; + hash = "sha256-gK19pjB8TDy/kK+fb4pjwlGZlUyY26p+CNxunvIMrrY="; }; patches = [ @@ -36,42 +47,39 @@ buildPythonPackage rec { # - The setup script, which would try to download the driver package from # a CDN and patch wheels so that they include it. We don't want this # we have our own driver build. - ./driver-location.patch + (replaceVars ./driver-location.patch { + driver = "${driver}/cli.js"; + nodejs = lib.getExe nodejs; + }) ]; postPatch = '' - # if setuptools_scm is not listing files via git almost all python files are excluded - export HOME=$(mktemp -d) - git init . - git add -A . - git config --global user.email "nixpkgs" - git config --global user.name "nixpkgs" - git commit -m "workaround setuptools-scm" - - sed -i -e 's/requires = \["setuptools==.*", "setuptools-scm==.*", "wheel==.*", "auditwheel==.*"\]/requires = ["setuptools", "setuptools-scm", "wheel"]/' pyproject.toml + substituteInPlace pyproject.toml \ + --replace-fail ', "auditwheel==6.2.0"' "" \ + --replace-fail "setuptools-scm==8.3.1" "setuptools-scm" \ + --replace-fail "setuptools==80.9.0" "setuptools" \ + --replace-fail "wheel==0.45.1" "wheel" # setup.py downloads and extracts the driver. # This is done manually in postInstall instead. rm setup.py - - # Set the correct driver path with the help of a patch in patches - substituteInPlace playwright/_impl/_driver.py \ - --replace-fail "@node@" "${lib.getExe nodejs}" \ - --replace-fail "@driver@" "${driver}/cli.js" ''; + build-system = [ + setuptools-scm + setuptools + ]; + nativeBuildInputs = [ gitMinimal - setuptools-scm - setuptools + writableTmpDirAsHomeHook ]; pythonRelaxDeps = [ "greenlet" "pyee" ]; - - propagatedBuildInputs = [ + dependencies = [ greenlet pyee ]; @@ -88,7 +96,7 @@ buildPythonPackage rec { passthru = { inherit driver; tests = { - driver = playwright-driver; + inherit driver; browsers = playwright-driver.browsers; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { @@ -97,7 +105,6 @@ buildPythonPackage rec { # Package and playwright driver versions are tightly coupled. # Use the update script to ensure synchronized updates. skipBulkUpdate = true; - updateScript = ./update.sh; }; meta = { @@ -108,12 +115,7 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ techknowlogick yrd - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" + kalekseev ]; }; -} +}) diff --git a/pkgs/development/python-modules/playwright/driver-location.patch b/pkgs/development/python-modules/playwright/driver-location.patch index 66a574e2f9fd..f32d16186feb 100644 --- a/pkgs/development/python-modules/playwright/driver-location.patch +++ b/pkgs/development/python-modules/playwright/driver-location.patch @@ -1,5 +1,5 @@ diff --git a/playwright/_impl/_driver.py b/playwright/_impl/_driver.py -index 22b53b8..2d86626 100644 +index 22b53b8..43fdbd5 100644 --- a/playwright/_impl/_driver.py +++ b/playwright/_impl/_driver.py @@ -23,14 +23,7 @@ from playwright._repo_version import version @@ -14,7 +14,7 @@ index 22b53b8..2d86626 100644 - cli_path, - ) - return (os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node")), cli_path) -+ return "@node@", "@driver@" ++ return "@nodejs@", "@driver@" def get_driver_env() -> dict: diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh deleted file mode 100755 index cdd80a84c691..000000000000 --- a/pkgs/development/python-modules/playwright/update.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip nix-prefetch -set -euo pipefail - -root="$(dirname "$(readlink -f "$0")")" - -version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/playwright-python/releases/latest | jq -r '.tag_name | sub("^v"; "")') -# Most of the time, this should be the latest stable release of the Node-based -# Playwright version, but that isn't a guarantee, so this needs to be specified -# as well: -setup_py_url="https://github.com/microsoft/playwright-python/raw/v${version}/setup.py" -driver_version=$(curl -Ls "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') - -# TODO: skip if update-source-version reported the same version -update-source-version playwright-driver "$driver_version" -update-source-version python3Packages.playwright "$version" - -playwright_dir="$root/../../web/playwright" -driver_file="$playwright_dir/driver.nix" -repo_url_prefix="https://github.com/microsoft/playwright/raw" - -temp_dir=$(mktemp -d) -trap 'rm -rf "$temp_dir"' EXIT - -# Update playwright-mcp package -mcp_version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/playwright-mcp/releases/latest | jq -r '.tag_name | sub("^v"; "")') -update-source-version playwright-mcp "$mcp_version" - -# Update npmDepsHash for playwright-mcp -pushd "$temp_dir" >/dev/null -curl -fsSL -o package-lock.json "https://raw.githubusercontent.com/microsoft/playwright-mcp/v${mcp_version}/package-lock.json" -mcp_npm_hash=$(prefetch-npm-deps package-lock.json) -rm -f package-lock.json -popd >/dev/null - -mcp_package_file="$root/../../../by-name/pl/playwright-mcp/package.nix" -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$mcp_npm_hash"'"#' -i "$mcp_package_file" - - -# update binaries of browsers, used by playwright. -replace_sha() { - sed -i "s|$2 = \".\{44,52\}\"|$2 = \"$3\"|" "$1" -} - -prefetch_browser() { - # nix-prefetch is used to obtain sha with `stripRoot = false` - # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53 - nix-prefetch --option extra-experimental-features flakes -q "{ stdenv, fetchzip }: stdenv.mkDerivation { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }" -} - -update_browser() { - name="$1" - platform="$2" - stripRoot="false" - if [ "$platform" = "darwin" ]; then - if [ "$name" = "webkit" ]; then - suffix="mac-14" - else - suffix="mac" - fi - else - if [ "$name" = "ffmpeg" ] || [ "$name" = "chromium-headless-shell" ]; then - suffix="linux" - elif [ "$name" = "chromium" ]; then - stripRoot="true" - suffix="linux" - elif [ "$name" = "firefox" ]; then - stripRoot="true" - suffix="ubuntu-22.04" - else - suffix="ubuntu-22.04" - fi - fi - aarch64_suffix="$suffix-arm64" - if [ "$name" = "chromium-headless-shell" ]; then - buildname="chromium"; - else - buildname="$name" - fi - - revision="$(jq -r ".browsers[\"$buildname\"].revision" "$playwright_dir/browsers.json")" - replace_sha "$playwright_dir/$name.nix" "x86_64-$platform" \ - "$(prefetch_browser "https://playwright.azureedge.net/builds/$buildname/$revision/$name-$suffix.zip" $stripRoot)" - replace_sha "$playwright_dir/$name.nix" "aarch64-$platform" \ - "$(prefetch_browser "https://playwright.azureedge.net/builds/$buildname/$revision/$name-$aarch64_suffix.zip" $stripRoot)" -} - -curl -fsSl \ - "https://raw.githubusercontent.com/microsoft/playwright/v${driver_version}/packages/playwright-core/browsers.json" \ - | jq ' - .comment = "This file is kept up to date via update.sh" - | .browsers |= ( - [.[] - | select(.installByDefault) | del(.installByDefault)] - | map({(.name): . | del(.name)}) - | add - ) - ' > "$playwright_dir/browsers.json" - -update_browser "chromium" "linux" -update_browser "chromium-headless-shell" "linux" -update_browser "firefox" "linux" -update_browser "webkit" "linux" -update_browser "ffmpeg" "linux" - -update_browser "chromium" "darwin" -update_browser "chromium-headless-shell" "darwin" -update_browser "firefox" "darwin" -update_browser "webkit" "darwin" -update_browser "ffmpeg" "darwin" - -# Update package-lock.json files for all npm deps that are built in playwright - -# Function to download `package-lock.json` for a given source path and update hash -update_hash() { - local source_root_path="$1" - local existing_hash="$2" - - # Formulate download URL - local download_url="${repo_url_prefix}/v${driver_version}${source_root_path}/package-lock.json" - # Download package-lock.json to temporary directory - curl -fsSL -o "${temp_dir}/package-lock.json" "$download_url" - - # Calculate the new hash - local new_hash - new_hash=$(prefetch-npm-deps "${temp_dir}/package-lock.json") - - # Update npmDepsHash in the original file - sed -i "s|$existing_hash|${new_hash}|" "$driver_file" -} - -while IFS= read -r source_root_line; do - [[ "$source_root_line" =~ sourceRoot ]] || continue - source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/') - # Extract the current npmDepsHash for this sourceRoot - existing_hash=$(grep -A1 "$source_root_line" "$driver_file" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/') - - # Call the function to download and update the hash - update_hash "$source_root_path" "$existing_hash" -done < "$driver_file" diff --git a/pkgs/development/python-modules/ppf-datamatrix/default.nix b/pkgs/development/python-modules/ppf-datamatrix/default.nix deleted file mode 100644 index b4942912fbe4..000000000000 --- a/pkgs/development/python-modules/ppf-datamatrix/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - setuptools-scm, - pythonOlder, - fetchPypi, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "ppf-datamatrix"; - version = "0.2"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-jwNNnJDkCPYPixCic7qrgQFMmoHJg9wevcMdTKWsVYI="; - }; - - doCheck = true; - pythonImportsCheck = [ "ppf.datamatrix" ]; - nativeCheckInputs = [ pytestCheckHook ]; - - build-system = [ setuptools-scm ]; - - meta = { - description = "Pure-python package to generate data matrix codes."; - homepage = "https://github.com/adrianschlatter/ppf.datamatrix"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/py-moneyed/default.nix b/pkgs/development/python-modules/py-moneyed/default.nix deleted file mode 100644 index e839d6ec1958..000000000000 --- a/pkgs/development/python-modules/py-moneyed/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - babel, - pythonOlder, - typing-extensions, -}: - -buildPythonPackage rec { - pname = "py-moneyed"; - version = "3.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-SQbw8CzyuR7bouFW8tTpp48iQFmrjI+i/yYjDHXYlOg="; - }; - - dependencies = [ - babel - typing-extensions - ]; - - pythonImportsCheck = [ "moneyed" ]; - - build-system = [ setuptools ]; - - meta = { - description = "Provides Currency and Money classes for use in your Python code."; - homepage = "https://github.com/py-moneyed/py-moneyed"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ kurogeek ]; - }; -} diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f9f8bb47b0bd..13876af9da69 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,20 +10,20 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "14.0.9"; + version = "14.0.10"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pychromecast"; tag = version; - hash = "sha256-SpoVgXJV/9SVAcZXfeqpB3jkt9UUWcY9NBDGeIFhh4w="; + hash = "sha256-m9rucHSiApT0Xqkf4sjVRehcGGgvbaoGgbT/s3SLxKI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=65.6,<81.0" setuptools \ - --replace-fail "wheel>=0.37.1,<0.46.0" wheel + --replace-fail "setuptools>=65.6,<83.0" setuptools \ + --replace-fail "wheel>=0.37.1,<0.47.0" wheel ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index e8112a4b57a4..84331dabe05a 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -174,9 +174,9 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "parking" @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.47" +version = "0.12.49" dependencies = [ "pyo3", "serde_json", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index cf0d9954f3d6..8cc23bd8cf81 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt"; - version = "0.12.47"; + version = "0.12.49"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; tag = finalAttrs.version; - hash = "sha256-+LFORG9j3pkkPJ7IoF+yQ5AMssXmvQENzwpz6+ztLxM="; + hash = "sha256-TOILofUQYRZxHxn81lGkEEpp37DdHMznPE60aENKFkc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyfirefly/default.nix b/pkgs/development/python-modules/pyfirefly/default.nix index 6aef14d4832d..45ecc9622d72 100644 --- a/pkgs/development/python-modules/pyfirefly/default.nix +++ b/pkgs/development/python-modules/pyfirefly/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyfirefly"; - version = "0.1.14"; + version = "0.1.15"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyfirefly"; tag = "v${version}"; - hash = "sha256-MS3iDyH7rR/fsIVVEvhJjaNvjT81r6ReSzS6cqjChR8="; + hash = "sha256-vB/2CJMr5UEkANmJYCSA8igDCTYX0DFitDK3RFr68aE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyjvcprojector/default.nix b/pkgs/development/python-modules/pyjvcprojector/default.nix index b7bd3c02c849..3af5ddde1e5e 100644 --- a/pkgs/development/python-modules/pyjvcprojector/default.nix +++ b/pkgs/development/python-modules/pyjvcprojector/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyjvcprojector"; - version = "2.0.1"; + version = "2.0.3"; pyproject = true; src = fetchFromGitHub { owner = "SteveEasley"; repo = "pyjvcprojector"; tag = "v${version}"; - hash = "sha256-GKtBAW7opa6EQ+O3XfAi7D0V2KLWf+c+ECpBLbgVA9w="; + hash = "sha256-AXBayuGR8FxamyNMXzMO0sLaQNEmxkSbn/dcZxmLNG4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index a7a5bb873c82..d324aa4582a4 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "pylance"; - version = "2.0.1"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${finalAttrs.version}"; - hash = "sha256-KuUXo7GyC78U5RG6orW0X7a/B/0e9TbLpbTc7KXpxF8="; + hash = "sha256-71PogI877/dLwwlvMBraaC0vQWKtAHI/bmGEIBZVui4="; }; sourceRoot = "${finalAttrs.src.name}/python"; @@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: { src sourceRoot ; - hash = "sha256-dq5HK0yS/nnI7cqpsS51KnQus8KJ2mHsxmlgi8601gk="; + hash = "sha256-scQDRyX3hweYZep+LVAsiVqOvDTEw/ss0/4M3R4ewDU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index f8aaec5864ac..704a06c43323 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "pylint-odoo"; - version = "10.0.1"; + version = "10.0.2"; pyproject = true; src = fetchFromGitHub { owner = "OCA"; repo = "pylint-odoo"; tag = "v${version}"; - hash = "sha256-GMKgWPiX2e3WE2rW0XikRRsLhmz6u8EythB1wRakQnc="; + hash = "sha256-n89yO3bSYKrc9DCZGOxFQxtK0rzsE9wVJwhdIDedULk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pynputfix/default.nix b/pkgs/development/python-modules/pynputfix/default.nix new file mode 100644 index 000000000000..90fc331e5aa8 --- /dev/null +++ b/pkgs/development/python-modules/pynputfix/default.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + gitUpdater, + + # build-system + setuptools, + setuptools-lint, + sphinx, + + # dependencies + xlib, + evdev, + six, + + # tests + unittestCheckHook, +}: + +buildPythonPackage { + pname = "pynputfix"; + version = "1.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AuroraWright"; + repo = "pynputfix"; + tag = "1.8.2"; + hash = "sha256-SKw745hh0G2NoWgUUjShyjiG2NYPd4iJlWx7IeGpW/4="; + }; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'sphinx >=1.3.1'," "" \ + --replace-fail "'twine >=4.0']" "]" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-lint + sphinx + ]; + + propagatedBuildInputs = [ + six + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + evdev + xlib + ]; + + doCheck = false; # requires running X server + + nativeCheckInputs = [ unittestCheckHook ]; + + meta = { + broken = stdenv.hostPlatform.isDarwin; + description = "Library to control and monitor input devices"; + homepage = "https://github.com/moses-palmer/pynput"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix index 30bba93702b0..9f5a55c41d8d 100644 --- a/pkgs/development/python-modules/pyportainer/default.nix +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "pyportainer"; - version = "1.0.33"; + version = "1.0.34"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyportainer"; tag = "v${finalAttrs.version}"; - hash = "sha256-DWfe/N/YMiD5/4CnkVnWhgWoLE5tx1iaU93hQdmwXSQ="; + hash = "sha256-qa+NbX8y/2bK3B7gHWuTeAKT0bTaZS2HbWS/75a8tcA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index e7c074eca5d7..4d6b7d427064 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "3.6.1"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = "pysmartthings"; tag = "v${version}"; - hash = "sha256-tWWrx5gOpvTXBdlDfE13NwDTNemBW6kwhdSjHLJSXnw="; + hash = "sha256-PjvAdF1kvs0f7cViPjOYVziDRiI2DngwQk0E3zddgJE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 80e02eb3d5b8..bb35803e25cb 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "rajlaud"; repo = "pysqueezebox"; tag = "v${version}"; - hash = "sha256-1kkvqmmO197IjIcUlnmnKoeOq+0njbrgwogDU+ivIqw="; + hash = "sha256-aJKUgFTAfBZzzhtzklzOCgknk4Yk2i8YPqeVR6/444Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 72bea8934f72..de6d3f3cde01 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -13,7 +13,6 @@ stestrCheckHook, versionCheckHook, hacking, - coverage, keystoneauth1, stestr, openstacksdk, @@ -60,7 +59,6 @@ buildPythonPackage (finalAttrs: { stestrCheckHook openstacksdk hacking - coverage keystoneauth1 stestr openstacksdk diff --git a/pkgs/development/python-modules/pyworxcloud/default.nix b/pkgs/development/python-modules/pyworxcloud/default.nix index 42b886c2f639..466c2684f2ae 100644 --- a/pkgs/development/python-modules/pyworxcloud/default.nix +++ b/pkgs/development/python-modules/pyworxcloud/default.nix @@ -1,5 +1,6 @@ { lib, + aiohttp, awsiotsdk, buildPythonPackage, fetchFromGitHub, @@ -7,18 +8,19 @@ paho-mqtt, requests, urllib3, + tzdata, }: buildPythonPackage rec { pname = "pyworxcloud"; - version = "5.0.0"; + version = "6.0.5"; pyproject = true; src = fetchFromGitHub { owner = "MTrab"; repo = "pyworxcloud"; tag = "v${version}"; - hash = "sha256-eyMMtLgJuBIuPCyenYrHaRQIrb2tzPaIzM2UCAPPqDg="; + hash = "sha256-BqRdR202mF+aosAf1GRu8xcMSTkUrgxRVSgHyCg4wjA="; }; pythonRelaxDeps = [ "awsiotsdk" ]; @@ -26,10 +28,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ + aiohttp awsiotsdk paho-mqtt requests urllib3 + tzdata ]; pythonImportsCheck = [ "pyworxcloud" ]; diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index c7db15039b96..1f5ab7316c5a 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KL4vG5R3uk0NjXXdvCRo/JBpcNNvSUC9ky0aUYGOBqA="; + hash = "sha256-TwZ11KxFYqQTrk04GCk2igLI9bUYqFJU8f8I2vvnq38="; }; pythonRelaxDeps = [ "python-xz" ]; diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index ae5b8a296640..8d11aa9d9b2f 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rigour"; - version = "1.7.4"; + version = "1.7.5"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-YvxyKWkhiujVvrFpWd2JMf5+v81ugioCViHCt9AcNCM="; + hash = "sha256-n7GlxBU3aOTfy/vXPEXRv106W6Es7S07Da1589IlwBA="; }; build-system = [ diff --git a/pkgs/development/python-modules/swh-auth/default.nix b/pkgs/development/python-modules/swh-auth/default.nix index 10980def4a73..8f0ae143bae2 100644 --- a/pkgs/development/python-modules/swh-auth/default.nix +++ b/pkgs/development/python-modules/swh-auth/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitLab, setuptools, @@ -18,7 +19,7 @@ starlette, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-auth"; version = "0.10.0"; pyproject = true; @@ -28,7 +29,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-auth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8ctd5D7zT66oVNZlvRIs8pN7Fe2BhTgC+S9p1HBDO9E="; }; @@ -47,6 +48,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "swh.auth" ]; + # Many broken tests on Darwin. Disabling them for now. + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ aiocache djangorestframework @@ -61,6 +65,6 @@ buildPythonPackage rec { description = "Set of utility libraries related to user authentication in applications and services based on the use of Keycloak and OpenID Connect"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-auth"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index 940cf4980cd8..e84619a35532 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -42,7 +42,7 @@ pkgs, # Only for pkgs.zstd }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-core"; version = "4.6.0"; pyproject = true; @@ -52,7 +52,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dI+xfj0DnUbBdYIVycyJQg3B/jnH/eg/Ju8YX2k8Qkc="; }; @@ -81,6 +81,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + # Many broken tests on Darwin. Disabling them for now. + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ aiohttp-utils flask @@ -122,11 +125,11 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-core/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-core/-/tags/${finalAttrs.src.tag}"; description = "Low-level utilities and helpers used by almost all other modules in the stack"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core"; license = lib.licenses.gpl3Only; mainProgram = "swh"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix index bdb3b5cd7673..cc2c61e32a75 100644 --- a/pkgs/development/python-modules/swh-export/default.nix +++ b/pkgs/development/python-modules/swh-export/default.nix @@ -22,7 +22,7 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-export"; version = "1.8.0"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-export"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-n97MMYn7EmTrv411YSxUD1+zfbFB8KOSns44N3NqqV8="; }; @@ -85,6 +85,6 @@ buildPythonPackage rec { description = "Software Heritage dataset tools"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-export"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-journal/default.nix b/pkgs/development/python-modules/swh-journal/default.nix index e06e021615b9..8db3234f03d7 100644 --- a/pkgs/development/python-modules/swh-journal/default.nix +++ b/pkgs/development/python-modules/swh-journal/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitLab, setuptools, @@ -12,7 +13,7 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-journal"; version = "2.0.0"; pyproject = true; @@ -22,7 +23,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-journal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ycTB7hSjTerJOd+nEv8HbM82vPAO8P1+xooy0oN4eHw="; }; @@ -45,10 +46,20 @@ buildPythonPackage rec { pytest-mock ]; + disabledTestPaths = [ + # AssertionError: assert {'author': {'email': b'', 'fullname': b'foo', 'name': b'foo'}, 'date': {'offset_bytes': b'+0200', 'timestamp': {'micro...': 1234567890}}, 'id': b'\x80Y\xdcN\x17\xfc\xd0\xe5\x1c\xa3\xbc\xd6\xb8\x0fEw\xd2\x81\xfd\x08', 'message': b'foo', ...} is None + "swh/journal/tests/test_kafka_writer.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + #Fatal Python error: Segmentation fault" + "swh/journal/tests/test_client.py" + "swh/journal/tests/test_pytest_plugin.py" + ]; + meta = { description = "Persistent logger of changes to the archive, with publish-subscribe support"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-journal"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-model/default.nix b/pkgs/development/python-modules/swh-model/default.nix index cde19300c236..c93484a07e52 100644 --- a/pkgs/development/python-modules/swh-model/default.nix +++ b/pkgs/development/python-modules/swh-model/default.nix @@ -24,7 +24,7 @@ }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-model"; version = "8.4.1"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-model"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v/vbY0mxvsbuLUAmDACW9brfVF5djMYyvv9Mf1VL6do="; }; @@ -79,6 +79,6 @@ buildPythonPackage rec { description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix index c8ca0dc87afd..c7d7c6c6012a 100644 --- a/pkgs/development/python-modules/swh-objstorage/default.nix +++ b/pkgs/development/python-modules/swh-objstorage/default.nix @@ -38,7 +38,7 @@ util-linux, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-objstorage"; version = "5.1.0"; pyproject = true; @@ -48,7 +48,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-objstorage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NnNT9Lt/LGDIJpUmfkfPn6JnF3k8Usf2UVa88zHPKlg="; }; @@ -81,6 +81,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "swh.objstorage" ]; + # Many broken tests on Darwin. Disabling them for now. + doCheck = !stdenv.hostPlatform.isDarwin; + enabledTestPaths = [ "swh/objstorage/tests" ]; nativeCheckInputs = [ @@ -110,10 +113,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage/-/tags/${finalAttrs.src.tag}"; description = "Content-addressable object storage for the Software Heritage project"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix index 5dca94bb53d2..883f4b53f54b 100644 --- a/pkgs/development/python-modules/swh-scanner/default.nix +++ b/pkgs/development/python-modules/swh-scanner/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitLab, setuptools, @@ -21,7 +22,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-scanner"; version = "0.8.3"; pyproject = true; @@ -31,7 +32,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-scanner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-baUUuYFapBD7iuDaDP8CSR9f4glVZcS5qBpZddVf7z8="; }; @@ -65,6 +66,13 @@ buildPythonPackage rec { types-requests ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # Failed: Failed to start the server after 5 seconds. + "test_add_provenance_with_release" + "test_add_provenance_with_revision" + "test_scanner_result" + ]; + disabledTestPaths = [ # pytestRemoveBytecodePhase fails with: "error (ignored): error: opening directory "/tmp/nix-build-python3.12-swh-scanner-0.8.3.drv-5/build/pytest-of-nixbld/pytest-0/test_randomdir_policy_info_cal0/big-directory/dir/dir/dir/ ......" "swh/scanner/tests/test_policy.py" @@ -73,10 +81,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/tags/${finalAttrs.src.tag}"; description = "Source code scanner to analyze code bases and compare them with source code artifacts archived by Software Heritage"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix index 7bb37313ed3c..ea4c798e2e71 100644 --- a/pkgs/development/python-modules/swh-scheduler/default.nix +++ b/pkgs/development/python-modules/swh-scheduler/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitLab, setuptools, @@ -28,7 +29,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-scheduler"; version = "3.3.0"; pyproject = true; @@ -38,7 +39,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-scheduler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Kv5QH3sj/InKOSjxGtwVxtoAluHx5eIxO5GqcbOs0NY="; }; @@ -65,6 +66,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "swh.scheduler" ]; + # Many broken tests on Darwin. Disabling them for now. + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ plotille postgresql @@ -85,10 +89,10 @@ buildPythonPackage rec { disabledTests = [ "test_setup_log_handler_with_env_configuration" ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler/-/tags/${finalAttrs.src.tag}"; description = "Job scheduler for the Software Heritage project"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-shard/default.nix b/pkgs/development/python-modules/swh-shard/default.nix index a07c344b04a2..cefb105097a4 100644 --- a/pkgs/development/python-modules/swh-shard/default.nix +++ b/pkgs/development/python-modules/swh-shard/default.nix @@ -1,4 +1,5 @@ { + stdenv, buildPythonPackage, click, cmake, @@ -14,7 +15,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-shard"; version = "2.2.0"; pyproject = true; @@ -24,7 +25,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-shard"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-97oZ+Wa8GmyL2V4CnlSvaTbQZJ+mPbg6uVmWd0oxv1Q="; }; @@ -62,11 +63,26 @@ buildPythonPackage rec { rm src/swh/shard/*.py ''; + disabledTests = [ + "test_setup_log_handler_with_env_configuration" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # assert (51675136 - 51396608) < (100 * 1024) + "test_memleak" + # ValueError: Cannot convert negative int + "test_write_above_rlimit_fsize" + # ValueError: Cannot convert negative int + "test_finalize_above_rlimit_fsize" + ]; + meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-shard/-/tags/v2.2.0"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-shard/-/tags/${finalAttrs.src.tag}"; description = "Shard File Format for the Software Heritage Object Storage"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-shard"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.dotlambda ]; + maintainers = with lib.maintainers; [ + dotlambda + drupol + ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix index 52ed9dd19c50..326619bcd86d 100644 --- a/pkgs/development/python-modules/swh-storage/default.nix +++ b/pkgs/development/python-modules/swh-storage/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitLab, setuptools, @@ -30,7 +31,7 @@ swh-journal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-storage"; version = "4.1.1"; pyproject = true; @@ -40,7 +41,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-storage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AY2IcRJG19oSy2usI9JZTEKYLI3SEiLpNisqD7zus8A="; }; @@ -74,6 +75,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "swh.storage" ]; + # Many broken tests on Darwin. Disabling them for now. + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ postgresql postgresqlTestHook @@ -102,10 +106,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/${finalAttrs.src.tag}"; description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix index 7853a89e644b..e58396aca2b4 100644 --- a/pkgs/development/python-modules/swh-web-client/default.nix +++ b/pkgs/development/python-modules/swh-web-client/default.nix @@ -18,7 +18,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-web-client"; version = "0.9.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-web-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZZptYLC1os2i0NtBD3mp4QaQQRoKxnr9k8gJuqmpizE="; }; @@ -66,6 +66,6 @@ buildPythonPackage rec { description = "Client for Software Heritage Web applications, via their APIs"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-web-client"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix deleted file mode 100644 index 897884d2f1ce..000000000000 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - lib, - stdenv, - attrs, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - pendulum, - poetry-core, - pprintpp, - pytestCheckHook, - wrapt, -}: - -buildPythonPackage rec { - pname = "tbm-utils"; - version = "2.6.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "thebigmunch"; - repo = "tbm-utils"; - tag = version; - hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA="; - }; - - patches = [ - # Migrate to pendulum > 3, https://github.com/thebigmunch/tbm-utils/pull/3 - (fetchpatch { - name = "support-pendulum-3.patch"; - url = "https://github.com/thebigmunch/tbm-utils/commit/473534fae2d9a8dea9100cead6c54cab3f5cd0cd.patch"; - hash = "sha256-3T0KhSmO9r1vM67FWEnTZMQV4b5jS2xtPHI0t9NnCmI="; - }) - (fetchpatch { - name = "update-testsupport-pendulum-3.patch"; - url = "https://github.com/thebigmunch/tbm-utils/commit/a0331d0c15f11cd26bfbb42eebd17296167161ed.patch"; - hash = "sha256-KG6yfnnBltavbNvIBTdbK+CPXwZTLYl14925RY2a8vs="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'poetry>=1.0.0' 'poetry-core' \ - --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' - - substituteInPlace pytest.ini \ - --replace-fail 'strict = True' 'strict = False' - ''; - - pythonRelaxDeps = [ - "attrs" - "pendulum" - ]; - - build-system = [ poetry-core ]; - - propagatedBuildInputs = [ - attrs - pendulum - pprintpp - wrapt - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Skip on macOS because /etc/localtime is accessed through the pendulum - # library, which is not allowed in a sandboxed build. - "test_create_parser_filter_dates" - "test_parse_args" - ]; - - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # Skip on macOS because /etc/localtime is accessed through the pendulum - # library, which is not allowed in a sandboxed build. - "tests/test_datetime.py" - "tests/test_misc.py" - ]; - - pythonImportsCheck = [ "tbm_utils" ]; - - meta = { - description = "Commonly-used set of utilities"; - homepage = "https://github.com/thebigmunch/tbm-utils"; - changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/tcia-utils/default.nix b/pkgs/development/python-modules/tcia-utils/default.nix new file mode 100644 index 000000000000..71ee5c7821de --- /dev/null +++ b/pkgs/development/python-modules/tcia-utils/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + beautifulsoup4, + ipython, + pandas, + plotly, + requests, + tqdm, + unidecode, + hatchling, +}: + +buildPythonPackage (finalAttrs: { + pname = "tcia-utils"; + version = "3.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kirbyju"; + repo = "tcia_utils"; + rev = "9ff8a409df9daaa3f9bc28f0a951d7f6fcb90160"; # Corresponds to v3.2.1 + hash = "sha256-IW6rxlmRj7RW3hM7aZR+BuqboDzp+2R2ObGwAhOxMPM="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + beautifulsoup4 + ipython + pandas + plotly + requests + tqdm + unidecode + ]; + + pythonRemoveDeps = [ "bs4" ]; + + # Tests require network access to TCIA API and specific credentials + doCheck = false; + + pythonImportsCheck = [ "tcia_utils" ]; + + meta = { + description = "Python utilities for interacting with The Cancer Imaging Archive (TCIA)"; + homepage = "https://github.com/kirbyju/tcia_utils"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sgomezsal ]; + }; +}) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index f4656326f50b..73d651221567 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.20.3"; + version = "4.20.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-O78gUY5+OojZMwOKGcDAQ8J4tVVmmvAyS5xWQyl3Ppk="; + hash = "sha256-GzkMBNvXz8wqpYdsifeHqZFnYjRf4hNRmQQhHUB12VI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wolf-comm/default.nix b/pkgs/development/python-modules/wolf-comm/default.nix index 1cfb1bf01ad6..59bf238c2c11 100644 --- a/pkgs/development/python-modules/wolf-comm/default.nix +++ b/pkgs/development/python-modules/wolf-comm/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "wolf-comm"; - version = "0.0.47"; + version = "0.0.48"; pyproject = true; src = fetchFromGitHub { owner = "janrothkegel"; repo = "wolf-comm"; tag = version; - hash = "sha256-/34smUrsWKNEd5OPPIsDnW3zfq6nhKX3Yp+UBk+Nibw="; + hash = "sha256-w+7Z7A7q9RP+9ORYgvcqWDjV/XOUuXvE67LlOyzhSDY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 5440e47e84a9..b3d15c3f04b1 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "yalexs-ble"; - version = "3.2.7"; + version = "3.2.8"; pyproject = true; src = fetchFromGitHub { owner = "Yale-Libs"; repo = "yalexs-ble"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Y2ix5ikrWC9taCHJhg8Irt3PGOiH+OzqLRSVW/q8Gs="; + hash = "sha256-Aq0tZp5h3vDxxoPYefSCoTqJV8dZYvMbITd3icdIMf8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 8875a7d4b1b0..739a65528ecf 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -5,7 +5,6 @@ rocmUpdateScript, cmake, rocm-cmake, - llvm, clr, rocminfo, python3, @@ -124,7 +123,12 @@ stdenv.mkDerivation (finalAttrs: { "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; - # No flags to build selectively it seems... + patches = [ + # Hacky fix for failure for some targets when all targets are selected out + # for a non-optional at link time kernel + ./fix-empty-offload-targets.diff + ]; + postPatch = # Reduce configure time by preventing thousands of clang-tidy targets being added # We will never call them diff --git a/pkgs/development/rocm-modules/composable_kernel/fix-empty-offload-targets.diff b/pkgs/development/rocm-modules/composable_kernel/fix-empty-offload-targets.diff new file mode 100644 index 000000000000..d314873ff61b --- /dev/null +++ b/pkgs/development/rocm-modules/composable_kernel/fix-empty-offload-targets.diff @@ -0,0 +1,23 @@ +diff --git a/library/src/tensor_operation_instance/gpu/CMakeLists.txt b/library/src/tensor_operation_instance/gpu/CMakeLists.txt +index 172f6681b8..d3ddbb2f15 100644 +--- a/library/src/tensor_operation_instance/gpu/CMakeLists.txt ++++ b/library/src/tensor_operation_instance/gpu/CMakeLists.txt +@@ -154,9 +154,15 @@ function(add_instance_library INSTANCE_NAME) + list(FILTER INST_TARGETS INCLUDE REGEX "gfx12") + endif() + set(offload_targets) +- foreach(target IN LISTS INST_TARGETS) +- string(APPEND offload_targets "--offload-arch=${target} ") +- endforeach() ++ if(NOT INST_TARGETS) ++ # No valid GPU targets for this source, compile for 90a as fallback ++ # so the add_device…instances and hip_fatbin… symbols still exist ++ set(offload_targets "--offload-arch=gfx90a") ++ else() ++ foreach(target IN LISTS INST_TARGETS) ++ string(APPEND offload_targets "--offload-arch=${target} ") ++ endforeach() ++ endif() + set_source_files_properties(${source} PROPERTIES COMPILE_FLAGS ${offload_targets}) + list(APPEND INST_OBJ ${source}) + endforeach() diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index c9d90368ad70..a0168bbc1390 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.26.0"; + version = "2.27.2"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-rTMu3wd/drxALAZB0O5bAJuWdYsHSwwOD4nbAFIhXbg="; + sha256 = "sha256-SotlKv5gAeSTuhk60Y5Srgaogr7Fm7JO1CuGJ5eE0pg="; }; - vendorHash = "sha256-9jzhoFN7aAUgPxENPuGYR41gXLzSv1VtnTPB38heVlI="; + vendorHash = "sha256-ELJ/+LOwsQUGl0unsqDOX9mNxSUQFzeuOlqay24tZ4k="; tags = lib.optionals (!enableUnfree) [ "oss" diff --git a/pkgs/development/tools/electron/39-angle-patchdir.patch b/pkgs/development/tools/electron/39-angle-patchdir.patch index e1ce962a8b5c..1b53bfb2aa85 100644 --- a/pkgs/development/tools/electron/39-angle-patchdir.patch +++ b/pkgs/development/tools/electron/39-angle-patchdir.patch @@ -3,9 +3,9 @@ index f5dbe8600f..9e1e5e0704 100644 --- a/electron/patches/config.json +++ b/electron/patches/config.json @@ -14,5 +14,5 @@ - { "patch_dir": "src/electron/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" }, - { "patch_dir": "src/electron/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" }, - { "patch_dir": "src/electron/electron/patches/skia", "repo": "src/third_party/skia" }, -- { "patch_dir": "src/electron/electron/patches/angle", "repo": "src/third_party/angle/src" } -+ { "patch_dir": "src/electron/electron/patches/angle", "repo": "src/third_party/angle" } + { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" }, + { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" }, + { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" }, +- { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" } ++ { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" } ] diff --git a/pkgs/development/web/playwright/browser-downloads-test.js b/pkgs/development/web/playwright/browser-downloads-test.js new file mode 100644 index 000000000000..5f4ec96259c0 --- /dev/null +++ b/pkgs/development/web/playwright/browser-downloads-test.js @@ -0,0 +1,91 @@ +"use strict"; + +const childProcess = require("child_process"); +const fs = require("fs"); + +const [playwrightCorePath, expectedConfigPath] = process.argv.slice(2); + +if (!playwrightCorePath || !expectedConfigPath) { + throw new Error("usage: browser-downloads-test.js "); +} + +const browserDownloads = JSON.parse(fs.readFileSync(expectedConfigPath, "utf8")); +const browserNames = Object.keys(browserDownloads); + +const hostPlatformBySystem = { + "x86_64-linux": "ubuntu24.04-x64", + "aarch64-linux": "ubuntu24.04-arm64", + "x86_64-darwin": "mac15", + "aarch64-darwin": "mac15-arm64", +}; + +function getRegistryDownloadURLs(hostPlatform) { + const script = ` + const path = require("path"); + const { registry } = require(path.join(process.env.PLAYWRIGHT_CORE_PATH, "lib/server/registry/index.js")); + const browserNames = JSON.parse(process.env.PLAYWRIGHT_BROWSER_NAMES); + const downloadURLs = Object.fromEntries( + browserNames.map((name) => [name, registry.findExecutable(name).downloadURLs]), + ); + process.stdout.write(JSON.stringify(downloadURLs)); + `; + + return JSON.parse( + childProcess.execFileSync(process.execPath, ["-e", script], { + encoding: "utf8", + env: { + ...process.env, + PLAYWRIGHT_BROWSER_NAMES: JSON.stringify(browserNames), + PLAYWRIGHT_CORE_PATH: playwrightCorePath, + PLAYWRIGHT_HOST_PLATFORM_OVERRIDE: hostPlatform, + }, + }), + ); +} + +const failures = []; +const systems = Object.keys(browserDownloads[browserNames[0]]); + +for (const system of systems) { + const hostPlatform = hostPlatformBySystem[system]; + const registryDownloadURLs = getRegistryDownloadURLs(hostPlatform); + + if (!hostPlatform) { + throw new Error(`unsupported system: ${system}`); + } + + for (const name of browserNames) { + const expectedDownload = browserDownloads[name][system]; + const actualDownloadURLs = registryDownloadURLs[name]; + + if (!expectedDownload) { + failures.push(`missing browser-downloads.nix entry for ${name} on ${system}`); + continue; + } + + if (!Array.isArray(actualDownloadURLs) || actualDownloadURLs.length === 0) { + failures.push(`missing registry download URLs for ${name} on ${system} (${hostPlatform})`); + continue; + } + + const actualDownloadURL = actualDownloadURLs[0]; + + if (expectedDownload.url !== actualDownloadURL) { + failures.push( + [ + `${name} on ${system} (${hostPlatform}) did not match Playwright's primary download URL`, + `expected: ${browserDownloads[name][system].url}`, + `registry: ${actualDownloadURL}`, + ].join("\n"), + ); + } + } +} + +if (failures.length > 0) { + console.error("Playwright browser download URL mismatches:"); + for (const failure of failures) { + console.error(`- ${failure}`); + } + process.exit(1); +} diff --git a/pkgs/development/web/playwright/browser-downloads-test.nix b/pkgs/development/web/playwright/browser-downloads-test.nix new file mode 100644 index 000000000000..e51ecd4a9a01 --- /dev/null +++ b/pkgs/development/web/playwright/browser-downloads-test.nix @@ -0,0 +1,35 @@ +{ + lib, + runCommand, + nodejs, + playwright-core, +}: +let + browserNames = [ + "chromium" + "chromium-headless-shell" + "firefox" + "webkit" + "ffmpeg" + ]; + browsersJSON = (lib.importJSON ./browsers.json).browsers; + browserDownloads = lib.genAttrs browserNames ( + name: + import ./browser-downloads.nix { + inherit name; + inherit (browsersJSON.${name}) revision; + browserVersion = browsersJSON.${name}.browserVersion or ""; + } + ); + browserDownloadsExpectedJSON = builtins.toFile "playwright-browser-downloads.json" ( + builtins.toJSON browserDownloads + ); +in +runCommand "playwright-browser-downloads-test" + { + nativeBuildInputs = [ nodejs ]; + } + '' + node ${./browser-downloads-test.js} ${playwright-core} ${browserDownloadsExpectedJSON} + touch $out + '' diff --git a/pkgs/development/web/playwright/browser-downloads.nix b/pkgs/development/web/playwright/browser-downloads.nix new file mode 100644 index 000000000000..f399b582672f --- /dev/null +++ b/pkgs/development/web/playwright/browser-downloads.nix @@ -0,0 +1,56 @@ +{ + name, + revision, + browserVersion ? "", +}: +let + cftUrl = + path: + assert browserVersion != ""; + "https://cdn.playwright.dev/builds/cft/${browserVersion}/${path}"; + + registryUrl = + browser: archive: + "https://cdn.playwright.dev/dbazure/download/playwright/builds/${browser}/${revision}/${archive}"; + + mk = url: stripRoot: { + inherit url stripRoot; + }; +in +{ + chromium = { + x86_64-linux = mk (cftUrl "linux64/chrome-linux64.zip") true; + aarch64-linux = mk (registryUrl "chromium" "chromium-linux-arm64.zip") true; + x86_64-darwin = mk (cftUrl "mac-x64/chrome-mac-x64.zip") false; + aarch64-darwin = mk (cftUrl "mac-arm64/chrome-mac-arm64.zip") false; + }; + + "chromium-headless-shell" = { + x86_64-linux = mk (cftUrl "linux64/chrome-headless-shell-linux64.zip") false; + aarch64-linux = mk (registryUrl "chromium" "chromium-headless-shell-linux-arm64.zip") false; + x86_64-darwin = mk (cftUrl "mac-x64/chrome-headless-shell-mac-x64.zip") false; + aarch64-darwin = mk (cftUrl "mac-arm64/chrome-headless-shell-mac-arm64.zip") false; + }; + + firefox = { + x86_64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04.zip") true; + aarch64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04-arm64.zip") true; + x86_64-darwin = mk (registryUrl "firefox" "firefox-mac.zip") false; + aarch64-darwin = mk (registryUrl "firefox" "firefox-mac-arm64.zip") false; + }; + + webkit = { + x86_64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04.zip") false; + aarch64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04-arm64.zip") false; + x86_64-darwin = mk (registryUrl "webkit" "webkit-mac-15.zip") false; + aarch64-darwin = mk (registryUrl "webkit" "webkit-mac-15-arm64.zip") false; + }; + + ffmpeg = { + x86_64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux.zip") false; + aarch64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux-arm64.zip") false; + x86_64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac.zip") false; + aarch64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac-arm64.zip") false; + }; +} +.${name} diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json index bebcdade20d7..bccc346c7b66 100644 --- a/pkgs/development/web/playwright/browsers.json +++ b/pkgs/development/web/playwright/browsers.json @@ -2,34 +2,30 @@ "comment": "This file is kept up to date via update.sh", "browsers": { "chromium": { - "revision": "1200", - "browserVersion": "143.0.7499.4" + "revision": "1208", + "browserVersion": "145.0.7632.6", + "title": "Chrome for Testing" }, "chromium-headless-shell": { - "revision": "1200", - "browserVersion": "143.0.7499.4" + "revision": "1208", + "browserVersion": "145.0.7632.6", + "title": "Chrome Headless Shell" }, "firefox": { - "revision": "1497", - "browserVersion": "144.0.2" + "revision": "1509", + "browserVersion": "146.0.1", + "title": "Firefox" }, "webkit": { - "revision": "2227", + "revision": "2248", "revisionOverrides": { "debian11-x64": "2105", "debian11-arm64": "2105", - "mac10.14": "1446", - "mac10.15": "1616", - "mac11": "1816", - "mac11-arm64": "1816", - "mac12": "2009", - "mac12-arm64": "2009", - "mac13": "2140", - "mac13-arm64": "2140", "ubuntu20.04-x64": "2092", "ubuntu20.04-arm64": "2092" }, - "browserVersion": "26.0" + "browserVersion": "26.0", + "title": "WebKit" }, "ffmpeg": { "revision": "1011", diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix index 4003d077365d..33d260bb84d1 100644 --- a/pkgs/development/web/playwright/chromium-headless-shell.nix +++ b/pkgs/development/web/playwright/chromium-headless-shell.nix @@ -1,7 +1,7 @@ { fetchzip, revision, - suffix, + browserVersion, system, throwSystem, stdenv, @@ -24,15 +24,20 @@ ... }: let + download = + (import ./browser-downloads.nix { + name = "chromium-headless-shell"; + inherit revision browserVersion; + }).${system} or throwSystem; + linux = stdenv.mkDerivation { name = "playwright-chromium-headless-shell"; src = fetchzip { - url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-headless-shell-${suffix}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { - x86_64-linux = "sha256-4xPtmjRSbkWLmV2LzVClwjeQcmktZCvDS3gYo+FlkJc="; - aarch64-linux = "sha256-rnurwOiST8fdAC5kGC9uR+MRidGtIZCPQLrg+xZbuZQ="; + x86_64-linux = "sha256-/xskLzTc9tTZmu1lwkMpjV3QV7XjP92D/7zRcFuVWT8="; + aarch64-linux = "sha256-jckH5+eGJ4BhH1NAa5LIgf3/salKLAHW9XUOo5gob4c="; } .${system} or throwSystem; }; @@ -64,12 +69,11 @@ let }; darwin = fetchzip { - url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-headless-shell-${suffix}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-9MsBmUuaHq3P/eWxGcihzk09e1zuEr4dIMo6ZjSM8ZQ="; - aarch64-darwin = "sha256-i8L+C4p8DCcqb5C5B5q+JuX/fTPxhBva2dlFVDkdfQ0="; + x86_64-darwin = "sha256-bgU7lZhp9XUFfGu58pFdZyhXho3Jiy4MjljR+yk0M1c="; + aarch64-darwin = "sha256-45DjMIu0t7IEYdXOmIqpV/1/MKdEfx/8T7DWagh6Zhc="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 17458292b824..e255b6b03a40 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -5,7 +5,7 @@ chromium, fetchzip, revision, - suffix, + browserVersion, system, throwSystem, lib, @@ -41,6 +41,12 @@ ... }: let + download = + (import ./browser-downloads.nix { + name = "chromium"; + inherit revision browserVersion; + }).${system} or throwSystem; + # Playwright expects different directory names for different architectures: # - linux-x64 expects: chrome-linux64 # - linux-arm64 expects: chrome-linux @@ -54,11 +60,11 @@ let chromium-linux = stdenv.mkDerivation { name = "playwright-chromium"; src = fetchzip { - url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; + inherit (download) url stripRoot; hash = { - x86_64-linux = "sha256-r715GrQMPRIsM2/Z6SRyvo/6j4fbWXKfCCh//Cc2DGw="; - aarch64-linux = "sha256-bS8CstCia8dm2DG9vBKHjsfeoXkyBZStBefu0kD8c2o="; + x86_64-linux = "sha256-dJSO05xOzlSl/EwOWNQCeuSb+lhUU6NlGBnRu59irnM="; + aarch64-linux = "sha256-9DFLCPuc9WZjYLzlRW+Df2pb+mViPK3/IOkkUozELsw="; } .${system} or throwSystem; }; @@ -121,12 +127,11 @@ let ''; }; chromium-darwin = fetchzip { - url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-kGHlIxS9Ti362XmBt+aepYV45cCZoBRqJ+YBsLasDp0="; - aarch64-darwin = "sha256-LwY25Ckh1ZY+L196shf8ydF4IHXUIeI83Yqp8KG+nc4="; + x86_64-darwin = "sha256-vQuBHM0jkk6S/Gco/bBqSPJqXi/CJt/+nkbGtFNpgwk="; + aarch64-darwin = "sha256-qXdgHeBS5IFIa4hZVmjq0+31v/uDPXHyc4aH7Wn2E7E="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 7750fac295ca..058278509365 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -11,36 +11,28 @@ callPackage, makeFontsConf, makeWrapper, - runCommand, cacert, }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - suffix = - { - x86_64-linux = "linux"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "mac"; - aarch64-darwin = "mac-arm64"; - } - .${system} or throwSystem; + browsersJSON = (lib.importJSON ./browsers.json).browsers; - version = "1.57.0"; + version = "1.58.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright"; rev = "v${version}"; - hash = "sha256-1g8XCToVKWOjLpWS6g60FpoIphg9Rn/nv10oRa7oyDA="; + hash = "sha256-PRA3hjMlnHGVMidhEo371WXRPyVP2W0rle8ONUlKg9Y="; }; babel-bundle = buildNpmPackage { pname = "babel-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/babel"; - npmDepsHash = "sha256-ByCy4go8PM0ksDg+2DcJPyoKG7Z0uIqKM647ZQwYwAE="; + npmDepsHash = "sha256-MVMxYncmIA4k6h7mLirJaroOSNbCpvKSGxN3BGGqJ9w="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -60,7 +52,7 @@ let pname = "utils-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/utils"; - npmDepsHash = "sha256-InwWYRk6eRF62qI6qpVaPceIetSr3kPIBK4LdfeoJdo="; + npmDepsHash = "sha256-HzMu3xDb7MleJSsQ1+VvpIFSxcRfnVXniYIv/c5PHRg="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -70,7 +62,7 @@ let pname = "utils-bundle-core"; inherit version src; sourceRoot = "${src.name}/packages/playwright-core/bundles/utils"; - npmDepsHash = "sha256-lOwcHRpv7OKfdnwqHxvh+Gy5AE/Up3Vro4czedNiOpc="; + npmDepsHash = "sha256-/nxMK+gr4jmxeUazLRXd9LXdYYBVY9VnzbbXoxazX7c="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -92,7 +84,7 @@ let inherit version src; sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence - npmDepsHash = "sha256-69v+H3EQuJadma8b/l9rA/yMFCCb7wWiBGN/LoJLJM8="; + npmDepsHash = "sha256-kc77z9REuV7b+zHcUzBLf7F2+cbAhzD/kaGxa6xNnGo="; nativeBuildInputs = [ cacert @@ -164,7 +156,7 @@ let ''; passthru = { - browsersJSON = (lib.importJSON ./browsers.json).browsers; + inherit browsersJSON; selectBrowsers = browsers; browsers = browsers { }; browsers-chromium = browsers { @@ -172,7 +164,11 @@ let withWebkit = false; withChromiumHeadlessShell = false; }; + tests.browser-downloads = callPackage ./browser-downloads-test.nix { + playwright-core = finalAttrs.finalPackage; + }; inherit components; + updateScript = ./update.sh; }; }); @@ -203,27 +199,27 @@ let components = { chromium = callPackage ./chromium.nix { - inherit suffix system throwSystem; - inherit (playwright-core.passthru.browsersJSON.chromium) revision; + inherit system throwSystem; + inherit (browsersJSON.chromium) revision browserVersion; fontconfig_file = makeFontsConf { fontDirectories = [ ]; }; }; chromium-headless-shell = callPackage ./chromium-headless-shell.nix { - inherit suffix system throwSystem; - inherit (playwright-core.passthru.browsersJSON.chromium) revision; + inherit system throwSystem; + inherit (browsersJSON."chromium-headless-shell") revision browserVersion; }; firefox = callPackage ./firefox.nix { - inherit suffix system throwSystem; - inherit (playwright-core.passthru.browsersJSON.firefox) revision; + inherit system throwSystem; + inherit (browsersJSON.firefox) revision; }; webkit = callPackage ./webkit.nix { - inherit suffix system throwSystem; - inherit (playwright-core.passthru.browsersJSON.webkit) revision; + inherit system throwSystem; + inherit (browsersJSON.webkit) revision; }; ffmpeg = callPackage ./ffmpeg.nix { - inherit suffix system throwSystem; - inherit (playwright-core.passthru.browsersJSON.ffmpeg) revision; + inherit system throwSystem; + inherit (browsersJSON.ffmpeg) revision; }; }; @@ -251,8 +247,7 @@ let map ( name: let - revName = if name == "chromium-headless-shell" then "chromium" else name; - value = playwright-core.passthru.browsersJSON.${revName}; + value = browsersJSON.${name}; in lib.nameValuePair # TODO check platform for revisionOverrides diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix index 331541e1e405..f6ea2d06b130 100644 --- a/pkgs/development/web/playwright/ffmpeg.nix +++ b/pkgs/development/web/playwright/ffmpeg.nix @@ -1,13 +1,18 @@ { fetchzip, - suffix, revision, system, throwSystem, }: +let + download = + (import ./browser-downloads.nix { + name = "ffmpeg"; + inherit revision; + }).${system} or throwSystem; +in fetchzip { - url = "https://playwright.azureedge.net/builds/ffmpeg/${revision}/ffmpeg-${suffix}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { x86_64-linux = "sha256-AWTiui+ccKHxsIaQSgc5gWCJT5gYwIWzAEqSuKgVqZU="; diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index 6d081c637f5c..a9a1f840fc89 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -1,24 +1,26 @@ { - lib, stdenv, fetchzip, firefox-bin, - suffix, revision, system, throwSystem, }: let + download = + (import ./browser-downloads.nix { + name = "firefox"; + inherit revision; + }).${system} or throwSystem; + firefox-linux = stdenv.mkDerivation { name = "playwright-firefox"; src = fetchzip { - url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${ - "ubuntu-22.04" + (lib.removePrefix "linux" suffix) - }.zip"; + inherit (download) url stripRoot; hash = { - x86_64-linux = "sha256-PGTFoSjU2FFRmH7qfWkJsgnGvg3AI+eGrNUwyxRU8PM="; - aarch64-linux = "sha256-P5aHwaNZ0KfAVgRVugvAl6FsQu2/7sphwulOVyXiTgg="; + x86_64-linux = "sha256-+mwhR8QQ9fs7hD3C4Xn9xcL8LRU+rt2JO8Gcg/KjqRU="; + aarch64-linux = "sha256-drL8jduYK0rnmLYW9jzSTKHb0pKaezMnpER5kLikEvY="; } .${system} or throwSystem; }; @@ -37,12 +39,11 @@ let ''; }; firefox-darwin = fetchzip { - url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-MI4HfXLmVEwcoL2jlcrDkfiClEN5rI8YcJiMqzE1xYs="; - aarch64-darwin = "sha256-Il7bTQoP6ZlqizduV4iCTrVsymy33RbGQtVSnVXnhTc="; + x86_64-darwin = "sha256-uxPOq2U1D9gFXqvNzclctLbHx4fZ9O92GtDQjCRYGiM="; + aarch64-darwin = "sha256-ZFRmtlNrzrjB3ELXmGC67XO1IhfWsWZ7rXaUQ6If65s="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/update.sh b/pkgs/development/web/playwright/update.sh new file mode 100755 index 000000000000..fd8bc354beef --- /dev/null +++ b/pkgs/development/web/playwright/update.sh @@ -0,0 +1,183 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip nix-prefetch +# shellcheck shell=bash +set -euo pipefail + +root="$(dirname "$(readlink -f "$0")")" +repo_root="$(git -C "$root" rev-parse --show-toplevel)" +cd "$repo_root" + +github_api_curl_args=() +if [ -n "${GITHUB_TOKEN:-}" ]; then + github_api_curl_args=(-u ":$GITHUB_TOKEN") +fi + +playwright_browsers_file="$root/browsers.json" +playwright_driver_file="$root/driver.nix" +playwright_raw_repo_url="https://raw.githubusercontent.com/microsoft/playwright" +playwright_mcp_package_file="$root/../../../by-name/pl/playwright-mcp/package.nix" +browser_names=(chromium chromium-headless-shell firefox webkit ffmpeg) +browser_systems=(x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin) + +github_api_get() { + curl "${github_api_curl_args[@]}" -fsSL "$1" +} + +major_minor() { + echo "${1%.*}" +} + +python_version=$(github_api_get https://api.github.com/repos/microsoft/playwright-python/releases/latest | jq -r '.tag_name | sub("^v"; "")') +# Most of the time, this should be the latest stable release of the Node-based +# Playwright version, but upstream occasionally ships additional npm-only patch +# releases. Resolve the latest patch in the same major.minor series. +setup_py_url="https://github.com/microsoft/playwright-python/raw/v${python_version}/setup.py" +python_driver_version=$(curl -fsSL "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') +python_major_minor=$(major_minor "$python_driver_version") +resolve_driver_version_latest_patch() { + local mm_escaped + mm_escaped=${python_major_minor//./\\.} + curl -fsSL "https://registry.npmjs.org/playwright" \ + | jq -r '.versions | keys[]' \ + | grep -E "^${mm_escaped}\.[0-9]+$" \ + | sort -V \ + | tail -n1 +} +driver_version="$(resolve_driver_version_latest_patch)" +: "${driver_version:?failed to resolve driver version from npm for python major.minor ${python_major_minor}}" +: "${python_driver_version:?failed to resolve driver_version from ${setup_py_url}}" + +# TODO: skip if update-source-version reported the same version +update-source-version playwright-driver "$driver_version" +update-source-version python3Packages.playwright "$python_version" + +temp_dir=$(mktemp -d) +trap 'rm -rf "$temp_dir"' EXIT + +# Update playwright-mcp package +driver_major_minor=$(major_minor "$driver_version") +resolve_mcp_version() { + local releases_json + local tag_name + + releases_json=$(github_api_get "https://api.github.com/repos/microsoft/playwright-mcp/releases?per_page=100") + while IFS= read -r tag_name; do + local mcp_version_candidate mcp_npm_url mcp_playwright_dep mcp_major_minor + mcp_version_candidate=${tag_name#v} + mcp_npm_url="https://registry.npmjs.org/@playwright/mcp/${mcp_version_candidate}" + mcp_playwright_dep=$( + curl -fsSL "$mcp_npm_url" \ + | jq -r '.dependencies.playwright // .dependencies["playwright-core"] // empty' + ) || continue + mcp_major_minor=$(echo "$mcp_playwright_dep" | grep -Eo '[0-9]+\.[0-9]+' | head -n1 || true) + if [ "$mcp_major_minor" = "$driver_major_minor" ]; then + echo "$mcp_version_candidate" + return 0 + fi + done < <(echo "$releases_json" | jq -r '.[].tag_name') + return 1 +} +mcp_version="$(resolve_mcp_version)" || { + echo "Could not find a playwright-mcp release compatible with Playwright driver ${driver_version}" >&2 + exit 1 +} +update-source-version playwright-mcp "$mcp_version" + +# Update npmDepsHash for playwright-mcp +mcp_lock_file="${temp_dir}/playwright-mcp-package-lock.json" +curl -fsSL -o "$mcp_lock_file" "https://raw.githubusercontent.com/microsoft/playwright-mcp/v${mcp_version}/package-lock.json" +mcp_npm_hash=$(prefetch-npm-deps "$mcp_lock_file") + +sed -E -i 's#\bnpmDepsHash = "[^"]*"#npmDepsHash = "'"$mcp_npm_hash"'"#' "$playwright_mcp_package_file" + + +# update binaries of browsers, used by playwright. +replace_sha() { + local target_file="$1" + local attr_name="$2" + local new_hash="$3" + + sed -i "s|$attr_name = \".\{44,52\}\"|$attr_name = \"$new_hash\"|" "$target_file" +} + +prefetch_browser() { + local url="$1" + local strip_root="$2" + + # nix-prefetch is used to obtain sha with `stripRoot = false` + # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53 + nix-prefetch --option extra-experimental-features flakes -q "{ stdenv, fetchzip }: stdenv.mkDerivation { name=\"browser\"; src = fetchzip { url = \"$url\"; stripRoot = $strip_root; }; }" +} + +browser_download_info() { + local name="$1" + local revision="$2" + local browser_version="$3" + + nix-instantiate --eval --json --strict "$root/browser-downloads.nix" \ + --argstr name "$name" \ + --argstr revision "$revision" \ + --argstr browserVersion "$browser_version" +} + +update_browser() { + local name="$1" + local revision + local browser_version + local download_info + local system + local url + local strip_root + + revision="$(jq -r ".browsers[\"$name\"].revision" "$playwright_browsers_file")" + browser_version="$(jq -r ".browsers[\"$name\"].browserVersion // empty" "$playwright_browsers_file")" + download_info="$(browser_download_info "$name" "$revision" "$browser_version")" + + for system in "${browser_systems[@]}"; do + url="$(echo "$download_info" | jq -r --arg system "$system" '.[$system].url')" + strip_root="$(echo "$download_info" | jq -r --arg system "$system" '.[$system].stripRoot')" + replace_sha "$root/$name.nix" "$system" "$(prefetch_browser "$url" "$strip_root")" + done +} + +curl -fsSL \ + "https://raw.githubusercontent.com/microsoft/playwright/v${driver_version}/packages/playwright-core/browsers.json" \ + | jq ' + .comment = "This file is kept up to date via update.sh" + | .browsers |= ( + [.[] + | select(.installByDefault) | del(.installByDefault)] + | map({(.name): . | del(.name)}) + | add + ) + ' > "$playwright_browsers_file" + +for browser in "${browser_names[@]}"; do + update_browser "$browser" +done + +# Update package-lock.json files for all npm deps that are built in playwright + +# Download `package-lock.json` for a given sourceRoot path and update its hash. +update_hash() { + local source_root_path="$1" + local download_url + local lock_file + local new_hash + local source_root_pattern + + download_url="${playwright_raw_repo_url}/v${driver_version}${source_root_path}/package-lock.json" + lock_file="${temp_dir}/$(echo "$source_root_path" | tr '/.' '__').package-lock.json" + curl -fsSL -o "$lock_file" "$download_url" + new_hash=$(prefetch-npm-deps "$lock_file") + + source_root_pattern=$(printf '%s\n' "$source_root_path" | sed 's/[][\\/.*^$+?(){}|]/\\&/g') + sed -E -i "/sourceRoot = \"\\\$\\{src.name\\}${source_root_pattern}\";/,/npmDepsHash = / s#npmDepsHash = \"[^\"]*\";#npmDepsHash = \"${new_hash}\";#" "$playwright_driver_file" +} + +while IFS= read -r source_root_path; do + update_hash "$source_root_path" +done < <( + # shellcheck disable=SC2016 + sed -n 's#^[[:space:]]*sourceRoot = "${src.name}\(.*\)";.*$#\1#p' "$playwright_driver_file" +) diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index f818618295d4..17ddcf5c3d83 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -19,7 +19,7 @@ gst_all_1, harfbuzz, harfbuzzFull, - icu70, + icu74, lcms, libavif, libdrm, @@ -46,19 +46,16 @@ wayland-scanner, woff2, zlib, - suffix, revision, system, throwSystem, }: let - suffix' = - if lib.hasPrefix "linux" suffix then - "ubuntu-22.04" + (lib.removePrefix "linux" suffix) - else if lib.hasPrefix "mac" suffix then - "mac-14" + (lib.removePrefix "mac" suffix) - else - suffix; + download = + (import ./browser-downloads.nix { + name = "webkit"; + inherit revision; + }).${system} or throwSystem; libvpx' = libvpx.overrideAttrs ( finalAttrs: previousAttrs: { version = "1.12.0"; @@ -70,20 +67,6 @@ let }; } ); - libavif' = libavif.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "0.9.3"; - src = fetchFromGitHub { - owner = "AOMediaCodec"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds="; - }; - postPatch = ""; - patches = [ ]; - } - ); - libjxl' = libjxl.overrideAttrs ( finalAttrs: previousAttrs: { version = "0.8.2"; @@ -133,12 +116,11 @@ let webkit-linux = stdenv.mkDerivation { name = "playwright-webkit"; src = fetchzip { - url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { - x86_64-linux = "sha256-wSMObGeDoy1vW7TO20wL3vWOSpcDgFciK00SqZ15EjM="; - aarch64-linux = "sha256-IyZNAcAUxDpCgc/I2dWtIoRqKiZJ1ggmYqqdvUKg6IE="; + x86_64-linux = "sha256-Ei08TuR+WedVAfKRSeRQq7ZhULgxXQIV0bQPcNFYhr4="; + aarch64-linux = "sha256-/+tven7ksYhXQxPYfazyZhNsgvE8rr3A28fZPwL4c9s="; } .${system} or throwSystem; }; @@ -162,9 +144,9 @@ let gst_all_1.gstreamer harfbuzz harfbuzzFull - icu70 + icu74 lcms - libavif' + libavif libdrm libepoxy libevent @@ -214,12 +196,11 @@ let ''; }; webkit-darwin = fetchzip { - url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; - stripRoot = false; + inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-a8NKlNhKPEhtWREAgNosvTLE+zphmKYW+CtvW5jwFlQ="; - aarch64-darwin = "sha256-DvVTVAxuh4we2278xZFBomFAxcuqyEOCK7mPg3rnYpU="; + x86_64-darwin = "sha256-An3sdw8HltgHQ6YASsxyhoK1fd8PxZ0BBCMpnOORkv8="; + aarch64-darwin = "sha256-suXPCuXLMz3xoFxE5+Yjd9OXxLfNDDJiU6O1Ic0PsOI="; } .${system} or throwSystem; }; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 67f5d56715db..2d6a85df58c3 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.17"; - hash = "sha256-REUiyKNRDhpE0vRJb+PyBpOQem0oZrV+rbeLtkkJSTo="; + version = "6.18.18"; + hash = "sha256-ynfFioeCP2kvuCE6swH6OmqbfVDGBGEDfCJjaUfZ9g4="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.19.7"; - hash = "sha256-I0bv4r08pUuhjJR1ksti2vDqzq2tZdNcaD24kDBLssk="; + version = "6.19.8"; + hash = "sha256-Ay3tWPDz//Pnaam0EjqvVOM3zxSFTby0YxdWBW1a4es="; }; }; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index d1886342bcd4..80a309fa1619 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "nct6687d"; - version = "0-unstable-2026-02-19"; + version = "0-unstable-2026-03-13"; src = fetchFromGitHub { owner = "Fred78290"; repo = "nct6687d"; - rev = "03037dea69293d77d19e60afb6ff720157cd4672"; - hash = "sha256-iJjnk891BXArXX0oGxP4F+h5Dlv0CkXkYvgMGy49tFY="; + rev = "cedda8bff09a4083e07414fb80fdc3901e7ab544"; + hash = "sha256-+9gGpr004hKvvQeadTOwFe4gZvmx5bO1jWmlmt4NfSo="; }; setSourceRoot = '' diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 8095c5cbece6..b197b90e5aa4 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.3.3"; + version = "3.4"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"; - hash = "sha256-B3bwHV+f6IuoNESz5B4ij5KsIcCcpUPmoSnJeJj0J0Y="; + hash = "sha256-7IMInvVLIjGcHZvnSzhcne+4ieFa85ep7KMn2Oy9pF8="; }; # Don't build and install html documentation diff --git a/pkgs/servers/apache-kafka/3_9.nix b/pkgs/servers/apache-kafka/3_9.nix index ecd0ed75f784..e59ccd11df23 100644 --- a/pkgs/servers/apache-kafka/3_9.nix +++ b/pkgs/servers/apache-kafka/3_9.nix @@ -1,5 +1,5 @@ import ./generic.nix { - kafkaVersion = "3.9.1"; + kafkaVersion = "3.9.2"; scalaVersion = "2.13"; - hash = "sha256-3UOZgW5niUbKt2470WhhA1VeabyPKrhobNpxqhW8MaM="; + hash = "sha256-1dlRwiSE+aCQiwVWO8gKBC3pd53x4GqJ930nzrX2gyM="; } diff --git a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix index 0c1aaa745880..75fdcff27b0f 100644 --- a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix +++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix @@ -19,13 +19,13 @@ buildHomeAssistantComponent rec { owner = "danielcherubini"; domain = "elegoo_printer"; - version = "2.7.3"; + version = "2.7.5"; src = fetchFromGitHub { owner = "danielcherubini"; repo = "elegoo-homeassistant"; tag = "v${version}"; - hash = "sha256-ka1KHO46JsO0MBrSzrwZcQglxvRJjzJNfkfXUaAeB04="; + hash = "sha256-kZ5RzK/NbW8yysBKmmAWju41lao1leiHJsFQuheX93c="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index ef61e89e392e..b1e39e584448 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -17,13 +17,13 @@ buildHomeAssistantComponent rec { owner = "bramstroker"; domain = "powercalc"; - version = "1.20.8"; + version = "1.20.9"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-powercalc"; tag = "v${version}"; - hash = "sha256-E23GJOnc54iefgf5Y+purEPH4OrtlNiIs1EkcR2TjHM="; + hash = "sha256-0B7C4WBYgfS1M838kcc57gIIkH6ufozAelKF0IKzFi8="; }; dependencies = [ numpy ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index fffa8ddb6922..a8bdd12a4cc8 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.13.0-unstable-2026-03-04"; + version = "0.13.0-unstable-2026-03-09"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "88a71c3ce5383085b18d87d76ac42686ec7fad9f"; - sha256 = "sha256-9brIlsO0lice0atZux2OHdAR9DD0xx/aeRLziU6HQ94="; + rev = "644cda5ecaa39d0dcf797624c19d5425cb8121ec"; + sha256 = "sha256-ono0+6pyjJDexaDOH/vYNFNyh636iNfjBMxmWNbgVik="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index d9d1cddb1661..614e1816d0d5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "1.0.39"; - zipHash = "sha256-wQihdZ2Oj3ukdNvZP1hFWx4vI882GLWDhGCqzFAuSC0="; + version = "1.0.41"; + zipHash = "sha256-hOsiRHj32ydvNsSugFviw4NMVqjg11n7hIxVNr9dcA0="; meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index bf891cfbe8e2..07840a2a0e53 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.33"; - zipHash = "sha256-zQ9XwF4gUlsR5bGZVzQq/cXCLwrQ3xfYQK2jOZyrWH4="; + version = "1.0.34"; + zipHash = "sha256-wUjzCYLJ3fF80Q374bMyr7fQUb2XzxQjoYMDJvufqPM="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix index 7bca75ac0eb1..1615217e4b4d 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-logs-datasource"; - version = "0.26.2"; - zipHash = "sha256-m/ckiKhlrHNlbkXjvqXbNYogoI6QyEa1thBQmga5V/4="; + version = "0.26.3"; + zipHash = "sha256-6aRSuGZCfw3iPkZrGvgij7sTRCZ/kp+2s1T4MCecdIo="; meta = { description = "Grafana datasource for VictoriaLogs"; license = lib.licenses.asl20; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 08e7e268e146..d0ab7306c6aa 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.33.1"; + version = "2.34.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-eval-jobs"; tag = "v${version}"; - hash = "sha256-ONA7ztgyE2CC3T45NiGxQgCBQevAJ1+pEJlMQpREjBA="; + hash = "sha256-OFGRoJOYhvZ3Enk5a8vMy0QNcG5ZxyzFhyHMrwKXde8="; }; buildInputs = [ diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 1de1afb649e0..021bcd119e91 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -3,7 +3,7 @@ tl, bin, - version, + tlpdbVersion, lib, buildEnv, @@ -49,10 +49,9 @@ lib.fix ( args: (buildEnv ( { - pname = name; - version = "${toString version.texliveYear}-unstable-${version.year}-${version.month}-${version.day}"; + inherit pname version; - inherit (args) name paths; + inherit (args) paths; } // lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; } // lib.optionalAttrs (args ? pathsToLink) { inherit (args) pathsToLink; } @@ -216,11 +215,20 @@ lib.fix ( ] ) pkgList.bin; - name = + pname = if __combine then - "texlive-${__extraName}-${bin.texliveYear}${__extraVersion}" # texlive.combine: old name name + "texlive-${__extraName}" # texlive.combine: old name else - "texlive-${bin.texliveYear}-" + (if __formatsOf != null then "${__formatsOf.pname}-fmt" else "env"); + "texlive"; + version = + if __combine then + "${toString tlpdbVersion.year}${__extraVersion}" # texlive.combine: old version + else + "${toString tlpdbVersion.year}-r${toString tlpdbVersion.revision}-" + + (lib.optionalString tlpdbVersion.frozen "final-") + + (if __formatsOf != null then "${__formatsOf.pname}-fmt" else "env"); + + name = "${pname}-${version}"; texmfdist = buildEnv' { name = "${name}-texmfdist"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 155c2c801983..353df3c2bbe4 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -198,7 +198,7 @@ let # function for creating a working environment buildTeXEnv = import ./build-tex-env.nix { inherit bin tl; - inherit version; + inherit tlpdbVersion; ghostscript = ghostscript_headless; inherit lib diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 94f30f687bc0..fee3a804dcfb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -612,6 +612,7 @@ mapAliases { dtv-scan-tables_linuxtv = throw "'dtv-scan-tables_linuxtv' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27 dtv-scan-tables_tvheadend = throw "'dtv-scan-tables_tvheadend' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27 du-dust = throw "'du-dust' has been renamed to/replaced by 'dust'"; # Converted to throw 2025-10-27 + duckstation = throw "'duckstation' has been removed following upstream request. Please use the appimage instead"; # Added 2026-03-14 duckstation-bin = duckstation; # Added 2025-09-20 dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14 dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 223949269fe7..0819b252c12b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7618,7 +7618,7 @@ with pkgs; gtkVersion = "4"; }; - inherit (callPackage ../development/libraries/vtk { }) vtk_9_5; + inherit (callPackage ../development/libraries/vtk { }) vtk_9_5 vtk_9_6; vtk = vtk_9_5; @@ -7630,8 +7630,6 @@ with pkgs; vtkWithQt6 = vtk.override { withQt6 = true; }; - vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; - wayland = callPackage ../development/libraries/wayland { }; wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { }; @@ -10194,10 +10192,6 @@ with pkgs; taxi-cli = with python3Packages; toPythonApplication taxi; - imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { - lua = lua5; - }; - mupdf-headless = mupdf.override { enableX11 = false; enableGL = false; @@ -12169,7 +12163,7 @@ with pkgs; ); nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nixComponents = nixVersions.nixComponents_2_33; + nixComponents = nixVersions.nixComponents_2_34; }; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 29b10a13115c..8b869dda32cf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -93,6 +93,7 @@ mapAliases { async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29 asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29 atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29 + audio-metadata = throw "'audio-metadata' has been removed as it's unmaintained since 2020"; # Added 2026-03-12 autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29 av_13 = throw "'av_13' has been renamed to/replaced by 'av'"; # Added 2026-02-01 Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29 @@ -123,6 +124,7 @@ mapAliases { casbin = pycasbin; # added 2025-06-12 cchardet = throw "'cchardet' has been renamed to/replaced by 'faust-cchardet'"; # Converted to throw 2025-10-29 characteristic = throw "'characteristic' has been removed because it is no longer maintained upstream"; # Added 2026-01-14 + chart-studio = throw "'chart-studio' has been removed as it is no longer maintained upstream"; # Added 2026-03-12 cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13 class-registry = throw "'class-registry' has been renamed to/replaced by 'phx-class-registry'"; # Converted to throw 2025-10-29 ColanderAlchemy = throw "'ColanderAlchemy' has been renamed to/replaced by 'colanderalchemy'"; # Converted to throw 2025-10-29 @@ -537,6 +539,7 @@ mapAliases { systembridge = throw "systembridge has been removed because it is unmaintained upstream"; # Added 2025-11-23 systemd = throw "systemd was removed because it was misnamed; use systemd-python instead"; # added 2025-11-09 sysv_ipc = throw "'sysv_ipc' has been renamed to/replaced by 'sysv-ipc'"; # Converted to throw 2025-10-29 + tbm-utils = throw "'tbm-utils' has been removed as it is unmaintained since 2020"; # Added 2026-03-12 tensorflow-bin_2 = throw "'tensorflow-bin_2' has been renamed to/replaced by 'tensorflow-bin'"; # Converted to throw 2025-10-29 tensorflow-build_2 = throw "'tensorflow-build_2' has been renamed to/replaced by 'tensorflow-build'"; # Converted to throw 2025-10-29 tensorflow-estimator = throw "'tensorflow-estimator' has been renamed to/replaced by 'tensorflow-estimator-bin'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef4b99013cf6..01d9a6cbedd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1206,8 +1206,6 @@ self: super: with self; { audible = callPackage ../development/python-modules/audible { }; - audio-metadata = callPackage ../development/python-modules/audio-metadata { }; - audioop-lts = if pythonAtLeast "3.13" then callPackage ../development/python-modules/audioop-lts { } else null; @@ -2667,8 +2665,6 @@ self: super: with self; { charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; - chart-studio = callPackage ../development/python-modules/chart-studio { }; - chat-downloader = callPackage ../development/python-modules/chat-downloader { }; chatlas = callPackage ../development/python-modules/chatlas { }; @@ -4160,8 +4156,6 @@ self: super: with self; { django-currentuser = callPackage ../development/python-modules/django-currentuser { }; - django-dbbackup = callPackage ../development/python-modules/django-dbbackup { }; - django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { }; django-dynamic-preferences = @@ -4176,8 +4170,6 @@ self: super: with self; { django-environ = callPackage ../development/python-modules/django-environ { }; - django-error-report-2 = callPackage ../development/python-modules/django-error-report-2 { }; - django-extensions = callPackage ../development/python-modules/django-extensions { }; django-filer = callPackage ../development/python-modules/django-filer { }; @@ -4186,8 +4178,6 @@ self: super: with self; { django-filter = callPackage ../development/python-modules/django-filter { }; - django-flags = callPackage ../development/python-modules/django-flags { }; - django-formset-js-improved = callPackage ../development/python-modules/django-formset-js-improved { }; @@ -4222,8 +4212,6 @@ self: super: with self; { django-i18nfield = callPackage ../development/python-modules/django-i18nfield { }; - django-ical = callPackage ../development/python-modules/django-ical { }; - django-import-export = callPackage ../development/python-modules/django-import-export { }; django-ipware = callPackage ../development/python-modules/django-ipware { }; @@ -4252,14 +4240,10 @@ self: super: with self; { callPackage ../development/python-modules/django-login-required-middleware { }; - django-mailbox = callPackage ../development/python-modules/django-mailbox { }; - django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { }; - django-markdownify = callPackage ../development/python-modules/django-markdownify { }; - django-markdownx = callPackage ../development/python-modules/django-markdownx { }; django-markup = callPackage ../development/python-modules/django-markup { }; @@ -4278,8 +4262,6 @@ self: super: with self; { django-modeltranslation = callPackage ../development/python-modules/django-modeltranslation { }; - django-money = callPackage ../development/python-modules/django-money { }; - django-mptt = callPackage ../development/python-modules/django-mptt { }; django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; @@ -4348,8 +4330,6 @@ self: super: with self; { django-ratelimit = callPackage ../development/python-modules/django-ratelimit { }; - django-recurrence = callPackage ../development/python-modules/django-recurrence { }; - django-redis = callPackage ../development/python-modules/django-redis { }; django-registration = callPackage ../development/python-modules/django-registration { }; @@ -4392,19 +4372,10 @@ self: super: with self; { django-sql-utils = callPackage ../development/python-modules/django-sql-utils { }; - django-sslserver = callPackage ../development/python-modules/django-sslserver { }; - django-statici18n = callPackage ../development/python-modules/django-statici18n { }; - django-stdimage = callPackage ../development/python-modules/django-stdimage { - django = django_4; - pytest-django = pytest-django.override { django = django_4; }; - }; - django-storages = callPackage ../development/python-modules/django-storages { }; - django-structlog = callPackage ../development/python-modules/django-structlog { }; - django-stubs = callPackage ../development/python-modules/django-stubs { }; django-stubs-ext = callPackage ../development/python-modules/django-stubs-ext { }; @@ -4437,8 +4408,6 @@ self: super: with self; { django-types = callPackage ../development/python-modules/django-types { }; - django-user-sessions = callPackage ../development/python-modules/django-user-sessions { }; - django-valkey = callPackage ../development/python-modules/django-valkey { }; django-versatileimagefield = @@ -4455,10 +4424,6 @@ self: super: with self; { django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; - django-xforwardedfor-middleware = - callPackage ../development/python-modules/django-xforwardedfor-middleware - { }; - # LTS in extended support phase django_4 = callPackage ../development/python-modules/django/4.nix { }; @@ -11332,6 +11297,8 @@ self: super: with self; { obstore = callPackage ../development/python-modules/obstore { }; + obsws-python = callPackage ../development/python-modules/obsws-python { }; + oca-port = callPackage ../development/python-modules/oca-port { }; ochre = callPackage ../development/python-modules/ochre { }; @@ -12756,8 +12723,6 @@ self: super: with self; { ppdeep = callPackage ../development/python-modules/ppdeep { }; - ppf-datamatrix = callPackage ../development/python-modules/ppf-datamatrix { }; - ppft = callPackage ../development/python-modules/ppft { }; ppk2-api = callPackage ../development/python-modules/ppk2-api { }; @@ -13121,8 +13086,6 @@ self: super: with self; { py-melissa-climate = callPackage ../development/python-modules/py-melissa-climate { }; - py-moneyed = callPackage ../development/python-modules/py-moneyed { }; - py-multiaddr = callPackage ../development/python-modules/py-multiaddr { }; py-multibase = callPackage ../development/python-modules/py-multibase { }; @@ -14360,6 +14323,8 @@ self: super: with self; { pynput = callPackage ../development/python-modules/pynput { }; + pynputfix = callPackage ../development/python-modules/pynputfix { }; + pynrrd = callPackage ../development/python-modules/pynrrd { }; pynslookup = callPackage ../development/python-modules/pynslookup { }; @@ -18918,10 +18883,10 @@ self: super: with self; { ; }; - tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - tccbox = callPackage ../development/python-modules/tccbox { }; + tcia-utils = callPackage ../development/python-modules/tcia-utils { }; + tcolorpy = callPackage ../development/python-modules/tcolorpy { }; tcxfile = callPackage ../development/python-modules/tcxfile { };