diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 755d0d63ac8b..0eb7b892c3a5 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -11,7 +11,7 @@ on: permissions: contents: read - issues: write # adding the 'has: port to stable' label + issues: write # adding the 'has: port to stable' and 'has: backport failed' label pull-requests: write # creating backport pull requests defaults: @@ -49,7 +49,7 @@ jobs: - name: Create backport PRs id: backport - uses: korthout/backport-action@7c3f6cd5843cac11bc59a04a1b7699af93261670 # v4.5.0 + uses: korthout/backport-action@bf97bcfb53d5250af8b9a15fab0f56158a63b224 # v4.5.1 with: # Config README: https://github.com/korthout/backport-action#backport-action add_author_as_reviewer: true @@ -82,3 +82,16 @@ jobs: issue_number: context.payload.pull_request.number, labels: [ '8.has: port to stable' ] }) + + - name: "Add 'has: failed backport' label" + if: steps.backport.outputs.was_successful == 'false' + uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 + with: + # Not using the app on purpose to avoid triggering another workflow run after adding this label. + script: | + await github.rest.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: [ '8.has: failed backport' ] + }) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 687c7935c305..1b0336cf05de 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -91,7 +91,7 @@ jobs: GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }} run: gh api /rate_limit | jq - - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1 + - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 name: Labels from touched files if: | github.event_name == 'pull_request_target' && @@ -101,7 +101,7 @@ jobs: configuration-path: .github/labeler.yml # default sync-labels: true - - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1 + - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 name: Labels from touched files (no sync) if: | github.event_name == 'pull_request_target' && @@ -111,7 +111,7 @@ jobs: configuration-path: .github/labeler-no-sync.yml sync-labels: false - - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1 + - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 name: Labels from touched files (development branches) # Development branches like staging-next, haskell-updates and python-updates get special labels. # This is to avoid the mass of labels there, which is mostly useless - and really annoying for diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 591516bb93cf..789b9189c187 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 with: # Sandbox is disabled on MacOS by default. extra_nix_config: sandbox = true diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 12652e455fb9..50d9ad694984 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -147,7 +147,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17 continue-on-error: true diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index dc8f8fff421e..7ea55dd013da 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -136,7 +136,7 @@ jobs: core.info(`Found pinned.json commit: ${ciPinBumpCommit}`) - name: Install Nix - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - name: Load supported versions id: versions @@ -184,7 +184,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Install Nix - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17 continue-on-error: true @@ -274,7 +274,7 @@ jobs: merge-multiple: true - name: Install Nix - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - name: Combine all output paths and eval stats run: | @@ -481,7 +481,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} - name: Install Nix - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - name: Ensure flake outputs on all systems still evaluate run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 536a4757026c..3ff31a66091d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,7 +35,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well, # because the cache would be invalidated on every commit - treefmt checks every file. @@ -70,7 +70,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17 continue-on-error: true @@ -100,7 +100,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5 + - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17 continue-on-error: true diff --git a/ci/github-script/manual-file-edits.js b/ci/github-script/manual-file-edits.js index 84235d44752c..2f8d5caeb528 100644 --- a/ci/github-script/manual-file-edits.js +++ b/ci/github-script/manual-file-edits.js @@ -1,4 +1,5 @@ // @ts-check +const { classify } = require('../supportedBranches.js') const { getCommitDetailsForPR } = require('./get-pr-commit-details') /** @@ -32,6 +33,27 @@ async function checkManualFileEdits({ github, context, core, repoPath, dry }) { return } + const baseBranchType = classify( + pr.base.ref.replace(/^refs\/heads\//, ''), + ).type + const headBranchType = classify( + pr.head.ref.replace(/^refs\/heads\//, ''), + ).type + + if ( + baseBranchType.includes('development') && + headBranchType.includes('development') && + pr.base.repo.id === pr.head.repo?.id + ) { + // This matches, for example, PRs from NixOS:staging-next to NixOS:master, or vice versa. + // Ignore them: we should only care about PRs introducing *new* commits. + // We still want to run on PRs from, e.g., Someone:master to NixOS:master, though. + core.info( + 'This PR is from one development branch to another. Skipping checks.', + ) + return + } + const details = await getCommitDetailsForPR({ core, pr, repoPath }) if ( diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index ab63631ace2b..5953d676210c 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -93,6 +93,8 @@ This update introduces several breaking changes: the Python plugin interface is now v5.0, the `PATH` plugin has been renamed to `Commandline`, and the QStylesheets-based widgets box model frontend has been removed. For more information read the [changelog for 34.0.0](https://albertlauncher.github.io/2026/01/19/albert-v34.0.0-released/). +- `asciinema_3` is now renamed to `asciinema` and the old `asciinema` version 2.x.x written in python was removed. + - `sing-box` has been updated to 1.13.0, which has removed some deprecated options. See [upstream documentation](https://sing-box.sagernet.org/configuration/) for details and migration options. - `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0). diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index 5934726c068b..c54124fbe7a6 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -31,6 +31,22 @@ Unfree software is not tested or built in Nixpkgs continuous integration, and th Most unfree licenses prohibit either executing or distributing the software. ::: +The `NIXPKGS_CONFIG` environment variable can override the configuration file location. +Nixpkgs resolves the config in this order: + +1. `$NIXPKGS_CONFIG`, if set and the file exists. +2. `~/.config/nixpkgs/config.nix`, if it exists. +3. `~/.nixpkgs/config.nix` (legacy), if it exists. +4. Empty configuration. + +On NixOS, `NIXPKGS_CONFIG` points to `/etc/nix/nixpkgs-config.nix` system-wide. +Drop a file there to apply configuration to `nix-env`, `nix-shell`, and other user-level commands. +NixOS does not create this file. +The [`nixpkgs.config`](https://nixos.org/manual/nixos/stable/options#opt-nixpkgs.config) option does not affect `nix-env`, `nix-shell`, or other user-level commands. + +This lookup applies to non-flake usage like channels and ``. +Flakes ignore it; pass `config` directly when importing `nixpkgs`. + ## Installing broken packages {#sec-allow-broken} There are several ways to try compiling a package which has been marked as broken. diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 8e40dacdbeb3..87b841d8bd7a 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -527,6 +527,11 @@ lib.mapAttrs mkLicense ( fullName = "DOC License"; }; + docBookDtd = { + spdxId = "DocBook-DTD"; + fullName = "DocBook DTD License"; + }; + drl10 = { spdxId = "DRL-1.0"; fullName = "Detection Rule License 1.0"; diff --git a/lib/modules.nix b/lib/modules.nix index e369d98a6426..207b9f3cc6b4 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -589,7 +589,8 @@ let in modulesPath: initialModules: args: { modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); - # Intentionally not shared with `modules` above: this allows `collected` + # Intentionally not shared with `modules` above: this allows + # the return value of `collectStructuredModules` # to be garbage collected after `filterModules` returns. graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args); }; diff --git a/lib/strings.nix b/lib/strings.nix index 848e61a65ddf..4c78c909b4be 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -337,7 +337,6 @@ rec { /** Concatenate a list of strings, adding a newline at the end of each one. - Defined as `concatMapStrings (s: s + "\n")`. # Inputs @@ -361,7 +360,7 @@ rec { ::: */ - concatLines = concatMapStrings (s: s + "\n"); + concatLines = lines: optionalString (lines != [ ]) (concatStringsSep "\n" lines + "\n"); /** Given string `s`, replace every occurrence of the string `from` with the string `to`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index afc9cb5d437c..32bcfcb0b586 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4537,6 +4537,12 @@ githubId = 1945; name = "Casey Rodarmor"; }; + caseyavila = { + email = "casey@theavilas.org"; + github = "caseyavila"; + githubId = 53847249; + name = "Casey Avila"; + }; catap = { email = "kirill@korins.ky"; github = "catap"; @@ -4604,6 +4610,12 @@ githubId = 9086315; name = "Connor Brewster"; }; + cbrxyz = { + email = "me@cbrxyz.com"; + github = "cbrxyz"; + githubId = 52760912; + name = "Cameron Brown"; + }; ccellado = { email = "annplague@gmail.com"; github = "ccellado"; @@ -7978,12 +7990,6 @@ github = "EmanuelM153"; githubId = 134736553; }; - emattiza = { - email = "nix@mattiza.dev"; - github = "emattiza"; - githubId = 11719476; - name = "Evan Mattiza"; - }; embr = { email = "hi@liclac.eu"; github = "liclac"; @@ -9218,6 +9224,12 @@ githubId = 119691; name = "Michael Gough"; }; + fraioveio = { + email = "francesco@vecchia.lol"; + github = "FraioVeio"; + githubId = 181361445; + name = "Francesco Vecchia"; + }; franciscod = { github = "franciscod"; githubId = 726447; @@ -14036,13 +14048,6 @@ github = "keller00"; githubId = 8452750; }; - kennyballou = { - email = "kb@devnulllabs.io"; - github = "kennyballou"; - githubId = 2186188; - name = "Kenny Ballou"; - keys = [ { fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; } ]; - }; kenran = { email = "johannes.maier@mailbox.org"; github = "kenranunderscore"; @@ -19073,6 +19078,12 @@ { fingerprint = "5A1D C7CE 51DC 0A85 6DEA 41F7 31A8 CE0D 2E7D 30C3"; } ]; }; + naomieow = { + name = "Naomi Roberts"; + email = "mia@naomieow.xyz"; + github = "naomieow"; + githubId = 79906167; + }; naora = { name = "Joris Gundermann"; email = "jorisgundermann@gmail.com"; @@ -19901,6 +19912,12 @@ name = "Alessio Caiazza"; matrix = "@alessio:caiazza.info"; }; + nomadium = { + email = "miguel@miguel.cc"; + github = "nomadium"; + githubId = 79817; + name = "Miguel Landaeta"; + }; nomaterials = { email = "nomaterials@gmail.com"; github = "no-materials"; @@ -20132,9 +20149,6 @@ github = "nukdokplex"; githubId = 25458915; name = "Viktor Titov"; - keys = [ - { fingerprint = "7CE2 4C42 942D 58EA 99F6 F00A A47E 7374 3EF6 FCC4"; } - ]; }; nullcube = { email = "nullcub3@gmail.com"; @@ -23069,6 +23083,13 @@ githubId = 4196789; name = "Nathan Ringo"; }; + remidupre = { + email = "remi+nixpkgs@dupre.io"; + github = "remi-dupre"; + githubId = 1173464; + name = "Rémi Dupré"; + keys = [ { fingerprint = "4762 C65B F8D8 6A33 65C1 D10A 4613 02CD 1249 4653"; } ]; + }; remix7531 = { email = "remix7531@mailbox.org"; github = "remix7531"; @@ -23599,6 +23620,13 @@ githubId = 53882428; name = "Erik Rodriguez"; }; + roehrijn = { + email = "jan.roehrich@loft.sh"; + github = "roehrijn"; + githubId = 2474078; + name = "Jan Roehrich"; + keys = [ { fingerprint = "21C1 F506 455E 95B4 EB39 D566 BAE1 2FF6 0C8A 97F2"; } ]; + }; rogarb = { email = "rogarb@rgarbage.fr"; github = "rogarb"; diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index c3a7986810e5..eca0f9b880d6 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -110,6 +110,8 @@ - [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable). +- [Rustical](https://github.com/lennart-k/rustical), a CalDav/CardDav server aiming to be simple, fast and passwordless. Available as [services.rustical](options.html#opt-services.rustical.enable). + - [Elephant](https://github.com/abenz1267/elephant), a data provider service and backend for building custom application launchers. Available as [services.elephant](#opt-services.elephant.enable). - [Dunst](https://github.com/dunst-project/dunst), a lightweight and customizable notification daemon. Available as [services.dunst](#opt-services.dunst.enable). @@ -162,6 +164,8 @@ - `systemd.coredump.extraConfig` has been removed in favor of the structured [](#opt-systemd.coredump.settings.Coredump) option. Use `systemd.coredump.settings.Coredump` to set any `coredump.conf(5)` option directly. For example, replace `systemd.coredump.extraConfig = "Storage=journal";` with `systemd.coredump.settings.Coredump.Storage = "journal";`. +- `services.home-assistant.config.lovelace.mode` has been renamed to `lovelace.dashboards` and `lovelace.resource_mode` to match the [configuration format](https://www.home-assistant.io/dashboards/dashboards/) required by Home Assistant 2026.8. Users who explicitly set `lovelace.mode` should remove it; the module generates the correct entries automatically. + - `opentrack`, `slushload`, `synthesia`, `vtfedit`, `winbox`, `wineasio`, and `yabridge` use wineWow64Packages instead of wineWowPackages as wine versions >= 11.0 have deprecated wineWowPackages. As such, the prefixes for these packages are NOT backwards compatible and need to be regenerated with potential for data loss. - []{#sec-release-26.05-incompatibilities-profiles-hardened-removed} `profiles/hardened` has been removed, because: diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix index 423fcae1b2b1..56e709f1b91e 100644 --- a/nixos/modules/config/xdg/portals/lxqt.nix +++ b/nixos/modules/config/xdg/portals/lxqt.nix @@ -29,7 +29,6 @@ in [ pkgs.libsForQt5.qtstyleplugin-kvantum pkgs.breeze-qt5 - pkgs.qtcurve ]; ''; description = '' diff --git a/nixos/modules/hardware/i2c.nix b/nixos/modules/hardware/i2c.nix index badb5fbee4b0..0ca6e82dc402 100644 --- a/nixos/modules/hardware/i2c.nix +++ b/nixos/modules/hardware/i2c.nix @@ -38,7 +38,7 @@ in name = "i2c-udev-rules"; text = '' # allow group ${cfg.group} and users with a seat use of i2c devices - ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660" + ACTION!="remove", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660" ''; destination = "/etc/udev/rules.d/70-i2c.rules"; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-cosmic.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-cosmic.nix new file mode 100644 index 000000000000..abe79381f113 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-cosmic.nix @@ -0,0 +1,71 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + imports = [ ./installation-cd-graphical-calamares.nix ]; + + isoImage.edition = lib.mkDefault "cosmic"; + isoImage.configurationName = "COSMIC (Linux LTS)"; + + environment.pathsToLink = [ "/share/calamares" ]; + + services = { + desktopManager.cosmic.enable = true; + displayManager = { + # Greeter needs to be enabled to handle an idle logout and login + cosmic-greeter.enable = true; + + # No need to have a lockscreen on an installer ISO, enable autologin + autoLogin = { + enable = true; + user = "nixos"; + }; + }; + }; + + systemd.tmpfiles.rules = + let + desktopDir = "/home/nixos/Desktop"; + filesInHomePerms = "0644 nixos users -"; + dirsInHomePerms = "0755 nixos users - -"; + CosmicAppList_favorites = "${pkgs.writeText "favorites" '' + [ + "calamares", + "firefox", + "gparted", + "com.system76.CosmicFiles", + "com.system76.CosmicEdit", + "com.system76.CosmicTerm", + "com.system76.CosmicSettings", + ]''}"; + in + [ + # Need to create ${desktopDir} first or we get an ownership issue because + # otherwise ${desktopDir} gets the ownership of `root:root`. + "d ${desktopDir} ${dirsInHomePerms}" + "L+ ${desktopDir}/calamares.desktop ${filesInHomePerms} ${pkgs.calamares-nixos}/share/applications/calamares.desktop" + "L+ ${desktopDir}/firefox.desktop ${filesInHomePerms} ${pkgs.firefox}/share/applications/firefox.desktop" + "L+ ${desktopDir}/gparted.desktop ${filesInHomePerms} ${pkgs.gparted}/share/applications/gparted.desktop" + "L+ ${desktopDir}/nixos-manual.desktop ${filesInHomePerms} /run/current-system/sw/share/applications/nixos-manual.desktop" + + # Same as ${desktopDir}, need to create all directories in the hierarchy + "d /home/nixos/.config ${dirsInHomePerms}" + "d /home/nixos/.config/cosmic ${dirsInHomePerms}" + "d /home/nixos/.config/cosmic/com.system76.CosmicAppList ${dirsInHomePerms}" + "d /home/nixos/.config/cosmic/com.system76.CosmicAppList/v1 ${dirsInHomePerms}" + "L+ /home/nixos/.config/cosmic/com.system76.CosmicAppList/v1/favorites ${filesInHomePerms} ${CosmicAppList_favorites}" + ]; + + specialisation = { + cosmic_latest_kernel.configuration = + { config, ... }: + { + imports = [ ./latest-kernel.nix ]; + isoImage.configurationName = lib.mkForce "COSMIC (Linux ${config.boot.kernelPackages.kernel.version})"; + }; + }; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix index 250c4ed73d87..6d2c7112bc08 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -7,7 +7,10 @@ isoImage.edition = lib.mkDefault "plasma6"; - services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6 = { + enable = true; + enableQt5Integration = false; + }; # Automatically login as nixos. services.displayManager = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dfc82f98fcfd..718fb29d4d8d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1768,6 +1768,7 @@ ./services/web-apps/rimgo.nix ./services/web-apps/rss-bridge.nix ./services/web-apps/rsshub.nix + ./services/web-apps/rustical.nix ./services/web-apps/rutorrent.nix ./services/web-apps/screego.nix ./services/web-apps/selfoss.nix diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index d4de973c0401..9e8073c4d3ae 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -70,7 +70,10 @@ let zluda = { onFeatures = [ + "amd-gpu" "cuda" + "gpu" + "opengl" ]; paths = [ pkgs.addDriverRunpath.driverLink diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index d55658bb25b2..b735ffd79e70 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -571,7 +571,7 @@ in lib.nameValuePair (redisName name) { description = "System user for the redis-server instance ${name}"; isSystemUser = true; - group = redisName name; + group = conf.group; } ) (lib.filterAttrs (name: conf: conf.user == redisName name) enabledServers); users.groups = lib.mapAttrs' ( diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 67285acdfedf..fd4d1e409fa3 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -191,8 +191,8 @@ in # Only symlink the KIO plugins, so we don't accidentally pull any services # like KCMs or kcookiejar let - kioPluginPath = "${pkgs.plasma5Packages.qtbase.qtPluginPrefix}/kf5/kio"; - inherit (pkgs.plasma5Packages) kio; + kioPluginPath = "${pkgs.libsForQt5.qtbase.qtPluginPrefix}/kf5/kio"; + inherit (pkgs.libsForQt5.__internalKF5) kio; in pkgs.runCommand "kio5-plugins-only" { } '' mkdir -p $out/${kioPluginPath} diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix index 440f32c2b669..4956c86a1602 100644 --- a/nixos/modules/services/hardware/asusd.nix +++ b/nixos/modules/services/hardware/asusd.nix @@ -141,7 +141,6 @@ in systemd.packages = [ cfg.package ]; services.dbus.packages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; - services.supergfxd.enable = lib.mkDefault true; }; meta.maintainers = pkgs.asusctl.meta.maintainers; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0473740b2f78..99858a55bb6e 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -30,6 +30,7 @@ let mapAttrsToList mergeAttrsList mkEnableOption + mkDefault mkIf mkMerge mkOption @@ -70,7 +71,7 @@ let # Filter null values from the configuration, so that we can still advertise # optional options in the config attribute. filteredConfig = converge (filterAttrsRecursive (_: v: !elem v [ null ])) ( - recursiveUpdate customLovelaceModulesResources (cfg.config or { }) + recursiveUpdate (customLovelaceModulesResources // themesConfig) (cfg.config or { }) ); configFile = renderYAMLFile "configuration.yaml" filteredConfig; @@ -142,13 +143,146 @@ let paths = cfg.customLovelaceModules; }; - # Create parts of the lovelace config that reference lovelave modules as resources + # Create parts of the lovelace config that reference lovelace modules as resources customLovelaceModulesResources = { lovelace.resources = map (card: { url = "/local/nixos-lovelace-modules/${card.entrypoint or (card.pname + ".js")}?${card.version}"; type = "module"; }) cfg.customLovelaceModules; }; + + # Create a directory that holds all lovelace themes + themesDir = pkgs.buildEnv { + name = "home-assistant-themes"; + paths = cfg.themes; + }; + + # Auto-inject frontend.themes include directive when themes are used. + themesConfig = + if cfg.themes != [ ] then + { + frontend.themes = "!include_dir_merge_named ${themesDir}/themes"; + } + else + { }; + + componentsUsingBluetooth = [ + # Components that require the AF_BLUETOOTH address family + "august" + "august_ble" + "airthings_ble" + "aranet" + "bluemaestro" + "bluetooth" + "bluetooth_adapters" + "bluetooth_le_tracker" + "bluetooth_tracker" + "bthome" + "default_config" + "eufylife_ble" + "esphome" + "fjaraskupan" + "gardena_bluetooth" + "govee_ble" + "homekit_controller" + "inkbird" + "improv_ble" + "keymitt_ble" + "ld2410_ble" + "leaone" + "led_ble" + "medcom_ble" + "melnor" + "moat" + "mopeka" + "motionblinds_ble" + "oralb" + "private_ble_device" + "qingping" + "rapt_ble" + "ruuvi_gateway" + "ruuvitag_ble" + "sensirion_ble" + "sensorpro" + "sensorpush" + "shelly" + "snooz" + "switchbot" + "thermobeacon" + "thermopro" + "tilt_ble" + "xiaomi_ble" + "yalexs_ble" + ]; + componentsUsingPacketCapture = [ + "default_config" # includes dhcp + "dhcp" + ]; + componentsUsingPing = [ + # Components that require the capset syscall for the ping wrapper + "ping" + "wake_on_lan" + ]; + componentsUsingSerialDevices = [ + # Components that require access to serial devices (/dev/tty*) + # List generated from home-assistant documentation: + # git clone https://github.com/home-assistant/home-assistant.io/ + # cd source/_integrations + # rg "/dev/tty" -l | cut -d'/' -f3 | cut -d'.' -f1 | sort + # And then extended by references found in the source code, these + # mostly the ones using config flows already. + "acer_projector" + "alarmdecoder" + "aurora_abb_powerone" + "blackbird" + "bryant_evolution" + "crownstone" + "deconz" + "dsmr" + "edl21" + "elkm1" + "elv" + "enocean" + "homeassistant_hardware" + "homeassistant_yellow" + "firmata" + "flexit" + "gpsd" + "insteon" + "kwb" + "lacrosse" + "landisgyr_heat_meter" + "modbus" + "modem_callerid" + "mysensors" + "nad" + "numato" + "nut" + "opentherm_gw" + "otbr" + "rainforst_raven" + "rflink" + "rfxtrx" + "scsgate" + "serial" + "serial_pm" + "sms" + "upb" + "usb" + "velbus" + "w800rf32" + "zha" + "zwave" + "zwave_js" + + # Custom components, maintained manually. + "amshan" + "benqprojector" + ]; + componentsUsingInputDevices = [ + # Components that require access to input devices (/dev/input/*) + "keyboard_remote" + ]; in { imports = [ @@ -319,7 +453,35 @@ in Available cards can be found below `pkgs.home-assistant-custom-lovelace-modules`. ::: {.note} - Automatic loading only works with lovelace in `yaml` mode. + When non-empty, `lovelace.resource_mode` is automatically set to `"yaml"` + so that resources are loaded from the YAML configuration. + ::: + ''; + }; + + themes = mkOption { + type = types.listOf ( + types.addCheck types.package (p: p.isHomeAssistantTheme or false) + // { + name = "home-assistant-theme"; + description = "package that is a Home Assistant theme"; + } + ); + default = [ ]; + example = literalExpression '' + with pkgs.home-assistant-themes; [ + material-you-theme + ]; + ''; + description = '' + List of themes to load. + + Available themes can be found below `pkgs.home-assistant-themes`. + + ::: {.note} + When `themes` is set, the module takes authoritative control + over the `frontend.themes` setting in + {option}`services.home-assistant.config`. ::: ''; }; @@ -428,21 +590,57 @@ in lovelace = { # https://www.home-assistant.io/lovelace/dashboards/ - mode = mkOption { - type = types.enum [ - "yaml" - "storage" - ]; + dashboards.nixos-lovelace = mkOption { + type = types.nullOr format.type; default = - if (cfg.lovelaceConfig != null || cfg.lovelaceConfigFile != null) then "yaml" else "storage"; + if cfg.lovelaceConfig != null || cfg.lovelaceConfigFile != null then + { + mode = "yaml"; + filename = "ui-lovelace.yaml"; + title = "Overview"; + icon = "mdi:view-dashboard"; + show_in_sidebar = true; + } + else + null; defaultText = literalExpression '' - if (cfg.lovelaceConfig != null || cfg.lovelaceConfigFile != null) - then "yaml" - else "storage"; + if cfg.lovelaceConfig != null || cfg.lovelaceConfigFile != null then { + mode = "yaml"; + filename = "ui-lovelace.yaml"; + title = "Overview"; + icon = "mdi:view-dashboard"; + show_in_sidebar = true; + } else null ''; - example = "yaml"; description = '' - In what mode should the main Lovelace panel be, `yaml` or `storage` (UI managed). + Default NixOS-managed Lovelace dashboard. Automatically populated + when {option}`lovelaceConfig` or {option}`lovelaceConfigFile` is set. + + Additional dashboards can be defined under + `config.lovelace.dashboards.`. + + See for details. + ''; + }; + + resource_mode = mkOption { + type = types.nullOr ( + types.enum [ + "yaml" + "storage" + ] + ); + default = if cfg.customLovelaceModules != [ ] then "yaml" else null; + defaultText = literalExpression '' + if cfg.customLovelaceModules != [ ] then "yaml" else null + ''; + description = '' + Set to `"yaml"` to load Lovelace resources from YAML configuration, + or `"storage"` to manage them through the UI. See + . + + Automatically set to `"yaml"` when {option}`customLovelaceModules` + is non-empty. ''; }; }; @@ -510,7 +708,7 @@ in ''; description = '' Your {file}`ui-lovelace.yaml` as a Nix attribute set. - Setting this option will automatically set `lovelace.mode` to `yaml`. + Setting this option will automatically configure a Lovelace dashboard in YAML mode. Beware that setting this option will delete your previous {file}`ui-lovelace.yaml` ''; @@ -521,8 +719,8 @@ in type = types.nullOr types.path; example = "/path/to/ui-lovelace.yaml"; description = '' - Your {file}`ui-lovelace.yaml` managed as configuraton file. - Setting this option will automatically set `lovelace.mode` to `yaml`. + Your {file}`ui-lovelace.yaml` managed as configuration file. + Setting this option will automatically configure a Lovelace dashboard in YAML mode. ''; }; @@ -619,6 +817,19 @@ in }; config = mkIf cfg.enable { + warnings = optionals (cfg.config ? lovelace.mode) [ + '' + services.home-assistant.config.lovelace.mode is deprecated. + Home Assistant 2026.8 renames the legacy top-level `lovelace.mode` + setting in favour of per-dashboard configuration. + + Use `services.home-assistant.config.lovelace.dashboards` and + `services.home-assistant.config.lovelace.resource_mode` instead. + + See https://www.home-assistant.io/dashboards/dashboards/ for details. + '' + ]; + assertions = [ { assertion = cfg.openFirewall -> cfg.config != null; @@ -628,6 +839,10 @@ in assertion = !(cfg.lovelaceConfig != null && cfg.lovelaceConfigFile != null); message = "Only one of `lovelaceConfig` or `lovelaceConfigFile` can be configured at the same time."; } + { + assertion = cfg.themes != [ ] -> !(hasAttrByPath [ "frontend" "themes" ] (cfg.config or { })); + message = "`services.home-assistant.themes` and `services.home-assistant.config.frontend.themes` cannot both be set. When `themes` is non-empty the module sets `frontend.themes` authoritatively."; + } ]; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.config.http.server_port ]; @@ -711,6 +926,7 @@ in ln -fns "''${paths[@]}" "${cfg.configDir}/custom_components/" done ''; + removeBlueprints = '' # remove blueprints symlinked in from below the /nix/store readarray -d "" blueprints < <(find "${cfg.configDir}/blueprints" -maxdepth 2 -type l -print0) @@ -757,6 +973,10 @@ in "CAP_NET_ADMIN" "CAP_NET_RAW" ] + ++ optionals (any useComponent componentsUsingPacketCapture) [ + # Raw packet capture using AF_PACKET + "CAP_NET_RAW" + ] ++ optionals (useComponent "emulated_hue") [ # Alexa looks for the service on port 80 # https://www.home-assistant.io/integrations/emulated_hue @@ -769,119 +989,6 @@ in "CAP_NET_RAW" ] ); - componentsUsingBluetooth = [ - # Components that require the AF_BLUETOOTH address family - "august" - "august_ble" - "airthings_ble" - "aranet" - "bluemaestro" - "bluetooth" - "bluetooth_adapters" - "bluetooth_le_tracker" - "bluetooth_tracker" - "bthome" - "default_config" - "eufylife_ble" - "esphome" - "fjaraskupan" - "gardena_bluetooth" - "govee_ble" - "homekit_controller" - "inkbird" - "improv_ble" - "keymitt_ble" - "ld2410_ble" - "leaone" - "led_ble" - "medcom_ble" - "melnor" - "moat" - "mopeka" - "motionblinds_ble" - "oralb" - "private_ble_device" - "qingping" - "rapt_ble" - "ruuvi_gateway" - "ruuvitag_ble" - "sensirion_ble" - "sensorpro" - "sensorpush" - "shelly" - "snooz" - "switchbot" - "thermobeacon" - "thermopro" - "tilt_ble" - "xiaomi_ble" - "yalexs_ble" - ]; - componentsUsingPing = [ - # Components that require the capset syscall for the ping wrapper - "ping" - "wake_on_lan" - ]; - componentsUsingSerialDevices = [ - # Components that require access to serial devices (/dev/tty*) - # List generated from home-assistant documentation: - # git clone https://github.com/home-assistant/home-assistant.io/ - # cd source/_integrations - # rg "/dev/tty" -l | cut -d'/' -f3 | cut -d'.' -f1 | sort - # And then extended by references found in the source code, these - # mostly the ones using config flows already. - "acer_projector" - "alarmdecoder" - "aurora_abb_powerone" - "blackbird" - "bryant_evolution" - "crownstone" - "deconz" - "dsmr" - "edl21" - "elkm1" - "elv" - "enocean" - "homeassistant_hardware" - "homeassistant_yellow" - "firmata" - "flexit" - "gpsd" - "insteon" - "kwb" - "lacrosse" - "landisgyr_heat_meter" - "modbus" - "modem_callerid" - "mysensors" - "nad" - "numato" - "nut" - "opentherm_gw" - "otbr" - "rainforst_raven" - "rflink" - "rfxtrx" - "scsgate" - "serial" - "serial_pm" - "sms" - "upb" - "usb" - "velbus" - "w800rf32" - "zha" - "zwave" - "zwave_js" - - # Custom components, maintained manually. - "amshan" - "benqprojector" - ]; - componentsUsingInputDevices = [ - # Components that require access to input devices (/dev/input/*) - "keyboard_remote" - ]; in { ExecStart = escapeSystemdExecArgs ( @@ -958,6 +1065,9 @@ in ] ++ optionals (any useComponent componentsUsingBluetooth) [ "AF_BLUETOOTH" + ] + ++ optionals (any useComponent componentsUsingPacketCapture) [ + "AF_PACKET" ]; RestrictNamespaces = true; RestrictRealtime = true; @@ -980,9 +1090,11 @@ in ]; UMask = "0077"; }; - path = [ - pkgs.unixtools.ping # needed for ping - ]; + path = + with pkgs; + lib.optionals (useComponent "go2rtc") [ pkgs.go2rtc ] + ++ lib.optionals (useComponent "picotts") [ pkgs.picotts ] + ++ lib.optionals (any useComponent componentsUsingPing) [ unixtools.ping ]; }; systemd.targets.home-assistant = rec { diff --git a/nixos/modules/services/networking/nbd.nix b/nixos/modules/services/networking/nbd.nix index 1fcbc1969543..054f265f1bbd 100644 --- a/nixos/modules/services/networking/nbd.nix +++ b/nixos/modules/services/networking/nbd.nix @@ -36,8 +36,6 @@ let generic = ( cfg.server.extraOptions // { - user = "root"; - group = "root"; port = cfg.server.listenPort; } // (optionalAttrs (cfg.server.listenAddress != null) { @@ -155,8 +153,8 @@ in before = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.nbd}/bin/nbd-server -C ${serverConfig}"; - Type = "forking"; + ExecStart = "${pkgs.nbd}/bin/nbd-server -n -C ${serverConfig}"; + Type = "simple"; DeviceAllow = map (path: "${path} rw") allowedDevices; BindPaths = boundPaths; diff --git a/nixos/modules/services/networking/reframe.nix b/nixos/modules/services/networking/reframe.nix index b05f33772eaa..126cc24f4dae 100644 --- a/nixos/modules/services/networking/reframe.nix +++ b/nixos/modules/services/networking/reframe.nix @@ -9,7 +9,7 @@ let iniFmt = pkgs.formats.ini { }; in { - options.programs.reframe = { + options.services.reframe = { enable = lib.mkEnableOption "DRM/KMS based remote desktop for Linux that supports Wayland/NVIDIA/headless/login…"; package = lib.mkPackageOption pkgs "reframe" { }; configs = lib.mkOption { @@ -113,7 +113,7 @@ in "cpu" "gpu" ]; - default = true; + default = "cpu"; description = '' Set to `gpu` to use GPU damage region detection, which may be more efficiency but may cause artifacts depending on GPU vendors. Set to `cpu` to use CPU damage region detection if you get bugs with `gpu`. @@ -173,7 +173,7 @@ in description = "ReFrame Remote Desktop"; }; users.groups.reframe = { }; - environment.etc = builtins.mapAttrs' ( + environment.etc = lib.mapAttrs' ( name: value: lib.nameValuePair "reframe/${name}.conf" { mode = "0644"; diff --git a/nixos/modules/services/networking/sunshine.nix b/nixos/modules/services/networking/sunshine.nix index b4f731b3486d..50060d314a86 100644 --- a/nixos/modules/services/networking/sunshine.nix +++ b/nixos/modules/services/networking/sunshine.nix @@ -147,7 +147,7 @@ in ]; }; - boot.kernelModules = [ "uinput" ]; + hardware.uinput.enable = true; services.udev.packages = [ cfg.package ]; diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix index 6e1d39108079..f33853edd25b 100644 --- a/nixos/modules/services/web-apps/lasuite-docs.nix +++ b/nixos/modules/services/web-apps/lasuite-docs.nix @@ -17,6 +17,7 @@ let types optional optionalString + escapeShellArg ; cfg = config.services.lasuite-docs; @@ -76,6 +77,20 @@ let SystemCallArchitectures = "native"; UMask = "0077"; }; + + # Convert environment variables to be used as systemd-run arguments + envArgs = lib.concatStringsSep " " ( + lib.mapAttrsToList (name: value: "-E ${escapeShellArg "${name}=${value}"}") pythonEnvironment + ); + + # Easier usage of django manage.py stuff + manage = pkgs.writeShellScriptBin "lasuite-docs-manage" '' + exec ${lib.getExe' config.systemd.package "systemd-run"} \ + -p User=${commonServiceConfig.User} -p DynamicUser=yes \ + -p StateDirectory=${commonServiceConfig.StateDirectory} --working-directory=${commonServiceConfig.WorkingDirectory} \ + --quiet --collect --pipe --pty \ + ${envArgs} ${lib.getExe cfg.backendPackage} "$@" + ''; in { options.services.lasuite-docs = { @@ -346,6 +361,7 @@ in }; config = mkIf cfg.enable { + environment.systemPackages = [ manage ]; systemd.services.lasuite-docs-postgresql-setup = mkIf cfg.postgresql.createLocally { wantedBy = [ "lasuite-docs.target" ]; requiredBy = [ "lasuite-docs.service" ]; @@ -534,6 +550,10 @@ in recommendedProxySettings = true; }; + locations."/static/" = { + alias = "${cfg.backendPackage}/share/static/"; + }; + locations."/collaboration/ws/" = { proxyPass = "http://localhost:${toString cfg.collaborationServer.port}"; recommendedProxySettings = true; diff --git a/nixos/modules/services/web-apps/lasuite-meet.nix b/nixos/modules/services/web-apps/lasuite-meet.nix index 32fe78e29647..421af1596483 100644 --- a/nixos/modules/services/web-apps/lasuite-meet.nix +++ b/nixos/modules/services/web-apps/lasuite-meet.nix @@ -7,12 +7,16 @@ }: let inherit (lib) + elem getExe mapAttrs mkEnableOption mkIf + mkMerge mkPackageOption mkOption + mkRemovedOptionModule + mkRenamedOptionModule types optional optionalString @@ -77,12 +81,37 @@ let }; in { + imports = [ + (mkRenamedOptionModule + [ "services" "lasuite-meet" "backendPackage" ] + [ "services" "lasuite-meet" "package" ] + ) + (mkRemovedOptionModule [ + "services" + "lasuite-meet" + "frontendPackage" + ] "services.lasuite-mette.package.frotend should be used instead") + ]; + options.services.lasuite-meet = { enable = mkEnableOption "SuiteNumérique Meet"; - backendPackage = mkPackageOption pkgs "lasuite-meet" { }; + package = mkPackageOption pkgs "lasuite-meet" { }; - frontendPackage = mkPackageOption pkgs "lasuite-meet-frontend" { }; + addons = mkOption { + type = types.listOf ( + types.enum [ + "outlook" + ] + ); + default = [ ]; + example = '' + [ + "outlook" + ] + ''; + description = "Addons to use and configure"; + }; bind = mkOption { type = types.str; @@ -295,7 +324,7 @@ in ''; description = '' Configuration options of meet. - See https://github.com/suitenumerique/meet/blob/v${cfg.backendPackage.version}/docs/env.md + See https://github.com/suitenumerique/meet/blob/v${cfg.package.version}/docs/env.md `REDIS_URL` and `CELERY_BROKER_URL` are set if `services.lasuite-meet.redis.createLocally` is true. `DB_NAME` `DB_USER` and `DB_HOST` are set if `services.lasuite-meet.postgresql.createLocally` is true. ''; @@ -340,20 +369,20 @@ in ) fi ''} - if [ "${cfg.backendPackage.version}" != "$(cat .version)" ]; then - ${getExe cfg.backendPackage} migrate - echo -n "${cfg.backendPackage.version}" > .version + if [ "${cfg.package.version}" != "$(cat .version)" ]; then + ${getExe cfg.package} migrate + echo -n "${cfg.package.version}" > .version fi ''; environment = pythonEnvironment; serviceConfig = { - BindReadOnlyPaths = "${cfg.backendPackage}/share/static:/var/lib/lasuite-meet/static"; + BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-meet/static"; ExecStart = utils.escapeSystemdExecArgs ( [ - (lib.getExe' cfg.backendPackage "gunicorn") + (lib.getExe' cfg.package "gunicorn") "--bind=${cfg.bind}" ] ++ cfg.gunicorn.extraArgs @@ -381,7 +410,7 @@ in serviceConfig = { ExecStart = utils.escapeSystemdExecArgs ( - [ (lib.getExe' cfg.backendPackage "celery") ] + [ (lib.getExe' cfg.package "celery") ] ++ cfg.celery.extraArgs ++ [ "--app=meet.celery_app" @@ -417,36 +446,97 @@ in services.nginx = mkIf cfg.enableNginx { enable = true; - virtualHosts.${cfg.domain} = { - root = cfg.frontendPackage; + virtualHosts.${cfg.domain} = mkMerge [ + { + root = cfg.package.frontend; - extraConfig = '' - error_page 404 = /index.html; - ''; - - locations."/api" = { - proxyPass = "http://${cfg.bind}"; - recommendedProxySettings = true; - }; - - locations."/admin" = { - proxyPass = "http://${cfg.bind}"; - recommendedProxySettings = true; - }; - - locations."/static" = { - root = "${cfg.backendPackage}/share"; - }; - - locations."/livekit" = mkIf cfg.livekit.enable { - proxyPass = "http://localhost:${toString config.services.livekit.settings.port}"; - recommendedProxySettings = true; - proxyWebsockets = true; extraConfig = '' - rewrite ^/livekit/(.*)$ /$1 break; + error_page 404 = /index.html; ''; - }; - }; + + locations."/api" = { + proxyPass = "http://${cfg.bind}"; + recommendedProxySettings = true; + }; + + locations."/admin" = { + proxyPass = "http://${cfg.bind}"; + recommendedProxySettings = true; + }; + + locations."/static" = { + root = "${cfg.package}/share"; + }; + } + (mkIf cfg.livekit.enable { + locations."/livekit" = { + proxyPass = "http://localhost:${toString config.services.livekit.settings.port}"; + recommendedProxySettings = true; + proxyWebsockets = true; + extraConfig = '' + rewrite ^/livekit/(.*)$ /$1 break; + ''; + }; + }) + (mkIf (elem "outlook" cfg.addons) { + locations."= /.well-known/windows-app-web-link" = { + alias = pkgs.writeText "lasuite-meet-winsows-app-web-link.json" '' + [{ + "packageFamilyName" : "Visio_g3z6ba6vek6vg", + "paths" : [ "*" ] + }] + ''; + extraConfig = '' + default_type application/json; + add_header Content-Disposition "attachment; filename=windows-app-web-link"; + ''; + }; + + locations."= /addons/outlook/manifest.xml" = { + alias = pkgs.stdenv.mkDerivation { + name = "lasuite-meet-manifest.xml"; + buildCommand = '' + substitute ${cfg.package.addons.outlook}/manifest.xml $out \ + --replace-fail "__APP_NAME__" "LaSuite Meet" \ + --replace-fail "https://localhost:3000/" "https://${cfg.domain}/addons/outlook/" + ''; + }; + extraConfig = '' + add_header Access-Control-Allow-Origin "*"; + add_header Cache-Control "no-cache, no-store, must-revalidate"; + add_header X-Frame-Options "DENY"; + add_header Content-Security-Policy "frame-ancestors 'none'"; + ''; + }; + + locations."/addons/outlook/" = { + alias = "${cfg.package.addons.outlook}/"; + extraConfig = '' + error_page 404 =200 /index.html; + add_header Cache-Control "no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache" always; + add_header Expires 0 always; + + set $ms_domains "https://*.live.com https://*.office.com https://*.microsoft.com https://*.office365.com https://*.sharepoint.com"; + + set $nonce $request_id; + + set $csp "upgrade-insecure-requests; "; + set $csp "''${csp}frame-ancestors ''${ms_domains}; "; + set $csp "''${csp}script-src 'nonce-''${nonce}' 'strict-dynamic'; "; + set $csp "''${csp}connect-src 'self' ''${ms_domains}; "; + set $csp "''${csp}frame-src 'none'; "; + set $csp "''${csp}object-src 'none'; "; + set $csp "''${csp}base-uri 'none'; "; + + add_header Content-Security-Policy $csp; + + sub_filter 'NONCE_PLACEHOLDER' $nonce; + sub_filter_once off; + ''; + }; + }) + ]; }; }; diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 24258cdc7a4f..f7cea00a5855 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -525,7 +525,7 @@ in environment = env; path = with pkgs; [ - nodejs_20 + cfg.package.nodejs yarn ffmpeg-headless openssl @@ -946,7 +946,7 @@ in }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] - [ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ] + [ peertubeEnv cfg.package.nodejs pkgs.yarn pkgs.ffmpeg-headless ] ) (lib.mkIf cfg.redis.enableUnixSocket { ${config.services.peertube.user}.extraGroups = [ "redis-peertube" ]; diff --git a/nixos/modules/services/web-apps/rustical.nix b/nixos/modules/services/web-apps/rustical.nix new file mode 100644 index 000000000000..0764f384ab0d --- /dev/null +++ b/nixos/modules/services/web-apps/rustical.nix @@ -0,0 +1,183 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkIf + mkEnableOption + mkOption + mkPackageOption + types + ; + + cfg = config.services.rustical; + + format = pkgs.formats.toml { }; + configFile = format.generate "rustical.toml" cfg.settings; +in + +{ + options.services.rustical = { + enable = mkEnableOption "RustiCali CalDAV/CardDAV server"; + + package = mkPackageOption pkgs "rustical" { }; + + settings = mkOption { + description = '' + Your {file}`/etc/rustical/config.toml` as a Nix attribute set. + + Possible options can be found in the [Config struct]. A default + configuration can be viewed by running `rustical gen-config`. + + [Config struct]: https://lennart-k.github.io/rustical/_crate/rustical/config/struct.Config.html + ''; + type = types.submodule { + freeformType = format.type; + options = { + data_store.sqlite = { + db_url = mkOption { + type = types.path; + default = "/var/lib/rustical/db.sqlite3"; + description = '' + Path where the sqlite database is stored. + ''; + }; + }; + + frontend = { + enabled = mkEnableOption "the HTTP frontend" // { + default = true; + }; + }; + + http = { + host = mkOption { + type = types.str; + default = "[::1]"; + example = "[::]"; + description = '' + Host address to bind the HTTP service to. + + :::{.note} + Rustical expects to be hosted behind a reverse proxy that + provides HTTPS. Without HTTPS, the web frontend and some clients + (e.g. Apple Calendar) may not work. + ::: + ''; + }; + + port = mkOption { + type = types.port; + default = 4000; + description = '' + Port to bind the HTTP service to. + ''; + }; + }; + + dav_push.enabled = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable [WebDav Push] support. + + This allows the server to notify clients about changed data. + + [WebDav Push]: https://github.com/bitfireAT/webdav-push/ + ''; + }; + + nextcloud_login.enabled = mkOption { + type = types.bool; + default = true; + description = '' + Whether to emulate the Nextcloud login flow. + + This is supported in [DAVx5] and enables automatic app token generation. + + [DAVx5]: https://www.davx5.com/ + ''; + }; + }; + }; + }; + + environmentFiles = mkOption { + type = with types; listOf path; + default = [ ]; + example = [ "/run/keys/rustical.env" ]; + description = '' + Environment files to load into the runtime environment. + + Check the documentation for how to construct [environment variables]. + + :::{.tip} + Environment variables can substitute any config value and are useful for + hiding secrets. + ::: + + [environment variables]: https://lennart-k.github.io/rustical/installation/configuration/#environment-variables + ''; + }; + }; + + config = mkIf cfg.enable { + # install the config at a path where the cli will find it + environment.etc."rustical/config.toml".source = configFile; + + # provide the rustical cli + environment.systemPackages = [ cfg.package ]; + + systemd.services.rustical = { + description = "RustiCal CalDav/CardDav server"; + documentation = [ "https://lennart-k.github.io/rustical/" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = lib.getExe cfg.package; + EnvironmentFile = cfg.environmentFiles; + Restart = "on-failure"; + StateDirectory = "rustical"; + + CapabilityBoundingSet = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + ]; + SystemCallErrorNumber = "EPERM"; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 9a3138ff37eb..7f2d388b8af3 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -412,7 +412,9 @@ in echo -n "$kernelParams" > $out/kernel-params - ln -s ${initrdPath} $out/initrd + ${optionalString config.boot.initrd.enable '' + ln -s ${initrdPath} $out/initrd + ''} ${optionalString (config.boot.initrd.secrets != { }) '' ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 366d1285a74c..7b2e263e401e 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -395,7 +395,7 @@ def option_from_config(name: str, config_path: List[str]) -> str: return "" if isinstance(value, bool): value = bool_to_yes_no(value) - return f"{name}: {config(*config_path)}\n" + return f"{name}: {value}\n" def install_bootloader() -> None: diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7fcbde36087c..91df1388a191 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -204,11 +204,11 @@ let poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. fi if poolImported "${pool}"; then - ${lib.optionalString config.boot.initrd.clevis.enable ( - lib.concatMapStringsSep "\n" ( - elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key -L prompt ${elem} || true " - ) (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets) - )} + ${lib.optionalString config.boot.initrd.clevis.enable ( + lib.concatMapStringsSep "\n" ( + elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key -L prompt ${elem} || true " + ) (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets) + )} ${lib.optionalString keyLocations.hasKeys '' diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index 5dfac60c1c69..1c78e16d9256 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -24,9 +24,10 @@ in options = { virtualisation.kvmgt = { enable = mkEnableOption '' - KVMGT (iGVT-g) VGPU support. Allows Qemu/KVM guests to share host's Intel integrated graphics card. - Currently only one graphical device can be shared. To allow users to access the device without root add them - to the kvm group: `users.extraUsers..extraGroups = [ "kvm" ];` + KVMGT (iGVT-g) VGPU support. + When enabled on a host, allows Qemu/KVM guests to share host's Intel integrated graphics card. + Currently only one graphical device can be shared. + To allow host users to access the device without root add them to the kvm group: `users.extraUsers..extraGroups = [ "kvm" ];` ''; # multi GPU support is under the question device = mkOption { @@ -38,8 +39,8 @@ in default = { }; type = with types; attrsOf (submodule [ { options = vgpuOptions; } ]); description = '' - Virtual GPUs to be used in Qemu. You can find devices via {command}`ls /sys/bus/pci/devices/*/mdev_supported_types` - and find info about device via {command}`cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description` + Virtual GPUs of the host to be used in Qemu. + You can find devices via {command}`ls /sys/bus/pci/devices/*/mdev_supported_types` and find info about device via {command}`cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description` ''; example = { i915-GVTg_V5_8.uuid = [ "a297db4a-f4c2-11e6-90f6-d3b88d6c9525" ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f6164ed44abc..56c496713f21 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1469,6 +1469,7 @@ in rtkit = runTest ./rtkit.nix; rtorrent = runTest ./rtorrent.nix; rush = runTest ./rush.nix; + rustical = runTest ./web-apps/rustical.nix; rustls-libssl = runTest ./rustls-libssl.nix; rxe = runTest ./rxe.nix; sabnzbd = runTest ./sabnzbd.nix; diff --git a/nixos/tests/harmonia.nix b/nixos/tests/harmonia.nix index f847ed771450..d648cd2b00f0 100644 --- a/nixos/tests/harmonia.nix +++ b/nixos/tests/harmonia.nix @@ -35,7 +35,7 @@ '' start_all() - harmonia.wait_for_unit("harmonia.service") + harmonia.wait_for_unit("harmonia.socket") client01.wait_until_succeeds("curl -f http://harmonia:5000/nix-cache-info | grep '${toString nodes.harmonia.services.harmonia.cache.settings.priority}' >&2") client01.succeed("curl -f http://harmonia:5000/version | grep '${nodes.harmonia.services.harmonia.package.version}' >&2") diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index feb464b33ade..fbed5250c7ec 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -11,7 +11,10 @@ in meta.maintainers = lib.teams.home-assistant.members; nodes.hass = - { pkgs, ... }: + { + pkgs, + ... + }: { services.postgresql = { enable = true; @@ -24,6 +27,9 @@ in ]; }; + # required for dbus activation in the bluetooth component + hardware.bluetooth.enable = true; + services.home-assistant = { enable = true; inherit configDir; @@ -65,6 +71,11 @@ in mini-graph-card ]; + # test loading themes + themes = with pkgs.home-assistant-themes; [ + material-you-theme + ]; + config = { homeassistant = { name = "Home"; @@ -77,9 +88,30 @@ in # configure the recorder component to use the postgresql db recorder.db_url = "postgresql://@/hass"; - # without these some components that are loaded anyway fail to find - # their dependencies - default_config = { }; + # this is effecitvely default_config (2026.5.0), but with components + # skipped that would cause ERRORs in the sandbox + bluetooth = { }; + cloud = { }; + conversation = { }; + dhcp = { }; + energy = { }; + file = { }; + # Requires go2rtc service + # go2rtc = { }; + history = { }; + # Requires DNS and HTTP queries + # homeassistant_alerts = { }; + logbook = { }; + media_source = { }; + mobile_app = { }; + my = { }; + ssdp = { }; + stream = { }; + sun = { }; + usage_prediction = { }; + usb = { }; + webhook = { }; + zeroconf = { }; # include some popular integrations, that absolutely shouldn't break knx = { }; @@ -223,6 +255,11 @@ in hass.succeed("grep -q 'mini-graph-card-bundle.js' '${configDir}/configuration.yaml'") hass.succeed("curl --fail http://localhost:8123/local/nixos-lovelace-modules/mini-graph-card-bundle.js") + with subtest("Check that themes are referenced and installed"): + hass.succeed("grep -q '!include_dir_merge_named.*themes' '${configDir}/configuration.yaml'") + themes_dir = hass.succeed("sed -n 's/.*!include_dir_merge_named \\(.*\\)/\\1/p' '${configDir}/configuration.yaml'").strip() + hass.succeed(f"test -f {themes_dir}/material_you.yaml") + with subtest("Check that optional dependencies are in the PYTHONPATH"): env = get_unit_property("Environment") python_path = env.split("PYTHONPATH=")[1].split()[0] diff --git a/nixos/tests/invidious.nix b/nixos/tests/invidious.nix index 97086ace4d6b..822f884d9a49 100644 --- a/nixos/tests/invidious.nix +++ b/nixos/tests/invidious.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { name = "invidious"; @@ -24,7 +24,7 @@ networking.firewall.allowedTCPPorts = [ config.services.postgresql.settings.port ]; }; machine = - { lib, pkgs, ... }: + { pkgs, ... }: { services.invidious = { enable = true; @@ -142,7 +142,7 @@ # invidious does connect to the sig helper though and crashes when the sig helper is not available machine.wait_for_open_port(80) curl_assert_status_code("http://invidious.example.com/search", 200) - machine.succeed("journalctl -eu invidious.service | grep -o \"SigHelper: Using helper at 'tcp://127.0.0.1:2999'\"") + machine.succeed("journalctl -eu invidious.service | grep -o \"WARNING: Invidious companion is required to view and playback videos\"") postgres_tcp.wait_for_unit("postgresql.target") activate_specialisation("postgres-tcp") diff --git a/nixos/tests/ncps-ha-pg-redis.nix b/nixos/tests/ncps-ha-pg-redis.nix index 9d65f4de720c..80b8925b38e9 100644 --- a/nixos/tests/ncps-ha-pg-redis.nix +++ b/nixos/tests/ncps-ha-pg-redis.nix @@ -180,7 +180,7 @@ in start_all() - harmonia.wait_for_unit("harmonia.service") + harmonia.wait_for_unit("harmonia.socket") ncps0.wait_for_unit("ncps.service") ncps1.wait_for_unit("ncps.service") diff --git a/nixos/tests/ncps.nix b/nixos/tests/ncps.nix index ecda50d5f92d..87b1c33424b8 100644 --- a/nixos/tests/ncps.nix +++ b/nixos/tests/ncps.nix @@ -66,7 +66,7 @@ '' start_all() - harmonia.wait_for_unit("harmonia.service") + harmonia.wait_for_unit("harmonia.socket") ncps.wait_for_unit("ncps.service") diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix index 1a504a4ae4e0..997235ecfcd1 100644 --- a/nixos/tests/systemd-initrd-swraid.nix +++ b/nixos/tests/systemd-initrd-swraid.nix @@ -23,12 +23,7 @@ mdadm e2fsprogs ]; # for mdadm and mkfs.ext4 - boot.swraid = { - enable = true; - mdadmConf = '' - ARRAY /dev/md0 devices=/dev/vdb,/dev/vdc - ''; - }; + boot.swraid.enable = true; environment.etc."mdadm.conf".text = '' MAILADDR test@example.com ''; @@ -64,12 +59,12 @@ assert "hello" in machine.succeed("cat /test") assert "md0" in machine.succeed("cat /proc/mdstat") - expected_config = """MAILADDR test@example.com + # Verify the RAID array was properly auto-detected and assembled + detail = machine.succeed("mdadm --detail /dev/md0") + assert "raid1" in detail, f"Expected raid1 in mdadm detail output: {detail}" + assert "/dev/vdb" in detail, f"Expected /dev/vdb in array: {detail}" + assert "/dev/vdc" in detail, f"Expected /dev/vdc in array: {detail}" - ARRAY /dev/md0 devices=/dev/vdb,/dev/vdc - """ - got_config = machine.execute("cat /etc/mdadm.conf")[1] - assert expected_config == got_config, repr((expected_config, got_config)) machine.wait_for_unit("mdmonitor.service") ''; } diff --git a/nixos/tests/web-apps/rustical.nix b/nixos/tests/web-apps/rustical.nix new file mode 100644 index 000000000000..86b0e95afa20 --- /dev/null +++ b/nixos/tests/web-apps/rustical.nix @@ -0,0 +1,72 @@ +{ + pkgs, + lib, + ... +}: +{ + name = "rustical"; + + meta.maintainers = pkgs.rustical.meta.maintainers; + + nodes.machine = + { + pkgs, + ... + }: + { + services.rustical.enable = true; + environment.systemPackages = with pkgs; [ calendar-cli ]; + }; + + testScript = + { + nodes, + ... + }: + let + port = toString nodes.machine.services.rustical.settings.http.port; + url = "http://localhost:${toString port}"; + + createPrincipalScript = pkgs.writeScript "rustical-create-principal" '' + #!${lib.getExe pkgs.expect} + spawn rustical principals create alice --password + expect "Enter your password:\r" + send "foobar\r" + expect eof + ''; + + calendarCliConfig = (pkgs.formats.json { }).generate "rustical-test-calendar-cli.json" { + default = { + caldav_user = "alice"; + caldav_url = "${url}/caldav/"; + calendar_url = "${url}/caldav/principal/alice"; + }; + testcal = { + inherits = "default"; + calendar_url = "${url}/caldav/principal/alice/testcal"; + }; + }; + in + # python + '' + machine.wait_for_unit("rustical.service") + machine.wait_for_open_port(${port}) + + with subtest("Smoketest"): + machine.succeed("curl --fail ${url}") + + with subtest("Create principal"): + machine.succeed("${createPrincipalScript}") + machine.succeed("rustical principals list | grep alice") + + with subtest("Generate token for principal"): + machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' ${url}/frontend/login") + machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' ${url}/frontend/user/alice/app_token > token.txt") + + with subtest("Interact with caldav"): + machine.succeed('calendar-cli --config-file ${calendarCliConfig} --caldav-pass "$(cat token.txt)" calendar create testcal') + machine.succeed('calendar-cli --config-file ${calendarCliConfig} --config-section testcal --caldav-pass "$(cat token.txt)" calendar add 2013-10-01 testevent') + + machine.log(machine.execute("systemd-analyze security rustical.service | grep -v ✓")[1]) + ''; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index 7d93f45ed037..1593b5d22f04 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -13,13 +13,13 @@ let pname = "ghostel"; - version = "0.18.1-unstable-2026-04-24"; + version = "0-unstable-2026-05-06"; src = fetchFromGitHub { owner = "dakra"; repo = "ghostel"; - rev = "fdfb68f70ca6f43277ef8a0ba4103631857e4ad4"; - hash = "sha256-u3zUj5uUHqFEP7mjmADNB6n6n/LmGR6ne0ylalop8WI="; + rev = "5bce751687f3b33978a4244a1611648bbedb7124"; + hash = "sha256-MAV3iQeriZhE9SGwVEnKs2rwebbEnPP1LiHuCAjlGE8="; }; module = stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index edf2820fadda..925e2f8d398b 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "kakoune-unwrapped"; - version = "2025.06.03"; + version = "2026.04.12"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${finalAttrs.version}"; - hash = "sha256-AJvh6NVFpbPsyzfeii/5muE+i4TwfxhwhDVgMLYOJCM="; + hash = "sha256-m8q1+TooDREbQD848ciHxeHwMajmlmhAhCqGmdbThIU="; }; makeFlags = [ diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 9c5e90861df6..05336bb03039 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,50 +1,55 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, + cmake, extra-cmake-modules, - kdoctools, wrapQtAppsHook, - qtscript, - kconfig, - kinit, + shared-mime-info, + xz, + qttools, karchive, - kcrash, kcmutils, + kconfig, kconfigwidgets, + kcrash, knewstuff, kparts, - qca-qt5, - shared-mime-info, + qca, }: stdenv.mkDerivation (finalAttrs: { pname = "okteta"; - version = "0.26.25"; + version = "0.26.25-unstable-2026-04-28"; - src = fetchurl { - url = "mirror://kde/stable/okteta/${finalAttrs.version}/src/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-K+GJG/SYyzgDDKXbGtAixQJVfBwLj/asP9rIJUpbt2s="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "okteta"; + rev = "9ab055f50e7569c9a0bc401be4b5686dc1e61dcc"; + hash = "sha256-1ih0kFS7opA5w1QyB7MQAOYFoSAUPKNM8fRi1G/mq2U="; }; nativeBuildInputs = [ - qtscript + cmake extra-cmake-modules - kdoctools wrapQtAppsHook ]; - buildInputs = [ shared-mime-info ]; - propagatedBuildInputs = [ - kconfig - kinit + buildInputs = [ + shared-mime-info + xz + + qttools + + karchive kcmutils + kconfig kconfigwidgets + kcrash knewstuff kparts - qca-qt5 - karchive - kcrash + qca ]; outputs = [ diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 58b4f03611fa..c759a6e3d6db 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4950,10 +4950,13 @@ assertNoAdditions { }; }); - vim-flog = super.vim-flog.overrideAttrs { + vim-flog = super.vim-flog.overrideAttrs (old: { # Not intended to be required, used by vim plugin nvimSkipModules = "flog.graph_bin"; - }; + meta = old.meta // { + license = lib.licenses.vim; + }; + }); vim-fugitive = super.vim-fugitive.overrideAttrs (old: { meta = old.meta // { diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 4a1e8b3da4f4..ad82fb7f6711 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-cn/GLWORkVa/mJRdpV5jqOm5iFW1QFFrTlGPGCzm1/o="; + hash = "sha256-6+fMMB8Vgvmi3JO6YMqMiiHWdlq+PfTD1/zemIqf5sw="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-w7RB1WI5Lyn8LkFarIgwSTbuECuLF0wT5ht3jnGO+9A="; + hash = "sha256-HA2I2+4F5NSLWJJpArTDcEHIAJShARjgomM2GcVwj5Q="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-XTE03L6SrIGZNaz2/XSKGLp3D45EWeh6RUxgBabURz0="; + hash = "sha256-MaclGEzgUAHLV2Fe8O3ex6yjfnM73Clory0n+BVNZIs="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-Xq2+C9/g9y+K9s6qIMgUZxyyPaMSLQI31uLyR5dAyww="; + hash = "sha256-YR/geLezoi+UPa7Eo0M4wQmRGuHiRTK74BdkGGOxPis="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.131"; + version = "2.1.133"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9bb18e119758..3c80682dbe86 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -871,8 +871,8 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "3.18.1"; - hash = "sha256-Kph5nQgbRSgDVqo2n2eXoQXh7ga0o8/oNkQyoSZxHZo="; + version = "3.19.0"; + hash = "sha256-6/NHZkg37b6RyZIP89FMltSii+7sC5UTfHYFgyYyl4A="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc/changelog"; @@ -1760,8 +1760,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.39.0"; - hash = "sha256-kOzr8YjwHdA3Tgo4JeEAWda4tBrXjMQNBITNhmy9cP4="; + version = "0.40.3"; + hash = "sha256-NGC6uW1biseqQ04fD3K4mK4D4rcGVqt0LBlGFC1Exu8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -3534,8 +3534,8 @@ let mktplcRef = { publisher = "mvllow"; name = "rose-pine"; - version = "2.15.1"; - hash = "sha256-GCN201yqr4lf2rc0ZV+iWkZi69qGOXFKhLPMhJ08U2w="; + version = "2.15.2"; + hash = "sha256-5jXlCFk/86BL1yojTRuhRzS3XqcwcCpl/gmApcTdlBw="; }; meta = { license = lib.licenses.mit; @@ -3898,8 +3898,8 @@ let mktplcRef = { publisher = "redhat"; name = "vscode-yaml"; - version = "1.22.0"; - hash = "sha256-Xsy2350zAxSEhJgCl5/bVwWEwaXgmnN0Y/orDjwNuw4="; + version = "1.23.0"; + hash = "sha256-GC7AIQIUw+F5rBscTe+ulKt/97s7p636TLRvmcT9b9c="; }; meta = { description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support"; @@ -4218,8 +4218,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.24"; - hash = "sha256-SKDg0AVzlDFPq3ZHE65vX6OUPWeZGTJb5DaVs/y14UY="; + version = "0.8.25"; + hash = "sha256-0yOtvHL24eJizmzXAC956Tx9eNJaWDPl/OAhmFv2KJk="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; @@ -4530,8 +4530,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.15.0"; - hash = "sha256-/1we+6X3l7MCx96ELz7wg6oDDAcYCJBt7XJ4X0ihwx0="; + version = "110.0.0"; + hash = "sha256-l5L0uqHpBR6nWzr8/edz3EU8+BP9yqRRFhpnngG0RGY="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix index 695d221ee3f1..ad57d3e15f26 100644 --- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix @@ -26,8 +26,8 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-mr5GwwfuNoLhKM5bAhNAO3j0ow4FcyZhvQlVnAENoyg="; + fetcherVersion = 3; + hash = "sha256-Yuxuqr1BiviSw+dGNHLs2jAy8ADlBvRks6Kmy7FmCMw="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix index 0fff354b20da..4e57a24ce0c3 100644 --- a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix +++ b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "10.14.1"; - hash = "sha256-lsbiKzZTlkq/9K7ptLg0kHAd4i5OyNh2pLGGYUOJS9A="; + version = "10.15.2"; + hash = "sha256-H/WJdkwfiNIFBc4dW6XqB6QopKZYjYN/zDVUpoY3erk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix index 217701a6ac02..80544534894c 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix @@ -34,7 +34,7 @@ let }; makeCacheWritable = true; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; nativeBuildInputs = [ @@ -42,10 +42,10 @@ let nodejs-slim.python npmHooks.npmConfigHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar ]; diff --git a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix index 2b4644a8502b..41fdc17e69f4 100644 --- a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix @@ -32,7 +32,7 @@ let hash = "sha256-vktxhQA2a+D9Nr4vhbmGCnNdGzt0U89K50g0SgiV5SE="; }; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; @@ -41,10 +41,10 @@ let nodejs-slim.python npmHooks.npmConfigHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar ]; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index fceb766b79ab..627b30007bdb 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -25,8 +25,8 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-kQjxcqHEClQtG6x2QM1/zixN6rvcEivX8vicNydDdOw="; + fetcherVersion = 3; + hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index cc47b9f8ecd6..4c2ab7990fe4 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -47,7 +47,7 @@ let pkg-config ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 installPhase = '' diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 582e54e64b17..1c0fe0f5ed3a 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.81.0"; - hash = "sha256-gVQmKuyUH+bXpr7X2Z23U2oKFnAV2mxhckjef2uL8KQ="; + version = "3.82.0"; + hash = "sha256-+CtWfRGumMTFckmU9Z8TAwrn35WiUrri1x6XL9khOnM="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix index 7b4b082988be..a81e42ca3349 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix @@ -22,7 +22,7 @@ buildNpmPackage { python3 pkg-config ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 62d99fa80b64..bb091c071025 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -35,17 +35,17 @@ let hash = { - x86_64-linux = "sha256-YF0zu0aqZpGGGaf5uNqaVaL1sMQuEVIzZ1Mczuwnfq4="; - x86_64-darwin = "sha256-zv6Ryr1wTR9+osEhtAHO4viXAI4pc7Yk47dex622ymg="; - aarch64-linux = "sha256-Mym9ijieF7jVAyZJ/3sO0Wp5JJ4c+/8psCjxrlEH/ok="; - aarch64-darwin = "sha256-qLshyr9jGyx5dxUGnf5GftlTSoA1OeAWtIvK1aDxqCQ="; - armv7l-linux = "sha256-JdyQ+65gJCU8Ye2darRV4Hi0//0imkX56bvc52MNLcM="; + x86_64-linux = "sha256-HcZIRGB0y8U5huxXN9jNrhMD0Jjmn+QNUU60EHGduXo="; + x86_64-darwin = "sha256-mMDxEAt/Lst4ifeczcL+QT8mVVXNk8fDNTM1YHGZ8tY="; + aarch64-linux = "sha256-o0JV1Vc6utTmJkH9uTSylBsYM3mAfiDIgwg3LUOBWb0="; + aarch64-darwin = "sha256-8ixVOUe4EcNX/z0jnux1hXOhnG1JuhbssH2BARqU80o="; + armv7l-linux = "sha256-KxrSOVCdfa4L9RlnHybwGLRciMFwC/COsctX+5nqR/c="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.118.1"; + version = "1.119.0"; # The update server (update.code.visualstudio.com) expects the version path # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0"). @@ -53,7 +53,7 @@ let downloadVersion = lib.versions.pad 3 version; # This is used for VS Code - Remote SSH test - rev = "034f571df509819cc10b0c8129f66ef77a542f0e"; + rev = "8b640eef5a6c6089c029249d48efa5c99adf7d51"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -86,7 +86,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-is+djb3G/Lchc4+rqNgjW5xH6vD+OuHDKH7MBKPAJoA="; + hash = "sha256-FyRpbjxY8PWr8z+ttn1H93ud4raFAJz704Vn38+LYCM="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index bf9550bb7c38..1851be48b328 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-01"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "95b5274dfeda36f7e77c70daa666a63302ad83cf"; - hash = "sha256-BEt2g63jBOrgWk0tYp8DJVC65AbeSVRQz9rIMwjj2Sg="; + rev = "9ba79648d6ec85e833aef719d7f359117498d89c"; + hash = "sha256-VSZelshWjMxIe8sumNZZ6WHm1WTE9r2xm62og0YLGlY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 4c5d684ed49c..ff7bf7afadd5 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "ab72423afd429c1e96ca56fbd39094a71270842b"; - hash = "sha256-j1ZCbB0hKcxay/0BkkuoncYPAkMTgSGEAOzYNgJaAh4="; + rev = "c699953afa01bc3f179edbcb14c4cfbeee6107a2"; + hash = "sha256-s009GuPnsufDT70dBmhwfZmYjdf7pYO13FjycYvUF4c="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/desmume.nix b/pkgs/applications/emulators/libretro/cores/desmume.nix index a53dbfe8270f..e1009508362c 100644 --- a/pkgs/applications/emulators/libretro/cores/desmume.nix +++ b/pkgs/applications/emulators/libretro/cores/desmume.nix @@ -10,13 +10,13 @@ }: mkLibretroCore { core = "desmume"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-03"; src = fetchFromGitHub { owner = "libretro"; repo = "desmume"; - rev = "a4db60dc63f36134ffebfe524b56e87a0b05f20f"; - hash = "sha256-v9jppfo85wR4KrblE9HtI/psQiQafn4OIXmDofxqOfc="; + rev = "a55c393de8ecf19df8111f65b8e12d08b9616520"; + hash = "sha256-0+uSOg1asszgnDbdRsfWQY/E2Ky2tK3KxkcNV2mGjBQ="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 8efae4a3c047..08984bdd5b9c 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2026-04-30"; + version = "0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "806cbc866c973caf442b4b6c6058f867b36bd1fb"; - hash = "sha256-kHB2Zz6mjhZiYDtoMIuaFvB2C/RIU89e2JNeBzHgIuU="; + rev = "776ae715211d3ef2413b2828e9e9d50d869a6822"; + hash = "sha256-NgPs8H8/ysD18J2G9StaLM5e05EzgjLW8c2kTrcOXZI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix index 70391d943e7a..3121978358ac 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "0-unstable-2026-04-09"; + version = "0-unstable-2026-05-05"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2010"; - rev = "a7a4bfaed4c6408908c76af20ad625e1645c3d11"; - hash = "sha256-mtTgh/koM7jS7/cH7qRgTa+xJXBBJSdxHHbhOd/q4i4="; + rev = "d9cba8a41b3407ebb929816a7033e0407fd7b2d0"; + hash = "sha256-OdJStJK823PayWS+bmwG+kDrdx6KeVWYiSAu61C9UFs="; }; makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 8aa5a308c364..d25f943a1363 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -268,16 +268,6 @@ stdenv.mkDerivation ( } ''; - # Fix dcomp test for aarch64 - postPatch = lib.optionalString (useStaging && stdenv.hostPlatform.isAarch64) '' - if [ -f dlls/dcomp/tests/dcomp.c ]; then - substituteInPlace dlls/dcomp/tests/dcomp.c \ - --replace-fail \ - '#error "Unsupported architecture"' \ - '__asm__ __volatile__("mov %0, sp" : "=r"(stack_pointer));' - fi - ''; - configureFlags = prevConfigFlags ++ lib.optionals waylandSupport [ "--with-wayland" ] diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0f93ed114c8b..d6f624271e9b 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -151,9 +151,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "11.7"; + version = "11.8"; url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz"; - hash = "sha256-sBqyHHn+3mx71THUadma/Z3N9T6ymviK2sajMutDX58="; + hash = "sha256-U6qFmV1Ll/ARahxWuKahQXcw71mid4GdLT0xNk6lVrA="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -163,7 +163,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-EjAmwSZu/Q/8QfFERnV5iz1n5CsWPneBHflQDaD4LAc="; + hash = "sha256-lW5dfCfsB+z84mlLpfmkR7QDxmhL+RcBufSftUutHto="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 9d3738d17752..7a5b12418a12 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -76,7 +76,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; - version = "1.4.3"; + version = "1.4.4"; outputs = [ "out" "man" @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-6DosPbVwtsWh/w/M/nCYg3s/a9dLEzVnk3yKkXEO0dE="; + sha256 = "sha256-u85XU6Hgi4caXPFsZl6wYHAKqrmmo3ncY/TE2bO4hW4="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index 2871514797a0..d2563a0313e4 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, wrapQtAppsHook, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index b4730af82ae2..7c5fdc28720d 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; installPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out" mv diffpdf.app "$out"/ diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix deleted file mode 100644 index 53b4d511b73f..000000000000 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - extra-cmake-modules, - wrapQtAppsHook, - kiconthemes, - kio, - kjobwidgets, - kxmlgui, - testers, - k4dirstat, -}: - -stdenv.mkDerivation rec { - pname = "k4dirstat"; - version = "3.4.3"; - - src = fetchFromGitHub { - owner = "jeromerobert"; - repo = "k4dirstat"; - rev = version; - hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kiconthemes - kio - kjobwidgets - kxmlgui - ]; - - passthru.tests.version = testers.testVersion { - package = k4dirstat; - command = "k4dirstat -platform offscreen --version &>/dev/stdout"; - }; - - meta = { - homepage = "https://github.com/jeromerobert/k4dirstat"; - description = "Small utility program that sums up disk usage for directory trees"; - mainProgram = "k4dirstat"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.raboof ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix deleted file mode 100644 index 853904523636..000000000000 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - extra-cmake-modules, - wrapQtAppsHook, - kactivities, - qtbase, -}: - -stdenv.mkDerivation rec { - pname = "KSmoothDock"; - version = "6.3"; - - src = fetchFromGitHub { - owner = "dangvd"; - repo = "ksmoothdock"; - rev = "v${version}"; - sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk="; - }; - - # Upstream seems dead and there are new deprecation warnings in KF5.100 - # Remember, kids: friends don't let friends build with -Werror - postPatch = '' - substituteInPlace src/CMakeLists.txt --replace "-Werror" "" - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kactivities - qtbase - ]; - - cmakeDir = "../src"; - - meta = { - description = "Cool desktop panel for KDE Plasma 5"; - mainProgram = "ksmoothdock"; - license = lib.licenses.mit; - homepage = "https://dangvd.github.io/ksmoothdock/"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/kup/default.nix b/pkgs/applications/misc/kup/default.nix deleted file mode 100644 index a956b7de416e..000000000000 --- a/pkgs/applications/misc/kup/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - extra-cmake-modules, - shared-mime-info, - wrapQtAppsHook, - kcoreaddons, - kdbusaddons, - ki18n, - kio, - solid, - kidletime, - knotifications, - kconfig, - kinit, - kjobwidgets, - kcmutils, - plasma-framework, - libgit2, -}: - -stdenv.mkDerivation rec { - pname = "kup"; - version = "0.10.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - repo = "kup"; - owner = "system"; - rev = "kup-${version}"; - hash = "sha256-G/GXmcQI1OBnCE7saPHeHDAMeL2WR6nVttMlKV2e01I="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - wrapQtAppsHook - ]; - - buildInputs = [ - kcoreaddons - kdbusaddons - ki18n - kio - solid - kidletime - knotifications - kconfig - kinit - kjobwidgets - plasma-framework - libgit2 - kcmutils - ]; - - meta = { - description = "Backup tool for KDE"; - homepage = "https://apps.kde.org/kup"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.pwoelfel ]; - }; -} diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 1c1f5719f37c..9903c2433c47 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -5,7 +5,6 @@ cmake, qttools, wrapQtAppsHook, - kirigami2, qtquickcontrols2, qtlocation, qtsensors, @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - kirigami2 qtquickcontrols2 qtlocation qtsensors @@ -47,7 +45,7 @@ stdenv.mkDerivation rec { s2geometry ]; - cmakeFlags = [ "-DFLAVOR=kirigami" ]; + cmakeFlags = [ "-DFLAVOR=qtcontrols" ]; pythonPath = with python3.pkgs; [ gpxpy ]; diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix index 07d4d5347afd..7ce61dcf307f 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -4,51 +4,63 @@ fetchFromGitHub, installShellFiles, pkg-config, - qmake, + cmake, qtbase, - kcoreaddons, - kwidgetsaddons, qtsvg, wrapQtAppsHook, + qttools, + pugixml, }: - +let + singleApplication = fetchFromGitHub { + owner = "itay-grudev"; + repo = "SingleApplication"; + tag = "v3.2.0"; + hash = "sha256-qjpPYPe1Oism6TetD/dMvTo1qyZKOsOPW+MzzNpJf3A="; + }; +in stdenv.mkDerivation rec { pname = "qelectrotech"; - version = "0.9.0"; + version = "0.100"; src = fetchFromGitHub { owner = "qelectrotech"; repo = "qelectrotech-source-mirror"; - tag = "0.9"; - hash = "sha256-tj8q+mRVtdeDXbpiv4retdbNiIfvAFlutXn7BmjqFYU="; + tag = version; + hash = "sha256-ElkqRiIHSXavXEw1ioFKL1cGnaBb2GXZuxgl98O4WuI="; }; + patches = [ + # stripped down version of https://codeberg.org/gentoo/gentoo/src/branch/master/sci-electronics/qelectrotech/files/qelectrotech-0.90_pre20250820-cmake.patch + ./system-pugixml.patch + ]; + + # fix wrong cmake conditional postPatch = '' - substituteInPlace qelectrotech.pro \ - --replace-fail 'GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""' \ - 'GIT_COMMIT_SHA="\\\"${version}\\\""' \ - --replace-fail "COMPIL_PREFIX = '/usr/local/'" \ - "COMPIL_PREFIX = '$out/'" \ - --replace-fail "INSTALL_PREFIX = '/usr/local/'" \ - "INSTALL_PREFIX = '$out/'" + substituteInPlace cmake/fetch_kdeaddons.cmake \ + --replace-fail "DEFINED BUILD_WITH_KF5" "BUILD_WITH_KF5" ''; + cmakeFlags = [ + "-DBUILD_WITH_KF5=OFF" + # relies on vendored catch2 + "-DPACKAGE_TESTS=OFF" + "-DFETCHCONTENT_SOURCE_DIR_SINGLEAPPLICATION=${singleApplication}" + "-DBUILD_PUGIXML=OFF" + ]; + nativeBuildInputs = [ installShellFiles pkg-config - qmake + cmake wrapQtAppsHook + qttools ]; buildInputs = [ - kcoreaddons - kwidgetsaddons qtbase qtsvg - ]; - - qmakeFlags = [ - "INSTALLROOT=$(out)" + pugixml ]; installPhase = '' diff --git a/pkgs/applications/misc/qelectrotech/system-pugixml.patch b/pkgs/applications/misc/qelectrotech/system-pugixml.patch new file mode 100644 index 000000000000..4b3295abc448 --- /dev/null +++ b/pkgs/applications/misc/qelectrotech/system-pugixml.patch @@ -0,0 +1,57 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,6 @@ + ${QET_DIR}/sources/NameList + ${QET_DIR}/sources/NameList/ui + ${QET_DIR}/sources/utils +- ${QET_DIR}/pugixml/src + ${QET_DIR}/sources/dataBase + ${QET_DIR}/sources/dataBase/ui + ${QET_DIR}/sources/factory/ui +--- a/cmake/qet_compilation_vars.cmake ++++ b/cmake/qet_compilation_vars.cmake +@@ -421,10 +421,6 @@ + ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp + ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h + +- ${QET_DIR}/pugixml/src/pugiconfig.hpp +- ${QET_DIR}/pugixml/src/pugixml.cpp +- ${QET_DIR}/pugixml/src/pugixml.hpp +- + ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp + ${QET_DIR}/sources/qetgraphicsitem/conductor.h + ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp +--- a/sources/diagramcontext.h ++++ b/sources/diagramcontext.h +@@ -17,7 +17,7 @@ + */ + #ifndef DIAGRAM_CONTEXT_H + #define DIAGRAM_CONTEXT_H +-#include "pugixml/src/pugixml.hpp" ++#include + + #include + #include +--- a/sources/ElementsCollection/elementslocation.h ++++ b/sources/ElementsCollection/elementslocation.h +@@ -20,7 +20,7 @@ + + #include "../NameList/nameslist.h" + #include "../diagramcontext.h" +-#include "pugixml/src/pugixml.hpp" ++#include + + #include + #include +--- a/sources/NameList/nameslist.h ++++ b/sources/NameList/nameslist.h +@@ -17,7 +17,7 @@ + */ + #ifndef NAMES_LIST_H + #define NAMES_LIST_H +-#include "pugixml/src/pugixml.hpp" ++#include + + #include + /** + diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index eaf712c54871..8e8594c63520 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -2,26 +2,29 @@ fetchurl, lib, stdenv, + cmake, extra-cmake-modules, kdoctools, wrapQtAppsHook, knotifyconfig, kidletime, kwindowsystem, + kstatusnotifieritem, ktextwidgets, kcrash, }: stdenv.mkDerivation rec { pname = "rsibreak"; - version = "0.12.13"; + version = "0.13.0"; src = fetchurl { - url = "mirror://kde/stable/rsibreak/${version}/rsibreak-${version}.tar.xz"; - sha256 = "N0C+f788fq5yotSC54H2K4WDc6PnGi8Nh/vXL4v0fxo="; + url = "mirror://kde/stable/rsibreak/${lib.versions.majorMinor version}/rsibreak-${version}.tar.xz"; + hash = "sha256-arLOCcV9D+UXgwjqlfh9675VrpjPs3QkkireJZO60SA="; }; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools wrapQtAppsHook @@ -30,6 +33,7 @@ stdenv.mkDerivation rec { knotifyconfig kidletime kwindowsystem + kstatusnotifieritem ktextwidgets kcrash ]; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 50cf1f4ec7db..33ed202662ed 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -828,28 +828,28 @@ } }, "ungoogled-chromium": { - "version": "147.0.7727.137", + "version": "148.0.7778.96", "deps": { "depot_tools": { - "rev": "f2f7ec41f2c170d6f1899406f11a48411760a683", - "hash": "sha256-/4Zz169PVxRGFubknL+5hbUX9uRnOGArjt0dA8u0I88=" + "rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1", + "hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM=" }, "gn": { - "version": "0-unstable-2026-03-05", - "rev": "d8c2f07d653520568da7cace755a87dad241b72d", - "hash": "sha256-3AfExm7NL5GJXyC5JCPbGC70D59doRfIZIgpt6MLy9Y=" + "version": "0-unstable-2026-04-01", + "rev": "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a", + "hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=" }, "ungoogled-patches": { - "rev": "147.0.7727.137-1", - "hash": "sha256-MtsTk7aV7qpeXYBTxfEauCJlcoWYxdsQFbtN9ockSME=" + "rev": "148.0.7778.96-1", + "hash": "sha256-yuc51ursl3pNyqSuTT9391AAlytoTzEMeronxjsNM7g=" }, - "npmHash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=" + "npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "68ba233a543d25e75c30f1228dd3bafa2da96937", - "hash": "sha256-ktIkQRYWcyKnZKEhvxFGssMZ///ctd/Ue3VIYPvQzuM=", + "rev": "8625e066febc721e015ea99842da12901eb7ed73", + "hash": "sha256-coeBYfNPtiRRPuqoBRaxkTQI/a2pYNLI1slUdU1dZAc=", "recompress": true }, "src/third_party/clang-format/script": { @@ -859,8 +859,8 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "338a5c004c774a8927899b1f1c0c25a82d14510f", - "hash": "sha256-2lj4oF8IbJoPOBWwQ4ZfDQjPklxQyNyG5AcHazxEYcs=" + "rev": "76287b5da8e155135536c8e3a67432d97d74fe3a", + "hash": "sha256-q6syHriTR8TCQSqTWbbAkVVK0a/i4wojdEGN7sWGxUY=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", @@ -874,13 +874,13 @@ }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "78884e23fe39cf5cc6987ea188a9b802d65a21c9", - "hash": "sha256-G8CtxDHzo8WtJ6qrtghXBoYCWwnDvXcAueEGzLc6C14=" + "rev": "6ca46ff28e3578c57cbead6f233969eb3dabc176", + "hash": "sha256-JW4kqpVTCFDN4WZE2S5gEkX1O7eDycl+adm3KGlUoTU=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "c42ab4598a74eea2cf3efff9d44b22de155d41af", - "hash": "sha256-NJCdrmVyF80aQLtrdVgcWQadhj5w7nKrLShaZDen1GA=" + "rev": "2a826f2fda3cf8d75b47cbc3bb1d9b244f13a6ab", + "hash": "sha256-OWe2lAT5XbADWuxHgg53lZiU0My/ys86FEXvn4zlVx0=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -899,18 +899,18 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "d3b3b620e65ebaf511c6c8399b98a081cd644a66", - "hash": "sha256-xTGvhQUKOgt007WdvzN4eDpue8nheEMSV+Cl3Tnwviw=" + "rev": "44319eca109f9678595924a90547c1f6650d8664", + "hash": "sha256-Trkan7bzRaLFlTkRfNGh7ssoZ3QpMh+mxQacsSM+d2I=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "9920660ea0162f88c44a648de177e6f8cb976d07", - "hash": "sha256-rC/aV3vsFzXQ8BiOIK+OTXxTsgTLEEqC19KDAot1PTs=" + "rev": "33c977516b3dfe5b065bc298aa74175e1999ab51", + "hash": "sha256-GsaRxLnsz1jrFZ3m5tv65d1dioG23uJnmfa+WD7XcFc=" }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "435c98c0d9ab7a2b60592c5297635b4791745191", - "hash": "sha256-dhsq9kLRcXPxv0Ih6CQhDvLAGjh3EgSCl28Cxjk2aos=" + "rev": "21ffbe4c7b717d00d2d768c259b5b330fd754ac3", + "hash": "sha256-yKMmfdSBvbB3T042TJbZ1Mw+y0kyfHP0knQVFWAFPTg=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -919,8 +919,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "534e0d1c1d0fcb4b57fd6a3fb9284cd14eaa28cd", - "hash": "sha256-o3UV8X27G7wpaDiKDzgMZN64+d9JQrvcQXpSybxi/h4=" + "rev": "cc0e3572e8789f4a184dd9714a04b3d98ae81015", + "hash": "sha256-3KVTEBcnQTn99ccdKzylzUvua2jlS4g8/nfIDdLk6ug=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -934,8 +934,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "1cf4ed5bc0620ea514404609b1a2958c4518b86d", - "hash": "sha256-IZ5tVrld2+wDOWaYX93j2eLZJJs/EMW1+FtxhOeWi6w=" + "rev": "f52e89f885064b9109501bca16c813bb29389993", + "hash": "sha256-3jx4QVR9nB3WggfrORGJGifmJQhAYVSPusa7RlR16qg=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -954,48 +954,53 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "b546257f770768b2c88258c533da38b91a06f737", - "hash": "sha256-E3da/LJ8HNy1osExmupovqnL8JHgVNzPUCG5F8TJKXQ=" + "rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75", + "hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "049880d58d6636a819168c00f44f8a4ed1e33e51", - "hash": "sha256-AHUos4ejvcsHTDdretkDHAeyLugtI6Jg14Hb9MbbPPs=" + "rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3", + "hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8=" }, - "src/third_party/dawn/third_party/glfw": { + "src/third_party/dawn/third_party/glfw3/src": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", - "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=" + "rev": "043378876a67b092f5d0d3d9748660121a336dd3", + "hash": "sha256-4QSD1/uxWfYZPMjShB0h639eqAfuBRXAVfOm6BbZCBs=" }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "2888a8764a33693f5a351e0c4ec87f430ccb0f7a", - "hash": "sha256-xAe7SdcOeNiqNF6pYwMPMnd9/2yTWUlVdH1aCco/PEo=" + "rev": "eb67a9085c758516d940e1ce3fed0acfb6518209", + "hash": "sha256-z+yIuVweIyLdOiZDRfSppjTRoYq8S93+JNUla4Umot8=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=" }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "src/third_party/dawn/third_party/directx-headers/src": { + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=" + }, + "src/third_party/dawn/third_party/OpenGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", "rev": "5bae8738b23d06968e7c3a41308568120943ae77", "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=" }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "src/third_party/dawn/third_party/EGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=" }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "d213d4b8dba58ca7a0685e30cfaf1d29f4fc5d5b", - "hash": "sha256-6YGLG9BMQbF2pjV40su5ddHMqDW8/CEwM3RDEc/t2kM=" + "rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f", + "hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", - "rev": "b2b04dde36a941434c88ccff7a730d7e464d638c", - "hash": "sha256-+/qXZNkm26p+becMVcyHNUPyEUCejSV+tyTGFE4ivak=" + "rev": "7d3186c3dd2c708703524027b46b8703534ab3cc", + "hash": "sha256-yE3/mfhqc7YtVNg4f/nrUpuRUGRjOzdwl++vPvd+mvc=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -1009,13 +1014,13 @@ }, "src/third_party/libpfm4/src": { "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git", - "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064", - "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=" + "rev": "977a25bb3dfe45f653a6cee71ffaae9a92fc3095", + "hash": "sha256-t4LMG38GksMEM5DktyJ0qLUX1biXErQ57MaMtd7hoeo=" }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "27bc28d7f03fb9e3752980dce01de1a529236532", - "hash": "sha256-u+yvIPrdb9fWzJXJeIidUQ1MkKUx6sKLs7vdW68QhYc=" + "rev": "d8be2b4a71155bf82da092ef543176351eeb59ff", + "hash": "sha256-fZc95YrREDbf0YcO6zahIjdX6TcRJANcH9MrkLIIIHw=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", @@ -1029,13 +1034,13 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "e0ebf38a01214aba11f31daa1c743782def031d5", - "hash": "sha256-njtIcvzo2v9uDuP+AostVAZRTtH2vePsshF4cANHkxo=" + "rev": "4f1d71f6841d210b3a06ab3ef2e2ed679af0ee56", + "hash": "sha256-aHlf8gw3KxbKoyyajP4w586iYybx7HSkcKtLcZIgiDE=" }, "src/third_party/catapult/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "22be07d7809409644d7e292d9495fa8a251d5f29", - "hash": "sha256-HR6iEDwmxFaiLi+h3MwsNfBOtBNbrKvmRNgMVog3A0Y=" + "rev": "be48b5e3387780790ecc7723434b6ea6733bcc33", + "hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -1059,8 +1064,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "7364b490b5f78d58efe23ea76e74210fd6c3c76f", - "hash": "sha256-lB6e5zcw5UiwTOf+a+B35apXP5t1bxI6yOMiEeFwIwY=" + "rev": "7607ca500436b37ad23fb8d18614bec7796b68a7", + "hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -1069,28 +1074,28 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "1fb70b2851b292e48b612482a6d4d1b4c343c862", - "hash": "sha256-YBN8ogJn5Yup9GYrsE9UW15KPCuXbhD6hdqXWWCPD20=" + "rev": "c27a09148de373889e5d2bf616c4e85a68050ae2", + "hash": "sha256-a/mAa1+if6B1FHe9crO8PDpc3o8M+CeIuXjXT0lwZOY=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "19cee54825bc57215266f5b14a5874bfbbb57543", - "hash": "sha256-HVwX8E3/7yw7zUqZrptN1iSBWF4ls0FAzPObPagNYtM=" + "rev": "c179f7919aade97c5cff64d14b9171736e7aaef9", + "hash": "sha256-Hxazf58z9imnGO1aj2NRtsQ+BYrfAuIuZscADpr1NVI=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", - "rev": "909ad1733b50f28510c840ebad7b878a5ce07715", - "hash": "sha256-RYih9sn4rIBnFW/styZaUl5H0A1eEy3//DypZjY6n0M=" + "rev": "b19e4e52c33fb8a105c3fc99598b0b9b4bc59752", + "hash": "sha256-7vCQw91L2c97dnVdrJ53zL8hi0KZffDJJjk7GaG3b/U=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "4ce8ba39a3488397a2d1494f167020f21de502f3", - "hash": "sha256-WTzjmLFjh1yDDEvYE7Qfx8aBxMLdATx14+Jprwh8ZgQ=" + "rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1", + "hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "854a02be78c7ffea104cb523636efa991bef5c5b", - "hash": "sha256-CzzUueh2QXX+ExGqh5+JpnDoWF8DiFDff7fWmC01xfg=" + "rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7", + "hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1104,8 +1109,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "54458cb39d1081d0cfe6b77ed8e085d457a4c921", - "hash": "sha256-WXxSe2AY3hSMXz7lHNeFefOHGGkdXoSQLC6FuOa6Exo=" + "rev": "a3074053a614df7a3896cb4edbcba40222a5f549", + "hash": "sha256-9AHpSqemqdwXoMiP3hH1YuEd3+nrudeVGTpInw+8BU4=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1119,13 +1124,13 @@ }, "src/third_party/federated_compute/src": { "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git", - "rev": "271aa00f8aec5bc801f542710efe1b2f0b5f0ef9", - "hash": "sha256-6ZATBYkyIdGuhG0Ps2vr0DT9nq1LhW2XCWWAkiZh9Hc=" + "rev": "eb170f645b270c7979edb863fd2cf8edab2b2fd1", + "hash": "sha256-Cp0WQBbqWvPdrKCMQhH4Z6zl6YlIPLjafWZEwdkYWlc=" }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "946d97db8d906277085e361892b7efda5152e2f1", - "hash": "sha256-UxrmVqfX6TvFy1yxWXIQbd3ABD3jEAtDesgfnbJGg1E=" + "rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0", + "hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1154,18 +1159,18 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "45556a19aab9502b91d6f30931e0cb5256f683f8", - "hash": "sha256-eMt2orPeG81o42O/HU+4B5b/G62TYAVIEeWwOmiML14=" + "rev": "99b479dc34728936b006679a31e12b8cf432fc55", + "hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=" }, - "src/third_party/harfbuzz-ng/src": { + "src/third_party/harfbuzz/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "5d4e96ad8d00fc871ffa17707b2ca08fa850e7d6", - "hash": "sha256-9ef1P2JVJc7ZiP7TObFOxJbccCLsEgjhj+Z/ooEAGiI=" + "rev": "4fc96139259ebc35f40118e0382ac8037d928e5c", + "hash": "sha256-/RT2OPWFiVwFqmNS4o+gE0JrcVO1cQDkCkgrSEe7BzE=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", @@ -1174,13 +1179,13 @@ }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", - "rev": "3fa5129ed1ae6f8b2ec4e9b60fa5d08cc81e2d78", - "hash": "sha256-/TBxFsmLH1h3kfeE90LhR0RWJ3NrCTiLKklcaPbean8=" + "rev": "da42d439389c90ec7574f0381ec53e7f5be0c2eb", + "hash": "sha256-W5HgVe0v9O/EuhpKMHp83PLq4p6cuBul3QUGLYdF6rY=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", - "rev": "69015643b3f68dbd438c010439c59adc52cac808", - "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=" + "rev": "e8cb570a9a2ee9128e2214c73417ad2a3c47780b", + "hash": "sha256-5cb9qhSEzb941pF5HH0Br+x9wEH7MiGwQttvErb2mZo=" }, "src/third_party/emoji-segmenter/src": { "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", @@ -1214,8 +1219,8 @@ }, "src/third_party/icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "ee5f27adc28bd3f15b2c293f726d14d2e336cbd5", - "hash": "sha256-UQWSAekvYc1bTEAEQTPdeB406Uqb0mptpnGRZSaLewo=" + "rev": "ff7995a708a10ab44db101358083c7f74752da9f", + "hash": "sha256-yQ55MGzqkVkp/arTlmKqySBvQFtaPaBk9UUAFE0imhE=" }, "src/third_party/nlohmann_json/src": { "url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git", @@ -1229,8 +1234,8 @@ }, "src/third_party/leveldatabase/src": { "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5", - "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=" + "rev": "7ee830d02b623e8ffe0b95d59a74db1e58da04c5", + "hash": "sha256-a1fcVI9Vsm1qE17Fnx5UxwOy4ZFMMJ0OKwNs/gZHYQI=" }, "src/third_party/libFuzzer/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", @@ -1239,8 +1244,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "1f7726d61f7afa9aca1198a9395ede472ed70366", - "hash": "sha256-RhJ676e6Kr/muR0ZCfZOAcs3kfoK7CjG2cwOpYG/JCY=" + "rev": "800c545cf9d6e9c01328a1974f93a7e6564a74fd", + "hash": "sha256-Pvz+CWTBcWE0N0yfNGZhXDgUrGeIaCNfEjP1jYmF6G0=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1254,13 +1259,13 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "ab9876a5983227865ee26e91caac87c6b8750e27", - "hash": "sha256-V40GL7fKj1qratP0KcrhedEPDIsg0XVb3ha5nroM0ws=" + "rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c", + "hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c05daf3e2e6d83f2a359ab97094ce042944020a9", - "hash": "sha256-vVKAgvPdba0Lt3BUStOQsILlhiHNJeIv1jS9691+a80=" + "rev": "7466a44ac80893803d4a7168b98dc6cd02d1fe2d", + "hash": "sha256-x1MRNtGLmwlRNenoQKz2Bgm3J5eHlNiJZtzhT9lttmk=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", @@ -1314,8 +1319,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "ddb611c60142c72be3719e753a42fb434b6f2458", - "hash": "sha256-M/b7PKEu+mFxsEeedJeppkwl8aZnX/932zqWlrCx8Y4=" + "rev": "fb512780dcc5ba4b5be9e8a3118919002077c760", + "hash": "sha256-7wx73HZ6aqXQvLxwX6XnJAPefi/t47gIhvDH3FRT1j4=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -1324,8 +1329,8 @@ }, "src/third_party/expat/src": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2", - "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk=" + "rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a", + "hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc=" }, "src/third_party/libipp/libipp": { "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", @@ -1369,13 +1374,13 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "aec2a6f1cd6e3d9e8cf5d9682fcb8a442799bd22", - "hash": "sha256-PNreh1VisA46I0WZqq8wZRCjbQRiVMxbL5Gl2Bfzo3M=" + "rev": "47ac1ec7f3de7d7cb3d070844c427c8f1fa9d6fc", + "hash": "sha256-RyYnkLYafiS6kQKeOmzohtxFRXudDzgEmQkG+qKHozc=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c", - "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4=" + "rev": "b7a1e4767fbb02ad467f45ba378e858e897028da", + "hash": "sha256-Lzfs15Us8MDDQYvLRVf6xKg9A76aXPnTukx/A8Mf7rw=" }, "src/third_party/libwebp/src": { "url": "https://chromium.googlesource.com/webm/libwebp.git", @@ -1404,8 +1409,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f", - "hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=" + "rev": "45252858722aad12e545819b2d0f370eb865431b", + "hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -1419,8 +1424,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "571620ad60afc9f317d77605c65335f5412aada2", - "hash": "sha256-ktR3EpmkjueEmEip2oUTcSclVkUlPi/7+qmhElG+Bzs=" + "rev": "448a19d1f24e0f8ce85ad0c1c6a50cf370ae69d7", + "hash": "sha256-hRDFnoqAH4HoWZ3oTWlzNge2nwlxpUC/GEq0MQVzBw8=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -1434,13 +1439,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "e5bafd3be58c26673576fd5bb5cbf413b485de5b", - "hash": "sha256-umtG2n6kWYD0hT44GpmnwUVztkZ0RtQDV0h0+4CTC9w=" + "rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93", + "hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "728eb5626a3bc701d044dd16d9cd289360ff47c3", - "hash": "sha256-LeGGkzSMfVXuioVJmRi/TjMYgG/0YrK7PckBJTejSHU=" + "rev": "46432bb2a7a60e10fcee516f1692e6846d098a8d", + "hash": "sha256-jVih4xWota4SZQi4yEtaIP+4qgD03OsELt2aaulIXik=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1454,8 +1459,8 @@ }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=" + "rev": "8047437615d66d3267ac0134834b80e70639d572", + "hash": "sha256-rEnt08K90/Psfa+SQgTUG3YGrhp4/udXG9VKIwPM7pk=" }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", @@ -1484,8 +1489,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "6e0fbe154ccaf018b2dd1f0e42eec285e7d79d00", - "hash": "sha256-oqfNOSQB+5sbAnw4tPBXn22rk6Ai5b2aZNLJUyM181k=" + "rev": "afe8b760ada5128164f9826866b4381a3463df41", + "hash": "sha256-HsKHffZWTls362kjokxzdhaxb/xJD1g70VHGk9l6GVM=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1499,13 +1504,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "727f7c8991f7b622a8b5c833cff99871a8c2cd8e", - "hash": "sha256-L42hkqcsuyMkNUeornIul7AYNgachkYpfNFE8H/VeVc=" + "rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239", + "hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "313545f85af72f954820e54f4110cda591a6cf7b", - "hash": "sha256-EGgC5nK68Wk0b466K9yvLlGMxBd/CeI+KTgyoE+x6DY=" + "rev": "89556131bf9d48af3c5c9fbb9a3322e706da89a3", + "hash": "sha256-h0utcwCnzwhFufggkBNeA674x2Kqwu4sz3jQ/9eoQv0=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1514,23 +1519,23 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "b476481b77f6e939e813ac93df22a4a6e7a3dd57", - "hash": "sha256-oKLFjed5sbYjEX5kddkAEdhkVOwFf5ddEUlOS55zLWE=" + "rev": "de8d7f65b6eb670e4dad0225d0d6f99bebaab559", + "hash": "sha256-r2b+/VBffxsh1sRM2xcFiBx9K6GD6FsaQXpfFMBFUag=" }, "src/third_party/litert/src": { "url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git", - "rev": "82bf3bef8a04a416bcb9d1cca5bdd51a6b3ab4ba", - "hash": "sha256-uMBuoGQIgRhmc8KJqLUnf13XK9tveuS0/OzzwKHKNUw=" + "rev": "588075c77c6895cce6397d41d2890b1aa0a14372", + "hash": "sha256-rcEPZNSV0DiDrmoBCtJ07wFzzpmpM93jG4jYaEdNWvI=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "4a9f2cec3d5e7cb4810cf84716f597aff768ffa4", - "hash": "sha256-PyBxtzesZR/5jrWt96DxK7QwRoG8qhzWzbiE1fqdqkI=" + "rev": "0ced1107c62836f439f684a5696c4bd69e09fce3", + "hash": "sha256-VOyN618wzyyO2Wh18gCnw+FCr/NbegX3A/54MClyhwc=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "b11b03839c940685b0201026bd2a4ffef1d5a4b8", - "hash": "sha256-FjUqETWBiI91hq5wGomPmCeW7K4k9kn5r74pUP0QFNo=" + "rev": "715c8500e7cd67f2eba9e60e98852a1ed49d2f15", + "hash": "sha256-vSbMdTjlRVvYLi5ZvTVmfe76oAQ4AhqyD+ohvkvIYIs=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1539,38 +1544,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "f88a2d766840fc825af1fc065977953ba1fa4a91", - "hash": "sha256-VhcGQ+Tr9sH0ZEIk0oJsXh8MvCo2qpA2W3i8YVCwKaE=" + "rev": "6dd7ba990830f7c15ac1345ff3b43ef6ffdad216", + "hash": "sha256-UKBVs2s05hP+paPq1dZFaUEQQ9Kx9acHxYUyJVx22eY=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "7d8d9e58c384949f1615c069d4c9346bf51b9738", - "hash": "sha256-AxS7vHw3RoXZLayWEDKBU7H0M1BZ9RMVdIsD/4rYap8=" + "rev": "2d14d2e76aa7de72404b17078eda15c20a6a0389", + "hash": "sha256-8Xtzq8WOdFEw+uEJqMW39LLHt2m165K9OJsIFZuifoM=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "74d8a6cb930c68ef617b202c3ff3c59d919e086b", - "hash": "sha256-bZKNFiZMVYDxa6RKb1c/GxIR+eEFQAyYNaEptzQW5TE=" + "rev": "afe9eb980aa928a66d1c9c06f38c55dd59868720", + "hash": "sha256-/yolWlC7ruRiJ0gSdCoSlqL9+j2uJAh+o+H0OG37pq4=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "363f465abadab0a8dcfc5c85d2c691e9b0b788d6", - "hash": "sha256-Zk2QyKu19g52vzGpNq5Qm+mlEgqk4jCFn/861eK8+64=" + "rev": "df84d2be47457a8dfd7eb66f8c2b031683bd1ba5", + "hash": "sha256-8ParcURRRU3eS9Oej/vHTwOwvYy3HsVJsKh2wQLKUgM=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "59f963ce1b1d16cc92137a241a0fe98d637d21f4", - "hash": "sha256-Hh0N4N4XN7p7PBKk2uCU5g9TO9vmxJbomC1Gvf5oDZc=" + "rev": "90bf5bc4fd8bea0d300f6564af256a51a34124b8", + "hash": "sha256-tmTD/waVX/duaKXvj0FNUS+ncL1agM73kK7pEfHEsSA=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "20fb10eb1ec08ccd5cacec32b7df1b0e99e48a0c", - "hash": "sha256-4XsQN94JsQXFGwJKp3W2gdTCCxUZrpCKiRVXzxL+Qs0=" + "rev": "48b1fd1a65e436bae806cb6180c9338846b9de97", + "hash": "sha256-B3GXmwJEvnGcER5DJt0FGrwqNi3t8iV6VgX8uOrExlU=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "20948525099c0ea030ec5b149c809e48010be4ed", - "hash": "sha256-H05Ms2a770ApiCz5ERiIm8g893TJG9gRRuM9Qr4bj60=" + "rev": "ac146eef210b6f52b842111c5d3419ab32a7293f", + "hash": "sha256-GqjVHxtda1a47+9G+nqh4qNMJmQaUdZNMUGQ8kAIIkk=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -1604,23 +1609,23 @@ }, "src/third_party/webgl/src": { "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "8fc2a0dff53abfc0cf2c140d8420759b2036cc54", - "hash": "sha256-cU7kfmxgaem6rPHGW+VwjxfKe7c0u1tCc98MQjsp5l8=" + "rev": "216b10fafd3f6a900c715a8c758a4c7f9883b030", + "hash": "sha256-Aax2hr/9Zq6Avk+TMU1OMBLGshUL6hyRTX6eoOQesqM=" }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "54441b8d176b12a5e2b01b8db78191ace56d7f34", - "hash": "sha256-gGvvKMTUJGm4ZwM7C1xTY1DKskCmlrCpSl3HLgVZqoY=" + "rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f", + "hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "22be07d7809409644d7e292d9495fa8a251d5f29", - "hash": "sha256-HR6iEDwmxFaiLi+h3MwsNfBOtBNbrKvmRNgMVog3A0Y=" + "rev": "be48b5e3387780790ecc7723434b6ea6733bcc33", + "hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "28452dff1bf86fec881a47949d4dedd4a2fe1f09", - "hash": "sha256-KBz94jvdVgxWuTuSoeHKNdY7wEJDGqG3xVsSVB3ubRQ=" + "rev": "9600e77d854090669817d22aa2fc941ee92aaacd", + "hash": "sha256-jTJv53qt971Va5q6MaULysYiChBVmsFYxG9fzkcE0ak=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1632,25 +1637,20 @@ "rev": "b65be9e699847c975440108a42f05412cc7fddac", "hash": "sha256-PySen9syu0OshtlHAZw666FeSQXdnsV8nlW9RmxgapM=" }, - "src/third_party/xdg-utils": { - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=" - }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "abd8e60edf09db5f5ba8e7fa2f1fcab0ae0807e1", - "hash": "sha256-VdrA2UwQ7/kHbnlIXBmga3ZjAqWaxCDQcDAssbLrh/M=" + "rev": "1812bbe2928a32f26c5e48466712ba6460cf290c", + "hash": "sha256-xal21wjgeql3MjQXw6F1ezcRsnhVKod5jv0nYWroJ1o=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "1168da0e567960d50cba1b58c9b0ba047ece4733", - "hash": "sha256-T2CwRpL/XT/OsBrRfxC8kNIm43U4qPMBju8Ug13Qebo=" + "rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f", + "hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "c152c31c55cd54fd239772532a86c802d95b4617", - "hash": "sha256-7qEPh9l94LqyaA9qW0ZfFmmFyMNTjTJaeunLgDhtFuM=" + "rev": "ddc9a95905de5268332a8f0216dc2bc67d26e829", + "hash": "sha256-x2FGL3J+JaWO1m6jBrcayR7Vlz90fYEAuufm4PULYyM=" } } } diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml index 59f19c889b12..fdd08e11291a 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -1,4 +1,3 @@ -build_with_tflite_lib=false chrome_pgo_phase=0 clang_use_chrome_plugins=false disable_fieldtrial_testing_config=true diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix index b4261e3197a3..deeecde37523 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "140.10.1esr"; + version = "140.10.2esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "aa3481dbdda0a302acefff52007ba2e6927962523408b942a7df673e80618fc381faf1ca70ebaac3760645bf7cb382b85658af49beca705cd636ce9de58349a5"; + sha512 = "bda7d5e6d59a2ad310e3f3e6e8ec05c78222edce266671d5d454dfa3e8f0086add3b9c0099db907cb62b2587ed47026ba7b3aa4f0406693d142d8d91b818d551"; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e429b2638963..ca3331bc0da1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-nQIpxNiWYFHYgmiLjva+3tyOVdjrap35Zmy1nRWwpH4=", + "hash": "sha256-RgyPVv3CWHgArDjmcz46j578hgleHFQ81MJ5OUWXnBk=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.104.0", + "rev": "v0.106.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pgFHrO71UGfH/w4Du7ocy437FNtptoDTWHmARQG/5A0=" + "vendorHash": "sha256-AxXZRn2D6iEIG6p00KGQi1kMkt2F/ZyeBsXHR345wag=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -310,11 +310,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-qiXN8ktqhJuN7Sb9XHf5HFaBfJASEpVkE07pAHg80QU=", + "hash": "sha256-LmG3NpDkGgaQRworjC+CEhXxMO1lPbgOVhFTiObNkCA=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.85.0", + "rev": "v2.85.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -328,13 +328,13 @@ "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE=" }, "dnsimple_dnsimple": { - "hash": "sha256-pbc7jLhIm+ogcpCBhi4CVsr2qM5vDzH0QuP3+cEVYLw=", + "hash": "sha256-j3O1gztyDCiq0Rchcx1lYktY2EhaNaa3t1yL+lH7IAg=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v2.0.1", + "rev": "v2.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-DRMbcAR+DDrxrg1jNgnoWUg+OjlKm7wkqgIN6Hhkp3U=" + "vendorHash": "sha256-1CpswocnTe6aj4TP7fMGy6mv0d/yX8FcYAKkAW5k7kk=" }, "dnsmadeeasy_dme": { "hash": "sha256-JH9YcM9Fvd1x0BJpLUZCm6a9hZZxySrkFVLP89FO3fU=", @@ -382,11 +382,11 @@ "vendorHash": "sha256-WFlKj1IO9ylXn5frdnLcctQawjUXBTqcoMhQUQTU06A=" }, "exoscale_exoscale": { - "hash": "sha256-qjevix8bIRY3MKLlTZK/uUHS8nmKgjPk/rgqNWRdKes=", + "hash": "sha256-eK9XWu1Hh/sFWkUO5r0HIcw8tIhhP1nzkI41B0DpMZg=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.68.0", + "rev": "v0.69.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -508,13 +508,13 @@ "vendorHash": "sha256-4I3YwVn3lGSDXKLqzlOlY4TlaSSJk6uKBNeCn7IdX6w=" }, "hashicorp_awscc": { - "hash": "sha256-SMG66AP5IWbnwUOQBsf0p1WT1ht4a740Z7ltLgyhN2o=", + "hash": "sha256-x1IcDODMayfVCZYz4kVf809Up0ictjJ0AzM0rA2z3Ks=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.82.0", + "rev": "v1.83.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2muLyg2LPj0broth01BZBysOdZyXaY/QzJWYjxTyKEw=" + "vendorHash": "sha256-jLJECrwL9JoWz2FSfTM/yQGzBg3gsrGtGpiZFRYwbII=" }, "hashicorp_azuread": { "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=", @@ -571,13 +571,13 @@ "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" }, "hashicorp_google": { - "hash": "sha256-ZS5KnCC40Tt0G8aHd+wIYllEAfvT+e7zliuoo9fduTA=", + "hash": "sha256-6cvRvVQmKRi4kyNAo/UAGN00bO+uCJYvf661xYW/QCQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.30.0", + "rev": "v7.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9Vs/ksWpdusfIHOM1jXZ6XYptLReY7LeQKflXlsOWj8=" + "vendorHash": "sha256-UoS4iIVHhCQ+Zk+SJmsMHJgJBKLMbfMVmtm4MDmzT68=" }, "hashicorp_google-beta": { "hash": "sha256-ltqZ6nyl/leYsV2pBJVgOtcOYIyfDmDLsZLfHTPOyew=", @@ -715,22 +715,22 @@ "vendorHash": "sha256-fWnf2l9a7bzXtofA+Aow6F17K+slpMpXEYZPuqDNwfg=" }, "huaweicloud_huaweicloud": { - "hash": "sha256-Eg811AwJwuHZ/270+TNh6JskCGRUt0ikk6yShjtVtcU=", + "hash": "sha256-CtqPtXccE6I+yDj/7XbjbACMwCGMv+pSEIa5DVh+AGo=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.90.0", + "rev": "v1.91.0", "spdx": "MPL-2.0", "vendorHash": null }, "ibm-cloud_ibm": { - "hash": "sha256-FeH8XVy+xTal2bbylEfvVqqqoURvuNKNzcK1fv+Ng50=", + "hash": "sha256-sd7/8xjsNwP5ALFDMCbKy6L7zke2wxK2gylSbqpeD9o=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v2.0.2", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HDZiRZoq3/2E8aK/whBBeLVPcWYXYZqTNPa4DvNG2aQ=" + "vendorHash": "sha256-euaLEnXZ9xmee5nTymFqPeUU4cewE+Ij6ZKGksNy25o=" }, "icinga_icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -842,13 +842,13 @@ "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" }, "linode_linode": { - "hash": "sha256-nrNyOcaC5wKJijfubBBuEBKA6dT6Ajo33MR4P80j29k=", + "hash": "sha256-prYSxbzRCrB3IDpctEUBLIHpV2iwHHILDlCceRVdIvw=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.11.0", + "rev": "v3.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-91mdCcM5BSNdgW1/mMbuNtAxc4TH1abW8xbRcbHAnNc=" + "vendorHash": "sha256-4PQGnRL+z3EgVsTbKLXCBYwbzhd57tPije8RMJNrkKs=" }, "loafoe_htpasswd": { "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=", @@ -914,22 +914,22 @@ "vendorHash": "sha256-JRqBv5N+i5yhKrC+Eenm1xmwylNF7k/EIJXaklrsFfA=" }, "mongey_kafka-connect": { - "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=", + "hash": "sha256-A20rLdvunuTU3zZOJ1bj/yIaWs+xsdvSmpDPuxN7XQc=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka-connect", "owner": "Mongey", "repo": "terraform-provider-kafka-connect", - "rev": "v0.4.3", + "rev": "v0.5.0", "spdx": "MIT", - "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU=" + "vendorHash": "sha256-ulhKT0DaS6gg9Ucz9pqqIg4mxRpGDGz2rN1R0RNuumg=" }, "mongodb_mongodbatlas": { - "hash": "sha256-2qthbblL0yh/SZjZg+49OkLi1EVODQxGWN41xD3AMpQ=", + "hash": "sha256-8HZOdEHD5KwVuSDe3EDX54nPqn3Uz6kooi/HEGoI3F0=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v2.11.0", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-65I0oFyE9252aRaHvmYhOX8RTyH6UDE3Ude4b/LIkdo=" + "vendorHash": "sha256-c864XU6t/ehD1KhlV0aBddEc0eifWHHWeS67BH3odbM=" }, "namecheap_namecheap": { "hash": "sha256-eV2K3KHTEXEEt1WXwfYfNMK+gLUY0EoHFQg9kLdAI3s=", @@ -941,13 +941,13 @@ "vendorHash": null }, "nats-io_jetstream": { - "hash": "sha256-xEWUMZBGLjUK3iab0VPQfR02WYnx2KEChG2nApvwW54=", + "hash": "sha256-DRpHKfzvb5ubeTXoLis52RacvWSHjLBhC5/8oFTAS0w=", "homepage": "https://registry.terraform.io/providers/nats-io/jetstream", "owner": "nats-io", "repo": "terraform-provider-jetstream", - "rev": "v0.3.0", + "rev": "v0.4.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-+ZUPqDQ/YhDVJ/ukvp/Zk6nOCa/NKDPgeGqTRnrXEtQ=" + "vendorHash": "sha256-z1Qi/07jh0A8PNo87dVMAq2O5+oc33J7/SNx7rrm/Kg=" }, "nbering_ansible": { "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", @@ -959,13 +959,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-j4DQRsw7QP7d83HTIchgSVt3CPUCIJ8CKmuMSKr5GaQ=", + "hash": "sha256-m8KZQUmDyMTR3S1BC5nmo15j5TUDV3ZZsy4hg16VZlc=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.85.1", + "rev": "v3.87.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-zFg0xT6iLBxnM9ysKB/Dmveffp6Ohbj9akgr6lbU8MI=" + "vendorHash": "sha256-W/a04lDiPVh/tkcWz9eJp/pupI46cXxqukdv1h17xYY=" }, "ns1-terraform_ns1": { "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=", @@ -1031,13 +1031,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-rhufSDVO6Yu5EXwduREFg3dkA/SkjzTyW3rR+Tqivbg=", + "hash": "sha256-NQ8yB4maHOF/sfFSSeCW9MNnAo/PgYrXAPRuM4NNti0=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.64", + "rev": "v1.36.65", "spdx": "MPL-2.0", - "vendorHash": "sha256-qtH6jjhzGRGaHYKjpJLPWjwRL5PQIyOPvI33BVf4cO4=" + "vendorHash": "sha256-NOsmv0G+tfNwqbPF8U4vihp3cd5Kn9N0dJBWh9m5X+Y=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", @@ -1049,11 +1049,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-xB/wHvFmv14Lz1IR4+n7+l+RbRJCtDqZisLURK9IB4E=", + "hash": "sha256-Yt46N9wVwgz8VbPSHQF1UQ4XT1ENIcE+yeKmO0JqnlM=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v8.12.0", + "rev": "v8.13.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1391,11 +1391,11 @@ "vendorHash": "sha256-ozAYLFkilSK0Nygdglhz3VNtRVKoLDGRnrVvg4nWyH4=" }, "turbot_turbot": { - "hash": "sha256-zh809E1qII8EJm7QFHEORju2WF//+A2uk7olrCNdBkU=", + "hash": "sha256-sJODPeFzU3vaiHbKlGe1dR5Pi7aS56JcmZUe8Yg1BcQ=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.13.1", + "rev": "v1.13.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1481,13 +1481,13 @@ "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0=" }, "vultr_vultr": { - "hash": "sha256-gw4Eo4wrBDAycQyN7xGHe/w1VazTSgtIcAlBBrePrgs=", + "hash": "sha256-IKXby/v1oNjxwgzbFTSDQYEEWbV8v8qzB4ZC9ISEf5o=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.31.0", + "rev": "v2.31.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-bKf0QittBRoEbuz0JvmcyCyus1wPP3pacuYmq2RLV08=" + "vendorHash": "sha256-XQcxOSvZKXyq+k8N5n1lMM1ThbWfDXBm1Hc+Rmagu7I=" }, "wgebis_mailgun": { "hash": "sha256-Li4eyqZ6huO5Q+XTcQ+HQCg8IOjhxGU9Z4Uw3TbMdAc=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3b1614ecc892..e0a9677bce88 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -200,8 +200,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.15.0"; - hash = "sha256-cKgZFCPLusXXSjcff/PmKGIdSm3wRY1DpduXBRrgcDc="; + version = "1.15.2"; + hash = "sha256-jwmyZJHGfi2oO8FBebPKBQdXt61w02H6zbbqSXxMhMM="; vendorHash = "sha256-Gv6V5aXqTuQoG1StbD/7Ln2QrLpMsW6fbUJUkyZMkvk="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index bbad5d6cb030..0bc68cd19b3c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -17,6 +17,10 @@ let inherit stdenv; # N/A on Qt5 kimageformats = null; + unwrapped = libsForQt5.callPackage ../telegram-desktop/unwrapped.nix { + inherit stdenv; + kcoreaddons = null; + }; }; version = "1.4.9"; tg_owt = telegram-desktop.tg_owt.overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index b554349eeef3..1938832de1f2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "6.7.6"; + version = "6.8.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-TGI1SLtzjjDaodQc+JIVRRiwCy9PCO3MuPfv2DpDFxo="; + hash = "sha256-CcibFBPbviakOsf+BpAF8U0CRWIt3zO/KiHycwRw2V0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 46ae3e118578..a716025225ad 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -16,20 +16,9 @@ boost, zlib, qtscript, - phonon, libdbusmenu, qca-qt5, openldap, - - withKDE ? true, # enable KDE integration - extra-cmake-modules, - kconfigwidgets, - kcoreaddons, - knotifications, - knotifyconfig, - ktextwidgets, - kwidgetsaddons, - kxmlgui, }: let @@ -39,7 +28,6 @@ in assert monolithic -> !client && !enableDaemon; assert client || enableDaemon -> !monolithic; -assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [ ("-D" + feature + (if flag then "=ON" else "=OFF")) ]; @@ -76,17 +64,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals buildClient [ libdbusmenu - phonon - ] - ++ lib.optionals (buildClient && withKDE) [ - extra-cmake-modules - kconfigwidgets - kcoreaddons - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui ]; cmakeFlags = [ @@ -97,8 +74,7 @@ stdenv.mkDerivation rec { ++ edf monolithic "WANT_MONO" ++ edf enableDaemon "WANT_CORE" ++ edf enableDaemon "WITH_LDAP" - ++ edf client "WANT_QTCLIENT" - ++ edf withKDE "WITH_KDE"; + ++ edf client "WANT_QTCLIENT"; dontWrapQtApps = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 5bc335454a29..27b0241de129 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "150.0"; + version = "150.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/af/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/af/thunderbird-150.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "603a11f975f05ee8551231b2ea9d1e2078a70f9cf940efe7068421e7344f4724"; + sha256 = "e19bd0ef0405858ffa4c8e88c4763b587236916ce70599b7716b5b6ae0f7e7e1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ar/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ar/thunderbird-150.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "544b1fc693f13821dcf319750d393690d0727136c3f8c86a43f3a6e22ff23a2e"; + sha256 = "14b424b7c10bd2ee51e83f651f0f2c5a3981ef56fce29ef8e5e865f25334a074"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ast/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ast/thunderbird-150.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e34239b70a1a4e80103f7abf880713acc3e1fb158491808e7bd31ab16aa22dee"; + sha256 = "5423b969d3fd4bc2c7d51a5f4802a4e1109cd50f823cbfc22d24981cefa2f4bb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/be/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/be/thunderbird-150.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b79b994c610160397efa907ce6ad17577c246d396d5c1f5ac538647c6e918280"; + sha256 = "e8a80b8008de0b10a1d8ca1bb2e8b06ddef6a8b2b6b052b15fae6bddc7f611ee"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/bg/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/bg/thunderbird-150.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1c7bd1cbe9502fa88c426ec6d4f2224743f85b8ea8ba3257927d9ef35081fe12"; + sha256 = "fe65d3f75c923bbebfe878468ed2a8cf2c868e08adce1e525ccdc512b64fd05f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/br/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/br/thunderbird-150.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "df0c71bbc7fd06a1acc7610ad6b506c7be359c7161eb494a800c73192f629151"; + sha256 = "5cd3774993f6e152e52bec19460c938073deef3e967898f5e9a867d9321618c7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ca/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ca/thunderbird-150.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "92809fc47558be9587158f306dafe0d3c09dfb3c4ba53c20b3ebea1954fc0868"; + sha256 = "6b69cacd93c48d426d28b68329c10ed791f0e31c817ed1b06d321b60d9448047"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/cak/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/cak/thunderbird-150.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c0b26b573c5b77ec2e67b87f75ddd54bdb1964bc1d92a9fcf8fe0dc83d9d5f96"; + sha256 = "860ab458083e3d747ad4e81f3af114147681d7f66a41961e3c1ffa5a15a79420"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/cs/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/cs/thunderbird-150.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6f8604165b2addcfa17b6c4df8f28ccef6e9b06e320069c20a27e02f04253058"; + sha256 = "74f20183defa44fd93143ee31b03c19882b3864f66dfdf70ec836e10f20c2a6a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/cy/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/cy/thunderbird-150.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "187585e3536fa3fc61d72fcbbdb628439217755f1fa0f7bf0018a9ed893559ff"; + sha256 = "9b2ee852e0eea5893143fc604833b4283896f872a348e875c1f182aa2739ef5c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/da/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/da/thunderbird-150.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1932efa7f84ed2778f8b179ee792b1fcb3739cf87a379be41861e26be40dd04a"; + sha256 = "32888221b7be2cb60c4676626f7df78ebca530b765f341643edc79520a032b65"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/de/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/de/thunderbird-150.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5639eea20c5cfe708f76fef1f0db72dc67caf1b3a8b1b074026e24dae83367f9"; + sha256 = "f2f4943a444e4a2aceafa25093fa837bf9a4f351be025fb91ec2e9c8366ea967"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/dsb/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/dsb/thunderbird-150.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e9e8356703ffb1ba55b737e1f862f75b212467412bbf46910e445d068f1482d7"; + sha256 = "308c7c72a83e708f39ff541ca635fdfae2daf4435c099c218bb33113677c85c8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/el/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/el/thunderbird-150.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "dd25deb118eff6e8eb53640095a6fe7728a3b8dcbc605858e49a857182e2f7cd"; + sha256 = "2a64c02ec06312bfa16077bee67ed3d9cc3535d9c784a6c960c2a1461d705db7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/en-CA/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/en-CA/thunderbird-150.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2bbfb0ecff24ae2aae36b1a839e7e314939fbdd2772811b7d9f124ecd69e952f"; + sha256 = "2de9452bb068c6654bf0e088099111b88a8034de515224410505f13bdc0da398"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/en-GB/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/en-GB/thunderbird-150.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "12f908ad0a0735b1e3b1751b29fe93e20ec8e71d1734e8ac51db8a328c781701"; + sha256 = "43874b4905ae365e8f815b2e1c2cf76c4a27b48b212bc2b1dac0190dcfc21d03"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/en-US/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/en-US/thunderbird-150.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "724b96883bd656d46831e8e8d15abb83a378b95ee0ab9282319957f054bac3d5"; + sha256 = "8c5001d2cf779583f88c11e7f0edb0da98a7f911cc387b2bc6b17787af235344"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/es-AR/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/es-AR/thunderbird-150.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fef7d09ada4d2bac62d296363d2523ec0305ed5bd3ac66e426704dca5d18c5ab"; + sha256 = "16a36b71d06f5246a87e16b956e21b6691cf96aa6cb46646e07d235ed293fffd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/es-ES/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/es-ES/thunderbird-150.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "22bd2958fd874888e35c4864d9d7166fc69a88c7362aec3312219f87bb8ecd34"; + sha256 = "6ca98ba68f61587b606f873a3c6c94aef85f222b3791d4eb1ed0bfd0d2c40358"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/es-MX/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/es-MX/thunderbird-150.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d821867bce159036aeea21c476baa7669ef07981b9ab1609af7553f3e03b11c8"; + sha256 = "dc9ae26197ff3179a38d83b3ea4c52ea4c833ccaa1a03a59eb39376776b99a40"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/et/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/et/thunderbird-150.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "16ae4916ff0d845cb86bc61a085868265d3b954bbc2156b7ddb4c733ce6a2653"; + sha256 = "1ed600fa1c275e3e2823dc20b54406407e5ceb6bc08eccbad82a8e8e09080935"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/eu/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/eu/thunderbird-150.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fe1be0db05ee461800abaa48b9a1397e16ad134cb7a3848039d74710b0c0e062"; + sha256 = "3ce118f8ff3c9e3458e4bd00083d09a837fe76634edb5a34141e5d18370498a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/fi/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/fi/thunderbird-150.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9c6198e408108debdfb5f5ce9ed4f80c29d9cac445976ac0c2ee3472ea94117e"; + sha256 = "47c5e1045e2154270e211003a0705ab7845fc7155156cfab6ee2956fa32ceb80"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/fr/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/fr/thunderbird-150.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "059a9900c1eae3e65df61fe5723def9eaf62d8fdcbe88161392f40dabc09c456"; + sha256 = "28fe1d68032b9eece718500f953f48df0ddf9d8f3299174e326afc8edced3f89"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/fy-NL/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/fy-NL/thunderbird-150.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "be5e33d5e8b9c3fd73a0a82b6a5200293c92a4c2ce6ab9731896560dfb50bf16"; + sha256 = "38d5a2cb35441c6923b620524b0eb004a0e2b6b537a60520b492bed7a39562be"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ga-IE/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ga-IE/thunderbird-150.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "3ef3f08cf8c5834e722c1242bd8b177bcf59361684deb701cd5b3f6fc0962965"; + sha256 = "b8cc9a4b99bdb7b8099d172eceed011da1b38d7c5ca3a9d1683bfc85bebf46a1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/gd/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/gd/thunderbird-150.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3576c8d73bf51902a5e4812844080abd1136a353d7dc9b5d8bda404e9116d529"; + sha256 = "071f4d7d504065e9406c1c4c46bdcc4e6d5d4a37fbd731db78890af24e239b86"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/gl/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/gl/thunderbird-150.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "55447f090a76f350932c548ff5d118fdef54f64a6f84bb8b3607bff6f9190500"; + sha256 = "d49946503751d5b3068e5b2734fad48224dad0fa31f4422fa22adf062912a882"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/he/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/he/thunderbird-150.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "db6cf04c8b597987f1c0a8ac00bee5bee5e2cdac143ff8e4dae22b5cbe4bfe04"; + sha256 = "fddb3459bfb5f2fb04a37173b7f49615380021889dc7bbc769fc5c008ff65ea0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hr/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/hr/thunderbird-150.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6d087e4c4bac1af6f462d3065208c7f26fb3c20d7787f47075033891556cf7bd"; + sha256 = "066bde56938c11074c56a6218a0d3897c4fd79daecaf1ecb33ea9bb9ecc77c29"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hsb/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/hsb/thunderbird-150.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "00c8df688bc1bf9436cb21d4f2c4bb1ae13c30167ba6b8b6122be07ddb00eb63"; + sha256 = "ce71c493edad78317613d498b24134c95f725a53cd2c310594627890200a7d11"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hu/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/hu/thunderbird-150.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "75db83e09a5bf577f7f134f28cd5005751a115e589d6fe64b95752214cd0eebf"; + sha256 = "fdef09223bc8b9dc846b727d46c02b50b1781f012ff113f20dd4846131c3935b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hy-AM/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/hy-AM/thunderbird-150.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2739326930b8e5b0d3f1d57fad820158ed65ec0353325ffcda8953db93ed6775"; + sha256 = "bf6ddb3196c2675d98d5de3f993b0b07c61a801b7dfb399c86716eeaee040895"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/id/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/id/thunderbird-150.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2f973d4df278cdab6983fd4c09e782fe1342184f325a8c3b1d90ae23bccd5cbc"; + sha256 = "36352432ca141c6e2d395d0b8e4a53f9ee2e12851ee7eb4fbd1df685fa6cb5a5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/is/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/is/thunderbird-150.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a96580cc22b26cb9f35959537c923b0d92c2f1fabad582f989da52195644f670"; + sha256 = "27b4c197788714aed2cd68725b295053df73bc392b1c4b46a7e7a9d9989cd68b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/it/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/it/thunderbird-150.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ca2cb2af67d2a0f26f75a4a617dce3740e582b243204b6a860dc1e4f73738cd0"; + sha256 = "9066f09e5c83bcd336edd74f7384a506d3e0d11f446cb3d9d0f5e18d6c2ae5a2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ja/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ja/thunderbird-150.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e1e7f307ea87cfd27374938a35abdb302a34d10db3eb1942b54806c07120010e"; + sha256 = "d9faf1632ce8d7ceb2a454951ad12ee14fb45242a78428f332abb3cdb491ceb1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ka/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ka/thunderbird-150.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ee951466bbc42d785d7de85c2c6bab219488d1786eeee152b2a27fc284d19340"; + sha256 = "3e9225cee5602ceec18feaffdcdd8862c6ba07c19130e41ad3b15b81d731236d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/kab/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/kab/thunderbird-150.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4c6ab236c4d167c6386e4cfdd10055099abdc62b0000f32196e30d616be86bd4"; + sha256 = "1895c27801f1c3c6ca9658f54d21c394eef6593d32d6151be33590ed12bb92ec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/kk/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/kk/thunderbird-150.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "48bdc20ec2f85dc1d9fe0ec751bcddf19611deb8504ba1d67688b0e5eba81c1e"; + sha256 = "7ae91900a6def530071ad5e85f2c0b5a99348b1f915ff1d31a2c4ae5acb6ccee"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ko/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ko/thunderbird-150.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "b33e6da7f94f470adf277aa8030513830882b8db28a73a752236b5f89331c9b0"; + sha256 = "004217615c107b0613158c0229f542c0b2c2fe963ea12bae40dc5fa2a936e055"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/lt/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/lt/thunderbird-150.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c66c2bea8901207b9740733021648735b8683a4de60fec3343dd406313aeca64"; + sha256 = "842b0e7344496465860b20bfdf766f4a6cf2cce93bb5d352e13d7a310b65c703"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/lv/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/lv/thunderbird-150.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9b02b0563eae2626a9fc2faa37be685bee0397827ed4e38924527913e1cdc8b0"; + sha256 = "bdd4a9974f5933d57c538d4156008751e40c0f5c7fe8e2553984d82de2815e03"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ms/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ms/thunderbird-150.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d7395d59657576f6da0ed349b8ac0e889dd0d0c86d15d1e4688021253af6220a"; + sha256 = "1541b90c739e9015fc2e7c88e09210681be9f552bca420e527244bae2170b164"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/nb-NO/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/nb-NO/thunderbird-150.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "4ff74c13d0224e72d68d495d70ae11f697ad53b7a9cd1812fd5da22c8bcc9186"; + sha256 = "820cf7a946c03a81dcb35dfc61ec7051e7c34324342a650a437c06efe90eba42"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/nl/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/nl/thunderbird-150.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b2958229fdaa0a6535ac38baa3d056ab1d3624ff768a4ed3bbef02e7deb08738"; + sha256 = "352a7e22033ae0b0ee735d243ca3d28900b541868ffab48b7acbc6628975e8b6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/nn-NO/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/nn-NO/thunderbird-150.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "693e39f69bb210dc0c38fb6b67c607030546a834b670191937e4bebb0fed1100"; + sha256 = "449aacec09d057f297c9943eff85e4da7e19e3a1e83921f8c4096b554b6d4dc4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pa-IN/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/pa-IN/thunderbird-150.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "64f0cea758cc5c54e488bc75884ec7ba4df6a49f6ea2573ecf8b099e5c5e8ff9"; + sha256 = "51699b1006434208493f49e46f70522a227486d5e52d437012b975b3b70eca49"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pl/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/pl/thunderbird-150.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "bd9db8e078667b2914153e47130df4d75d9e008c5f8ff63061b9afbcdaaf8c46"; + sha256 = "bba4ab9e7c38f1cdf7ec789f496f467a8b5c4cfd63d99e94511b8ed5a6b78593"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pt-BR/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/pt-BR/thunderbird-150.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8afbfb8a1fee6ce0fb4eb736c3bd861f74c478ca3f25b621768b0461a2737f99"; + sha256 = "6bc71d0fc17a19878391df1902475dd818bce26750ee94025ef710cb0785ae46"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pt-PT/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/pt-PT/thunderbird-150.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "92e99ab883e4337cf85c57eed0ae1ef1a4d769acfc4d7f9baa904e0d3c585f60"; + sha256 = "aa196a8876052c41be248ce460fd9de098210c1f6f25724eadf9df7effee7c03"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/rm/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/rm/thunderbird-150.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "53e488588e12d5a8c1c9f39aef9baa54e8e9b0212102c2b6b8fde616e3a17996"; + sha256 = "c5e3347b9251b83fa8e6d6eb8253334d840e342ccc3ad0c900f7ea49f86f40fd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ro/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ro/thunderbird-150.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "65b3ce9b6095cba2c9c3ddf80528dd4e33d9eeb21d012c8272426837eabc2377"; + sha256 = "9faa923fc15db6c365d208fac4867b3923b09765ada462b0703a72e28be24e81"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ru/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/ru/thunderbird-150.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ea51fb751c40c93a116603a8ee70efe12d0ab94565120612db63fde3fc5fa4d5"; + sha256 = "52b2f56fed84a81ec06aa1995000c40e342666f5e6ce843886aba7a50fb2e5d7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sk/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/sk/thunderbird-150.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4a84087fb09116569295b3f998e7314b93f5571a2de8fb28dec640f00ac676cb"; + sha256 = "7a9d9de2835369d79e51189ed5ffeaee4a25ea24171e690f19c44709440a116a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sl/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/sl/thunderbird-150.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2c527ac512d360a3100285fa073865daa9001b845db6e922bb73a71b869de94d"; + sha256 = "e9c772c567e4fbf1226f6c2c20f36aedfae8204903d3143ae3cd3fcd844ac345"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sq/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/sq/thunderbird-150.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0ebd0114ae78faf585e83326825c24c8d23e4924f35a684fdb0d887eb265f3f3"; + sha256 = "2a831c2c8b74b5e6f059c468158e61e5ac148b916930abcd6430471a9e72e56e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sr/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/sr/thunderbird-150.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "da3418a17ab307c84a1e3927400bd3e42b2292d5e46012f143789f8241ba88e4"; + sha256 = "447ebdfce33474d419260776d79aabf1896bed9e681c33f6c8a93884d94ae52f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sv-SE/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/sv-SE/thunderbird-150.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2798d076f6eb74cc7fc20aa4eb27f18a2bc52c068752967eb97e9b3ab8a24a32"; + sha256 = "c944f61802d256f56c3fc420eadb79f8ea20c97b8ae9b530fce1f977a47734cb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/th/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/th/thunderbird-150.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "720df901ce7b9b747b151b7eaac69204945b64ddd6aaa1516e64bcc225883d20"; + sha256 = "08bbcdf86d01663cb6c516a6ce1c0228f766829d839b4bdf1d3be9baee276ec5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/tr/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/tr/thunderbird-150.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7f29d029e195be863f943a2941ba66318783bc9a4e6dca5474236f268be79efb"; + sha256 = "7dfa1d8767863814e551e5bc3f084fe2947bb4f03ae1355e00a1576c03975ac8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/uk/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/uk/thunderbird-150.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4020ce17dfb1c4636157c82c441510495def7b2ec458fb6f4fbb7ad5ff04bf29"; + sha256 = "8408c1cf28c5bb0f777c49f83c42d0a93780d432ee169e44bb00a7b1d7a886f9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/uz/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/uz/thunderbird-150.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "690c71f6ef16341a511a134183456ad4c661f0e9e8e296477751374633f14424"; + sha256 = "97aa8d7603967d84f1c0e929f7b1cbfabe253a2dc28aa6f0451ac18ca30ba44f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/vi/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/vi/thunderbird-150.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d98d304d4029ea60d711c85dfa3722ae0f828c491841397d227fda2f9e72bca2"; + sha256 = "04589b92e28c0f95474ebaad6f5ae9c027ca80930a800e3202faef821b599126"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/zh-CN/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/zh-CN/thunderbird-150.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0249af83552c9ea030834569b2556ec2d189286602cbcf23af73ec6be7783a81"; + sha256 = "2c0d69d29536fa0d55a5cd5dcc9de2f788e33a401b35e1f8d98cb1651b5051b7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/zh-TW/thunderbird-150.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/linux-x86_64/zh-TW/thunderbird-150.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "722c3be5b64e98b57a8daced279e1b0f684f5af4078caae65b4bc629976506a5"; + sha256 = "7662ded57361fe3de43be1266e420f6768c03073b19577625d69ae7c8c4c700f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/af/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/af/Thunderbird%20150.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "e5e34f254ff4b167ed850cb2444982f8830a552358a6cc8bb911ce53daeaa8e1"; + sha256 = "ea5b06389c08743d340b6581fc212f2d75d66fc814f6833078ffb7e615175bf4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ar/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ar/Thunderbird%20150.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "ed5db82a5a79906e7de4d08c625612a1a16cfd85b030985aa0586b7b661edc1f"; + sha256 = "836a36509c673bf30465a1cdedbac44981d9b238c224d56a25e136a36196e363"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ast/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ast/Thunderbird%20150.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "55ce4114b23f203c6688fde1b4c27bd4b29c46a7f70df56dc3355ad8a32a0707"; + sha256 = "ce8122bac365dd72e51d9fd0cd439eec892febef2daaac917b2d9574b2691bc7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/be/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/be/Thunderbird%20150.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "b5151f40775561ab4d41517209c59b52e8aa50e21302c7688bfd1c28fce33e6b"; + sha256 = "e1934f301ed1cb996bcf655a4898fb6154fe5a7cb6685f6f4e18ab0c356c3ba2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/bg/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/bg/Thunderbird%20150.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "dfb8b3b5ed406273b3d073ebe881e4b6b2614066ca556ad8e9441778e889cf98"; + sha256 = "5d2ad753e75635c2dcb51920c06a8563d98482cdab0478acfaea0de4a78c3f77"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/br/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/br/Thunderbird%20150.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "c6ee9640f267ddbede95188f825388518076797262e2472f6ed07e99c8ab84e1"; + sha256 = "f5eaa6fa572eee8b1a9a7afedbfa90c62b57ccbc32934ec92c13593c08e2d84f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ca/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ca/Thunderbird%20150.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "f1f450823f697d81d7ee992fff6b9d6f82b83413962cc769d6a07cbec928a066"; + sha256 = "89e92e967cd433dcce851fc0e7d159784d5a15b82134b253902c4e733865a68d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/cak/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/cak/Thunderbird%20150.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "d97d0578525cffb0e3bb5e89646801ec5279758115a00efb799ac5119225bbb1"; + sha256 = "8b08b8b471a6b8b36fa1d8cfe563377c4c6c8a78c80b58224bd40329787b2e2f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/cs/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/cs/Thunderbird%20150.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "078481051486ed0a8f0c22b4968036a1767cb0b8db2e72e40e7de8cfa1dce609"; + sha256 = "ac39f830863398ab98af9a649c6b5f786b145ec870e75d399297511ef2ef5993"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/cy/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/cy/Thunderbird%20150.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "a7fe65221494b2130725408ae18d8718d7ac1198f77e730076eec366a9f0d659"; + sha256 = "bb6d61944130791174463f117d04512aedabb00b697297112388be0a7ccb4773"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/da/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/da/Thunderbird%20150.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "803d8197af10715c9912cbf1aa31d6dcf05cf3164a18eef623c4acd36b8119df"; + sha256 = "626ddaecab5dc22ef6d87867c72888f7e0f58a398601700ff1a48d9a58c9ae02"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/de/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/de/Thunderbird%20150.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "3c6c420c4a8a18274d2d2b0af25163e780cd57517ced984e92a2a720de9fafa5"; + sha256 = "f241c560c66fd5e9f3a431b957a303948ddf644336bce8dc9748a5b603a5586d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/dsb/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/dsb/Thunderbird%20150.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "047fa535dc650caee615cc6d13e204c29e02e13a7cd89d999c57027f8212a1ad"; + sha256 = "f6b6a0f08ff55f11af3b31405f0390601f555dc00eb91f99220eeecd242674cd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/el/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/el/Thunderbird%20150.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "0174e0c2ee3f088537620eb9916ba11465c66f706ad358d59d34b800a850ec6f"; + sha256 = "0e9621e04e93465fa7270261c7b3e7ef970046f3b06e3e6bb05564b9d4a75557"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/en-CA/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/en-CA/Thunderbird%20150.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "a9342558d9a803ca93b489bff2bfe666dc162d7e89e9396e9f4adfa5efd7c05f"; + sha256 = "f1233dcda7622bc1be53bbcf38b7c5b5dfdf950ea868821b9677beef28b1b8ba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/en-GB/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/en-GB/Thunderbird%20150.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "a45d150e923731b20b2f5ab7778b90e2de48b22d40e3a1d088c6ae66356e2903"; + sha256 = "1531db96d0abad3d81e79100b7a380e6f3ebb098cdedd3e23eddaa6ca454d1aa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/en-US/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/en-US/Thunderbird%20150.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "a867f970e8ef28796d324020f0d866aee779efd40bd760305800b4a3c9e8e60e"; + sha256 = "38c04659881a190797864d5116f214f3722966ae95f1583cc0693dda675a383d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/es-AR/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/es-AR/Thunderbird%20150.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "69538918e5f62051cdf535e8544f027e82e55cd8d1e876c140c8217ec541be4d"; + sha256 = "14576b63f3083481784470f00b86b76f4f709e56f1b6a4c194e34eb0ceb98cc6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/es-ES/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/es-ES/Thunderbird%20150.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "6d48d83f81a518ee204d39728d4ac102660485da27e82c2c9dbfccc98a66ab1d"; + sha256 = "09732570d3e05438cff6dd39574703a5c1d433a83799262f084b109d474dd93a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/es-MX/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/es-MX/Thunderbird%20150.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "fcd8255d48803a6c0af7fc4c12d8ad8fd55ef2624c8d8466c051d7524f8725fb"; + sha256 = "50a772ac09d8f4337003207b72d8bacd972e8742b389714f65f66920d0c2f5b4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/et/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/et/Thunderbird%20150.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "3dba9f72f90be11e09b29ee8dd812583825ba80cfc07aeb91644a7d6cc81d460"; + sha256 = "d4064025eed684ba8050098d69263909a4bc3c098f7e8381481f3f2047be4827"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/eu/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/eu/Thunderbird%20150.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "ef4212a8d80aaebe395f45482f2191d6cba0ab414b9bc19820f5deb71390ee0f"; + sha256 = "07a72cf772f6d053db4eab71a364db24e6bd9a8d9b22f60e4eb01a4f16671bc9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/fi/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/fi/Thunderbird%20150.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "c7b16935d01907b375e9e92772ea969d54a9d9f620ba6160c4743d92e7936efc"; + sha256 = "b36259438245acc6bb7d199584fd90ade47daedc4f2d1513939bc674d674542f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/fr/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/fr/Thunderbird%20150.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "a89bdf41188d0083d1b0deb906ab6b71a8fa2e5f696f5cd0e8040e93e80c39d0"; + sha256 = "c67d47f3fd1bebf8a8cb9fc9d65d0dfe2671897d405a16204ca8eb661c1c5533"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/fy-NL/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/fy-NL/Thunderbird%20150.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "7c7a8562a44e3fad7e104ec9f31550ea7ad841e7c405dd0f189d04c52451864f"; + sha256 = "24773209034b6ba5faa8c76aa2b6a4abb94ef26a990a27d867238ee0fd8a7a47"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ga-IE/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ga-IE/Thunderbird%20150.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "e5fa6cdf54d03c50d38d246eaa0a977a9c54625f3e80dfb91c9bc74a2e83ea5b"; + sha256 = "e1e46124788e857d501d7fa10e0562b0c170ab6406ee43526dbe2eef89891493"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/gd/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/gd/Thunderbird%20150.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "b27ff1b049ca29ae6909f3b2b56d195a70ebb2d0e9888f65fb58be6952370f0d"; + sha256 = "07594192153c19d26406a117ae678e70f5ca03e8e971282ba2160841fdec14c3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/gl/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/gl/Thunderbird%20150.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "12e46cb1ec8d597ef7a92bb2793aeff41403b689352ae562978b8e51d118ab4a"; + sha256 = "8ded75d32df56d268bde0d8d8720a237aa4f5790cbe46a90c6c8d268e4ea9674"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/he/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/he/Thunderbird%20150.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "f92d36d48b426e531ff4cfde3c272009bf11a640a30404b1b4e75ed9a5b5bc76"; + sha256 = "d61b2c1329fc3cb86a21f4b97e4bf57501b6347e04c160a564b8070446c06b65"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hr/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/hr/Thunderbird%20150.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "c86e06144780f6993d975f580ac15402358fb6619162f78e7524c0d32069ed18"; + sha256 = "81f7f722303a101dba291e881f02173bc95c31d4d127297b17789dd7e0fe4411"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hsb/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/hsb/Thunderbird%20150.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "42a1d83d6a21d86bf9a41d58c12dca0e72f7133db3c6c5f20bef9fd32ffa0da8"; + sha256 = "d85d0c39c44bfb5a3f1ef4b0e5ead6c19be4fc16c4c4f1bca9cf89fcc2101f9e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hu/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/hu/Thunderbird%20150.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "9045d34faca947a9c0fa3ccc222a93fa23ac4b5fc12b9b2b0c107f06e797e4c8"; + sha256 = "5940ef23504cddc429d5e59c62be00e6ae5c8857ab079cefdb435adc7b0a6741"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hy-AM/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/hy-AM/Thunderbird%20150.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "99c0b265dd23c8907717584b08d663bcc05ccdc544436e2d61bfd5a807630177"; + sha256 = "3d7ac7140fa6a26629be65f2da0ae717a389cf7313a8db3defc69ad8e7f2f734"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/id/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/id/Thunderbird%20150.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "8b88175966b31700a312a7e01f67ce9108eb18f6de46a08c52f6807fa3ca1fa3"; + sha256 = "a50b200be3b6fc950f6e68f7297845f31331bfa4a48c2acb97271164f4f57dc8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/is/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/is/Thunderbird%20150.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "f3c3082a7e3b2abcf0d4f9a64e2fdb415d02366843df18c8beb9e2bd6a2800d0"; + sha256 = "294edeea714cb004c2964465b8670442234f743e434b60a7d8632c0568798493"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/it/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/it/Thunderbird%20150.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "a51d25192f1374fff8a6d3c96a585d99ab856183ab4b1e1865b9750c96646bb1"; + sha256 = "a37f058902d373e907491ee230bf63ba139ff80fa1147c4c2f8983bdcb5310f8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ja-JP-mac/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ja-JP-mac/Thunderbird%20150.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "a9849cb12238e77eb7540c8fba19c59c4a069344c6694ba3fa65ea181763af5d"; + sha256 = "8d7541990d22ba72ff7ea54a8af7f9a131fc0e4b566caf721b7739f20dedbaba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ka/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ka/Thunderbird%20150.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "69621e44e215d086c1ed4935d1600e348b3476cf57fd976f2bad19ce1fc8027d"; + sha256 = "fa7cdcc95af17b45aa39efe504e2178f85271fccb0d8d4800bbe6a27cc5347e4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/kab/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/kab/Thunderbird%20150.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "1d9392c1c20e2870822b209f525b179e23f9d9f78572cd13f256643824242de0"; + sha256 = "6a1829f985d7fa905520f768b1d28a24cb55dbb7b40d2d51202eb4ea4bcebcd5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/kk/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/kk/Thunderbird%20150.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "4674752cd943737cadfc1fa8d9ff073ace98cc7eb7a9309d362551bb677fa352"; + sha256 = "ff4c25c4eb332afc849f25ef37f41c8aceea2e02f43a6fc9cf5c8cac5b54193a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ko/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ko/Thunderbird%20150.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "25f59eedc7e2aa5c141a6b325d482bf136ddedf4be5c629128d56f232502e5b6"; + sha256 = "f8b9eba049c083cb77b7459ac75da2eec3452e65021973698d52a543fe91439f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/lt/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/lt/Thunderbird%20150.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "fda8b6a30432fa94e0afa22431eb1021554230fd6559fe58df0fc2d08256eced"; + sha256 = "a671244e3cf56bf126fe9d54824aa85a75202905d016a4a514479a862fae89bf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/lv/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/lv/Thunderbird%20150.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "bc1d80d157e7fc6848c1a6e6a9311b80c0802f80386f294880b3ea90fd40ebcd"; + sha256 = "1c494e1f17abf76a03d60b13c910cbecaa0526421868106ea672862e15ad2415"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ms/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ms/Thunderbird%20150.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "e0219f9eef0804ab9b9dd57fd298354ea44ff8f22d11ac0d58c14b39fedaa643"; + sha256 = "3a6093db74e7309622d0f0289eae0d97bf86c1f6c33f4bd75967be20656f805a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/nb-NO/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/nb-NO/Thunderbird%20150.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "f588d8d2868c169dd9a774c7279a73b2a62e6a403609744468f62d63c7904a00"; + sha256 = "133dd4b1c4958501d1a4c302b5b2992e3d5075721bf45ac8eeb9986519fe6767"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/nl/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/nl/Thunderbird%20150.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "d922efa82df4c5ff15cbf745c0aa1eda25677d20e35e40eb3f91d31d574c4675"; + sha256 = "1c8bd8a0271fc6e9cdec19aa6c4f0fa6368a8875f1eb0fdc7f827e9b85587e21"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/nn-NO/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/nn-NO/Thunderbird%20150.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "483d0771c112afaf73e84ed4090f2f0d8f943367a612e4916869f086f3b4096a"; + sha256 = "8470647f46cddca9026dbac67f6f3e63f5b878a06849ed5f212897ea38c94734"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pa-IN/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/pa-IN/Thunderbird%20150.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "ac2b4c78884ec57461f81572ec812f63a06daddbdbe12002a4279414ef721eca"; + sha256 = "700436c7762ed9ce3c2015f300f33338369d7bb040e81bc11460c29ad6108d25"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pl/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/pl/Thunderbird%20150.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "e0fb9fb4eb5c48c9dd850c1361a9825307ffa2d5b6d982ea76fe60051d6d1e10"; + sha256 = "2758fbf17991da4520acfd59f5b0ef27539c851f5f46cdf0096dea4539c532c3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pt-BR/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/pt-BR/Thunderbird%20150.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "dfd1722f6329b671a319cc99d2980db6ab8d7dd162f85e48bce62a23f4982141"; + sha256 = "8ea57054abfbc2b8e09156834331a80b1ceafce8f47ccbbccb3dbc615135047f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pt-PT/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/pt-PT/Thunderbird%20150.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "9e5f3b0ff00937e8bbdf1b795ead5bc5a3c7ba5ac1f59d7047f9355be09d6b0d"; + sha256 = "4df75dc976f48f251387bf1dc20a1db46b6b00526c4a03d89d47c13841c12c4e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/rm/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/rm/Thunderbird%20150.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "89782c2e789c68477234a4a0458423af944bf0a3d4a8ffded581e2d22dfe3ae9"; + sha256 = "4e165315aafe7e805ba5685c6dda80208db02fd18970990f29e95a04f9615c40"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ro/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ro/Thunderbird%20150.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "28715e0125fcac13dabadb320e92ef5a64a3a44823ee963b7a94b27bd393d2ff"; + sha256 = "ca61edbd00b15881c2fefd92bf6e03b4f865340cb42cfddc0093c72295389d43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ru/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/ru/Thunderbird%20150.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "80b384086c928a37b7855171ce42a0d35878157131a0be825ca1cc6cf25e32c9"; + sha256 = "0ddb8ee2c51f5856c84b15308ceb261ca81a368c46e93ac71b37082f3b6540bc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sk/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/sk/Thunderbird%20150.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "6315c1cf3747cb295bf588f0f2bfecb80e429f593497ba47f35b20af3ff95e72"; + sha256 = "ba1d6bee77308321cc98aeeb55fd119181c252d30fd6158b7537177b4cb94bce"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sl/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/sl/Thunderbird%20150.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "04ed617e2d49a0b4a4840b86fe726254aed86485ecf11a15b9330930fb0e3158"; + sha256 = "f5aabfb152e5c39b4f2ba73d899f053f444712238edbec9d1db25be87f558f95"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sq/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/sq/Thunderbird%20150.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "2ee9b0afbbb15e703fd3fead6461ca856e6c0812283ad3732d388cff151c7224"; + sha256 = "135d2a9dd4c451f13375e30c0a1904838b3cc70bff1f8b71c86eaf13fceaa0ac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sr/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/sr/Thunderbird%20150.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "1ad74172517281999050993c11e4b05a082208c23caa85d11e65ff7d3979dfa3"; + sha256 = "f912ddfc8a66d4b0a3f2b01f39b3a2a4b6e1cc330b497186ef33c0de6cd48b6f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sv-SE/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/sv-SE/Thunderbird%20150.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "271509bce61e11fd114810b5186a067e895920809cdc192b6da88e34546913ed"; + sha256 = "41e70bc4cc821f7839bf06e6d5da3b864ea974fa06e7057645c5474b78c4f716"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/th/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/th/Thunderbird%20150.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "9db6bad978f3afaee9961e6ffc1f7e0e48255a9da412d46d5944f68ffd5ebf23"; + sha256 = "25a6aa1817662e681ece2266df39e15804604e37cf063d790fcb1bb141f778d4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/tr/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/tr/Thunderbird%20150.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "f08d4ea305ec1a8e9b4098e9c919d8033720f61976ae44804b6a1b4ff6962588"; + sha256 = "328c07ee637ba8c78468fc79788c8ed91073fb8cf7ed9825aef1778d3e3f5191"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/uk/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/uk/Thunderbird%20150.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "457ec9fa23d2ef14ec43d826eecd58665ba38ac308ab81a5fc02dc9f5382246b"; + sha256 = "00a1289f816bf2ad7051ccead4e1bbf4f964d5ffa1375abb8ceaa7cba0edd726"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/uz/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/uz/Thunderbird%20150.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "11ef7b6cebe705b20a88d1f5caf121c75bf4297460b8512e58be610d91df6064"; + sha256 = "29fe11df8109728c49a0570fde783ffb79547cbf39152a9ec88c36f869758aec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/vi/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/vi/Thunderbird%20150.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "d7b65901fb6aace20921ac0a27c29c0ced06b412666131b2c30e4bf795d6b4cb"; + sha256 = "5fdea1a3bdab0d33d5c91e55ced9c2efa31169f8fc1615b987962e069db01706"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/zh-CN/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/zh-CN/Thunderbird%20150.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "dbe73b0a66bde150737fc2a43deffecd129da3514dffcb600995c8fb407d8fe4"; + sha256 = "4af159263591e02b0b86be500d1e1f09e7b0476f28a9be7a26a5f09d8384ca8c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/zh-TW/Thunderbird%20150.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0.1/mac/zh-TW/Thunderbird%20150.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "5fa4ed3d9aafc457908098eb1f9cfe6af5a66407d365cde26199380b9a8d7244"; + sha256 = "db06fb610719488e7000bb04204a4a40099feb284ffcef65d2f2fc974cba555e"; } ]; } diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 1a766edfb70c..0fae90828e9f 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # K&R-style declarations in vendored mimetex break under gcc 15's C23 default. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + preBuild = '' substituteInPlace app/app.pro \ --replace /usr/local/bin $out/bin \ diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index 9e01f7107d78..30a86b541f61 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -1,11 +1,14 @@ { lib, stdenv, - fetchpatch, fetchurl, + fetchpatch, cmake, + pkg-config, extra-cmake-modules, shared-mime-info, + bison, + flex, wrapQtAppsHook, qtbase, @@ -33,7 +36,7 @@ netcdf, cfitsio, libcerf, - # cantor, + cantor, zlib, lz4, readstat, @@ -44,30 +47,33 @@ stdenv.mkDerivation rec { pname = "labplot"; - version = "2.10.1"; + version = "2.12.1"; src = fetchurl { url = "mirror://kde/stable/labplot/labplot-${version}.tar.xz"; - sha256 = "sha256-K24YFRfPtuDf/3uJXz6yDHzjWeZzLThUXgdXya6i2u8="; + hash = "sha256-4oFVv930DltvfEeRMTVW0eSBOARPIW8hDVFbn21sEGo="; }; - cmakeFlags = [ - # Disable Vector BLF since it depends on DBC parser which fails to be detected - "-DENABLE_VECTOR_BLF=OFF" + patches = [ + # backport build fix + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/education/labplot/-/commit/c2db2ec28aa8958f7041ae5cd03ddae9f44e5aa3.diff"; + hash = "sha256-0biKZXWMs5y1U9phAivEAbd2N4C/CiOKvk/QRAaPimo="; + }) ]; - patches = [ - (fetchpatch { - name = "matio-fix-compilation-for-latest-version-1.5.27.patch"; - url = "https://github.com/KDE/labplot/commit/d6142308ffa492d9f7cea00fad3b4cd1babfd00c.patch"; - hash = "sha256-qD5jj6GxBKbQezKJb1Z8HnwFO84WJBGQDawS/6o/wHE="; - }) + cmakeFlags = [ + "-DQT_FIND_PRIVATE_MODULES=ON" ]; nativeBuildInputs = [ cmake + pkg-config extra-cmake-modules shared-mime-info + bison + flex wrapQtAppsHook ]; @@ -97,7 +103,7 @@ stdenv.mkDerivation rec { netcdf cfitsio libcerf - # cantor + cantor zlib lz4 readstat diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix deleted file mode 100644 index c730a82499a6..000000000000 --- a/pkgs/applications/video/kaffeine/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - cmake, - extra-cmake-modules, - libvlc, - libv4l, - libx11, - kidletime, - kdelibs4support, - libxscrnsaver, - wrapQtAppsHook, - qtx11extras, -}: - -stdenv.mkDerivation rec { - pname = "kaffeine"; - version = "2.0.19"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - repo = "kaffeine"; - owner = "Multimedia"; - rev = "v${version}"; - hash = "sha256-AHyUS2vyeuWFLRXdIoy1sbssDgzz7N957vyf5rWiooI="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - libvlc - libv4l - libx11 - kidletime - qtx11extras - kdelibs4support - libxscrnsaver - ]; - - meta = { - description = "KDE media player"; - homepage = "https://apps.kde.org/kaffeine/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.pasqui23 ]; - platforms = lib.platforms.all; - mainProgram = "kaffeine"; - }; -} diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 84fdbfc86845..bf74970b64f0 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -5,11 +5,8 @@ qmake, qttools, wrapQtAppsHook, - phonon, - phonon-backend-vlc, qtbase, qtdeclarative, - qtx11extras, mpv, # "Free" key generated by pasqui23 @@ -18,21 +15,21 @@ stdenv.mkDerivation rec { pname = "minitube"; - version = "3.9.3"; + version = "4.0"; src = fetchFromGitHub { - hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; - rev = version; repo = "minitube"; owner = "flaviotordini"; + tag = version; fetchSubmodules = true; + hash = "sha256-JAxdPiiPDpmhJBiNtlaMbdcC/YEGJyc9mP3kBvee/74="; }; - patches = [ - # Taken from FreeBSD; already merged upstream in the media submodule - # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) - ./lib_media_src_mpv_mpvwidget.patch - ]; + # https://github.com/NixOS/nixpkgs/issues/214765 + postPatch = '' + substituteInPlace locale/locale.pri \ + --replace-fail '$$[QT_INSTALL_BINS]/lrelease' '${lib.getDev qttools}/bin/lrelease' + ''; nativeBuildInputs = [ qmake @@ -41,11 +38,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - phonon - phonon-backend-vlc qtbase qtdeclarative - qtx11extras mpv ]; diff --git a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch deleted file mode 100644 index 9beff68a0ec4..000000000000 --- a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp ---- a/lib/media/src/mpv/mpvwidget.cpp -+++ b/lib/media/src/mpv/mpvwidget.cpp -@@ -30,7 +30,11 @@ - qDebug() << "initializeGL" << nativeParent; - if (nativeParent == nullptr) qFatal("No native parent"); - -- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; -+ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) -+ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; -+ #else -+ mpv_opengl_init_params gl_init_params{get_proc_address, this}; -+ #endif - mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, - {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, - {MPV_RENDER_PARAM_INVALID, nullptr}, diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 7889794a06c1..a47c815aef41 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -10,7 +10,7 @@ cairo, ceres-solver, expat, - extra-cmake-modules, + kdePackages, glog, libxdmcp, python312, @@ -61,7 +61,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index b501927422c4..a9318a0611cd 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -62,7 +62,7 @@ qrcodegencpp, simde, nix-update-script, - extra-cmake-modules, + kdePackages, }: let @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 wrapQtAppsHook - extra-cmake-modules + kdePackages.extra-cmake-modules ] ++ optional scriptingSupport swig ++ optional cudaSupport autoAddDriverRunpath; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-plugin-countdown.nix b/pkgs/applications/video/obs-studio/plugins/obs-plugin-countdown.nix index 73502bb921bd..aa09869198a9 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-plugin-countdown.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-plugin-countdown.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-plugin-countdown"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ashmanix"; repo = "obs-plugin-countdown"; tag = finalAttrs.version; - hash = "sha256-rDs+X2eH8aUUH6phEo/pelUY1mHnnJNc6mqcT/lT+6c="; + hash = "sha256-0E2pNRg4vwXK54aYuWYZyuRJaNrpwX7X0Dq6V8B/SgA="; }; buildInputs = [ diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 214656bbb955..2c6a297cb7cb 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -222,9 +222,14 @@ let ro_mounts+=(--ro-bind /etc /.host-etc) fi + declare -A etc_ignored_set + for ign in "''${etc_ignored[@]}"; do + etc_ignored_set[$ign]=1 + done + # link selected etc entries from the actual root for i in ${escapeShellArgs etcBindEntries}; do - if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then + if [[ -n "''${etc_ignored_set[$i]:-}" ]]; then continue fi if [[ -e $i ]]; then @@ -232,11 +237,21 @@ let fi done + declare -A ignored_set + for ign in "''${ignored[@]}"; do + ignored_set[$ign]=1 + done + declare -a auto_mounts # loop through all directories in the root for dir in /*; do - # if it is a directory and it is not ignored - if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then + # if it is a directory and not already provided by the FHS env or + # explicitly ignored, bind-mount it into the chroot. Use exact match + # via associative array because regex substring matching incorrectly + # skips prefixes (e.g. /sb would match /sbin and never get mounted, + # breaking --chdir when CWD is on a custom mount like /sb/project). + # https://github.com/NixOS/nixpkgs/issues/241151 + if [[ -d "$dir" ]] && [[ -z "''${ignored_set[$dir]:-}" ]]; then # add it to the mount list auto_mounts+=(--bind "$dir" "$dir") fi diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index ca0d7331daaf..af1ec421da9b 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -325,6 +325,7 @@ lib.makeOverridable buildDependencies_ = buildDependencies; processedAttrs = [ "src" + "propagatedBuildInputs" "nativeBuildInputs" "buildInputs" "crateBin" @@ -418,7 +419,8 @@ lib.makeOverridable buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) - ++ buildInputs_; + ++ buildInputs_ + ++ completePropagatedBuildInputs; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; @@ -428,6 +430,16 @@ lib.makeOverridable ++ lib.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies ); + # Propagated native build inputs from this crate and all transitive Rust + # dependencies. Analogous to completeDeps but for native library deps: + # a crate can declare `propagatedBuildInputs` in its override and they + # will automatically be added to the buildInputs of every crate that + # depends on it, without having to repeat them up the dependency tree. + completePropagatedBuildInputs = lib.unique ( + (crate.propagatedBuildInputs or [ ]) + ++ lib.concatMap (dep: dep.completePropagatedBuildInputs or [ ]) dependencies + ); + # Create a list of features that are enabled by the crate itself and # through the features argument of buildRustCrate. Exclude features # with a forward slash, since they are passed through to dependencies, diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 2c9ada4e3dfd..75a483a0096f 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1060,6 +1060,69 @@ rec { test -x '${pkg}/bin/rcgen' && touch $out '' ); + + # Test that propagatedBuildInputs declared in a crate override are + # collected by completePropagatedBuildInputs and propagate transitively + # to all crates that depend on it. + propagatedBuildInputsTest = + let + fakeNativeLib = runCommand "fake-native-lib" { } "mkdir -p $out/lib && touch $out/lib/libfoo.a"; + + # Library crate that declares a native dep via propagatedBuildInputs + libCrate = mkHostCrate { + crateName = "mylib"; + src = mkLib "src/lib.rs"; + propagatedBuildInputs = [ fakeNativeLib ]; + }; + + # Binary crate with a direct dependency on libCrate + binCrate = mkHostCrate { + crateName = "mybin"; + src = mkFile "src/main.rs" "fn main() {}"; + dependencies = [ libCrate ]; + }; + + # Intermediate library that depends on libCrate + transitiveLib = mkHostCrate { + crateName = "transitivelib"; + src = mkLib "src/lib.rs"; + dependencies = [ libCrate ]; + }; + + # Binary crate that only depends on transitiveLib (not libCrate directly) + transitiveBin = mkHostCrate { + crateName = "transitivebin"; + src = mkFile "src/main.rs" "fn main() {}"; + dependencies = [ transitiveLib ]; + }; + in + runCommand "propagated-build-inputs-test" + { + libCrateInputs = libCrate.completePropagatedBuildInputs; + binCrateInputs = binCrate.completePropagatedBuildInputs; + transitiveBinInputs = transitiveBin.completePropagatedBuildInputs; + } + '' + # libCrate itself should have fakeNativeLib in completePropagatedBuildInputs + echo "$libCrateInputs" | grep -q "${fakeNativeLib}" || { + echo "ERROR: fakeNativeLib not in libCrate.completePropagatedBuildInputs" + exit 1 + } + + # binCrate depends on libCrate, so fakeNativeLib should propagate + echo "$binCrateInputs" | grep -q "${fakeNativeLib}" || { + echo "ERROR: fakeNativeLib not propagated to binCrate.completePropagatedBuildInputs" + exit 1 + } + + # transitiveBin → transitiveLib → libCrate: fakeNativeLib should propagate transitively + echo "$transitiveBinInputs" | grep -q "${fakeNativeLib}" || { + echo "ERROR: fakeNativeLib not transitively propagated to transitiveBin.completePropagatedBuildInputs" + exit 1 + } + + touch $out + ''; } ); test = releaseTools.aggregate { diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index c122efe78fcc..0814f78edfef 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -27,7 +27,7 @@ passthru.tests = { test = tests.rust-hooks.cargoBuildHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; }; } ./cargo-build-hook.sh; @@ -41,7 +41,7 @@ passthru.tests = { test = tests.rust-hooks.cargoCheckHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; }; } ./cargo-check-hook.sh; @@ -54,7 +54,7 @@ passthru.tests = { test = tests.rust-hooks.cargoInstallHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; }; } ./cargo-install-hook.sh; @@ -68,7 +68,7 @@ passthru.tests = { test = tests.rust-hooks.cargoNextestHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; }; } ./cargo-nextest-hook.sh; @@ -107,7 +107,7 @@ passthru.tests = { test = tests.rust-hooks.cargoSetupHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; }; } ./cargo-setup-hook.sh; diff --git a/pkgs/build-support/setup-hooks/install-fonts.sh b/pkgs/build-support/setup-hooks/install-fonts.sh index 27f9aeb82cd6..702b37a2ca43 100644 --- a/pkgs/build-support/setup-hooks/install-fonts.sh +++ b/pkgs/build-support/setup-hooks/install-fonts.sh @@ -52,6 +52,9 @@ installFonts() { if [ -n "${webfont-}" ]; then installFont 'woff' "$webfont/share/fonts/woff" installFont 'woff2' "$webfont/share/fonts/woff2" + elif [[ "${dontInstallWebfonts-}" != 1 && -n "$(find . \( -iname "*.woff" -o -iname "*.woff2" \) -print)" ]]; then + nixErrorLog "Consider adding \"webfont\" to outputs to install woff/woff2 files." + nixErrorLog "Alternatively, set dontInstallWebfonts to silence this." + exit 1 fi - } diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index f3c071bd8f12..fbc065a082ea 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -10,13 +10,13 @@ telegram-desktop.override { inherit withWebkit; unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { pname = "64gram-unwrapped"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "TDesktop-x64"; repo = "tdesktop"; tag = "v${version}"; - hash = "sha256-Xhyk/rCb4EakU0Nc80U1QN3PyMqlLBtcYb+zGjllhDM="; + hash = "sha256-C3DpwMF+0P2YKLG+USZMrBqRmfTSoF82YPMAgj33L+Y="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/_8/_86box/package.nix b/pkgs/by-name/_8/_86box/package.nix index 0ab749273e29..d83bb8b0f2c5 100644 --- a/pkgs/by-name/_8/_86box/package.nix +++ b/pkgs/by-name/_8/_86box/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - extra-cmake-modules, + kdePackages, pkg-config, makeWrapper, freetype, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { qt5.wrapQtAppsHook ] ++ lib.optionals enableWayland [ - extra-cmake-modules + kdePackages.extra-cmake-modules wayland-scanner ]; diff --git a/pkgs/by-name/ab/abbaye-des-morts/package.nix b/pkgs/by-name/ab/abbaye-des-morts/package.nix index e0905c31c0ca..6cff999a347b 100644 --- a/pkgs/by-name/ab/abbaye-des-morts/package.nix +++ b/pkgs/by-name/ab/abbaye-des-morts/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "DESTDIR=" ] - ++ lib.optional stdenv.isDarwin "PLATFORM=mac"; + ++ lib.optional stdenv.hostPlatform.isDarwin "PLATFORM=mac"; # Even with PLATFORM=mac, the Makefile specifies some GCC-specific CFLAGS that # are not supported by modern Clang on macOS - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail "-funswitch-loops" "" \ --replace-fail "-fgcse-after-reload" "" diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 11a35fdd5227..2c0948ac8eee 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -40,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: { ]; sourceRoot = "${src.name}/"; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/actualbudget/actual/blob/master/package.json#L123 + ./yarn-4.14-support.patch + ]; + nativeBuildInputs = [ yarn-berry nodejs @@ -98,8 +104,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-WWnf7HgTdyWrrHZA43hPjv8Q1PO1ETMKkd0eSu0pQ3M="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-7Vlc9hPv7Sr2ZUw7fasl3xf7ZYU31oS4tWW46UBJ1F0="; }; pname = "actual-server"; diff --git a/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch b/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch new file mode 100644 index 000000000000..e74e38dad8ba --- /dev/null +++ b/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -6,4 +6,7 @@ enableTransparentWorkspaces: false + + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.10.3.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix index 2260544631f1..e5bb023800d3 100644 --- a/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -60,10 +60,10 @@ stdenv.mkDerivation { makeWrapper patchelf ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index be96ca33df78..ac3dea2ab1ec 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aJeW8I7hx9VN5AU6gVq18cKO0QuKtc7JGUDbVsSXXE4="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/toeverything/AFFiNE/blob/canary/package.json#L96 + ./yarn-4.14-support.patch + ]; + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; hash = "sha256-vZkKFUaNe9iIAkdUfXnnuD2lM6kuzwqj1Dyt5GAgXsM="; @@ -62,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { # keep yarnOfflineCache same output style with offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; hash = "" }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; - inherit (finalAttrs) src; + inherit (finalAttrs) src patches; nativeBuildInputs = [ yarn-berry cacert @@ -106,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-CSB7fQnxkUx+LRDO0PbiPc2NZuvzWbBLNkImfrSm44o="; + outputHash = "sha256-mNvvKbj9mUioh5Jw4CcRt0CpX1IcQC8JOxUnyy0Lw9c="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ diff --git a/pkgs/by-name/af/affine/yarn-4.14-support.patch b/pkgs/by-name/af/affine/yarn-4.14-support.patch new file mode 100644 index 000000000000..782730dc89af --- /dev/null +++ b/pkgs/by-name/af/affine/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -12,4 +12,7 @@ npmPublishAccess: public + + npmRegistryServer: "https://registry.npmjs.org" + +-yarnPath: .yarn/releases/yarn-4.12.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/ai/aileron/package.nix b/pkgs/by-name/ai/aileron/package.nix index e741dcbe4480..c2c914b5cb4c 100644 --- a/pkgs/by-name/ai/aileron/package.nix +++ b/pkgs/by-name/ai/aileron/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: let @@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/aileron/"; diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix index dcfa98d8843d..9eb7da829490 100644 --- a/pkgs/by-name/al/alfis/package.nix +++ b/pkgs/by-name/al/alfis/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "alfis"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; tag = "v${finalAttrs.version}"; - hash = "sha256-gYy4Jyq4tkAPPfi2GGUf0ucVPlTgr0PkZYdOmqUMBvU="; + hash = "sha256-zZ8xltFgdPAfx+jtnnyLzzoC4r/L4oVjt59YemoDtgE="; }; - cargoHash = "sha256-yRJSgFIheWLWK0gN9VNmgMhQGdv902zx2T3X6CA8YEQ="; + cargoHash = "sha256-zqeWNf1fOGJFvRFU8ABm4s2QCfo4loNCPC1Zj19XE1U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/al/alice/package.nix b/pkgs/by-name/al/alice/package.nix index daf66b775658..822ba52f8f6b 100644 --- a/pkgs/by-name/al/alice/package.nix +++ b/pkgs/by-name/al/alice/package.nix @@ -2,37 +2,28 @@ lib, stdenv, fetchzip, + installFonts, }: stdenv.mkDerivation (finalAttrs: { - pname = "Alice"; + pname = "alice"; version = "2.003"; outputs = [ "out" - "woff2" + "webfont" ]; src = fetchzip { - url = - with finalAttrs; - "https://github.com/cyrealtype/${pname}/releases/download/v${version}/${pname}-v${version}.zip"; + url = "https://github.com/cyrealtype/Alice/releases/download/v${finalAttrs.version}/Alice-v${finalAttrs.version}.zip"; stripRoot = false; hash = "sha256-p+tE3DECfJyBIPyafGZ8jDYQ1lPb+iAnEwLyaUy7DW0="; }; + nativeBuildInputs = [ installFonts ]; + dontBuild = true; - installPhase = '' - runHook preInstall - - install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf - install -m444 -Dt $out/share/fonts/opentype fonts/otf/*.otf - install -m444 -Dt $woff2/share/fonts/woff2 fonts/webfonts/*.woff2 - - runHook postInstall - ''; - meta = { description = "Open-source font by Ksenia Erulevich"; homepage = "https://github.com/cyrealtype/Alice"; diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 50564e8cf69e..aa9d9c885fab 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.3.11"; + version = "3.3.12"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-jksC63DFSbZcBjQvV7BBMSMbPMeSqUQMWN9HcIcFZSU="; + hash = "sha256-U6vEQwlj0jNYnkZyZmmelEf/WJIHmaffJ+Y1NRU0IiI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/am/amarok/package.nix b/pkgs/by-name/am/amarok/package.nix index 4c38ee22d342..ff187b8d3618 100644 --- a/pkgs/by-name/am/amarok/package.nix +++ b/pkgs/by-name/am/amarok/package.nix @@ -3,7 +3,6 @@ fetchurl, lib, cmake, - extra-cmake-modules, pkg-config, kdePackages, fftw, diff --git a/pkgs/by-name/am/amnezia-vpn-bin/package.nix b/pkgs/by-name/am/amnezia-vpn-bin/package.nix new file mode 100644 index 000000000000..ed9b55ff33b9 --- /dev/null +++ b/pkgs/by-name/am/amnezia-vpn-bin/package.nix @@ -0,0 +1,140 @@ +{ + stdenv, + fetchzip, + lib, + libarchive, + makeWrapper, + autoPatchelfHook, + libxkbcommon, + libxcb-cursor, + libxcb-wm, + libxcb-util, + libxcb-image, + libxcb-keysyms, + libxcb-render-util, + krb5, + brotli, + fontconfig, + freetype, + gtk3, + pango, + at-spi2-atk, + unixodbc, + firebird, + libdrm, + openldap, + bash, + kdePackages, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "amnezia-vpn-bin"; + version = "4.8.15.4"; + + __structuredAttrs = true; + + src = fetchzip { + url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar"; + hash = "sha256-Dr8zuzgwMAPXOTh69URFvA7EzGMnfBFO6kPhjhtjr6A="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoPatchelfHook + libarchive + makeWrapper + ]; + + buildInputs = [ + stdenv.cc.cc + bash + libxkbcommon + libxcb-cursor + libxcb-wm + libxcb-util + libxcb-image + libxcb-keysyms + libxcb-render-util + krb5.lib + brotli.lib + fontconfig.lib + freetype + gtk3 + pango + at-spi2-atk + unixodbc + firebird + libdrm + openldap + kdePackages.wayland + ]; + + # These libraries are not available in nixpkgs. They are Oracle Instant Client + # (libclntsh.so.23.1) and UCanAccess/Mimer SQL (libmimerapi.so) drivers that + # are bundled with Qt's SQlite database plugins (libqsqlora, libqsqlmimer). + # The Amnezia VPN binary ships pre-linked against these Qt database drivers + # even though it does not use them. Without ignoring these missing deps, + # autoPatchelfHook would fail the build. + autoPatchelfIgnoreMissingDeps = [ + "libclntsh.so.23.1" + "libmimerapi.so" + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/amnezia-vpn $out/bin $out/share/applications $out/lib/systemd/system $out/share/icons/hicolor/512x512/apps + + bsdtar -xf AmneziaVPN_Linux_Installer.bin -C $out/share/amnezia-vpn + + makeWrapper "$out/share/amnezia-vpn/client/bin/AmneziaVPN" "$out/bin/AmneziaVPN" \ + --prefix LD_LIBRARY_PATH : "$out/share/amnezia-vpn/client/lib" \ + --set QML_IMPORT_PATH "$out/share/amnezia-vpn/client/qml" \ + --set QML2_IMPORT_PATH "$out/share/amnezia-vpn/client/qml" \ + --set QT_PLUGIN_PATH "$out/share/amnezia-vpn/client/plugins" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/share/amnezia-vpn/client/plugins/platforms" \ + --set QTDIR "$out/share/amnezia-vpn/client" \ + --set CQT_PKG_ROOT "$out/share/amnezia-vpn/client" + + makeWrapper "$out/share/amnezia-vpn/service/bin/AmneziaVPN-service" "$out/bin/AmneziaVPN-service" \ + --prefix LD_LIBRARY_PATH : "$out/share/amnezia-vpn/client/lib" \ + --prefix LD_LIBRARY_PATH : "$out/share/amnezia-vpn/service/lib" \ + --set QML_IMPORT_PATH "$out/share/amnezia-vpn/service/qml" \ + --set QML2_IMPORT_PATH "$out/share/amnezia-vpn/service/qml" \ + --set QT_PLUGIN_PATH "$out/share/amnezia-vpn/service/plugins" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/share/amnezia-vpn/service/plugins/platforms" \ + --set QTDIR "$out/share/amnezia-vpn/service" \ + --set CQT_PKG_ROOT "$out/share/amnezia-vpn/service" + + substituteInPlace $out/share/amnezia-vpn/AmneziaVPN.service \ + --replace-fail "/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "AmneziaVPN-service" \ + --replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" "" + ln -s $out/share/amnezia-vpn/AmneziaVPN.service $out/lib/systemd/system/AmneziaVPN.service + + substituteInPlace $out/share/amnezia-vpn/AmneziaVPN.desktop \ + --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN" + ln -s $out/share/amnezia-vpn/AmneziaVPN.desktop $out/share/applications/AmneziaVPN.desktop + + ln -s $out/share/amnezia-vpn/AmneziaVPN.png $out/share/icons/hicolor/512x512/apps/AmneziaVPN.png + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Amnezia VPN Client (binary release)"; + downloadPage = "https://amnezia.org/en/downloads"; + homepage = "https://github.com/amnezia-vpn/amnezia-client"; + license = lib.licenses.gpl3; + mainProgram = "AmneziaVPN"; + maintainers = with lib.maintainers; [ sund3RRR ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/am/amnezia-vpn/dev_agw_public_key b/pkgs/by-name/am/amnezia-vpn/dev_agw_public_key new file mode 100644 index 000000000000..80d94e51adce --- /dev/null +++ b/pkgs/by-name/am/amnezia-vpn/dev_agw_public_key @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwMJbYlGxn3l+0XiGA9I/ +BHK8HX/aet7A9GVL817apDUeL6sdISRBdopv5Y0FdrBHSJWSUdWtVxVazJB46J8x +327/5H5pi0nkfRbcgxBGSGxhKOvwRe+WPVb2f81jlkenZK46c9C7dNmX/310rlHY +BwOnZcdw2oKu6hTNDwk3nyUo2v2/leNIMLsv84RlHAX6Tyx5slq8ysewhcmdfv17 +WQjF7albq12ZafTSjtXqDcsrk2oF8mfyzxLjSXbxQHKIDHkfz3SUXCs/H9tt1ydK +2Yj6nIxv98HESZ8Ng40OZPhHDex8Ru1NjcWlo2EWNM1xT8IqmBT21PLuyzGjNSwG +Ojnm1V2EcjerVmRNhFTJG70RkURD/i2MDbG+ZKpqPtW1uL8wEt2IkSqNfKcf+TF+ +UJZZfm1lDUMpWJ2eWJGrgOUX8/f8v/GB+x4PxUo1m7V/pDLqCUPm3l2dkaM9P0sM +6lO0+jKqfIFnG1zjc3if7r1YbDsZlyl389q9Hrh7t+Lwj/JXkDxFaTnudM8egaXk +GX5YxZiEDmCCLRskRwBBUaYffXIpFbI8sO2Xj0J5/im5xtu7TtfJktcPzDL9uyG1 +Ebt8oSA4FTzTid6Zwj55YgDfz0FMnNmXh80T1xMzlbi6y+BCuna+I+7McMRo8yz3 +VzzYJ0/J7PpHpXoZv7K1qDsCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 9db6232d93ac..831f1ec9b45a 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -58,23 +58,38 @@ let amnezia-xray = callPackage ./xray-lib.nix { }; - amneziaPremiumConfig = fetchurl { - url = "https://raw.githubusercontent.com/amnezia-vpn/amnezia-client-lite/f45d6b242c1ac635208a72914e8df76ccb3aa44c/macos-signed-build.sh"; - hash = "sha256-PnaPVPlyglUphhknWwP7ziuwRz+WOz0k9WRw6Q0nG2c="; - postFetch = '' - sed -nri '/PROD_AGW_PUBLIC_KEY|PROD_S3_ENDPOINT/p' $out - ''; - }; + # Amnezia Gateway (AGW) public keys for premium server list verification. + # These PEM-formatted RSA public keys are hardcoded in the upstream binary + # and used to verify signatures on server list responses from the AGW service. + # The original values were extracted from the upstream linux binary using + # `strings` command, as they are not present in any public source files. + # Newlines are escaped (\n -> \\n) to prevent Makefile generation failures + # during build when these variables are exported via preConfigure. + dev-agw-public-key = lib.replaceStrings [ "\n" ] [ "\\n" ] (builtins.readFile ./dev_agw_public_key); + dev-agw-endpoint = "http://gw.dev.amzsvc.com:80/"; + dev-s3-endpoint = "https://s3.eu-north-1.amazonaws.com/amnezia-dev/"; + + prod-agw-public-key = lib.replaceStrings [ "\n" ] [ "\\n" ] ( + builtins.readFile ./prod_agw_public_key + ); + prod-s3-endpoint = lib.concatStringsSep ", " [ + "https://s3.eu-north-1.amazonaws.com/amnezia/" + "https://amnzstrg01.blob.core.windows.net/lambda-list/" + "https://storage.googleapis.com/lambda-list/" + "https://objectstorage.eu-zurich-1.oraclecloud.com/n/zrhfyaq6qxvh/b/lambda-list/o/" + ]; in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.14.5"; + version = "4.8.15.4"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-ijo6PC1Be06K8hxvgjybLvU80xEYUPahBV4f5JqabLc="; + hash = "sha256-ZUWesEpXb+L7NzL/jkWpS3b4DGq4733T5zc+VXSw9Ic="; fetchSubmodules = true; }; @@ -132,8 +147,15 @@ stdenv.mkDerivation (finalAttrs: { qt6.qttools ]; + # These environment variables are baked into the binary at build time. + # They configure which Amnezia Gateway servers and S3 endpoints the client + # uses for fetching verified server lists (premium functionality). preConfigure = '' - source ${amneziaPremiumConfig} + export DEV_AGW_PUBLIC_KEY="${dev-agw-public-key}" + export DEV_AGW_ENDPOINT="${dev-agw-endpoint}" + export DEV_S3_ENDPOINT="${dev-s3-endpoint}" + export PROD_AGW_PUBLIC_KEY="${prod-agw-public-key}" + export PROD_S3_ENDPOINT="${prod-s3-endpoint}" ''; installPhase = '' @@ -148,6 +170,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Amnezia VPN Client"; downloadPage = "https://amnezia.org/en/downloads"; diff --git a/pkgs/by-name/am/amnezia-vpn/prod_agw_public_key b/pkgs/by-name/am/amnezia-vpn/prod_agw_public_key new file mode 100644 index 000000000000..c92516a546a1 --- /dev/null +++ b/pkgs/by-name/am/amnezia-vpn/prod_agw_public_key @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj5mxl/4DL3Sk89ntxs5G +X3JawGQWIoq6rvNkOzNGuNgedNS2+pi6hZl3Izl1Io9om4KiUlMT6mgLO1hTr9q+ +s7CYhlvroFA7ErucF+9L+7FCt0Igi0kIK/R2/vxd/2HaUrorn/aSvvutkYwbfxqW +SwtzE+RuBeDWGvEt937OW0oqYONPYv9E4T56Dz/EZ6v2t8ejAnKLbGD/GocMmipK +7etFSiSMAB2RmaztqTq4NleBepfO80XpYlW9pCSXuHcE8wxHczkzxsbyMAMsG/K3 +vUQY6qPtohqqzSSBwa/8u2ptNHBeor7l7DdYXeR/Nqcc4z92VUkZ5lOVR4evkS5V +/wQqp5tnOJEj3NjUhEhXFoNEapbZd1bh6iQoUk7jC1TdvKJ/nPKGZAsHRpr0rNKz +fx/N/Oo6lr2yh/+ps6VxTkbPmB6E85WOO3UvjImZUY0XQdBjWle/4iJLdEC77Nr0 +jXhdgeypucy6jkB6iBHMeVMlrNMEV7UxoBR/cCNx55zu/8sml5ByiDvCDT7sRomN +NgVt5S/FaVjYuzFUifJ12ToChXFgESKFmuso7WluEaWvMIGREdrMrKQKHfYLOzWF +2B5ZJDqw4o03fU4J/6rw61M1b+rjVpXMjPnzc2A+RgcjTvXv955gfZkwe4lt5wk/ +3j8zMVo3+zLrMTAaEeIUM0UCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 42a9d633e30e..6195cb95700c 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1777624460-g8bb2f0" + "@sourcegraph/amp": "^0.0.1778343260-gb9a37d" } }, "node_modules/@napi-rs/keyring": { @@ -228,9 +228,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1777624460-g8bb2f0", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1777624460-g8bb2f0.tgz", - "integrity": "sha512-LGr3VAfyW5W7eJNPa545KvCL11qsac0FFzu67rPrqCR2Xh7v0mP1N7S9TLHKDG74NoqmB3xdhX7o0lIk2ZoGkg==", + "version": "0.0.1778343260-gb9a37d", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1778343260-gb9a37d.tgz", + "integrity": "sha512-TY4lL2lqwt+NtBa3ngKZSYfY5Z1qBAOd4UQMCT0nsUKatQGtSOIMec+zQSv6tr0L+z2jrDUzD0cpRkBDkLQjsQ==", "license": "Amp Commercial License", "dependencies": { "@napi-rs/keyring": "1.1.10" diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index f507ceeacf83..3116d00e392a 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1777624460-g8bb2f0"; + version = "0.0.1778343260-gb9a37d"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-HUoRVq++AsIbQxJHkI4oyPyBbFcji6BvWdWxrqdUQQ0="; + hash = "sha256-48FyPDniLNQoeZ+SaheTvzLCYL3r95e9VDCW4Y5gMq8="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-Lnnutg8LDp9UMuJ+TuoRABK7lcQNizZDltr1cMFpYEc="; + npmDepsHash = "sha256-Ce7TaJuSrha+NcFmppMm/byAFosBR2I/zMY4KA5JXuE="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index 2753d00b83f4..591e168e1e1f 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -4,11 +4,12 @@ buildGoModule, versionCheckHook, writableTmpDirAsHomeHook, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "andcli"; - version = "2.6.1"; + version = "2.6.2"; subPackages = [ "cmd/andcli" ]; @@ -16,10 +17,10 @@ buildGoModule (finalAttrs: { owner = "tjblackheart"; repo = "andcli"; tag = "v${finalAttrs.version}"; - hash = "sha256-iNquGZfnXIo/UcTcRYdw+reV5TEPymHsX3kZdT66IPw="; + hash = "sha256-EtfsSLyZs5hADJRE5xvn2mu6A04Sz9e21Y4+VkopCY0="; }; - vendorHash = "sha256-ZfU8Sf9M2dz9aIhwiK58zGIrcpmaw8wMAdcpxxvkUsQ="; + vendorHash = "sha256-CHWypAA2BpHop5LGkjZVTBL4dGzWfrwDJcFrtGTBAb4="; ldflags = [ "-s" @@ -35,6 +36,8 @@ buildGoModule (finalAttrs: { versionCheckKeepEnvironment = [ "HOME" ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/tjblackheart/andcli"; description = "2FA TUI for your shell"; diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix index 597c7e41ad1f..a7920e4b0e94 100644 --- a/pkgs/by-name/an/angle/package.nix +++ b/pkgs/by-name/an/angle/package.nix @@ -35,7 +35,7 @@ let llvmPackages.clang ]; postBuild = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/darwin ln -s $out/resource-root/lib/darwin/libclang_rt.osx.a \ @@ -67,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: { python3 llvmPackages.bintools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ glib libxcb.dev libx11.dev @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { pciutils libGL ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index 58dcf2ddb4ec..79b1d8bdab15 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -8,6 +8,7 @@ curl, catt, syncplay, + openssl, ffmpeg, fzf, aria2, @@ -27,17 +28,18 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "ani-cli"; - version = "4.11"; + version = "4.14"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-gQprGtKXXpDm66dFWsrriL4G0NPav+nqm8T6wkdbgk8="; + hash = "sha256-OyCKDN89sBz59+3JncMDyNOq8UMqqjara+A0Owo3oko="; }; nativeBuildInputs = [ makeWrapper ]; runtimeInputs = [ + openssl gnugrep gnused curl @@ -70,5 +72,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; mainProgram = "ani-cli"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + ]; }; }) diff --git a/pkgs/by-name/an/anki/package.nix b/pkgs/by-name/an/anki/package.nix index a2eece5add07..9909f92a97b8 100644 --- a/pkgs/by-name/an/anki/package.nix +++ b/pkgs/by-name/an/anki/package.nix @@ -37,12 +37,12 @@ let yarn-berry = yarn-berry_4; pname = "anki"; - version = "25.09.2"; + version = "25.09.3"; rev = "3890e12c9e48c028c3f12aa58cb64bd9f8895e30"; - srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A="; + srcHash = "sha256-vpAWrZAXqm775sn1I5unPb8L9cqaRqPrVEc4A8SxPOk="; cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM="; - yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg="; + yarnHash = "sha256-wi8e9B0EtRMoyH6KhRBNDHM/ffJ+/0Y4f4AZ7eUcXmA="; pythonDeps = with python3Packages; [ @@ -58,7 +58,6 @@ let # aqt runtime deps beautifulsoup4 flask - flask-cors jsonschema pip-system-certs pyqt6 @@ -155,14 +154,17 @@ python3Packages.buildPythonApplication (finalAttrs: { ./patches/skip-formatting-python-code.patch # Used in with-addons.nix ./patches/allow-setting-addons-folder.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/ankitects/anki/blob/main/package.json#L99 + ./patches/yarn-4.14-support.patch ]; inherit cargoDeps; missingHashes = ./missing-hashes.json; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) missingHashes; - yarnLock = "${finalAttrs.src}/yarn.lock"; + inherit (finalAttrs) src missingHashes patches; hash = yarnHash; }; diff --git a/pkgs/by-name/an/anki/patches/yarn-4.14-support.patch b/pkgs/by-name/an/anki/patches/yarn-4.14-support.patch new file mode 100644 index 000000000000..c45ad0430e5e --- /dev/null +++ b/pkgs/by-name/an/anki/patches/yarn-4.14-support.patch @@ -0,0 +1,19 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,2 +1,4 @@ + nodeLinker: node-modules + enableScripts: false ++approvedGitRepositories: ++ - "**" +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 3d1e6d1a197b..5e0d5804dbf2 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -42,6 +42,9 @@ copyDesktopItems, pulseaudio, udev, + libxkbcommon, + wayland, + libepoxy, }: let @@ -100,6 +103,9 @@ stdenv.mkDerivation (finalAttrs: { libsm libxrender udev + libxkbcommon + wayland + libepoxy ]; nativeBuildInputs = [ @@ -188,6 +194,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" ]; mainProgram = "anydesk"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ fraioveio ]; }; }) diff --git a/pkgs/by-name/an/anydesk/pin.json b/pkgs/by-name/an/anydesk/pin.json index 825e8fdd0a83..be59d275a145 100644 --- a/pkgs/by-name/an/anydesk/pin.json +++ b/pkgs/by-name/an/anydesk/pin.json @@ -1,5 +1,5 @@ { - "version": "7.1.3", - "x86_64-linux": "sha256-b1WSQMRlFaqhECCBKoPjUIww5Fj3yfN8wxwACuO7RR4=", - "aarch64-linux": "sha256-Yb5Jnjxs8AmMeFvWY+VYGTovpLwW1PRPBEJZUF63gA0=" + "version": "8.0.2", + "x86_64-linux": "sha256-6noMPfe0x6kx/whyd66qcmk7WhEivx3xK5q58Se9Ij0=", + "aarch64-linux": "sha256-wfY+OCx9OyLCmiA29RjnYzcg/pApMIXWT5UrcdcyRYM=" } diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index c648c00d517b..42d546715507 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeBool "BUILD_JAVA" false) - (lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.isLinux) + (lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.hostPlatform.isLinux) (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 0290e2b73e21..490bc6bbb4d1 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { # skip tests on darwin due to some local networking failures # `__darwinAllowLocalNetworking = true;` wasn't sufficient for # aarch64 or x86_64 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # some test data include SOURCE_DATE_EPOCH (which is different from our default) # and the default version info which we get by unsetting our ldflags diff --git a/pkgs/by-name/ar/arcdps-log-manager/package.nix b/pkgs/by-name/ar/arcdps-log-manager/package.nix index 7015c17454fe..1ccbe05a2b3c 100644 --- a/pkgs/by-name/ar/arcdps-log-manager/package.nix +++ b/pkgs/by-name/ar/arcdps-log-manager/package.nix @@ -13,13 +13,13 @@ }: buildDotnetModule (finalAttrs: { pname = "arcdps-log-manager"; - version = "1.15"; + version = "1.15.1"; src = fetchFromGitHub { owner = "gw2scratch"; repo = "evtc"; tag = "manager-v${finalAttrs.version}"; - hash = "sha256-z7SuE+MPhN4/XW3CtYabbAd2ZjL2M/ii+VCdyUUukoA="; + hash = "sha256-JevVLlWcPu0/inLjzsxyNCcwOTp1jwNMp/rZH9h1wO0="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix deleted file mode 100644 index c8e5d8690ad4..000000000000 --- a/pkgs/by-name/as/asciinema-automation/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, - asciinema, -}: - -python3.pkgs.buildPythonApplication (finalAttrs: { - pname = "asciinema-automation"; - version = "0.2.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "PierreMarchand20"; - repo = "asciinema_automation"; - rev = "v${finalAttrs.version}"; - hash = "sha256-VfIr7w/5hQwr6XYuC3f8h71uScr0lBdx6PyO1hpiZhA="; - }; - - nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.wheel - ]; - - propagatedBuildInputs = with python3.pkgs; [ - asciinema - pexpect - ]; - - optional-dependencies = with python3.pkgs; { - dev = [ - mypy - pytest - ruff - types-pexpect - ]; - }; - - pythonImportsCheck = [ "asciinema_automation" ]; - - meta = { - changelog = "https://github.com/PierreMarchand20/asciinema_automation/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - description = "CLI utility to automate asciinema recordings"; - homepage = "https://github.com/PierreMarchand20/asciinema_automation"; - license = lib.licenses.mit; - mainProgram = "asciinema-automation"; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix index 882ff4e271d1..5d93445c8101 100644 --- a/pkgs/by-name/as/asciinema/package.nix +++ b/pkgs/by-name/as/asciinema/package.nix @@ -1,36 +1,62 @@ { lib, - python3Packages, fetchFromGitHub, + installShellFiles, + python3, + rustPlatform, + versionCheckHook, }: -python3Packages.buildPythonApplication (finalAttrs: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "asciinema"; - version = "2.4.0"; - pyproject = true; + version = "3.2.0"; src = fetchFromGitHub { owner = "asciinema"; repo = "asciinema"; - rev = "v${finalAttrs.version}"; - hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58="; }; - build-system = [ python3Packages.setuptools ]; + cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8="; - postPatch = '' - substituteInPlace tests/pty_test.py \ - --replace-fail "python3" "${python3Packages.python.interpreter}" + env.ASCIINEMA_GEN_DIR = "gendir"; + + strictDeps = true; + + nativeCheckInputs = [ python3 ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage gendir/man/* + installShellCompletion --cmd asciinema \ + --bash gendir/completion/asciinema.bash \ + --fish gendir/completion/asciinema.fish \ + --zsh gendir/completion/_asciinema ''; - nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { - description = "Terminal session recorder and the best companion of asciinema.org"; homepage = "https://asciinema.org/"; + description = "Terminal session recorder and the best companion of asciinema.org"; + longDescription = '' + asciinema is a suite of tools for recording, replaying, and sharing + terminal sessions. It is free and open-source software (FOSS), created + by Marcin Kulik. + + Its typical use cases include creating tutorials, demonstrating + command-line tools, and sharing reproducible bug reports. It focuses on + simplicity and interoperability, which makes it a popular choice among + computer users working with the command-line, such as developers or + system administrators. + ''; license = with lib.licenses; [ gpl3Plus ]; - maintainers = [ ]; - platforms = lib.platforms.all; mainProgram = "asciinema"; + maintainers = with lib.maintainers; [ + jiriks74 + llakala + ]; }; }) diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix deleted file mode 100644 index 5d93445c8101..000000000000 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - fetchFromGitHub, - installShellFiles, - python3, - rustPlatform, - versionCheckHook, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "asciinema"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "asciinema"; - repo = "asciinema"; - tag = "v${finalAttrs.version}"; - hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58="; - }; - - cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8="; - - env.ASCIINEMA_GEN_DIR = "gendir"; - - strictDeps = true; - - nativeCheckInputs = [ python3 ]; - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installManPage gendir/man/* - installShellCompletion --cmd asciinema \ - --bash gendir/completion/asciinema.bash \ - --fish gendir/completion/asciinema.fish \ - --zsh gendir/completion/_asciinema - ''; - - doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; - - meta = { - homepage = "https://asciinema.org/"; - description = "Terminal session recorder and the best companion of asciinema.org"; - longDescription = '' - asciinema is a suite of tools for recording, replaying, and sharing - terminal sessions. It is free and open-source software (FOSS), created - by Marcin Kulik. - - Its typical use cases include creating tutorials, demonstrating - command-line tools, and sharing reproducible bug reports. It focuses on - simplicity and interoperability, which makes it a popular choice among - computer users working with the command-line, such as developers or - system administrators. - ''; - license = with lib.licenses; [ gpl3Plus ]; - mainProgram = "asciinema"; - maintainers = with lib.maintainers; [ - jiriks74 - llakala - ]; - }; -}) diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index 8040aa5490da..8c6be12940be 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "astartectl"; - version = "24.5.3"; + version = "26.5.0"; src = fetchFromGitHub { owner = "astarte-platform"; repo = "astartectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-wziSP4mbUnAAPzmkl1qXbT95Ku/M9rMb63s/5ndCXrk="; + hash = "sha256-mRPy5nnj/1T3tnii+Z9QmL6kZba2Wom/jGncp+ZynFg="; }; - vendorHash = "sha256-TZ0ua64DPVlGBrr4ZCexBoyuwvJzRr1t37BTJ2bLuQI="; + vendorHash = "sha256-Yz6Ph6TqyWlEXnkW/g1DDqxaqTM9DJrnO+QJgzqjVhw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 06f8394fbbf6..270c56e614e6 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { prePnpmInstall ; pnpm = pnpm_10; - fetcherVersion = 2; - hash = "sha256-DFoIq5+cKqnmWLJ6CHhfdQEAGjvpu72qb1CSWaExODI="; + fetcherVersion = 3; + hash = "sha256-1kdXt0Wc/ON//hwBYozRSMAyKQqEfSMfOI7XJyd9MBc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index ccddbe14511e..3091be5059f1 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "astyle"; - version = "3.6.14"; + version = "3.6.15"; src = fetchurl { url = "mirror://sourceforge/astyle/astyle-${finalAttrs.version}.tar.bz2"; - hash = "sha256-HEb9wiy+mcYDWTmTt1C6pMouC0yeSx2Q4vtg10nWCNA="; + hash = "sha256-W0B31otZQWCJFs2KJjBGo1Yfl1k3A8BIMccwsjCoGuk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix index 0b4d816f3c32..9c631d791f17 100644 --- a/pkgs/by-name/at/attyx/package.nix +++ b/pkgs/by-name/at/attyx/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "attyx"; - version = "0.3.15"; + version = "0.4.0"; src = fetchFromGitHub { owner = "semos-labs"; repo = "attyx"; tag = "v${finalAttrs.version}"; - hash = "sha256-w71MyTlnuJBdC9HtXm9hdYNv+ONnh8Ii3i2BhmmcXz4="; + hash = "sha256-9OTvpkkIo6pb9G2mvlNeZrwyOwIhAM7f9zy1LJzxJG0="; }; deps = callPackage ./build.zig.zon.nix { }; diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 254e156b8884..8c314c465018 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -153,7 +153,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=ui::viewport::tests::test_add_line_scrolling" "--skip=ui::viewport::tests::test_line_wrapping" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __structuredAttrs = true; diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index a4b34536ea71..edb3a95e3f6d 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -16,12 +16,12 @@ let pname = "autobrr"; - version = "1.77.0"; + version = "1.77.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-Rz2rPV1IigaaSwk18vldNQ1RRK9cUJPy4yYkL1KTURw="; + hash = "sha256-XNTQmW8JUxe8bffe1eGvxoRQ3rKdoH0QQKDn/wY6L3o="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -46,7 +46,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-BEsYcS0SiWLQyQc7CRadoQ146VAnq0zmHxdd838H6iI="; + hash = "sha256-StLGK3Oezv+M5tuFd1rZyLpG0g1xFxWPJ5lm39Sy0FQ="; }; postBuild = '' @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { src ; - vendorHash = "sha256-HjHRT/PAZdMM/2JWmNMK/I9Gc0ThTAFDSxWW/ATYxW8="; + vendorHash = "sha256-POqFXcLtc18EzEQ2SRb2+D+3E8KexaAOelgOSvCwoWI="; preBuild = '' cp -r ${finalAttrs.passthru.autobrr-web}/* web/dist diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 0fb88b914458..7124ccac6707 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "aws-cdk-cli"; - version = "2.1104.0"; + version = "2.1116.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cdk-cli"; tag = "cdk@v${finalAttrs.version}"; - hash = "sha256-bIrTc87gk14ckVhcoZKa1aOo0wpWZCceafpxzKLcDEY="; + hash = "sha256-mRr5G42RrO87AdJOTLaM+EPprTFCI7eVxzUhafrGOxA="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-JuklEESNm/eadB5iBvomfY87NRaPywEnwL2GtPUTQ2Y="; + hash = "sha256-cjJBaq65sNWOFMFB1HAgGScxJlBZKnwkGipDd4aXhDE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 43b66e34aceb..b678721ec1d3 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -9,7 +9,7 @@ dbus, dbus-test-runner, evolution-data-server, - extra-cmake-modules, + kdePackages, glib, gst_all_1, gtest, @@ -93,11 +93,11 @@ stdenv.mkDerivation (finalAttrs: { if enableLomiriFeatures then ( [ - extra-cmake-modules + kdePackages.extra-cmake-modules mkcal ] ++ (with libsForQt5; [ - kcalendarcore + __internalKF5.kcalendarcore qtbase ]) ++ (with lomiri; [ diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 38a5f7b4f486..509577e12c94 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -12,13 +12,13 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "ayugram-desktop-unwrapped"; - version = "6.3.10"; + version = "6.7.8"; src = fetchFromGitHub { owner = "AyuGram"; repo = "AyuGramDesktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-kyxnr246bhxHpDUhhEnraDtHZDnF2uU2tdmfIvPnKHo="; + hash = "sha256-X0g/zl5pJE8S5rkk7o81LiDNClLEMDyHVxmdoO4X9DE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index e872aa63dc30..2ecbc0851df4 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_SSE42" enableSSE42) ]; - installPhase = optionalString stdenv.isDarwin '' + installPhase = optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications $out/bin @@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=( --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" - ${optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : ${ + ${optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : ${ lib.makeLibraryPath [ moltenvk ] }"} ) diff --git a/pkgs/development/interpreters/babashka/completions/bb.bash b/pkgs/by-name/ba/babashka-unwrapped/completions/bb.bash similarity index 100% rename from pkgs/development/interpreters/babashka/completions/bb.bash rename to pkgs/by-name/ba/babashka-unwrapped/completions/bb.bash diff --git a/pkgs/development/interpreters/babashka/completions/bb.fish b/pkgs/by-name/ba/babashka-unwrapped/completions/bb.fish similarity index 100% rename from pkgs/development/interpreters/babashka/completions/bb.fish rename to pkgs/by-name/ba/babashka-unwrapped/completions/bb.fish diff --git a/pkgs/development/interpreters/babashka/completions/bb.zsh b/pkgs/by-name/ba/babashka-unwrapped/completions/bb.zsh similarity index 100% rename from pkgs/development/interpreters/babashka/completions/bb.zsh rename to pkgs/by-name/ba/babashka-unwrapped/completions/bb.zsh diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/by-name/ba/babashka-unwrapped/package.nix similarity index 96% rename from pkgs/development/interpreters/babashka/default.nix rename to pkgs/by-name/ba/babashka-unwrapped/package.nix index 0e517c67c139..e762e658beaa 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/by-name/ba/babashka-unwrapped/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "babashka-unwrapped"; - version = "1.12.217"; + version = "1.12.218"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar"; - sha256 = "sha256-5Nnzx2chre+h0SnM5spwiR9r4gjlyfc2FbgYa0spM34="; + sha256 = "sha256-CEApb2noPYfRYRDTo1RBLOZELvEuxGO4HW1CB//bky8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -69,7 +69,7 @@ buildGraalvmNativeImage (finalAttrs: { | ${lib.getExe finalAttrs.finalPackage} -I -o -e "(or (some->> *input* (filter #(= '(def version) (take 2 %))) first last last last) (throw (ex-info \"Couldn't find expected '(def version ...)' form in 'borkdude/deps.clj'.\" {})))") update-source-version babashka.clojure-tools "$clojure_tools_version" \ - --file="pkgs/development/interpreters/babashka/clojure-tools.nix" + --file="pkgs/by-name/ba/babashka/clojure-tools.nix" ''; meta = { diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/by-name/ba/babashka/clojure-tools.nix similarity index 62% rename from pkgs/development/interpreters/babashka/clojure-tools.nix rename to pkgs/by-name/ba/babashka/clojure-tools.nix index a8f87bc735b6..a537a00c7389 100644 --- a/pkgs/development/interpreters/babashka/clojure-tools.nix +++ b/pkgs/by-name/ba/babashka/clojure-tools.nix @@ -1,16 +1,16 @@ # This file tracks the Clojure tools version required by babashka. # See https://github.com/borkdude/deps.clj#deps_clj_tools_version for background. -# The `updateScript` provided in default.nix takes care of keeping it in sync, as well. +# The `updateScript` provided in babashka-unwrapped takes care of keeping it in sync, as well. { clojure, fetchurl, }: clojure.overrideAttrs (previousAttrs: { pname = "babashka-clojure-tools"; - version = "1.12.4.1597"; + version = "1.12.4.1618"; src = fetchurl { url = previousAttrs.src.url; - hash = "sha256-DgEvXVExaexDTLoonh/fVS5nHjgekL6BlFYLM9X6wkM="; + hash = "sha256-E3adptY6mN6yAkN4rhpk5O4hGsEDU0DfynppRMQc3iE="; }; }) diff --git a/pkgs/development/interpreters/babashka/wrapped.nix b/pkgs/by-name/ba/babashka/package.nix similarity index 100% rename from pkgs/development/interpreters/babashka/wrapped.nix rename to pkgs/by-name/ba/babashka/package.nix diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix index 765d48a54e04..835a888d20e0 100644 --- a/pkgs/by-name/ba/balatro-mod-manager/package.nix +++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix @@ -92,6 +92,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; meta = { + # Rollup for ARM64 is broken with Node modules + broken = stdenv.hostPlatform.isAarch64; description = "A mod manager for the game Balatro"; homepage = "https://balatro-mod-manager.dasguney.com/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index ba56ce00a1d8..28092a12c1c7 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -6,7 +6,7 @@ cereal, cmake, eigen, - extra-cmake-modules, + kdePackages, fetchFromGitLab, fmt, freeglut, @@ -45,7 +45,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config ]; diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 0073245147e2..3070840aac38 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { docify pkg-config ] - ++ lib.optional stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optional stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 3e0b23f391e1..9fc72267d488 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.38.0"; + version = "1.38.2"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-ARSrlQozhefNV4K75aiaKxgfKIkE9mPrDksDhuvXfA4="; + hash = "sha256-zUrvqds6gkqZLV5BbwZDf+IsClNn8CwiC4VdAUO2CWY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-dtGRtJxsVvltjPdMl0KZMaAqnNppwGCtL/XnYbc1PyQ="; + hash = "sha256-vk5nI8CPYp9ux984yiFWRdOGWrabx/VWPNlgihuLCMM="; }; postPatch = '' diff --git a/pkgs/by-name/bc/bcompare4/package.nix b/pkgs/by-name/bc/bcompare4/package.nix deleted file mode 100644 index 90e805ca7d3b..000000000000 --- a/pkgs/by-name/bc/bcompare4/package.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - lib, - autoPatchelfHook, - bzip2, - cairo, - fetchurl, - gdk-pixbuf, - glibc, - pango, - gtk2, - libsForQt5, - stdenv, - runtimeShell, - unzip, -}: - -let - pname = "bcompare4"; - version = "4.4.7.28397"; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://www.scootersoftware.com/bcompare-${version}_amd64.deb"; - sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U"; - }; - - x86_64-darwin = fetchurl { - url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; - sha256 = "sha256-qbpM6hJbv+APo+ed45k3GXrl1HnZRxD1uT2lvaN3oM4="; - }; - - aarch64-darwin = srcs.x86_64-darwin; - }; - - src = srcs.${stdenv.hostPlatform.system} or throwSystem; - - linux = stdenv.mkDerivation { - inherit - pname - version - src - meta - ; - unpackPhase = '' - ar x $src - tar xfz data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/{bin,lib,share} - - cp -R usr/{bin,lib,share} $out/ - - # Remove library that refuses to be autoPatchelf'ed - rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so - - substituteInPlace $out/bin/bcompare \ - --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ - --replace "ldd" "${glibc.bin}/bin/ldd" \ - --replace "/bin/bash" "${runtimeShell}" - - # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - (lib.getLib stdenv.cc.cc) - gtk2 - pango - cairo - libsForQt5.kio - libsForQt5.kservice - libsForQt5.ki18n - libsForQt5.kcoreaddons - gdk-pixbuf - bzip2 - ]; - - dontBuild = true; - dontConfigure = true; - dontWrapQtApps = true; - - __structuredAttrs = true; - strictDeps = true; - }; - - darwin = stdenv.mkDerivation { - inherit - pname - version - src - meta - ; - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/Applications/BCompare.app - cp -R . $out/Applications/BCompare.app - ''; - - __structuredAttrs = true; - strictDeps = true; - }; - - meta = { - description = "GUI application that allows to quickly and easily compare files and folders"; - longDescription = '' - Beyond Compare is focused. Beyond Compare allows you to quickly and easily compare your files and folders. - By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. - You can then merge the changes, synchronize your files, and generate reports for your records. - ''; - homepage = "https://www.scootersoftware.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ - ktor - arkivm - ]; - platforms = builtins.attrNames srcs; - mainProgram = "bcompare"; - }; -in -if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/bc/bcu/package.nix b/pkgs/by-name/bc/bcu/package.nix index 5f6c6449c7cb..e96ab8cf142e 100644 --- a/pkgs/by-name/bc/bcu/package.nix +++ b/pkgs/by-name/bc/bcu/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcu"; - version = "1.1.119"; + version = "1.1.128"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "bcu"; tag = "bcu_${finalAttrs.version}"; - hash = "sha256-GVnUkIoqHED/9c3Tr4M29DB+t6Q8OPDcxVWKNn/lU/8="; + hash = "sha256-8q9xJYEZfyC8ETNi3q8YQOtBGMmI4EQLp7LKxPaU65Q="; }; patches = [ ./darwin-install.patch ]; diff --git a/pkgs/by-name/be/beauty-line-icon-theme/package.nix b/pkgs/by-name/be/beauty-line-icon-theme/package.nix index c92199cd7dc0..b8ba0688b122 100644 --- a/pkgs/by-name/be/beauty-line-icon-theme/package.nix +++ b/pkgs/by-name/be/beauty-line-icon-theme/package.nix @@ -8,7 +8,7 @@ mint-x-icons, pantheon, jdupes, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation { @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point) propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme mint-x-icons @@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation { dontPatchELF = true; dontRewriteSymlinks = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/be/bella/package.nix b/pkgs/by-name/be/bella/package.nix index fb42d1448968..97d73641eb3c 100644 --- a/pkgs/by-name/be/bella/package.nix +++ b/pkgs/by-name/be/bella/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bella"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "josephmawa"; repo = "Bella"; tag = "v${finalAttrs.version}"; - hash = "sha256-IjRjo5zKoXFK+4F7OtSYuk62Pif7HDAi0E/3+t9rjv4="; + hash = "sha256-gIz6Vjs4L7dSVyXTE//vmjIqisu5vBTUoE6cET52G4c="; }; strictDeps = true; diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index 71807c43c84e..8ff85d0e2577 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -27,24 +27,24 @@ let '' ${acc} substituteInPlace pkg/berglas/${goFileName}_test.go \ - --replace "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \ - --replace "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager" + --replace-fail "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \ + --replace-fail "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager" '' ) "" (builtins.attrNames skipTests); in buildGoModule (finalAttrs: { pname = "berglas"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "berglas"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-NIAnVjZZKey+XFxS1jryr4cWEmjtznXaLc1DZJldjxY="; + sha256 = "sha256-4Y53psmHpe1JmTKfvOS5f0VHCp/GuC4kDWiHWl5ty3Q="; }; - vendorHash = "sha256-I0Tdjw9cd9eufEwnxC4E0tB7KPE7jQKJPrUQbFgqQVI="; + vendorHash = "sha256-Bz+4hlT5ZqpDnquGirooyFMG8FNUU2NO60Ih3Et3Y3o="; ldflags = [ "-s" diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix index 317b2f0651d5..5e3b73e76218 100644 --- a/pkgs/by-name/bi/bird-lg/package.nix +++ b/pkgs/by-name/bi/bird-lg/package.nix @@ -10,13 +10,13 @@ let { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-60QyqilUI0yNCTZrCyUZhQYFio0gP/Z5Lcb3btlQRaE="; + hash = "sha256-xKDpaGnMv8e2OKV3547d7Jsq3VFNwayhCL2dGKVYSZM="; }; doDist = false; diff --git a/pkgs/by-name/bi/bitlbee-steam/package.nix b/pkgs/by-name/bi/bitlbee-steam/package.nix index 54506265176c..4dc003c03659 100644 --- a/pkgs/by-name/bi/bitlbee-steam/package.nix +++ b/pkgs/by-name/bi/bitlbee-steam/package.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitlbee-steam"; src = fetchFromGitHub { - rev = "v${finalAttrs.version}"; owner = "bitlbee"; repo = "bitlbee-steam"; - sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WPUelgClqGiKmClIkGEMaBbtUrBlwN85L4Rs/qpIOYg="; }; nativeBuildInputs = [ @@ -37,6 +37,9 @@ stdenv.mkDerivation (finalAttrs: { ./autogen.sh ''; + # Source uses `bool` as a variable name, reserved in C23. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + meta = { description = "Steam protocol plugin for BitlBee"; diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 271122ea8ca1..d8b09698aee7 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "bitrise"; - version = "2.39.4"; + version = "2.39.5"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sg7Os1HqxyGQ7WngCFmV0s8HsFHLt/IgX79nd1tBciU="; + hash = "sha256-2AT6coAJFXt0eZicXABojGOHay2oU7pe70IKJX/dyk8="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bi/bitwig-studio6/package.nix b/pkgs/by-name/bi/bitwig-studio6/package.nix index cbb6052144c6..63c482832462 100644 --- a/pkgs/by-name/bi/bitwig-studio6/package.nix +++ b/pkgs/by-name/bi/bitwig-studio6/package.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwig-studio6"; - version = "6.0"; + version = "6.0.6"; src = fetchurl { name = "bitwig-studio-${finalAttrs.version}.deb"; url = "https://www.bitwig.com/dl/Bitwig%20Studio/${finalAttrs.version}/installer_linux"; - hash = "sha256-jrCTgaxfeWhfKwLeKLmqTQWS7RVbVnHqJ0InCipmm8k="; + hash = "sha256-tczgtA4v3a5Qjxaa6ZvaiFDWD6dhRw19vj8IMxkyCNI="; }; strictDeps = true; diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix index 88bbdef9e5df..8dcee7a0b549 100644 --- a/pkgs/by-name/bl/bluej/package.nix +++ b/pkgs/by-name/bl/bluej/package.nix @@ -19,7 +19,7 @@ let { enableJavaFX = true; } - // lib.optionalAttrs stdenv.isLinux { + // lib.optionalAttrs stdenv.hostPlatform.isLinux { openjfx_jdk = openjfx21.override { withWebKit = true; }; } ); diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index b71d91edc6e3..c6bede970944 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -62,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: { "varmod-localtime" ] # TODO: drop the name-conditioning on stdenv rebuild - ++ lib.optional (stdenv.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin") "export" + ++ lib.optional ( + stdenv.hostPlatform.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin" + ) "export" ); strictDeps = true; diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix index 6eb61c0f9647..6ac0065809ab 100644 --- a/pkgs/by-name/bo/bombsquad/package.nix +++ b/pkgs/by-name/bo/bombsquad/package.nix @@ -25,11 +25,11 @@ let { x86_64-linux = { name = "BombSquad_Linux_x86_64"; - hash = "sha256-VHhDRzB7sSvb3Ou/Sg+PjTKFDG9sKsXueu2qLNfC06k="; + hash = "sha256-Su7xEVzgFBl+Q2iFWdIRbyO8lRs8Xd4KabFhycZUVjs="; }; aarch64-linux = { name = "BombSquad_Linux_Arm64"; - hash = "sha256-usrhPOsXkJZk0HCSBIGnc4qdIu2SW7STp6Y/e6RmZlM="; + hash = "sha256-Q87KbQqwEOaMiJ4uSgZ3eD8AYKQCoJWPzq7rt9Nu9Co="; }; } .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported."); @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { # Note: This version trails behind the latest version by one since the latest # version sometimes gets replaced for minor updates. The builds in /old/ are # stable. - version = "1.7.61"; + version = "1.7.62"; src = fetchurl { url = "https://files.ballistica.net/bombsquad/builds/old/${archive.name}_${finalAttrs.version}.tar.gz"; @@ -89,13 +89,17 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/libexec $out/share/bombsquad/ba_data install -Dm555 -t $out/libexec ${finalAttrs.meta.mainProgram} + # x86_64 bundles Discord partner SDK; aarch64 currently does not. + if [ -e libdiscord_partner_sdk.so ]; then + install -Dm555 -t $out/libexec libdiscord_partner_sdk.so + fi cp -r ba_data $out/share/bombsquad makeWrapper "$out/libexec/${finalAttrs.meta.mainProgram}" "$out/bin/${finalAttrs.meta.mainProgram}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ --add-flags "-d $out/share/bombsquad" - install -Dm755 ${bombsquadIcon} $out/share/icons/bombsquad.png + install -Dm444 ${bombsquadIcon} $out/share/icons/bombsquad.png runHook postInstall ''; diff --git a/pkgs/by-name/bo/boulder/package.nix b/pkgs/by-name/bo/boulder/package.nix index 7a3c851e7876..9f0550a1884c 100644 --- a/pkgs/by-name/bo/boulder/package.nix +++ b/pkgs/by-name/bo/boulder/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "boulder"; - version = "0.20260428.0"; + version = "0.20260504.0"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { find $out -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-ky6geY8pIBhnpwQ4bbzQN0+EQgOfwlo8EQ0rTZdtNIA="; + hash = "sha256-nqSBFaPhu+TRPY33Rh3El7IJbKDPI133qgsupVpx/Lg="; }; vendorHash = null; diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index c308ec735302..4a7a69a5dfac 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.21.0"; + version = "5.22.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-AE8c2ArkNipoAJSCj3NHEM91rulfbWGyANunPESKc/E="; + hash = "sha256-DizB9SCw3SMOsBz/bioUqLvDME9lfNaBzOY/pFGzv8g="; }; patches = [ ]; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 32aacb29cfd9..f4f178f44786 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.89.145"; + version = "1.90.121"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-WcLCmhbALtVHL4LEPCUyLfRZR30kdc/41pfHxvE0rJQ="; + hash = "sha256-y4wAvJdghCfKF61EQoZHaZ28qmX2/DTmBhISRj+m8EM="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-t7OXN+42gXd/b9fE8sd40aH2l/nW2OvtLvHCqb7/1qI="; + hash = "sha256-XOTxy6+P6abDZtE9UlxSVX/eEDfNFrudC/q+9+gE3s4="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-A5SGxb+r0wEbdo7ZkUrwm6zVr86+vpOvtfBpZivmNoE="; + hash = "sha256-WI5QIym3rMC8z+CcsLG+K4qgEaRiNzIOO7a7Vf45r1M="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-kTk6BeKuGkteKlGBk2b5ftDeo9F+EaWwk4DoEzlfJGw="; + hash = "sha256-a3GJeQ6InfTz3a4jtdOcNfP37MqLsjnuIJo3M451NKc="; }; }; diff --git a/pkgs/by-name/br/brogue-ce/package.nix b/pkgs/by-name/br/brogue-ce/package.nix index 793b9c8b490d..c57df0a4996b 100644 --- a/pkgs/by-name/br/brogue-ce/package.nix +++ b/pkgs/by-name/br/brogue-ce/package.nix @@ -46,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: { "DATADIR=$(out)/opt/brogue-ce" "TERMINAL=${if terminal then "YES" else "NO"}" "GRAPHICS=${if graphics then "YES" else "NO"}" - "MAC_APP=${if stdenv.isDarwin then "YES" else "NO"}" + "MAC_APP=${if stdenv.hostPlatform.isDarwin then "YES" else "NO"}" ]; - postBuild = lib.optionalString (stdenv.isDarwin && graphics) '' + postBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && graphics) '' make Brogue.app $makeFlags ''; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postInstall = lib.optionalString (stdenv.isDarwin && graphics) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin && graphics) '' mkdir -p $out/Applications mv Brogue.app "$out/Applications/Brogue CE.app" ''; diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index e1111044faf4..ee0fd9289b90 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -22,10 +22,10 @@ }: mkDerivation { pname = "bruijn"; - version = "0-unstable-2025-12-07"; + version = "0-unstable-2026-05-02"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/3f329f0299c944205293eceec72be25418fd9f0b.tar.gz"; - sha256 = "0qx7x50bz0yw0iwg4ymxipzqbh7ki729rbfwxrmijnwbxijlsr01"; + url = "https://github.com/marvinborner/bruijn/archive/8a88445d1f0d970c88cdb0e1b97a04ba02019a94.tar.gz"; + sha256 = "12s2sa9zg6sxia36mm0z8fq7f3kd86g96gcwd8xnb8dl49x8qbd5"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index bdbac91e5cd7..8f9c54f3e414 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -31,7 +31,7 @@ buildNpmPackage { nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin clang_20; # clang_21 breaks gyp builds + ++ lib.optional stdenv.hostPlatform.isDarwin clang_20; # clang_21 breaks gyp builds buildInputs = [ pango diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 89d0a6eb48cf..f768c3a81a32 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -42,7 +42,7 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin clang_20 # clang_21 breaks gyp builds + ++ lib.optional stdenv.hostPlatform.isDarwin clang_20 # clang_21 breaks gyp builds ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ makeWrapper copyDesktopItems diff --git a/pkgs/by-name/br/brush-splat/package.nix b/pkgs/by-name/br/brush-splat/package.nix index 9f8c7f33151c..c697d89714ee 100644 --- a/pkgs/by-name/br/brush-splat/package.nix +++ b/pkgs/by-name/br/brush-splat/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { vulkan-loader zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 37c480f5e3ba..33e733fdd90d 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "buf"; - version = "1.68.4"; + version = "1.69.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; tag = "v${finalAttrs.version}"; - hash = "sha256-qxTRUYt2JKBE5WvfXlMsdXMJtrD9MLnMjy6+3PMkpvo="; + hash = "sha256-x8Dj4xl67Jq0ViWu+Tz+3lAnfIpE926dIr+oe4ul0gI="; }; - vendorHash = "sha256-aQ4yWdHUmb0LaJ33T2vuVDS1UhYmBUYcwkbnkN7DOqQ="; + vendorHash = "sha256-zhXpWpYd/bim5f4EQJujVm072LPgBusjCFGYAwK10HE="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/bu/buf/skip_broken_tests.patch b/pkgs/by-name/bu/buf/skip_broken_tests.patch index 8bde6a9f70bf..3867083e832d 100644 --- a/pkgs/by-name/bu/buf/skip_broken_tests.patch +++ b/pkgs/by-name/bu/buf/skip_broken_tests.patch @@ -1,15 +1,15 @@ diff --git a/private/buf/buftesting/buftesting.go b/private/buf/buftesting/buftesting.go -index 1c650077..5422f703 100644 +index 1b5557d..cec5736 100644 --- a/private/buf/buftesting/buftesting.go +++ b/private/buf/buftesting/buftesting.go -@@ -106,6 +106,10 @@ func RunActualProtoc( +@@ -100,6 +100,10 @@ func RunActualProtoc( // GetGoogleapisDirPath gets the path to a clone of googleapis. - func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { + func GetGoogleapisDirPath(tb testing.TB, buftestingDirPath string) string { + // Requires network access, which is not available during + // the nixpkgs sandboxed build -+ t.Skip() ++ tb.Skip() + googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath) require.NoError( - t, + tb, diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 89ab8a12d59d..d99f0098fffe 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -14,16 +14,16 @@ }: buildGoModule (finalAttrs: { pname = "buildkite-agent"; - version = "3.121.0"; + version = "3.124.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-QlslPoLpqzuX05bp58xz/3Vhj0imEqCleO1hhe1PPXM="; + hash = "sha256-HdTMsCBvd3vN/OkpBpiJ7dXq50PXx165NWmKGGpikUQ="; }; - vendorHash = "sha256-rv5CqNpjmXhGcZ3KQBX0Z2428upWBUVkdRjEG4QWEoY="; + vendorHash = "sha256-VE7YEBIrkDG1ERGXnib0LPjBWcrepGAqwY5yKzSQ6wg="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash @@ -59,9 +59,6 @@ buildGoModule (finalAttrs: { passthru = { tests.smoke-test = nixosTests.buildkite-agents; - updateScript = gitUpdater { - rev-prefix = "v"; - }; }; meta = { @@ -80,6 +77,7 @@ buildGoModule (finalAttrs: { zimbatm jsoo1 techknowlogick + cbrxyz ]; platforms = with lib.platforms; unix ++ darwin; }; diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix index 24fc2ab9ca05..355c77ac1791 100644 --- a/pkgs/by-name/bu/buildkite-cli/package.nix +++ b/pkgs/by-name/bu/buildkite-cli/package.nix @@ -3,6 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, + gitMinimal, versionCheckHook, writableTmpDirAsHomeHook, nix-update-script, @@ -10,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "buildkite-cli"; - version = "3.32.2"; + version = "3.40.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-7jBYi9KGkeB6Pu4VDR8QSTG3U4QFFVih3MUp2Sldpqo="; + hash = "sha256-8Fij2SG6dLnyc4U2Q+jIx2ZDzbGd6ETTWiiz3ciRaE8="; }; - vendorHash = "sha256-yi77gGlBIGEQQbYVVsQP74IVFuZo5GAPOdgYmaDnBAs="; + vendorHash = "sha256-pxVSzEc/pgPaMMBOl5LYjbmPVpjr1M2obFmeiGqfgik="; ldflags = [ "-s" @@ -27,6 +28,7 @@ buildGoModule (finalAttrs: { ]; nativeCheckInputs = [ + gitMinimal writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index b1dc9f933c8d..a3ac52c26266 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -8,20 +8,20 @@ buildGoModule (finalAttrs: { pname = "pack"; - version = "0.37.0"; + version = "0.40.3"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; + hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4="; }; - vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ="; + vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A="; nativeBuildInputs = [ installShellFiles ]; - subPackages = [ "cmd/pack" ]; + subPackages = [ "." ]; ldflags = [ "-s" diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index bb97601005fc..8d0d34035e6b 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-rI0DhnncVWd4Wp5pvTnL8IerXbFDwJzkhC4uIe6WJto="; + fetcherVersion = 3; + hash = "sha256-nIj4S5BWTaw3RVNIxbla8Q31wvK67Of6psx5wX9ID+E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix index e8c9427f52ac..a113c3f354e1 100644 --- a/pkgs/by-name/ca/caido-cli/package.nix +++ b/pkgs/by-name/ca/caido-cli/package.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation (finalAttrs: { ); nativeBuildInputs = - lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ]; + lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; - buildInputs = lib.optionals stdenv.isLinux [ libgcc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgcc ]; sourceRoot = "."; diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix index e554e26f0fe9..0c26ee5beb60 100644 --- a/pkgs/by-name/ca/caido-desktop/package.nix +++ b/pkgs/by-name/ca/caido-desktop/package.nix @@ -71,6 +71,8 @@ let extraInstallCommands = '' install -m 444 -D ${appimageContents}/caido.desktop \ -t $out/share/applications + substituteInPlace $out/share/applications/caido.desktop \ + --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=caido-desktop %U" install -m 444 -D ${appimageContents}/caido.png \ $out/share/icons/hicolor/512x512/apps/caido.png wrapProgram $out/bin/${pname} \ @@ -111,9 +113,9 @@ let }; in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then linux -else if stdenv.isDarwin then +else if stdenv.hostPlatform.isDarwin then darwin else throw "caido-desktop: unsupported platform ${stdenv.hostPlatform.system}" diff --git a/pkgs/by-name/ca/calligraplan/package.nix b/pkgs/by-name/ca/calligraplan/package.nix index 0a6f049da2ad..abb2d290154f 100644 --- a/pkgs/by-name/ca/calligraplan/package.nix +++ b/pkgs/by-name/ca/calligraplan/package.nix @@ -2,53 +2,57 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, - qt5, - libsForQt5, + qt6, + kdePackages, cmake, - extra-cmake-modules, + shared-mime-info, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "calligraplan"; - version = "3.3.0"; + version = "4.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = "calligraplan"; tag = "v${finalAttrs.version}"; - hash = "sha256-szPdRxbzJ2+nmgp+1FwmKZwHEDV8EtbDW/3jsw4J6HI="; + hash = "sha256-OD719omgw+RZrFz6qWiFDFB4t6Lvvh2M2QXYAIh0H2I="; }; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/office/calligraplan/-/commit/cdd85c895b487a8b3837bf8b864103997e0af544.patch"; - hash = "sha256-IMoJvvszPuIdWedeU7PQw8ngYmMA7k//wXfT+mZQP88="; - }) - ]; - buildInputs = [ - qt5.qtbase - libsForQt5.kdbusaddons - libsForQt5.kguiaddons - libsForQt5.ki18n - libsForQt5.kiconthemes - libsForQt5.kitemviews - libsForQt5.kjobwidgets - libsForQt5.kio - libsForQt5.knotifications - libsForQt5.kparts - libsForQt5.kinit - libsForQt5.kdiagram - libsForQt5.qt5.qtx11extras + qt6.qtbase + kdePackages.karchive + kdePackages.kcalendarcore + kdePackages.kconfig + kdePackages.kconfigwidgets + kdePackages.kcoreaddons + kdePackages.kdbusaddons + kdePackages.kdiagram + kdePackages.kguiaddons + kdePackages.kholidays + kdePackages.ki18n + kdePackages.kiconthemes + kdePackages.kio + kdePackages.kitemmodels + kdePackages.kitemviews + kdePackages.kjobwidgets + kdePackages.knotifications + kdePackages.kparts + kdePackages.ktextwidgets + kdePackages.kwidgetsaddons + kdePackages.kwindowsystem + kdePackages.kxmlgui + kdePackages.plasma-activities + kdePackages.sonnet ]; nativeBuildInputs = [ - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook cmake - extra-cmake-modules + kdePackages.extra-cmake-modules + shared-mime-info ]; passthru = { diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix index a51dce1f9bdb..b4b9c5bed454 100644 --- a/pkgs/by-name/ca/canta-theme/package.nix +++ b/pkgs/by-name/ca/canta-theme/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' patchShebangs . diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 2475d673e5b0..11b0186ba992 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-binstall"; - version = "1.18.1"; + version = "1.19.1"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${finalAttrs.version}"; - hash = "sha256-SOiwme6MIOzro5/85rgEP90odXUUqeTDzn1ZsKDS4Z4="; + hash = "sha256-b4S8oPK1U84Oy3hhJSxJxToaFF5l4V2Tea0kGn3hW0A="; }; - cargoHash = "sha256-UW960ls3O+0CiQHoFvkhieL+t0dG9RJ3zi/Pu37kvbY="; + cargoHash = "sha256-E+exhtfJiOTQIZm44WyA0yptUn7wymXFRlDyAsshcKA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index ff217138912a..7b7cf4e5946a 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-deny"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; tag = finalAttrs.version; - hash = "sha256-faONVJNllTyWWdyNaOUgphZkCXOwXQ5521Nll+yw+qE="; + hash = "sha256-/rhdG/N2xQYCRPAddS2GELRuc/LsQVt8puvgn/cdbj4="; }; - cargoHash = "sha256-NjGGe5K0fpS9EDfuSOmBi9BGiObh8XITHQoSb7iktWc="; + cargoHash = "sha256-Xx8t3DpJ9n1v3Cky1r+WiP3/Q4rJ7wDntSiV8VS8qTQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index c18a62d2a07a..64464a140c27 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-dtrace-macos.patch ]; diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix index 60911458f3c8..288963cad6ce 100644 --- a/pkgs/by-name/ca/castero/package.nix +++ b/pkgs/by-name/ca/castero/package.nix @@ -54,6 +54,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { # E + where '' = .metadata # E + and = episode1.metadata "test_menu_episode_metadata" + # flaky: segfaults on Hydra when a background DB reload thread races the test + "test_perspective_downloaded_draw_metadata" ]; pythonImportsCheck = [ diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index 76fc6f64def7..197137aa33d9 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, cctools, - libiconv, llvmPackages, ninja, openssl, @@ -19,23 +18,25 @@ }: let stdenv = if cudaSupport then cudaPackages.backendStdenv else llvmPackages.stdenv; + buildPythonBindingsEnv = python3Packages.python.withPackages ( + ps: with ps; [ + cython + numpy + ] + ); in stdenv.mkDerivation (finalAttrs: { pname = "catboost"; - version = "1.2.7"; + version = "1.2.10"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; tag = "v${finalAttrs.version}"; - hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4="; + hash = "sha256-z68vflYgO3cWeOkb417Gyco1Fqb98ulyRgI+OS+B4is="; }; - patches = [ - ./remove-conan.patch - ]; - postPatch = '' substituteInPlace cmake/common.cmake \ --replace-fail "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ @@ -43,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { shopt -s globstar for cmakelists in **/CMakeLists.*; do - sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists + sed -i "s/openssl::openssl/OpenSSL::SSL/g" $cmakelists done ''; @@ -53,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + buildPythonBindingsEnv cmake llvmPackages.bintools ninja - (python3Packages.python.withPackages (ps: with ps; [ six ])) ragel yasm ] @@ -71,9 +72,6 @@ stdenv.mkDerivation (finalAttrs: { openssl zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl @@ -101,7 +99,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true) (lib.cmakeFeature "CATBOOST_COMPONENTS" "app;libs${lib.optionalString pythonSupport ";python-package"}") (lib.cmakeBool "HAVE_CUDA" cudaSupport) - ]; + ] + ++ lib.optional pythonSupport ( + lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}" + ); installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ca/catboost/remove-conan.patch b/pkgs/by-name/ca/catboost/remove-conan.patch deleted file mode 100644 index 4e3ab6f436f9..000000000000 --- a/pkgs/by-name/ca/catboost/remove-conan.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24ffd1225a..700adcc246 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,6 @@ include(cmake/global_flags.cmake) - include(cmake/global_vars.cmake) - include(cmake/archive.cmake) - include(cmake/common.cmake) --include(cmake/conan1_deprecated.cmake) - include(cmake/cuda.cmake) - include(cmake/cython.cmake) - include(cmake/fbs.cmake) -@@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake) - include(cmake/shared_libs.cmake) - include(cmake/swig.cmake) - --if (CMAKE_CROSSCOMPILING) -- include(${PROJECT_BINARY_DIR}/conan_paths.cmake) --else() -- conan_cmake_autodetect(settings) -- conan_cmake_install( -- PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR} -- INSTALL_FOLDER ${PROJECT_BINARY_DIR} -- BUILD missing -- REMOTE conancenter -- SETTINGS ${settings} -- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" -- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" -- ) --endif() -- - - if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -@@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86") - elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64") - include(CMakeLists.android-x86_64.txt) - endif() -- diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 3067b2c9e4e9..c836ea06440d 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.13.5"; + version = "4.13.6"; src = fetchFromGitHub { owner = "ccache"; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-v8TgVoLIKhNgcmTLbgqAYuJLUHJEOh/yDVPig/LfPMk="; + hash = "sha256-A0n+DO6IznETsAFUNIpBkQI6A3UilgEUbuyP3sqKDTk="; }; outputs = [ @@ -99,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: { ]; disabledTests = [ - "test.direct" # https://github.com/ccache/ccache/issues/1699 "test.fileclone" # flaky on hydra, also seems to fail on zfs "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) ] diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 08b9776cd476..a5beb4b2932d 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.33"; + version = "1.2.34"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-K7cLmNGTVv5Y5kxmqd2+iyj/mmGNdvq3QskDQLMgUUk="; + hash = "sha256-iCv9v8ItMbozaJpNPW7zunjeszZbQxyjUvB7Kx1Dj1E="; }; vendorHash = "sha256-aolS1mhIM8/fOeHeLQgiS8z/zO++U+36Th7wNpKlkFU="; diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix index d7f4a98c38ff..373117ca1957 100644 --- a/pkgs/by-name/cd/cdxgen/package.nix +++ b/pkgs/by-name/cd/cdxgen/package.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; - fetcherVersion = 2; - hash = "sha256-o5pNgn+ZqaEfsWO97jXkRyPH+0pffR6TBZcF6nApWVg="; + fetcherVersion = 3; + hash = "sha256-o7u/ZZS/5PgOtWd07zO4a01mUWZowUTL+JDJ2442mGc="; }; buildPhase = '' diff --git a/pkgs/by-name/cg/cgui/fix-gcc15.patch b/pkgs/by-name/cg/cgui/fix-gcc15.patch new file mode 100644 index 000000000000..653fd269d2f6 --- /dev/null +++ b/pkgs/by-name/cg/cgui/fix-gcc15.patch @@ -0,0 +1,15 @@ +diff --git a/examples/25viewer.c b/examples/25viewer.c +index 37e4585..a0328f0 100644 +--- a/examples/25viewer.c ++++ b/examples/25viewer.c +@@ -10,8 +10,9 @@ + + static const char *fname; /* stores name of file to open */ + +-void quit() ++void quit(void *data) + { ++ (void)data; + exit(0); + } + diff --git a/pkgs/by-name/cg/cgui/package.nix b/pkgs/by-name/cg/cgui/package.nix index 9f510370b3ca..abd0c6eaa952 100644 --- a/pkgs/by-name/cg/cgui/package.nix +++ b/pkgs/by-name/cg/cgui/package.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; }; + patches = [ + ./fix-gcc15.patch + ]; + buildInputs = [ texinfo allegro diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index ad27f086988e..98aa57e383e6 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chainsaw"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-FsetcuVl1JHkVy4Haal6e16NLQz+zS9mFyqH65Qr5zU="; + hash = "sha256-ywHPDVHpw0TrzeWPzZ3cvQSxCr2Di2YjS0Not1B9vlg="; }; - cargoHash = "sha256-UumlqHRssy401iiZSMq5N5r8a2f6ZLoqPuyBoDHPxYg="; + cargoHash = "sha256-AA8JQiGukh4SRZyciuE2u4OUo7HNeb6+SWej9vlw5z8="; ldflags = [ "-w" diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix index bf64bc06717b..728e191cc7c1 100644 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ b/pkgs/by-name/ch/chameleon-cli/package.nix @@ -23,14 +23,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "chameleon-cli"; - version = "2.1.0-unstable-2026-04-19"; + version = "2.1.0-unstable-2026-05-08"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "ChameleonUltra"; - rev = "75eb389fe97a18b5ba6c8754cdfa0ec716a2dcf1"; + rev = "f06efdf81574406943142f4a14db338d2b145a15"; rootDir = "software"; - hash = "sha256-RnP+j6ZZxE167Xr6C0Hs/d6zV8jjQUyI91Ya8JVMrcs="; + hash = "sha256-2zc9Uww1t1XJzQpI4KChe1cbqJXoewTo3vBbQKJdjfI="; }; postPatch = '' diff --git a/pkgs/by-name/ch/changelogen/package.nix b/pkgs/by-name/ch/changelogen/package.nix index df0b68bb0289..e4452f35f38f 100644 --- a/pkgs/by-name/ch/changelogen/package.nix +++ b/pkgs/by-name/ch/changelogen/package.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-UKSIfn2iR8Ydk9ViGCgWtspZr1FjTeW49UMwTcL57UA="; + fetcherVersion = 3; + hash = "sha256-S+GxeljcPj/MzBkleVNgaRa8D4kmHrKwwVqakmB5sAw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix index 065870fd8989..713e8d4c2b93 100644 --- a/pkgs/by-name/ch/checkip/package.nix +++ b/pkgs/by-name/ch/checkip/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "checkip"; - version = "0.53.1"; + version = "0.53.3"; src = fetchFromGitHub { owner = "jreisinger"; repo = "checkip"; tag = "v${finalAttrs.version}"; - hash = "sha256-z/6r1t6CZI4Q+Xr30u3NZgVLgeB0NCnSH8tSieAOys4="; + hash = "sha256-F+0qZxtITS4RqeB8s0pTLKckSdaOPYP+AGu58Fh50tg="; }; vendorHash = "sha256-5sUBrzo6wJfaMMvgNflcjB2QNSIeaD2TN7qBao53NFs="; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 8c987eae2d1d..c36da5daba50 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -35,14 +35,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "checkov"; - version = "3.2.526"; + version = "3.2.527"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = finalAttrs.version; - hash = "sha256-AWr95ZU7B3N6KZpJvPM3w41qv0ejoDtlRIEdDSH50w0="; + hash = "sha256-PKG4WzXtocfE9rwg3E77BkWREs7RhAzmdv9mz5VsbLA="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index 1cc0604b37ae..92a2392ddb0f 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -8,17 +8,17 @@ }: maven.buildMavenPackage (finalAttrs: { - version = "13.2.0"; + version = "13.4.2"; pname = "checkstyle"; src = fetchFromGitHub { owner = "checkstyle"; repo = "checkstyle"; tag = "checkstyle-${finalAttrs.version}"; - hash = "sha256-f9jJK9zp7sm8VEn30qQA73+ynARJWY3BxbSMEppEDlk="; + hash = "sha256-0ENLO/hP/MXVU358Ys83cH1Adl8CTbT/zcG9/tOBIC8="; }; - mvnHash = "sha256-+l3ubVFWx1QVTSgwVv0yGVyh8RPnxyHBU/vKE4sBRoE="; + mvnHash = "sha256-eRNJOrSP9GcuF226kZi5ef3shm1PdTEsGvjpi46cfSw="; nativeBuildInputs = [ maven diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index f45f5bcd5789..01dfd735a3ae 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-vm1yz0iKErkw/l4cGPedVVaoBGLV0h4O7xA56e3IoqM="; + hash = "sha256-+mfetkw5SibvUky/QoUE4+5SL+v8S4JGq9ZlS9q6Uk0="; }; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-cBZymB2eI93ui8rdQzBibdf44lXJC/KGwoz0EyeOk2A="; + hash = "sha256-6zbnWaeSzvK1NDCXIySS54Pq6siBCuBRJkMa7/NAt1k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 9cc7f08fce36..8ba61f5cbe4b 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -7,16 +7,16 @@ buildGo125Module (finalAttrs: { pname = "chezmoi"; - version = "2.70.2"; + version = "2.70.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; tag = "v${finalAttrs.version}"; - hash = "sha256-47tc3L3iUVt+i13qyZMxRYb59Y/id/+EMQfbZGsMJzQ="; + hash = "sha256-1O2KXDOs9U079A12oJ5reIO5HXyrn4+hfKfQiadFEM4="; }; - vendorHash = "sha256-uTbU8lrMTfyiljJ6flo88k3xJrhZJCzPuyu/hFrRTGo="; + vendorHash = "sha256-vejh1aeniksXJ7xda8fEYiqe4FEsYzJpGMtr59uHByY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chuck/package.nix b/pkgs/by-name/ch/chuck/package.nix index e6a59199d561..db12ce525f13 100644 --- a/pkgs/by-name/ch/chuck/package.nix +++ b/pkgs/by-name/ch/chuck/package.nix @@ -14,14 +14,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.5.6"; + version = "1.5.5.8"; pname = "chuck"; src = fetchFromGitHub { owner = "ccrma"; repo = "chuck"; tag = "chuck-${finalAttrs.version}"; - hash = "sha256-KBmMpycNCjRZJPdRR3HG5nqHQhhVOENciRpiQ7buyok="; + hash = "sha256-GBgb7Bnq5R9Gs/chstjxO8qf+MfSXVftwCbgNW5qC5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix index 3f4babaab654..5931e61f3b1d 100644 --- a/pkgs/by-name/ci/circleci-cli/package.nix +++ b/pkgs/by-name/ci/circleci-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "circleci-cli"; - version = "0.1.35800"; + version = "0.1.36202"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = "circleci-cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Mxeyij1S0mrVTBNFDgnlIFCHYik47sHtrgbc1cjObbM="; + sha256 = "sha256-79B1zQ6n066onSf08vYRXNxoq+pvBRyHAXPiTkhqMm8="; }; vendorHash = "sha256-vTYepN/srd5qb2o1O5KwcGBwvKmV1DLG3/4OdtKJpVk="; diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 646fda10453c..7acef8fcb848 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -64,9 +64,7 @@ rustPlatform.buildRustPackage { substituteInPlace $cargoDepsCopy/*/sysproxy-*/src/linux.rs \ --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' \ - --replace-fail '"kreadconfig5"' '"${libsForQt5.kconfig}/bin/kreadconfig5"' \ --replace-fail '"kreadconfig6"' '"${kdePackages.kconfig}/bin/kreadconfig6"' \ - --replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \ --replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"' # this file tries to override the linker used when compiling for certain platforms diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index d0f804c0a236..5502e19ec7b6 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.131", - "commit": "c122cd1bd5247f2a4bde8bcaec712fb1dff247e8", - "buildDate": "2026-05-06T06:18:01Z", + "version": "2.1.137", + "commit": "88a017e5d1d4c7de4e6de6a496ac08c9c1b77d79", + "buildDate": "2026-05-08T23:09:27Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "cc6066b0db7bb423c75316366542f771a41923999a76a5771afad87dd65dceae", - "size": 217349888 + "checksum": "6d91ce741b8aa129fd43c2f844b39dcc1fec8cfd77e8e5a1ed0f0e7ba54cfea9", + "size": 205062416 }, "darwin-x64": { "binary": "claude", - "checksum": "a1bd2c782c3f961987d7d6456f75b3fa538cc425f1573908850afedcb038ca5f", - "size": 218914128 + "checksum": "bc71e2701a196c1eee65d0cda675f40118aaf11ce469831bb45092fc342527ff", + "size": 207568336 }, "linux-arm64": { "binary": "claude", - "checksum": "0919cdf512ca673b38230882b458801b78e9248eb472383631cfc12d8d0d55cf", - "size": 249367104 + "checksum": "8198e7c845a4f3806504b7350424158970c24c56724de400675d6597507d6183", + "size": 230471304 }, "linux-x64": { "binary": "claude", - "checksum": "9af15b9302ffde3fa83e3ea4a41cdd00158301cd8badc755567a8e9149f1c36c", - "size": 249178752 + "checksum": "ae29f87fdee2d42b5e9ff05c84256bf50a0e7edaa2d58975f9b4b2bd2c29897c", + "size": 230577872 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "78ffce2cad108ef1ca3301fc34307277b8a98e4095344b091b84be1678bd6ebc", - "size": 242092416 + "checksum": "a0fc2fc56e36e281bf2849c6edb7403fa2d97a4ca68d555cfa18c9232fdd7d8d", + "size": 223326040 }, "linux-x64-musl": { "binary": "claude", - "checksum": "f712c043f6df7552b95d30d256ebc4feb9c3a642f04b0e823719b524e3128939", - "size": 243444096 + "checksum": "35e6c7fd0e03717a74e3fe8b016ca7ee448131d3edf060f82164a573cb818449", + "size": 224971824 }, "win32-x64": { "binary": "claude.exe", - "checksum": "49204d250c5fe1797f74bc68f305016e72b356b06fe7ff1f8a651f7ad6a0df8b", - "size": 255085216 + "checksum": "4bb6443d136278fbb8acf637cdf3481e5db5c547a7f9bc4658dcd8630279dfe4", + "size": 226494112 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "d1b1336200468b5e29a0e4cc8c1dfc5c79d01f11118d8594756243bb6102dc40", - "size": 251148960 + "checksum": "83db287224382522157ecbb733f63f51cbc1fb5d048a3950ee2a05c779edbfb5", + "size": 222451872 } } } diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 1122b623877f..381a9baa1434 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "4.9.0"; + version = "4.10.0"; nodejs = nodejs_22; @@ -19,10 +19,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-O/Uz+eG8FT3nsXGRqcRdREXNaGlTpyVgUBmNsH7tLJA="; + hash = "sha256-EgGjlZ6Awg7SEC3ljPqii3wpq2SlXN/gARUJBSFcX0k="; }; - npmDepsHash = "sha256-aps8j9Vx1LZQAWHuWmnAusCJfAuzREM+GyKdybw+Hcc="; + npmDepsHash = "sha256-1v9c1525J7aS89PDdl6hWbYdn/DIM3G1BxFbpxu/F7E="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/cl/cli53/package.nix b/pkgs/by-name/cl/cli53/package.nix index fa58e37e73c6..f181f8d3e83b 100644 --- a/pkgs/by-name/cl/cli53/package.nix +++ b/pkgs/by-name/cl/cli53/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cli53"; - version = "0.8.22"; + version = "0.9.0"; src = fetchFromGitHub { owner = "barnybug"; repo = "cli53"; - rev = finalAttrs.version; - sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-ojLqveOZ8IIJXNd6PdXbqWYcwXqAjjEpKiquqXwcZt8="; }; - vendorHash = "sha256-LKJXoXZS866UfJ+Edwf6AkAZmTV2Q1OI1mZfbsxHb3s="; + vendorHash = "sha256-OpBeuIyyFOliVtN1z9Ll9ji2qNS41NvZBjL7vJvRe6E="; ldflags = [ "-s" diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index 3ae353c04a75..ac1d94cff029 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -3,22 +3,23 @@ stdenvNoCC, buildGraalvmNativeImage, fetchurl, - fetchFromGitHub, writeScript, writableTmpDirAsHomeHook, versionCheckHook, - testers, }: buildGraalvmNativeImage (finalAttrs: { pname = "clojure-lsp"; - version = "2025.11.28-12.47.43"; + version = "2026.02.20-16.08.58"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${finalAttrs.version}/clojure-lsp-standalone.jar"; - hash = "sha256-An7sTudpP2Ct32sYShNhgRsHgJJIN9H+sR5MlQ8i+7o="; + hash = "sha256-sSE/BIRT5CNc2ZS3LwSMLvQDVKLMlM1BIhKq6joX3c8="; }; + strictDeps = true; + __structuredAttrs = true; + extraNativeImageBuildArgs = [ # These build args mirror the build.clj upstream # ref: https://github.com/clojure-lsp/clojure-lsp/blob/2024.08.05-18.16.00/cli/build.clj#L141-L144 diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix index 799c9cb7e8c7..38a7216723ad 100644 --- a/pkgs/by-name/cl/cloudcompare/package.nix +++ b/pkgs/by-name/cl/cloudcompare/package.nix @@ -157,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://cloudcompare.org"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nh2 ]; + teams = [ lib.teams.geospatial ]; mainProgram = "CloudCompare"; platforms = with lib.platforms; linux; # only tested here; might work on others }; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 8bef9b3c12a9..590904c3e6f6 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "cnspec"; - version = "13.7.0"; + version = "13.8.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-YRQythakLR6dwd0vpyudcAwa7jHxBuWW+WOigVosRzM="; + hash = "sha256-z7Peg7UQnMhWHazDrHabDQ0Y2QlyTjA7XzuwVA8fdak="; }; proxyVendor = true; - vendorHash = "sha256-mcg9jh07ZvHxi/zuDWs9t3bxPW6zuAPzKTQYMtQ08/M="; + vendorHash = "sha256-F6EpksIF8aNcQEchp08DBa5ZwUFU3YusTkNBT1VjfFw="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix index c06b312e5ef9..c6b2596a8970 100644 --- a/pkgs/by-name/co/coal/package.nix +++ b/pkgs/by-name/co/coal/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coal"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "coal-library"; repo = "coal"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Ww1vAzKaCccBpBQU1hzI7Jk+oXw73zhnH594Xn9gbw="; + hash = "sha256-2fmu2VZJ+Fd87q2RpnJU61v6Lj2C9r5iweFrr1HwQQI="; }; strictDeps = true; diff --git a/pkgs/by-name/co/coc-cmake/package.nix b/pkgs/by-name/co/coc-cmake/package.nix index c50ab33dad33..22379cc0709c 100644 --- a/pkgs/by-name/co/coc-cmake/package.nix +++ b/pkgs/by-name/co/coc-cmake/package.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; pnpm = pnpm_8; - fetcherVersion = 2; - hash = "sha256-wQ9dcqY7BVXc7wpsHlYNpc7utL1+MkdTCu77Wh8+QWc="; + fetcherVersion = 3; + hash = "sha256-h/ND/665MpcPaDIR1Bb5iPrHmoNysr9vuFk1I0fFP34="; }; pnpmWorkspaces = [ "coc-cmake" ]; diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix index d06840f9562c..0f19b4d98902 100644 --- a/pkgs/by-name/co/coc-markdownlint/package.nix +++ b/pkgs/by-name/co/coc-markdownlint/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-markdownlint"; - version = "0-unstable-2026-04-01"; + version = "0-unstable-2026-05-01"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "9a92eef6adbd6ba7b1afe50bd9a3c82b94902c51"; - hash = "sha256-5pfsaZFA1OYwREB3FqyUQY4D47dKH22pQV8dBgPiipo="; + rev = "91345f973c7fde3e72f95bc7648043c35e23e007"; + hash = "sha256-Uj+PKaihRaWybWvt82Aenmt1/seTsJwgb4LSF+gIAc0="; }; - npmDepsHash = "sha256-J6gYA3eP2PWK3kesJDL5tqHOY/j2PoC+uhVxpeYVnsk="; + npmDepsHash = "sha256-J5LHaKrtQeYiIU06rargZrQX5P4ABP0cP0wuPHIRzjw="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index 3f1a1d4e7c9c..f2f4987762b4 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2026-04-14"; + version = "0-unstable-2026-05-01"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "3a82969c169b9d71b51e74fe8841d1f04326725d"; - hash = "sha256-8/wgdlM4US5R6xOYFD4uP6gEeRfJsjDwwCz3BIUpoFI="; + rev = "9bfd30f3ab029c31f1c012b12156bdac9a0d0351"; + hash = "sha256-JrR7nf6xQxzGHrOp1dof6GLOcH6BSiAd79RcgsUUU24="; }; - npmDepsHash = "sha256-+3eXdiM0Nll7V6EnDXq88rBjRkPN6GLFASdJ3fMXbq4="; + npmDepsHash = "sha256-1+U4XG3zciSnVh8Syff/hZgSPBdwDfgf9KQFURJAddQ="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index 24a424fc3d4e..58bf2eff76a6 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-files"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-files"; tag = finalAttrs.version; - hash = "sha256-RoAlZ3PIJHdF2kBnrBnbJqnwl7/C7po7pvI3xmsRFQc="; + hash = "sha256-Mofw8hn/+NtkqFqe2MDI+hp/MyTwXDteY/hv3GofIPs="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix index 579061932ba3..868a576c4620 100644 --- a/pkgs/by-name/co/cockpit-machines/package.nix +++ b/pkgs/by-name/co/cockpit-machines/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-machines"; - version = "351"; + version = "352"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-machines"; tag = finalAttrs.version; - hash = "sha256-zZ1R6DE7Y+kKnYQFIDGLdwn7ELq4kIvGvtQXaSxxdKI="; + hash = "sha256-wDDskuvGVq5MWvi+3+3OXpaswPvea8+NDcic70GiYkg="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index 2b2630de8f5c..275ea5eccf51 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-podman"; - version = "124"; + version = "125"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-podman"; tag = finalAttrs.version; - hash = "sha256-20dGvEJraTxJlj5Z9HbPWtWN96XPVwbCkHGzX4uiDmk="; + hash = "sha256-8YKqcm+IEhZwCPdNrMceAXdoBRS5xyRxrQM1FDNCANk="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-zfs/package.nix b/pkgs/by-name/co/cockpit-zfs/package.nix index 134cd2a35477..70b099943166 100644 --- a/pkgs/by-name/co/cockpit-zfs/package.nix +++ b/pkgs/by-name/co/cockpit-zfs/package.nix @@ -1,6 +1,7 @@ { acl, bash, + buildPackages, cockpit, coreutils, fetchFromGitHub, @@ -13,6 +14,7 @@ makeWrapper, mbuffer, msmtp, + nix-update-script, nodejs, openssh, samba, @@ -28,21 +30,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-zfs"; - version = "1.2.12-2"; + version = "1.2.16"; src = fetchFromGitHub { owner = "45Drives"; repo = "cockpit-zfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-oeXSOxogfAazRsKfngq2+DOyo//wRJQSqm7gaCza4WY="; + hash = "sha256-d1wurTha4LIe01oogJZHfLdTvBnEsNG9sGO8CfyS+GE="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/45Drives/cockpit-zfs/blob/main/package.json#L13 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; - offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-YnR1SqBGnxEQaGUGMNTHHEGcOIhuGbWnqMdr4eRGXcA="; + # Use buildPackages for cross-compilation support + offlineCache = buildPackages.yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-Tdxe5bXN9psSrnUXL1f+1nh4WPzuvOI7j0I+VPU2/1s="; }; nativeBuildInputs = [ @@ -50,9 +59,13 @@ stdenv.mkDerivation (finalAttrs: { nodejs jq yarn-berry - yarn-berry.yarnBerryConfigHook + buildPackages.yarn-berry.yarnBerryConfigHook ]; + disallowedRequisites = [ finalAttrs.offlineCache ]; + + passthru.updateScript = nix-update-script { }; + passthru.cockpitPath = [ acl bash @@ -82,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; }; - patchPhase = + postPatch = let # houston-common-lib has @types/electron which pulls in electron. # Electron's postinstall downloads binaries, which fails in sandbox. @@ -91,8 +104,6 @@ stdenv.mkDerivation (finalAttrs: { houstonUiDir = "houston-common/houston-common-ui"; in '' - runHook prePatch - # Remove electron type dependency substituteInPlace ${houstonLibDir}/package.json \ --replace-fail '"@types/electron": "^1.6.12",' "" @@ -116,8 +127,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "VueDevTools()," "" \ --replace-fail "import dts from 'vite-plugin-dts'" "" sed -i '/dts({/,/})/d' ${houstonUiDir}/vite.config.ts - - runHook postPatch ''; buildPhase = '' diff --git a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch b/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch new file mode 100644 index 000000000000..2d23ed3e118c --- /dev/null +++ b/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch @@ -0,0 +1,11 @@ +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 14bfa8fe51d4..55d6fed592a4 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - asciidoc, + asciidoctor, autoreconfHook, bashInteractive, cacert, @@ -53,18 +53,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "360"; + version = "361"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-nxucAln5iBRORgLtgslenBNxp6gCd7FauDbb3X7/3xQ="; + hash = "sha256-/OaFNUUz6W1du9b7esEz1VHtx7MEphbXhyybyWwPc2Y="; fetchSubmodules = true; }; nativeBuildInputs = [ - asciidoc + asciidoctor autoreconfHook makeWrapper docbook_xml_dtd_43 @@ -171,11 +171,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/usr/lib/polkit-1/polkit-agent-helper-1" "/run/wrappers/bin/polkit-agent-helper-1" ''; - preConfigure = '' - # Make sure our Python comes before any other Python (e.g. from asciidoc) - export PATH="${lib.makeBinPath [ python3Packages.python ]}:$PATH" - ''; - configureFlags = [ "--enable-prefix-only=yes" "--disable-pcp" # TODO: figure out how to package its dependency diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index 1ca57d0bd915..72c1c59cd855 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.38"; + version = "0.3.39"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-dePa6QgpyY4xyK8VSzlbo1MDi3WMXSaT9X2six8dKGU="; + hash = "sha256-u0BFbG7Vq2dIIJIlXe2rlNPD6iUVnb3uM95bLBg9CEU="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-kR1XhVWOFKvJ9Fy8PZTQP/YwXKtpJL31BqzHBxGNbhY="; + cargoHash = "sha256-Tx2KxtUjQpJa2WDUlFQoNZItKowGv09ZTGytFuxL0yc="; env = { CARGO_PROFILE_RELEASE_LTO = "fat"; diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index 04b17ef411ac..e32beee8a39f 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -11,9 +11,9 @@ librusty_v8 ? callPackage ./librusty_v8.nix { }, }: let - # codex-acp 0.12.0 pins openai/codex rust-v0.124.0 in Cargo.lock. - codexRev = "e9fb49366c93a1478ec71cc41ecee415a197d036"; - codexHash = "sha256-YFnzzwCm9/b30qLDMbkf/rEizuTjeqdCgoBZeS0wNBo="; + # codex-acp 0.13.0 pins openai/codex rust-v0.128.0 in Cargo.lock. + codexRev = "e4310be51f617f5e60382038fa9cbf53a2429ca4"; + codexHash = "sha256-v2W0eslPOPHxHX76+bnkE/f4y+MnQuopeOoAC5X16TA="; codexSrc = fetchFromGitHub { owner = "openai"; repo = "codex"; @@ -23,21 +23,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "codex-acp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "zed-industries"; repo = "codex-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-qPqg95FpXHBtyHBJtrfJUwu9GokfmOJgKgqLKQ48u+8="; + hash = "sha256-8Mz3xPhGSjaucZ9c0etGOe4JJC8vJhGFOnAhkwXmhyY="; }; - cargoHash = "sha256-/BZ82qiTy/mPwhf5v5CFrNSB6AxCRFdmHB72L0+KjJw="; + cargoHash = "sha256-kneMay6MGXhHA0q/usKsLFs/YKmdSHmrgSthzhaPgbk="; - # fetchCargoVendor only keeps the individual git crate subtrees, so restore - # the workspace-root file that codex-core includes via ../../../../node-version.txt. + # fetchCargoVendor only keeps the individual git crate subtrees. Older Codex + # crates included this workspace-root file from codex-core. postPatch = '' - cp ${codexSrc}/codex-rs/node-version.txt "$cargoDepsCopy/source-git-0/node-version.txt" + if [ -e ${codexSrc}/codex-rs/node-version.txt ]; then + cp ${codexSrc}/codex-rs/node-version.txt "$cargoDepsCopy/source-git-0/node-version.txt" + fi ''; env = { diff --git a/pkgs/by-name/co/codex-acp/update.sh b/pkgs/by-name/co/codex-acp/update.sh index 401c252abe13..2a8328e7bcf5 100755 --- a/pkgs/by-name/co/codex-acp/update.sh +++ b/pkgs/by-name/co/codex-acp/update.sh @@ -88,7 +88,15 @@ update_codex_pins() { local tmp tmp="$(mktemp)" - awk -v codex_rev="$CODEX_REV" -v codex_hash="$CODEX_HASH" ' + awk \ + -v latest_version="$latest_version" \ + -v codex_tag="$CODEX_TAG" \ + -v codex_rev="$CODEX_REV" \ + -v codex_hash="$CODEX_HASH" ' + /# codex-acp [^ ]+ pins openai\/codex rust-v[0-9.]+ in Cargo.lock\./ { + comment_count++ + sub(/# codex-acp [^ ]+ pins openai\/codex rust-v[0-9.]+ in Cargo.lock\./, "# codex-acp " latest_version " pins openai/codex " codex_tag " in Cargo.lock.") + } /codexRev = "[0-9a-f]+";/ { rev_count++ sub(/codexRev = "[0-9a-f]+";/, "codexRev = \"" codex_rev "\";") @@ -99,6 +107,10 @@ update_codex_pins() { } { print } END { + if (comment_count != 1) { + print "Failed to update codex pin comment in package.nix" > "/dev/stderr" + exit 1 + } if (rev_count != 1) { print "Failed to update codexRev in package.nix" > "/dev/stderr" exit 1 diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 70cac402140c..b6bf755739f2 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.128.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-v2W0eslPOPHxHX76+bnkE/f4y+MnQuopeOoAC5X16TA="; + hash = "sha256-YeUeYbzUMUx0lhIKdtPa8vUYK2Cj1hmbLb68Y80r71o="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-3NQ4UCfBpANhyoJJatd8m31cEugsd42Ye2BXuzlKC0c="; + cargoHash = "sha256-cpkj7H/jkKGbfJ92Ty9peqfxibFw2aWWG64tmgeG+2o="; # Match upstream's release build for the codex binary only. cargoBuildFlags = [ @@ -55,12 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # to use the shared library instead substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" - - '' - # Keep upstream's release profile on Darwin. Without LTO/codegen-units=1, - # the aarch64-darwin binary grows enough for ld64 to hit ARM64 branch range - # limits while linking codex-cli. - + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace Cargo.toml \ --replace-fail 'lto = "fat"' "" \ --replace-fail 'codegen-units = 1' "" diff --git a/pkgs/by-name/co/contact/package.nix b/pkgs/by-name/co/contact/package.nix index 723110af352f..e6ad0ba8ade2 100644 --- a/pkgs/by-name/co/contact/package.nix +++ b/pkgs/by-name/co/contact/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "contact"; - version = "1.5.7"; + version = "1.5.8"; pyproject = true; src = fetchFromGitHub { owner = "pdxlocations"; repo = "contact"; tag = finalAttrs.version; - hash = "sha256-nuhlxKE6o2kNMz5VRV0SIY4Hee5thBbV71Ex6mM1AXo="; + hash = "sha256-YNDw/lAPuJIyK6abRnl5WOyv8+t/PTtmBvFWu7NTVwY="; }; dependencies = [ python3Packages.meshtastic ]; diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index 03bce4355a9d..f48c185548db 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-vOZnVCz5lFdVD2qmlHdTRxzuEjpR3W/rXfzvjvdOh9E="; + fetcherVersion = 3; + hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/corepack/package.nix b/pkgs/by-name/co/corepack/package.nix index 5f6644896f49..b7b3845f2976 100644 --- a/pkgs/by-name/co/corepack/package.nix +++ b/pkgs/by-name/co/corepack/package.nix @@ -7,7 +7,6 @@ fetchFromGitHub, nix-update-script, versionCheckHook, - fetchpatch2, writeScriptBin, }: @@ -30,6 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { # We can use the built-in SQLite module instead (and skip the installCheck phase on version of # Node.js that do not have built-in SQLite support). ./use-builtin-sqlite.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/nodejs/corepack/blob/main/package.json#L19 + ./yarn-4.14-support.patch ]; nativeBuildInputs = [ @@ -49,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { patches src ; - hash = "sha256-cmY6e29ryLs0psZ/TEqRfs4RdB7eCzfXU7aUH+yCE/s="; + hash = "sha256-WIXXaam6OoIQrAUiLtF/Fst3vYTFj3mqBr7UxhUcXMI="; }; postPatch = '' diff --git a/pkgs/by-name/co/corepack/yarn-4.14-support.patch b/pkgs/by-name/co/corepack/yarn-4.14-support.patch new file mode 100644 index 000000000000..2d23ed3e118c --- /dev/null +++ b/pkgs/by-name/co/corepack/yarn-4.14-support.patch @@ -0,0 +1,11 @@ +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index f7754c7dff69..df3f4af94c53 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,19 +11,19 @@ buildGoModule (finalAttrs: { pname = "coroot"; - version = "1.17.9"; + version = "1.19.7"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${finalAttrs.version}"; - hash = "sha256-hr1t3WaYEOYnj3Cam2NGgiGD49Vr9HBkz4JmOlJxzQQ="; + hash = "sha256-eMN0n+kXN49o7oCjWAa3kPDAEksvGroRLrfFEVdPORE="; }; vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A="; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/front"; - hash = "sha256-6a8eOPgAdpZpdXmrHVw/twfikjjWHSy/BdYdlyRQkjc="; + hash = "sha256-5N4dmtKdZgwulqxFHYKhnHOYAg0gnb/rzVVcmzjYFUg="; }; nativeBuildInputs = [ @@ -43,6 +43,9 @@ buildGoModule (finalAttrs: { npm --prefix="$npmRoot" run build-prod ''; + # required for tests + __darwinAllowLocalNetworking = true; + meta = { description = "Open-source APM & Observability tool"; homepage = "https://coroot.com"; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index acb6ab6403a9..baf172b48f90 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-+E7d8I9xKaTzJzVlJhPb23ak8M9wgjnB6rwYFdpnjcs="; + hash = "sha256-8/9Cj30bAxxtMhqFgWvYJiuApDNgclPPTYh7aNR6OAs="; }; - cargoHash = "sha256-uxz6kMuxhDTehHxDcA43iO+zVHBofbtO6HZoWEf3E30="; + cargoHash = "sha256-gA+dpodk6u8dv9VaKNi/xzI8ys39iztQdia+eGkzXs4="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index ed00811f5cfb..f331ee49a2f9 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-+ewcDeRskge8mgGo7b9rf0i0vg+mdR3iwK/LF38UTvM="; + hash = "sha256-deE9xXvRSZWSEdKPJr1HuA/gVs0a22lAVRmUnhwpDJM="; }; - cargoHash = "sha256-Cd4tNG+qXYwCUKIXnE5+LzaCBmRJnDWrI1uGwFiFhWA="; + cargoHash = "sha256-uR0wm2+zmcec3esfYwgq4pRqSHkZnd3O8XhgnANf/1Q="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 81f68f77e579..75b780b65c95 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-f8XVAxxP+RdsVaVKqicZBkZiGXPCMfpP6Z4sBDeoYyo="; + hash = "sha256-E4OWxoGyRNFcMl7ni7PB6PE0Yl7dE+Wd4JGDMHO94Yw="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg" ''; - cargoHash = "sha256-ahz/isgQpt48lWQM4V7Y4NwUlyX8+tW9LHNxZJe3SD4="; + cargoHash = "sha256-xXq8Dckg3YOf2AT9uOZqVfq00FhZp/X5UU8hLmAln1U="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index f4aa7b67143a..dfc8da54c91f 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-eFUvLBk+EkemDWJk7A0bd3R0fip31u2zqjmKKVim8Y0="; + hash = "sha256-C0s0u7g2LlLccaHsZLHvFs4JAPzQboEcqtwe0x8SVO4="; }; - cargoHash = "sha256-80xojIrLd8Foxu9Qbf/cCImP4T4I7otA1iJbr7/lEb8="; + cargoHash = "sha256-G2/nVy9I4iGZiG3+uVMnnqj82Wg2s5/SmNyQERqDhXY="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 0a336fc306fa..7d68865c1e85 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-L4OtNqcvXMjQZtt26H+NIh6bzgDoFlyZuViXoG9RdaI="; + hash = "sha256-ucDMl2qX7NApWxrfn4vk5eWrlESZNLBZCsR/tK0zwkI="; }; - cargoHash = "sha256-Qs+THwbp6TNcSzO33Y0j/o8WP9E5ti0HCxknOo7h1H0="; + cargoHash = "sha256-iWZRxn0puWwAibjbj/jdk4t6qgETEUJUv612RZSavMw="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix index 640e66019f9b..74b437417ebe 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-sysinfo"; - version = "0-unstable-2026-04-16"; + version = "0-unstable-2026-05-04"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-sysinfo"; - rev = "3a22684788b839ead634b8abb6ab2296296dba9d"; - hash = "sha256-7gqf1m7jlsuzadsELDJL7XwYlpdmEhHYG5FEFsI3HRU="; + rev = "fd12d6b638d7033756250ce5cfd82313bdca4124"; + hash = "sha256-DN/7N2I32PCC4RvmhvYn8iwVd/yk6nefhFBEZ8c6mRI="; }; - cargoHash = "sha256-vD90KMBI1bQTwazVnEMFo3eKXmLLI9QswdIwz+XoDho="; + cargoHash = "sha256-ogFEENZxj4ifLbqKL+gimcAMX1REp2oEohY0MqM6Jsg="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 166ae96b3d89..0f552ae1f95b 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-cPnsnn9VLyTFA9htsovboDygt7NEAr9XdrJsP45bE08="; + hash = "sha256-q9dNpSjwvqWTGaWg9VA4zJXQo8+YiYJ4qo/Ev4Nk4IY="; }; - cargoHash = "sha256-DB5u0MSdrxYIGcndbyUUeNPuXXN0OScd519XBxB1lLg="; + cargoHash = "sha256-tMSqyl75XK2rgqRtgHAPtr+KFotx61HGqzv0iqzakS8="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index a7c47b818d02..75473be3d5ba 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,17 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-59t0jKXspmhwnTYPa96tNkYrOuCFZ80g/VJsyrZ0s10="; + hash = "sha256-mfgIVi/o5O715IX7Wt8QHfxzBX6ye+wztWU/GHaj9C0="; }; - cargoHash = "sha256-MZmbwmc1DPCZ9g4OM9gy0IuXgy/zxreujEYY3Ji5Ad8="; + cargoHash = "sha256-jhugV3eF7g6WU5ez3LzqKc/wP952Zpi8Hplg9SZflns="; env.VERGEN_GIT_SHA = finalAttrs.src.tag; diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 3b1bc8237b88..0bc5a0168044 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,14 +9,14 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-h6vnOL3T4o2VDoQ5vLGg3s6nMYcPKysI5RxbjnbnCFI="; + hash = "sha256-3owl4M4vRyzjR4v74clyAxpNDu77rieSpYAVYfADHzY="; }; nativeBuildInputs = [ just ]; diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index e09dca350c55..6619478f8376 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index ab06d9cd4256..e590dd9356ed 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,17 +14,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-wq0uqS0gNM4w6E+1pTPU6C8Mx4j8/MNp+0Oiw1kbwck="; + hash = "sha256-GyLh7vucn62SpxolYNjJodkb41BT1CDZdEa/TasJXYM="; }; - cargoHash = "sha256-Kj+eaTMHMQQHN0X3prIuZm1wvfnaV7BUlUKem6JLtc8="; + cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY="; buildFeatures = [ "nixos" ]; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index 8f1ccd36a539..a44c59b15cb3 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-g2j0rh/gNe30DXSjPaGE8HH2aQ0tOW0wimSUt5D08yo="; + hash = "sha256-pyfRGiVyXJPLoLdaeo7/TaW6+jm43SoPKk04NJLfLvc="; }; - cargoHash = "sha256-KsiW+/WYKCfoUJB++ov0FGcmZhew2NjvzkBlcH/Vubw="; + cargoHash = "sha256-wZgxlq9MVCeESH093MaQybVMyq50L7aYwj//2r/B0QM="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index eb409e186074..cf05ef1f18d6 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-/q+OIkKxqsLK2b9jjwDyVEkdNy0Xav3t4DicD3GeQD8="; + hash = "sha256-84e+idGKYDBerS84Cl9jPc/Z9RzuVvND7nHzmApsrgA="; }; - cargoHash = "sha256-+yNXOKZYWoR3yK1ulNRStJZbNTEDsKErL1N1wNiYsOM="; + cargoHash = "sha256-EIwYabYWSHTMnNFcammidn3bI4fc6JFdcVkGj7RmWqA="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index a788c0a1a9cc..6f7a39f84a7e 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-TniUR2CwqHkouQ1OPYi8z3jxDiXJoWYqUjheKtmggD8="; + hash = "sha256-XpjU0Pad/xUK1vnpq4qT4UmfkBH8yuiOaC4EZWiphkE="; }; - cargoHash = "sha256-Q6nsaYlAZwSoANsrrdaIrNdnzaJiBRMUzZdbtHLupio="; + cargoHash = "sha256-1YRWWI2qhCI0GrxBAAkGT/AbtkTHgdbYsG8obriZ+zg="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 7b4aa8c5fbe0..e0dff5e9e822 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-QbdLYJMe1jxBb5c2LsQXwfURNldkR+WAYq+7fpoXJJU="; + hash = "sha256-1yry1cA/friBzyE6LH3G6rd8ZzBPt5aTGWVzATO839Y="; }; - cargoHash = "sha256-vXmLoyHtHvzy47CZvtCEeyyZrYCc+RciE54OKwqJiBw="; + cargoHash = "sha256-vU++jreNHCRjxyyoj53LB2Sa7cdVUWGAvECcqoDofF8="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 3c5e81c42d8d..6aaaf42d43b9 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-VmOTEpnDic2PMEhmFNDXz7CHw3MdInZXZlp237BU+jY="; + hash = "sha256-74iYH1jW5Tau9enem0SeLLTnWhaa/+ow1m3hvGfOt9c="; }; - cargoHash = "sha256-FyvBjJEwluKFZtFYByd4aeMhtLHKjnoAa+qIaOUS0vE="; + cargoHash = "sha256-YPxbOSz/E3hoMT4dutk60jWJMpJHqOWpCSA91b+mHaE="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 93aac664a948..64d833e3aad7 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index ea37323fbf71..ccbb1e64b857 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-w7UySGvCibxDEyu/LBckvHDruOH3v1IVoKezgvt0zak="; + hash = "sha256-vWLjMAyR2vgOGfIYZQFYPWGHx+T1ZrWAztm60qdHgBk="; }; - cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o="; + cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index a26d15b46c68..b4b5a8054fec 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-t7BUBJ9MjTSd2rSkKtiYkltbfcpOcXl2smXxV84l3GY="; + hash = "sha256-ugVj4SIO77Fw9ET4zIyK3OJaRFH3ujbQBJ57Vc+f2Ao="; }; - cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4="; + cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A="; postPatch = '' substituteInPlace data/start-cosmic \ diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 803520857390..4c8e862d5435 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 73136945a57d..c13ed1b1fb05 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,17 +27,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-/gFJvV5v4T30mkA8ppSc/kevwwR1RgIXWMGI+HmxK+U="; + hash = "sha256-NRaavbpNUh4sSHwW0seSpJFBbH06nmKiofoJ4cmQFcY="; }; - cargoHash = "sha256-Nxc9VYtyG1avv1a32IZjsNQIQo5WmRJzjMEcf20B06s="; + cargoHash = "sha256-O6d47H+vcSn9G6EIMpSshfL+cBJWZMYXHHKsu2n/huk="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 268f12f884a8..f6dc3b86df48 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-miR50DtNaUOOoVZ25vD0WuQ+PN/8DYy2cPFGcUE7Y+Y="; + hash = "sha256-oybxrzKofTbw8u8KMvcU0kODKZ3ttPtSfcoXRjgLq6s="; }; - cargoHash = "sha256-AsppupxVQlzKbdd+qt9oMZa3flcpC8fUwN3Lw0cgzW8="; + cargoHash = "sha256-DCqEXoJ1qTwKemSCGe7AwQCdOFw7Qh3PoxbB9XdLfHk="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 5c5a3b3967ed..af483dfd11fe 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Hb5FMJH5P/kQZ7Ess6fAVYoR7EVFyH019bI3+YSHPdw="; + hash = "sha256-GpbLNr6B16hy7emdkjDfzOFfGgMOz6vfmmhCSL7lR5c="; }; - cargoHash = "sha256-MS0yUwg/MAtHq6YgxfikAbEUwLmx5OrLnsrle3MlIpg="; + cargoHash = "sha256-9iHcmImA2tscpRuRKE/nUrwhR5RU5xA2zxJpcDt+2sE="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index 4a724d8b8edb..c27c8e18db3f 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 1c80ed47ea17..ec2bb120e7a1 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-pzIRH/AQwUllvJxL3u6P+wTM8ndhsbYQhABFNSrvGmE="; + hash = "sha256-WYPVzFKMJ3Xhubr0rWW/u9Ex5NwuG2ZjSio6iWJwbCc="; }; - cargoHash = "sha256-wdRUvjeRLxJzF2g8+Q+O5KPA3b2DimE0pluvxEuyDps="; + cargoHash = "sha256-Z5dC3W8QoDBZWBjHwRj9MC8EScDjQwUiUcOPTRDToDA="; separateDebugInfo = true; diff --git a/pkgs/by-name/cp/cpeditor/package.nix b/pkgs/by-name/cp/cpeditor/package.nix index 839d49adf4a8..d6320e3be7e4 100644 --- a/pkgs/by-name/cp/cpeditor/package.nix +++ b/pkgs/by-name/cp/cpeditor/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitHub, - libsForQt5, + qt6, + kdePackages, pkg-config, cmake, ninja, @@ -12,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpeditor"; - version = "7.1.1"; + version = "7.1.1-unstable-2026-04-07"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; - tag = finalAttrs.version; - hash = "sha256-zEK3137DjQmuc7Y4c/HF0n37bdokj9ci2/agSaG7nZE="; + rev = "912784abcbfb38d70911c45d15a308c339894cec"; + hash = "sha256-udpDsYve1QIQTT75Xk8HHBV1lTTTjauDMyfJKbShgEs="; fetchSubmodules = true; }; @@ -26,13 +27,15 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook python3 ]; + buildInputs = [ - libsForQt5.qtbase - libsForQt5.qttools - libsForQt5.syntax-highlighting + qt6.qtbase + qt6.qttools + qt6.qt5compat + kdePackages.syntax-highlighting ]; postPatch = '' diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 730292092ede..c1b4eda08e07 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2026-04-28"; + version = "0-unstable-2026-04-30"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "e829e80faba35db623b5e272c867ad72146adcda"; - hash = "sha256-0xLxkGiUVWY+8X8ahQC5hvAKjkEQ5Blv8kNqJHPwezg="; + rev = "3681f0ce1446167d01dfe125d6db96ba2ac31c3c"; + hash = "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cpu-info"; maintainers = with lib.maintainers; [ pawelchcki ]; pkgConfigModules = [ "libcpuinfo" ]; - # https://github.com/pytorch/cpuinfo/blob/e829e80faba35db623b5e272c867ad72146adcda/CMakeLists.txt#L98 + # https://github.com/pytorch/cpuinfo/blob/3681f0ce1446167d01dfe125d6db96ba2ac31c3c/CMakeLists.txt#L98 platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv; }; }) diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix index be5f87c143ce..5b84bb8f7510 100644 --- a/pkgs/by-name/cr/crd2pulumi/package.nix +++ b/pkgs/by-name/cr/crd2pulumi/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "crd2pulumi"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-0D5U3Ie9h5R0kTLb5YHshtYrwuoXxPX0fYAJGqUw35w="; + sha256 = "sha256-0BnDN1D1g/LdYqLw1It5a/jG2g6/kBb4F64NEI5xFeA="; }; - vendorHash = "sha256-mO1DgyasJFYpRxeTd8Dinn1mcddCjTiUqs54WD31V/w="; + vendorHash = "sha256-cbJ0jZtJhVz3b1jdsLiwNBHqRUHk29haJ+YzShcTfJg="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/cre2/missing-header-include-pr-34.patch b/pkgs/by-name/cr/cre2/missing-header-include-pr-34.patch new file mode 100644 index 000000000000..8c087dcec4c5 --- /dev/null +++ b/pkgs/by-name/cr/cre2/missing-header-include-pr-34.patch @@ -0,0 +1,20 @@ +From 7c83c012b33a16b11e3547894118fc013ec23ca0 Mon Sep 17 00:00:00 2001 +From: Willy +Date: Tue, 5 May 2026 13:50:44 +0200 +Subject: [PATCH] add missing cstring include + +fails on newer compilers/toolchains without +--- + src/cre2.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cre2.cpp b/src/cre2.cpp +index 5a63b93..3b1ec21 100644 +--- a/src/cre2.cpp ++++ b/src/cre2.cpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include diff --git a/pkgs/by-name/cr/cre2/package.nix b/pkgs/by-name/cr/cre2/package.nix index 43b106f29418..9fd65596d1bb 100644 --- a/pkgs/by-name/cr/cre2/package.nix +++ b/pkgs/by-name/cr/cre2/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; + patches = [ + ./missing-header-include-pr-34.patch + ]; + nativeBuildInputs = [ autoreconfHook libtool diff --git a/pkgs/by-name/cr/creduce/fix-gcc15.patch b/pkgs/by-name/cr/creduce/fix-gcc15.patch new file mode 100644 index 000000000000..42bd32aae05d --- /dev/null +++ b/pkgs/by-name/cr/creduce/fix-gcc15.patch @@ -0,0 +1,53 @@ +From 1c715fef9113d5a5291694eab739d4a743ab08d5 Mon Sep 17 00:00:00 2001 +From: Bradley Walters +Date: Fri, 2 Jan 2026 22:02:30 -0800 +Subject: [PATCH] unifdef: constexpr is reserved in C23 + +--- + unifdef/unifdef.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/unifdef/unifdef.c b/unifdef/unifdef.c +index 5c67cd44..692a1640 100644 +--- a/unifdef/unifdef.c ++++ b/unifdef/unifdef.c +@@ -201,7 +201,7 @@ static int depth; /* current #if nesting */ + static int delcount; /* count of deleted lines */ + static unsigned blankcount; /* count of blank lines */ + static unsigned blankmax; /* maximum recent blankcount */ +-static bool constexpr; /* constant #if expression */ ++static bool isconstexpr; /* constant #if expression */ + static bool zerosyms; /* to format symdepth output */ + static bool firstsym; /* ditto */ + +@@ -1078,7 +1078,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + *valp = (value[sym] != NULL); + lt = *valp ? LT_TRUE : LT_FALSE; + } +- constexpr = false; ++ isconstexpr = false; + } else if (!endsym(*cp)) { + debug("eval%d symbol", prec(ops)); + sym = findsym(&cp); +@@ -1095,7 +1095,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + lt = *valp ? LT_TRUE : LT_FALSE; + cp = skipargs(cp); + } +- constexpr = false; ++ isconstexpr = false; + } else { + debug("eval%d bad expr", prec(ops)); + return (LT_ERROR); +@@ -1162,10 +1162,10 @@ ifeval(const char **cpp) + long val = 0; + + debug("eval %s", *cpp); +- constexpr = killconsts ? false : true; ++ isconstexpr = killconsts ? false : true; + ret = eval_table(eval_ops, &val, cpp); + debug("eval = %d", val); +- return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); ++ return (isconstexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); + } + + /* diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/by-name/cr/creduce/package.nix similarity index 89% rename from pkgs/development/tools/misc/creduce/default.nix rename to pkgs/by-name/cr/creduce/package.nix index 23d88f07cdcb..03f135937da5 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/by-name/cr/creduce/package.nix @@ -4,13 +4,15 @@ fetchFromGitHub, cmake, makeWrapper, - llvm, - libclang, + llvmPackages_18, flex, zlib, perlPackages, util-linux, }: +let + llvmPackages = llvmPackages_18; +in stdenv.mkDerivation { pname = "creduce"; @@ -23,6 +25,11 @@ stdenv.mkDerivation { hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA="; }; + patches = [ + # https://github.com/csmith-project/creduce/pull/290 + ./fix-gcc15.patch + ]; + postPatch = '' substituteInPlace {clex,clang_delta,delta,unifdef,creduce,.}/CMakeLists.txt --replace-fail \ "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" @@ -39,14 +46,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper - llvm.dev + llvmPackages.llvm.dev ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - llvm - libclang + llvmPackages.llvm + llvmPackages.libclang flex zlib ] diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 775871d8567b..3148f4e442e7 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.2"; + version = "10.4.3"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-JZV02QZAS4OhnFdEB/EKm2FL0o4VmNSJIWNBdmIIdrE="; + hash = "sha256-cQgGs4vv7RGa9reM3QoYDW6PdREx+rIzg4uXXrahPSg="; }; - vendorHash = "sha256-/qPBHpCdEu1uBFFwE7uzmCcm4EL8TxUWdjiaFlUSxIU="; + vendorHash = "sha256-qS+jjchXysIj4ZcZoUWg8W0uyYTYPPy8DdhZEP/uZGg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cr/crow-translate/package.nix b/pkgs/by-name/cr/crow-translate/package.nix index 073d2722bd44..45d7939ad4c5 100644 --- a/pkgs/by-name/cr/crow-translate/package.nix +++ b/pkgs/by-name/cr/crow-translate/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, cmake, - extra-cmake-modules, leptonica, qt6, tesseract, @@ -33,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules qt6.qttools qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/cs/cspell/package.nix b/pkgs/by-name/cs/cspell/package.nix index 0b95ce09471e..f08cdbd5bca9 100644 --- a/pkgs/by-name/cs/cspell/package.nix +++ b/pkgs/by-name/cs/cspell/package.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; pnpm = pnpm_10; - fetcherVersion = 2; - hash = "sha256-EKnczZ/7O2ZMaSlIFfLk9WXyf/ubynhmecs+IyIoTHw="; + fetcherVersion = 3; + hash = "sha256-eQ9KiRSwWmfhCinYVP4ulQdAG6SOd9yyyOUWSwc5TV8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ct/ctre/package.nix b/pkgs/by-name/ct/ctre/package.nix index 7c62280763bb..fc590b6a21c3 100644 --- a/pkgs/by-name/ct/ctre/package.nix +++ b/pkgs/by-name/ct/ctre/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ctre"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${finalAttrs.version}"; - hash = "sha256-/44oZi6j8+a1D6ZGZpoy82GHjPtqzOvuS7d3SPbH7fs="; + hash = "sha256-YtshxSdVT9V9V0KcYF+9NtgW0kYUCQ4I9EbcWNajuxI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index fab552cdcd88..ab3c587a7e77 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2026-04-22"; + version = "0-unstable-2026-05-06"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "a37dadd1ed5949ab0accd7087b7c5c57800eab43"; - hash = "sha256-JUHuigIhXDF1pFGbkIp6ZKQhCpa/w2LL7HK4IpCYiek="; + rev = "6ad18e2b523a2c721ee1ed8ad0940521a19f5f84"; + hash = "sha256-Q+UepE/mNIKBvltLKr1RGmuP7ulVd5sxHwaVCeb0BzM="; }; outputs = [ diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix index 631f1cf9cc15..87fb51f50e30 100644 --- a/pkgs/by-name/cu/cubelify/package.nix +++ b/pkgs/by-name/cu/cubelify/package.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { wrapProgram $out/bin/cubelify \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${contents}/cubelify-overlay.desktop -t $out/share/applications/ - install -Dm444 ${contents}/cubelify-overlay.png -t $out/share/pixmaps/ + install -Dm444 ${contents}/cubelify-overlay.png -t $out/share/icons substituteInPlace $out/share/applications/cubelify-overlay.desktop \ --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=cubelify' ''; diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index d81886fcebcf..45e51e985f56 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -5,7 +5,9 @@ stdenv, installShellFiles, testers, + tests, callPackage, + pkgs, }: buildGoModule (finalAttrs: { @@ -38,17 +40,27 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/cue completion zsh) ''; - passthru = { - writeCueValidator = callPackage ./validator.nix { }; - tests = { - test-001-all-good = callPackage ./tests/001-all-good.nix { }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "cue version"; - version = "v${finalAttrs.version}"; + passthru = + let + cue = finalAttrs.finalPackage; + writeCueValidator = callPackage ./validator.nix { inherit cue; }; + in + { + inherit writeCueValidator; + + tests = { + validation = tests.cue-validation.override { + pkgs = pkgs.extend (_: _: { inherit writeCueValidator; }); + }; + + test-001-all-good = callPackage ./tests/001-all-good.nix { inherit cue; }; + version = testers.testVersion { + package = cue; + command = "cue version"; + version = "v${finalAttrs.version}"; + }; }; }; - }; meta = { description = "Data constraint language which aims to simplify tasks involving defining and using data"; diff --git a/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch b/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch new file mode 100644 index 000000000000..0ffb08bfab16 --- /dev/null +++ b/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch @@ -0,0 +1,11 @@ +diff --git a/src/include/external/cxxopts.hpp b/src/include/external/cxxopts.hpp +--- a/src/include/external/cxxopts.hpp ++++ b/src/include/external/cxxopts.hpp +@@ -26,6 +26,7 @@ THE SOFTWARE. + #define CXXOPTS_HPP_INCLUDED + + #include ++#include + #include + #include + #include diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix index fdb927462723..7c325f0571f2 100644 --- a/pkgs/by-name/d-/d-seams/package.nix +++ b/pkgs/by-name/d-/d-seams/package.nix @@ -36,6 +36,8 @@ clangStdenv.mkDerivation rec { url = "https://github.com/d-SEAMS/seams-core/commit/f6156057e43d0aa1a0df9de67d8859da9c30302d.patch"; hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw="; }) + # Add missing include for uint8_t in vendored cxxopts. + ./cxxopts-cstdint.patch ]; postPatch = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/by-name/da/daktari/package.nix b/pkgs/by-name/da/daktari/package.nix index 0079222b76d2..51ae7fd0f4b9 100644 --- a/pkgs/by-name/da/daktari/package.nix +++ b/pkgs/by-name/da/daktari/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "daktari"; - version = "0.0.319"; + version = "0.0.321"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "genio-learn"; repo = "daktari"; tag = "v${finalAttrs.version}"; - hash = "sha256-NxTDyul1BESr/fBow9hwmTLr6jcl4p5RlIKNzFbaJvc="; + hash = "sha256-ZxSyN1yv0MCKo5y9uTGFRURA3hc04DnzOzXAuNHi/s0="; }; patches = [ ./optional-pyclip.patch ]; diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix index bf71ab8a4faf..c1d319d8fae1 100644 --- a/pkgs/by-name/da/dalfox/package.nix +++ b/pkgs/by-name/da/dalfox/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "dalfox"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "hahwul"; repo = "dalfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-RJzvsQBsdkuhbGbfGSO/iJXUzdQ7KTeLx9Wntv4p3Hc="; + hash = "sha256-GAlLmgIs2r8VCm69MuFPuQERHSZYAE/Zz8/y4ewYJME="; }; - vendorHash = "sha256-NQBCsGB3GQ0XPoGQdGDCJs4+Bv2Gu3JZj85ESoLiFVg="; + vendorHash = "sha256-UmQGsuLOpUJpGnWBot6YjG56LLNYHjm9mCejhEzkoBk="; ldflags = [ "-w" diff --git a/pkgs/by-name/da/darkly-qt5/package.nix b/pkgs/by-name/da/darkly-qt5/package.nix deleted file mode 100644 index de0113957bd4..000000000000 --- a/pkgs/by-name/da/darkly-qt5/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - darkly, - libsForQt5, -}: -darkly.override { qtPackages = libsForQt5; } diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 9a8ddb9f439f..9dad017633cf 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -5,14 +5,11 @@ cmake, ninja, kdePackages, - qtPackages ? kdePackages, + qt6, gitUpdater, }: -let - qtMajorVersion = lib.versions.major qtPackages.qtbase.version; -in stdenv.mkDerivation (finalAttrs: { - pname = "darkly-qt${qtMajorVersion}"; + pname = "darkly"; version = "0.5.32"; src = fetchFromGitHub { @@ -25,34 +22,27 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - qtPackages.wrapQtAppsHook - qtPackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.extra-cmake-modules ]; - buildInputs = - with qtPackages; - [ - qtbase - kconfig - kcoreaddons - kcmutils - kguiaddons - ki18n - kiconthemes - kwindowsystem - ] - ++ lib.optionals (qtMajorVersion == "5") [ - kirigami2 - ] - ++ lib.optionals (qtMajorVersion == "6") [ - kcolorscheme - kdecoration - kirigami - ]; + buildInputs = with kdePackages; [ + qtbase + kconfig + kcoreaddons + kcmutils + kguiaddons + ki18n + kiconthemes + kwindowsystem + kcolorscheme + kdecoration + kirigami + ]; - cmakeFlags = map (v: lib.cmakeBool "BUILD_QT${v}" (v == qtMajorVersion)) [ - "5" - "6" + cmakeFlags = [ + "-DBUILD_QT5=OFF" + "-DBUILD_QT6=ON" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -64,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ pluiedev ]; - } - // lib.optionalAttrs (qtMajorVersion == "6") { mainProgram = "darkly-settings6"; }; }) diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index c3bfe85af7cf..206dc5016818 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "4.0.5"; + version = "4.0.7"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; tag = finalAttrs.version; - hash = "sha256-vcNKnRcSQMU4AuvWTFdTlxVOAA0rlPCKUrDZbd+8/mk="; + hash = "sha256-PWuynBFOp4A/0AC5Lc5zAkb5Y5DWJgdZHtDc/douYQc="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-1FRrhNKm38/AP30F6Rf0cCHflIK9bWoxUCMMiT5c1Fc="; + hash = "sha256-jU/XnX6i6P1CWWWyUeVXt2q2PXMExDvmPTiLBOEuHcE="; }; passthru = { diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix index de6b66ae1c57..771510a5ff7d 100644 --- a/pkgs/by-name/da/davmail/package.nix +++ b/pkgs/by-name/da/davmail/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "davmail"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "mguessan"; repo = "davmail"; tag = finalAttrs.version; - hash = "sha256-La6nrbAGeZlIhs0i5dm6pIcvn+V1wQjuqBza4w+Aa3A="; + hash = "sha256-bQyZ+Sela70fOle+uqqG+y3fACeItvkmidXOFXW+DOk="; }; buildPhase = '' diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 36ebd418bdcc..ab71d28b9823 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2026-04"; + version = "2026-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-wJA6XqFbVxsWNEJ4AzwiKMOjsayJczVU/L3i98Y1x+I="; + hash = "sha256-14Gx6w1BzS+3+xz6CiJ3OMm3KgvU2pf+z9TOiydky4U="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index b9a06afab30e..a13f76fef7bc 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2026-04"; + version = "2026-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-sIb1DGVNmvV0B3ltTcT4yQkMMMiZt89X0eDIzT0U/r8="; + hash = "sha256-lSDMjGXcBMr8iGgqyJ26LPu8tfaG6QlKsCH88q4sAvA="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index 919b256bd17f..418f7397df6c 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2026-04"; + version = "2026-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-d+6Bq1l6XZHI+maW20SmpXjfP9O1a4FmhtfL3poEOfs="; + hash = "sha256-I0aw3Sk+hZf4n7nvTiy0GEKVkHIx/URgwkAgSW8o7fo="; }; dontUnpack = true; diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix index 751af9c6b69c..ef4317966003 100644 --- a/pkgs/by-name/de/deadlock-mod-manager/package.nix +++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix @@ -77,9 +77,9 @@ rustPlatform.buildRustPackage (finalAttrs: { src ; pnpm = pnpm_9; - fetcherVersion = 2; + fetcherVersion = 3; sourceRoot = "source"; - hash = "sha256-fFcKyqAo/HpGBaEJMk6Lq0FafNXrGu9z9nHnav5d6Hg="; + hash = "sha256-6lMTvlkIeM9kkbFhHzS9jJsHk2bVZWZs6GPgn+X3Rss="; }; patches = [ diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 85a26a424526..102284256aa2 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "deck"; - version = "1.59.1"; + version = "1.60.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${finalAttrs.version}"; - hash = "sha256-nBLY3X1r4ntqzosnwc2fVo/mWb7+5RHbKL1hUGmjRp4="; + hash = "sha256-5L1kY8EE3+IGP20fL1oBbc7rWqHcseyw+qYKND4AnMg="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-AaZxe7VYor+XIW3gH+0YfPK7weauEh/ZHUK6KK2GhbA="; + vendorHash = "sha256-C6JqlW50vJVmwEPOtljgPxRWcJ12IpTzGVCHVC57+J0="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 5f49439667de..4eb0435a55ab 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-+Mxf/D66EoE/axKg5+TSaLFPSpUEDZNtSNH4zklxV5s="; + fetcherVersion = 3; + hash = "sha256-UZ6/OTUtIiOA1D5PanY4aS+VCBNj/AIbIGYe1eibGMQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/devilspie2/package.nix b/pkgs/by-name/de/devilspie2/package.nix index e3009a20d294..157a4d532a82 100644 --- a/pkgs/by-name/de/devilspie2/package.nix +++ b/pkgs/by-name/de/devilspie2/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, intltool, pkg-config, glib, @@ -12,11 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "devilspie2"; - version = "0.44"; + version = "0.45"; - src = fetchurl { - url = "mirror://savannah/devilspie2/devilspie2-${finalAttrs.version}.tar.xz"; - hash = "sha256-Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; + src = fetchFromGitHub { + owner = "dsalt"; + repo = "devilspie2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3TLA4vvTY8nt2LupLH8btdGhz7mfWYHnwRf7lQKGq8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix index 18541eae9074..52fb0c2c5c73 100644 --- a/pkgs/by-name/di/di-tui/package.nix +++ b/pkgs/by-name/di/di-tui/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "di-tui"; - version = "1.13.4"; + version = "1.14.0"; src = fetchFromGitHub { owner = "acaloiaro"; repo = "di-tui"; rev = "v${finalAttrs.version}"; - hash = "sha256-0PIKPprAqGbVFiGFxwzgmS4fYKTHfpdpWWUMuxK67tQ="; + hash = "sha256-P784Tf3XA/28PgKTr89yizKAX1MhAb4877gV7vVHBYE="; }; vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I="; diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix index b8b99593affc..96758a7d0802 100644 --- a/pkgs/by-name/di/dictu/package.nix +++ b/pkgs/by-name/di/dictu/package.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: { -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/' ''; + # bcrypt magic value triggers gcc 15 -Wunterminated-string-initialization. + env.NIX_CFLAGS_COMPILE = "-Wno-error=unterminated-string-initialization"; + cmakeFlags = [ "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}" "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}" diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index b2a90f6a34be..20e30df4e5ea 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -108,12 +108,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "316"; + version = "318"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-6YLeNNWVMbvL2xymsdsxUPnknOScqGc1egl8VKtWXz4="; + hash = "sha256-rvZxd0mFDzmMFg2QYihkfizYGwiK1QQB9flyYn1uESM="; }; outputs = [ diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index a2ea5ea3dfd2..0f7c3f08fb19 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -7,8 +7,8 @@ gitUpdater, cmake, + pkg-config, ninja, - extra-cmake-modules, flex, bison, wrapGAppsHook3, @@ -81,8 +81,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ninja - extra-cmake-modules + kdePackages.extra-cmake-modules flex bison kdePackages.wrapQtAppsHook diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index 5bc41df8d7dc..cdafe17af58f 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dioxus-cli"; - version = "0.7.7"; + version = "0.7.9"; src = fetchCrate { pname = "dioxus-cli"; version = finalAttrs.version; - hash = "sha256-jMy2i19qyoMuIh/BJ1iJU78WNY+kWQC9xKTovLJvL2A="; + hash = "sha256-tLMtUlohSJt3okdJh+ARweQNGmzj/vYiNl8iZhDbSAc="; }; - cargoHash = "sha256-qPxW3VzHUw+GBmHn9r77BcDw50AkCfAOa7JblpgYgls="; + cargoHash = "sha256-h5wkxHP8ehZLHqcUsro08/dpqSPnPuBbZuUGG8i4nBc="; buildFeatures = [ "no-downloads" ] diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix index 547298b36de6..00222d55c8e5 100644 --- a/pkgs/by-name/di/distrobox/package.nix +++ b/pkgs/by-name/di/distrobox/package.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.8.2.4"; + version = "1.8.2.5"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; tag = finalAttrs.version; - hash = "sha256-bttJFHgmZgN0p6eT7vGzz2DsrrUgB+uGnnPz2Ep+eB4="; + hash = "sha256-sqMtB5THrspxkapB8eBfb9LNEnghE0UolivOvOEf7cs="; }; dontConfigure = true; diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index 7c595f178c0d..2a5f099884c9 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -5,29 +5,30 @@ nix-update-script, versionCheckHook, }: + buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-Vqru5JK3QCz1ij08ezuJgozhJaEplp92c2jBOiijB+M="; + hash = "sha256-hqSfL3R0fp7uYBGoD1Wu0ZNLq1VnOvcN0n8zzfRXTfA="; }; + subPackages = [ "." ]; ldflags = [ "-s" - "-w" - "-X github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" - "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" - "-X github.com/prometheus/common/version.Branch=master" - "-X github.com/prometheus/common/version.Revision=${finalAttrs.src.rev}" - "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" + "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" + "-X=github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X=github.com/prometheus/common/version.Branch=master" + "-X=github.com/prometheus/common/version.Revision=${finalAttrs.src.rev}" + "-X=github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-wyfbxdmF3OeWgZ9IeiCyo9PZFnSfnCmlZXM5/1Jq38w="; + vendorHash = "sha256-i1Ogo5zRYaEgiYMMTUjI2WiL2gABw2r31/WslXLzowI="; passthru.updateScript = nix-update-script { }; @@ -39,7 +40,7 @@ buildGoModule (finalAttrs: { meta = { changelog = "https://github.com/dmachart/dns-collector/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/dmachart/dns-collector"; - description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata. "; + description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata"; license = lib.licenses.mit; mainProgram = "go-dnscollector"; maintainers = with lib.maintainers; [ paepcke ]; diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 952fe7182043..215700e21886 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.36.1"; + version = "4.37.1"; src = fetchFromGitHub { - owner = "StackExchange"; + owner = "DNSControl"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-9mOhiQBL3rFXSi5WpCKr3YXMAaK25Hsk1ln475cY1H4="; + hash = "sha256-qpvT1jhFNNmHsiJe3RsbxmgXd4OOX7+uqxjCBKERwkw="; }; - vendorHash = "sha256-ao8IVxtCURrbyeC+mLgM1e88KRNwzCY1s6ixF//jHhE="; + vendorHash = "sha256-M+Wx3I2KCKI3fHHw6t5WhCcJkHvxswC3G0Zt8SAQ0ZI="; nativeBuildInputs = [ installShellFiles ]; @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" - "-X=github.com/StackExchange/dnscontrol/v${lib.versions.major finalAttrs.version}/pkg/version.version=${finalAttrs.version}" + "-X=github.com/DNSControl/dnscontrol/v${lib.versions.major finalAttrs.version}/pkg/version.version=${finalAttrs.version}" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { meta = { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://dnscontrol.org/"; - changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/DNSControl/dnscontrol/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ SuperSandro2000 diff --git a/pkgs/by-name/dn/dnsenum/package.nix b/pkgs/by-name/dn/dnsenum/package.nix index 165a48b02b84..b5bb75c84795 100644 --- a/pkgs/by-name/dn/dnsenum/package.nix +++ b/pkgs/by-name/dn/dnsenum/package.nix @@ -9,15 +9,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnsenum"; - version = "1.2.4.2"; + version = "1.3.2"; src = fetchFromGitHub { - owner = "fwaeytens"; - repo = "dnsenum"; - rev = finalAttrs.version; - sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v"; + owner = "SparrowOchon"; + repo = "dnsenum2"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-I4I+HNQC7xqIF2P7NBy2Ophh3znl5qy9fSicJKIBUis="; }; + patchPhase = '' + rm Makefile + ''; + propagatedBuildInputs = with perlPackages; [ perl NetDNS @@ -35,11 +39,27 @@ stdenv.mkDerivation (finalAttrs: { install -vD dns.txt -t $out/share ''; + postFixup = '' + wrapProgram $out/bin/dnsenum \ + --prefix PERL5LIB : "${ + with perlPackages; + makePerlPath [ + NetIP + NetDNS + NetNetmask + StringRandom + XMLWriter + NetWhoisIP + WWWMechanize + ] + }" + ''; + meta = { - homepage = "https://github.com/fwaeytens/dnsenum"; + homepage = "https://github.com/SparrowOchon/dnsenum2"; description = "Tool to enumerate DNS information"; mainProgram = "dnsenum"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix index cb4f7b70fbf0..a48170c3140d 100644 --- a/pkgs/by-name/do/docker-credential-helpers/package.nix +++ b/pkgs/by-name/do/docker-credential-helpers/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "docker"; repo = "docker-credential-helpers"; rev = "v${version}"; - sha256 = "sha256-OM5NU0I3272KaCHv8ZtkbkB86d6mo/Ym1QXMGmCisVc="; + sha256 = "sha256-HgioRk6qz9H9KD0JWcYg2bIpqHZxnPHYc3idxMUKuD8="; }; vendorHash = null; diff --git a/pkgs/by-name/do/dokieli/missing-hashes.json b/pkgs/by-name/do/dokieli/missing-hashes.json index 9b0ac522e2ec..8987bc04facd 100644 --- a/pkgs/by-name/do/dokieli/missing-hashes.json +++ b/pkgs/by-name/do/dokieli/missing-hashes.json @@ -1,19 +1,19 @@ { - "@rolldown/binding-android-arm64@npm:1.0.0-rc.15": "0c78d6321d2dedc0c6ed4b5541328f6c04e8530a3c294b477cd9741e2af7c8377a51474f0171c85ecf63bff5c8bb31ee586f40f13fa265a869247ec3d6293204", - "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.15": "598b8cb87d8ba8df4e880e0d6903f7f4f32b3e7b2804429cb3ccc47a69b8e7b852b2e3115a8c3a882d14979909f9464e8da55c2c52a52cb18a81df7e8a1aa654", - "@rolldown/binding-darwin-x64@npm:1.0.0-rc.15": "92fdfa58a8d9edaec4c1766c38c34f657715d2c8faec141590812d11ba6a6ce52530e55a6a2515fcd2ec6287e50187a458f06ca3c6813130cb9869a99c9f6f29", - "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.15": "04e8288accf007c82e8bbe75af62d4ed570bddd7b25a178506fcf97daa0907cf6f85ea095be5826095242ac1a4923196059f53a9e8fdd0e3c34d9ed1c00d64ae", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.15": "4cd7452e4fe4433b730585bcbaf210efc50621bca5906204179ffe80748bea187398d4091dae64079f0c7ebfea1987f0b1c045ff60209ab0f60be9e04eccbef7", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.15": "fbddea791134b45a94aa5aea640a177d6feacd81a44f9ee3615da3daa824dc2a193ced6e8f2a0bb0676fca7b224525513b451cd8f78b379d7b1983fe6a0360ff", - "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.15": "b325fa98753bf41100c5d95145f30ce92b5f69f6989973306344b1644fb21633454aa216f28355c74d0e7bd5885bb6d2c80d0f96dcc2b869ca7e63d8b22dbe91", - "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.15": "0bff0d2724912079dcedfbc0a86dbad8e3e376d2d619cf36917964701b9ae5a39afa5ff49d3cb5b2c3e17437c559314cf8e17433ad3bfb4b64229d9c8bf1ebca", - "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.15": "6718fd91ead389f3bdefe22fd0344b490d3f9350697e4aa35a0fb55957aa1b127d26aaecf9bc2d49f1dfde62d9d4717cf5dfb7d93ce3b871372ef9c6cb7a1b1a", - "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.15": "cb7628e1a7398ab5fd07dc79a38c73a27524d45adc989b5d906ea37e23b7692123d607d07fb9fda35485d6caba545ae41c561b9632aefa0bff76997208f83eae", - "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.15": "f59fb354b8cac55d123f6f3fe7bf8210402f97ed4be3f3a883c6c544ce1b825e36154f479d45f6e9f23c1fcd8861e9f3873dc24278631db871d263db3bea5580", - "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.15": "b6c220a48ace9c381d238dce2caaa8453da1d3fe9312bab7babf127a500bdec2bbe30bd381f9945af79c30fe9ca0185108b86ef311fc83ecb83ef24f7a587902", - "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.15": "9cd39e02ad5f43fc45901d074df10c0e3532d9077a6e334e431de60f90555c15e5445d1b5156c10df49d28839f9f15d5d808666bc8e70ab065bb9af3b8567e7a", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.15": "cfc32a72e8a3900f356b0b359520df3f18ac79379a273a4c53b00b1555123dcfd8204cf9976762664898b0c6c949c0edd4be850ae254d2e84a40fcb8352858eb", - "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.15": "f0bd2876247f0834f135c1ae150b7d5626d54ff399b4a6193626dc46a0eca22374a43c64afdf3eff8e8e9cf1f20df826bcd9fd4219df3fece03972b8ae080e20", + "@rolldown/binding-android-arm64@npm:1.0.0-rc.17": "7c821eb984e2dd03b05979be3116d927326a1752e7d04462f6c78721fc47fb33d1a584e8c739b181dbfb5c28170541d05f775ada38e81bb685e43d03d974abe3", + "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.17": "ddedec6840b8e32b7c45a4afe9d797bb24ea74ef222a1b443161045f0b53ec3a5752b108552fe6c99182e2553dd53498d96d3b30551cd3f1e8057559f23b1ed7", + "@rolldown/binding-darwin-x64@npm:1.0.0-rc.17": "b66ce82e3162261c045027b3aa061cd735c9b1395e77756e06b973f8d0e4256247ddfdb7ee8134363dfcd9d83e665b647b45b666a65c8454babdee19f6d57b40", + "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.17": "87b9045771edda717c7d66df105bba2c22c88214254eae48d54ca641f79b4558c2d1ae3db27d8e36b230728263d539c5f6e03e895dbed6e08afa495f634eb42d", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.17": "43e60168d359a5edae352d948a6515c40a8e047fef7541693cbf18a09d80076efb9308a804c5ea7f645883f8f6b7b43e0e14ea677df63fb4016a55ba6f63b947", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.17": "d6bfe49089d598886e8c9c92e45240a2404e9594c4abc25f303c8655b859e0f0b67c18947e23177ccc5fb81c9b22a1bd32f2ed052531cc41491b4261ed728342", + "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.17": "be5459bf78de0931993158783af8e349a68d03610876eb131f48fa51414a45683047cd9b4ad7631f385fedc9bb89677e8d12e874104a038b63932aaa1d7bceb3", + "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.17": "e36194c8a39afc6522ca71c2ebf4c038792bf2c0141da76e8a385bebdda077a52f95ece9bd0a3818d5c0023e7e8ce708566d42ecd2ff31296a26a41ed6847aa4", + "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.17": "288ce91c69b13e37b2106fcfb663a981aba9de65d3bb4d3cd8c17b9e8193f3de44d08d1201c4d3a18fdeec5a89256d5b3b4d5bb913ff023cb577c403f8889917", + "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.17": "d532e43e02e0a84c71ff9be34791d7b32b71786bac4921f9e4f92da39a7d5daeabeb4188c7cc088a8a80ab0691dcf1cc9d414396ce7ff6a970b1374e033df8f6", + "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.17": "56aecbe0a2aeaedd558c62a5057a7f915ecada0528a27b5edd80478d948c3645104a56c88121c71edefe9a6af7500f053724103099a90764eb8b84c3ee1f9536", + "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.17": "cc7a806e106f4c0d24400af42155b8b396f712e25d76e13b033895b3b635e21edb2246d3c8592c86989c7aaae1ded1708d36516472555bbed3ccaffc939403a4", + "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.17": "e6fb0aff901de475a4874af6b0473b396bf1bddf6cbb9acbdb6d4c9318ab2fa3e09d80435ecaeb7866b03effea79c57db9a271b5c720007341949e06828c8385", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.17": "d3724ce9f4117d28f903ae1bfc34e3a3efac853691577e511cef91259eb8355dc24f2f27a832bbbd9ad3323dc1b0c3ddbdc4c791ae2a6dd5e5b0c9051384d4d0", + "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.17": "6f4a348202955f74481ccf1c0ec5fa96671507353b6a7f680b920c773f0dda4ebd46c1561428efcefacb9b4d279cd550c80a79fa261f8db173b527ae9a671eca", "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d", "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06", "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e", diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index 26b0b81c1260..ebaf2ba4e4ab 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -16,19 +16,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dokieli"; - version = "0-unstable-2026-04-27"; + version = "0-unstable-2026-05-08"; src = fetchFromGitHub { owner = "dokieli"; repo = "dokieli"; - rev = "4d0ad172bb02245d93abb3290a51e9743a880876"; - hash = "sha256-Xkj2H5a5uTqGpOuLPo5BLM7vEGx5eaznX1w0CiNQFZA="; + rev = "f0372663098582c0310c9e16918a55cf000fbaf1"; + hash = "sha256-jpIQcE1GdjvEsk6HPxjdFLbrxGWvVCaaG7T08HdMj7Y="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-3FyctNQ8pDvJ559SJvAJZjn49wptfB5Q5Takk51oqMQ="; + hash = "sha256-SEoYmh7oHmJrVhShOjRyaClyQxW9S96GCI3ggRkW+6U="; }; buildPhase = '' diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 06df698995aa..abd4fe455cc5 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "dotenvx"; - version = "1.64.0"; + version = "1.65.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xa3xtDzvSbgba083R2g3vV8Jtv86NMEbZ/EhYxmGsKA="; + hash = "sha256-+THGA+EQcfx+s/PDb+xTgsrZBtn8m1im1H4sfJ6vPDs="; }; - npmDepsHash = "sha256-WeqODrueKqDFvIsXHlzWhHSdqPY/uS+VM+wCp69LN9M="; + npmDepsHash = "sha256-SHGJDpuGuuBXKwppZPM43r7Ae8PSegz3ld+M2WlDQi0="; dontNpmBuild = true; diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix index f7aa58bae20e..7c6c2768f505 100644 --- a/pkgs/by-name/do/dovecot/generic.nix +++ b/pkgs/by-name/do/dovecot/generic.nix @@ -4,6 +4,7 @@ patches, }: { + autoreconfHook, stdenv, lib, fetchzip, @@ -64,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: { perl pkg-config ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; + ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ]; buildInputs = [ openssl @@ -137,11 +139,19 @@ stdenv.mkDerivation (finalAttrs: { ) + lib.optionalString stdenv.hostPlatform.isLinux '' export systemdsystemunitdir=$out/etc/systemd/system + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac \ + --replace-fail \ + 'NOPLUGIN_LDFLAGS="-no-undefined"' \ + 'NOPLUGIN_LDFLAGS="-undefined dynamic_lookup"' ''; - preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" - ''; + preBuild = + lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.hostPlatform.isDarwin) + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" + ''; # We need this for sysconfdir, see remark below. installFlags = [ "DESTDIR=$(out)" ]; @@ -203,7 +213,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; meta = { - broken = lib.versionAtLeast version "2.4" && stdenv.hostPlatform.isDarwin; # fails to link openssl homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with lib.licenses; [ diff --git a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix index fca1f17172ec..29367dd72364 100644 --- a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix +++ b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withLDAP "--with-ldap"; - preBuild = lib.optionalString (!isCurrent && stdenv.isDarwin) '' + preBuild = lib.optionalString (!isCurrent && stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" ''; diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index d5466e98f7eb..25b86d598cac 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS/JSON) wrapper plugin"; - hash = "sha256-SRUOPwe3n15jluYzRi+SKRN9KSRF9KSSWoi898tMC18="; + hash = "sha256-ccPkzEV0Gtzi6iKq6oIREvIccEFvHec06XxoUWufDZc="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -17,6 +17,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.12.9.wasm"; - version = "0.12.9"; + url = "https://plugins.dprint.dev/biome-0.12.10.wasm"; + version = "0.12.10"; } diff --git a/pkgs/by-name/dr/dragmap/cstdint.patch b/pkgs/by-name/dr/dragmap/cstdint.patch index b9b0721173d7..6004510d2999 100644 --- a/pkgs/by-name/dr/dragmap/cstdint.patch +++ b/pkgs/by-name/dr/dragmap/cstdint.patch @@ -58,3 +58,16 @@ index eefb9ae..623a77f 100644 class ReadGroupList { public: const std::string &getReadGroupName(const uint16_t idx) const { + +diff --git a/stubs/dragen/src/host/metrics/public/run_stats.hpp b/stubs/dragen/src/host/metrics/public/run_stats.hpp +index 998fe4e..9561b0b 100644 +--- a/stubs/dragen/src/host/metrics/public/run_stats.hpp ++++ b/stubs/dragen/src/host/metrics/public/run_stats.hpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + // + // RP: HA! HA! HA! That's what you get when you write code logging to cout all + // over the place! diff --git a/pkgs/by-name/dr/dragmap/getHostVersion.patch b/pkgs/by-name/dr/dragmap/getHostVersion.patch new file mode 100644 index 000000000000..ba769c9b09a3 --- /dev/null +++ b/pkgs/by-name/dr/dragmap/getHostVersion.patch @@ -0,0 +1,11 @@ +diff --git a/thirdparty/dragen/src/common/hash_generation/gen_hash_table.c b/thirdparty/dragen/src/common/hash_generation/gen_hash_table.c +index cdca3df..5a55699 100644 +--- a/thirdparty/dragen/src/common/hash_generation/gen_hash_table.c ++++ b/thirdparty/dragen/src/common/hash_generation/gen_hash_table.c +@@ -249,7 +249,7 @@ void setDefaultHashParams(hashTableConfig_t* defConfig, const char* destDir, Has + free(dir); + } + +- defConfig->hostVersion = (char*)getHostVersion(0); ++ defConfig->hostVersion = (char*)getHostVersion(); + } diff --git a/pkgs/by-name/dr/dragmap/package.nix b/pkgs/by-name/dr/dragmap/package.nix index 08d2654119a1..1c2898efb370 100644 --- a/pkgs/by-name/dr/dragmap/package.nix +++ b/pkgs/by-name/dr/dragmap/package.nix @@ -19,13 +19,21 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-f1jsOErriS1I/iUS4CzJ3+Dz8SMUve/ccb3KaE+L7U8="; }; - nativebuildInputs = [ boost ]; + nativeBuildInputs = [ boost ]; buildInputs = [ gtest zlib ]; + # Latest boost do not need system as a linking flag + postPatch = '' + sed -i 's/system filesystem/filesystem/' config.mk + ''; + patches = [ + # getHostVersion use an empty parameter list. This is now an error for GC + ./getHostVersion.patch + # pclose is called on a NULL value. This is no longer allowed since # https://github.com/bminor/glibc/commit/64b1a44183a3094672ed304532bedb9acc707554 ./stdio-pclose.patch diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix index a02eef927117..4152c07609d2 100644 --- a/pkgs/by-name/dr/draupnir/package.nix +++ b/pkgs/by-name/dr/draupnir/package.nix @@ -20,13 +20,13 @@ in buildNpmPackage (finalAttrs: { pname = "draupnir"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "the-draupnir-project"; repo = "Draupnir"; tag = "v${finalAttrs.version}"; - hash = "sha256-WrMYak6ztIy3KqjcVuN2OmIy1uxlIVNvHPGw7e3LRw0="; + hash = "sha256-e6d9z5dkJg4ZpkN+yJFr8J8RWl9tcAhEYTOM+9413Ok="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildNpmPackage (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool; - npmDepsHash = "sha256-CnSeg7sGFzPD+VQl8sWXtiBfuSdeieNhDrLFjWlHcUs="; + npmDepsHash = "sha256-DvQM9Kr9Hc7/1OEZadZ1GvpAjfRmbdIcA6UDuFBQ+vo="; preBuild = '' # install proper version and branch info @@ -44,8 +44,7 @@ buildNpmPackage (finalAttrs: { echo "main" > apps/draupnir/branch.txt # we already set the version and branch above - substituteInPlace apps/draupnir/package.json \ - --replace-fail " && npm run describe-version && npm run describe-branch" "" + sed -i "/build:assets/d" apps/draupnir/package.json ''; postInstall = '' diff --git a/pkgs/by-name/dr/drawpile/package.nix b/pkgs/by-name/dr/drawpile/package.nix index 9a2e905a2dc3..70952f5d1eb6 100644 --- a/pkgs/by-name/dr/drawpile/package.nix +++ b/pkgs/by-name/dr/drawpile/package.nix @@ -3,7 +3,9 @@ lib, fetchFromGitHub, cargo, - extra-cmake-modules, + pkg-config, + cmake, + kdePackages, rustc, rustPlatform, fetchpatch, @@ -91,7 +93,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cargo - extra-cmake-modules + pkg-config + cmake + kdePackages.extra-cmake-modules rustc rustPlatform.cargoSetupHook qt6Packages.wrapQtAppsHook diff --git a/pkgs/by-name/ds/dstask/package.nix b/pkgs/by-name/ds/dstask/package.nix index 527df6306f3f..c852bc13cd1c 100644 --- a/pkgs/by-name/ds/dstask/package.nix +++ b/pkgs/by-name/ds/dstask/package.nix @@ -1,13 +1,19 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule (finalAttrs: { pname = "dstask"; version = "1.0.1"; + nativeBuildInputs = [ + installShellFiles + ]; + src = fetchFromGitHub { owner = "naggie"; repo = "dstask"; @@ -24,6 +30,13 @@ buildGoModule (finalAttrs: { doCheck = false; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd dstask \ + --bash <($out/bin/dstask bash-completion) \ + --fish <($out/bin/dstask fish-completion) \ + --zsh <($out/bin/dstask zsh-completion) + ''; + # The ldflags reduce the executable size by stripping some debug stuff. # The other variables are set so that the output of dstask version shows the # git ref and the release version from github. @@ -39,6 +52,9 @@ buildGoModule (finalAttrs: { description = "Command line todo list with super-reliable git sync"; homepage = finalAttrs.src.meta.homepage; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ stianlagstad ]; + maintainers = with lib.maintainers; [ + remidupre + stianlagstad + ]; }; }) diff --git a/pkgs/by-name/dt/dtop/package.nix b/pkgs/by-name/dt/dtop/package.nix index 189ff12eeca7..bac5038f5d08 100644 --- a/pkgs/by-name/dt/dtop/package.nix +++ b/pkgs/by-name/dt/dtop/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dtop"; - version = "0.6.14"; + version = "0.7.4"; src = fetchFromGitHub { owner = "amir20"; repo = "dtop"; tag = "v${finalAttrs.version}"; - hash = "sha256-nWSV91cvfWSTzseTFEVlVKHOa4ZsDDFt9r6L3yLjWZ8="; + hash = "sha256-xye3P8fi/Z1RJrkkZWZuA6/UXFDGsn7pV18hMkdHTOk="; }; - cargoHash = "sha256-xJ4d+Nul8B9mE6Rlf5kg0nLuZWTmpbPnjpE0hUAME6U="; + cargoHash = "sha256-c/xIQ3rDvR3VbTg0iPmFAN3pRXHWzlFG6wrcsc4rCyI="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/du/dublin-traceroute/package.nix b/pkgs/by-name/du/dublin-traceroute/package.nix index 1d2159daca60..75410da09849 100644 --- a/pkgs/by-name/du/dublin-traceroute/package.nix +++ b/pkgs/by-name/du/dublin-traceroute/package.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation { hash = "sha256-UJeFPVi3423Jh72fVk8QbLX1tTNAQ504xYs9HwVCkZc="; }; - # gtest requires C++17, while dublin-traceroute requires C++11 postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-fail "ENABLE_TESTING()" "" + --replace-fail "ENABLE_TESTING()" "" \ + --replace-fail "-std=c++11" "-std=c++17" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix deleted file mode 100644 index 4973b63580db..000000000000 --- a/pkgs/by-name/e-/e-search/package.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - fetchzip, - autoPatchelfHook, - gitMinimal, - gobject-introspection, - makeWrapper, - nodejs_20, - pnpm_10_29_2, - fetchPnpmDeps, - pnpmConfigHook, - electron, - atk, - atkmm, - cairo, - cairomm, - gdk-pixbuf, - glib, - glibmm, - gtk3, - gtkmm3, - harfbuzz, - libsForQt5, - pango, - pangomm, - libxt, - libxtst, - libxrandr, - libx11, - libxcb, - zlib, - nix-update-script, - commandLineArgs ? "", -}: - -let - pnpm' = pnpm_10_29_2.override { nodejs = nodejs_20; }; - eSearch-OCR-ch = fetchzip { - url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/4.0.0/ch.zip"; - hash = "sha256-0NCXuy8k9/AdpK4ie49S8032u37gNhX6Jc6bOGufrV4="; - stripRoot = false; - }; - eSearch-OCR-doc_cls = fetchurl { - url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/8.1.0/doc_cls.onnx"; - hash = "sha256-9VFoIq+SYnEeGX/yJKip2IT4BGpjIbdi40+MvwgsRe8="; - }; - eSearch-seg = fetchurl { - url = "https://github.com/xushengfeng/eSearch-seg/releases/download/1.0.0/seg.onnx"; - hash = "sha256-IJSPX4Kg7wIPjdXVmpGbeSk2y98OS+tJrIth9W+J/Q8="; - }; - eSearch-migan_pipeline_v2 = fetchurl { - url = "https://github.com/xushengfeng/eSearch/releases/download/13.1.6/migan_pipeline_v2.onnx"; - hash = "sha256-bx81MKGiMksZdSAYznVgiLB5c82o19iQA0rOXIpIxAs="; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "e-search"; - version = "15.2.3"; - - src = fetchFromGitHub { - owner = "xushengfeng"; - repo = "eSearch"; - tag = finalAttrs.version; - hash = "sha256-wzSspt1qJpBgw4MyiK+vhRjoybNcaaa9nWBPV0bctiM="; - }; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; - nativeBuildInputs = [ gitMinimal ]; - pnpm = pnpm'; - fetcherVersion = 2; - hash = "sha256-q0+6vkDZdcDXwsTxby2RuQUYTgEnxGx1CeXROSrG9lU="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - gobject-introspection - pnpmConfigHook - pnpm' - makeWrapper - nodejs_20 - ]; - - buildInputs = [ - atk - atkmm - cairo - cairomm - gdk-pixbuf - glib - glibmm - gtk3 - gtkmm3 - harfbuzz - (lib.getLib stdenv.cc.cc) - libsForQt5.kauth - libsForQt5.kcodecs - libsForQt5.kcompletion - libsForQt5.kconfigwidgets - libsForQt5.kcoreaddons - libsForQt5.kitemviews - libsForQt5.kjobwidgets - libsForQt5.kservice - libsForQt5.kwidgetsaddons - libsForQt5.kio - libsForQt5.qt5.qtbase - libsForQt5.qt5.qtnetworkauth - libsForQt5.qt5.qttools - libsForQt5.qt5.qtxmlpatterns - pango - pangomm - libx11 - libxrandr - libxt - libxtst - libxcb - zlib - ]; - - env = { - ELECTRON_OVERRIDE_DIST_PATH = "${electron}/libexec/electron"; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - }; - - preBuild = '' - mkdir -p assets/onnx/ppocr assets/onnx/seg assets/onnx/inpaint - cp --recursive --no-preserve=mode ${eSearch-OCR-ch}/* assets/onnx/ppocr - cp --no-preserve=mode ${eSearch-OCR-doc_cls} assets/onnx/ppocr/doc_cls.onnx - cp --no-preserve=mode ${eSearch-seg} assets/onnx/seg/seg.onnx - cp --no-preserve=mode ${eSearch-migan_pipeline_v2} assets/onnx/inpaint/migan_pipeline_v2.onnx - ''; - - buildPhase = '' - runHook preBuild - - npm run build - npm exec electron-builder -- \ - --linux \ - --dir \ - -p never \ - --config electron-builder.config.js \ - --config.electronDist=${electron.dist} \ - --config.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/eSearch - ${ - if stdenv.hostPlatform.isAarch64 then - "cp -r build/linux-arm64-unpacked/{resources,LICENSE*} $out/share/eSearch" - else - "cp -r build/linux-unpacked/{resources,LICENSE*} $out/share/eSearch" - } - makeWrapper ${lib.getExe electron} $out/bin/e-search \ - --inherit-argv0 \ - --add-flags $out/share/eSearch/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - for icon_size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do - install -Dm0644 assets/logo/$icon_size.png $out/share/icons/hicolor/$icon_size/apps/e-search.png - done - install -Dm0644 assets/e-search.desktop $out/share/applications/e-search.desktop - - runHook postInstall - ''; - - dontWrapQtApps = true; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Screenshot OCR search translate search for picture paste the picture on the screen screen recorder"; - homepage = "https://github.com/xushengfeng/eSearch"; - changelog = "https://github.com/xushengfeng/eSearch/releases/tag/${finalAttrs.version}"; - mainProgram = "e-search"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ qzylinra ]; - }; -}) diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix index fcbe647131d1..c9cc2e57df1e 100644 --- a/pkgs/by-name/ea/eas-cli/package.nix +++ b/pkgs/by-name/ea/eas-cli/package.nix @@ -18,16 +18,26 @@ let hash = "sha256-Z+PtS88Rv9Vv6FA15KxSBWCmOtwmTqO1etgCV7WaTXo="; }; missingHashes = ./missing-hashes.json; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/expo/eas-cli/blob/v18.7.0/package.json#L37 + ./yarn-4.14-support.patch + ]; in # cc is necessary because of building an npm package without a prebuilt binary # for ARM. See comment in nativeBuildInputs below. stdenv.mkDerivation (finalAttrs: { pname = "eas-cli"; - inherit src version missingHashes; + inherit + src + version + missingHashes + patches + ; yarnOfflineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit src missingHashes; - hash = "sha256-ZlbCHWEwVaYCfzowrm1qrM1MpLo5vNmEG5bWzWT/cTU="; + inherit src missingHashes patches; + hash = "sha256-KtFLJc2bEBS0sgTqbF68574fFMxwSlaSKcR0RedVJ4k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/eas-cli/yarn-4.14-support.patch b/pkgs/by-name/ea/eas-cli/yarn-4.14-support.patch new file mode 100644 index 000000000000..2591021c6269 --- /dev/null +++ b/pkgs/by-name/ea/eas-cli/yarn-4.14-support.patch @@ -0,0 +1,20 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,2 +1,5 @@ + defaultSemverRangePrefix: '' + nodeLinker: node-modules ++approvedGitRepositories: ++ - "**" ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/ec/eccodes/package.nix b/pkgs/by-name/ec/eccodes/package.nix index 5ea1a9d7df36..32c9129f541a 100644 --- a/pkgs/by-name/ec/eccodes/package.nix +++ b/pkgs/by-name/ec/eccodes/package.nix @@ -17,11 +17,11 @@ }: gccStdenv.mkDerivation rec { pname = "eccodes"; - version = "2.44.0"; + version = "2.47.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-x1+x+Rt2W2uLR3RjKopvvOyWk02wFftjwq0lYK7dRDs="; + hash = "sha256-gtqBmqm1GDHcFLO/KRi/7lCxzVOgUIjQw/RJN1iq4JQ="; }; postPatch = '' diff --git a/pkgs/by-name/ec/ecos/package.nix b/pkgs/by-name/ec/ecos/package.nix index 9c35f428677a..c6ca5208ee81 100644 --- a/pkgs/by-name/ec/ecos/package.nix +++ b/pkgs/by-name/ec/ecos/package.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WMgqDc+XAY3g2wwlefjJ0ATxR5r/jL971FZKtxsunnU="; }; + # tests call no-arg-declared functions with args; pre-C23 allows it + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/eg/egctl/package.nix b/pkgs/by-name/eg/egctl/package.nix index 8caa4ba36076..c0671873e0a5 100644 --- a/pkgs/by-name/eg/egctl/package.nix +++ b/pkgs/by-name/eg/egctl/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "egctl"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "envoyproxy"; repo = "gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-EI/7vNNi3RbG7/WdBlpvjM/LRUq9m3rYvH2yVSq5bPo="; + hash = "sha256-8cM8wA1XCHQ2OQn/CkeWML9aWEYX9Xv3XEpn+TPGbYA="; }; - vendorHash = "sha256-jEPvLDuu3ykuVPs8skByeTHYIrodp9xP2FqVex4McQ8="; + vendorHash = "sha256-CwBaEt5BYwGVBdt/M/V1SM00MONifskQYfErVubFppY="; # Fix case-insensitive conflicts producing platform-dependent checksums # https://github.com/microsoft/go-mssqldb/issues/234 proxyVendor = true; diff --git a/pkgs/by-name/eg/eggdrop/package.nix b/pkgs/by-name/eg/eggdrop/package.nix index f7270926c323..95184cc39a82 100644 --- a/pkgs/by-name/eg/eggdrop/package.nix +++ b/pkgs/by-name/eg/eggdrop/package.nix @@ -2,19 +2,23 @@ lib, stdenv, fetchurl, + openssl, tcl, }: stdenv.mkDerivation (finalAttrs: { pname = "eggdrop"; - version = "1.9.5"; + version = "1.10.1"; src = fetchurl { url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor finalAttrs.version}/eggdrop-${finalAttrs.version}.tar.gz"; - hash = "sha256-4mkY6opk2YV1ecW2DGYaM38gdz7dgwhrNWUlvrWBc2o="; + hash = "sha256-pc33RE14HC/09dC+FCAvXQlx4AOHGBpJtyUFf+lTEtU="; }; - buildInputs = [ tcl ]; + buildInputs = [ + openssl + tcl + ]; hardeningDisable = [ "format" ]; @@ -37,5 +41,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; homepage = "https://www.eggheads.org"; description = "Internet Relay Chat (IRC) bot"; + maintainers = with lib.maintainers; [ EpicEric ]; }; }) diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index f5604b92bba8..be6a7c822c9d 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/5RkZNf/ErSxNwW0ZfPwF52k3fZzAQAFMmbJ9xM7f74="; }; + patches = [ + # Remove after updating since project has moved to pnpm + # https://github.com/element-hq/element-call/blob/v0.19.2/package.json#L159 + ./yarn-4.14-support.patch + ]; + matrixJsSdkRevision = "6e3efef0c5f660df47cf00874927dec1c75cc3cf"; matrixJsSdkOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.offlineCache}/checkouts/${finalAttrs.matrixJsSdkRevision}/yarn.lock"; @@ -47,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-Ose2PlsNHlCllynl+aIx/nToqtsqs7f43znOTLm2WEE="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-2P4kwccT2WP2SlJJ1biZCRU8O+Y43sGJmfRTUujklUg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/element-call/yarn-4.14-support.patch b/pkgs/by-name/el/element-call/yarn-4.14-support.patch new file mode 100644 index 000000000000..bb64eb874448 --- /dev/null +++ b/pkgs/by-name/el/element-call/yarn-4.14-support.patch @@ -0,0 +1,21 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,3 +1,6 @@ + nodeLinker: node-modules + plugins: + - .yarn/plugins/linker.cjs ++approvedGitRepositories: ++ - "**" ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/el/elinks/package.nix b/pkgs/by-name/el/elinks/package.nix index 6ab33a4e7e7c..a338be83a9f6 100644 --- a/pkgs/by-name/el/elinks/package.nix +++ b/pkgs/by-name/el/elinks/package.nix @@ -3,21 +3,28 @@ stdenv, fetchFromGitHub, ncurses, - libx11, bzip2, zlib, brotli, zstd, xz, openssl, - autoreconfHook, + meson, + ninja, gettext, + python3, pkg-config, - libev, + xmlto, + docbook_xml_dtd_42, gpm, - libidn, + libidn2, tre, expat, + lua, + curl, + libcss, + libdom, + nix-update-script, # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null, @@ -42,55 +49,95 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aQ+q2I6uTVv5kpKBaGJ1xiE/9vv9T7JI05VX/ROkAqA="; }; + outputs = [ + "out" + "man" + "doc" + ]; + buildInputs = [ ncurses - libx11 bzip2 zlib brotli zstd xz openssl - libidn + libidn2 tre expat - libev + lua + curl + libcss + libdom ] - ++ lib.optional stdenv.hostPlatform.isLinux gpm + ++ lib.optional stdenv.hostPlatform.isDarwin gettext ++ lib.optional enableGuile guile ++ lib.optional enablePython python ++ lib.optional enablePerl perl; nativeBuildInputs = [ - autoreconfHook + meson + ninja gettext + perl + python3 pkg-config + xmlto ]; - configureFlags = [ - "--enable-finger" - "--enable-html-highlight" - "--enable-gopher" - "--enable-gemini" - "--enable-cgi" - "--enable-bittorrent" - "--enable-nntp" - "--enable-256-colors" - "--enable-true-color" - "--with-brotli" - "--with-lzma" - "--with-libev" - "--with-terminfo" - ] - ++ lib.optional enableGuile "--with-guile" - ++ lib.optional enablePython "--with-python" - ++ lib.optional enablePerl "--with-perl"; + env = + lib.optionalAttrs stdenv.hostPlatform.isLinux { + C_INCLUDE_PATH = "${lib.getInclude gpm}/include"; + LIBRARY_PATH = "${lib.getLib gpm}/lib"; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LDFLAGS = "-liconv"; + }; + + strictDeps = true; + __structuredAttrs = true; + + mesonFlags = + (map (f: lib.mesonBool f true) [ + "finger" + "html-highlight" + "gopher" + "gemini" + "cgi" + "nntp" + "256-colors" + "true-color" + "brotli" + "lzma" + "terminfo" + "reproducible" + ]) + ++ [ + (lib.mesonOption "luapkg" "lua") + (lib.mesonBool "gpm" stdenv.hostPlatform.isLinux) + (lib.mesonBool "guile" enableGuile) + (lib.mesonBool "python" enablePython) + (lib.mesonBool "perl" enablePerl) + ]; + + postPatch = '' + patchShebangs doc/tools + substituteInPlace doc/tools/asciidoc/docbook.conf \ + --replace-fail "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" + ''; + + preConfigure = '' + mesonFlags+=("-Dsource-date-epoch=$SOURCE_DATE_EPOCH") + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; meta = { description = "Full-featured text-mode web browser"; mainProgram = "elinks"; homepage = "https://github.com/rkd77/elinks"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ iblech diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix index 073f1a20b1c9..7cb9f6c45f8d 100644 --- a/pkgs/by-name/em/emmylua-check/package.nix +++ b/pkgs/by-name/em/emmylua-check/package.nix @@ -9,7 +9,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_check"; - inherit (emmylua-ls) version src; + inherit (emmylua-ls) version src cargoHash; nativeBuildInputs = [ pkg-config @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/emmylua_check"; - cargoHash = "sha256-JNirHIKXFsiLme5oByerHjB/3lumuAr2u3pNfxh4qa0="; - nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index ee9f3f210f3e..6d5fb6330410 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,12 +6,10 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - inherit (emmylua-ls) version src; + inherit (emmylua-ls) version src cargoHash; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-JNirHIKXFsiLme5oByerHjB/3lumuAr2u3pNfxh4qa0="; - nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 5131d9a50c54..87d7fe1b8303 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_ls"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-Zj5nLeTH/4sVElYP+erg6bSTX8jFqF7sqiXfaMam8pE="; + hash = "sha256-2HC2BeT4x4QGjj2tKB0yM9Bh7zsQ/S0xX/KaJvlgq2o="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/emmylua_ls"; - cargoHash = "sha256-JNirHIKXFsiLme5oByerHjB/3lumuAr2u3pNfxh4qa0="; + cargoHash = "sha256-AruojLPjozzajHksLDfi39Qq6gvnHem2glgS454yxVQ="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/en/entire/package.nix b/pkgs/by-name/en/entire/package.nix index 1e0445a204a2..16f3db5b2db4 100644 --- a/pkgs/by-name/en/entire/package.nix +++ b/pkgs/by-name/en/entire/package.nix @@ -26,7 +26,6 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" - "-w" "-X=github.com/entireio/cli/cmd/entire/cli/versioninfo.Version=${finalAttrs.version}" "-X=github.com/entireio/cli/cmd/entire/cli/versioninfo.Commit=${finalAttrs.src.rev}" ]; @@ -55,9 +54,10 @@ buildGoModule (finalAttrs: { of how code was written in your repo. ''; homepage = "https://github.com/entireio/cli"; - changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + iamanaws sheeeng squishykid ]; diff --git a/pkgs/by-name/eq/equibop/node-modules.nix b/pkgs/by-name/eq/equibop/node-modules.nix index aa9b6902371d..df0876ff55f8 100644 --- a/pkgs/by-name/eq/equibop/node-modules.nix +++ b/pkgs/by-name/eq/equibop/node-modules.nix @@ -50,8 +50,8 @@ stdenvNoCC.mkDerivation { outputHash = { - x86_64-linux = "sha256-pJp4l0QJAg42gj/R4bq4P1iVtMehkvNs7hv9/3RmNsI="; - aarch64-linux = "sha256-POIXQZ3ZruzfwF/6Kg6zRXdSrKtm56cBCMAvB5JTuJM="; + x86_64-linux = "sha256-p8jx9HDYG2q2nhBiBK8XDTYm9O0ptTqv8L+PrQ8oiy8="; + aarch64-linux = "sha256-UsccQFaSSjhmv1+oF2FZcRG8xtWBCcPD+tizbdQ7SSI="; } .${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 3dab77796c0b..61881fe24170 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -6,7 +6,7 @@ makeWrapper, makeDesktopItem, copyDesktopItems, - electron_40, + electron_41, python3Packages, pipewire, libpulseaudio, @@ -18,17 +18,17 @@ withMiddleClickScroll ? false, }: let - electron = electron_40; + electron = electron_41; in stdenv.mkDerivation (finalAttrs: { pname = "equibop"; - version = "3.1.9"; + version = "3.2.0"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; tag = "v${finalAttrs.version}"; - hash = "sha256-4v0NKGmdbEdHyjz35l+QUnXvnVfLzIe1vLxOSmdgbYQ="; + hash = "sha256-CPRn1F15N4Rjry91Gu+ZXWpKVTOEnHI3TmZn8502QB4="; }; postPatch = '' @@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: { # disable auto updates substituteInPlace src/main/updater.ts \ --replace-fail 'const isOutdated = autoUpdater.checkForUpdates().then(res => Boolean(res?.isUpdateAvailable));' 'const isOutdated = false;' + + # disable auto update for bun + substituteInPlace scripts/build/compileArrpc.mts \ + --replace-fail -baseline "" ''; node-modules = callPackage ./node-modules.nix { }; @@ -177,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ NotAShelf rexies + PerchunPak ]; mainProgram = "equibop"; # I am not confident in my ability to support Darwin, please PR if this is important to you diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix index 97b7e50c295e..d1b8470c2d45 100644 --- a/pkgs/by-name/er/eresi/package.nix +++ b/pkgs/by-name/er/eresi/package.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # K&R-style function-pointer declarations break under gcc 15's C23 default. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + postPatch = '' # Two occurences of fprintf() with only two arguments, which should really # be fputs(). diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json index 1487ee24234b..00063ec5eba8 100644 --- a/pkgs/by-name/es/eslint/package-lock.json +++ b/pkgs/by-name/es/eslint/package-lock.json @@ -1,12 +1,12 @@ { "name": "eslint", - "version": "10.2.1", + "version": "10.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "eslint", - "version": "10.2.1", + "version": "10.3.0", "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", @@ -52,7 +52,7 @@ "@eslint/json": "^1.2.0", "@types/esquery": "^1.5.4", "@types/node": "^22.13.14", - "@typescript-eslint/parser": "^8.56.0", + "@typescript-eslint/parser": "^8.58.2", "babel-loader": "^8.0.5", "c8": "^11.0.0", "chai": "^4.0.1", @@ -91,7 +91,7 @@ "mocha": "^11.7.1", "node-polyfill-webpack-plugin": "^1.0.3", "npm-license": "^0.3.3", - "prettier": "3.8.2", + "prettier": "3.8.3", "progress": "^2.0.3", "proxyquire": "^2.0.1", "recast": "^0.23.0", @@ -99,7 +99,7 @@ "semver": "^7.5.3", "shelljs": "^0.10.0", "sinon": "^11.0.0", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "webpack": "^5.23.0", "webpack-cli": "^4.5.0", "yorkie": "^2.0.0" @@ -252,9 +252,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", - "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.3.tgz", + "integrity": "sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==", "dev": true, "license": "MIT", "engines": { @@ -377,9 +377,9 @@ "license": "ISC" }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz", - "integrity": "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.3.tgz", + "integrity": "sha512-RpLYy2sb51oNLjuu1iD3bwBqCBWUzjO0ocp+iaCP/lJtb2CPLcnC2Fftw+4sAzaMELGeWTgExSKADbdo0GFVzA==", "dev": true, "license": "MIT", "dependencies": { @@ -388,7 +388,7 @@ "@babel/helper-optimise-call-expression": "^7.27.1", "@babel/helper-replace-supers": "^7.28.6", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", - "@babel/traverse": "^7.28.6", + "@babel/traverse": "^7.29.0", "semver": "^6.3.1" }, "engines": { @@ -642,9 +642,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz", - "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", + "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", "dev": true, "license": "MIT", "dependencies": { @@ -706,6 +706,23 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": { + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.3.tgz", + "integrity": "sha512-SRS46DFR4HqzUzCVgi90/xMoL+zeBDBvWdKYXSEzh79kXswNFEglUpMKxR04//dPqwYXWUBJ3mpUd933ru9Kmg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.28.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz", @@ -1660,19 +1677,20 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.2.tgz", - "integrity": "sha512-DYD23veRYGvBFhcTY1iUvJnDNpuqNd/BzBwCvzOTKUnJjKg5kpUBh3/u9585Agdkgj+QuygG7jLfOPWMa2KVNw==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.3.tgz", + "integrity": "sha512-ySZypNLAIH1ClygLDQzVMoGQRViATnkHkYYV6TcNDz+8+jwZCdsguGvsb3EY5d9wyWyhmF1iSuFM0Yh5XPnqSA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.29.0", + "@babel/compat-data": "^7.29.3", "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-validator-option": "^7.27.1", "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5", "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1", + "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "^7.29.3", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1", "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", @@ -2679,9 +2697,9 @@ } }, "node_modules/@loaderkit/resolve": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.4.tgz", - "integrity": "sha512-rJzYKVcV4dxJv+vW6jlvagF8zvGxHJ2+HTr1e2qOejfmGhAApgJHl8Aog4mMszxceTRiKTTbnpgmTO1bEZHV/A==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.5.tgz", + "integrity": "sha512-fhkdGM57xhJ7CO91MUgbQlb0ClP0AJ9vB3yoVnBTslYJqrJOCVEbOprZcxZlexdMbmTBPQqVcQYr+j4oRRtIZA==", "dev": true, "license": "ISC", "dependencies": { @@ -3397,16 +3415,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.0.tgz", - "integrity": "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.1.tgz", + "integrity": "sha512-HDQH9O/47Dxi1ceDhBXdaldtf/WV9yRYMjbjCuNk3qnaTD564qwv61Y7+gTxwxRKzSrgO5uhtw584igXVuuZkA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.59.0", - "@typescript-eslint/types": "8.59.0", - "@typescript-eslint/typescript-estree": "8.59.0", - "@typescript-eslint/visitor-keys": "8.59.0", + "@typescript-eslint/scope-manager": "8.59.1", + "@typescript-eslint/types": "8.59.1", + "@typescript-eslint/typescript-estree": "8.59.1", + "@typescript-eslint/visitor-keys": "8.59.1", "debug": "^4.4.3" }, "engines": { @@ -3422,14 +3440,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.0.tgz", - "integrity": "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.1.tgz", + "integrity": "sha512-+MuHQlHiEr00Of/IQbE/MmEoi44znZHbR/Pz7Opq4HryUOlRi+/44dro9Ycy8Fyo+/024IWtw8m4JUMCGTYxDg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.59.0", - "@typescript-eslint/types": "^8.59.0", + "@typescript-eslint/tsconfig-utils": "^8.59.1", + "@typescript-eslint/types": "^8.59.1", "debug": "^4.4.3" }, "engines": { @@ -3444,14 +3462,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz", - "integrity": "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.1.tgz", + "integrity": "sha512-LwuHQI4pDOYVKvmH2dkaJo6YZCSgouVgnS/z7yBPKBMvgtBvyLqiLy9Z6b7+m/TRcX1NFYUqZetI5Y+aT4GEfg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.0", - "@typescript-eslint/visitor-keys": "8.59.0" + "@typescript-eslint/types": "8.59.1", + "@typescript-eslint/visitor-keys": "8.59.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3462,9 +3480,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz", - "integrity": "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.1.tgz", + "integrity": "sha512-/0nEyPbX7gRsk0Uwfe4ALwwgxuA66d/l2mhRDNlAvaj4U3juhUtJNq0DsY8M2AYwwb9rEq2hrC3IcIcEt++iJA==", "dev": true, "license": "MIT", "engines": { @@ -3479,9 +3497,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.0.tgz", - "integrity": "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.1.tgz", + "integrity": "sha512-ZDCjgccSdYPw5Bxh+my4Z0lJU96ZDN7jbBzvmEn0FZx3RtU1C7VWl6NbDx94bwY3V5YsgwRzJPOgeY2Q/nLG8A==", "dev": true, "license": "MIT", "engines": { @@ -3493,16 +3511,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz", - "integrity": "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.1.tgz", + "integrity": "sha512-OUd+vJS05sSkOip+BkZ/2NS8RMxrAAJemsC6vU3kmfLyeaJT0TftHkV9mcx2107MmsBVXXexhVu4F0TZXyMl4g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.59.0", - "@typescript-eslint/tsconfig-utils": "8.59.0", - "@typescript-eslint/types": "8.59.0", - "@typescript-eslint/visitor-keys": "8.59.0", + "@typescript-eslint/project-service": "8.59.1", + "@typescript-eslint/tsconfig-utils": "8.59.1", + "@typescript-eslint/types": "8.59.1", + "@typescript-eslint/visitor-keys": "8.59.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -3521,16 +3539,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.0.tgz", - "integrity": "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.1.tgz", + "integrity": "sha512-3pIeoXhCeYH9FSCBI8P3iNwJlGuzPlYKkTlen2O9T1DSeeg8UG8jstq6BLk+Mda0qup7mgk4z4XL4OzRaxZ8LA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.59.0", - "@typescript-eslint/types": "8.59.0", - "@typescript-eslint/typescript-estree": "8.59.0" + "@typescript-eslint/scope-manager": "8.59.1", + "@typescript-eslint/types": "8.59.1", + "@typescript-eslint/typescript-estree": "8.59.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3545,13 +3563,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz", - "integrity": "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==", + "version": "8.59.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.1.tgz", + "integrity": "sha512-LdDNl6C5iJExcM0Yh0PwAIBb9PrSiCsWamF/JyEZawm3kFDnRoaq3LGE4bpyRao/fWeGKKyw7icx0YxrLFC5Cg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.0", + "@typescript-eslint/types": "8.59.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -3842,9 +3860,9 @@ } }, "node_modules/ajv": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", - "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -3876,9 +3894,9 @@ } }, "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", "dev": true, "license": "MIT", "dependencies": { @@ -4295,9 +4313,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.21", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz", - "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==", + "version": "2.10.25", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.25.tgz", + "integrity": "sha512-QO/VHsXCQdnzADMfmkeOPvHdIAkoB7i0/rGjINPJEetLx75hNttVWGQ/jycHUDP9zZ9rupbm60WRxcwViB0MiA==", "dev": true, "license": "Apache-2.0", "bin": { @@ -4787,9 +4805,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001790", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz", - "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==", + "version": "1.0.30001791", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz", + "integrity": "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==", "dev": true, "funding": [ { @@ -6268,9 +6286,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.343", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.343.tgz", - "integrity": "sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==", + "version": "1.5.349", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.349.tgz", + "integrity": "sha512-QsWVGyRuY07Aqb234QytTfwd5d9AJlfNIQ5wIOl1L+PZDzI9d9+Fn0FRale/QYlFxt/bUnB0/nLd1jFPGxGK1A==", "dev": true, "license": "ISC" }, @@ -6346,14 +6364,14 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.20.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz", - "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==", + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz", + "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==", "dev": true, "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", - "tapable": "^2.3.0" + "tapable": "^2.3.3" }, "engines": { "node": ">=10.13.0" @@ -6447,9 +6465,9 @@ } }, "node_modules/es-module-lexer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz", - "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", + "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==", "dev": true, "license": "MIT" }, @@ -8444,14 +8462,17 @@ } }, "node_modules/install-artifact-from-github": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.4.0.tgz", - "integrity": "sha512-+y6WywKZREw5rq7U2jvr2nmZpT7cbWbQQ0N/qfcseYnzHFz2cZz1Et52oY+XttYuYeTkI8Y+R2JNWj68MpQFSg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.6.0.tgz", + "integrity": "sha512-wKsuzN8fy8QK7iEUqyWTQmvZ1QFGPn1xyl3/1iIIDthDjS7Hn9HoPwHlNakZirWbCsbad0lZMkr6Xfbpe1pUzw==", "dev": true, "license": "BSD-3-Clause", "bin": { "install-from-cache": "bin/install-from-cache.js", "save-to-github-cache": "bin/save-to-github-cache.js" + }, + "engines": { + "node": ">=18" } }, "node_modules/interpret": { @@ -9627,9 +9648,9 @@ } }, "node_modules/loader-runner": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz", - "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz", + "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==", "dev": true, "license": "MIT", "engines": { @@ -12438,9 +12459,9 @@ } }, "node_modules/prettier": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz", - "integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", + "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", "dev": true, "license": "MIT", "bin": { @@ -14228,9 +14249,9 @@ } }, "node_modules/terser": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz", - "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==", + "version": "5.46.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz", + "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -14247,9 +14268,9 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz", - "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz", + "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==", "dev": true, "license": "MIT", "dependencies": { @@ -14281,9 +14302,9 @@ } }, "node_modules/terser-webpack-plugin/node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", "dev": true, "license": "MIT", "dependencies": { @@ -14482,22 +14503,22 @@ } }, "node_modules/tldts": { - "version": "7.0.28", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.28.tgz", - "integrity": "sha512-+Zg3vWhRUv8B1maGSTFdev9mjoo8Etn2Ayfs4cnjlD3CsGkxXX4QyW3j2WJ0wdjYcYmy7Lx2RDsZMhgCWafKIw==", + "version": "7.0.30", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.30.tgz", + "integrity": "sha512-ELrFxuqsDdHUwoh0XxDbxuLD3Wnz49Z57IFvTtvWy1hJdcMZjXLIuonjilCiWHlT2GbE4Wlv1wKVTzDFnXH1aw==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^7.0.28" + "tldts-core": "^7.0.30" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "7.0.28", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.28.tgz", - "integrity": "sha512-7W5Efjhsc3chVdFhqtaU0KtK32J37Zcr9RKtID54nG+tIpcY79CQK/veYPODxtD/LJ4Lue66jvrQzIX2Z2/pUQ==", + "version": "7.0.30", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.30.tgz", + "integrity": "sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==", "dev": true, "license": "MIT" }, @@ -14739,9 +14760,9 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -15011,6 +15032,7 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", "dev": true, "license": "MIT", "bin": { @@ -15264,9 +15286,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz", - "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz", + "integrity": "sha512-eACpxRN02yaawnt+uUNIF7Qje6A9zArxBbcAJjK1PK3S9Ycg5jIuJ8pW4q8EMnwNZCEGltcjkRx1QzOxOkKD8A==", "dev": true, "license": "MIT", "engines": { @@ -15274,9 +15296,9 @@ } }, "node_modules/webpack/node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", "dev": true, "license": "MIT", "dependencies": { @@ -15640,9 +15662,9 @@ } }, "node_modules/yaml": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", - "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.4.tgz", + "integrity": "sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==", "dev": true, "license": "ISC", "bin": { @@ -15909,9 +15931,9 @@ "license": "ISC" }, "node_modules/zod": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz", - "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.2.tgz", + "integrity": "sha512-IynmDyxsEsb9RKzO3J9+4SxXnl2FTFSzNBaKKaMV6tsSk0rw9gYw9gs+JFCq/qk2LCZ78KDwyj+Z289TijSkUw==", "dev": true, "license": "MIT", "funding": { @@ -15933,7 +15955,7 @@ "devDependencies": { "@arethetypeswrong/cli": "^0.18.0", "eslint": "^10.0.0", - "typescript": "^5.9.3" + "typescript": "^6.0.3" }, "engines": { "node": "^20.19.0 || ^22.13.0 || >=24" diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 5230e636f826..9126aa0a18c1 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -6,13 +6,13 @@ }: buildNpmPackage rec { pname = "eslint"; - version = "10.2.1"; + version = "10.3.0"; src = fetchFromGitHub { owner = "eslint"; repo = "eslint"; tag = "v${version}"; - hash = "sha256-XUVCFubLnht+OZIZRg2NzuX1/zDhqWYtQZzw8FwkTu4="; + hash = "sha256-b0Gv7soMPTsbMOZLqMe5vMCPwInk9AFusepf2jJH/Ng="; }; # NOTE: Generating lock-file @@ -24,7 +24,7 @@ buildNpmPackage rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-SET3In91HxRdSEVAgZHETF+ahOJg/4+Jb1Jy5msVzZs="; + npmDepsHash = "sha256-gi/aiWEzbf91LNTB2kMx9Iq4PoVORLs3mBjSSt2mFiQ="; npmInstallFlags = [ "--omit=dev" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index caadde2007af..89a22162a0d5 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rustPlatform, pkg-config, - extra-cmake-modules, + kdePackages, dbus, libx11, libxcb, @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-E3z8NfKZiQsaYqDKXSIltETa4cSL0ShHnUMymjH5pas="; nativeBuildInputs = [ - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config makeWrapper wxwidgets_3_2 diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 7dd6ee371525..22cb5466bb4e 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.4.3"; + version = "2026.4.5"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-+esSczOBIT4dJEyzqmEv6YMU4wGkN4lFGmuZKRp5/bo="; + hash = "sha256-uMlkrHg4cZYsdSv8D8U57mEZnjwcRkJe2zKI8VFsTRk="; }; patches = [ @@ -186,6 +186,9 @@ python.pkgs.buildPythonApplication (finalAttrs: { # Expects a full git clone "test_clang_tidy_mode_full_scan" "test_clang_tidy_mode_targeted_scan" + # Patched to run platformio without the esphome wrapper + "test_run_platformio_cli_strips_win_long_path_prefix" + "test_run_platformio_cli_does_not_set_pythonexepath_without_strip" ]; passthru = { diff --git a/pkgs/by-name/es/esphome/platformio-binary-reference.patch b/pkgs/by-name/es/esphome/platformio-binary-reference.patch index 7022c0fc0c72..42c3a16fa3b8 100644 --- a/pkgs/by-name/es/esphome/platformio-binary-reference.patch +++ b/pkgs/by-name/es/esphome/platformio-binary-reference.patch @@ -1,13 +1,13 @@ diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py -index fc21977f..e5059f1d 100644 +index 81ff01306..2dfa523dd 100644 --- a/esphome/platformio_api.py +++ b/esphome/platformio_api.py -@@ -63,7 +63,7 @@ def run_platformio_cli(*args, **kwargs) -> str | int: - os.environ.setdefault("PYTHONWARNINGS", "ignore::SyntaxWarning") - # Increase uv retry count to handle transient network errors (default is 3) - os.environ.setdefault("UV_HTTP_RETRIES", "10") -- cmd = [sys.executable, "-m", "esphome.platformio_runner"] + list(args) +@@ -64,7 +64,7 @@ def run_platformio_cli(*args, **kwargs) -> str | int: + # a user-provided value (or the unmodified path on platforms that + # don't need the strip). + os.environ["PYTHONEXEPATH"] = python_exe +- cmd = [python_exe, "-m", "esphome.platformio_runner"] + list(args) + cmd = ["platformio"] + list(args) - + return run_external_process(*cmd, **kwargs) - + diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 89cc7480f56d..ad778e31128d 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.306.2"; + version = "0.306.3"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-XlSdAOuC+nwxRVa0nnsqGDPY57q58byLgLpTqEyImJ8="; + hash = "sha256-6j4GTAgC5xvLkaNaOQQBkjINI4Wg57IHVVUoDY/rfBo="; }; vendorHash = "sha256-JBhx1K8E2BynsgjXBno+0OUpWF15Eyo9yBzofruBEck="; @@ -97,9 +97,10 @@ buildGo126Module rec { let skippedTests = [ # network access - "TestOctopusConfigParse" - "TestTemplates" "TestOcpp" + "TestOctopusConfigParse" + "TestSessionHandlerTimezoneFilter" + "TestTemplates" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 5bdca52f8b5f..fa6a966b59be 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -4,23 +4,25 @@ python3Packages, xhost, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "exegol"; version = "5.1.10"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "ThePorgs"; repo = "Exegol"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iyzTBZHOzr6CfZDqHvycdWZply/BXH7kESaO5pDLBMY="; }; build-system = with python3Packages; [ pdm-backend ]; pythonRelaxDeps = [ - "rich" "argcomplete" + "requests" + "rich" "supabase" ]; @@ -41,7 +43,9 @@ python3Packages.buildPythonApplication rec { ] ++ pyjwt.optional-dependencies.crypto ++ [ xhost ] - ++ lib.optional (!stdenv.hostPlatform.isLinux) tzlocal; + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + tzlocal + ]; doCheck = true; @@ -58,7 +62,7 @@ python3Packages.buildPythonApplication rec { stylish macOS users and corporate Windows pros to UNIX-like power users. ''; homepage = "https://github.com/ThePorgs/Exegol"; - changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${src.tag}"; + changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ gpl3Only { @@ -76,4 +80,4 @@ python3Packages.buildPythonApplication rec { macbucheron ]; }; -} +}) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index eaeed731d09f..5a36a41abc88 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2026-05-01"; + version = "2026-05-08"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-BZ1X9SpXf+HSY/4xz9imnCwK3si7c130Havg/ATI/LQ="; + hash = "sha256-fTO/85TOpDeyJG8qaaM6YTBYel7Jpycphrs7hs8S7Hs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/fancontrol-gui/package.nix b/pkgs/by-name/fa/fancontrol-gui/package.nix deleted file mode 100644 index dd38a9b4cba7..000000000000 --- a/pkgs/by-name/fa/fancontrol-gui/package.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - cmake, - extra-cmake-modules, - fancontrol-gui, - fetchFromGitHub, - lib, - libgcc, - libsForQt5, - nix-update-script, - stdenv, - testers, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "fancontrol-gui"; - version = "0.8"; - - src = fetchFromGitHub { - owner = "Maldela"; - repo = "fancontrol-gui"; - tag = "v${finalAttrs.version}"; - hash = "sha256-hJaU8SL0b6GmTONGSIzUzzbex6KxHf2Np0bCX8YSSVM="; - }; - - buildInputs = with libsForQt5; [ - libgcc - kcmutils - kdeclarative - kio - plasma-framework - qt5.qtdeclarative - qt5.qtquickcontrols - qt5.qtquickcontrols2 - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook - ]; - - patches = [ - ./version.patch - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" - ''; - - passthru = { - tests.version = testers.testVersion { - package = fancontrol-gui; - command = "env QT_QPA_PLATFORM=minimal ${lib.getExe fancontrol-gui} --version"; - }; - updateScript = nix-update-script { }; - }; - - meta = { - description = "GUI for fancontrol with QT and KDE framework 5"; - homepage = "https://github.com/Maldela/fancontrol-gui"; - changelog = "https://github.com/Maldela/fancontrol-gui/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl2Plus; - mainProgram = "fancontrol_gui"; - maintainers = with lib.maintainers; [ dashietm ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/fa/fancontrol-gui/version.patch b/pkgs/by-name/fa/fancontrol-gui/version.patch deleted file mode 100644 index 9b0ea0943b8f..000000000000 --- a/pkgs/by-name/fa/fancontrol-gui/version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fancontrol-gui/src/main.cpp b/fancontrol-gui/src/main.cpp -index 9f33fa0..ae0deb6 100644 ---- a/fancontrol-gui/src/main.cpp -+++ b/fancontrol-gui/src/main.cpp -@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) - - auto about = KAboutData(QStringLiteral("org.kde.fancontrol.gui"), - i18n("Fancontrol-GUI"), -- QStringLiteral("0.7"), -+ QStringLiteral("0.8"), - i18n("Graphical user interface for fancontrol"), - KAboutLicense::KAboutLicense::GPL_V2, - QStringLiteral("Copyright (C) 2015 Malte Veerman"), diff --git a/pkgs/by-name/fa/fanwood/package.nix b/pkgs/by-name/fa/fanwood/package.nix index 0b0c7274148b..7dda66cccf6b 100644 --- a/pkgs/by-name/fa/fanwood/package.nix +++ b/pkgs/by-name/fa/fanwood/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,13 +16,12 @@ stdenvNoCC.mkDerivation { hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg="; }; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Serif based on the work of a famous Czech-American type designer of yesteryear"; diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 0584155bdc01..e88656ca3a8b 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "14.3.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-8RdJNGI8FzM2HVkJNbWqr2Cw+CkPUTZ7uiiLQVEKTGM="; + hash = "sha256-ZSUT0f3U6tmJLtSdpTorAYxJExdR+zVan+Gua3BIcDM="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-XzfsPSG0gEXhlAF9O3VGNn8FGXlvXFxqX7kffQDdsRA="; + vendorHash = "sha256-J0UvU/rXUpxJEn/p+ScO8omFwHY2JD3kq7zGes0ohQ8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fc/fcitx5-anthy/package.nix b/pkgs/by-name/fc/fcitx5-anthy/package.nix index dbf8ad0a078f..afb6c4af67d4 100644 --- a/pkgs/by-name/fc/fcitx5-anthy/package.nix +++ b/pkgs/by-name/fc/fcitx5-anthy/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, cmake, - extra-cmake-modules, + kdePackages, pkg-config, fcitx5, anthy, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext # msgfmt pkg-config zstd diff --git a/pkgs/by-name/fc/fcitx5-array/package.nix b/pkgs/by-name/fc/fcitx5-array/package.nix index d3993d83e984..12de32a108f1 100644 --- a/pkgs/by-name/fc/fcitx5-array/package.nix +++ b/pkgs/by-name/fc/fcitx5-array/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fmt, cmake, - extra-cmake-modules, + kdePackages, gettext, fcitx5, sqlite, @@ -23,11 +23,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext ]; buildInputs = [ + kdePackages.extra-cmake-modules fmt fcitx5 sqlite diff --git a/pkgs/by-name/fc/fcitx5-bamboo/package.nix b/pkgs/by-name/fc/fcitx5-bamboo/package.nix index 2b75181a719b..aa3a35d40c8f 100644 --- a/pkgs/by-name/fc/fcitx5-bamboo/package.nix +++ b/pkgs/by-name/fc/fcitx5-bamboo/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, fcitx5, gettext, go, @@ -25,12 +25,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext go ]; buildInputs = [ + kdePackages.extra-cmake-modules fcitx5 ]; diff --git a/pkgs/by-name/fc/fcitx5-chewing/package.nix b/pkgs/by-name/fc/fcitx5-chewing/package.nix index 74df970f72b6..f1f53547f01e 100644 --- a/pkgs/by-name/fc/fcitx5-chewing/package.nix +++ b/pkgs/by-name/fc/fcitx5-chewing/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, fcitx5, libchewing, @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; diff --git a/pkgs/by-name/fc/fcitx5-gtk/package.nix b/pkgs/by-name/fc/fcitx5-gtk/package.nix index 57a44919d525..767d6e85bf7a 100644 --- a/pkgs/by-name/fc/fcitx5-gtk/package.nix +++ b/pkgs/by-name/fc/fcitx5-gtk/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, fcitx5, gobject-introspection, glib, @@ -71,7 +72,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gobject-introspection ]; diff --git a/pkgs/by-name/fc/fcitx5-hangul/package.nix b/pkgs/by-name/fc/fcitx5-hangul/package.nix index 72b8dd1eed4a..47dcd7b3e634 100644 --- a/pkgs/by-name/fc/fcitx5-hangul/package.nix +++ b/pkgs/by-name/fc/fcitx5-hangul/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, fcitx5, libhangul, @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; diff --git a/pkgs/by-name/fc/fcitx5-m17n/package.nix b/pkgs/by-name/fc/fcitx5-m17n/package.nix index b17bbdc80414..576ca57ebcd7 100644 --- a/pkgs/by-name/fc/fcitx5-m17n/package.nix +++ b/pkgs/by-name/fc/fcitx5-m17n/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, pkg-config, fcitx5, m17n_lib, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config gettext ]; diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index 1c713b159a6c..ad38ec542fd6 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, json_c, icu, @@ -26,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; buildInputs = [ + kdePackages.extra-cmake-modules fcitx5 fmt gtest diff --git a/pkgs/by-name/fc/fcitx5-rime/package.nix b/pkgs/by-name/fc/fcitx5-rime/package.nix index 3ab643daf337..9083c8873d56 100644 --- a/pkgs/by-name/fc/fcitx5-rime/package.nix +++ b/pkgs/by-name/fc/fcitx5-rime/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, cmake, - extra-cmake-modules, + kdePackages, gettext, zstd, fcitx5, @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config gettext zstd diff --git a/pkgs/by-name/fc/fcitx5-table-extra/package.nix b/pkgs/by-name/fc/fcitx5-table-extra/package.nix index 60b2d8e70db8..6059b4546e21 100644 --- a/pkgs/by-name/fc/fcitx5-table-extra/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-extra/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, libime, boost, @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext libime fcitx5 diff --git a/pkgs/by-name/fc/fcitx5-table-other/package.nix b/pkgs/by-name/fc/fcitx5-table-other/package.nix index f62e1611bcbb..113a18ae2ede 100644 --- a/pkgs/by-name/fc/fcitx5-table-other/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-other/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, gettext, libime, boost, @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext libime fcitx5 diff --git a/pkgs/by-name/fc/fcitx5/package.nix b/pkgs/by-name/fc/fcitx5/package.nix index 42123c74edcc..6ac5d9b7b750 100644 --- a/pkgs/by-name/fc/fcitx5/package.nix +++ b/pkgs/by-name/fc/fcitx5/package.nix @@ -6,7 +6,7 @@ pkg-config, buildPackages, cmake, - extra-cmake-modules, + kdePackages, wayland-scanner, cairo, pango, @@ -61,13 +61,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wayland-scanner gettext ]; buildInputs = [ + kdePackages.extra-cmake-modules expat isocodes cairo diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix index 86ca0e289908..01e3d32a0085 100644 --- a/pkgs/by-name/fe/feather-tk/package.nix +++ b/pkgs/by-name/fe/feather-tk/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableNFD [ nativefiledialog-extended ] - ++ lib.optionals (enableNFD && stdenv.isLinux) [ + ++ lib.optionals (enableNFD && stdenv.hostPlatform.isLinux) [ gtk3 ] ++ lib.optionals enablePython [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = enableTests; - nativeCheckInputs = lib.optionals (enableTests && stdenv.isLinux) [ + nativeCheckInputs = lib.optionals (enableTests && stdenv.hostPlatform.isLinux) [ xvfb-run ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck cd feather-tk/src/feather-tk-build - ${if stdenv.isLinux then "xvfb-run" else ""} ctest --verbose -C Release + ${if stdenv.hostPlatform.isLinux then "xvfb-run" else ""} ctest --verbose -C Release runHook postCheck ''; diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix index 1a6d2957145a..72931f20abdb 100644 --- a/pkgs/by-name/fe/feh/package.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-cjfP/jnVWIGXTihtjVANE1T31R9ZFj8g5H8W3F+JrQk="; + hash = "sha256-YAVj4ZD4WchMalIUyqnw4sZTTTnLouv9VDwqK6q3SAE="; }; outputs = [ diff --git a/pkgs/by-name/fe/fence/package.nix b/pkgs/by-name/fe/fence/package.nix index 23b53ff68c27..1afdf6fb58b3 100644 --- a/pkgs/by-name/fe/fence/package.nix +++ b/pkgs/by-name/fe/fence/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "fence"; - version = "0.1.54"; + version = "0.1.57"; src = fetchFromGitHub { owner = "Use-Tusk"; repo = "fence"; tag = "v${finalAttrs.version}"; - hash = "sha256-Um9nIg+lXNfp8vBeLlCUYlJNtPIemnyenz7+L9dfcjg="; + hash = "sha256-YX+DqD20hr/+hAXLVddEQjj0J7jybhNNdtQM3tlSPek="; }; vendorHash = "sha256-Qct/M0zuggYzlN0gyO8nF58M5Av3HcYyMjrPab5Crr0="; diff --git a/pkgs/by-name/fi/figurine/package.nix b/pkgs/by-name/fi/figurine/package.nix index 5543bba573f6..51b850c51a4b 100644 --- a/pkgs/by-name/fi/figurine/package.nix +++ b/pkgs/by-name/fi/figurine/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "figurine"; - version = "1.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "arsham"; repo = "figurine"; rev = "v${finalAttrs.version}"; - hash = "sha256-1q6Y7oEntd823nWosMcKXi6c3iWsBTxPnSH4tR6+XYs="; + hash = "sha256-U25nbXr8SuSgMq1Nqk/7Ci4tKoWAyccv8j4aTIEox3k="; }; - vendorHash = "sha256-mLdAaYkQH2RHcZft27rDW1AoFCWKiUZhh2F0DpqZELw="; + vendorHash = "sha256-CdiHPN0zfOedsz2M6JWFMQpG70vxLbKj//WkKyN58AQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/filebench/package.nix b/pkgs/by-name/fi/filebench/package.nix index ed608e49aac3..aceb41e77b8c 100644 --- a/pkgs/by-name/fi/filebench/package.nix +++ b/pkgs/by-name/fi/filebench/package.nix @@ -1,7 +1,9 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + fetchpatch, + autoreconfHook, bison, flex, @@ -9,13 +11,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "filebench"; - version = "1.4.9.1"; + version = "1.5-alpha3-unstable-2020-02-20"; - src = fetchurl { - url = "mirror://sourceforge/filebench/filebench-${finalAttrs.version}.tar.gz"; - sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc"; + src = fetchFromGitHub { + owner = "filebench"; + repo = "filebench"; + rev = "22620e602cbbebad90c0bd041896ebccf70dbf5f"; + hash = "sha256-IVQSEUZOC+X3C994tnk0n3NI7yu2yPAWlPA7zdSbvlg="; }; + patches = [ + (fetchpatch { + name = "gcc-15.patch"; + url = "https://github.com/filebench/filebench/commit/82191902e44b7a136adb9285bcce3d4a52551b9e.patch?full_index=1"; + hash = "sha256-Uf4DrHZl94m502C7MynMtYpon1886RLbXGKW6lYq1SI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison @@ -24,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "File system and storage benchmark that can generate both micro and macro workloads"; - homepage = "https://sourceforge.net/projects/filebench/"; + homepage = "https://github.com/filebench/filebench"; license = lib.licenses.cddl; - maintainers = [ ]; + maintainers = [ lib.maintainers.ryand56 ]; platforms = lib.platforms.linux; mainProgram = "filebench"; }; diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index aa6a25433792..24bc2247e3bc 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -12,13 +12,13 @@ }: let - version = "2.63.2"; + version = "2.63.3"; src = fetchFromGitHub { owner = "filebrowser"; repo = "filebrowser"; rev = "v${version}"; - hash = "sha256-pAD7mEiDQyfmKmClO9oMLgPua0jOrcImiQrSGLvhCEA="; + hash = "sha256-v3cC8opClvt91MqUIKNZdvCv0hPeCvWPi0IlOMHlWbQ="; }; frontend = buildNpmPackage rec { @@ -41,7 +41,7 @@ let ; fetcherVersion = 3; pnpm = pnpm_10; - hash = "sha256-0n2HxluqIcCzo1QA5D/YRCk5+mbTntLA8PFxZAC3YA8="; + hash = "sha256-g8BWDEymQNOkLYBws0ii4iLnpjB7X4EQl0OzR3GXeq0="; }; installPhase = '' @@ -59,7 +59,7 @@ buildGoModule { pname = "filebrowser"; inherit version src; - vendorHash = "sha256-YM/aIx1gDhFAKNNZmXvG3AVd4xSNC8AHIya4Gyeq9/Y="; + vendorHash = "sha256-ofeQkbvBfCpu2g1CLAwUZAZISyAOz+0smEZRx/koj/8="; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/fi/filen-desktop/package.nix b/pkgs/by-name/fi/filen-desktop/package.nix index abd50c5d20ea..862159bc5182 100644 --- a/pkgs/by-name/fi/filen-desktop/package.nix +++ b/pkgs/by-name/fi/filen-desktop/package.nix @@ -63,7 +63,7 @@ buildNpmPackage { electron makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index da380b148071..c177df3fddae 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.282"; + version = "2.15.287"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-2N4vftX3AZwxbebEGhc6LKkQXovv/y4JNKLNy3CpaU8="; + hash = "sha256-iKVoQCyLcsGc51IKwUzCpLqG5VbkIASpZILVVX14Sv8="; }; - vendorHash = "sha256-kP8YuqtrqmE3m4ACLIsSzXNj0AtmYdLoK9w1KmjExJA="; + vendorHash = "sha256-K9XXwKFC0xVYSwpQz7EubOoA2XSP7ROa3ORU9A/Gehg="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 6b3a72a9d94e..7cd357b00749 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/fi/firefly-desktop/package.nix b/pkgs/by-name/fi/firefly-desktop/package.nix index 1e0c4175d153..ccc35bad670d 100644 --- a/pkgs/by-name/fi/firefly-desktop/package.nix +++ b/pkgs/by-name/fi/firefly-desktop/package.nix @@ -20,12 +20,11 @@ appimageTools.wrapType2 { extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mkdir -p $out/share/applications $out/share/pixmaps - cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop + install -D ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop substituteInPlace $out/share/applications/firefly-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=firefly-desktop' \ - --replace 'Icon=desktop' 'Icon=firefly-desktop' - cp ${appimageContents}/desktop.png $out/share/pixmaps/firefly-desktop.png + --replace-fail 'Exec=AppRun' 'Exec=firefly-desktop' \ + --replace-fail 'Icon=desktop' 'Icon=firefly-desktop' + install -D ${appimageContents}/desktop.png $out/share/icons/firefly-desktop.png ''; meta = { diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index d1f35cba4f03..4fb02d0e786b 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchzip, stdenvNoCC, nodejs-slim, fetchNpmDeps, @@ -10,13 +11,20 @@ nix-update-script, dataDir ? "/var/lib/firefly-iii", }: - let php = php85; + version = "6.6.2"; + + # Release tarball contains translations downloaded from crowdin + releaseTarball = fetchzip { + url = "https://github.com/firefly-iii/firefly-iii/releases/download/v${version}/FireflyIII-v${version}.tar.gz"; + stripRoot = false; + hash = "sha256-vPuLCjU8MzV5odoDl9QQXj4kKnT6QBSAPwvekMxJtEM="; + }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.6.2"; + inherit version; src = fetchFromGitHub { owner = "firefly-iii"; @@ -55,6 +63,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { + inherit releaseTarball; phpPackage = php; tests = nixosTests.firefly-iii; updateScript = nix-update-script { @@ -68,6 +77,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { postInstall = '' chmod -R u+w $out/share mv $out/share/php/firefly-iii/* $out/ + + # Copy language files from release tarball (contains all translations) + cp -r ${finalAttrs.passthru.releaseTarball}/resources/lang/* $out/resources/lang/ + rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules ln -s ${dataDir}/storage $out/storage ln -s ${dataDir}/cache $out/bootstrap/cache diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index d6eead7cd42e..a0af663f595a 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -148,13 +148,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-LzpWSxhUMcJytxUoD7SZyLc/+hiL6CAyL/0FNbvBk1M="; + hash = "sha256-u0mBdWkxP4zI6NUhJ0LJrEDrbAAfTDi8IapsWWC9yWc="; }; env = { @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-WS7FWws1dIuVM9gE1PBnDZpUcRu96fWR80Az4Q+tZpI="; + hash = "sha256-d4YA9fnDQyfyK675nP+tiTqJ1o2jqjwPHU1trXd8MCA="; }; patches = [ diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index 18bba90c1a25..4892fbf6a1ba 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "flaca"; - version = "3.5.3"; + version = "3.6.1"; lockFile = fetchurl { url = "https://github.com/Blobfolio/flaca/releases/download/v${finalAttrs.version}/Cargo.lock"; - hash = "sha256-NNeq8qr+z0s98mgFYyUu9aNRqaAi2CZfQx0vQzSzOc8="; + hash = "sha256-GNpL51rx3na+ECHUl0JAUQJBRQQ12Ubg4RIhNfXxMRQ="; }; src = fetchFromGitHub { owner = "Blobfolio"; repo = "flaca"; tag = "v${finalAttrs.version}"; - hash = "sha256-Fh+nWnAG87NL3scr/y2jCNqaeJtEwi4nCYTGwnmEsIQ="; + hash = "sha256-LVk+2zt7Abku3bR5FnpugztMy0A3LmpO2yBkZO1jjxc="; }; postUnpack = '' @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-yHkUsxJppHhIpgX7Vtrs8TCy43xaNpqoVkMZ0msr02k="; + cargoHash = "sha256-73O/h7Cuh+to9MpQ97daPFKI4ACtT0aer3h0EmKKcoA="; meta = { description = "CLI tool to losslessly compress JPEG and PNG images"; diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix index 18f55e5cbda9..eb89a4959e9f 100644 --- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -6,7 +6,7 @@ pantheon, gnome-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme @@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontFixup = true; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/share/icons diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index ec40ec7af51a..b9f4426b0fd5 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -6,14 +6,14 @@ imagemagick, libgbm, libdrm, - flutter338, + flutter341, pulseaudio, webkitgtk_4_1, copyDesktopItems, makeDesktopItem, callPackage, - vodozemac-wasm ? callPackage ./vodozemac-wasm.nix { flutter = flutter338; }, + vodozemac-wasm ? callPackage ./vodozemac-wasm.nix { flutter = flutter341; }, targetFlutterPlatform ? "linux", }: @@ -25,20 +25,20 @@ let ]; pubspecLock = lib.importJSON ./pubspec.lock.json; libwebrtc = fetchzip { - url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.1.0/libwebrtc.zip"; - sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA="; + url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.3.0/libwebrtc.zip"; + sha256 = "sha256-lGvWAicdKbNdMZAQS9Qyxv737G/sBI/hKbge/Xw5bDM="; }; in -flutter338.buildFlutterApplication ( +flutter341.buildFlutterApplication ( rec { pname = "fluffychat-${targetFlutterPlatform}"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "krille-chan"; repo = "fluffychat"; tag = "v${version}"; - hash = "sha256-8Q+A5IZW6RjmnE+ovI7HYPZCi0oOoj9SU7o0VUPXxsM="; + hash = "sha256-8iMSfF5K/9bQot7Tzc2XuuiQnquLZmS0ucC5t2T/HEA="; }; inherit pubspecLock; diff --git a/pkgs/by-name/fl/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json index 57e11b462370..603c99479c39 100644 --- a/pkgs/by-name/fl/fluffychat/pubspec.lock.json +++ b/pkgs/by-name/fl/fluffychat/pubspec.lock.json @@ -20,15 +20,15 @@ "source": "hosted", "version": "8.4.1" }, - "animations": { - "dependency": "direct main", + "analyzer_plugin": { + "dependency": "transitive", "description": { - "name": "animations", - "sha256": "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab", + "name": "analyzer_plugin", + "sha256": "825071d553c4aef2252196d46a665fbd8e0cb06de07725f25d1b29bd18d65fff", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "0.13.6" }, "ansicolor": { "dependency": "transitive", @@ -40,55 +40,15 @@ "source": "hosted", "version": "2.0.3" }, - "app_links": { - "dependency": "direct main", - "description": { - "name": "app_links", - "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.4.1" - }, - "app_links_linux": { - "dependency": "transitive", - "description": { - "name": "app_links_linux", - "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.3" - }, - "app_links_platform_interface": { - "dependency": "transitive", - "description": { - "name": "app_links_platform_interface", - "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "app_links_web": { - "dependency": "transitive", - "description": { - "name": "app_links_web", - "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, "archive": { "dependency": "direct main", "description": { "name": "archive", - "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.7" + "version": "4.0.9" }, "args": { "dependency": "transitive", @@ -114,11 +74,11 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac", + "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.25" + "version": "0.2.2" }, "badges": { "dependency": "direct main", @@ -174,11 +134,11 @@ "dependency": "transitive", "description": { "name": "build_cli_annotations", - "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "canonical_json": { "dependency": "transitive", @@ -194,11 +154,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.4.1" }, "charcode": { "dependency": "transitive", @@ -214,11 +174,11 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "chewie": { "dependency": "direct main", @@ -260,6 +220,16 @@ "source": "hosted", "version": "1.1.2" }, + "code_assets": { + "dependency": "transitive", + "description": { + "name": "code_assets", + "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "collection": { "dependency": "direct main", "description": { @@ -294,31 +264,31 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.13.1" + "version": "1.15.0" }, "cross_file": { "dependency": "direct main", "description": { "name": "cross_file", - "sha256": "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239", + "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5" + "version": "0.3.5+2" }, "crypto": { "dependency": "transitive", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "csslib": { "dependency": "transitive", @@ -331,7 +301,7 @@ "version": "1.0.2" }, "cupertino_icons": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "cupertino_icons", "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", @@ -340,6 +310,16 @@ "source": "hosted", "version": "1.0.8" }, + "dart_code_linter": { + "dependency": "direct dev", + "description": { + "name": "dart_code_linter", + "sha256": "1b53722d9933a5f5d4580acc29c7f16b1fde66d21d1ecf7bb2a811caf3a42b42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, "dart_earcut": { "dependency": "transitive", "description": { @@ -360,25 +340,35 @@ "source": "hosted", "version": "1.0.0" }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, "dart_webrtc": { "dependency": "transitive", "description": { "name": "dart_webrtc", - "sha256": "51bcda4ba5d7dd9e65a309244ce3ac0b58025e6e1f6d7442cee4cd02134ef65f", + "sha256": "4ed7b9fa9924e5a81eb39271e2c2356739dd1039d60a13b86ba6c5f448625086", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.0" + "version": "1.7.0" }, "dbus": { "dependency": "transitive", "description": { "name": "dbus", - "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.11" + "version": "0.7.12" }, "desktop_drop": { "dependency": "direct main", @@ -464,11 +454,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "file": { "dependency": "transitive", @@ -484,11 +474,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "d974b6ba2606371ac71dd94254beefb6fa81185bde0b59bdc1df09885da85fde", + "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.8" + "version": "10.3.10" }, "file_selector": { "dependency": "direct main", @@ -504,21 +494,21 @@ "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54", + "sha256": "51e8fd0446de75e4b62c065b76db2210c704562d072339d333bd89c57a7f8a7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+14" + "version": "0.5.2+4" }, "file_selector_ios": { "dependency": "transitive", "description": { "name": "file_selector_ios", - "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420", + "sha256": "e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.3+1" + "version": "0.5.3+5" }, "file_selector_linux": { "dependency": "transitive", @@ -564,11 +554,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", + "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+4" + "version": "0.9.3+5" }, "fixnum": { "dependency": "transitive", @@ -596,11 +586,11 @@ "dependency": "direct main", "description": { "name": "flutter_foreground_task", - "sha256": "48ea45056155a99fb30b15f14f4039a044d925bc85f381ed0b2d3b00a60b99de", + "sha256": "1903697944a31f596622e51a6af55e3a9dfb27762f9763ab2841184098c6b0ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.0" + "version": "9.2.1" }, "flutter_linkify": { "dependency": "direct main", @@ -626,41 +616,41 @@ "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875", + "sha256": "0d9035862236fe38250fe1644d7ed3b8254e34a21b2c837c9f539fbb3bba5ef1", "url": "https://pub.dev" }, "source": "hosted", - "version": "19.5.0" + "version": "21.0.0" }, "flutter_local_notifications_linux": { "dependency": "transitive", "description": { "name": "flutter_local_notifications_linux", - "sha256": "e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5", + "sha256": "e0f25e243c6c44c825bbbc6b2b2e76f7d9222362adcfe9fd780bf01923c840bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "8.0.0" }, "flutter_local_notifications_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_local_notifications_platform_interface", - "sha256": "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe", + "sha256": "e7db3d5b49c2b7ecc68deba4aaaa67a348f92ee0fef34c8e4b4459dbef0d7307", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.0" + "version": "11.0.0" }, "flutter_local_notifications_windows": { "dependency": "transitive", "description": { "name": "flutter_local_notifications_windows", - "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf", + "sha256": "3a2654ba104fbb52c618ebed9def24ef270228470718c43b3a6afcd5c81bef0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.3" + "version": "3.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -702,11 +692,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", + "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.28" + "version": "2.0.33" }, "flutter_rust_bridge": { "dependency": "transitive", @@ -722,61 +712,61 @@ "dependency": "direct main", "description": { "name": "flutter_secure_storage", - "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea", + "sha256": "da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.4" + "version": "10.0.0" + }, + "flutter_secure_storage_darwin": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_darwin", + "sha256": "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "flutter_secure_storage_linux": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_linux", - "sha256": "be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688", + "sha256": "2b5c76dce569ab752d55a1cee6a2242bcc11fdba927078fb88c503f150767cda", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" - }, - "flutter_secure_storage_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_secure_storage_macos", - "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.3" + "version": "3.0.0" }, "flutter_secure_storage_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_platform_interface", - "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "sha256": "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "2.0.1" }, "flutter_secure_storage_web": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_web", - "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "sha256": "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "2.1.0" }, "flutter_secure_storage_windows": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_windows", - "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "sha256": "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "4.1.0" }, "flutter_shortcuts_new": { "dependency": "direct main", @@ -798,31 +788,31 @@ "dependency": "direct main", "description": { "name": "flutter_vodozemac", - "sha256": "16d4b44dd338689441fe42a80d0184e5c864e9563823de9e7e6371620d2c0590", + "sha256": "ef4c3580a7f2fe8eebb7602c6cba593a42b4a5e5466c372a022f77ccc14914a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.1" + "version": "0.5.0" }, "flutter_web_auth_2": { "dependency": "direct main", "description": { "name": "flutter_web_auth_2", - "sha256": "3c14babeaa066c371f3a743f204dd0d348b7d42ffa6fae7a9847a521aff33696", + "sha256": "432ff8c7b2834eaeec3378d99e24a0210b9ac2f453b3f7a7d739a5c09069fba3", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "5.0.1" }, "flutter_web_auth_2_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_web_auth_2_platform_interface", - "sha256": "c63a472c8070998e4e422f6b34a17070e60782ac442107c70000dd1bed645f4d", + "sha256": "ba0fbba55bffb47242025f96852ad1ffba34bc451568f56ef36e613612baffab", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "5.0.0" }, "flutter_web_plugins": { "dependency": "transitive", @@ -834,11 +824,11 @@ "dependency": "direct main", "description": { "name": "flutter_webrtc", - "sha256": "71a38363a5b50603e405c275f30de2eb90f980b0cc94b0e1e9d8b9d6a6b03bf0", + "sha256": "c549ea8ffb20167110ad0a28e5f17a2650b5bea8837d984898cd9b0ffd5fa78b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.3.1" }, "frontend_server_client": { "dependency": "transitive", @@ -900,11 +890,11 @@ "dependency": "transitive", "description": { "name": "geolocator_linux", - "sha256": "c4e966f0a7a87e70049eac7a2617f9e16fd4c585a26e4330bdfc3a71e6a721f3", + "sha256": "d64112a205931926f4363bb6bd48f14cb38e7326833041d170615586cd143797", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.3" + "version": "0.2.4" }, "geolocator_platform_interface": { "dependency": "transitive", @@ -950,11 +940,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "eff94d2a6fc79fa8b811dde79c7549808c2346037ee107a1121b4a644c745f2a", + "sha256": "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896", "url": "https://pub.dev" }, "source": "hosted", - "version": "17.0.1" + "version": "17.1.0" }, "gsettings": { "dependency": "transitive", @@ -966,25 +956,15 @@ "source": "hosted", "version": "0.2.8" }, - "gtk": { - "dependency": "transitive", - "description": { - "name": "gtk", - "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, "handy_window": { "dependency": "direct main", "description": { "name": "handy_window", - "sha256": "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a", + "sha256": "06cc2747607022dbcea54b9b863db0962d34d606f998831a9b05a551c5184462", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.4.2" }, "highlight": { "dependency": "direct main", @@ -996,6 +976,16 @@ "source": "hosted", "version": "0.7.0" }, + "hooks": { + "dependency": "transitive", + "description": { + "name": "hooks", + "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, "html": { "dependency": "direct main", "description": { @@ -1050,11 +1040,11 @@ "dependency": "direct main", "description": { "name": "image", - "sha256": "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c", + "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.7.2" + "version": "4.8.0" }, "image_picker": { "dependency": "direct main", @@ -1070,31 +1060,31 @@ "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c", + "sha256": "518a16108529fc18657a3e6dde4a043dc465d16596d20ab2abd49a4cac2e703d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.13" + "version": "0.8.13+13" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6", + "sha256": "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e", + "sha256": "b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.13" + "version": "0.8.13+6" }, "image_picker_linux": { "dependency": "transitive", @@ -1110,21 +1100,21 @@ "dependency": "transitive", "description": { "name": "image_picker_macos", - "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04", + "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.2" + "version": "0.2.2+1" }, "image_picker_platform_interface": { "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665", + "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.11.1" }, "image_picker_windows": { "dependency": "transitive", @@ -1136,16 +1126,6 @@ "source": "hosted", "version": "0.2.2" }, - "import_sorter": { - "dependency": "direct dev", - "description": { - "name": "import_sorter", - "sha256": "eb15738ccead84e62c31e0208ea4e3104415efcd4972b86906ca64a1187d0836", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.6.0" - }, "integration_test": { "dependency": "direct dev", "description": "flutter", @@ -1186,11 +1166,11 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.9.0" + "version": "4.10.0" }, "just_audio": { "dependency": "direct main", @@ -1236,11 +1216,11 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.0.1" + "version": "11.0.2" }, "leak_tracker_flutter_testing": { "dependency": "transitive", @@ -1273,7 +1253,7 @@ "version": "1.6.2" }, "linkify": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "linkify", "sha256": "4139ea77f4651ab9c315b577da2dd108d9aa0bd84b5d03d33323f1970c645832", @@ -1286,11 +1266,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "6.1.0" }, "lists": { "dependency": "transitive", @@ -1306,11 +1286,11 @@ "dependency": "transitive", "description": { "name": "logger", - "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.2" }, "logging": { "dependency": "transitive", @@ -1336,31 +1316,31 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.17" + "version": "0.12.19" }, "material_color_utilities": { "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.1" + "version": "0.13.0" }, "matrix": { "dependency": "direct main", "description": { "name": "matrix", - "sha256": "fb116ee89f6871441f22f76a988db15cfcfb6dfac97e3e2d654c240080015707", + "sha256": "5bb38e98212bc4c3244c762a1af787f7239a38d2cfdf44488258283ff899f77c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "6.2.0" }, "meta": { "dependency": "transitive", @@ -1392,6 +1372,26 @@ "source": "hosted", "version": "2.0.0" }, + "native_imaging": { + "dependency": "direct main", + "description": { + "name": "native_imaging", + "sha256": "ced7acb18b80a431578c9068eb9c3ee75f8df39491e8adaf471635bac282d651", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "native_toolchain_c": { + "dependency": "transitive", + "description": { + "name": "native_toolchain_c", + "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.4" + }, "nested": { "dependency": "transitive", "description": { @@ -1412,6 +1412,16 @@ "source": "hosted", "version": "2.0.2" }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.3.0" + }, "opus_caf_converter_dart": { "dependency": "direct main", "description": { @@ -1436,11 +1446,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.1" + "version": "9.0.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1456,11 +1466,21 @@ "dependency": "transitive", "description": { "name": "pana", - "sha256": "eb816d35b80d3880335c3f2d139b376e81fd98a9ea273faf39f2c8914c4afba5", + "sha256": "d7bd85f18a14909f0baab69a13895dc4ff163be51c9884f73a506982adeac57d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.23.3" + "version": "0.23.10" + }, + "particles_network": { + "dependency": "direct main", + "description": { + "name": "particles_network", + "sha256": "fbaead7961925946ff83e5b441bdbc8628139ea161ce901547e6f1190a6161de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.3" }, "path": { "dependency": "direct main", @@ -1486,21 +1506,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.6.0" }, "path_provider_linux": { "dependency": "transitive", @@ -1532,75 +1552,15 @@ "source": "hosted", "version": "2.3.0" }, - "permission_handler": { - "dependency": "direct main", - "description": { - "name": "permission_handler", - "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "12.0.1" - }, - "permission_handler_android": { - "dependency": "transitive", - "description": { - "name": "permission_handler_android", - "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "13.0.1" - }, - "permission_handler_apple": { - "dependency": "transitive", - "description": { - "name": "permission_handler_apple", - "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.4.7" - }, - "permission_handler_html": { - "dependency": "transitive", - "description": { - "name": "permission_handler_html", - "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3+5" - }, - "permission_handler_platform_interface": { - "dependency": "transitive", - "description": { - "name": "permission_handler_platform_interface", - "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.3.0" - }, - "permission_handler_windows": { - "dependency": "transitive", - "description": { - "name": "permission_handler_windows", - "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1" - }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "platform": { "dependency": "transitive", @@ -1626,11 +1586,11 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" }, "posix": { "dependency": "transitive", @@ -1646,21 +1606,21 @@ "dependency": "direct main", "description": { "name": "pretty_qr_code", - "sha256": "2291db3f68d70a3dcd46c6bd599f30991ae4c02f27f36215fbb3f4865a609259", + "sha256": "474f8a4512113fba06f14a6ec9bbf42353b4e651d7a520e3096f2a9b6bbe7a8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.0" + "version": "3.6.0" }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.3" + "version": "5.0.5" }, "proj4dart": { "dependency": "transitive", @@ -1692,6 +1652,16 @@ "source": "hosted", "version": "2.2.0" }, + "pub_updater": { + "dependency": "transitive", + "description": { + "name": "pub_updater", + "sha256": "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, "pubspec_parse": { "dependency": "transitive", "description": { @@ -1726,11 +1696,11 @@ "dependency": "direct main", "description": { "name": "qr_code_scanner_plus", - "sha256": "b764e5004251c58d9dee0c295e6006e05bd8d249e78ac3383abdb5afe0a996cd", + "sha256": "dae0596b2763c2fd0294f5cfddb1d3a21577ae4dc7fc1449eb5aafc957872f61", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.14" + "version": "2.1.1" }, "qr_image": { "dependency": "direct main", @@ -1766,71 +1736,71 @@ "dependency": "direct main", "description": { "name": "record", - "sha256": "6bad72fb3ea6708d724cf8b6c97c4e236cf9f43a52259b654efeb6fd9b737f1f", + "sha256": "d5b6b334f3ab02460db6544e08583c942dbf23e3504bf1e14fd4cbe3d9409277", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.2.0" }, "record_android": { "dependency": "transitive", "description": { "name": "record_android", - "sha256": "fb54ee4e28f6829b8c580252a9ef49d9c549cfd263b0660ad7eeac0908658e9f", + "sha256": "94783f08403aed33ffb68797bf0715b0812eb852f3c7985644c945faea462ba1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.4" + "version": "1.5.1" }, "record_ios": { "dependency": "transitive", "description": { "name": "record_ios", - "sha256": "765b42ac1be019b1674ddd809b811fc721fe5a93f7bb1da7803f0d16772fd6d7", + "sha256": "8df7c136131bd05efc19256af29b2ba6ccc000ccc2c80d4b6b6d7a8d21a3b5a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.0" }, "record_linux": { "dependency": "transitive", "description": { "name": "record_linux", - "sha256": "235b1f1fb84e810f8149cc0c2c731d7d697f8d1c333b32cb820c449bf7bb72d8", + "sha256": "c31a35cc158cd666fc6395f7f56fc054f31685571684be6b97670a27649ce5c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.3.0" }, "record_macos": { "dependency": "transitive", "description": { "name": "record_macos", - "sha256": "842ea4b7e95f4dd237aacffc686d1b0ff4277e3e5357865f8d28cd28bc18ed95", + "sha256": "084902e63fc9c0c224c29203d6c75f0bdf9b6a40536c9d916393c8f4c4256488", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.1" }, "record_platform_interface": { "dependency": "transitive", "description": { "name": "record_platform_interface", - "sha256": "b0065fdf1ec28f5a634d676724d388a77e43ce7646fb049949f58c69f3fcb4ed", + "sha256": "8a81dbc4e14e1272a285bbfef6c9136d070a47d9b0d1f40aa6193516253ee2f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "record_web": { "dependency": "transitive", "description": { "name": "record_web", - "sha256": "4f0adf20c9ccafcc02d71111fd91fba1ca7b17a7453902593e5a9b25b74a5c56", + "sha256": "7e9846981c1f2d111d86f0ae3309071f5bba8b624d1c977316706f08fc31d16d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "record_windows": { "dependency": "transitive", @@ -1976,21 +1946,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.20" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.6" }, "shared_preferences_linux": { "dependency": "transitive", @@ -2112,31 +2082,21 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.1" - }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" + "version": "1.10.2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "sqflite_common_ffi": { "dependency": "direct main", @@ -2232,11 +2192,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.0" }, "term_glyph": { "dependency": "transitive", @@ -2252,61 +2212,51 @@ "dependency": "transitive", "description": { "name": "test", - "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7", + "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.26.3" + "version": "1.30.0" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.7" + "version": "0.7.10" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0", + "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.12" + "version": "0.6.16" }, "timezone": { "dependency": "transitive", "description": { "name": "timezone", - "sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1", + "sha256": "784a5e34d2eb62e1326f24d6f600aaaee452eb8ca8ef2f384a59244e292d158b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.1" - }, - "tint": { - "dependency": "transitive", - "description": { - "name": "tint", - "sha256": "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" + "version": "0.11.0" }, "translations_cleaner": { "dependency": "direct dev", "description": { "name": "translations_cleaner", - "sha256": "811f42be32f024fdf083903f198d3625f6ee6927601e3a53a29b85b90508b88c", + "sha256": "c6e5051cb5d4fe4c5b2cc1ef83a6964f27063f9cf5b6166f445709bea8f81ad3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0" + "version": "0.1.1" }, "typed_data": { "dependency": "transitive", @@ -2342,11 +2292,11 @@ "dependency": "transitive", "description": { "name": "unifiedpush_android", - "sha256": "556796c81e8151ee8e4275baea2f7191119e8b1412ec35523cc2ac1c44c348bf", + "sha256": "2e6684e0a1a39ad8d6c7bc0d197954d50686acb1b1a7614b18ab0e0126f5492a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.0" + "version": "3.4.1" }, "unifiedpush_linux": { "dependency": "transitive", @@ -2442,41 +2392,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.16" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.4.1" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2492,31 +2442,31 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { "dependency": "transitive", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "vector_math": { "dependency": "transitive", @@ -2542,101 +2492,101 @@ "dependency": "direct main", "description": { "name": "video_player", - "sha256": "096bc28ce10d131be80dfb00c223024eb0fba301315a406728ab43dd99c45bdf", + "sha256": "48a7bdaa38a3d50ec10c78627abdbfad863fdf6f0d6e08c7c3c040cfd80ae36f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.10.1" + "version": "2.11.1" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "28dcc4122079f40f93a0965b3679aff1a5f4251cf79611bd8011f937eb6b69de", + "sha256": "e726b33894526cf96a3eefe61af054b0c3e7d254443b3695b3c142dc277291be", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.8.4" + "version": "2.9.3" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f", + "sha256": "f93b93a3baa12ca0ff7d00ca8bc60c1ecd96865568a01ff0c18a99853ee201a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.1" + "version": "2.9.3" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844", + "sha256": "57c5d73173f76d801129d0531c2774052c5a7c11ccb962f1830630decd9f24ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.6.0" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba", + "sha256": "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.4.0" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.2" }, "vodozemac": { "dependency": "transitive", "description": { "name": "vodozemac", - "sha256": "39144e20740807731871c9248d811ed5a037b21d0aa9ffcfa630954de74139d9", + "sha256": "bbe7dd31d7f623e2aeedb92e4b71a8b519e6109ce1e2911b5a220f6752b65cda", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.5.0" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b", + "sha256": "e4e125b7c1a2f0e491e5452afdc0e25ab77b2d2775a7caa231fcc1c1f2162c47", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.3" + "version": "1.5.0" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207", + "sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" + "version": "1.4.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.2.1" }, "web": { "dependency": "transitive", @@ -2672,11 +2622,11 @@ "dependency": "transitive", "description": { "name": "webcrypto", - "sha256": "e393b3d0b01694a8f81efecf278ed7392877130e6e7b29f578863e4f2d0b2ebd", + "sha256": "sha256-a0MAHEEQhW/3+l5eZeey1EvsHYtUpNhNX6LHYiJnxcE=", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "webdriver": { "dependency": "transitive", @@ -2702,31 +2652,31 @@ "dependency": "transitive", "description": { "name": "webpush_encryption", - "sha256": "63046b7d6909f4a72ce3c153fa574726e257aaf21b1995ba063dc241a1b1520b", + "sha256": "5b83272b91acda6ae515fcd980c94f06bf413702282497c5a68f5dfc64fed27f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.0.1" }, "webrtc_interface": { "dependency": "direct main", "description": { "name": "webrtc_interface", - "sha256": "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233", + "sha256": "ad0e5786b2acd3be72a3219ef1dde9e1cac071cf4604c685f11b61d63cdd6eb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.14.0" + "version": "5.15.0" }, "win32_registry": { "dependency": "transitive", @@ -2800,7 +2750,7 @@ } }, "sdks": { - "dart": ">=3.10.0 <4.0.0", - "flutter": ">=3.35.0" + "dart": ">=3.11.1 <4.0.0", + "flutter": ">=3.38.4" } } diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index e134b52de943..fca91def2a8a 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fly"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${finalAttrs.version}"; - hash = "sha256-JWl3dUx3eQWD8I+be6APuQklUw1ZzW6xK6iypxbgxF0="; + hash = "sha256-zQ7J04QHozRRFPWKjKtI5nB15x5ztYennfM16rpZpP8="; }; - vendorHash = "sha256-ZZfiRfOkAcF3ItB4tjp8BgurMThxUOoBMyt9PeJpus4="; + vendorHash = "sha256-dvE5rtJX3MIuYyswLgcwojd5LIkhD4WnPEL3HNfmhkA="; subPackages = [ "fly" ]; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 8a35497c0404..2b6eae3dc87e 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "flyctl"; - version = "0.4.42"; + version = "0.4.49"; src = fetchFromGitHub { owner = "superfly"; @@ -22,11 +22,11 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-yAzd7bytBKxOBGs8ja48QPVdmJSvRfIzi8K2DoC0O+Y="; + hash = "sha256-WOk4zIWZbf3s4jPzeHANxHAOZvnnm3ENdGluSuM90WM="; }; proxyVendor = true; - vendorHash = "sha256-TUlOdRfexuxC2Of6ZHPYChCr3i1IGapLZz1/lAhnUxk="; + vendorHash = "sha256-395vcBQYvc3LUQSPGtJ1x6RIhUmkR6Y/wGFCD3vrMcE="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fm/fmd-server/package.nix b/pkgs/by-name/fm/fmd-server/package.nix index efd319a5dae0..e5fad6c9ac32 100644 --- a/pkgs/by-name/fm/fmd-server/package.nix +++ b/pkgs/by-name/fm/fmd-server/package.nix @@ -17,12 +17,12 @@ buildGoModule ( in { pname = "fmd-server"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitLab { owner = "fmd-foss"; repo = "fmd-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-zAGwKOfPu7AEYhaDxx1P3EoA1K9p/f3Vwh7GrynqKho="; + hash = "sha256-EzhXrB15lRtDnFicdH7fjpcm1BYoAb1SBeylGSub69s="; }; pnpmDeps = fetchPnpmDeps { @@ -30,7 +30,7 @@ buildGoModule ( inherit pnpm_10; sourceRoot = "${finalAttrs.src.name}/${ui.pnpmRoot}"; fetcherVersion = 3; - hash = "sha256-fgqNaFQ4+uJxXzDJJq+D0+EFaLaYR+WUzi5kGq5ezjs="; + hash = "sha256-vKSKPwOkb7TwDUlkl8lUvO6tLKp2NyBQ0BGxThUN2P8="; }; vendorHash = "sha256-cFIg9mOSQbrYHW4kg4aTeTaF+gy1jNpAlg8qepb81Jc="; diff --git a/pkgs/by-name/fm/fmit/package.nix b/pkgs/by-name/fm/fmit/package.nix index b49b60e60747..5889b19bfd53 100644 --- a/pkgs/by-name/fm/fmit/package.nix +++ b/pkgs/by-name/fm/fmit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - libsForQt5, + qt6, fftw, itstool, alsaSupport ? true, @@ -19,31 +19,34 @@ assert portaudioSupport -> portaudio != null; stdenv.mkDerivation (finalAttrs: { pname = "fmit"; - version = "1.2.14"; + version = "1.3.3"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${finalAttrs.version}"; - sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; + sha256 = "sha256-fi5/JCgum+TYexUuTRZNFWPPsR87P73gfYhozQYx3Rw="; }; nativeBuildInputs = [ - libsForQt5.qmake + qt6.qmake itstool - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ fftw - libsForQt5.qtbase - libsForQt5.qtmultimedia + qt6.qtbase + qt6.qtmultimedia + qt6.qtsvg ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals jackSupport [ libjack2 ] ++ lib.optionals portaudioSupport [ portaudio ]; postPatch = '' - substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${finalAttrs.version}' + substituteInPlace fmit.pro \ + --replace-fail 'FMITVERSIONPRO = $$system(git describe --tags --always)' 'FMITVERSIONPRO = ${finalAttrs.version}' \ + --replace-fail 'FMITBRANCHGITPRO = $$system(git rev-parse --abbrev-ref HEAD)' 'FMITBRANCHGITPRO = master' ''; qmakeFlags = [ diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index 60fcac666064..a9354ee28cbc 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fna3d"; - version = "26.04"; + version = "26.05"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-DZZuJ0bppyoXgewAOrtDnOHi4rKKc9PNxKif1BIN2Zk="; + hash = "sha256-b0s7aKRTKNYIIckSItmjsY2Or8td/YvTELx6tOFhiKM="; }; cmakeFlags = [ diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 4f85ec25dc13..d4ae132e8e78 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -45,7 +45,7 @@ let # Timeouts "TestRunJob_WithConnectionFromCommandOptions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Uses docker-specific options, unsupported on Darwin "TestMergeJobOptions" ]; diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix index 1d219e19537c..40e03e02cf70 100644 --- a/pkgs/by-name/fo/fosrl-newt/package.nix +++ b/pkgs/by-name/fo/fosrl-newt/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "newt"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "fosrl"; repo = "newt"; tag = finalAttrs.version; - hash = "sha256-Maw0qELlnh0m+NsQGdDC3wGYK8zi8Lbt7zwJqieR4hg="; + hash = "sha256-wYLnuKIU+wcCxF57cdfepTVm52btfdrveQ8Y+R9flMo="; }; - vendorHash = "sha256-+zMSzNbqmWm/DXL2xMUd5uPP5tSIybsRokwJ2zd0pf0="; + vendorHash = "sha256-WfIK+Q8WQ372NzLw6DRapv1nYPduShi4KnVJBPk0Oz0="; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -30,8 +30,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; - versionCheckProgramArg = [ "-version" ]; - passthru.updateScript = nix-update-script { }; __structuredAttrs = true; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index b7d3c0af79cc..8760b4204aaa 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -5,7 +5,6 @@ buildNpmPackage, makeWrapper, formats, - inter, databaseType ? "sqlite", environmentVariables ? { }, nixosTests, @@ -29,16 +28,16 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.17.1"; + version = "1.18.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-V1yOSFN2g5MHPIXF/UFymgXrfN5tE99cuIFnWpdCVCA="; + hash = "sha256-1grYW3UrQsw94xFyKj+n8styihRdW/+aW2Q5lq9b3Bg="; }; - npmDepsHash = "sha256-DyPfylne9Ku7sEUNN0LLlN0EOnCjcklsh+F6YP+rXv4="; + npmDepsHash = "sha256-+qsHvytwAIbbNYpgNT6I7lekpxY0mUWcWGA9dT6rbtc="; nativeBuildInputs = [ esbuild @@ -48,23 +47,13 @@ buildNpmPackage (finalAttrs: { # dependency resolution is borked npmFlags = [ "--legacy-peer-deps" ]; - # Replace the googleapis.com Inter font with a local copy from Nixpkgs. - # Based on pkgs.nextjs-ollama-llm-ui. - postPatch = '' - substituteInPlace src/app/layout.tsx --replace-fail \ - "{ Inter } from \"next/font/google\"" \ - "localFont from \"next/font/local\"" - - substituteInPlace src/app/layout.tsx --replace-fail \ - "const inter = Inter({${"\n"} subsets: [\"latin\"]${"\n"}});" \ - "const inter = localFont({ src: './Inter.ttf' });" - - substituteInPlace server/lib/consts.ts --replace-fail \ - 'export const APP_VERSION = "1.17.0";' \ - 'export const APP_VERSION = "${finalAttrs.version}";' - - cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf - ''; + # upstream inconsistently updates this + # so leaving this here in case it's needed + # postPatch = '' + # substituteInPlace server/lib/consts.ts --replace-fail \ + # 'export const APP_VERSION = "${lib.versions.majorMinor finalAttrs.version + ".0"}";' \ + # 'export const APP_VERSION = "${finalAttrs.version}";' + # ''; preBuild = '' npm run set:${db false} diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index 0e237120cb03..a38818417b30 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.3.11"; + version = "3.3.12"; src = fetchurl { url = "https://thomasokken.com/free42/upstream/free42-nologo-${finalAttrs.version}.tgz"; - hash = "sha256-Y9tV06K+1tZmoNBLS5tsOoLPjS2unTe8c0AYkHgDVVo="; + hash = "sha256-Ybr5IwqYBIXGWcLBM2drKuN2NDBta299X/3hvzvGPeU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index 400660be9e83..e35f6a48994a 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -16,24 +16,24 @@ let pname = "freelens-bin"; - version = "1.8.1"; + version = "1.9.0"; sources = { x86_64-linux = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-amd64.AppImage"; - hash = "sha256-Goe/eAmefL+4itHrGmQjBGVWalk559kGg/OgA1yKKdk="; + hash = "sha256-aM3sS87kpb9UhVMdG7cPeCp4j9KBW71H+MJR+oN4908="; }; aarch64-linux = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage"; - hash = "sha256-Mcvjiv7tQU56uaVvtoK5mn6jpQsRnP1F2UeG8OHhywQ="; + hash = "sha256-/DUMuGAhVV0Ro4UbAF6lwjgB4/Wi1AY2UKn9ZuN7fDc="; }; x86_64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg"; - hash = "sha256-4b4xzr4shEBYhqQ+NZaew4ZSq3J5den5KPJ7X8UpTJ8="; + hash = "sha256-xKH/RBR2if37WiquCC+ZSxGyoFF32iIPvYdGNfDbDFw="; }; aarch64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg"; - hash = "sha256-jCR/ypqGTp8swi1b9hgm4iWjGoKA2pW0mqxF8QJzYVk="; + hash = "sha256-dp/kD6NHmK/CNZEF2BKh6NAChBTMgjZLY7eIwhyWgWk="; }; }; diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index e2b79c9631e3..4babd94ed95a 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.3.2"; + version = "0.3.5"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-1i87gZgAicFKEIfI3aqek8pHT+iDI7Y4awyBGzLcggo="; + hash = "sha256-L2UnVhNiZtawIYP8ni/TiAATt5gOAYUC0RgTe3zi5uk="; }; - cargoHash = "sha256-l88eXpCoMQV63iZ1tLwjeM+TVH/Juibr5MHX3sL6jLA="; + cargoHash = "sha256-4SmvNOJIXV1u+BwOZgxEREtGdOpjACAf7AzYAzPWDVQ="; nativeBuildInputs = [ gzip diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index ca50d1f3a610..58c2735a7753 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "fritz-exporter"; - version = "2.6.0"; + version = "2.6.2"; pyproject = true; src = fetchFromGitHub { owner = "pdreker"; repo = "fritz_exporter"; tag = "fritzexporter-v${finalAttrs.version}"; - hash = "sha256-m2jDQN6c3S4xDIrmRFdD+stwutBxcespLKZvxp1VC0I="; + hash = "sha256-qHx96TluE3RdkIfMcsnMt+LcHoqS2l5sD0+94yizbp8="; }; postPatch = '' diff --git a/pkgs/by-name/fu/fut/package.nix b/pkgs/by-name/fu/fut/package.nix index 5641ab5ebccc..e884f6fcf122 100644 --- a/pkgs/by-name/fu/fut/package.nix +++ b/pkgs/by-name/fu/fut/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fut"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "fusionlanguage"; repo = "fut"; tag = "fut-${finalAttrs.version}"; - hash = "sha256-IsGe8dGfE8npOZs3A/Y9gIRxkve93V7Aq/YuDBjVNb8="; + hash = "sha256-UOToKLQMO/g48DfXi9QQoZ7xJgBsz1Spjc35oEgjHis="; }; buildPhase = '' diff --git a/pkgs/by-name/fv/fverb/package.nix b/pkgs/by-name/fv/fverb/package.nix index 63495ca19594..532360cf4156 100644 --- a/pkgs/by-name/fv/fverb/package.nix +++ b/pkgs/by-name/fv/fverb/package.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; # clang++: error: unsupported option '-mfpu=' for target 'arm64-apple-darwin' # clang++: error: unsupported option '-mfloat-abi=' for target 'arm64-apple-darwin' - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 08c059bb8baa..738cbd6267a1 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -3,18 +3,19 @@ stdenv, lib, fetchFromGitHub, + unstableGitUpdater, zsh, }: stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2025-12-15"; + version = "1.0.0-unstable-2026-03-03"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "cdd9d5cc3b41a3a390a0fb8605c40de652da6309"; - hash = "sha256-i6qoaMWVofhD3K6/RaaNatzA2aokiNQ5ilqmahprJFU="; + rev = "d56d2387ce376f80e42c46654a9ee1f899a40b46"; + hash = "sha256-twry9z9gDvRfH3AOWEV/a9HX4pnlMJDSw74Sm/MBwIk="; }; strictDeps = true; @@ -33,6 +34,8 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + meta = { homepage = "https://github.com/unixorn/fzf-zsh-plugin"; description = "ZSH plugin to enable fzf searches of a lot more stuff - docker, tmux, homebrew and more"; diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 0c6b23197bfc..5c28217cd0e9 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -38,13 +38,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.13.0"; + version = "1.13.3"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-q/DBgAOFyIqhagWffJ6z+F7TXAZd7otPOGJI4oid4vM="; + hash = "sha256-QmTv1T9ocC8gfOSOiiNZoCovtyqtUmBTWObVFf9pUGY="; }; pnpmDeps = fetchPnpmDeps { @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-V8MKgicqHU9kEMTw17xeM2pzzkAlGBZJ2j4W5OEIit0="; + cargoHash = "sha256-GdVqVRh3tKuuyoWVpWqHcW9n9Erv35nzP9BumJfRIj8="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ga/gammu/bashcomp-dir.patch b/pkgs/by-name/ga/gammu/bashcomp-dir.patch index de402595cd38..3e4788040f87 100644 --- a/pkgs/by-name/ga/gammu/bashcomp-dir.patch +++ b/pkgs/by-name/ga/gammu/bashcomp-dir.patch @@ -1,6 +1,8 @@ +diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt +index 1120c0309..62e6177ab 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt -@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES) +@@ -87,7 +87,7 @@ endif (INSTALL_PHP_EXAMPLES) if (INSTALL_BASH_COMPLETION) macro_optional_find_package (BashCompletion) if (NOT BASH_COMPLETION_FOUND) diff --git a/pkgs/by-name/ga/gammu/gammu-config-dialog.patch b/pkgs/by-name/ga/gammu/gammu-config-dialog.patch index f9f76bfec00b..bfa45dc674b3 100644 --- a/pkgs/by-name/ga/gammu/gammu-config-dialog.patch +++ b/pkgs/by-name/ga/gammu/gammu-config-dialog.patch @@ -1,14 +1,16 @@ +diff --git a/utils/gammu-config b/utils/gammu-config +index abf278ada..fc12493cd 100755 --- a/utils/gammu-config +++ b/utils/gammu-config -@@ -59,16 +59,7 @@ +@@ -59,16 +59,7 @@ while [ "$#" -ge 1 ] ; do shift done --if type dialog > /dev/null 2>&1 ; then +-if command -v dialog > /dev/null 2>&1 ; then - DIALOG=dialog --elif type cdialog > /dev/null 2>&1 ; then +-elif command -v cdialog > /dev/null 2>&1 ; then - DIALOG=cdialog --elif type whiptail > /dev/null 2>&1 ; then +-elif command -v whiptail > /dev/null 2>&1 ; then - DIALOG=whiptail -else - echo "You need dialog, cdialog or whiptail installed to make this work" diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix index 143a2a85de37..005e5237a58c 100644 --- a/pkgs/by-name/ga/gammu/package.nix +++ b/pkgs/by-name/ga/gammu/package.nix @@ -24,13 +24,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gammu"; - version = "1.42.0"; + version = "1.43.2"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = finalAttrs.version; - sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I="; + sha256 = "sha256-+mZBELwFUEL4S3IUIIa83TaNIYQxjQE1TvWhXTcIfYc="; }; patches = [ diff --git a/pkgs/by-name/ga/gappa/package.nix b/pkgs/by-name/ga/gappa/package.nix index 6df1dded2850..2c8f189024d0 100644 --- a/pkgs/by-name/ga/gappa/package.nix +++ b/pkgs/by-name/ga/gappa/package.nix @@ -5,27 +5,40 @@ gmp, mpfr, boost, + flex, + bison, versionCheckHook, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "gappa"; - version = "1.6.1"; + version = "1.8.0"; src = fetchurl { url = "https://gappa.gitlabpages.inria.fr/releases/gappa-${finalAttrs.version}.tar.gz"; - hash = "sha256-1ux5ImKR8edXyvL21w3jY2o4/fATEjO2SMzS8B0o8Ok="; + hash = "sha256-dA1gOwRkW7lEo04bMldFHX0Chs8gMbd0Yl4/HhYK4qo"; }; strictDeps = true; + nativeBuildInputs = [ + flex + bison + ]; + buildInputs = [ gmp mpfr boost.dev ]; + # For darwin sandboxed builds + postPatch = '' + substituteInPlace remake.cpp \ + --replace 'tempnam(NULL, "rmk-")' 'tempnam(".", "rmk-")' + ''; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ga/garage-webui/package.nix b/pkgs/by-name/ga/garage-webui/package.nix index 282ff20a628d..a0d4b336b0ec 100644 --- a/pkgs/by-name/ga/garage-webui/package.nix +++ b/pkgs/by-name/ga/garage-webui/package.nix @@ -33,8 +33,8 @@ buildGoModule (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs') pname version src; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-8eQhR/fuDFNL8W529Ev7piCaseVaFahgZJQk3AJA3ng="; + fetcherVersion = 3; + hash = "sha256-z/Y9q/SE2c/KYzIOAfATlprjr6NjmmUHQB+ZbO39OK4="; }; buildPhase = '' diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 9b7dd04c4d26..fbcfdd1c7f00 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-YMfeY5VaC9brkiaK5UAkTlAUy7jFgbKBXPml9GYDsUs="; + hash = "sha256-OUCztqeE8oHaO0Cz/4Oz6bsp8GKszxwTjpbMLFvkCTE="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ga/gate12/package.nix b/pkgs/by-name/ga/gate12/package.nix index cf2eb205347e..117e8e0aef6b 100644 --- a/pkgs/by-name/ga/gate12/package.nix +++ b/pkgs/by-name/ga/gate12/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/ga/gauge/plugins/js/default.nix b/pkgs/by-name/ga/gauge/plugins/js/default.nix index db759927a19c..c988e3330f90 100644 --- a/pkgs/by-name/ga/gauge/plugins/js/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/js/default.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "gauge-plugin-js"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge-js"; rev = "v${version}"; - hash = "sha256-eFXWed/2NQphSPuGIdnpq77ZiYPEGx5bS7g5LAZhkME="; + hash = "sha256-CFjwdfU7KjYcG9EGF76j4iNXZqD5eGTsxbk2s//EKJ4="; fetchSubmodules = true; }; - npmDepsHash = "sha256-LUwnue1kFxtifRrV8U+IQ74A2/ari75MVyZT0xLaez4="; + npmDepsHash = "sha256-R6XYgeVD8NlgLyqZywzeTBebYG5T4qdSUwEH73+nKRA="; npmBuildScript = "package"; buildInputs = [ nodejs ]; diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 498590cdce87..3827a251350b 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gcsfuse"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${finalAttrs.version}"; - hash = "sha256-JQgjLrAqpRdq20DhG26AxkMRdJkJCrrS4/7LrDvV6NI="; + hash = "sha256-jVuO73U9KKop9wpO/uLz1ergo3FygCeFHaQbNS46gF0="; }; - vendorHash = "sha256-KDjSNJVsEuLGTgnAz9Ue+ZolxGzuqN3b/B+0LsgI9xY="; + vendorHash = "sha256-Hsx4FJ1DHnS8Nv8eNjbmLTTFlfuRNFP/7V63JefuKR0="; subPackages = [ "." diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 92b99620f611..622769eafb27 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -47,6 +47,7 @@ buildGoModule (finalAttrs: { skippedTests = [ "TestStoredAnalyzer" # https://github.com/dundee/gdu/issues/371 "TestAnalyzePathWithIgnoring" + "TestTopDirFollowSymlink" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/ge/gegl/package.nix b/pkgs/by-name/ge/gegl/package.nix index d1da3ad9284f..b9251fd7ed4e 100644 --- a/pkgs/by-name/ge/gegl/package.nix +++ b/pkgs/by-name/ge/gegl/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { gexiv2 openexr suitesparse + vala ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -94,6 +95,8 @@ stdenv.mkDerivation (finalAttrs: { babl ]; + strictDeps = true; + mesonFlags = [ "-Dmrg=disabled" # not sure what that is "-Dsdl2=disabled" diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 440462e68e9b..e07f14806b03 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,27 +15,27 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.40.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-oWznf9xleb9bpW2dnMIUehkMqKCb6AecZjcVwZgBrdo="; + hash = "sha256-4jwEviWYzan97pVn0RWfWU4XS8c27L4ZJUwa2iGlFxY="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-sscqcey+hPsfajrTspy6FScjfFmtvJMP1w56cFuu3DI="; + npmDepsHash = "sha256-4znN1YR3AX2SKeCJjUS8cm6WGcOGPXI27xrQCotBjgQ="; - dontPatchElf = stdenv.isDarwin; + dontPatchElf = stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ jq pkg-config makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar buildInputs = [ ripgrep diff --git a/pkgs/by-name/ge/gen6dns/fix-gcc15.patch b/pkgs/by-name/ge/gen6dns/fix-gcc15.patch new file mode 100644 index 000000000000..971d22213999 --- /dev/null +++ b/pkgs/by-name/ge/gen6dns/fix-gcc15.patch @@ -0,0 +1,24 @@ +diff --git a/parse.c b/parse.c +index d4bb28b..90a307d 100644 +--- a/parse.c ++++ b/parse.c +@@ -43,7 +43,7 @@ static int parsehostline (const char *line, host_t *h, ip6_t *hid, ip6_t *sid, c + static int parseextralines (FILE *fp, int *lnrp, char *extra_rr, size_t len); + static void dumphostline (FILE *fp, const host_t *host, const ip6_t *hid, const ip6_t *sid, const char *scope); + +-int parsefile (const char *fname, FILE *outfp, int (*genfunc)()) ++int parsefile (const char *fname, FILE *outfp, int (*genfunc)(int type, const ip6_t *prfx, const scope_t *scope, const host_t *host, const ip6_t *hid, ip6_t *sid, const char *extra_rr)) + { + char extra_rr[MAXEXTRARR+1]; + char line[MAXLINE+1]; +diff --git a/parse.h b/parse.h +index 10e7997..fbb452d 100644 +--- a/parse.h ++++ b/parse.h +@@ -7,5 +7,5 @@ + # define MAXLINE 511 + # define MAXEXTRARR (3*MAXLINE) + +-extern int parsefile (const char *fname, FILE *outfp, int (*genfunc)()); ++extern int parsefile (const char *fname, FILE *outfp, int (*genfunc)(int type, const ip6_t *prfx, const scope_t *scope, const host_t *host, const ip6_t *hid, ip6_t *sid, const char *extra_rr)); + #endif diff --git a/pkgs/by-name/ge/gen6dns/package.nix b/pkgs/by-name/ge/gen6dns/package.nix index 9dc3693e6cc6..20df0d24b116 100644 --- a/pkgs/by-name/ge/gen6dns/package.nix +++ b/pkgs/by-name/ge/gen6dns/package.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MhYfgzbGPmrhPx89EpObrEkxaII7uz4TbWXeEGF7Xws="; }; + patches = [ + ./fix-gcc15.patch + ]; + nativeBuildInputs = [ installShellFiles ]; preInstall = '' diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index df742e4790f7..e49afbcd7f65 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20260415"; + version = "0.7.9_20260508"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-eMBerL8kry9UlsXS4qdXT7jLK4f1S/q//5qkJ5qi3dA="; + hash = "sha256-XcGykMUEMmrNQ8y++SM1s0RPfMFgBTDXAIeAGKgU2Iw="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; diff --git a/pkgs/by-name/gh/ghdump/package.nix b/pkgs/by-name/gh/ghdump/package.nix index 9d7069e2c491..294f8f49f773 100644 --- a/pkgs/by-name/gh/ghdump/package.nix +++ b/pkgs/by-name/gh/ghdump/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ghdump"; - version = "0.1.2"; + version = "0.2.2"; __structuredAttrs = true; strictDeps = true; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "drupol"; repo = "ghdump"; tag = finalAttrs.version; - hash = "sha256-XOLXrffbymuPv544g66kwo1IKkEaK5/MBA1gsg+Cj2c="; + hash = "sha256-UNIG/AT5RGPeNfZ7S3TdhfN+s8VXRPygcTBV7Fulilg="; }; - cargoHash = "sha256-kuXtBrMk1s5mDjMVL/BKV+8qRlJ/g0Svv07IQepcQE8="; + cargoHash = "sha256-gyNMtS6h2ct9IkvfhRWyMv9JVPtVEILsmYUcPETFEWQ="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index 7857c70e65ae..9a7f7b1a3374 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "git-town"; - version = "22.7.1"; + version = "23.0.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; tag = "v${finalAttrs.version}"; - hash = "sha256-MGiWqFWA4PMyGL7QqgcDWrgM/Wo8us8GMhdsrXBgWmg="; + hash = "sha256-Bk3m9/AMo+1xxz97hNEd+wDdvCep/BwUA5Ps1VYIdfk="; }; vendorHash = null; diff --git a/pkgs/by-name/gi/git-xet/package.nix b/pkgs/by-name/gi/git-xet/package.nix index a24bb7114a98..4ee5bd74e8ff 100644 --- a/pkgs/by-name/gi/git-xet/package.nix +++ b/pkgs/by-name/gi/git-xet/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "git-xet"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "huggingface"; repo = "xet-core"; tag = "git-xet-v${finalAttrs.version}"; - hash = "sha256-XnCp9Dt4isFsT124ZVA/ID5y9l4bCSBQRrqrIPpv5Ow="; + hash = "sha256-PmAJg7R5IBvDUsQGyDWzUz4bAFsR5ET1pOncpBGiHl4="; }; - cargoHash = "sha256-0xUik5zHO4T2PjFXrA0XHuy2892piE5Kiw2pcpa7xdY="; + cargoHash = "sha256-2f2lLSYcvllIKvyMlT5hphhkb0QY70wdTvncC1Lf4NI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 7e02ecfd91dc..5be2c2b04b95 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" - + lib.optionalString stdenv.isFreeBSD "-lthr"; + + lib.optionalString stdenv.hostPlatform.isFreeBSD "-lthr"; # The build phase already installs it all GIT_PREFIX = placeholder "out"; diff --git a/pkgs/by-name/gi/gitbeaker-cli/package.nix b/pkgs/by-name/gi/gitbeaker-cli/package.nix index 3c722adb0901..e95875965083 100644 --- a/pkgs/by-name/gi/gitbeaker-cli/package.nix +++ b/pkgs/by-name/gi/gitbeaker-cli/package.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-EVxDUEuxCnMiqqsKFs9JpRVJ86d9hW22K4a4we8eoJA="; }; + patches = [ + # Remove this when updating since upstream migrated to pnpm + # https://github.com/jdalrymple/gitbeaker/blob/main/package.json#L59 + ./yarn-4.14-support.patch + ]; + nativeBuildInputs = [ nodejs yarn-berry_4.yarnBerryConfigHook @@ -30,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-WTxUoRPooea4CqpKnnrmvoWXoglCivVet+bUh0YG7gU="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-RTgdHicbfbJbToif51TchLCfdIPZynvT0n/KwrydLYU="; }; buildPhase = '' diff --git a/pkgs/by-name/gi/gitbeaker-cli/yarn-4.14-support.patch b/pkgs/by-name/gi/gitbeaker-cli/yarn-4.14-support.patch new file mode 100644 index 000000000000..aa1ac588934c --- /dev/null +++ b/pkgs/by-name/gi/gitbeaker-cli/yarn-4.14-support.patch @@ -0,0 +1,22 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,3 +1,6 @@ + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.10.3.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 835b7e19bded..8acddb6fb185 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -58,8 +58,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-0WLgtidG8hqTkXY3heu+m3VoqQD/kGMlTmLb0qAS8sQ="; + fetcherVersion = 3; + hash = "sha256-eRiFA5lXpPHQwlyFmKMx1zmHH2zLCHB+3s708g6srg4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index d63484b3d085..9d08e9e35d65 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -202,6 +202,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; mainProgram = "github-desktop"; maintainers = with lib.maintainers; [ dtomvan ]; - inherit (electron.meta) platforms; + platforms = lib.lists.intersectLists electron.meta.platforms lib.platforms.linux; }; }) diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index b2ae1005fc07..a29faeeb9c2f 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10_29_2; - fetcherVersion = 2; - hash = "sha256-uK3CNyPewUVAmqBJq1WMCrNeMP5I18BEBkZIBP0qPsI="; + fetcherVersion = 3; + hash = "sha256-0iTvrIe5PVj99ePWt8rn+laikdJ5TaNQ8GZGHyUTTQI="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gi/gitsign/package.nix b/pkgs/by-name/gi/gitsign/package.nix index 43344b4364ef..296da485a734 100644 --- a/pkgs/by-name/gi/gitsign/package.nix +++ b/pkgs/by-name/gi/gitsign/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "gitsign"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "gitsign"; rev = "v${finalAttrs.version}"; - hash = "sha256-oY4My+ZmkGWsVL031A01qZGJPSEQURrqFC8qH9WcUiw="; + hash = "sha256-XFeKU956FIfQhaca2M/OtYgCF8qErzPcyMBEGvzPAcc="; }; vendorHash = "sha256-fjrdQZVXgBvdKQFnmjtLShBHsKNIp5Y/uW7aU2cP1aY="; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 28ef8e78a535..96060ad9e0d5 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "glaze"; - version = "7.5.0"; + version = "7.6.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${finalAttrs.version}"; - hash = "sha256-END9mrzYIsulQROqyTsPPtScFvR1+LMasD5aiyACUfU="; + hash = "sha256-3sRWE+kEde9LVQ4mSL/2vplS2nF1BYGGIdwQHadY0uA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gn/gnu-cim/package.nix b/pkgs/by-name/gn/gnu-cim/package.nix index a2b81433c18f..e70d907538ed 100644 --- a/pkgs/by-name/gn/gnu-cim/package.nix +++ b/pkgs/by-name/gn/gnu-cim/package.nix @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.gnu.org/software/cim/"; license = lib.licenses.gpl2; - platforms = lib.platforms.all; - badPlatforms = [ "aarch64-darwin" ]; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pbsds ]; }; }) diff --git a/pkgs/by-name/go/go-font/package.nix b/pkgs/by-name/go/go-font/package.nix index b9a6c8970ad3..e8f4214af470 100644 --- a/pkgs/by-name/go/go-font/package.nix +++ b/pkgs/by-name/go/go-font/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,15 +15,11 @@ stdenvNoCC.mkDerivation { hash = "sha256-rdzt51wY4b7HEr7W/0Ar/FB0zMyf+nKLsOT+CRSEP3o="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - mkdir -p $out/share/fonts/truetype + postInstall = '' mkdir -p $out/share/doc/go-font - mv *.ttf $out/share/fonts/truetype - mv README $out/share/doc/go-font/LICENSE - - runHook postInstall + cp $src/README $out/share/doc/go-font/LICENSE ''; meta = { diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix index 0c2cdd335551..3f9131cfaf61 100644 --- a/pkgs/by-name/go/goaway/package.nix +++ b/pkgs/by-name/go/goaway/package.nix @@ -12,13 +12,13 @@ }: let - version = "0.63.7"; + version = "0.63.15"; src = fetchFromGitHub { owner = "pommee"; repo = "goaway"; tag = "v${version}"; - hash = "sha256-XNjp9fSMu5AdLnFNsh7Lrf1J06sPZPjvlNFkDa1QDJQ="; + hash = "sha256-jtUAMCGdFmt89kchHdy9AnSMKu1rZeTLPcFIzqipOyw="; }; goaway-web = stdenvNoCC.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/client"; fetcherVersion = 3; - hash = "sha256-1YZf32lDwX3e9EC0Uixyo+yDczfU4/ZSlG+jFZwf+38="; + hash = "sha256-GM86Os1OQaagD61BEIIsqhWJNVPFA9Z5RiYWyHlQlwY="; }; pnpmRoot = "client"; @@ -66,7 +66,7 @@ buildGo126Module (finalAttrs: { goaway-web ; - vendorHash = "sha256-QgacBw+kpGdv8fAPQyndrHTxY1JrxFRf2qCS7etjNfw="; + vendorHash = "sha256-tSTvySLBo9cM9+Ul45TrGDruTllE/HWLdYmzqMDIYEQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/golazo/package.nix b/pkgs/by-name/go/golazo/package.nix index 7dab451dc34f..b53de0b6af67 100644 --- a/pkgs/by-name/go/golazo/package.nix +++ b/pkgs/by-name/go/golazo/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "golazo"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "0xjuanma"; repo = "golazo"; tag = "v${finalAttrs.version}"; - hash = "sha256-hrdiNccvIgX9v187l4Htc7viqOb1lGgxOkeLJgFyF4M="; + hash = "sha256-MSFH6IuSeMi98Ri/YVIxLFn7eYozodosfk8ZYz+Q2K0="; }; vendorHash = "sha256-M2gfqU5rOfuiVSZnH/Dr8OVmDhyU2jYkgW7RuIUTd+E="; diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix index f03952f04009..c1e30e4fd9e5 100644 --- a/pkgs/by-name/go/golines/package.nix +++ b/pkgs/by-name/go/golines/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "golines"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { - owner = "segmentio"; + owner = "golangci"; repo = "golines"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y4q3xpGw8bAi87zJ48+LVbdgOc7HB1lRdYhlsF1YcVA="; + sha256 = "sha256-gjm76dGbFTisQdiM0GAQJRcAreQUWIBuqYbLU2ruCNk="; }; - vendorHash = "sha256-94IXh9iBAE0jJXovaElY8oFdXE6hxYg0Ww0ZEHLnEwc="; + vendorHash = "sha256-cLzCpjifb0lc6UaDW2JZBQABixz98EJ4syLapX7I8y8="; subPackages = [ "." @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { meta = { description = "Golang formatter that fixes long lines"; - homepage = "https://github.com/segmentio/golines"; + homepage = "https://github.com/golangci/golines"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ meain ]; mainProgram = "golines"; diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index d5a666880079..68c6fae7a480 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goverlay"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "benjamimgois"; repo = "goverlay"; tag = finalAttrs.version; - hash = "sha256-q4g6K4iUkeam1dVHOWdkUjH/XAOIKgOXnJDE0dm5HVw="; + hash = "sha256-/ItkUqUQq1aeDPB8gHNOQkFp8s+/mOwFthnC77fT+h8="; }; outputs = [ diff --git a/pkgs/by-name/gp/gpupad/package.nix b/pkgs/by-name/gp/gpupad/package.nix index 91858873a9de..9efdcebf43c2 100644 --- a/pkgs/by-name/gp/gpupad/package.nix +++ b/pkgs/by-name/gp/gpupad/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpupad"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "houmain"; repo = "gpupad"; tag = finalAttrs.version; - hash = "sha256-7WdEdVe2lkCDHKkZpN3QTdQtsVWXdcQ3tdKd8vd1xAc="; + hash = "sha256-8kDJRZPDzZA6ofaXWQ55VZfuXdOHvTCssoe64qgNrbU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index f93dae3e9f26..b943a4c0b22b 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -6,6 +6,8 @@ libgit2, zlib, cmake, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -15,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-fTmCL8b9Yp0DwgatGd7ODpq3z9b3Rqg/skqvjQkZvOU="; }; @@ -31,12 +33,17 @@ rustPlatform.buildRustPackage (finalAttrs: { zlib ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "SQL like query language to perform queries on .git files"; homepage = "https://github.com/AmrDeveloper/GQL"; - changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/AmrDeveloper/GQL/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "gitql"; }; }) diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix index 32f2a26e9ef0..eecb75819a60 100644 --- a/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "grafana-kiosk"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-kiosk"; rev = "v${finalAttrs.version}"; - hash = "sha256-+LoUJiMqE/OO0J7zIy+8uvQUq1wFpGvNvxzhb4pj+r8="; + hash = "sha256-NfLS7N1J71HnDx3oTfWf3lsWp3XNx18Jk7qwNPMfOZA="; }; - vendorHash = "sha256-+tslKo5onMgnEtitYi9uwO4m5MUGzctJ7Vt4C7hJ7Fc="; + vendorHash = "sha256-Czxxuy4ptsUx9cqog6wsHkUzS+j7WGj8PGsa4MDRJEE="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix index c44a93d6695d..23e9ba8915b8 100644 --- a/pkgs/by-name/gr/grafana/package.nix +++ b/pkgs/by-name/gr/grafana/package.nix @@ -36,6 +36,12 @@ buildGoModule (finalAttrs: { hash = "sha256-fGRvCDIOQcF743SimatyNmX0gZtO0tvgEAFuk38rl88="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/grafana/grafana/blob/main/package.json#L483 + ./yarn-4.14-support.patch + ]; + # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 env = { CYPRESS_INSTALL_BINARY = 0; @@ -48,8 +54,8 @@ buildGoModule (finalAttrs: { missingHashes = ./missing-hashes.json; # Since this is not a dependency attribute the buildPackages has to be specified. offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-5aInVAn9UMGp8U+LEIR1D19RI9vKVrNpt5Frbr1sBJs="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-l+X7vgU+wuuq+Usdp0ffY1SpT70QlmdsjrHnyyJufjw="; }; disallowedRequisites = [ finalAttrs.offlineCache ]; diff --git a/pkgs/by-name/gr/grafana/yarn-4.14-support.patch b/pkgs/by-name/gr/grafana/yarn-4.14-support.patch new file mode 100644 index 000000000000..6d3be05a1c1e --- /dev/null +++ b/pkgs/by-name/gr/grafana/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -25,6 +25,7 @@ plugins: + path: .yarn/plugins/@yarnpkg/plugin-licenses.cjs + spec: "https://raw.githubusercontent.com/mhassan1/yarn-plugin-licenses/v0.15.0/bundles/@yarnpkg/plugin-licenses.js" + +-yarnPath: .yarn/releases/yarn-4.11.0.cjs ++approvedGitRepositories: ++ - "**" + + enableScripts: false +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index df9c0ef9d7a4..86af4e92af49 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -27,7 +27,6 @@ libxcursor, libx11, libxcb, - nix-update-script, }: let @@ -173,12 +172,7 @@ stdenv.mkDerivation (finalAttrs: { disallowedReferences = [ rustc ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version=branch" - "--version-regex=(0-unstable-.*)" - ]; - }; + passthru.updateScript = ./update.nu; meta = { description = "Open source vector graphics editor and procedural design engine"; diff --git a/pkgs/by-name/gr/graphite/update.nu b/pkgs/by-name/gr/graphite/update.nu new file mode 100755 index 000000000000..816acbe71f41 --- /dev/null +++ b/pkgs/by-name/gr/graphite/update.nu @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell nix-update curl common-updater-scripts nix + +^nix-update graphite --version=branch --version-regex '(0-unstable-.*)' + +let pkg = "./pkgs/by-name/gr/graphite/package.nix" +let rev = (open $pkg | lines | where ($it | str contains 'rev = "') | first | str trim | parse 'rev = "{rev}";' | get 0.rev) +let meta = (http get $"https://raw.githubusercontent.com/GraphiteEditor/Graphite/($rev)/.branding" | lines) +let branding_rev = ($meta | get 0 | path basename | str replace ".tar.gz" "") +let branding_hash = (^nix hash convert --to sri --hash-algo sha256 ($meta | get 1) | str trim) +open $pkg +| str replace --regex 'brandingRev = "[^"]*"' $'brandingRev = "($branding_rev)"' +| str replace --regex 'brandingHash = "[^"]*"' $'brandingHash = "($branding_hash)"' +| save --force $pkg diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix index d0e064be74d4..e90f554e1c1c 100644 --- a/pkgs/by-name/gr/grass/package.nix +++ b/pkgs/by-name/gr/grass/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.4.2"; + version = "8.5.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-DEbJZlnq9o+5BYQBXL6wJIVJ9c7HOBLQDMrsiMcaPgk="; + hash = "sha256-rQnJrL4ol5yb/egxlpzzyS3JovNq/irIhmJoxZI8uSg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index e229df63da30..58f26a4cff3c 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.48"; + version = "0.4.49"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-W5B14om0oAKEm8XP5vYJzHv2Mplfv+2VapsvOnS0wTY="; + hash = "sha256-JH4Km8nlUffkga7oKgXXwqRYm/8oG9giLCFn1BZ1eVY="; }; tags = [ @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { "-X main.versionTag=${finalAttrs.version}" ]; - vendorHash = "sha256-3Ucro8FHOiSFHqGB2jwLshhzbkRdkZnJJFbNyuDX2QY="; + vendorHash = "sha256-97OFqr93G/6F58nF1riGFbCOtORPojMMU4IX9ivjSxg="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix index 1095643dbd14..2dc7bfc5e29c 100644 --- a/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix +++ b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix @@ -5,7 +5,7 @@ gtk3, gnome-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme ]; @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; dontDropIconThemeCache = true; + dontWrapQtApps = true; meta = { description = "Gruvbox icons for GTK based desktop environments"; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 2369b88eb1d8..018a7c67c470 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -106,7 +106,7 @@ buildGoModule (finalAttrs: { "Test_dpkgUseCPEsForEOLEnvVar" "Test_rpmUseCPEsForEOLEnvVar" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails to generate x509 certificate # cat: /etc/ssl/openssl.cnf: Operation not permitted "Test_defaultHTTPClientHasCert" diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix index fc62127f647b..a2097549a08b 100644 --- a/pkgs/by-name/gs/gscan2pdf/package.nix +++ b/pkgs/by-name/gs/gscan2pdf/package.nix @@ -123,15 +123,15 @@ perlPackages.buildPerlPackage rec { ]); checkPhase = '' - # Temporarily disable a test failing because of a behavioural change in ImageMagick7 - # t/04_Page.t ................................... 1/12 - # Failed test 'undefined' - # at t/04_Page.t line 114. - # got: '72' - # expected: '300' - # Looks like you failed 1 test of 12. + # Skip a failing test, due to a change in ImageMagick: + # https://sourceforge.net/p/gscan2pdf/bugs/439/ rm t/04_Page.t + # Skip a failing test, due to a breaking change in ImageMagick: + # https://sourceforge.net/p/gscan2pdf/bugs/442/ + # https://github.com/ImageMagick/ImageMagick/issues/8714 + rm t/113_save_pdf_with_downsample.t + export XDG_CACHE_HOME="$(mktemp -d)" xvfb-run -s '-screen 0 800x600x24' \ make test diff --git a/pkgs/by-name/gt/gts/package.nix b/pkgs/by-name/gt/gts/package.nix index e51a67eb374a..b50c41b42156 100644 --- a/pkgs/by-name/gt/gts/package.nix +++ b/pkgs/by-name/gt/gts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gettext ]; propagatedBuildInputs = [ glib ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Doesn't build on Darwin with -std=gnu23. NIX_CFLAGS_COMPILE = "-std=gnu17"; }; diff --git a/pkgs/by-name/gu/guitarix-vst/package.nix b/pkgs/by-name/gu/guitarix-vst/package.nix new file mode 100644 index 000000000000..27eb994a4f8a --- /dev/null +++ b/pkgs/by-name/gu/guitarix-vst/package.nix @@ -0,0 +1,76 @@ +{ + alsa-lib, + avahi, + boost, + curl, + fetchFromGitHub, + fftwFloat, + freetype, + glib, + glibmm, + lib, + libsndfile, + libx11, + libxcursor, + libxext, + libxinerama, + libxrandr, + lilv, + ncurses, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guitarix-vst"; + version = "0.5"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = "guitarix.vst"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SuKPTdYt9sFAZGFsf5P6nl4lzTOirOTOeRoCJEMH76w="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace Builds/LinuxMakefile/Makefile \ + --replace-fail '$(shell arch)' '${stdenv.hostPlatform.uname.processor}' + ''; + + nativeBuildInputs = [ + pkg-config + ncurses + ]; + + buildInputs = [ + alsa-lib + avahi + boost + curl + fftwFloat + freetype + glib + glibmm + libx11 + libxcursor + libxext + libxinerama + libxrandr + lilv + libsndfile + ]; + + installFlags = [ "JUCE_VST3DESTDIR=${placeholder "out"}/lib/vst3" ]; + + meta = { + description = "Versatile (guitar) amplifier VST3 plugin"; + homepage = "https://github.com/brummer10/guitarix.vst"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.eymeric ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/gu/gurobi/package.nix b/pkgs/by-name/gu/gurobi/package.nix index d99af02c6525..63ea67d2692f 100644 --- a/pkgs/by-name/gu/gurobi/package.nix +++ b/pkgs/by-name/gu/gurobi/package.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "gurobi"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz"; hash = { - aarch64-linux = "sha256-MQDqu95e+fJ00FGtYVw2FlkZ6uhl5eTFefpsA0ti+jI="; - x86_64-linux = "sha256-7GIyF6xfoGV3madS7XwCshQfu5wP80Ep1uH4yaj+Ttg="; + aarch64-linux = "sha256-PFCjHiCvbX+BXwx3ytBGEyC7XRzQYMHwPUWaW5tpx+4="; + x86_64-linux = "sha256-z/1O48GZApToBEZia9F3IEXkINfDTDeYObasyhbwojs="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/ha/ha-mcp/package.nix b/pkgs/by-name/ha/ha-mcp/package.nix index 2c956dd86d5e..332d0244ce33 100644 --- a/pkgs/by-name/ha/ha-mcp/package.nix +++ b/pkgs/by-name/ha/ha-mcp/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ha-mcp"; - version = "7.3.0"; + version = "7.4.1"; pyproject = true; src = fetchFromGitHub { owner = "homeassistant-ai"; repo = "ha-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-boWqv8lSN/UiqSRhVBgbucX+RC6q14Oa4WzkJPeZzVw="; + hash = "sha256-F13BoZinPnv+tlkiVnG7iAkr2JdEbFE0RIEgmHa/yq4="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix index f6ec236e6102..e381c07c3c8e 100644 --- a/pkgs/by-name/ha/hacompanion/package.nix +++ b/pkgs/by-name/ha/hacompanion/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "hacompanion"; - version = "1.0.27"; + version = "1.0.30"; src = fetchFromGitHub { owner = "tobias-kuendig"; repo = "hacompanion"; rev = "v${finalAttrs.version}"; - hash = "sha256-tm9qx2SPkyzxP7fHXAzlk/iMn/67zMJlmeTq9veRg98="; + hash = "sha256-TC1ZnYT5WGbKP2Y2pOKaLj8Hmr3lU+LShkNV2DpcyDk="; }; vendorHash = "sha256-SohjueM0DwSuh7XVClYiWA/5d0V6x2vmp5aPxgmIJYY="; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index f44341085fd3..5637cf73031e 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "halo"; - version = "2.24.0"; + version = "2.24.2"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar"; - hash = "sha256-71br2gG8vl3EyvC+AYzqJOtgHnhdEmcRAjXSXXXqI5s="; + hash = "sha256-ONaSclpfNQtuSllndIylm759NUcfKL7dYTQYVj4jSjs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 2e0a6a731606..27f7118cd6c2 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -12,7 +12,6 @@ libvorbis, mbedtls, openal, - pcre, SDL2, sqlite, }: @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { libvorbis mbedtls openal - pcre SDL2 sqlite ]; diff --git a/pkgs/by-name/he/headlamp-frontend/package.nix b/pkgs/by-name/he/headlamp-frontend/package.nix index 191a68b1547c..68b611156846 100644 --- a/pkgs/by-name/he/headlamp-frontend/package.nix +++ b/pkgs/by-name/he/headlamp-frontend/package.nix @@ -12,7 +12,7 @@ buildNpmPackage { sourceRoot = "${headlamp-server.src.name}/frontend"; - npmDepsHash = "sha256-cjar6j5Wzh5monp9YxrsrnGDxgjlT+YRFh5mgZcImKI="; + npmDepsHash = "sha256-73xc/GK1Cvz67D6ftYVRe5GARNgG5qD86CGK6uhoyWA="; postPatch = '' chmod -R u+w ../app diff --git a/pkgs/by-name/he/headlamp-server/package.nix b/pkgs/by-name/he/headlamp-server/package.nix index 6cb3ac559dc6..ce86de1ab9a9 100644 --- a/pkgs/by-name/he/headlamp-server/package.nix +++ b/pkgs/by-name/he/headlamp-server/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "headlamp-server"; - version = "0.41.0"; + version = "0.42.0"; strictDeps = true; __structuredAttrs = true; @@ -15,12 +15,12 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = "headlamp"; tag = "v${version}"; - hash = "sha256-ZXyE4oPkwimnU2ArOiTCnLxzaI5z/7T/SHS9aqP2DGM="; + hash = "sha256-SBPSh6dsKvMw1C80THri0mNPoTMgcrjONk455S/g9v0="; }; modRoot = "backend"; - vendorHash = "sha256-JjfB93C97yTbUTUbs7wEB/iFtuRzHzFXGyRHDAec7X8="; + vendorHash = "sha256-dBU053QtUEMWjzkOEHzELH3j7PJOKuoBZCVZFmZ5z7E="; # Don't embed frontend - Electron serves it directly. This also prevents # the server from auto-opening a browser window. diff --git a/pkgs/by-name/he/headlamp/package.nix b/pkgs/by-name/he/headlamp/package.nix index 52c90fceba03..4991f3e61205 100644 --- a/pkgs/by-name/he/headlamp/package.nix +++ b/pkgs/by-name/he/headlamp/package.nix @@ -17,7 +17,7 @@ buildNpmPackage { sourceRoot = "${headlamp-server.src.name}/app"; - npmDepsHash = "sha256-FcV2ORs96Rj/OyCbBCBo/ZmcwvjDLPKkn0i4m+0gXIE="; + npmDepsHash = "sha256-k7rABbEmYY24k/obKm1GZUnM0Udjtyv2bhrVEvc0ebc="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index a7e425f8acf5..1f608ecc8be0 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -20,13 +20,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9gKpjmE8z/9PUILCiVK1utNYKD8kscbCBKxerqTO3z4="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/hedgedoc/hedgedoc/blob/develop/package.json#L28 + ./yarn-4.14-support.patch + ]; + # Generate this file with: # nix run nixpkgs#yarn-berry_4.yarn-berry-fetcher missing-hashes yarn.lock missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-HbrkmuL1OBZZoA6o438GePId50lJrYfI7M2FsP00YGc="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-AMTSCM8dNwAddI3QZMFDzxJmJPvJ9fGK79at2I0S/pE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/hedgedoc/yarn-4.14-support.patch b/pkgs/by-name/he/hedgedoc/yarn-4.14-support.patch new file mode 100644 index 000000000000..965bede33cf7 --- /dev/null +++ b/pkgs/by-name/he/hedgedoc/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -4,4 +4,7 @@ enableGlobalCache: false + + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.13.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/he/hexcurse/package.nix b/pkgs/by-name/he/hexcurse/package.nix index 2c27ee1fc5d2..b8863337e7bf 100644 --- a/pkgs/by-name/he/hexcurse/package.nix +++ b/pkgs/by-name/he/hexcurse/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, fetchpatch, + fetchDebianPatch, ncurses, }: @@ -48,6 +49,15 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/LonnyGomes/hexcurse/commit/cb70d4a93a46102f488f471fad31a7cfc9fec025.patch"; sha256 = "19674zhhp7gc097kl4bxvi0gblq6jzjy8cw8961svbq5y3hv1v5y"; }) + + # Fix build with GCC 15 (old-style function definitions) + (fetchDebianPatch { + pname = "hexcurse"; + version = "1.60.0"; + debianRevision = "1"; + patch = "gcc-15.patch"; + hash = "sha256-nWwYjI18fsJ9LSby6OJoJ0QXENgyVbUY3LpEYWoCBkI="; + }) ]; meta = { diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index b1ff6594ddcb..c75fd64d0717 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -13,7 +13,6 @@ ncurses, nixos-option, stdenvNoCC, - unixtools, unstableGitUpdater, }: @@ -94,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "home-manager"; - maintainers = with lib.maintainers; [ bryango ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ho/homebridge/package.nix b/pkgs/by-name/ho/homebridge/package.nix index f289c95341e2..43a82b3e2957 100644 --- a/pkgs/by-name/ho/homebridge/package.nix +++ b/pkgs/by-name/ho/homebridge/package.nix @@ -2,29 +2,20 @@ lib, buildNpmPackage, fetchFromGitHub, - jq, }: buildNpmPackage (finalAttrs: { pname = "homebridge"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-KRDeS9qYefdafGpX8RF68ce6uSlS22aIRqJimmhI8Ko="; + hash = "sha256-JHeyyPh2ePIrUhqfo1Cb4pNf+lB3ldE6NR0OunbLuKk="; }; - npmDepsHash = "sha256-CkizIWaHzmotAr/64yY2wKAtqFoBdr5ylN5WcgdpMis="; - - # Homebridge's clean phase attempts to install rimraf directly, which fails in nix builds - # rimraf is already in the declared dependencies, so we just don't need to do it. - # This will replace "npm install rimraf && rimraf lib/" with "rimraf lib/". - preBuild = '' - cat package.json | ${jq}/bin/jq '.scripts.clean = "rimraf lib/"' > package.json.tmp - mv package.json.tmp package.json - ''; + npmDepsHash = "sha256-zJ9WPnhtC0rnyT5dqPfC/eg+TRlKlDDQW3XYx67pl5s="; meta = { description = "Lightweight emulator of iOS HomeKit API"; diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index ad5c58240a5d..2ca921488e7a 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "26.3.1-0"; + version = "26.4.0-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-9Ahc/Gi4MRgloWND82lZQhWG2oR85Fytsz2BYi+fVpc="; + hash = "sha256-qpwtXAVrBAdDnK9FLkvPdbVtPIZpAaZ0srT+Hw7ckNA="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-YXvLzdm493xAvCRuRg0WwBTJ4VXKO50wzr2TfWN3J84="; + hash = "sha256-LtEHmdSxIiWNHIAkVycsNMhmjS7VWkMiwLcY544fQ1Y="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-6dFCCYkof0N4AqWZko741LN6NW2K4F5gpwzzK4U5QCM="; + hash = "sha256-bgo+R01NJ3ElfHHvRZ42K8AcioJyjhs52yHkq30nsyg="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index cad6573bc572..7f94f37d9dc1 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { postInstall = with python3.pkgs; '' wrapProgram $out/bin/htgettoken \ - --set PYTHONPATH "${ + --prefix PYTHONPATH : "${ makePythonPath [ gssapi paramiko diff --git a/pkgs/by-name/ht/htpdate/package.nix b/pkgs/by-name/ht/htpdate/package.nix index a192747bed76..c92446ffe32a 100644 --- a/pkgs/by-name/ht/htpdate/package.nix +++ b/pkgs/by-name/ht/htpdate/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.0.1"; + version = "2.0.2"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = "htpdate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-dl3xlwk2q1DdGrIQsbKwdYDjyhGxpYwQGcd9k91LkxA="; + sha256 = "sha256-aDir0e/itYxo0wgKIyT2chEVyXgz6nd2JOuyo7Yq/js="; }; makeFlags = [ diff --git a/pkgs/by-name/ht/httrack/package.nix b/pkgs/by-name/ht/httrack/package.nix index 9fea3afdd19e..909980769ba5 100644 --- a/pkgs/by-name/ht/httrack/package.nix +++ b/pkgs/by-name/ht/httrack/package.nix @@ -1,19 +1,23 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, openssl, libiconv, }: stdenv.mkDerivation (finalAttrs: { - version = "3.49.2"; + version = "3.49.6"; pname = "httrack"; - src = fetchurl { - url = "https://mirror.httrack.com/httrack-${finalAttrs.version}.tar.gz"; - sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; + src = fetchFromGitHub { + owner = "xroche"; + repo = "httrack"; + # 3.49.6 is not tagged, but corresponds to this rev. + rev = "748c35de7858ead963daf1393ad023d75b7820c2"; + hash = "sha256-Iaeo6lB84I0amr2C8iZ+kQ6F8AXqyyARV6FiwpBshvA="; + fetchSubmodules = true; }; buildInputs = [ @@ -22,12 +26,11 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - enableParallelBuilding = true; - meta = { description = "Easy-to-use offline browser / website mirroring utility"; - homepage = "http://www.httrack.com"; + homepage = "https://www.httrack.com"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tbutter ]; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix index ded0143917db..01a9dbb3c8d9 100644 --- a/pkgs/by-name/hy/hygg/package.nix +++ b/pkgs/by-name/hy/hygg/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ## Skipping this test due to the high variability of its outcome ## When the package was merged the test was passing but on hydra its not ## Look at PR #448907 - ++ (if pkgs.stdenv.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]); + ++ (if pkgs.stdenv.hostPlatform.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]); doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index e04bbcaf7a6d..6b1153743b93 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg="; + hash = "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprviz/package.nix b/pkgs/by-name/hy/hyprviz/package.nix index 59414bac320b..eae6af039dd8 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.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "timasoft"; repo = "hyprviz"; tag = "v${finalAttrs.version}"; - hash = "sha256-UvFtZzQuUgqxY/pMfFaMEM/5VRJuMjSBOXiViwLB0TE="; + hash = "sha256-d1JNCCzCpJw646VrwSdrj175F4w4AsAfvGv4CnCEEv4="; }; - cargoHash = "sha256-QuwxJw77ccUnvHcPNrPD5EwgZ3MJV4VvGb7MtUnYu88="; + cargoHash = "sha256-Wjk1nqSoqeHvdTRzoRl3NTJIB5Chp14Cm/6weniVwiI="; nativeBuildInputs = [ pkg-config @@ -35,7 +35,9 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postInstall = '' - install -Dm644 hyprviz.desktop -t $out/share/applications + install -Dm644 assets/hyprviz.desktop -t $out/share/applications + install -Dm644 assets/hyprviz.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 assets/hyprviz.png -t $out/share/icons/hicolor/256x256/apps ''; meta = { diff --git a/pkgs/by-name/ic/icemon/package.nix b/pkgs/by-name/ic/icemon/package.nix index 41d872b6c3a0..880f8d13da86 100644 --- a/pkgs/by-name/ic/icemon/package.nix +++ b/pkgs/by-name/ic/icemon/package.nix @@ -4,7 +4,8 @@ asciidoc, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, + pkg-config, icecream, libcap_ng, lzo, @@ -27,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ asciidoc cmake - extra-cmake-modules + kdePackages.extra-cmake-modules + pkg-config qt6.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/id/id3/fix-gcc15.patch b/pkgs/by-name/id/id3/fix-gcc15.patch new file mode 100644 index 000000000000..ddce9ac753fc --- /dev/null +++ b/pkgs/by-name/id/id3/fix-gcc15.patch @@ -0,0 +1,12 @@ +diff --git a/fileops.c b/fileops.c +index 1e70af1..9017bd0 100644 +--- a/fileops.c ++++ b/fileops.c +@@ -68,7 +68,6 @@ FILE *ftemp(char *templ, const char *mode) + #else + int fd = mkstemp(templ); + if(fd >= 0) { +- FILE* fdopen(); /* in case -ansi is used */ + if(f = fdopen(fd, mode)) return f; + close(fd); + #endif diff --git a/pkgs/by-name/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix index 037c222cb7cd..99be080a9af1 100644 --- a/pkgs/by-name/id/id3/package.nix +++ b/pkgs/by-name/id/id3/package.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk="; }; + patches = [ + # https://github.com/squell/id3/pull/35 + ./fix-gcc15.patch + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/by-name/id/idris2/libidris2_support.nix b/pkgs/by-name/id/idris2/libidris2_support.nix index 538da01e26d7..2117bc729283 100644 --- a/pkgs/by-name/id/idris2/libidris2_support.nix +++ b/pkgs/by-name/id/idris2/libidris2_support.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optional stdenv.isDarwin "OS="; + ++ lib.optional stdenv.hostPlatform.isDarwin "OS="; buildFlags = [ "support" ]; diff --git a/pkgs/by-name/im/imapgoose/package.nix b/pkgs/by-name/im/imapgoose/package.nix index eb843f9d57bb..83f4538f2590 100644 --- a/pkgs/by-name/im/imapgoose/package.nix +++ b/pkgs/by-name/im/imapgoose/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "imapgoose"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "ImapGoose"; tag = "v${version}"; - hash = "sha256-H+6S+jAZT4jj1R8sJeLzFjyNkZqo0WlTLVfu1BH+RM4="; + hash = "sha256-OJ6qV3nZD1chLOG/LDn8fbf1R70Xnzo2Gx5/PYSPCAk="; }; - vendorHash = "sha256-75dP0iB3Tu1GQfi9w+H1dgWHZh7X9FJOlsLbC3Baqjg="; + vendorHash = "sha256-PY6m92/8bzbYjkGvbNtL1W9sMayjPOyWVvJPwKAnLc8="; subPackages = [ "cmd/imapgoose" diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix index c65ff71cbb01..4ef4132a37af 100644 --- a/pkgs/by-name/im/immich-kiosk/package.nix +++ b/pkgs/by-name/im/immich-kiosk/package.nix @@ -33,8 +33,8 @@ buildGoModule rec { ; pnpm = pnpm_9; sourceRoot = "${src.name}/frontend"; - hash = "sha256-ELIbM+tWOGntv8XmNvRZ/Q2iSRq0g9Kv5LnkwLPisPM="; - fetcherVersion = 2; + hash = "sha256-8iKug4zsX3u0vS68osKRW6iOP+A3OdjI3yxNPIJaQqM="; + fetcherVersion = 3; }; # Frontend is in a subdirectory diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index f0713769865e..b42101a350e1 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch - (if stdenv.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch) + (if stdenv.hostPlatform.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch) (fetchpatch { name = "CVE-2026-24061_1.patch"; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers"; - ${if stdenv.isDarwin then "hardeningDisable" else null} = [ "format" ]; + ${if stdenv.hostPlatform.isDarwin then "hardeningDisable" else null} = [ "format" ]; doCheck = true; diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 326f1a95ecf6..7ea762f2c363 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.76.1"; + version = "0.77.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-SkW79i1jutVwty18bWXJEUijDunHukF3Sxqm0VwzMz0="; + hash = "sha256-sSLazAjwkTu4Vns8Vs4Gx47WG8fYQYJX6zhk0p139q0="; }; - cargoHash = "sha256-nHAdU/7JHPveOvUsXqdmUQtzET2Jv6T6PN83S7TwsIM="; + cargoHash = "sha256-OEpv09DipaGtmlUWmvl4+Hm3DyBvSRkZaGePDy14/OU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix index 3b2eea97dcf5..ae533545be65 100644 --- a/pkgs/by-name/in/insomnia/package.nix +++ b/pkgs/by-name/in/insomnia/package.nix @@ -82,7 +82,7 @@ else '' # Install XDG Desktop file and its icon install -Dm444 ${appimageContents}/insomnia.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/insomnia.png -t $out/share/pixmaps + install -Dm444 ${appimageContents}/insomnia.png -t $out/share/icons/ # Replace wrong exec statement in XDG Desktop file substituteInPlace $out/share/applications/insomnia.desktop \ --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=insomnia' diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix index d16bd7061f51..ea9675b86095 100644 --- a/pkgs/by-name/in/insulator2/package.nix +++ b/pkgs/by-name/in/insulator2/package.nix @@ -34,10 +34,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3eDA+pwchnwWtweGeSDlf+Vt0Hoylmanf4hnvJ2YOGU="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/andrewinci/insulator2/blob/main/package.json#L105 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-3BgvOoGMY86xzSHf6S0265PYOPEgLv77nT6CO9IGdwc="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-IechRla3epfANBESCYgti5/8B3QaPCv6Gp2I4eZNiyI="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/in/insulator2/yarn-4.14-support.patch b/pkgs/by-name/in/insulator2/yarn-4.14-support.patch new file mode 100644 index 000000000000..017f2d295ca9 --- /dev/null +++ b/pkgs/by-name/in/insulator2/yarn-4.14-support.patch @@ -0,0 +1,21 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1 +1,6 @@ + nodeLinker: node-modules ++ ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/in/intel-media-sdk/package.nix b/pkgs/by-name/in/intel-media-sdk/package.nix index 18509b93aa2d..838f3dfbe2b5 100644 --- a/pkgs/by-name/in/intel-media-sdk/package.nix +++ b/pkgs/by-name/in/intel-media-sdk/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ libdrm libva @@ -51,15 +52,14 @@ stdenv.mkDerivation rec { libxdmcp libpthread-stubs ]; - nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DBUILD_SAMPLES=OFF" - "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DBUILD_TESTS=OFF" "-DUSE_SYSTEM_GTEST=ON" ]; - doCheck = true; + doCheck = false; meta = { description = "Intel Media SDK"; diff --git a/pkgs/by-name/in/intercal/package.nix b/pkgs/by-name/in/intercal/package.nix index 70dc84c82994..1366dd0b7d2d 100644 --- a/pkgs/by-name/in/intercal/package.nix +++ b/pkgs/by-name/in/intercal/package.nix @@ -3,37 +3,34 @@ stdenv, fetchurl, fetchpatch, - pkg-config, + autoreconfHook, bison, flex, makeWrapper, + pkg-config, }: stdenv.mkDerivation rec { pname = "intercal"; - version = "0.31"; + version = "0.34"; src = fetchurl { url = "http://catb.org/esr/intercal/intercal-${version}.tar.gz"; - sha256 = "1z2gpa5rbqb7jscqlf258k0b0jc7d2zkyipb5csjpj6d3sw45n4k"; + hash = "sha256-fvYUjDUd9mhGbi3L15UXci+RwzyqORWVcTfzgzcfjVU="; }; - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchains: - # https://gitlab.com/esr/intercal/-/issues/4 - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lang/c-intercal/files/c-intercal-31.0-no-common.patch?id=a110a98b4de6f280d770ba3cc92a4612326205a3"; - sha256 = "03523fc40042r2ryq5val27prlim8pld4950qqpawpism4w3y1p2"; - }) - ]; + postPatch = '' + # Workaround: https://gitlab.com/esr/intercal/-/work_items/9 + substituteInPlace src/abcessh.in --replace-fail "#ifdef HAVE_STDARG_H" "#if 1" + ''; nativeBuildInputs = [ - pkg-config + autoreconfHook bison flex makeWrapper + pkg-config ]; # Intercal invokes gcc, so we need an explicit PATH diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 9b8d5610f091..c0f62e8f5ce5 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -17,7 +17,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2026-1.1"; + version = "2026-1.2"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-/UB8mWB3yaT+mDa3mqGm2ULqDdNcmQu+cHKNdKQa/ug="; + hash = "sha256-Zw/QtmbINCV1VPz52KCxam+WFgkh8Kjz1v0e7oVeZCs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/is/isle-portable/unwrapped.nix b/pkgs/by-name/is/isle-portable/unwrapped.nix index 825b9e9bad5a..889968a859e4 100644 --- a/pkgs/by-name/is/isle-portable/unwrapped.nix +++ b/pkgs/by-name/is/isle-portable/unwrapped.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace packaging/macos/CMakeLists.txt \ --replace-fail "fixup_bundle" "#fixup_bundle" ''; diff --git a/pkgs/by-name/it/itools/package.nix b/pkgs/by-name/it/itools/package.nix index 6a54e031b05c..e56b771274ec 100644 --- a/pkgs/by-name/it/itools/package.nix +++ b/pkgs/by-name/it/itools/package.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-DxTZaq2SlEmy9k7iAdjctpPkk+2rIaF+xEcfXj/ERWw="; }; + postPatch = '' + rm config.h.in + ''; + meta = { description = "Islamic command-line tools for prayer times and hijri dates"; longDescription = '' diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix index 0a38413359f9..742501fe21b2 100644 --- a/pkgs/by-name/ja/jabref/package.nix +++ b/pkgs/by-name/ja/jabref/package.nix @@ -173,8 +173,8 @@ stdenv.mkDerivation rec { zip -d $out/lib/javafx-web-*-*.jar "*.so" # Use postgresql from nixpkgs since the bundled binary doesn't work on NixOS - ARCH1=${if stdenv.isAarch64 then "arm64v8" else "amd64"} - ARCH2=${if stdenv.isAarch64 then "arm_64" else "x86_64"} + ARCH1=${if stdenv.hostPlatform.isAarch64 then "arm64v8" else "amd64"} + ARCH2=${if stdenv.hostPlatform.isAarch64 then "arm_64" else "x86_64"} mkdir postgresql cd postgresql ln -s ${postgresql}/{lib,share} ./ diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index afd5826b9167..e95370728979 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.1807"; + version = "0.24.1831"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-HkhjHIMZCTzbxaZNb4wFRDAaDJVD9WPS+lNMnM34rEM="; + hash = "sha256-ipOlkUz1DK0U01OUI2Kd3gQTF2/MULkk5CVu4EfELmI="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix index 767ba5ac7527..102dd142399a 100644 --- a/pkgs/by-name/jd/jdupes/package.nix +++ b/pkgs/by-name/jd/jdupes/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromCodeberg, + fetchpatch2, libjodycode, }: @@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: { postFetch = "rm -r $out/testdir"; }; + patches = [ + (fetchpatch2 { + name = "use-stat-time-macros-for-compatibility-reasons.patch"; + url = "https://codeberg.org/jbruchon/jdupes/commit/464f72c82f2ce81dd33bfb5381f1bcf148da4091.patch"; + hash = "sha256-/B6iNAG3Fsmot5MGSBMs99QnAc/bFZJjPtnbiq21QZg="; + }) + ]; + buildInputs = [ libjodycode ]; dontConfigure = true; diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index 6170f8031c66..4b195e72934d 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -8,19 +8,19 @@ buildGoModule (finalAttrs: { pname = "jfrog-cli"; - version = "2.78.10"; + version = "2.103.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-o3H+onnvGFGxUtFRYFHmrEQ5EqQCGP8n/NdqdEHNj84="; + hash = "sha256-7IJ76xpaM3V964dYOu4mZCxbx66e5976QYNddNoyiJk="; }; proxyVendor = true; - vendorHash = "sha256-jzjYFnctUwQUVC59JIsrHTIWCqYiZTurNFLn9zuM+18="; + vendorHash = "sha256-vtLsjbj1cb6AmV8EM+9cghlcL9nVDMeC8Au3sMuT91c="; - checkFlags = "-skip=^TestReleaseBundle"; + checkFlags = "-skip=^(TestReleaseBundle|TestVisibilitySendUsage_RtCurl_E2E)"; postInstall = '' # Name the output the same way as the original build script does diff --git a/pkgs/by-name/jj/jj-vine/package.nix b/pkgs/by-name/jj/jj-vine/package.nix index a756e1d07421..6287241df882 100644 --- a/pkgs/by-name/jj/jj-vine/package.nix +++ b/pkgs/by-name/jj/jj-vine/package.nix @@ -6,20 +6,22 @@ git, writableTmpDirAsHomeHook, cacert, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jj-vine"; - version = "0.3.6"; + version = "0.5.0"; src = fetchFromCodeberg { owner = "abrenneke"; repo = "jj-vine"; tag = "v${finalAttrs.version}"; - hash = "sha256-vvNbeQvP205snAGiql/i8yFGyMw23YkSU4/uxOSnycY="; + hash = "sha256-uvnSv+4ijVdBoHrOklDRY+JDLsVOTRu+laOcFMjkYaA="; }; - cargoHash = "sha256-vcpaKlNeORnDpVqXxu0TrXWaWNfaK9QPVJOrty9WmcQ="; + cargoHash = "sha256-TsyFWcvr8ksiC1vStWs+mH88lw1/JGRg8IQ7XFnZ5qg="; nativeCheckInputs = [ jujutsu @@ -29,6 +31,11 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFeatures = [ "no-e2e-tests" ]; env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Tool for submitting stacked Pull/Merge Requests from Jujutsu bookmarks"; homepage = "https://codeberg.org/abrenneke/jj-vine"; diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 6050122523e2..c00abb320409 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,16 +8,16 @@ }: buildGo125Module (finalAttrs: { pname = "jjui"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-20NWoojFBwHs33NFNeZbk1kiZ418kYD42XTUOHuQtv8="; + hash = "sha256-3cr6aSJoIAv9Ine2ePHCC6xBaS1G4i23yQh8I5mq47g="; }; - vendorHash = "sha256-AJlJ9iHkkWNS8a4oGt8AG89StjMH9UH3WuOcZwa3VS8="; + vendorHash = "sha256-iUWeQIYwOkXhRFsQc5zBjFFG5m412ysR5LsZsHET1ak="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/jm/jmc2obj/package.nix b/pkgs/by-name/jm/jmc2obj/package.nix index b4abf1aff21c..efc0114dc310 100644 --- a/pkgs/by-name/jm/jmc2obj/package.nix +++ b/pkgs/by-name/jm/jmc2obj/package.nix @@ -4,20 +4,21 @@ jre, makeWrapper, maven, + nix-update-script, }: maven.buildMavenPackage rec { pname = "j-mc-2-obj"; - version = "126"; + version = "128"; src = fetchFromGitHub { owner = "jmc2obj"; repo = "j-mc-2-obj"; - rev = version; - hash = "sha256-c0qLryv9Gx9BlKXmwSKkK5/v3Wypny841htNfsNNxpg="; + tag = version; + hash = "sha256-3+vH1pGJ6I4oobb2vk+J5GrOQrSLNoCuBIC9OsWYCj0="; }; - mvnHash = "sha256-ya8E/6tOxyW+AO7v9p0dg72qFpQjWwvntZOw+TEKq0k="; + mvnHash = "sha256-ZU/5RGujCdmlBuxtHDaBpF/54e8W/Kca+2jtTudMXWo="; mvnParameters = "-Dmaven.gitcommitid.skip=true"; @@ -33,6 +34,8 @@ maven.buildMavenPackage rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/jmc2obj/j-mc-2-obj/releases/tag/${version}"; description = "Java-based Minecraft-to-OBJ exporter"; diff --git a/pkgs/by-name/jo/joplin-cli/package.nix b/pkgs/by-name/jo/joplin-cli/package.nix index 8722e160fb1e..fd2748722c5e 100644 --- a/pkgs/by-name/jo/joplin-cli/package.nix +++ b/pkgs/by-name/jo/joplin-cli/package.nix @@ -28,11 +28,22 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NNtdY6ajMfcMWj/AIo+b2nhylBCqyOIwCepYx/ZNCBY="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/laurent22/joplin/blob/dev/package.json#L103 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes postPatch; - hash = "sha256-EGP/nnz4u6I0efTQu41lgmk0tuHpiavVKHRdiSYdEUs="; + inherit (finalAttrs) + src + missingHashes + patches + postPatch + ; + hash = "sha256-qTDrNoOnlrceIJZ/VGAYnMozQsURbCdtAA4ZV3NQYmc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jo/joplin-cli/yarn-4.14-support.patch b/pkgs/by-name/jo/joplin-cli/yarn-4.14-support.patch new file mode 100644 index 000000000000..dfcc07f08841 --- /dev/null +++ b/pkgs/by-name/jo/joplin-cli/yarn-4.14-support.patch @@ -0,0 +1,26 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -5,7 +5,10 @@ nodeLinker: node-modules + compressionLevel: mixed + enableGlobalCache: false + +-yarnPath: .yarn/releases/yarn-4.9.2.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true + + logFilters: + # Disable useless non-actionable warnings. +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index c0f31bf541f7..ce1c3589d199 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -47,10 +47,21 @@ stdenv.mkDerivation (finalAttrs: { inherit (releaseData) hash; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/laurent22/joplin/blob/dev/package.json#L103 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes postPatch; + inherit (finalAttrs) + src + missingHashes + patches + postPatch + ; hash = releaseData.deps_hash; }; diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json index 31c0c409db70..71f8e781c5b7 100644 --- a/pkgs/by-name/jo/joplin-desktop/release-data.json +++ b/pkgs/by-name/jo/joplin-desktop/release-data.json @@ -9,5 +9,5 @@ "npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0=" } }, - "deps_hash": "sha256-iDclcCwzgmKOMxO4ZdmPyTKPoGY24+6gm19E4+pCB50=" + "deps_hash": "sha256-77uC3QvYzAI6GIBL7uAuf+p6i/M4VptN27NFY/zmeUg=" } diff --git a/pkgs/by-name/jo/joplin-desktop/yarn-4.14-support.patch b/pkgs/by-name/jo/joplin-desktop/yarn-4.14-support.patch new file mode 100644 index 000000000000..dfcc07f08841 --- /dev/null +++ b/pkgs/by-name/jo/joplin-desktop/yarn-4.14-support.patch @@ -0,0 +1,26 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -5,7 +5,10 @@ nodeLinker: node-modules + compressionLevel: mixed + enableGlobalCache: false + +-yarnPath: .yarn/releases/yarn-4.9.2.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true + + logFilters: + # Disable useless non-actionable warnings. +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix index 266ced05efa0..cb0acd896dba 100644 --- a/pkgs/by-name/jo/josh/package.nix +++ b/pkgs/by-name/jo/josh/package.nix @@ -10,7 +10,7 @@ }: let - version = "26.04.19"; + version = "26.05.08"; in rustPlatform.buildRustPackage { @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "josh-project"; repo = "josh"; rev = "r${version}"; - hash = "sha256-tWU7ZGs148fmCXJxUM1RiDIgJONMZnFXO7ksaqqoT9I="; + hash = "sha256-rG5ZkEH8ZL8t0sDnBnNPtVtaR1I8BoulXlFh0HCpMsw="; }; - cargoHash = "sha256-Ksl3dFeEpwhpiotNuM9/vg7aD2TUuHKvqUaZkbceCdY="; + cargoHash = "sha256-/hMn80jHDF9gh+K8IOV5zXllzJkCdcmvI/NmbKFd/uM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/jo/jove/package.nix b/pkgs/by-name/jo/jove/package.nix index c433f0cd5e27..db4eb350f688 100644 --- a/pkgs/by-name/jo/jove/package.nix +++ b/pkgs/by-name/jo/jove/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ + OPTFLAGS="-O -Wno-error=incompatible-pointer-types" \ JTMPDIR=$TMPDIR TERMCAPLIB=-lncurses \ SHELL=${runtimeShell} \ diff --git a/pkgs/by-name/jo/joystickwake/package.nix b/pkgs/by-name/jo/joystickwake/package.nix index db39b51d67c7..f455d91fd88d 100644 --- a/pkgs/by-name/jo/joystickwake/package.nix +++ b/pkgs/by-name/jo/joystickwake/package.nix @@ -1,18 +1,18 @@ { lib, python3, - fetchFromGitHub, + fetchFromCodeberg, }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "joystickwake"; - version = "0.4.2"; + version = "0.5.2"; pyproject = true; - src = fetchFromGitHub { - owner = "foresto"; + src = fetchFromCodeberg { + owner = "forestix"; repo = "joystickwake"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-vSvIpbcDIbRyitVjx3wNSxt5vTIZ9/NPWokOJt0p6oQ="; + hash = "sha256-qIXXlwZec4CQk93gmY5O3mdGdlNCeXWTr/DDw4vwRUM="; }; build-system = with python3.pkgs; [ @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ]; dependencies = with python3.pkgs; [ - dbus-next + dbus-fast pyudev xlib ]; diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 37e61e88a66a..9a698fb4fe8a 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; - version = "0.46.3"; + version = "0.46.4"; src = fetchCrate { pname = "jsonschema-cli"; inherit (finalAttrs) version; - hash = "sha256-/Tebhwn+H8HFTUelaQ33kuU6np3QKCrZpKfpvm7buWI="; + hash = "sha256-Yze2iL+4SAR3WUgypGM94OKKFlD4PTLrvsP+nJz9Kho="; }; - cargoHash = "sha256-XP8IphAprOmwqHMzkcJN4rOjMZ3yNEhpvwO3tAD203Y="; + cargoHash = "sha256-28OtvYDv7OpIio7WghkuVA8t+d0b91bQ9U/llJEFzmw="; preCheck = '' export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index eb0e34df5d7a..7cb5571eb585 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-PBrsNHywOUEiFyyHW6J4WHDmLwVWv2JkbHCNvbE0tHE="; + hash = "sha256-id35e2kzyHyXCRy0aomkd1l0K7qzD0RnzdAzxKUGiso="; }; - cargoHash = "sha256-jOklgYw6mYCs/FnTczmkT7MlepNtnHXfFB4lghpLOVE="; + cargoHash = "sha256-zWfdIac+SsNdfXAfD4NVTl7YfXzAlrK82KNduFgG1EA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index 335e5750ae17..0d9449dd0b44 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -22,23 +22,23 @@ let in clangStdenv.mkDerivation (finalAttrs: { pname = "julec"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "julelang"; repo = "jule"; tag = "jule${finalAttrs.version}"; name = "jule-${finalAttrs.version}"; - hash = "sha256-fwltqCmpCzWkCFGxGrhozW7LQmDwGT8nR9NO5s0nMfI="; + hash = "sha256-zfFsWP1nFvyzIqtf/nG4itpKxy6ZZjb3gGC3LwLVGPk="; }; irSrc = fetchFromGitHub { owner = "julelang"; repo = "julec-ir"; # revision determined by the upstream commit hash - rev = "e4134d89f34588e9fb5cc5698f27b0471918e057"; + rev = "5de197f9041dbc61b1d97ed4e3b84c0f667014f8"; name = "jule-ir-${finalAttrs.version}"; - hash = "sha256-hdS/q2/V/N97fM0r6jrj2SEGWdx9pFivGE4K4l8iVag="; + hash = "sha256-PMAFXLXa3wS0+TWEU2bjlw5UzOmAx8ittQzuExhrWDM="; }; dontConfigure = true; diff --git a/pkgs/by-name/ju/juledoc/package.nix b/pkgs/by-name/ju/juledoc/package.nix index a83f69cfcd7f..ad8554254849 100644 --- a/pkgs/by-name/ju/juledoc/package.nix +++ b/pkgs/by-name/ju/juledoc/package.nix @@ -7,13 +7,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "juledoc"; - version = "0.0.0-unstable-2026-02-02"; + version = "0.0.0-unstable-2026-04-13"; src = fetchFromGitHub { owner = "julelang"; repo = "juledoc"; - rev = "e01e200293d134064c674f705c9babf6d23775e8"; - hash = "sha256-JzIwIEd9kuVrBVo2H5bv3ROqpVUndBqLAZVYmoGbYuQ="; + rev = "d6ba549aeb82ea224e2cf07e0f0f3a2448dbd9db"; + hash = "sha256-3n9VOoXIFEI9V6fzSD75PdwkijXruC7qWClOUlWd52I="; }; nativeBuildInputs = [ julec.hook ]; diff --git a/pkgs/by-name/ju/julefmt/package.nix b/pkgs/by-name/ju/julefmt/package.nix index f79e042a99f8..05e619ff982c 100644 --- a/pkgs/by-name/ju/julefmt/package.nix +++ b/pkgs/by-name/ju/julefmt/package.nix @@ -7,13 +7,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "julefmt"; - version = "0.0.0-unstable-2026-01-31"; + version = "0.0.0-unstable-2026-05-02"; src = fetchFromGitHub { owner = "julelang"; repo = "julefmt"; - rev = "85b4aaca42e958fb33d6769879ec0a375913206c"; - hash = "sha256-1UR5hsG5squzb2ADPMmHMKFSL4/fePlYsSlfx70nPSU="; + rev = "6bd55e31ebba393c973017332502a548ea0f402c"; + hash = "sha256-j8V5L4j4qaApJixsEo10Qv58IHcU54hnpL8uD+T0C0M="; }; nativeBuildInputs = [ julec.hook ]; diff --git a/pkgs/by-name/jw/jwt-hack/Cargo.lock b/pkgs/by-name/jw/jwt-hack/Cargo.lock index 24b8a68325b6..569486c79865 100644 --- a/pkgs/by-name/jw/jwt-hack/Cargo.lock +++ b/pkgs/by-name/jw/jwt-hack/Cargo.lock @@ -1,36 +1,27 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] +version = 4 [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "allocator-api2" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" @@ -42,10 +33,23 @@ dependencies = [ ] [[package]] -name = "anstream" -version = "0.6.19" +name = "ansi-to-tui" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +checksum = "67555e1f1ece39d737e28c8a017721287753af3f93225e4a445b29ccb0f5912c" +dependencies = [ + "nom", + "ratatui", + "simdutf8", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "anstream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -58,130 +62,219 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.9" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "backtrace" -version = "0.3.75" +name = "aws-lc-rs" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", + "aws-lc-sys", + "untrusted", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "axum" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" +dependencies = [ + "axum-core", + "bytes", + "form_urlencoded", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde_core", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", + "tracing", ] [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "bumpalo" -version = "3.18.1" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" +dependencies = [ + "rustversion", +] [[package]] name = "cc" -version = "1.2.26" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ + "find-msvc-tools", + "jobserver", + "libc", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", "windows-link", ] [[package]] name = "clap" -version = "4.5.39" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -189,9 +282,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.39" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", @@ -201,9 +294,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.32" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", @@ -213,37 +306,58 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "colored" -version = "2.2.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" +checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.61.2", +] + +[[package]] +name = "compact_str" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "static_assertions", ] [[package]] name = "console" -version = "0.15.11" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87" dependencies = [ "encode_unicode", "libc", - "once_cell", - "unicode-width", - "windows-sys 0.59.0", + "unicode-width 0.2.0", + "windows-sys 0.61.2", ] [[package]] @@ -252,6 +366,15 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -278,14 +401,106 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] -name = "deranged" -version = "0.4.0" +name = "crossterm" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix 0.38.44", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "darling" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" +dependencies = [ + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", ] +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "either" version = "1.15.0" @@ -299,51 +514,263 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] -name = "env_logger" -version = "0.10.2" +name = "env_filter" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", ] [[package]] -name = "errno" -version = "0.3.12" +name = "env_logger" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] -name = "getrandom" -version = "0.3.3" +name = "filedescriptor" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" dependencies = [ - "cfg-if", "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "thiserror 1.0.69", + "winapi", ] [[package]] -name = "gimli" -version = "0.31.1" +name = "find-msvc-tools" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[package]] +name = "futures-executor" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" + +[[package]] +name = "futures-macro" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" + +[[package]] +name = "futures-task" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" + +[[package]] +name = "futures-util" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "slab", +] + +[[package]] +name = "gag" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972" +dependencies = [ + "filedescriptor", + "tempfile", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "wasip2", + "wasip3", +] + +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -351,29 +778,97 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" - [[package]] name = "hmac-sha256" -version = "1.1.12" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6880c8d4a9ebf39c6e8b77007ce223f646a4d21ce29d99f70cb16420545425" +checksum = "ec9d92d097f4749b64e8cc33d924d9f40a2d4eb91402b458014b781f5733d60f" [[package]] -name = "humantime" -version = "2.2.0" +name = "http" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +dependencies = [ + "bytes", + "http", + "http-body", + "hyper", + "pin-project-lite", + "tokio", + "tower-service", +] [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -394,145 +889,311 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.17.11" +name = "id-arena" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "indexmap" +version = "2.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +dependencies = [ + "equivalent", + "hashbrown 0.17.1", + "serde", + "serde_core", +] + +[[package]] +name = "indicatif" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb" dependencies = [ "console", - "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", + "unit-prefix", "web-time", ] [[package]] -name = "is-terminal" -version = "0.4.16" +name = "indoc" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.59.0", + "rustversion", +] + +[[package]] +name = "instability" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971" +dependencies = [ + "darling", + "indoc", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "jiff" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + +[[package]] +name = "josekit" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a808e078330e6af222eb0044b71d4b1ff981bfef43e7bc8133a88234e0c86a0c" +dependencies = [ + "anyhow", + "base64", + "flate2", + "openssl", + "regex", + "serde", + "serde_json", + "thiserror 2.0.18", + "time", +] [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ + "cfg-if", + "futures-util", "once_cell", "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "10.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "0529410abe238729a60b108898784df8984c87f6054c9c4fcacc47e4803c1ce1" dependencies = [ - "base64 0.21.7", + "aws-lc-rs", + "base64", + "getrandom 0.2.17", + "js-sys", "pem", - "ring", "serde", "serde_json", + "signature", "simple_asn1", ] [[package]] name = "jwt-hack" -version = "2.0.0" +version = "2.5.0" dependencies = [ + "ansi-to-tui", "anyhow", - "base64 0.21.7", + "axum", + "base64", "chrono", "clap", "colored", + "crossterm", + "dirs", "env_logger", + "flate2", + "gag", "hmac-sha256", "indicatif", + "josekit", "jsonwebtoken", "log", + "openssl", + "ratatui", "rayon", + "rmcp", "serde", "serde_json", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.18", "tokio", + "toml", + "tower", + "tower-http", ] [[package]] -name = "lazy_static" -version = "1.5.0" +name = "leb128fmt" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + +[[package]] +name = "libredox" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +dependencies = [ + "libc", +] [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" + +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.5", +] + +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "mio" -version = "1.0.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "log", + "wasi", + "windows-sys 0.61.2", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", ] [[package]] @@ -547,9 +1208,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" [[package]] name = "num-integer" @@ -569,38 +1230,76 @@ dependencies = [ "autocfg", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[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 = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + +[[package]] +name = "openssl" +version = "0.10.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0b434746ee2832f4f0baf10137e1cabb18cbe6912c69e2e33263c45250f542" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-src" +version = "300.6.0+3.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8e8cbfd3a4a8c8f089147fd7aaa33cf8c7450c4d09f8f80698a0cf093abeff4" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -608,37 +1307,71 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-link", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pastey" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5a797f0e07bdf071d15742978fc3128ec6c22891c31a3a931513263904c982a" + [[package]] name = "pem" -version = "1.1.1" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" dependencies = [ - "base64 0.13.1", + "base64", + "serde_core", ] [[package]] -name = "pin-project-lite" -version = "0.2.16" +name = "percent-encoding" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project-lite" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + +[[package]] +name = "pkg-config" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" + +[[package]] +name = "portable-atomic-util" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" +dependencies = [ + "portable-atomic", +] [[package]] name = "powerfmt" @@ -647,34 +1380,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "proc-macro2" -version = "1.0.95" +name = "prettyplease" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", +] + +[[package]] +name = "ratatui" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" +dependencies = [ + "bitflags", + "cassowary", + "compact_str", + "crossterm", + "indoc", + "instability", + "itertools", + "lru", + "paste", + "strum", + "unicode-segmentation", + "unicode-truncate", + "unicode-width 0.2.0", +] [[package]] name = "rayon" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -682,9 +1461,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -692,18 +1471,49 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.12" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] [[package]] -name = "regex" -version = "1.11.1" +name = "redox_users" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.17", + "libredox", + "thiserror 2.0.18", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "regex" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -713,9 +1523,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -724,55 +1534,108 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] -name = "ring" -version = "0.16.20" +name = "rmcp" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "0a621b37a548ff6ab6292d57841eb25785a7f146d89391a19c9f199414bd13da" dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", + "async-trait", + "base64", + "chrono", + "futures", + "pastey", + "pin-project-lite", + "rmcp-macros", + "schemars", + "serde", + "serde_json", + "thiserror 2.0.18", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "rustc-demangle" -version = "0.1.24" +name = "rmcp-macros" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "6b79ed92303f9262db79575aa8c3652581668e9d136be6fd0b9ededa78954c95" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "serde_json", + "syn", +] [[package]] name = "rustix" -version = "1.0.7" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.15", "windows-sys 0.59.0", ] [[package]] -name = "rustversion" -version = "1.0.21" +name = "rustix" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.12.1", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "chrono", + "dyn-clone", + "ref-cast", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn", +] [[package]] name = "scopeguard" @@ -781,19 +1644,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "serde" -version = "1.0.219" +name = "semver" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", @@ -802,12 +1692,46 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ + "indexmap", "itoa", "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" +dependencies = [ + "itoa", + "serde", + "serde_core", +] + +[[package]] +name = "serde_spanned" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", "ryu", "serde", ] @@ -819,26 +1743,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "signal-hook-registry" -version = "1.4.5" +name = "signal-hook" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" dependencies = [ "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", ] [[package]] -name = "simple_asn1" -version = "0.6.3" +name = "signature" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "simple_asn1" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d" dependencies = [ "num-bigint", "num-traits", - "thiserror 2.0.12", + "thiserror 2.0.18", "time", ] +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + [[package]] name = "smallvec" version = "1.15.1" @@ -847,19 +1820,19 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.10" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] -name = "spin" -version = "0.5.2" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" @@ -868,10 +1841,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "syn" -version = "2.0.101" +name = "strum" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -879,25 +1874,22 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.20.0" +name = "sync_wrapper" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" -dependencies = [ - "fastrand", - "getrandom", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" [[package]] -name = "termcolor" -version = "1.4.1" +name = "tempfile" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ - "winapi-util", + "fastrand", + "getrandom 0.4.2", + "once_cell", + "rustix 1.1.4", + "windows-sys 0.61.2", ] [[package]] @@ -911,11 +1903,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.18", ] [[package]] @@ -931,9 +1923,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -942,30 +1934,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.41" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.22" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -973,11 +1965,10 @@ dependencies = [ [[package]] name = "tokio" -version = "1.45.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ - "backtrace", "bytes", "libc", "mio", @@ -986,14 +1977,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", @@ -1001,10 +1992,159 @@ dependencies = [ ] [[package]] -name = "unicode-ident" -version = "1.0.18" +name = "tokio-util" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.9.12+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" +dependencies = [ + "indexmap", + "serde_core", + "serde_spanned", + "toml_datetime", + "toml_parser", + "toml_writer", + "winnow 0.7.15", +] + +[[package]] +name = "toml_datetime" +version = "0.7.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" +version = "1.1.2+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +dependencies = [ + "winnow 1.0.2", +] + +[[package]] +name = "toml_writer" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" +dependencies = [ + "bitflags", + "bytes", + "http", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "unicode-ident" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-segmentation" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" + +[[package]] +name = "unicode-truncate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools", + "unicode-segmentation", + "unicode-width 0.1.14", +] + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-width" @@ -1012,6 +2152,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "unit-prefix" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" + [[package]] name = "untrusted" version = "0.7.1" @@ -1025,51 +2177,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "wasi" -version = "0.14.2+wasi-0.2.4" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.3+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen 0.57.1", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1077,34 +2231,58 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] [[package]] -name = "web-sys" -version = "0.3.77" +name = "wasm-encoder" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" dependencies = [ - "js-sys", - "wasm-bindgen", + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap", + "semver", ] [[package]] @@ -1133,15 +2311,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -1150,9 +2319,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -1163,9 +2332,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -1174,9 +2343,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -1185,37 +2354,28 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-sys" version = "0.59.0" @@ -1225,6 +2385,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -1290,10 +2459,119 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "winnow" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" + +[[package]] +name = "winnow" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" + +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" dependencies = [ - "bitflags", + "wit-bindgen-rust-macro", ] + +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "prettyplease", + "syn", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/pkgs/by-name/jw/jwt-hack/package.nix b/pkgs/by-name/jw/jwt-hack/package.nix index d84b86331762..9ecab2c65bd7 100644 --- a/pkgs/by-name/jw/jwt-hack/package.nix +++ b/pkgs/by-name/jw/jwt-hack/package.nix @@ -2,17 +2,19 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + openssl, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jwt-hack"; - version = "2.0.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "hahwul"; repo = "jwt-hack"; tag = "v${finalAttrs.version}"; - hash = "sha256-uJur/ABoAaQT3BBO2yprK/0/bQPT138Yg9IbztZ6w2w="; + hash = "sha256-kutt5VhMY/YIXBpVZTg/xAwa9d+J5ypfLi5aLakjfaY="; }; cargoLock = { @@ -23,6 +25,16 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -s ${./Cargo.lock} Cargo.lock ''; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + OPENSSL_NO_VENDOR = 1; + meta = { description = "JSON Web Token Hack Toolkit"; homepage = "https://github.com/hahwul/jwt-hack"; diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index eccba34d81be..b13be50d918e 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.28.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-gPGMOawC8SymiGp0Zcm/bk+sD8R4DWDCrJpi4LGcDnE="; + hash = "sha256-D47BSI0BcVyO8y42+aqkp1/59548kENtqdQyXg519os="; }; - vendorHash = "sha256-ixL1S60XOtqzadQTZsT5utfsSW2LE9/30xXujQvgpxI="; + vendorHash = "sha256-zUKfn7dli/vfHha3AaFrSbux1oDOZyV2dWE/BorYN8I="; ldflags = [ "-s" diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index 8ad0511bf4c1..ce60330b31a0 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -7,7 +7,6 @@ # build cmake, - extra-cmake-modules, kdePackages, pkg-config, writableTmpDirAsHomeHook, @@ -37,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules kdePackages.wrapQtAppsHook pkg-config writableTmpDirAsHomeHook diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 676f5b9f558b..675875ff419c 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kakoune-lsp"; - version = "19.0.1"; + version = "20.0.0"; src = fetchFromGitHub { owner = "kakoune-lsp"; repo = "kakoune-lsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-MDGDc2xhQNfbczq/JT/hDd3ZPLRd9DVXdTg0VLQLNHk="; + hash = "sha256-1O0Seyz+Wzt2aJh5Os5D/7UI4LVizvY195aXJSMpeyw="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-5ESICzwLcXheqNz/E3EBX7K2RFVFPAAuoqyZsJpVijI="; + cargoHash = "sha256-wmoF0pwuXN83xy4R7wC1+YBBNdseFCg8xSqkBR/Axro="; meta = { description = "Kakoune Language Server Protocol Client"; diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix index a7de1cc10d5f..154eb8b0bdce 100644 --- a/pkgs/by-name/ka/katex/package.nix +++ b/pkgs/by-name/ka/katex/package.nix @@ -19,9 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-M9PqzSQkMcnfuL2n/eLwxnk3E9gSEVu0t6Tahiw7niI="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/KaTeX/KaTeX/blob/main/package.json#L58 + ./yarn-4.14-support.patch + ]; + offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src; - hash = "sha256-bRzYuiYDAz9LTcaUgI0dvfxU/eo0uTSz0pPP7dH5XW8="; + inherit (finalAttrs) src patches; + hash = "sha256-6DxF+TtUOqW14ivBHETUMXzDspP/54k1OzbKeIJqDAQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ka/katex/yarn-4.14-support.patch b/pkgs/by-name/ka/katex/yarn-4.14-support.patch new file mode 100644 index 000000000000..1187f50502b8 --- /dev/null +++ b/pkgs/by-name/ka/katex/yarn-4.14-support.patch @@ -0,0 +1,20 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,2 +1,5 @@ + compressionLevel: mixed + enableGlobalCache: false ++approvedGitRepositories: ++ - "**" ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/ka/kati/package.nix b/pkgs/by-name/ka/kati/package.nix index e956e4798851..f3e1e621ff97 100644 --- a/pkgs/by-name/ka/kati/package.nix +++ b/pkgs/by-name/ka/kati/package.nix @@ -2,20 +2,25 @@ lib, stdenv, fetchFromGitHub, + replaceVars, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "kati-unstable"; - version = "2019-09-23"; + version = "0-unstable-2026-02-12"; src = fetchFromGitHub { owner = "google"; repo = "kati"; - rev = "9da3296746a0cd55b38ebebf91e7f57105a4c36f"; - sha256 = "0s5dfhgpcbx12b1fqmm8p0jpvrhgrnl9qywv1ksbwhw3pfp7j866"; + rev = "985493689b70e28970952bde44ac2a8433257b5e"; + sha256 = "sha256-fn+eA/TBmiyQYeUQvviL/zc9qxUYfW1BaeqNCILsk+w="; }; - patches = [ ./version.patch ]; + patches = [ + (replaceVars ./version.patch { + version = finalAttrs.src.rev; + }) + ]; installPhase = '' install -D ckati $out/bin/ckati @@ -29,4 +34,4 @@ stdenv.mkDerivation { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danielfullmer ]; }; -} +}) diff --git a/pkgs/by-name/ka/kati/version.patch b/pkgs/by-name/ka/kati/version.patch index 1821ac6bbb73..fa0c19f2bb8c 100644 --- a/pkgs/by-name/ka/kati/version.patch +++ b/pkgs/by-name/ka/kati/version.patch @@ -1,19 +1,22 @@ diff --git a/Makefile.ckati b/Makefile.ckati -index e4067bb..15518f3 100644 +index d585106..7e15d08 100644 --- a/Makefile.ckati +++ b/Makefile.ckati -@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o +@@ -101,16 +101,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o $(KATI_LD) $^ -o $@ $(KATI_LIBS) # Rule to generate version.cc --KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel) +-KATI_GIT_DIR := $(shell cd $(KATI_SRC_PATH); realpath `git rev-parse --git-dir`) + KATI_VERSION_DEPS := -ifneq ($(KATI_GIT_DIR),) --KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index +-KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/HEAD $(KATI_GIT_DIR)/index) +-endif +-ifneq ($(KATI_VERSION_DEPS),) -KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD) -else - KATI_VERSION_DEPS := - KATI_VERSION := unknown +-KATI_VERSION := unknown -endif ++KATI_VERSION := @version@ $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS) @mkdir -p $(dir $@) echo '// +build ignore' > $@ diff --git a/pkgs/by-name/kb/kbdd/package.nix b/pkgs/by-name/kb/kbdd/package.nix index e83b8864ba0f..1142fe4d4376 100644 --- a/pkgs/by-name/kb/kbdd/package.nix +++ b/pkgs/by-name/kb/kbdd/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "kbdd"; - version = "unstable-2021-04-26"; + version = "unstable-2025-08-10"; src = fetchFromGitHub { owner = "qnikst"; repo = "kbdd"; - rev = "3145099e1fbbe65b27678be72465aaa5b5872874"; - sha256 = "1gzcjnflgdqnjgphiqpzwbcx60hm0h2cprncm7i8xca3ln5q6ba1"; + rev = "b87e44afd5859157245eee22b11827605bfa09b9"; + hash = "sha256-cbMcB6jgssfMUjemBOiE06zJK2TbzOWt1Rvt41V33Mo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kd/kdesvn/package.nix b/pkgs/by-name/kd/kdesvn/package.nix deleted file mode 100644 index eba7462c7c7a..000000000000 --- a/pkgs/by-name/kd/kdesvn/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - cmake, - qt5, - apr, - aprutil, - subversion, - subversionClient, - libsForQt5, - extra-cmake-modules, -}: - -stdenv.mkDerivation { - pname = "kdesvn"; - version = "2.1"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "sdk"; - repo = "kdesvn"; - rev = "2028bc2f3621510db05e437e33f5cc225a7cd16b"; - hash = "sha256-IaERXT648v2nTW89V6gpf7Dt95GJd92QmC50de+Knq8="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)" - ''; - - cmakeFlags = [ - "-DSUBVERSION_INSTALL_PATH=${lib.getDev subversion}" - ]; - - nativeBuildInputs = [ - cmake - qt5.wrapQtAppsHook - apr.dev - aprutil.dev - extra-cmake-modules - ]; - - buildInputs = [ - qt5.qtbase - subversion - subversionClient - libsForQt5.kbookmarks - libsForQt5.kcodecs - libsForQt5.kcompletion - libsForQt5.kconfig - libsForQt5.kconfigwidgets - libsForQt5.kcoreaddons - libsForQt5.kdbusaddons - libsForQt5.kdoctools - libsForQt5.ki18n - libsForQt5.kiconthemes - libsForQt5.kitemviews - libsForQt5.kjobwidgets - libsForQt5.kio - libsForQt5.knotifications - libsForQt5.kparts - libsForQt5.kservice - libsForQt5.ktextwidgets - libsForQt5.kwallet - libsForQt5.kwidgetsaddons - libsForQt5.kxmlgui - ]; - - meta = { - homepage = "https://invent.kde.org/sdk/kdesvn"; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - mainProgram = "kdesvn"; - description = "Subversion client by KDE"; - license = lib.licenses.agpl3Plus; - }; -} diff --git a/pkgs/by-name/kd/kdiff3/package.nix b/pkgs/by-name/kd/kdiff3/package.nix index 460dd66312c6..e3000e2143b6 100644 --- a/pkgs/by-name/kd/kdiff3/package.nix +++ b/pkgs/by-name/kd/kdiff3/package.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchurl, - extra-cmake-modules, boost, + cmake, kdePackages, }: @@ -17,7 +17,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - extra-cmake-modules + cmake + kdePackages.extra-cmake-modules kdePackages.kdoctools kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix index 7ad7b8bb246b..1c8d0d0e060c 100644 --- a/pkgs/by-name/ke/keyscope/package.nix +++ b/pkgs/by-name/ke/keyscope/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "keyscope"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "spectralops"; repo = "keyscope"; tag = "v${finalAttrs.version}"; - hash = "sha256-2DhKiQixhTCQD/SYIQa+o1kzEsslu6wAReuWr0rTrH8="; + hash = "sha256-PjuBRxW42DIOyHPqs5sOFBUrPPzVVoYAeKtyIWfA+28="; }; - cargoHash = "sha256-f4r0zZTkVDfycrGqRCaBQrncpAm0NP6XYkj3w7fzQeY="; + cargoHash = "sha256-Oi/F89uRuwqWTa7E/PDVdj/VAnYYeG0BSs+pM41AXCU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch deleted file mode 100644 index 19ca4a46ec88..000000000000 --- a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03dfe43..33553f8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.10) - cmake_policy(SET CMP0048 NEW) - project(kgraphviewer VERSION "2.4.3") - set(KGRAPHVIEWERLIB_SOVERION 3) diff --git a/pkgs/by-name/kg/kgraphviewer/package.nix b/pkgs/by-name/kg/kgraphviewer/package.nix deleted file mode 100644 index 3247296c1608..000000000000 --- a/pkgs/by-name/kg/kgraphviewer/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - extra-cmake-modules, - pkg-config, - wrapGAppsHook3, - libsForQt5, - boost, - graphviz, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kgraphviewer"; - version = "2.4.3"; - - src = fetchurl { - url = "mirror://kde/stable/kgraphviewer/${finalAttrs.version}/kgraphviewer-${finalAttrs.version}.tar.xz"; - sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; - }; - - patches = [ ./cmake-minimum-required.patch ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtsvg - boost - graphviz - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - wrapGAppsHook3 - libsForQt5.kdoctools - libsForQt5.wrapQtAppsHook - ]; - - propagatedBuildInputs = with libsForQt5; [ - kconfig - kinit - kio - kparts - kwidgetsaddons - ]; - - meta = { - description = "Graphviz dot graph viewer for KDE"; - mainProgram = "kgraphviewer"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix index 211d194c9b9b..890806ae81b4 100644 --- a/pkgs/by-name/ki/kicad/versions.nix +++ b/pkgs/by-name/ki/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-testing" = { kicadVersion = { - version = "10.0-2026-04-22"; + version = "10.0-2026-05-09"; src = { - rev = "704a11803d7b882dec23c4fa8623253ba380aadb"; - sha256 = "04y8vfg5ffx1aawcy4np66jv7k2gqv9yvcagnqlh3k4b3adn7g3b"; + rev = "58a1e6556bf606cbc8da10733db8a9801cdfade3"; + sha256 = "1myln0iyl3z4s9h8867rr4zjka9xw04gdl29pqgj8ivjpm8gxw95"; }; }; libVersion = { - version = "10.0-2026-04-22"; + version = "10.0-2026-05-09"; libSources = { - symbols.rev = "49f3091e7fea8d9b935635f3328cbf07b7548625"; - symbols.sha256 = "0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm"; - templates.rev = "66727540677590f988f8448fd3b632d3f26cc1b4"; + symbols.rev = "f31042c9759771f10754f02e54344dee750692b1"; + symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl"; + templates.rev = "db5a3e2a99d5200cabfb03199fe28a5f3ba59191"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "ab2f97eaa2ab7769ec3ad0487ff9bcafabe8641a"; - footprints.sha256 = "0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v"; - packages3d.rev = "efef8c6631221341db2549c52b921e33dd05bbb4"; - packages3d.sha256 = "0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl"; + footprints.rev = "c076368c29f8f5c3ad2ee7ed91083815b79ddb72"; + footprints.sha256 = "1h1v44qc5lvvqvmi1i7b79jhxsfq8snk0mcfl6r73hj6w0b25l84"; + packages3d.rev = "3720ad929a99187fc55a8d35895672ef9aaf9cb7"; + packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl"; }; }; }; diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index 1e4e75ed0014..3bdeb4c32106 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.55.0"; + version = "2.56.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-p4Y5hCWr5BVOGYUJtFJhhDftm+A/CWxbdBhPgOR1TcY="; + hash = "sha256-rax67E/Zr50ejSAjA4Aa1NDsAbJYuAAE4k8hji5UhOg="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-Vlaqe3FTItRZDiYWzOVDL+q7HZ8TgpiLPFTDzUyL4LY="; + vendorHash = "sha256-XHicbYXOfCPFIMKrhyBpchd89anj6kG1/7prpER7aCo="; composerNoPlugins = false; postInstall = '' diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index c97167e898fb..2ced131f418d 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -7,7 +7,7 @@ fetchFromGitHub, pkg-config, cmake, - extra-cmake-modules, + kdePackages, withWayland ? true, withIndicator ? true, dbus, @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - extra-cmake-modules + kdePackages.extra-cmake-modules rustPlatform.bindgenHook rustPlatform.cargoSetupHook rustc diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index a892398db8e0..7b92bfda807c 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kine"; - version = "0.14.16"; + version = "0.15.0"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${finalAttrs.version}"; - hash = "sha256-WLH0aGs8Y8DKbhsjvtnp2sjEDP1F19V/tEtdfT+3FtM="; + hash = "sha256-zGxFVtp2rP5+vm+pDhq7JenJokRT1crkJE2tTksr5vM="; }; - vendorHash = "sha256-RFqK2k1Gm89Oc3c+LAEE2FyOVIfEYIrEbUXQVHUWbrU="; + vendorHash = "sha256-aKAHGDjLzUtCHcxmNGbPuOFW1thpBz2ml17/owvt1a0="; ldflags = [ "-s" diff --git a/pkgs/by-name/ki/kio-fuse/package.nix b/pkgs/by-name/ki/kio-fuse/package.nix deleted file mode 100644 index 8c6d0863fea2..000000000000 --- a/pkgs/by-name/ki/kio-fuse/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - cmake, - extra-cmake-modules, - libsForQt5, - fuse3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kio-fuse"; - version = "5.1.0"; - - src = fetchgit { - url = "https://invent.kde.org/system/kio-fuse.git"; - hash = "sha256-xVeDNkSeHCk86L07lPVokSgHNkye2tnLoCkdw4g2Jv0="; - rev = "v${finalAttrs.version}"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.kio - fuse3 - ]; - - meta = { - description = "FUSE Interface for KIO"; - homepage = "https://invent.kde.org/system/kio-fuse"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ _1000teslas ]; - }; -}) diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index f60a97f33f07..a720b38fbcda 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -14,23 +14,23 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiro-cli"; - version = "2.2.0"; + version = "2.2.2"; src = let darwinDmg = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-upHmDcqQ57aZCnxtfvaPZ7NEnyNgStRHV1Nbo3ND9ZM="; + hash = "sha256-z+eTOA5PTKYEcjdzHL4/LeFqUO61eXhdl0Yn3dzwtw0="; }; in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; - hash = "sha256-z11ujzGvSdt++9KF3xx+nUqjbzIg+ZGyMt+dEemiCq8="; + hash = "sha256-QU8akDY0VrNMrcwuQJHZIUiJrCnjYzshmsaqviY0+PY="; }; aarch64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; - hash = "sha256-2A3Ikang4Ii1VUeElbrxmNG1r+H5/iESEYUtK+aa5B8="; + hash = "sha256-hFJN6FFE3uY1Wdjibb+PoXIKF6W70osg/euxSuLqCZA="; }; x86_64-darwin = darwinDmg; aarch64-darwin = darwinDmg; 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 1f4e03cc7e6d..cb449cb1df97 100644 --- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -75,7 +75,7 @@ python3Packages.buildPythonPackage { echo -e 'quit()' | env -i ./kresd -a 127.0.0.1#53535 -c test-http.lua ''; - doCheck = python3Packages.stdenv.isLinux; # maybe in future + doCheck = python3Packages.stdenv.hostPlatform.isLinux; # maybe in future nativeCheckInputs = with python3Packages; [ augeas dnspython diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix index 7874d6979874..ff54dac5da3d 100644 --- a/pkgs/by-name/ko/komari-agent/package.nix +++ b/pkgs/by-name/ko/komari-agent/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "komari-agent"; - version = "1.1.93"; + version = "1.2.0"; src = fetchFromGitHub { owner = "komari-monitor"; repo = "komari-agent"; tag = finalAttrs.version; - hash = "sha256-6rS+DvPrraW4EgYiyTzhzFTSKQQ4OssiBUSOMaOlBvo="; + hash = "sha256-3SwkZ3hUXl/JKWZNhkwQ5bgngahLdsv3NjVuOd3q7MY="; }; vendorHash = "sha256-5RL/dDR/Or9GRCPVQmUYKTV82q7xuN2Mqc4/86WmbqY="; diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix index 1a150bc46352..80075abbc1eb 100644 --- a/pkgs/by-name/kp/kphotoalbum/package.nix +++ b/pkgs/by-name/kp/kphotoalbum/package.nix @@ -2,7 +2,6 @@ stdenv, fetchurl, lib, - extra-cmake-modules, exiv2, ffmpeg, libvlc, @@ -27,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - extra-cmake-modules + kdePackages.extra-cmake-modules kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/kr/krename/package.nix b/pkgs/by-name/kr/krename/package.nix index 50add1b75286..92cc85ddf0f1 100644 --- a/pkgs/by-name/kr/krename/package.nix +++ b/pkgs/by-name/kr/krename/package.nix @@ -2,7 +2,7 @@ stdenv, fetchFromGitLab, lib, - extra-cmake-modules, + cmake, kdePackages, taglib, exiv2, @@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - extra-cmake-modules + cmake + kdePackages.extra-cmake-modules kdePackages.kdoctools kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/kr/krita-unwrapped/package.nix b/pkgs/by-name/kr/krita-unwrapped/package.nix index 8b5efa331ecd..b5c14dcb9ccd 100644 --- a/pkgs/by-name/kr/krita-unwrapped/package.nix +++ b/pkgs/by-name/kr/krita-unwrapped/package.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "krita-unwrapped"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "mirror://kde/stable/krita/${finalAttrs.version}/krita-${finalAttrs.version}.tar.gz"; - hash = "sha256-kytodhJvfGKeQn7j0BIwDIKGsFoYQnc1S0FK9kGg8e0="; + hash = "sha256-COddFMgFJh/IIovsFt70cF9unPsBkecb0EzEwOGChIo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kr/krusader/package.nix b/pkgs/by-name/kr/krusader/package.nix index f4e98cb2cffe..2753a4696998 100644 --- a/pkgs/by-name/kr/krusader/package.nix +++ b/pkgs/by-name/kr/krusader/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - extra-cmake-modules, cmake, kdePackages, }: @@ -18,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules kdePackages.kdoctools kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ks/ksnip/package.nix b/pkgs/by-name/ks/ksnip/package.nix index a06b8e76337f..462b646d1e96 100644 --- a/pkgs/by-name/ks/ksnip/package.nix +++ b/pkgs/by-name/ks/ksnip/package.nix @@ -3,43 +3,37 @@ lib, cmake, fetchFromGitHub, - fetchpatch, - libsForQt5, + qt6, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { pname = "ksnip"; - version = "1.10.1"; + version = "1.10.1-unstable-2026-02-27"; src = fetchFromGitHub { owner = "ksnip"; repo = "ksnip"; - tag = "v${finalAttrs.version}"; - hash = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I="; + rev = "f50e2764d0d51af2fd06c9d70f1e5f1631726975"; + hash = "sha256-XehTMbvSRHfwTy6+Rv2QavQfRs6lK1+sd04iOZZZH4c="; }; - patches = [ - # Fix build with latest kImageAnnotator - (fetchpatch { - url = "https://github.com/ksnip/ksnip/commit/76f4b381971eead6ff31b8bf3bb64bb5717469c3.patch"; - hash = "sha256-JWoI974qDNZIzr/8oksI8m6g3XNWEaQRGsqSfvQrmao="; - }) + cmakeFlags = [ + "-DBUILD_WITH_QT6=ON" + "-DQT_FIND_PRIVATE_MODULES=ON" ]; nativeBuildInputs = [ cmake - ] - ++ (with libsForQt5; [ - extra-cmake-modules - wrapQtAppsHook - qttools - ]); + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + qt6.qttools + ]; - buildInputs = with libsForQt5; [ - kcolorpicker - kimageannotator - qtsvg - qtx11extras + buildInputs = [ + kdePackages.kcolorpicker + kdePackages.kimageannotator + qt6.qtsvg ]; meta = { diff --git a/pkgs/by-name/kt/ktextaddons/package.nix b/pkgs/by-name/kt/ktextaddons/package.nix deleted file mode 100644 index 0e0d32871452..000000000000 --- a/pkgs/by-name/kt/ktextaddons/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - libsForQt5, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "ktextaddons"; - version = "1.3.2"; - - src = fetchurl { - url = "mirror://kde/stable/ktextaddons/ktextaddons-${finalAttrs.version}.tar.xz"; - hash = "sha256-mB7Hh2Ljrg8D2GxDyHCa1s6CVmg5DDkhwafEqtSqUeM="; - }; - - nativeBuildInputs = [ - cmake - ] - ++ (with libsForQt5; [ - extra-cmake-modules - wrapQtAppsHook - ]); - - buildInputs = with libsForQt5; [ - karchive - kconfigwidgets - kcoreaddons - ki18n - kxmlgui - qtkeychain - ]; - - meta = { - description = "Various text handling addons for KDE applications"; - homepage = "https://invent.kde.org/libraries/ktextaddons/"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index 24ab1c88550c..80503f3a7eed 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, openssl, + oniguruma, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -23,10 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { OPENSSL_NO_VENDOR = 1; + RUSTONIG_SYSTEM_LIBONIG = 1; }; buildInputs = [ openssl + oniguruma ]; cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix index c5167b321f74..449db34605ee 100644 --- a/pkgs/by-name/ku/kubefwd/package.nix +++ b/pkgs/by-name/ku/kubefwd/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubefwd"; - version = "1.25.13"; + version = "1.25.14"; src = fetchFromGitHub { owner = "txn2"; repo = "kubefwd"; tag = "v${finalAttrs.version}"; - hash = "sha256-fAqsBqJgDyollaJNjdXI+hv3im7v0P/+cMkd4zj10kA="; + hash = "sha256-fxwUolGn55gf4voGT3noz44aNMSkxZiHD6OLADJ8aGg="; }; - vendorHash = "sha256-jMGz1pgSfr4NAOYvGRBL+A1ecWCC5Okn0vPZ1qgyxB8="; + vendorHash = "sha256-UL9i81ez937u2sn4ZGY89eXfTplB0LVkeuLigc0BM5Y="; subPackages = [ "cmd/kubefwd" ]; diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index db7c9af140a8..9ccb2474030a 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "kubeshark"; - version = "52.10.3"; + version = "53.2.3"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; - rev = "v${finalAttrs.version}"; - hash = "sha256-n7AYUms6fn25UinLd5xFG2DfcpJU0/pR4JF3i1VY1hM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ey40GmwM7UdMNZIYLF1AFeJAwnT2f2xqHB6lG/uM+ds="; }; vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4="; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { [ "-s" "-w" - "-X ${t}/misc.GitCommitHash=${finalAttrs.src.rev}" + "-X ${t}/misc.GitCommitHash=${finalAttrs.src.tag}" "-X ${t}/misc.Branch=master" "-X ${t}/misc.BuildTimestamp=0" "-X ${t}/misc.Platform=unknown" @@ -43,6 +43,9 @@ buildGoModule (finalAttrs: { ''; doCheck = true; + # Tests bind loopback sockets via httptest. + __darwinAllowLocalNetworking = true; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd kubeshark \ --bash <($out/bin/kubeshark completion bash) \ @@ -72,6 +75,7 @@ buildGoModule (finalAttrs: { ''; maintainers = with lib.maintainers; [ qjoly + miniharinn ]; }; }) diff --git a/pkgs/by-name/la/la-capitaine-icon-theme/package.nix b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix index e3dd010f7098..c8cc7dba86ca 100644 --- a/pkgs/by-name/la/la-capitaine-icon-theme/package.nix +++ b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix @@ -5,7 +5,7 @@ gnome-icon-theme, hicolor-icon-theme, pantheon, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -20,13 +20,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; postPatch = '' patchShebangs configure diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix deleted file mode 100644 index fe6d4f6225ae..000000000000 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchNpmDeps, - buildNpmPackage, -}: - -buildNpmPackage rec { - pname = "lasuite-meet-frontend"; - version = "1.14.0"; - - src = fetchFromGitHub { - owner = "suitenumerique"; - repo = "meet"; - tag = "v${version}"; - hash = "sha256-baQVCnkEv5aUy4mKdiscPiiEvwYPfezF03i1HPX64oA="; - }; - - sourceRoot = "source/src/frontend"; - - npmDeps = fetchNpmDeps { - inherit version src; - sourceRoot = "source/src/frontend"; - hash = "sha256-iXiadLaXFKmph6psIss0/5FjQkmjnDnQMxAmtrqJn+0="; - }; - - buildPhase = '' - runHook preBuild - - npm run build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r dist $out - - runHook postInstall - ''; - - meta = { - description = "Open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React"; - homepage = "https://github.com/suitenumerique/meet"; - changelog = "https://github.com/suitenumerique/meet/blob/${src.tag}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ soyouzpanda ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix new file mode 100644 index 000000000000..f578f0635d9a --- /dev/null +++ b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix @@ -0,0 +1,42 @@ +{ + src, + version, + meta, + fetchNpmDeps, + buildNpmPackage, + pkg-config, + libsecret, +}: +buildNpmPackage (finalAttrs: { + pname = "lasuite-meet-addon-outlook"; + inherit src version; + + sourceRoot = "${finalAttrs.src.name}/src/addons/outlook"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libsecret + ]; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) version src sourceRoot; + hash = "sha256-ReYXXYFzqZl0HWAgLdlw25ZamZJ06Aez8g1Tv/Nt3cE="; + }; + npmBuildScript = "build"; + + installPhase = '' + runHook preInstall + + cp -r dist $out + cp manifest.xml $out + + runHook postInstall + ''; + + meta = meta // { + description = "Microsoft Outlook add-in support for LaSuite Meet"; + }; +}) diff --git a/pkgs/by-name/la/lasuite-meet/frontend.nix b/pkgs/by-name/la/lasuite-meet/frontend.nix new file mode 100644 index 000000000000..f4bb9ffb5182 --- /dev/null +++ b/pkgs/by-name/la/lasuite-meet/frontend.nix @@ -0,0 +1,31 @@ +{ + src, + version, + meta, + fetchNpmDeps, + buildNpmPackage, +}: +buildNpmPackage (finalAttrs: { + pname = "lasuite-meet-frontend"; + inherit src version; + + sourceRoot = "${finalAttrs.src.name}/src/frontend"; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) version src sourceRoot; + hash = "sha256-LDH8aR+FSiIFYMDaQ3wNYAzv6VpHtH5X+DMHGBhPkm0="; + }; + npmBuildScript = "build"; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; + + meta = meta // { + description = "Open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React"; + }; +}) diff --git a/pkgs/by-name/la/lasuite-meet/mail.nix b/pkgs/by-name/la/lasuite-meet/mail.nix new file mode 100644 index 000000000000..878430ab0c48 --- /dev/null +++ b/pkgs/by-name/la/lasuite-meet/mail.nix @@ -0,0 +1,40 @@ +{ + src, + version, + meta, + fetchNpmDeps, + buildNpmPackage, +}: +buildNpmPackage (finalAttrs: { + pname = "lasuite-meet-mail"; + inherit src version; + + sourceRoot = "${finalAttrs.src.name}/src/mail"; + + # TODO: Remove package-lock.json patch when + # https://github.com/suitenumerique/meet/pull/1321 is merged. + postPatch = '' + substituteInPlace bin/html-to-plain-text bin/mjml-to-html \ + --replace-fail \ + '../backend/core/templates/mail' \ + '${placeholder "out"}' + + cp ${./package-lock.json} package-lock.json + ''; + + npmDeps = fetchNpmDeps { + pname = "${finalAttrs.pname}-npm-deps"; + inherit version src; + inherit (finalAttrs) sourceRoot; + hash = "sha256-jjLzgGqCsMu6Smyfaam6coqOM9UW2zG88adSPVrWPEE="; + + postPatch = "cp ${./package-lock.json} package-lock.json"; + }; + npmBuildScript = "build"; + + dontInstall = true; + + meta = meta // { + description = "HTML mail templates for LaSuite Meet"; + }; +}) diff --git a/pkgs/by-name/la/lasuite-meet/package-lock.json b/pkgs/by-name/la/lasuite-meet/package-lock.json new file mode 100644 index 000000000000..c98a53f2b406 --- /dev/null +++ b/pkgs/by-name/la/lasuite-meet/package-lock.json @@ -0,0 +1,2108 @@ +{ + "name": "mail_mjml", + "version": "1.15.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "mail_mjml", + "version": "1.15.0", + "license": "MIT", + "dependencies": { + "@html-to/text-cli": "0.5.4", + "mjml": "4.18.0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz", + "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@html-to/text-cli": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/@html-to/text-cli/-/text-cli-0.5.4.tgz", + "integrity": "sha512-V7WDfiYjXcibHGD6q61oW8HD68UPvBVkKit0X+9v54nTmLe8KDCc+56STleqqP7CzuEK5f/1jqa652fnr9Pmsw==", + "license": "MIT", + "dependencies": { + "@selderee/plugin-htmlparser2": "^0.11.0", + "aspargvs": "^0.6.0", + "deepmerge": "^4.3.1", + "htmlparser2": "^8.0.2", + "selderee": "^0.11.0" + }, + "bin": { + "html-to-text": "bin/cli.js" + }, + "engines": { + "node": ">=14.13.1" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@one-ini/wasm": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", + "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", + "license": "MIT" + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@selderee/plugin-htmlparser2": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz", + "integrity": "sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==", + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "selderee": "^0.11.0" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/aspargvs": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aspargvs/-/aspargvs-0.6.0.tgz", + "integrity": "sha512-yUrWCd1hkK5UtDOne1gM3O+FoTFGQ+BVlSd4G7FczBz8+JaFn1uzvQzROxwp9hmlhIUtwSwyRuV9mHgd/WbXxg==", + "license": "MIT", + "dependencies": { + "peberminta": "^0.8.0" + }, + "engines": { + "node": ">=14.13.1" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "license": "ISC" + }, + "node_modules/brace-expansion": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", + "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", + "license": "MIT", + "dependencies": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, + "node_modules/cheerio": { + "version": "1.0.0-rc.12", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", + "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "license": "MIT", + "dependencies": { + "cheerio-select": "^2.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "htmlparser2": "^8.0.1", + "parse5": "^7.0.0", + "parse5-htmlparser2-tree-adapter": "^7.0.0" + }, + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/cheeriojs/cheerio?sponsor=1" + } + }, + "node_modules/cheerio-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", + "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "license": "MIT", + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "license": "MIT" + }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "license": "MIT", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-select": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz", + "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", + "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "license": "MIT" + }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/editorconfig": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.7.tgz", + "integrity": "sha512-e0GOtq/aTQhVdNyDU9e02+wz9oDDM+SIOQxWME2QRjzRX5yyLAuHDE+0aE8vHb9XRC8XD37eO2u57+F09JqFhw==", + "license": "MIT", + "dependencies": { + "@one-ini/wasm": "0.1.1", + "commander": "^10.0.0", + "minimatch": "^9.0.1", + "semver": "^7.5.3" + }, + "bin": { + "editorconfig": "bin/editorconfig" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/editorconfig/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-goat": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz", + "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/glob": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", + "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/html-minifier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", + "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", + "license": "MIT", + "dependencies": { + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" + }, + "bin": { + "html-minifier": "cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/js-beautify": { + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz", + "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==", + "license": "MIT", + "dependencies": { + "config-chain": "^1.1.13", + "editorconfig": "^1.0.4", + "glob": "^10.4.2", + "js-cookie": "^3.0.5", + "nopt": "^7.2.1" + }, + "bin": { + "css-beautify": "js/bin/css-beautify.js", + "html-beautify": "js/bin/html-beautify.js", + "js-beautify": "js/bin/js-beautify.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/juice": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/juice/-/juice-10.0.1.tgz", + "integrity": "sha512-ZhJT1soxJCkOiO55/mz8yeBKTAJhRzX9WBO+16ZTqNTONnnVlUPyVBIzQ7lDRjaBdTbid+bAnyIon/GM3yp4cA==", + "license": "MIT", + "dependencies": { + "cheerio": "1.0.0-rc.12", + "commander": "^6.1.0", + "mensch": "^0.3.4", + "slick": "^1.12.2", + "web-resource-inliner": "^6.0.1" + }, + "bin": { + "juice": "bin/juice" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/juice/node_modules/commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/leac": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz", + "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==", + "license": "MIT", + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/lodash": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", + "license": "MIT" + }, + "node_modules/lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==", + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/mensch": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz", + "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==", + "license": "MIT" + }, + "node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/mjml": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.18.0.tgz", + "integrity": "sha512-rQM4aqFRrNvV1k733e8hJSopBjZvoSdBpRYzNTMAN+As0jqJsO5eN0wTT2IFtfe4PREzzu5b06RkPiUQdd0IIg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "mjml-cli": "4.18.0", + "mjml-core": "4.18.0", + "mjml-migrate": "4.18.0", + "mjml-preset-core": "4.18.0", + "mjml-validator": "4.18.0" + }, + "bin": { + "mjml": "bin/mjml" + } + }, + "node_modules/mjml-accordion": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.18.0.tgz", + "integrity": "sha512-9PUmy2JxIOGgAaVHvgVYX21nVAo3o/+wJckTTF/YTLGAqB+nm+44buxRzaXxVk7qXRwbCNfE8c8mlGVNh7vB1g==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-body": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.18.0.tgz", + "integrity": "sha512-34AwX70/7NkRIajPsa5j6NySRiNrlLatTKhiLwTVFiVtrEFlfCcbeMNmdVixI3Ldvs8209ZC6euaAnXDRyR1zw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-button": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.18.0.tgz", + "integrity": "sha512-ZsWMI0j7EcFCMqbqdVwMWhmsVc03FhmypWXokKopGhwySn4IAB4AOURonRmFrO7k6sDeQ+iJ9QtTu7jA+S8wmg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-carousel": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.18.0.tgz", + "integrity": "sha512-wY4g1CHCOoVSZuar7CLFon/qkPbICu71IT+6pa4BDwkAiaAMAemZPyy+a+iIUgdc8kHgSuHGsGf6PQzBSMWRZA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-cli": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.18.0.tgz", + "integrity": "sha512-N6CnA4o/q/VRnGPxTzvVnjAEcF7WUVVQGYfS9SPAp0qwyf7RysMmewdS9yN8GwXwZV6L2sKdn+3ANNi2FNsJ7w==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "chokidar": "^3.0.0", + "glob": "^10.3.10", + "html-minifier": "^4.0.0", + "js-beautify": "^1.6.14", + "lodash": "^4.17.21", + "minimatch": "^9.0.3", + "mjml-core": "4.18.0", + "mjml-migrate": "4.18.0", + "mjml-parser-xml": "4.18.0", + "mjml-validator": "4.18.0", + "yargs": "^17.7.2" + }, + "bin": { + "mjml-cli": "bin/mjml" + } + }, + "node_modules/mjml-column": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.18.0.tgz", + "integrity": "sha512-0QZ1whxbHUmJaRT8tW+wmr3fWZ/kpsHKAd24c7Z/N1Otm/U2G0T/FFEFJ6cB25X6ZN0K40QZ8L9gdLfiSVuRbA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-core": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.18.0.tgz", + "integrity": "sha512-yey72LszXvIo5p0R6DB+YU8er/nP2wPsqpLKQCB0H8vG0WRT1sbSUvnCUOkKGn7subuyWDTdzHKbQO3XYIOmvg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "cheerio": "1.0.0-rc.12", + "detect-node": "^2.0.4", + "html-minifier": "^4.0.0", + "js-beautify": "^1.6.14", + "juice": "^10.0.0", + "lodash": "^4.17.21", + "mjml-migrate": "4.18.0", + "mjml-parser-xml": "4.18.0", + "mjml-validator": "4.18.0" + } + }, + "node_modules/mjml-divider": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.18.0.tgz", + "integrity": "sha512-FmGUVJqi4RYroh7y85vDx0aUKZgECkxHtMQ4pkLGQbZ2g93/Qt0Ek88DVCNJ5XwUAQQkE/TvrGMLHp3CIqpQ9Q==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-group": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.18.0.tgz", + "integrity": "sha512-28ABkXsKljBqj7XCC8GkQ94xz8HEU2XTyD+9LTlkDafzGp/MGJb8DcLh/7IkxCwqkQWyeMiDNLf1djsQ909Vxw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.18.0.tgz", + "integrity": "sha512-DS0adpIAsVMDIk2DOsHzjg+RNjQU0fF8jiVP9BmdRHVGrLPmpL9wIHZk2KvsKvZe7VaXXBijFt3DZ5/CQ/+D7Q==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-attributes": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.18.0.tgz", + "integrity": "sha512-nLzix1wrMnojE0RPGhk4iKqSRwHKjie2EPzgKT7CDzfqN+Ref03E5Q19x3cQTLgxvq3C3CnvCQBfnhoS3Eakug==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-breakpoint": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.18.0.tgz", + "integrity": "sha512-k6rwff+7i+vTQYJ/CjBfE20qNqPaW60IRH2x2oEPuCzmwDmoVWOcplJIuotSqIAdfwF9hLkICknisp1BpczVlQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-font": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.18.0.tgz", + "integrity": "sha512-ao8HB5nf+Dmxw4GO6lMMOlnj1lNZONai0GC9RobrZgPlghZw6hpURWGpkON7pQcy6XnOHwYwkV7Go/npzA2i7w==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-html-attributes": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.18.0.tgz", + "integrity": "sha512-xaQE1rthe0RrNotwEr71X1tE+QQ489Yc0ynMm3oNMrohDI/TaCeazx8GAHPMM7VLduDA8D4A5wkZ6PuEvlJu4w==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-preview": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.18.0.tgz", + "integrity": "sha512-2JvYqhbLyU/+Te6/1AXxzTNoHYCDYhXOVZP7wMvU4t7K34pXqyRUNO405atyHUY1MRafrl6RJ8cIx0x5vUX7PA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-style": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.18.0.tgz", + "integrity": "sha512-nEwDHkAqY3Fm7QWeAZc/a7MakZpXh6THfrE8/AWrfpgzTHrD/wihNUc09ztNpr6z/K1+JWgQfSF2BRc+X3P46g==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-head-title": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.18.0.tgz", + "integrity": "sha512-0Hm8o50rPMUQLSCOOa4D4pz9NajmCDccLvBYE4fwKdeUXjSJ6bwAYeMpveel8oNZMDUVJ4Hx+PskisEGHMHM2w==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-hero": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.18.0.tgz", + "integrity": "sha512-rujm0ROM4QGWw77vnl3NaVaCKXrT4xTSHeAnkHKiY5AuRf6HPTgEtutq5pdel/y6Q9GrmxvN3HRESum7tpJCJw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-image": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.18.0.tgz", + "integrity": "sha512-e09NkoYwvzMcTv7V6H5doWD6Te2E1y2EvOLQJoXKVdQpDwyBWGdfnZke0scJGdA58HLAB+0mLYogpLwmfLaP5Q==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-migrate": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.18.0.tgz", + "integrity": "sha512-qfNCgW9zhJIsbPyXFA5RT/WY4mlje3N0WhHHOsHc0nY89Q01DenyslUy9nLLGXwi4K5FHS58oCjwWbMhwDcj1w==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "js-beautify": "^1.6.14", + "lodash": "^4.17.21", + "mjml-core": "4.18.0", + "mjml-parser-xml": "4.18.0", + "yargs": "^17.7.2" + }, + "bin": { + "migrate": "lib/cli.js" + } + }, + "node_modules/mjml-navbar": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.18.0.tgz", + "integrity": "sha512-uho/MS2tfNAe+V9u2X7NoCco34MDbdp30ETA8009Qo1VCP/D8lZ+s69WGRPu6hvN/Y2pzBgZly++CMg3qFZqBQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-parser-xml": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.18.0.tgz", + "integrity": "sha512-sHSsZg4afY1heThuJzxa1Kvfh/QzB7/9P5fFUHeVnnxb07ZTXnhXWA6YbobdND5/l9+5yjN5/UgqDZm3tIT4Uw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "detect-node": "2.1.0", + "htmlparser2": "^9.1.0", + "lodash": "^4.17.21" + } + }, + "node_modules/mjml-parser-xml/node_modules/htmlparser2": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "node_modules/mjml-preset-core": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.18.0.tgz", + "integrity": "sha512-x3l8vMVtsaqM/jauMeZIN7HFD2t5A28J4U0o4849yIlRxiWguLFV5l3BL8Byol+YLkoLuT9PjaZs9RYv+FGfeg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "mjml-accordion": "4.18.0", + "mjml-body": "4.18.0", + "mjml-button": "4.18.0", + "mjml-carousel": "4.18.0", + "mjml-column": "4.18.0", + "mjml-divider": "4.18.0", + "mjml-group": "4.18.0", + "mjml-head": "4.18.0", + "mjml-head-attributes": "4.18.0", + "mjml-head-breakpoint": "4.18.0", + "mjml-head-font": "4.18.0", + "mjml-head-html-attributes": "4.18.0", + "mjml-head-preview": "4.18.0", + "mjml-head-style": "4.18.0", + "mjml-head-title": "4.18.0", + "mjml-hero": "4.18.0", + "mjml-image": "4.18.0", + "mjml-navbar": "4.18.0", + "mjml-raw": "4.18.0", + "mjml-section": "4.18.0", + "mjml-social": "4.18.0", + "mjml-spacer": "4.18.0", + "mjml-table": "4.18.0", + "mjml-text": "4.18.0", + "mjml-wrapper": "4.18.0" + } + }, + "node_modules/mjml-raw": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.18.0.tgz", + "integrity": "sha512-F/kViAwXm3ccPP52kw++/mHQbcYbYYxC8JH15TZxH8GLVZkX5CGKgcBrHhDK7WoIlfEIsVRZ6IZdlHjH8vgyxw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-section": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.18.0.tgz", + "integrity": "sha512-bB8My9zvIEkTOxej+TrjEeaeRT0lsypGeRADtdrRZXeqUClkkuCnCXlsNKSLGT8ZRqjUqWRc5z8ubDOvGk2+Gg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-social": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.18.0.tgz", + "integrity": "sha512-iAQc9g59L6L3VHDd55BxeIvk/zHkxflxmvuyYyOOvpmmKAvUBC//ULfpxiiM4yupofsThqFfrO+wc8d4kTRkbQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-spacer": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.18.0.tgz", + "integrity": "sha512-FK/0f5IBiONgaRpwNBs7G8EbLdAbmYqcIfHR8O8tP4LipAChLQKHO9vX3vrRMGLBZZNTESLObcFSVWmA40Mfpw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-table": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.18.0.tgz", + "integrity": "sha512-vJysCPUL3CHcsQDAFpW+skzBtY0RYsmMBYswI4WX0B05GLKlOjXqpYOwcmAupWeGoBVL5r/t28ynu2PqnOlN3w==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-text": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.18.0.tgz", + "integrity": "sha512-hBLmF3JgveUKktKQFWHqHAr7qr92j1CxAvq7mtpDUgiWgyPFzqRX8mUsFYgZ7DmRxG4UE+Kzpt8/YFd9+E98lw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0" + } + }, + "node_modules/mjml-validator": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-validator/-/mjml-validator-4.18.0.tgz", + "integrity": "sha512-JmpWAsNTUlAxJOz2zHYfF8Vod8OzM3Qp5JXtrVw5tivZQzq88ZfqVGuqsas51z0pp1/ilfD4lC17YGfGwKGyhA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4" + } + }, + "node_modules/mjml-wrapper": { + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.18.0.tgz", + "integrity": "sha512-TZeOvLjIhXEK60rjWNiYhEYNlv5GKYahE+96ifcT5OGkWkRA0DsQDfp+6VI32OS5VxsfKq2h/UdERPlQijjpAQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.4", + "lodash": "^4.17.21", + "mjml-core": "4.18.0", + "mjml-section": "4.18.0" + } + }, + "node_modules/no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "license": "MIT", + "dependencies": { + "lower-case": "^1.1.1" + } + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" + }, + "node_modules/param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==", + "license": "MIT", + "dependencies": { + "no-case": "^2.2.0" + } + }, + "node_modules/parse5": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", + "license": "MIT", + "dependencies": { + "entities": "^6.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5/node_modules/entities": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", + "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/parseley": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz", + "integrity": "sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==", + "license": "MIT", + "dependencies": { + "leac": "^0.6.0", + "peberminta": "^0.9.0" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/parseley/node_modules/peberminta": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz", + "integrity": "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==", + "license": "MIT", + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/peberminta": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.8.0.tgz", + "integrity": "sha512-YYEs+eauIjDH5nUEGi18EohWE0nV2QbGTqmxQcqgZ/0g+laPCQmuIqq7EBLVi9uim9zMgfJv0QBZEnQ3uHw/Tw==", + "license": "MIT", + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "license": "ISC" + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/selderee": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz", + "integrity": "sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==", + "license": "MIT", + "dependencies": { + "parseley": "^0.12.0" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/slick": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz", + "integrity": "sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==", + "license": "MIT (http://mootools.net/license.txt)", + "engines": { + "node": "*" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==", + "license": "MIT" + }, + "node_modules/valid-data-url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", + "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/web-resource-inliner": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-6.0.1.tgz", + "integrity": "sha512-kfqDxt5dTB1JhqsCUQVFDj0rmY+4HLwGQIsLPbyrsN9y9WV/1oFDSx3BQ4GfCv9X+jVeQ7rouTqwK53rA/7t8A==", + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1", + "escape-goat": "^3.0.0", + "htmlparser2": "^5.0.0", + "mime": "^2.4.6", + "node-fetch": "^2.6.0", + "valid-data-url": "^3.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/web-resource-inliner/node_modules/dom-serializer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/dom-serializer/node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/domhandler": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", + "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.0.1" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/domutils/node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "license": "BSD-2-Clause", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/htmlparser2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz", + "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^3.3.0", + "domutils": "^2.4.2", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/fb55/htmlparser2?sponsor=1" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + } + } +} diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 217e45eeb123..ee936d36244a 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -1,29 +1,44 @@ { + callPackage, lib, - python3, fetchFromGitHub, nixosTests, + python3, + stdenv, }: let - python = python3.override { - self = python3; - packageOverrides = (self: super: { django = super.django_5; }); - }; -in - -python.pkgs.buildPythonApplication rec { - pname = "lasuite-meet"; - version = "1.14.0"; - pyproject = true; + version = "1.15.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-baQVCnkEv5aUy4mKdiscPiiEvwYPfezF03i1HPX64oA="; + hash = "sha256-18DcrrEvqWR6caEVZYxQlSnKcxItEpNE+bMhtS4Aa0M="; }; - sourceRoot = "source/src/backend"; + meta = { + homepage = "https://github.com/suitenumerique/meet"; + changelog = "https://github.com/suitenumerique/meet/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ soyouzpanda ]; + platforms = lib.platforms.all; + }; + + mail = callPackage ./mail.nix { inherit src version meta; }; + frontend = callPackage ./frontend.nix { inherit src version meta; }; + outlook = callPackage ./addon-outlook.nix { inherit src version meta; }; + + python = python3.override { + self = python3; + packageOverrides = (self: super: { django = super.django_5; }); + }; +in +python.pkgs.buildPythonApplication (finalAttrs: { + pname = "lasuite-meet"; + pyproject = true; + inherit version src; + + sourceRoot = "${finalAttrs.src.name}/src/backend"; patches = [ # Support configuration throught environment variables for SECURE_* @@ -33,7 +48,16 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build" - ''; + '' + # Otherwise fails with: + # socket.gaierror: [Errno 8] nodename nor servname provided, or not known + + (lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace impress/settings.py \ + --replace-fail \ + "gethostname()" \ + "gethostname() + '.local'" + ''); + __darwinAllowLocalNetworking = true; build-system = with python.pkgs; [ uv-build ]; @@ -95,7 +119,7 @@ python.pkgs.buildPythonApplication rec { postInstall = let - pythonPath = python.pkgs.makePythonPath dependencies; + pythonPath = python.pkgs.makePythonPath finalAttrs.passthru.dependencies; in '' mkdir -p $out/{bin,share} @@ -110,19 +134,23 @@ python.pkgs.buildPythonApplication rec { --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}" makeWrapper ${lib.getExe python.pkgs.gunicorn} $out/bin/gunicorn \ --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}" + + mkdir -p $out/${python.sitePackages}/core/templates + ln -sv ${finalAttrs.passthru.mail}/ $out/${python.sitePackages}/core/templates/mail ''; - passthru.tests = { - login-and-create-room = nixosTests.lasuite-meet; + passthru = { + inherit mail frontend; + addons = { + inherit outlook; + }; + tests = { + login-and-create-room = nixosTests.lasuite-meet; + }; }; - meta = { + meta = meta // { description = "Open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React"; - homepage = "https://github.com/suitenumerique/meet"; - changelog = "https://github.com/suitenumerique/meet/blob/${src.tag}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ soyouzpanda ]; mainProgram = "meet"; - platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/la/lazytrivy/package.nix b/pkgs/by-name/la/lazytrivy/package.nix index 47e94b231f7f..02bdbc4ebe2a 100644 --- a/pkgs/by-name/la/lazytrivy/package.nix +++ b/pkgs/by-name/la/lazytrivy/package.nix @@ -9,16 +9,18 @@ buildGoModule (finalAttrs: { pname = "lazytrivy"; - version = "1.2.0"; + version = "1.3.3"; + + env.GOEXPERIMENT = "jsonv2"; src = fetchFromGitHub { owner = "owenrumney"; repo = "lazytrivy"; tag = "v${finalAttrs.version}"; - hash = "sha256-fhHy54pIbYdj+mWCIx7Wla6x+J/w2f8+J+WSbt+WNwA="; + hash = "sha256-M7qhkHuyI6cpmRzvn8AJun3tyzTbU8QtUlK7Qo0xxU4="; }; - vendorHash = "sha256-dIe6zjWc8DVU9YQbYfmNUcfSh6MsdZZ8/A/EYLmPNkE="; + vendorHash = "sha256-vzdGWlyk4Eqhh+r4RH4eVVA4YPnADCGYnh0tmeD8S8M="; ldflags = [ "-s" diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index e93ba12dc0eb..53d80f3be6c1 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "ldeep"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; tag = finalAttrs.version; - hash = "sha256-WnsW50mh5ZESdk0hlsO78cREAj1FPNHRu3ivh3qUaEg="; + hash = "sha256-YR8ywhC+t35utojlmqD6rryzPE1UzTIQek3VmbpUfQ8="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/le/learn6502/get-yarn-from-path.patch b/pkgs/by-name/le/learn6502/get-yarn-from-path.patch new file mode 100644 index 000000000000..fc3b821897e0 --- /dev/null +++ b/pkgs/by-name/le/learn6502/get-yarn-from-path.patch @@ -0,0 +1,15 @@ +diff --git a/packages/app-gnome/meson.build b/packages/app-gnome/meson.build +--- a/packages/app-gnome/meson.build ++++ b/packages/app-gnome/meson.build +@@ -3,10 +3,7 @@ gnome = import('gnome') + dependency('gjs-1.0', version: '>= 1.80.2') + gjs_console = find_program('gjs-console', required: true) + +-# TODO: Autodetect yarn version +-yarn_path = meson.project_source_root() / '.yarn' / 'releases' / 'yarn-4.12.0.cjs' +-node = find_program('node') +-yarn = [node, yarn_path] ++yarn = find_program('yarn', required: true) + + + yarn_args = ['--cwd', meson.project_source_root()] diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix index da3a2e1b58bd..38022f842a09 100644 --- a/pkgs/by-name/le/learn6502/package.nix +++ b/pkgs/by-name/le/learn6502/package.nix @@ -33,15 +33,24 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MR4QslG1DnnYLLn7esXGit0HG1cW37ECUE2hgOegudw="; }; + patches = [ + ./get-yarn-from-path.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/JumpLink/Learn6502/blob/main/package.json#L36 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-y1Xyb2ipUx9gcfnub6gjABBSjBXQmSp6Kim0ZtUso38="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-sxlKw7txvFs9dI76dTf/Ap/2ADNH74q6rGS5ly65ILo="; }; nativeBuildInputs = [ nodejs + yarn-berry yarn-berry.yarnBerryConfigHook meson ninja diff --git a/pkgs/by-name/le/learn6502/yarn-4.14-support.patch b/pkgs/by-name/le/learn6502/yarn-4.14-support.patch new file mode 100644 index 000000000000..abe15dc87282 --- /dev/null +++ b/pkgs/by-name/le/learn6502/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -7,4 +7,7 @@ supportedArchitectures: + - x64 + - arm64 + +-yarnPath: .yarn/releases/yarn-4.12.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/le/lely-core/package.nix b/pkgs/by-name/le/lely-core/package.nix index 5f2aa132a9dd..c972c9bdd9ef 100644 --- a/pkgs/by-name/le/lely-core/package.nix +++ b/pkgs/by-name/le/lely-core/package.nix @@ -1,6 +1,7 @@ { autoreconfHook, fetchFromGitLab, + fetchpatch, lib, stdenv, }: @@ -20,6 +21,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PuNE/lKsNNd4KDEcSsaz+IfP2hgT5M5VgLY1kVy1KCc="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/lely_industries/lely-core/-/commit/6ed995fa86d828957b636a11470f150830d877ec.patch"; + hash = "sha256-Q4Sza0hs0EE4EZ0nbYAs+/qO2uWKGveZ0+Tgx8xvmEs="; + }) + ]; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/le/lenspect/package.nix b/pkgs/by-name/le/lenspect/package.nix index 0a99ba814709..313eb0f0c234 100644 --- a/pkgs/by-name/le/lenspect/package.nix +++ b/pkgs/by-name/le/lenspect/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "lenspect"; - version = "1.0.4"; + version = "1.0.5"; pyproject = false; src = fetchFromGitHub { owner = "vmkspv"; repo = "lenspect"; tag = "v${finalAttrs.version}"; - hash = "sha256-zYIDTFjT9izc4WFjs9fYDPDrQ8z16i2Bko5JW0tgCBk="; + hash = "sha256-aGL6o9gv+z7Ey2XR8IZ/4gBXdDqGlaWaQXf0eVDEHlI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix index 1bfaf651f37f..6ceab3be2094 100644 --- a/pkgs/by-name/le/leptosfmt/package.nix +++ b/pkgs/by-name/le/leptosfmt/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -18,6 +20,11 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-m9426zuxp9GfbYoljW49BVgetLTqqcqGHCb7I+Yw+bc="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Formatter for the leptos view! macro"; mainProgram = "leptosfmt"; @@ -27,6 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix index ae8dd4d91fc1..494657523c3d 100644 --- a/pkgs/by-name/le/lessc/package.nix +++ b/pkgs/by-name/le/lessc/package.nix @@ -1,7 +1,11 @@ { lib, - buildNpmPackage, + stdenv, fetchFromGitHub, + fetchPnpmDeps, + nodejs, + pnpm_9, + pnpmConfigHook, callPackage, testers, runCommand, @@ -10,27 +14,59 @@ lessc, }: -buildNpmPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "lessc"; - version = "4.2.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "less"; repo = "less.js"; - rev = "v${version}"; - hash = "sha256-vO/1laFb1yC+OESXTx9KuGdwSNC9Iv49F3V7kfXnyJU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ="; }; - sourceRoot = "${src.name}/packages/less"; - npmDepsHash = "sha256-3GlngmaxcUGXSv+ZwN2aovwEqcek6FJ1ZaL5KpjwNn4="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + pnpm = pnpm_9; + fetcherVersion = 3; + hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k="; + }; - postPatch = '' - sed -i ./package.json \ - -e '/@less\/test-data/d' \ - -e '/@less\/test-import-module/d' + strictDeps = true; + + nativeBuildInputs = [ + pnpmConfigHook + pnpm_9 + nodejs + ]; + + buildInputs = [ nodejs ]; + + pnpmWorkspaces = [ "less..." ]; + + buildPhase = '' + runHook preBuild + + pnpm --filter "less" run build + + runHook postBuild ''; - env.PUPPETEER_SKIP_DOWNLOAD = 1; + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/lessc} + cp -r {packages,node_modules} $out/lib/lessc + chmod +x $out/lib/lessc/packages/less/bin/lessc + ln -s $out/lib/lessc/packages/less/bin/lessc $out/bin/lessc + + runHook postInstall + ''; passthru = { updateScript = nix-update-script { }; @@ -69,9 +105,10 @@ buildNpmPackage rec { meta = { homepage = "https://github.com/less/less.js"; + changelog = "https://github.com/less/less.js/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Dynamic stylesheet language"; mainProgram = "lessc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lelgenio ]; }; -} +}) diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix index 5fe49009f61c..ff9e375107a2 100644 --- a/pkgs/by-name/li/lib3mf/package.nix +++ b/pkgs/by-name/li/lib3mf/package.nix @@ -18,35 +18,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lib3mf"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = "lib3mf"; tag = "v${finalAttrs.version}"; - hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA="; + hash = "sha256-8S892kvea6c9RynfVHo7epBjT9cWCV4VchGZ8G1hvHc="; }; - patches = [ - # some patches are required for the gcc 14 source build - # remove next release - # https://github.com/3MFConsortium/lib3mf/pull/413 - (fetchpatch { - url = "https://github.com/3MFConsortium/lib3mf/pull/413/commits/96b2f5ec9714088907fe8a6f05633e2bbd82053f.patch?full_index=1"; - hash = "sha256-cJRc+SW1/6Ypf2r34yroVTxu4NMJWuoSmzsmoXogrUk="; - }) - # https://github.com/3MFConsortium/lib3mf/pull/421 - (fetchpatch { - url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1"; - hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY="; - }) - (fetchpatch { - name = "lib3mf-fix-cmake-4.patch"; - url = "https://github.com/3MFConsortium/lib3mf/commit/01325a73de25d2ad49e992b5b6294beb32298c92.patch"; - hash = "sha256-8vv2ydnDgvSKkGjpmk5ng1BGKK0okTMOeAoGwlKcziY="; - }) - ]; - nativeBuildInputs = [ cmake ninja @@ -67,13 +47,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libzip gtest openssl zlib ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid; + propagatedBuildInputs = [ + libzip + ]; + postPatch = '' # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in @@ -91,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { EOF mkdir Libraries/fast_float - ln -s ${lib.getInclude fast-float}/include/fast_float Libraries/fast_float/Include + ln -s ${lib.getInclude fast-float}/include/ Libraries/fast_float/Include # functions are no longer in openssl, remove them from test cleanup function substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \ diff --git a/pkgs/by-name/li/libcss/package.nix b/pkgs/by-name/li/libcss/package.nix index 75c1edbe4f5c..54c0ce25bb31 100644 --- a/pkgs/by-name/li/libcss/package.nix +++ b/pkgs/by-name/li/libcss/package.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ perl netsurf-buildsystem + ]; + + propagatedBuildInputs = [ libparserutils libwapcaplet ]; diff --git a/pkgs/by-name/li/libdbusmenu/package.nix b/pkgs/by-name/li/libdbusmenu/package.nix index 7193271c5bfa..e7b5f05a0352 100644 --- a/pkgs/by-name/li/libdbusmenu/package.nix +++ b/pkgs/by-name/li/libdbusmenu/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { "dbusmenu-jsonloader-0.4" ] ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.msteen ]; }; }) diff --git a/pkgs/by-name/li/libdom/package.nix b/pkgs/by-name/li/libdom/package.nix index 7ac4118e676e..7022a9c21add 100644 --- a/pkgs/by-name/li/libdom/package.nix +++ b/pkgs/by-name/li/libdom/package.nix @@ -35,8 +35,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat netsurf-buildsystem - libhubbub libparserutils + ]; + + propagatedBuildInputs = [ + libhubbub libwapcaplet ]; diff --git a/pkgs/by-name/li/libertinus/package.nix b/pkgs/by-name/li/libertinus/package.nix index 212a0eb1eca2..ea11f10d53c0 100644 --- a/pkgs/by-name/li/libertinus/package.nix +++ b/pkgs/by-name/li/libertinus/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, zstd, }: @@ -14,15 +15,15 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-JQZ3ySnTd1owkTZDWUN5ryZKwu8oAQNaody+MLm+I6Y="; }; - nativeBuildInputs = [ zstd ]; + outputs = [ + "out" + "webfont" + ]; - installPhase = '' - runHook preInstall - - install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ + installFonts + zstd + ]; meta = { description = "Libertinus font family"; diff --git a/pkgs/by-name/li/libgit2-glib/package.nix b/pkgs/by-name/li/libgit2-glib/package.nix index 8af2905f5df5..44ef51b291b5 100644 --- a/pkgs/by-name/li/libgit2-glib/package.nix +++ b/pkgs/by-name/li/libgit2-glib/package.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; license = lib.licenses.lgpl21Plus; teams = [ lib.teams.gnome ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libhandy/package.nix b/pkgs/by-name/li/libhandy/package.nix index 94800313273f..2df28beb12d1 100644 --- a/pkgs/by-name/li/libhandy/package.nix +++ b/pkgs/by-name/li/libhandy/package.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation (finalAttrs: { glade ]; + checkInputs = [ + librsvg + ]; + nativeCheckInputs = [ xvfb-run at-spi2-atk @@ -76,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: { hicolor-icon-theme ]; + strictDeps = true; + mesonFlags = [ "-Dgtk_doc=true" "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix index 2b59381bfbfc..8dee87e0b676 100644 --- a/pkgs/by-name/li/libime/package.nix +++ b/pkgs/by-name/li/libime/package.nix @@ -4,7 +4,8 @@ fetchurl, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, boost, python3, fcitx5, @@ -48,7 +49,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules python3 ]; diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix index 3caf6b592b1f..1ca7fcc0e631 100644 --- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix +++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmysqlconnectorcpp"; - version = "9.6.0"; + version = "9.7.0"; src = fetchurl { url = "mirror://mysql/Connector-C++/mysql-connector-c++-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-slqaE5hV2pcTyGO1pkx/EMUu3tdrLASi+y3rmqtFaz0="; + hash = "sha256-mj3U/kQagZH3YRkuzccXwYpYocu245Yj3rtxlsMHWw4="; }; postPatch = '' diff --git a/pkgs/by-name/li/liborbispkg-pkgtool/package.nix b/pkgs/by-name/li/liborbispkg-pkgtool/package.nix index c901746957bc..daf7db94e7d4 100644 --- a/pkgs/by-name/li/liborbispkg-pkgtool/package.nix +++ b/pkgs/by-name/li/liborbispkg-pkgtool/package.nix @@ -5,13 +5,13 @@ }: buildDotnetModule { pname = "liborbispkg-pkgtool"; - version = "0.3-unstable-2024-10-12"; + version = "0.3-unstable-2025-11-13"; src = fetchFromGitHub { owner = "OpenOrbis"; repo = "LibOrbisPkg"; - rev = "75616a28de0f49f05eeff872211e806fb6de3818"; - hash = "sha256-ySlMzUfJ0IXi/NWbj53jqCRDNm9Xh4TuffyKhNh4wuM="; + rev = "c1caa3ba25097fe602c0d842a0357bf7037b0838"; + hash = "sha256-bCnaWooLHmUK5Say4fQINUuzTAmXr8qULmkD8bVVUjU="; }; projectFile = "PkgTool.Core/PkgTool.Core.csproj"; @@ -21,7 +21,7 @@ buildDotnetModule { ''; meta = { - description = "Library, GUI, CLI for creating, inspecting, and modifying PS4 PKG, SFO, PFS, and related filetypes"; + description = "CLI for creating, inspecting, and modifying PS4 PKG, SFO, PFS, and related filetypes"; homepage = "https://github.com/OpenOrbis/LibOrbisPkg"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.ryand56 ]; diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 87ef1fab2d52..475f68df53f1 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "150.0.1-1"; + version = "150.0.2-1"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-yIZGbTTelMerlFZ2oISCHtK/C62KjGnWd6agO4H+pbo="; - aarch64-linux = "sha256-hEAH1/I40f/fjUtODJc6kMuUhr4Xj+TyEvn0TOPSYMc="; + x86_64-linux = "sha256-KMpSMcLJ/wkySo2gbiECJfH2/hcxdTSLXwKcZLMkvhk="; + aarch64-linux = "sha256-Dxs7eRN6nj3e/6pQ3z0d27tnTtD6CefhUxPZGwTVL+Y="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index c4e33d934e6c..5016d5a46ca5 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "150.0.1-1", + "packageVersion": "150.0.2-1", "source": { - "rev": "150.0.1-1", - "hash": "sha256-9+NiNv6uAxdj3zFurH3dBDWk4SJxdgJaHAm67aOmJAk=" + "rev": "150.0.2-1", + "hash": "sha256-eEdLG9hBTRH8UIoclGJaJ4rNcTDrXbeUWZPM+Y6WXTw=" }, "firefox": { - "version": "150.0.1", - "hash": "sha512-s3EOGzUAIxK/JI6CJoEDm3XsEZb40BTIiwN3ybBvNHgEaRUqmK2WdEClGkoMpFQYumI5Q4+GmuVkzILAI2RReQ==" + "version": "150.0.2", + "hash": "sha512-4i/Gb3+uub70A20KkK9MJ9q8RaPcWccpBTa/5Gx2JNcziNKbNqiZnjZAZfoxpfoWdZZjIimwr5vBuvQTX6KaTQ==" } } diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix index bcb1ad7bf2d0..364e08c46186 100644 --- a/pkgs/by-name/li/libxkbcommon_8/package.nix +++ b/pkgs/by-name/li/libxkbcommon_8/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { bison doxygen ] - ++ lib.optional stdenv.isLinux xvfb + ++ lib.optional stdenv.hostPlatform.isLinux xvfb ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "-Denable-wayland=${lib.boolToString withWaylandTools}" ]; - doCheck = stdenv.isLinux; # TODO: disable just a part of the tests + doCheck = stdenv.hostPlatform.isLinux; # TODO: disable just a part of the tests preCheck = '' patchShebangs ../test/ ''; diff --git a/pkgs/by-name/li/licensedigger/package.nix b/pkgs/by-name/li/licensedigger/package.nix index 9035c07c27d4..296cf780454a 100644 --- a/pkgs/by-name/li/licensedigger/package.nix +++ b/pkgs/by-name/li/licensedigger/package.nix @@ -3,32 +3,31 @@ fetchFromGitLab, stdenv, cmake, - extra-cmake-modules, - libsForQt5, + kdePackages, + qt6, }: stdenv.mkDerivation { pname = "licensedigger"; - version = "0-unstable-2024-08-28"; + version = "0-unstable-2025-08-19"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "SDK"; repo = "licensedigger"; - rev = "cc4b24d3fb67afa8fb0a9ef61210588958eaf0f5"; - hash = "sha256-/ZEja+iDx0lVkJaLshPd1tZD4ZUspVeFHY1TNXjr4qg="; + rev = "711236617bfdeb4f72fecec3ab29bc25806337e5"; + hash = "sha256-IuH7K2Hhhdzw01fypiabv8/tClt+0rr4j94JAy8VKN4="; }; nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook ]; buildInputs = [ - libsForQt5.qtbase + qt6.qtbase ]; - dontWrapQtApps = true; - meta = { description = "Tools to convert existing license headers to SPDX compliant headers"; homepage = "https://invent.kde.org/sdk/licensedigger"; diff --git a/pkgs/by-name/li/lifelines/package.nix b/pkgs/by-name/li/lifelines/package.nix index 8d123c865b2a..a6d2d2a92935 100644 --- a/pkgs/by-name/li/lifelines/package.nix +++ b/pkgs/by-name/li/lifelines/package.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation { bison ]; + postPatch = '' + mkdir -p m4 + ''; + meta = { description = "Genealogy tool with ncurses interface"; homepage = "https://lifelines.github.io/lifelines/"; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 6eaff2ae724c..d3182147cddc 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 = "12.1.0"; + version = "12.2.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-DcVL7SYEIZKgY/TTsX8mW6wjAituCF+eBeISt6gMZhk="; + hash = "sha256-24oRmHjP7q1jwKeCNsV3xAU5xXWUlpUOoO0yps9WeGU="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/linkwarden/02-yarn-4.14-support.patch b/pkgs/by-name/li/linkwarden/02-yarn-4.14-support.patch new file mode 100644 index 000000000000..75225db95b78 --- /dev/null +++ b/pkgs/by-name/li/linkwarden/02-yarn-4.14-support.patch @@ -0,0 +1,20 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,2 +1,5 @@ + nodeLinker: node-modules + nmMode: hardlinks-local ++approvedGitRepositories: ++ - "**" ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/li/linkwarden/package.nix b/pkgs/by-name/li/linkwarden/package.nix index 1afe61298e4c..efaa7f835963 100644 --- a/pkgs/by-name/li/linkwarden/package.nix +++ b/pkgs/by-name/li/linkwarden/package.nix @@ -89,12 +89,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch */ ./01-localfont.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/linkwarden/linkwarden/blob/main/package.json#L3 + ./02-yarn-4.14-support.patch ]; missingHashes = ./missing-hashes.json; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-4Qo87kZ0eKHDL4K4yd7rfJwQ5rO1ho2JOvup4nIDMoQ="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-riijYhsnIUXwl5AHYfhTiKHZFPc+ORDTLO2GUY7Yl+g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index 6b1d1f5afbb2..1009674a7b68 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lintspec"; - version = "0.16.0"; + version = "0.17.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-hMBDOpmz8EMSWPKU16EleSxVZbLSbZPynqhrJifgt04="; + hash = "sha256-iIanf/lQRD+JZEa9jAa4JNATJq2EYoKoiA4dOmXxgtY="; }; - cargoHash = "sha256-WaMuHTvadj1GoFyT0p4II6EFp7nmN5LJN3SOO2kYujM="; + cargoHash = "sha256-+Hi9vciLSeIijTH3tCKMv2USTYrWzfuTUaxSOW0hi4g="; cargoBuildFlags = [ "--package" "lintspec" diff --git a/pkgs/by-name/li/linuxwave/deps.nix b/pkgs/by-name/li/linuxwave/deps.nix index 92f6d397ea1e..a378e6b035c4 100644 --- a/pkgs/by-name/li/linuxwave/deps.nix +++ b/pkgs/by-name/li/linuxwave/deps.nix @@ -4,10 +4,10 @@ linkFarm "zig-packages" [ { - name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0"; + name = "clap-0.12.0-oBajB7foAQDqlSwaSG5g0yq7xGbQARUsBk5T64gAOqP5"; path = fetchzip { - url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz"; - hash = "sha256-leXnA97ITdvmBhD2YESLBZAKjBg+G4R/+PPPRslz/ec="; + url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.12.0.tar.gz"; + hash = "sha256-HveL7aJBC+/8PNlGYxtNZBrk3ytkM8zuXENO9JpygC0="; }; } ] diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix index 973924615c96..6e2b1907c16c 100644 --- a/pkgs/by-name/li/linuxwave/package.nix +++ b/pkgs/by-name/li/linuxwave/package.nix @@ -3,28 +3,28 @@ stdenv, fetchFromGitHub, installShellFiles, - zig_0_14, + zig_0_16, callPackage, }: let - zig = zig_0_14; + zig = zig_0_16; in stdenv.mkDerivation (finalAttrs: { pname = "linuxwave"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "linuxwave"; tag = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-OuD5U/T3GuCQrzdhx01NXPSXD7pUAvLnNsznttJogz8="; + hash = "sha256-5LcAExNFCsQIeRqLHMCLO+MnK7p2q2qOA1SdMCR4nCw="; }; - postConfigure = '' - ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p - ''; + zigBuildFlags = [ + "--system" + (callPackage ./deps.nix { }) + ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/li/lisette/package.nix b/pkgs/by-name/li/lisette/package.nix index 6de83752508d..35301cd29df5 100644 --- a/pkgs/by-name/li/lisette/package.nix +++ b/pkgs/by-name/li/lisette/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lisette"; - version = "0.1.23"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ivov"; repo = "lisette"; tag = "lisette-v${finalAttrs.version}"; - hash = "sha256-sSNQKVfclSXXt1hp1AVBUKAjLhG9RSKxpoC8zWvOSz4="; + hash = "sha256-dp78bOsAe3KkPI3Lz11zCoRdx60lc1OUWUp45JNoz7o="; }; - cargoHash = "sha256-MlRx0lXuGyz7P8DT2tCsxVQ/W5P+W5+8YBt43wTz2IE="; + cargoHash = "sha256-ZoGS2DlLeAhTTa0TZi8Jh7bVbWdat2p7oWciRY5KUcE="; preCheck = '' export NO_COLOR=true diff --git a/pkgs/by-name/li/litemdview/fix-gcc15.patch b/pkgs/by-name/li/litemdview/fix-gcc15.patch new file mode 100644 index 000000000000..a5c5fc6b14d9 --- /dev/null +++ b/pkgs/by-name/li/litemdview/fix-gcc15.patch @@ -0,0 +1,15 @@ +diff --git a/xxd/xxd.c b/xxd/xxd.c +index 20f06ab..55e64fe 100644 +--- a/xxd/xxd.c ++++ b/xxd/xxd.c +@@ -132,8 +132,8 @@ extern void perror __P((char *)); + # endif + #endif + +-extern long int strtol(); +-extern long int ftell(); ++extern long int strtol(const char *restrict, char **restrict, int); ++extern long int ftell(FILE *); + + char version[] = "xxd V1.10 27oct98 by Juergen Weigert"; + #ifdef WIN32 diff --git a/pkgs/by-name/li/litemdview/package.nix b/pkgs/by-name/li/litemdview/package.nix index ec6cb70175ee..1a3a0ba8337d 100644 --- a/pkgs/by-name/li/litemdview/package.nix +++ b/pkgs/by-name/li/litemdview/package.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE="; }; + patches = [ + ./fix-gcc15.patch + ]; + buildInputs = [ gtkmm3 ]; diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 4bc48c28be3b..eff3876c6e44 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -81,7 +81,7 @@ buildGoModule (finalAttrs: { checkFlags = let - skippedTests = lib.optionals (stdenv.isDarwin) [ + skippedTests = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Fail only on *-darwin intermittently # https://github.com/mostlygeek/llama-swap/issues/320 "TestProcess_AutomaticallyStartsUpstream" diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 2c8b21418e68..d857fb008c29 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -38,8 +38,10 @@ stdenv.mkDerivation { local indexJs="$out/Applications/LM Studio.app/Contents/Resources/app/.webpack/main/index.js" substituteInPlace "$indexJs" --replace-quiet "'/Applications'" "'/'" - # Re-sign the app bundle after patching, otherwise macOS reports it as damaged - codesign --force --deep --sign - "$out/Applications/LM Studio.app" + # Re-sign the main executable, otherwise macOS reports the app as damaged + appBundle="$out/Applications/LM Studio.app" + mainExe="$appBundle/Contents/MacOS/LM Studio" + codesign --force --sign - "$mainExe" runHook postInstall ''; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index abb736643a60..b00e0193c009 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -22,10 +22,13 @@ xcbuild, zip, - electron, + electron_39, git, }: +let + electron = electron_39; +in stdenv.mkDerivation (finalAttrs: { pname = "logseq"; version = "0.10.15"; diff --git a/pkgs/by-name/lo/lovely-injector/package.nix b/pkgs/by-name/lo/lovely-injector/package.nix index 65c6d515bea4..af5cddf8d839 100644 --- a/pkgs/by-name/lo/lovely-injector/package.nix +++ b/pkgs/by-name/lo/lovely-injector/package.nix @@ -7,7 +7,7 @@ cmake, }: let - version = "0.8.0"; + version = "0.9.0"; in rustPlatform.buildRustPackage { pname = "lovely-injector"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "ethangreen-dev"; repo = "lovely-injector"; tag = "v${version}"; - hash = "sha256-leTe7j4RTqc6BkiS7W5e0viK8FEwJpPLNoyf4GLOI3E="; + hash = "sha256-TzBxyIf7MjzsdFaJLBp2dXWNj5sOXyoMifaaztNIOog="; fetchSubmodules = true; }; - cargoHash = "sha256-MnXB2ho48VPYtFSnGHGkuSv1eprOhmj4wMG2YmFSGec="; + cargoHash = "sha256-4ECH8E/GuV2NYvvjSkanmj4gPIahY40HlCrhR2aFJ5M="; cargoBuildFlags = [ "--package" "lovely-unix" diff --git a/pkgs/by-name/lu/lubelogger/deps.json b/pkgs/by-name/lu/lubelogger/deps.json index f27271e29c93..447b712aa934 100644 --- a/pkgs/by-name/lu/lubelogger/deps.json +++ b/pkgs/by-name/lu/lubelogger/deps.json @@ -1,8 +1,8 @@ [ { "pname": "BouncyCastle.Cryptography", - "version": "2.6.1", - "hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo=" + "version": "2.6.2", + "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" }, { "pname": "CsvHelper", @@ -16,33 +16,33 @@ }, { "pname": "MailKit", - "version": "4.14.1", - "hash": "sha256-YSEcfyYVskwJX6xa13wGW4JgHn0VpD04CtUiAGn3et0=" + "version": "4.15.1", + "hash": "sha256-ZI2ASxX1dY53YxWRii0Dow4aojR8VCEWzCWZLrH7wPw=" }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.15.0", - "hash": "sha256-LKTvERNUTMCEF7xs377tCMwOMRki93OS4kh6Yv0uXJ4=" + "version": "8.17.0", + "hash": "sha256-AU+EMOZArc3rTdsnKYzAufFAtspuYQM3XYi8/VsQAio=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.15.0", - "hash": "sha256-LwzKiGjcnORvmQ9tim6lomXpfVlPpd/fE8FKTFWKlpM=" + "version": "8.17.0", + "hash": "sha256-MH7vdhCNAae32p6UTvaDtmyvFDxa/W71qTsEQ6yC9xM=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.15.0", - "hash": "sha256-mMXwsjGcrrmHR1mG7BLTKg/30mX+m93QVX17/ynOOd4=" + "version": "8.17.0", + "hash": "sha256-IM6jsPMz+l9JA0cye/v2ke51xlfP0u5HtWBqc2aKDYM=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.15.0", - "hash": "sha256-7Lo/TsvqgNCEMyFssO3Om233521Pqgb9K9lUeHc5HMk=" + "version": "8.17.0", + "hash": "sha256-XcA0KXJbqMWt0I5LuHHMRLpgVQ18KcBej1BoySHeA1A=" }, { "pname": "MimeKit", - "version": "4.14.0", - "hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM=" + "version": "4.15.1", + "hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw=" }, { "pname": "Npgsql", @@ -51,7 +51,7 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.1", - "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" + "version": "10.0.0", + "hash": "sha256-d3sLG+LZ3+N/h/6gdJcVKOgbBO6wYb66NfXalAEDqnE=" } ] diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 9a4a21b4a9f7..95c025ff95fb 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-0PjIRf8M4wmn2zm7I9P1o8Zp2CRgZHxt5p6L8bTqJbE="; + hash = "sha256-w1UxnmuMBPi5Ov+3h7R0I0EIiZShsZm+TgXmfKdc1BU="; }; projectFile = "CarCareTracker.sln"; @@ -32,8 +32,6 @@ buildDotnetModule rec { description = "Vehicle service records and maintainence tracker"; longDescription = '' A self-hosted, open-source, unconventionally-named vehicle maintenance records and fuel mileage tracker. - - LubeLogger by Hargata Softworks is licensed under the MIT License for individual and personal use. Commercial users and/or corporate entities are required to maintain an active subscription in order to continue using LubeLogger. ''; homepage = "https://lubelogger.com"; changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}"; diff --git a/pkgs/by-name/lu/lufus/package.nix b/pkgs/by-name/lu/lufus/package.nix index de064128430f..49bc9654bf62 100644 --- a/pkgs/by-name/lu/lufus/package.nix +++ b/pkgs/by-name/lu/lufus/package.nix @@ -11,7 +11,7 @@ python313Packages.buildPythonApplication (finalAttrs: { version = "1.0.0b1.1"; src = fetchFromGitHub { - owner = "Hog185"; + owner = "Hogjects"; repo = "Lufus"; tag = "v${finalAttrs.version}"; sha256 = "sha256-3i0CnhGvLTXutz8CQoH5q4PwZ23lAwnUo8H5TRJx+KE="; @@ -65,7 +65,7 @@ python313Packages.buildPythonApplication (finalAttrs: { meta = { description = "A rufus clone written in py and designed to work with linux"; - homepage = "https://github.com/Hog185/Lufus"; + homepage = "https://github.com/Hogjects/Lufus"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Simon-Weij ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index a4812cec4b4a..7b7cbdf2f10d 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -24,7 +24,7 @@ appimageTools.wrapType2 rec { wrapProgram $out/bin/lunarclient \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/ - install -Dm444 ${contents}/lunarclient.png -t $out/share/pixmaps/ + install -Dm444 ${contents}/lunarclient.png -t $out/share/icons substituteInPlace $out/share/applications/lunarclient.desktop \ --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lunarclient' ''; diff --git a/pkgs/by-name/ly/lycheeslicer/package.nix b/pkgs/by-name/ly/lycheeslicer/package.nix index 884e988fd4d6..bf7e3e864f0b 100644 --- a/pkgs/by-name/ly/lycheeslicer/package.nix +++ b/pkgs/by-name/ly/lycheeslicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "lycheeslicer"; - version = "7.6.4"; + version = "7.6.5"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-lLE40ByNdfK7GkLjfbEEX0nmhL0+E51qPDe+whIJqEM="; + hash = "sha256-HVCAvukGeF4hRJ/l41iBV1MZD5i9qzIYGSgMrncNfDg="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ma/macskk/package.nix b/pkgs/by-name/ma/macskk/package.nix index a48119182d0b..e1cba951bb4e 100644 --- a/pkgs/by-name/ma/macskk/package.nix +++ b/pkgs/by-name/ma/macskk/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "macskk"; - version = "1.11.0"; + version = "2.14.0"; src = fetchurl { url = "https://github.com/mtgto/macSKK/releases/download/${finalAttrs.version}/macSKK-${finalAttrs.version}.dmg"; - hash = "sha256-CqtW6bfSuAo+9VRmRTgx0aKpBKBEDIxidOh7V5vD7ww="; + hash = "sha256-fjvrH/sd6A0d4ye7L/YMb+j4G6yxIZkxY4CN6z/n5JE="; }; nativeBuildInputs = [ @@ -31,7 +31,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { 7zz x $src xar -xf macSKK-${finalAttrs.version}.pkg cat app.pkg/Payload | gunzip -dc | cpio -i - cat dict.pkg/Payload | gunzip -dc | cpio -i runHook postUnpack ''; @@ -39,10 +38,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p "$out"/Library/{Containers,Input\ Methods} + mkdir -p "$out"/Library/Input\ Methods mkdir -p "$out/bin" cp -a "Library/Input Methods/macSKK.app" "$out/Library/Input Methods/" - cp -a "Library/Containers/net.mtgto.inputmethod.macSKK" "$out/Library/Containers/" ln -s "$out/Library/Input Methods/macSKK.app/Contents/MacOS/macSKK" "$out/bin/macSKK" runHook postInstall diff --git a/pkgs/by-name/ma/maestral-gui/package.nix b/pkgs/by-name/ma/maestral-gui/package.nix index 0d2ecbeee604..2fbe16bae18a 100644 --- a/pkgs/by-name/ma/maestral-gui/package.nix +++ b/pkgs/by-name/ma/maestral-gui/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, python3, qt6, + gitUpdater, nixosTests, }: @@ -64,7 +65,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "maestral_qt" ]; - passthru.tests.maestral = nixosTests.maestral; + passthru = { + updateScript = gitUpdater { + ignoredVersions = "dev"; + rev-prefix = "v"; + }; + tests.maestral = nixosTests.maestral; + }; __structuredAttrs = true; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 70fc78335250..f639ca0a2b48 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.19.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-K3gUZjthTLWMCPnenaSc4jn2lznpWa9GiJ5s6Vus8I4="; + hash = "sha256-5rdmDbAqqHZU65C+lFHxV7T8//Tw8v8gQKSNbVHSlno="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-EjI/dpYnohUdd12qT/mB7rtPetgNTi7RNfOnSgeJxnM="; + cargoHash = "sha256-fOxfQTacb3ap5soCVtJnlFPSl3IH+Ju1pPs8xrFBVCw="; env = { # Get openssl-sys to use pkg-config @@ -38,7 +38,10 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Toolchain for PHP that aims to provide a set of tools to help developers write better code"; homepage = "https://github.com/carthage-software/mago"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ hythera ]; + maintainers = with lib.maintainers; [ + hythera + patka + ]; mainProgram = "mago"; }; }) diff --git a/pkgs/by-name/ma/maia-icon-theme/package.nix b/pkgs/by-name/ma/maia-icon-theme/package.nix deleted file mode 100644 index 818a8cf9f167..000000000000 --- a/pkgs/by-name/ma/maia-icon-theme/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - cmake, - extra-cmake-modules, - gtk3, - hicolor-icon-theme, - libsForQt5, -}: - -stdenv.mkDerivation { - pname = "maia-icon-theme"; - version = "2018-02-24"; - - src = fetchFromGitLab { - domain = "gitlab.manjaro.org"; - group = "artwork"; - owner = "themes"; - repo = "maia"; - rev = "b61312cc80cb9d12b0d8a55b3e61668eb6b77d2d"; - sha256 = "1g98snlh96z4sqw9sfd7fxgamh45pcj3lh1kcmng7mirvrcn2pam"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - gtk3 - libsForQt5.plasma-framework - libsForQt5.kwindowsystem - ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - substituteInPlace {icons,icons-dark}/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - ''; - - postInstall = '' - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = { - description = "Icons based on Breeze and Super Flat Remix"; - homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index f6a749d65e64..6d15836e8ad0 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapserver"; - version = "8.6.2"; + version = "8.6.3"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-xsGydZo8figO6vvBjn2/aZl0iKRB77uwzye6wA2tMT0="; + hash = "sha256-PVuoljsDXxDFSB+VVCEmOsSQw8fGR0RaFcaom+W5B2E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix index c9dc8bb1c3af..68798c750022 100644 --- a/pkgs/by-name/ma/marp-cli/package.nix +++ b/pkgs/by-name/ma/marp-cli/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "marp-cli"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "marp-team"; repo = "marp-cli"; rev = "v${version}"; - hash = "sha256-Dj3DkHgoez4S2TtQQ9KlOWUFZkKDy5lUoNUhPkgUu64="; + hash = "sha256-DWXJ049pgrUFpacKObKURU8YrIl6Q4O4bXkzU35Dq00="; }; - npmDepsHash = "sha256-tPFc7b5OtjRJiD8yGLOYiAMQ7NroJvGlpIvRlrq2TxQ="; + npmDepsHash = "sha256-rIL5x6VLfT+mGqjE3yHQs1Dp0SZt7ZlhmC3dzSJXGRM="; npmPackFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix index 5cddce59d771..f9df3696180b 100644 --- a/pkgs/by-name/ma/masterpdfeditor/package.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "masterpdfeditor"; - version = "5.9.94"; + version = "5.9.98"; src = let @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz"; }; hash = selectSystem { - x86_64-linux = "sha256-WKMk0uzcjI4/dwjas4Ws3S6VBcUZYO9/WDXgKY22EeE="; - aarch64-linux = "sha256-DKNOvEAjCzOHRAn8PRiT/1tv6/NggoWCHgHf5OWOHSA="; + x86_64-linux = "sha256-KNAssyWLeMqtMyZQIF6Qr1K/9tioC4cD84lL9c1iMgM="; + aarch64-linux = "sha256-+jNXO4fbbkh9Uea0N+0fJbHRMu9zS/d7o8W4D2+7kMI="; }; }; diff --git a/pkgs/by-name/ma/mastodon/source.nix b/pkgs/by-name/ma/mastodon/source.nix index 7e7dbff6e5d8..2083b26366bb 100644 --- a/pkgs/by-name/ma/mastodon/source.nix +++ b/pkgs/by-name/ma/mastodon/source.nix @@ -15,9 +15,12 @@ applyPatches { hash = "sha256-EXMJWdcuvQWe2cXONlcN/oB4b0nXwDqRT+miIB7P7js="; passthru = { inherit version; - yarnHash = "sha256-wgdOcdJdFJrOA2i4U44BjgZiMvHykzbe0X3IPvisppc="; + yarnHash = "sha256-fDI0QIbcKclhjxT+GMEBvGZk82udJBpvJW6FjQW/xhA="; yarnMissingHashes = ./missing-hashes.json; }; }; - patches = patches ++ [ ]; + patches = patches ++ [ + # Remove when https://github.com/mastodon/mastodon/commit/048700da2f95e492a81fde902f4d48c278763a6d is released + ./yarn-4.14-support.patch + ]; } diff --git a/pkgs/by-name/ma/mastodon/yarn-4.14-support.patch b/pkgs/by-name/ma/mastodon/yarn-4.14-support.patch new file mode 100644 index 000000000000..017f2d295ca9 --- /dev/null +++ b/pkgs/by-name/ma/mastodon/yarn-4.14-support.patch @@ -0,0 +1,21 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1 +1,6 @@ + nodeLinker: node-modules ++ ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index c84e123cb96d..d63199543aac 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -11,12 +11,12 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "materialgram-unwrapped"; - version = "6.4.0.1"; + version = "6.7.7.1"; src = fetchFromGitHub { owner = "kukuruzka165"; repo = "materialgram"; - hash = "sha256-aNgvuuowyhEYUm5ie2vxCsdpaDuuZ/3xZJqWA0bN5Lc="; + hash = "sha256-Cy0ooQZOhfE+QBaRDblKXhmqYsKJ0TfeHsfJaVLVn8o="; tag = "v${finalAttrs.version}"; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix index 60b607fed740..d65b973762e7 100644 --- a/pkgs/by-name/ma/matlab-language-server/package.nix +++ b/pkgs/by-name/ma/matlab-language-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "matlab-language-server"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "mathworks"; repo = "matlab-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-DDtgommUDZbrTIGvH8xQyV+qNeDkxwwsx/0uQgGECPM="; + hash = "sha256-UY+rYWfLHSc+1wDZsRfttX9asFOmV4i42/vxdqLQSuw="; }; - npmDepsHash = "sha256-BW2J8yTGegugvPxmj1i1K/GDc5bZH8sHOpLOPgwFGKg="; + npmDepsHash = "sha256-r4GE9uQwjyPWUitaxXLejH4Ej8SWw+slGlYIo0OX3HM="; npmBuildScript = "package"; diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index daca0e92df47..69fd23b0f903 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -38,17 +38,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-o7bZMSsdSt6VOrsuSMrS7fU9u/LrdD/579IMvsZH+ss="; + hash = "sha256-4zs26kTqwkJV7x+Sm12LnR02bbyH0f6Itbz7bDKUyts="; }; - cargoHash = "sha256-QM4K5TmWWRTcrovAvvEbXEraI4C0vMSJ68Z/6kHhOr8="; + cargoHash = "sha256-T11ESuNg3BS54LtNJfhOoIgiyVL7VsdP4OeDI2nVBIk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index cfb4e84f85b7..f9f6ce65e275 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.152.0"; + version = "1.152.1"; pyproject = true; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-cjc9vC3sfsFaxcxEpXAAAza9/p3fk/2oCa4oB1fWAdA="; + hash = "sha256-81nqT6/TuqtQjjqnT6O+72WCCPlZ9JJKbWczMh6mbcU="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 1145facb3dff..65fcd91a4a4b 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -34,7 +34,7 @@ buildGoModule { tags = [ "sqlite_omit_load_extension" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "netgo" "osusergo" ]; diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index 3149f7090d7a..5eb9e42d0dd8 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; - version = "0.8.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "steipete"; repo = "mcporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-I7UqHsi4pw4wQB4bb8XObo4aUOVtYpF17aYzEHzgCrg="; + hash = "sha256-1wBdYetYu+R04Fl50KR3zZK3QO6S95GV+PEO9k3Thhc="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-OJhlpKwRCE7IqstwIzj1dBJMbMyPVA/w3RVnYfjz764="; + fetcherVersion = 3; + hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mc/mcrypt/gcc15.patch b/pkgs/by-name/mc/mcrypt/gcc15.patch new file mode 100644 index 000000000000..1a407cc0e92d --- /dev/null +++ b/pkgs/by-name/mc/mcrypt/gcc15.patch @@ -0,0 +1,48 @@ +diff --git a/src/defines.h b/src/defines.h +index 9533476..1999826 100644 +--- a/src/defines.h ++++ b/src/defines.h +@@ -164,7 +164,7 @@ + #endif + + /*extern char *getpass();*/ +-extern char *crypt(); /* libufc */ ++extern char *crypt(const char *key, const char *salt); /* libufc */ + + #if HAVE_TERMIOS_H + # include +diff --git a/src/extra.h b/src/extra.h +index b655291..bae372e 100644 +--- a/src/extra.h ++++ b/src/extra.h +@@ -14,7 +14,7 @@ char *get_cfile(int uid, char*); + void Bzero(void *s, size_t n); + void mcrypt_tolow(char *str, int size); + +-char *my_getpass(); ++char *my_getpass(char *prt); + int check_file_head(FILE *fstream, char *algorithm, char* mode, char* keymode, int *keysize, void* salt, int* salt_size); + void* read_iv(FILE *fstream, int ivsize); + int write_file_head(FILE * filedes, char* algorithm, char* mode, char* keymode, int* keysize, void *salt, int salt_size); +diff --git a/src/ufc_crypt.c b/src/ufc_crypt.c +index 8c452d7..7f3a68f 100644 +--- a/src/ufc_crypt.c ++++ b/src/ufc_crypt.c +@@ -28,7 +28,7 @@ + + /* UFC optimized for 32 bit machines */ + +-extern word32 *_ufc_dofinalperm(); ++extern word32 *_ufc_dofinalperm(word32 l1, word32 l2, word32 r1, word32 r2); + + + /* +@@ -668,7 +668,7 @@ char *salt; + return outbuf; + } + +-word32 *_ufc_doit(); ++word32 *_ufc_doit(word32 l1, word32 l2, word32 r1, word32 r2, word32 itr); + + /* + * UNIX crypt function diff --git a/pkgs/by-name/mc/mcrypt/package.nix b/pkgs/by-name/mc/mcrypt/package.nix index cd410b7c77bf..b6d54a99db4c 100644 --- a/pkgs/by-name/mc/mcrypt/package.nix +++ b/pkgs/by-name/mc/mcrypt/package.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation (finalAttrs: { ./segv.patch ./sprintf_CVE-2012-4527.patch ./malloc_to_stdlib.patch + ./gcc15.patch ]; buildInputs = [ diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index c5ea64b36b84..8a95807213b5 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.1.24"; + version = "0.2.0"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-dQMGVqCR8DEgKf1G0HG7eCydNju4OBaQ9UMgDD5hdvI="; + hash = "sha256-snmyfhOkCTnRsBcKcTTij5caA2NmSA1Csp3+D6BJcw4="; }; - cargoHash = "sha256-5HIc0h042gP4mGr4Yp6ej0fkwNW2SDEzlwITgLF2/7I="; + cargoHash = "sha256-CAXHIOC0K062zXNnAD1IW2Sb5Mnpc91A1Lamhc3+NLQ="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index 97450c5b3626..36a715ebc1b2 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -3,7 +3,7 @@ SDL2, cmake, enet, - extra-cmake-modules, + kdePackages, fetchFromGitHub, faad2, libGL, @@ -40,12 +40,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wrapQtAppsHook ]; buildInputs = [ + kdePackages.extra-cmake-modules SDL2 enet faad2 diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index 6aad5b405e11..c6a5dbe4d188 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -3,18 +3,15 @@ fetchFromGitHub, buildDartApplication, }: -let - version = "7.3.0"; +buildDartApplication (finalAttrs: { + pname = "melos"; + version = "7.4.1"; src = fetchFromGitHub { owner = "invertase"; repo = "melos"; - tag = "melos-v${version}"; - hash = "sha256-XTEhH8F54BoXJ1QNhUIZszHQoDwP0Za1LPQ6Dv9sR08="; + tag = "melos-v${finalAttrs.version}"; + hash = "sha256-bsNPZd1euOKF2LlAmBIkr+0iO51iAkcIZYrd5oUJTKo="; }; -in -buildDartApplication { - pname = "melos"; - inherit version src; patches = [ # Patch melos entrypoint to bypass cli_launcher which throws because it does not find melos in the "classic" folders eg : .dart_tool or pub cache. @@ -34,6 +31,16 @@ buildDartApplication { cp --recursive packages/melos/templates $out/ ''; + passthru = { + updateScript = { + command = [ + ./update.sh + ./. + ]; + supportedFeatures = [ "commit" ]; + }; + }; + meta = { homepage = "https://github.com/invertase/melos"; description = "Tool for managing Dart projects with multiple packages"; @@ -41,4 +48,4 @@ buildDartApplication { license = lib.licenses.asl20; maintainers = [ lib.maintainers.eymeric ]; }; -} +}) diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json index 744a351566ba..11aa0a7769ba 100644 --- a/pkgs/by-name/me/melos/pubspec.lock.json +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", + "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "91.0.0" + "version": "96.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", + "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.4.1" + "version": "10.2.0" }, "ansi_styles": { "dependency": "transitive", @@ -64,11 +64,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9", + "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.4" }, "built_collection": { "dependency": "transitive", @@ -84,11 +84,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.0" + "version": "8.12.4" }, "charcode": { "dependency": "transitive", @@ -124,11 +124,11 @@ "dependency": "transitive", "description": { "name": "cli_launcher", - "sha256": "17d2744fb9a254c49ec8eda582536abe714ea0131533e24389843a4256f82eac", + "sha256": "35cf15a3ffaeb9c11849eaa0afba761bb76dceb42d050532bfd3e1299c9748cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.2+1" + "version": "0.3.3+1" }, "cli_util": { "dependency": "transitive", @@ -144,11 +144,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.0" + "version": "4.11.1" }, "collection": { "dependency": "transitive", @@ -194,11 +194,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697", + "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.7" }, "file": { "dependency": "transitive", @@ -254,11 +254,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "http_multi_server": { "dependency": "transitive", @@ -290,25 +290,15 @@ "source": "hosted", "version": "1.0.5" }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.2" - }, "json_annotation": { "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.9.0" + "version": "4.11.0" }, "logging": { "dependency": "transitive", @@ -324,21 +314,21 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.17" + "version": "0.12.19" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.0" + "version": "1.18.2" }, "mime": { "dependency": "transitive", @@ -354,21 +344,21 @@ "dependency": "transitive", "description": { "name": "mockito", - "sha256": "4feb43bc4eb6c03e832f5fcd637d1abb44b98f9cfa245c58e27382f58859f8f6", + "sha256": "a45d1aa065b796922db7b9e7e7e45f921aed17adf3a8318a1f47097e7e695566", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.1" + "version": "5.6.3" }, "mustache_template": { "dependency": "transitive", "description": { "name": "mustache_template", - "sha256": "daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de", + "sha256": "4326d0002ff58c74b9486990ccbdab08157fca3c996fe9e197aff9d61badf307", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "2.0.3" }, "node_preamble": { "dependency": "transitive", @@ -404,11 +394,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "platform": { "dependency": "transitive", @@ -524,11 +514,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "9098ab86015c4f1d8af6486b547b11100e73b193e1899015033cb3e14ad20243", + "sha256": "adc962c96fffb2de1728ef396a995aaedcafbe635abdca13d2a987ce17e57751", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.2.1" }, "source_map_stack_trace": { "dependency": "transitive", @@ -554,11 +544,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.1" + "version": "1.10.2" }, "stack_trace": { "dependency": "transitive", @@ -604,31 +594,31 @@ "dependency": "transitive", "description": { "name": "test", - "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7", + "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.26.3" + "version": "1.30.0" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.7" + "version": "0.7.10" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0", + "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.12" + "version": "0.6.16" }, "typed_data": { "dependency": "transitive", @@ -654,11 +644,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.1" }, "web": { "dependency": "transitive", @@ -724,14 +714,14 @@ "dependency": "transitive", "description": { "name": "yaml_edit", - "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.4" } }, "sdks": { - "dart": ">=3.9.0 <4.0.0" + "dart": ">=3.10.0 <4.0.0" } } diff --git a/pkgs/by-name/me/melos/update.sh b/pkgs/by-name/me/melos/update.sh new file mode 100755 index 000000000000..dc0514431d57 --- /dev/null +++ b/pkgs/by-name/me/melos/update.sh @@ -0,0 +1,92 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq dart yq-go nix + +set -e + +# Get the directory where this script is located +script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +# Fetch the latest tags from GitHub +echo "Fetching latest tags from GitHub..." >&2 +tags=$(curl -s ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/invertase/melos/tags?per_page=20") + +if [ -z "$tags" ]; then + echo "Error: Failed to fetch tags from GitHub" >&2 + exit 1 +fi + +# Extract the latest stable version tag (skip dev versions) +latest_release=$(echo "$tags" | jq -r '.[] | select(.name | test("^melos-v[0-9]+\\.[0-9]+\\.[0-9]+$")) | .name' | head -1) + +if [ -z "$latest_release" ]; then + echo "Error: Could not find any stable release tags" >&2 + exit 1 +fi + +new_version=${latest_release#melos-v} + +# Get current version from package.nix +current_version=$(grep 'version = ' "$script_dir/package.nix" | head -1 | sed 's/.*version = "\(.*\)".*/\1/') + +echo "Current version: $current_version" >&2 +echo "Latest version: $new_version" >&2 + +if [ "$new_version" = "$current_version" ]; then + echo "Already at latest version" >&2 + exit 0 +fi + +# Create a temporary directory +tmpdir=$(mktemp -d) +trap "rm -rf $tmpdir" EXIT + +echo "Downloading melos ${latest_release} from GitHub..." >&2 +archive_url="https://github.com/invertase/melos/archive/refs/tags/${latest_release}.tar.gz" +archive_path="$tmpdir/melos.tar.gz" + +if ! curl -sL -o "$archive_path" "$archive_url"; then + echo "Error: Failed to download archive" >&2 + exit 1 +fi + +echo "Extracting archive..." >&2 +tar -xzf "$archive_path" -C "$tmpdir" + +extracted_dir=$(tar -tzf "$archive_path" | head -1 | cut -d/ -f1) +source_dir="$tmpdir/$extracted_dir" + +echo "Generating pubspec.lock..." >&2 +cd "$source_dir" +dart pub get > /dev/null 2>&1 + +echo "Converting to JSON..." >&2 +yq eval --output-format=json --prettyPrint pubspec.lock > "$tmpdir/pubspec.lock.json" + +# Compute the hash from the downloaded archive +echo "Computing source hash..." >&2 +nix_hash=$(nix-hash --flat --base32 --type sha256 "$archive_path") +if [ -z "$nix_hash" ]; then + echo "Error: Failed to compute source hash" >&2 + exit 1 +fi +new_hash="sha256-$(nix-hash --to-sri --type sha256 "$nix_hash")" + +cp "$tmpdir/pubspec.lock.json" "$script_dir/pubspec.lock.json" +echo "Updated pubspec.lock.json" >&2 + +# Update version in package.nix +sed -i "s/version = \"[^\"]*\";/version = \"${new_version}\";/" "$script_dir/package.nix" +echo "Updated version to ${new_version}" >&2 + +# Update hash in package.nix +sed -i "s|hash = \"[^\"]*\";|hash = \"${new_hash}\";|" "$script_dir/package.nix" +echo "Updated hash" >&2 + +# Output commit message +printf '{ + "attrPath": "melos", + "oldVersion": "%s", + "newVersion": "%s", + "files": ["pubspec.lock.json", "package.nix"], + "commitMessage": "melos: %s -> %s" +}' "$current_version" "$new_version" "$current_version" "$new_version" diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 71b455dc8f38..086cd2759348 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromCodeberg { owner = "mergiraf"; repo = "mergiraf"; tag = "v${finalAttrs.version}"; - hash = "sha256-KlielG8XxOlS5Np8LZT+GMujWw/7EDOwsZHWVjneV3g="; + hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws="; }; - cargoHash = "sha256-F6YtOgcAR4fN33j7Ae4ixhTfNctUfgkV3t1I7XJzHHw="; + cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8="; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index 2aaff1fc9806..104fbc3a03d2 100644 --- a/pkgs/by-name/me/meshlab/package.nix +++ b/pkgs/by-name/me/meshlab/package.nix @@ -153,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { nim65s yzx9 ]; + teams = [ lib.teams.geospatial ]; platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/me/meshtastic-web/package.nix b/pkgs/by-name/me/meshtastic-web/package.nix index 899c654b630b..7d956162ec67 100644 --- a/pkgs/by-name/me/meshtastic-web/package.nix +++ b/pkgs/by-name/me/meshtastic-web/package.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; - fetcherVersion = 2; - hash = "sha256-p8AdAYqaHoKaWirNy9uPLs/kRDVNDcXBJQ1y29MVAA0="; + fetcherVersion = 3; + hash = "sha256-yUdPrZAnCsxIiF++SxTm1VuVAEKIzTsp2qd/WcCPOcQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/meteo-qt/package.nix b/pkgs/by-name/me/meteo-qt/package.nix index 662aac97990f..ceb2d3254eea 100644 --- a/pkgs/by-name/me/meteo-qt/package.nix +++ b/pkgs/by-name/me/meteo-qt/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { postPatch = '' substituteInPlace setup.py \ - --replace-fail "lrelease-pro-qt6" "${qt6.qttools}/libexec/lrelease-pro" + --replace-fail "lrelease-pro-qt6" "${qt6.qttools}/bin/lrelease-pro" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/mg/mgmt/package.nix b/pkgs/by-name/mg/mgmt/package.nix index 6d36e9c10654..6a4611a5918e 100644 --- a/pkgs/by-name/mg/mgmt/package.nix +++ b/pkgs/by-name/mg/mgmt/package.nix @@ -12,18 +12,21 @@ }: buildGoModule (finalAttrs: { pname = "mgmt"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; tag = finalAttrs.version; - hash = "sha256-Qi9KkWzFOqmUp5CSHxzQabQ8bVnBbxxKS/W6aLBTv6k="; + hash = "sha256-nLk497gGrZ664VG9/yV6tqTtwAsN8EmuAEh5Vmq95hQ="; }; - vendorHash = "sha256-XZTDqN5nQqze41Y/jOhT3mFHXeR2oPjXpz7CJuPOi8k="; + vendorHash = "sha256-w4j9cJwW2tnjXSnd3w3v81TwHI8tGYiImjG3LZ+Pjuc="; + + proxyVendor = true; postPatch = '' + rm -rf vendor patchShebangs misc/header.sh ''; preBuild = '' @@ -60,5 +63,6 @@ buildGoModule (finalAttrs: { karpfediem ]; mainProgram = "mgmt"; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix index 30f103e33700..6d6673521f7f 100644 --- a/pkgs/by-name/mg/mgrep/package.nix +++ b/pkgs/by-name/mg/mgrep/package.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-qNsYMp25OAbbv+K7qvNRB+7QzzrgtrKQkUoe9IMIR5c="; + fetcherVersion = 3; + hash = "sha256-T1mbRDBLU4SjZSgqyKgusZe5UV9hI+/bAmBYoAWcWtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 8a2ee1cf49ad..3fdfefc7f965 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-vGvpjRJr4ez322JWUwboVml22vnRVRlwpZ9W4F5wATA="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ mold ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ mold ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/midicsv/fix-gcc15.patch b/pkgs/by-name/mi/midicsv/fix-gcc15.patch new file mode 100644 index 000000000000..70ac4a0e5f19 --- /dev/null +++ b/pkgs/by-name/mi/midicsv/fix-gcc15.patch @@ -0,0 +1,12 @@ +diff --git a/getopt.c b/getopt.c +index 1564e53..8db0459 100644 +--- a/getopt.c ++++ b/getopt.c +@@ -73,7 +73,6 @@ int Getopt(int nargc, char *nargv[], char *ostr) + static char *place = EMSG; /* option letter processing */ + static char *lastostr = (char *) 0; + register char *oli; /* option letter list index */ +- char *index(); + + /* LANCE PATCH: dynamic reinitialization */ + if (ostr != lastostr) { diff --git a/pkgs/by-name/mi/midicsv/package.nix b/pkgs/by-name/mi/midicsv/package.nix index 5edc2554770e..7476a77ac0cd 100644 --- a/pkgs/by-name/mi/midicsv/package.nix +++ b/pkgs/by-name/mi/midicsv/package.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; }; + patches = [ + ./fix-gcc15.patch + ]; + postPatch = '' substituteInPlace Makefile \ --replace /usr/local $out \ diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 05c0129dd694..38549a1186a8 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -64,6 +64,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeCheckInputs = [ cacert cmake + # gix spawns git-upload-pack by name in file:// clone tests. + git rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index d9fa43dc2963..82bfed927954 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: { src ; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-GVzU5YQe7GHn2ddpaGPyLLmhOv5Fy33RL+gBLl3Oyis="; + fetcherVersion = 3; + hash = "sha256-iMS+sFDnGShOQfFQjGtj4+7McqMQvfE8KK1MV/jPC2s="; }; buildPhase = '' diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 240d729627f1..184f4f0f0ab6 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -37,7 +37,7 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.9.4"; + version = "2.9.5"; pyproject = true; __structuredAttrs = true; @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-TOA1ybK41f3+/I5gCaPlAd3yo9N399l6JumWnATbS00="; + hash = "sha256-NiW4VZyQerFhDEDXOOTNzOpsPnZvoyxJWMfg9hHJJ8c="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix index ab3b493241f5..a87dd92bf812 100644 --- a/pkgs/by-name/mk/mkcal/package.nix +++ b/pkgs/by-name/mk/mkcal/package.nix @@ -6,7 +6,7 @@ testers, cmake, doxygen, - extra-cmake-modules, + kdePackages, graphviz, libsForQt5, perl, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules doxygen graphviz perl @@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { ]); buildInputs = with libsForQt5; [ - kcalendarcore + kdePackages.extra-cmake-modules + __internalKF5.kcalendarcore qtbase qtpim timed diff --git a/pkgs/by-name/mm/mmtui/package.nix b/pkgs/by-name/mm/mmtui/package.nix index 12eee2974e76..fd3f75b155f5 100644 --- a/pkgs/by-name/mm/mmtui/package.nix +++ b/pkgs/by-name/mm/mmtui/package.nix @@ -9,6 +9,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mmtui"; version = "0.2.0"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "SL-RU"; repo = "mmtui"; @@ -22,7 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "mmt-v(.*)" + ]; + }; meta = { changelog = "https://github.com/SL-RU/mmtui/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 7e4fdf0e66e1..027f6224f1af 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-04-29"; + version = "0-unstable-2026-05-07"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "e8b5a27723f124e195d60ff18dfe42735dd76aff"; - hash = "sha256-lGryqSZf/baGL8HP1aKK8zQ5hr5UuyIaATmjcgGkCMI="; + rev = "2e5b87a9c20c198dba4e3c8eba3ccfa959499790"; + hash = "sha256-dZLzWgur3zccc92/iaeckcCMCFYOqBz49p1b5gzMaDY="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index c170924d2e89..c15ad31eb41a 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.12.3"; + version = "2.13.0"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-nqwdWDJ4lpWJL79Bjk17U81xqz4l0Q75jG2tJfYmV/w="; + hash = "sha256-aEwazj3RXOrPPOxZDfvyHqetO5tvhnzQ19rE+NQf8wQ="; }; vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM="; diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix index 6231d05b48bb..fab76b8cbdf1 100644 --- a/pkgs/by-name/mo/moosefs/package.nix +++ b/pkgs/by-name/mo/moosefs/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "moosefs"; - version = "4.59.0"; + version = "4.59.1"; src = fetchFromGitHub { owner = "moosefs"; repo = "moosefs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-l4KtrGyV4qy9QFj1SL73n0tRKEATfgDfjTxES9ws+Zw="; + sha256 = "sha256-ASI3iwygGeF9HaoZaSMUIuELJ/pMzRwJL8VmOAXs8cM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix index e32dbe4c0778..7ec8c7fe4551 100644 --- a/pkgs/by-name/mo/motrix-next/package.nix +++ b/pkgs/by-name/mo/motrix-next/package.nix @@ -25,16 +25,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "motrix-next"; - version = "3.8.5"; + version = "3.8.9"; src = fetchFromGitHub { owner = "AnInsomniacy"; repo = "motrix-next"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y5i+0bAIb2YorO+PolBWlv0dFt/P6INPBfVEe3zG5Uc="; + hash = "sha256-Z3oGUwol6vtnrjpvJdPtrdaoaANaW3dtl2vNwpmMXEM="; }; - cargoHash = "sha256-p5Z9196lh7+4K2MzROZGbPcLyUjGU7VufXCZnh3WQfY="; + cargoHash = "sha256-BWPYzGYw6W3Gl1T+eXINFgbo58rvOzOUMa83fcOHJq0="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src ; inherit pnpm; - hash = "sha256-s/xKVhY6NRIGbVkaXOei9z9n0CQkoK5eGhc5/WcEGFI="; + hash = "sha256-BjBC7w2I5VCP59H7TqsIpDLvsfOhGVkfUPmvfzyndaI="; fetcherVersion = 3; }; diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 87fc743b4513..ac2869c075dc 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-H3Oa0SJR74dzZvg9u2drLmH/FNsc1hVUz2MEz/TV1rg="; + hash = "sha256-Mig/GJCFodOoTGk5iCO5WoFGYv3CdD7de65xgLf4xgk="; }; patches = [ ]; @@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: { patches ; modRoot = "linux/netfilter"; - vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; + vendorHash = "sha256-RDSZdmQ31RW4PjZsula9V/asT36GJRdxlAHV/wX2DS8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-ZcLbrLtaGOPSi9AUtiaFYefdlGMq5ygZF6KOgSQehAE="; + hash = "sha256-5147SMY/lowPr4LYhaCBMRxDG53bxc67tsl8WaRuaQc="; }; buildInputs = [ diff --git a/pkgs/by-name/mp/mpage/package.nix b/pkgs/by-name/mp/mpage/package.nix deleted file mode 100644 index f9eca32cb763..000000000000 --- a/pkgs/by-name/mp/mpage/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - fetchurl, - lib, - stdenv, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mpage"; - version = "2.5.8"; - - src = fetchurl { - url = "https://www.mesa.nl/pub/mpage/mpage-${finalAttrs.version}.tgz"; - sha256 = "sha256-I1HpHSV5SzWN9mGPF6cBOijTUOwgQI/gb4Ej3EZz/pM="; - }; - - postPatch = '' - sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g" - substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc' - ''; - - meta = { - description = "Many-to-one page printing utility"; - mainProgram = "mpage"; - - longDescription = '' - Mpage reads plain text files or PostScript documents and prints - them on a PostScript printer with the text reduced in size so - that several pages appear on one sheet of paper. This is useful - for viewing large printouts on a small amount of paper. It uses - ISO 8859.1 to print 8-bit characters. - ''; - - license = lib.licenses.gpl2Plus; - homepage = "http://www.mesa.nl/pub/mpage/"; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index da512c422dfd..26a57c5df185 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "mpls"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${finalAttrs.version}"; - hash = "sha256-mhQuycz+8UfZwsc2/gRuK6X26PxedcqlFyUM0IxqQJs="; + hash = "sha256-MMFwWHgdSkUgwx+XxBCIL4dElY1HIM5h2XNFTZBKNkQ="; }; - vendorHash = "sha256-w0YBeIaARC16BFp4uxJO8X8b1ozTbWFNUg7VQQa5iFw="; + vendorHash = "sha256-fE6GFfrDS3k9BmsL2+UbefG/EQngI/WGRZA3U10VBP4="; ldflags = [ "-s" diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix index 0b05834ba47b..a7adb44cb92c 100644 --- a/pkgs/by-name/mr/mrtg/package.nix +++ b/pkgs/by-name/mr/mrtg/package.nix @@ -3,6 +3,7 @@ stdenv, makeWrapper, fetchurl, + fetchpatch, perl, gd, rrdtool, @@ -38,10 +39,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # gcc14 broke detection of printf format specifiers # building from master seems to be fixed upstream, so next release can (likely) drop the patch - # just keep the CFLAGS below ./configure-long-long-format-gcc14.patch + # fix gcc15 build, remove after next release + (fetchpatch { + name = "fix-gcc15.patch"; + url = "https://github.com/oetiker/mrtg/commit/a64a83210643114b3a892e70ce07ded5bd5de054.patch"; + hash = "sha256-9k16WrCAETuk5DJf5pmeXFHc4AZD9Acmtq/7P24tpwc="; + excludes = [ "CHANGES" ]; + stripLen = 2; + extraPrefix = ""; + }) ]; - env.NIX_CFLAGS_COMPILE = "-Werror"; + env.NIX_CFLAGS_LINK = "-lm"; postInstall = '' diff --git a/pkgs/by-name/mr/mruby/package.nix b/pkgs/by-name/mr/mruby/package.nix index cce569c26c9c..aa6178a73c1d 100644 --- a/pkgs/by-name/mr/mruby/package.nix +++ b/pkgs/by-name/mr/mruby/package.nix @@ -10,23 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mruby"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = finalAttrs.version; - sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8="; + sha256 = "sha256-7CDTRQncpjY0HO0S1lM57aUvV6ZseEp+/nxXp4ZuuQs="; }; - patches = [ - (fetchpatch { - name = "CVE-2025-7207.patch"; - url = "https://github.com/mruby/mruby/commit/1fdd96104180cc0fb5d3cb086b05ab6458911bb9.patch"; - hash = "sha256-wtSlLydofkp2brk/pRiJqt4NhkGRdzsx7JpTmWu2B7I="; - }) - ]; - nativeBuildInputs = [ rake ]; nativeCheckInputs = [ ruby ]; @@ -53,9 +45,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; - maintainers = with lib.maintainers; [ nicknovitski ]; + maintainers = with lib.maintainers; [ + nicknovitski + nomadium + ]; license = lib.licenses.mit; platforms = lib.platforms.all; mainProgram = "mruby"; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix index b3637d909a37..7ad2ac9d982b 100644 --- a/pkgs/by-name/mu/multica-cli/package.nix +++ b/pkgs/by-name/mu/multica-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { __structuredAttrs = true; pname = "multica-cli"; - version = "0.2.23"; + version = "0.2.29"; src = fetchFromGitHub { owner = "multica-ai"; repo = "multica"; rev = "v${version}"; - hash = "sha256-2W2OjiKsjaLmKJTr1Rr31eqL/yt+o4XsLFeLwbyv7MY="; + hash = "sha256-RW9GXWMOJZGc2RsuKAmfTOol66/XwQLdyK7iPoGFF48="; }; sourceRoot = "${src.name}/server"; diff --git a/pkgs/by-name/mu/muse/package.nix b/pkgs/by-name/mu/muse/package.nix index 18b3bb23c90e..fa002cccd2dd 100644 --- a/pkgs/by-name/mu/muse/package.nix +++ b/pkgs/by-name/mu/muse/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, pkg-config, alsa-lib, dssi, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config libsForQt5.qttools libsForQt5.wrapQtAppsHook diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 3e08a4e8f0c7..b83e5b43f137 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -38,14 +38,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.8.6"; + version = "2.8.7"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-//SR7UhaDgT6zNBZ6/B0tBQ88fWkHtrr9Ds0KwH6xzs="; + hash = "sha256-m91q/8XYoZ5Azu79fKD0euRCuf29w3vj5cxdFheDsmI="; }; patches = [ @@ -176,12 +176,15 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies - ++ (providerPackages.audible python.pkgs) - ++ (providerPackages.dlna python.pkgs) - ++ (providerPackages.jellyfin python.pkgs) - ++ (providerPackages.opensubsonic python.pkgs) - ++ (providerPackages.sendspin python.pkgs) - ++ (providerPackages.tidal python.pkgs); + ++ (map (provider: providerPackages.${provider} python.pkgs) [ + "audible" + "dlna" + "jellyfin" + "opensubsonic" + "sendspin" + "snapcast" + "tidal" + ]); disabledTestPaths = [ # no multicast support in build sandbox: diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index c5051d6d857c..4acb6678c682 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.8.6"; + version = "2.8.7"; providers = { airplay = ps: with ps; [ diff --git a/pkgs/by-name/mu/mutagen/package.nix b/pkgs/by-name/mu/mutagen/package.nix index 6169af0e880d..d7bd3b96399e 100644 --- a/pkgs/by-name/mu/mutagen/package.nix +++ b/pkgs/by-name/mu/mutagen/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mutagen"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "mutagen-io"; repo = "mutagen"; rev = "v${version}"; - hash = "sha256-/UigWQMk+VDMGna/ixctU8MR7VNPpOTOGNUtuYx8DS0="; + hash = "sha256-eT1B2ifs1BA2wcVyz9C9F8YoSbGcpGghu5Z3UrjfBOc="; }; - vendorHash = "sha256-J92LzjIsLlBOhnkWrp8MRgoe+4NzXyBgqQRigse5GQk="; + vendorHash = "sha256-RVVUeNfp/HWd3/5uCyaDGw6bXFJvfomhu//829jO+qE="; agents = fetchzip { name = "mutagen-agents-${version}"; @@ -27,7 +27,7 @@ buildGoModule rec { postFetch = '' rm $out/mutagen # Keep only mutagen-agents.tar.gz. ''; - hash = "sha256-EGMBsv6WjmWj/tOhtOORd6eqHmdfJb5pxPrb3zr/ynI="; + hash = "sha256-ltObD3MCSYE7IJaEDyB35CqmtUKintsaD0sMQdFAfYY="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/my/myanon/package.nix b/pkgs/by-name/my/myanon/package.nix index 4ee77b11a39f..ef425790a231 100644 --- a/pkgs/by-name/my/myanon/package.nix +++ b/pkgs/by-name/my/myanon/package.nix @@ -5,23 +5,25 @@ autoreconfHook, flex, bison, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "myanon"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "ppomes"; repo = "myanon"; tag = "v${finalAttrs.version}"; - hash = "sha256-HOWwFdNFfebjWcmADyGVFMQ00sLp+ykk9ZCYI9grYWY="; + hash = "sha256-5JwD1vPAKZlgnl6vfmqgl/jJBHWi8OGsVFJM4ofe6DM="; }; nativeBuildInputs = [ autoreconfHook flex bison + pkg-config ]; meta = { diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index c2c021fac4de..e6101292d8dc 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "myks"; - version = "5.12.2"; + version = "5.13.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${finalAttrs.version}"; - hash = "sha256-CQCxsuZhqRo5PMahc1UBy5T2SvwDs50JWHmhm4qU3FI="; + hash = "sha256-t2Q7nQVwPyxDxH/KvA9ys6uLJt8+kYaCvkTXrzdwlt4="; }; - vendorHash = "sha256-BFuJBaOGzttc8Q1ZxMIx0SWnBWmHg7TwU5VG8Wgydb0="; + vendorHash = "sha256-PwqglEyo63QRHrmY/Yw64U9HkCBQK+DfM3R3WTgT2cQ="; subPackages = "."; diff --git a/pkgs/by-name/my/mysql_jdbc/package.nix b/pkgs/by-name/my/mysql_jdbc/package.nix index 340d112f89ee..ccc926bff99e 100644 --- a/pkgs/by-name/my/mysql_jdbc/package.nix +++ b/pkgs/by-name/my/mysql_jdbc/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql-connector-java"; - version = "9.6.0"; + version = "9.7.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${finalAttrs.version}.zip"; - hash = "sha256-JUTlcbET+e4FNyDssKQ10EwD3riZIRohEfP01JhMpjs="; + hash = "sha256-RsiF8d7hqq96RLp5+bYvuJ0cZUoz23SE9GVwvC9LPaM="; }; installPhase = '' diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 00fc217462bc..67c7f425725d 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -14,6 +14,7 @@ libkrb5, libmongocrypt, libpq, + dart-sass, makeWrapper, }: let @@ -25,20 +26,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "2.15.0"; + version = "2.19.5"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-TOIJqLa68ibry9LSqMkHrJJ+v9t2bK2ybNPUDdiJ66Q="; + hash = "sha256-BOxSiSDDMC1OX4Otbn6DiSG4ThIsiRssKwfXh9y9JSM="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-YGplNNvIOIY1BthWmejAzucXujq8AkgPJus774GmWCA="; + hash = "sha256-gDlTNwsLT4hW1+3agSS/eBAW/804c7ElXCEfs58gP8U="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { python3 # required to build sqlite3 bindings node-gyp # required to build sqlite3 bindings makeWrapper + dart-sass ] ++ lib.optional stdenv.hostPlatform.isDarwin [ cctools @@ -63,6 +65,10 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild + # Force sass-embedded npm package to use our dart-sass instead of bundled binaries + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];' + pushd node_modules/sqlite3 node-gyp rebuild popd diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix index 259bca7ff786..08a7f1e90b95 100644 --- a/pkgs/by-name/na/naabu/package.nix +++ b/pkgs/by-name/na/naabu/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "naabu"; - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; tag = "v${finalAttrs.version}"; - hash = "sha256-8UnZqSjN57rqSpAf3H77TruT7hXMkgUroBhC+VlkXYY="; + hash = "sha256-rjGTicUzdFRpJ3VGl/eXLKGdrbuwM3jQbOd0pmknabg="; }; - vendorHash = "sha256-HOCbtmb6gVsbErxeM2mXbqqALbz3EqK02ARxgyfZinc="; + vendorHash = "sha256-Qay0jAWRnK5oRfOmYLrfWFR5eOT5glcsQ9BgSr2LiS8="; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 8e23a5b84fde..2ed0ed7d956d 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "narsil"; - version = "1.4.0-116-gab32c9f80"; + version = "1.4.0-140-g962201f6f"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; tag = finalAttrs.version; - hash = "sha256-Nw8NZyFQzTwcJhKB86LC0mqjLOmivSm7o9BSRsvQVP4="; + hash = "sha256-6vAVdogjun8Ali/Y71w0jlBU7mEXA0wy2yYCSXPSY3E="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index c73ca513597b..3927a19ba362 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -5,17 +5,18 @@ bison, buildPackages, installShellFiles, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "nawk"; - version = "20251225"; + version = "20260426"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = finalAttrs.version; - hash = "sha256-8QocZx6Diy3xLakZQxqmWdOywvhVYRjSndY5EiV+dng="; + hash = "sha256-ndhSOl4xEwbDQ51g7yuwe3MOfmQrzePuanmyXYhWp+I="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -44,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/onetrueawk/awk"; description = "One, true implementation of AWK"; diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 53ccac64c697..25170308304a 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nb"; - version = "7.25.3"; + version = "7.25.4"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; tag = finalAttrs.version; - hash = "sha256-liDNmc7pueIk0nFUkPjP8llXzV6dTpHMVkRSc0stEVk="; + hash = "sha256-zcNL1WI3UoYV5nXzU0yYh0GwTsUzkeclMcEjQlneSzw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/nb/nbd/package.nix b/pkgs/by-name/nb/nbd/package.nix index 7a813bdef3f9..5788eaf9d506 100644 --- a/pkgs/by-name/nb/nbd/package.nix +++ b/pkgs/by-name/nb/nbd/package.nix @@ -1,12 +1,18 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, + autoreconfHook, + autoconf-archive, pkg-config, glib, which, bison, + flex, + docbook2x, + docbook_sgml_dtd_41, + docbook_sgml_dtd_45, nixosTests, libnl, linuxHeaders, @@ -15,26 +21,37 @@ stdenv.mkDerivation (finalAttrs: { pname = "nbd"; - version = "3.25"; + version = "3.27.1"; - src = fetchurl { - url = "https://github.com/NetworkBlockDevice/nbd/releases/download/nbd-${finalAttrs.version}/nbd-${finalAttrs.version}.tar.xz"; - hash = "sha256-9cj9D8tXsckmWU0OV/NWQy7ghni+8dQNCI8IMPDL3Qo="; + src = fetchFromGitHub { + owner = "NetworkBlockDevice"; + repo = "nbd"; + tag = "nbd-${finalAttrs.version}"; + hash = "sha256-0ahoLnwLdQdpr0AuRpNoid17hXo9BWlIOWRjRwhJ/LM="; }; patches = [ - # fix port setting from nbdtab - # https://github.com/NetworkBlockDevice/nbd/pull/154 + # Fix nbd device parsing (fetchpatch { - url = "https://github.com/NetworkBlockDevice/nbd/commit/915444bc0b8a931d32dfb755542f4bd1d37f1449.patch"; - hash = "sha256-6z+c2cXhY92WPDqRO6AJ5BBf1N38yTgOE1foduIr5Dg="; + url = "https://github.com/NetworkBlockDevice/nbd/commit/a80304e10e9709d4100c935bc4cdc9086e86d5ff.patch"; + hash = "sha256-PMgVz2a8cwv1tO8ac5Wrf8ZFvOmCq+mC5bysJJGhpGc="; }) ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail "support/genver.sh" "echo ${finalAttrs.version}" + substituteInPlace man/Makefile.am \ + --replace-fail "docbook2man" "docbook2man --sgml" + ''; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive pkg-config - which bison + flex + docbook2x # docbook2man ]; buildInputs = [ @@ -46,15 +63,21 @@ stdenv.mkDerivation (finalAttrs: { linuxHeaders ]; + nativeCheckInputs = [ + which + ]; + configureFlags = [ "--sysconfdir=/etc" ]; - # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; - doCheck = !stdenv.hostPlatform.isDarwin; + env.SGML_CATALOG_FILES = lib.concatStringsSep ":" [ + "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat" + "${docbook_sgml_dtd_45}/sgml/dtd/docbook-4.5/docbook.cat" + ]; + passthru.tests = { test = nixosTests.nbd; }; diff --git a/pkgs/by-name/nb/nbench/package.nix b/pkgs/by-name/nb/nbench/package.nix index 1d7c5d9b5049..6327471caabb 100644 --- a/pkgs/by-name/nb/nbench/package.nix +++ b/pkgs/by-name/nb/nbench/package.nix @@ -14,11 +14,12 @@ stdenv.mkDerivation (finalAttrs: { }; prePatch = '' - substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\"" - substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h" + substituteInPlace nbench1.h --replace-fail '"NNET.DAT"' "\"$out/NNET.DAT\"" \ + --replace-fail 'static void adjust_mid_wts();' 'static void adjust_mid_wts(int);' + substituteInPlace sysspec.h --replace-fail "malloc.h" "stdlib.h" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace Makefile --replace "-static" "" + substituteInPlace Makefile --replace-fail "-static" "" ''; buildInputs = lib.optionals stdenv.hostPlatform.isGnu [ diff --git a/pkgs/by-name/nc/ncview/package.nix b/pkgs/by-name/nc/ncview/package.nix index 5259aa000d99..50dd95c20453 100644 --- a/pkgs/by-name/nc/ncview/package.nix +++ b/pkgs/by-name/nc/ncview/package.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { libxt ]; + # K&R-style declarations break under gcc 15's C23 default. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + meta = { description = "Visual browser for netCDF format files"; homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; diff --git a/pkgs/by-name/nd/ndn-cxx/package.nix b/pkgs/by-name/nd/ndn-cxx/package.nix index e3d276635057..8ff76d9dfc61 100644 --- a/pkgs/by-name/nd/ndn-cxx/package.nix +++ b/pkgs/by-name/nd/ndn-cxx/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, doxygen, pkg-config, python3, @@ -23,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM="; }; + patches = [ + (fetchpatch { + name = "fix-gcc15.patch"; + url = "https://github.com/named-data/ndn-cxx/commit/0ba3d3a9d9701be4baa3969fe50e97e89d11249b.patch"; + hash = "sha256-ikVIJ8Jza17k/sa/wtu2EUGLEhUMloMOkBrMN9W9BPY="; + }) + ]; + nativeBuildInputs = [ doxygen pkg-config diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index ea31916fdfb4..ff5043275208 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-ojm4we7mI02Y1MT9uWDpu1tp0QRo4VvGrvezUb+Lxcc="; + hash = "sha256-9Vb7hUyJJZ/zKv+nhoX0HX2njCqU49LhM8ihm7Or/xE="; }; vendorHash = "sha256-j+8KZxHnYrtxwdBxpAXZ+Q5Sm1REluUEmD69tKYTCag="; diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 5b7d20f6e909..05d08b75441c 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -30,8 +30,7 @@ buildNpmPackage rec { description = "NetBird Management Service Web UI Panel"; homepage = "https://github.com/netbirdio/dashboard"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - patrickdag + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 20f9e121a909..832dc179d7fe 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -5,7 +5,6 @@ qt6Packages, stdenv, cmake, - extra-cmake-modules, inotify-tools, kdePackages, libcloudproviders, @@ -54,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - extra-cmake-modules + kdePackages.extra-cmake-modules librsvg sphinx qt6Packages.wrapQtAppsHook diff --git a/pkgs/by-name/ne/nextinspace/package.nix b/pkgs/by-name/ne/nextinspace/package.nix index 1fa33346c1e5..7358b27c857c 100644 --- a/pkgs/by-name/ne/nextinspace/package.nix +++ b/pkgs/by-name/ne/nextinspace/package.nix @@ -6,28 +6,28 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "nextinspace"; - version = "2.0.5"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "not-stirred"; repo = "nextinspace"; tag = "v${finalAttrs.version}"; - hash = "sha256-CrhzCvIA3YAFsWvdemvK1RLMacsM5RtgMjLeiqz5MwY="; + hash = "sha256-oEvRxaxx1pIco2+jm/3HUN0a0nqdo2VosCisM0MWTjU="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - pythonPath = with python3.pkgs; [ + dependencies = with python3.pkgs; [ requests tzlocal colorama ]; nativeCheckInputs = with python3.pkgs; [ - pytest-lazy-fixture + pytest-lazy-fixtures pytestCheckHook requests-mock ]; diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index d96dd2fba5e8..67323d4e2656 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "4.2"; + version = "5.0"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-pkVUCWWVzPwPEG4NGWOoHrXkQpC245kD/Xbj9wmxR3E="; + hash = "sha256-O4ry1G7Y55bjr4APrYMSCfrkNy8KrhSgG0Nh1rOGMvU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 5abf92438aea..30a601ec1b81 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "nezha-agent"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-JuR/9q8RzSHNKJFhe9pdRS30KlXepDho+1E4bOZa4M4="; + hash = "sha256-pysEeqW/WCj+VlERl9m5pir0SfCRA92R6akIGmHTLdI="; }; - vendorHash = "sha256-O2ENDVq4Dt3f1FCZBKiz30P/xNRxx+0w3r7LzJP9URM="; + vendorHash = "sha256-GIdkbQzHAIgH7KVoxZ1DcbamWYaRdTuJKGTnOn8SPyk="; ldflags = [ "-s" diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 1b76f0ff1f84..619549072a3c 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-BoQO6oTctvRAzHUw6dsOSV5w7uLzrnD1+KmP9irG0Z4="; + fetcherVersion = 3; + hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 00b39f59eb0a..6a3c02fe4485 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { nimHost = lib.warn "nimHost is deprecated, please use stdenv.hostPlatform.nim.os instead." stdenv.hostPlatform.nim.os; - nimTarget = lib.warn "nimTarget is deprecated, please use stdenv.hostPlatform.nim.cpu instead." stdenv.hostPlatform.cpu; + nimTarget = lib.warn "nimTarget is deprecated, please use stdenv.hostPlatform.nim.cpu instead." stdenv.hostPlatform.nim.cpu; }; meta = { diff --git a/pkgs/by-name/ni/nip2/package.nix b/pkgs/by-name/ni/nip2/package.nix index faf3ba81e236..f20cef494d57 100644 --- a/pkgs/by-name/ni/nip2/package.nix +++ b/pkgs/by-name/ni/nip2/package.nix @@ -1,7 +1,9 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + fetchpatch, + autoreconfHook, pkg-config, glib, libxml2, @@ -20,18 +22,39 @@ stdenv.mkDerivation (finalAttrs: { pname = "nip2"; version = "8.9.1"; - src = fetchurl { - url = "https://github.com/libvips/nip2/releases/download/v${finalAttrs.version}/nip2-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-t14m6z+5lPqpiOjgdDbKwqSWXCyrCL7zlo6BeoZtds0="; + src = fetchFromGitHub { + owner = "libvips"; + repo = "nip2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SemlINqrqzWa7/sU6KnWiDJW8FLSYVZnCDtJNE0wjhg="; }; + patches = [ + (fetchpatch { + name = "do-not-redeclare-statfs.patch"; + url = "https://github.com/libvips/nip2/commit/045268a78c40d7f546220504f971c728aebc00be.patch"; + hash = "sha256-A17+/Vmjf0l1Jpl22VL11gj5m6oFB8DnvkH2EHiRTw8="; + }) + (fetchpatch { + name = "declare-function-arguments-for-function-pointer.patch"; + url = "https://github.com/libvips/nip2/commit/8c60c517b59f806da84d57cb1d083a213b811151.patch"; + hash = "sha256-o5OHNSbUORGquhyCYCtGQTY74IfroByaa0UAXYsP484="; + }) + ]; + nativeBuildInputs = [ + autoreconfHook bison flex pkg-config makeWrapper + glib ]; + preAutoreconf = '' + glib-gettextize --force --copy + ''; + buildInputs = [ glib libxml2 diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index c68503dfda04..c44737b94bd0 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -20,7 +20,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { pname = "nixtamal"; - version = "1.5.0"; + version = "1.5.3"; release_year = 2026; minimalOCamlVersion = "5.3"; @@ -29,7 +29,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { url = "https://darcs.toastal.in.th/nixtamal/stable/"; mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ]; rev = finalAttrs.version; - hash = "sha256-noQU480HoxVjnHvEY/rso9jANNA8EIKbYeYpnhkkx74="; + hash = "sha256-/0JRG8BAuNaT9KpotDxXlbdSYMTWiOgzIABT+MGPPU0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch b/pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch deleted file mode 100644 index 85d4a74b9ad5..000000000000 --- a/pkgs/by-name/no/noctalia-qs/0001-fix-unneccessary-reloads.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/core/generation.cpp b/src/core/generation.cpp -index c68af71..4967562 100644 ---- a/src/core/generation.cpp -+++ b/src/core/generation.cpp -@@ -172,12 +172,18 @@ void EngineGeneration::setWatchingFiles(bool watching) { - if (this->watcher == nullptr) { - this->watcher = new QFileSystemWatcher(); - -+ // note: not using canonicalFilePath() here on purpose, -+ // since the path could be a link to the nix store -+ // and the link might change -+ - for (auto& file: this->scanner.scannedFiles) { -+ if (file.startsWith("/nix/store/")) continue; - this->watcher->addPath(file); - this->watcher->addPath(QFileInfo(file).dir().absolutePath()); - } - - for (auto& file: this->extraWatchedFiles) { -+ if (file.startsWith("/nix/store/")) continue; - this->watcher->addPath(file); - this->watcher->addPath(QFileInfo(file).dir().absolutePath()); - } diff --git a/pkgs/by-name/no/noctalia-qs/package.nix b/pkgs/by-name/no/noctalia-qs/package.nix index 1546b1cd3411..f11d123ae1ba 100644 --- a/pkgs/by-name/no/noctalia-qs/package.nix +++ b/pkgs/by-name/no/noctalia-qs/package.nix @@ -26,19 +26,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "noctalia-qs"; - version = "0.0.10"; + version = "0.0.12"; src = fetchFromGitHub { owner = "noctalia-dev"; repo = "noctalia-qs"; tag = "v${finalAttrs.version}"; - hash = "sha256-tscUYNjBfi52Uwu40epdAhoFztsmroKBEBvr22oCnv4="; + hash = "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0="; }; - patches = [ - ./0001-fix-unneccessary-reloads.patch - ]; - nativeBuildInputs = [ cmake ninja @@ -74,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "DISTRIBUTOR_DEBUGINFO_AVAILABLE" true) (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix) (lib.cmakeFeature "GIT_REVISION" "tag-v${finalAttrs.version}") + (lib.cmakeBool "NIX_STORE_DIR_SKIP_WATCH" true) + (lib.cmakeFeature "NIX_STORE_DIR" builtins.storeDir) ]; - cmakeBuildType = "RelWithDebInfo"; - separateDebugInfo = true; - dontStrip = false; + cmakeBuildType = "Release"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/no/novnc/fix-paths.patch b/pkgs/by-name/no/novnc/fix-paths.patch index cb160320dd53..04cc2052f422 100644 --- a/pkgs/by-name/no/novnc/fix-paths.patch +++ b/pkgs/by-name/no/novnc/fix-paths.patch @@ -1,5 +1,5 @@ diff --git a/utils/novnc_proxy b/utils/novnc_proxy -index 0900f7e..a931763 100755 +index e1efb9f..1540698 100755 --- a/utils/novnc_proxy +++ b/utils/novnc_proxy @@ -22,7 +22,7 @@ usage() { @@ -10,8 +10,8 @@ index 0900f7e..a931763 100755 + echo " Default: @out@/share/webapps/novnc" echo " --ssl-only Disable non-https connections." echo " " - echo " --record FILE Record traffic to FILE.session.js" -@@ -44,7 +44,7 @@ PORT="6080" + echo " --file-only Disable directory listing in web server." +@@ -53,7 +53,7 @@ LISTEN="$PORT" VNC_DEST="localhost:5900" CERT="" KEY="" @@ -19,4 +19,5 @@ index 0900f7e..a931763 100755 +WEB="@out@/share/webapps/novnc" proxy_pid="" SSLONLY="" - RECORD_ARG="" + RECORD="" + diff --git a/pkgs/by-name/no/novnc/package.nix b/pkgs/by-name/no/novnc/package.nix index d39c6484f562..b77abcfecdce 100644 --- a/pkgs/by-name/no/novnc/package.nix +++ b/pkgs/by-name/no/novnc/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "novnc"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-VYG0p70ZvRzK9IeA+5J95FqF+zWgj/8EcxnVOk+YL9o="; + sha256 = "sha256-vObaEjP8ZgA4a4bEYbSBsSTl6CfYa/B7qmghM+iVDnQ="; }; patches = @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 utils/novnc_proxy "$out/bin/novnc" install -dm755 "$out/share/webapps/novnc/" - cp -a app core po vendor vnc.html karma.conf.js package.json vnc_lite.html "$out/share/webapps/novnc/" + cp -a app core po vendor vnc.html karma.conf.cjs package.json vnc_lite.html "$out/share/webapps/novnc/" runHook postInstall ''; diff --git a/pkgs/by-name/no/novnc/websockify.patch b/pkgs/by-name/no/novnc/websockify.patch index dd335cdbfc6c..4d970d3ab7a3 100644 --- a/pkgs/by-name/no/novnc/websockify.patch +++ b/pkgs/by-name/no/novnc/websockify.patch @@ -1,13 +1,14 @@ diff --git a/utils/novnc_proxy b/utils/novnc_proxy -index 0365c1e..7eba2db 100755 +index e1efb9f..6d79999 100755 --- a/utils/novnc_proxy +++ b/utils/novnc_proxy -@@ -167,7 +167,7 @@ if [[ -d ${HERE}/websockify ]]; then +@@ -181,7 +181,7 @@ if [[ -d ${HERE}/websockify ]]; then echo "Using local websockify at $WEBSOCKIFY" else -- WEBSOCKIFY_FROMSYSTEM=$(which websockify 2>/dev/null) +- WEBSOCKIFY_FROMSYSTEM=$(type -P websockify 2>/dev/null) + WEBSOCKIFY_FROMSYSTEM="@websockify@/bin/websockify" - WEBSOCKIFY_FROMSNAP=${HERE}/../usr/bin/python2-websockify [ -f $WEBSOCKIFY_FROMSYSTEM ] && WEBSOCKIFY=$WEBSOCKIFY_FROMSYSTEM - [ -f $WEBSOCKIFY_FROMSNAP ] && WEBSOCKIFY=$WEBSOCKIFY_FROMSNAP + + if [ ! -f "$WEBSOCKIFY" ]; then + diff --git a/pkgs/by-name/no/noxdir/package.nix b/pkgs/by-name/no/noxdir/package.nix index 57f8daa9de4e..bb5367434ff5 100644 --- a/pkgs/by-name/no/noxdir/package.nix +++ b/pkgs/by-name/no/noxdir/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "noxdir"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "crumbyte"; repo = "noxdir"; tag = "v${finalAttrs.version}"; - hash = "sha256-xq0oXMsJlhstiLK0VIYqwg7fK1ERwzOGtV8McqCX9G8="; + hash = "sha256-tK/W36jzHZ3VavkTuBYV5MSUGCTQFskx/qULBuV0Cis="; }; vendorHash = "sha256-citZvLDKdhkWma3XKSfMvPOTo1xEpZhovkWTsMTyO+k="; diff --git a/pkgs/by-name/np/npiet/package.nix b/pkgs/by-name/np/npiet/package.nix index cbc1592129e4..9899a4db55fb 100644 --- a/pkgs/by-name/np/npiet/package.nix +++ b/pkgs/by-name/np/npiet/package.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'exec wish' 'exec ${tk}/bin/wish' ''; + # K&R-style decls clash with GCC 15's default of -std=gnu23. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + strictDeps = true; passthru.tests = diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix index 3c300672becc..7e814d867a14 100644 --- a/pkgs/by-name/nr/nrm/package.nix +++ b/pkgs/by-name/nr/nrm/package.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-PENYS5xO2LwT3+TGl/wU2r0ALEj/JQfbkpf/0MJs0uw="; + fetcherVersion = 3; + hash = "sha256-DvhUXkh9Ijuik9uWzPOtM1idSNSaJxDiRHWpUMepf3U="; }; buildPhase = '' diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix index 157065023948..63783b327735 100644 --- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation rec { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index 70f459769eff..1c09f1898995 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation rec { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/numix-icon-theme/package.nix b/pkgs/by-name/nu/numix-icon-theme/package.nix index 8438f544d88d..8a47d2c4bd56 100644 --- a/pkgs/by-name/nu/numix-icon-theme/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme/package.nix @@ -7,7 +7,7 @@ gnome-icon-theme, hicolor-icon-theme, gitUpdater, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -27,12 +27,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/nusmv/package.nix b/pkgs/by-name/nu/nusmv/package.nix index fb32ef5d1a0e..f56d1d41aed7 100644 --- a/pkgs/by-name/nu/nusmv/package.nix +++ b/pkgs/by-name/nu/nusmv/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { throw "only linux and mac x86_64 are currently supported" ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' install -m755 -D bin/NuSMV $out/bin/NuSMV diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 0826cf12af56..20602fd44707 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -35,13 +35,13 @@ let in maven.buildMavenPackage rec { pname = "nzbhydra2"; - version = "8.8.0"; + version = "8.8.1"; src = fetchFromGitHub { owner = "theotherp"; repo = "nzbhydra2"; tag = "v${version}"; - hash = "sha256-BndOpHEcesrfequErt193F3Bapm8E4jwZ9gPxuvWDi0="; + hash = "sha256-r6vv636evAetj5Pa4Ql2vkKP36BQ16JdmbAQLatCr9c="; }; mvnHash = "sha256-mZ/mOF9k5URheNNxmrKkCiklP26zeTGKhDGxqRiDBuk="; diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix index dff8d5b18357..90b71a6e523b 100644 --- a/pkgs/by-name/od/odp-dpdk/package.nix +++ b/pkgs/by-name/od/odp-dpdk/package.nix @@ -2,9 +2,11 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, autoreconfHook, pkg-config, dpdk, + intel-ipsec-mb, libbpf, libconfig, libpcap, @@ -31,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./odp-dpdk_25.03.patch + # Fix gcc 15 -Wunterminated-string-initialization errors in test code. + (fetchpatch2 { + url = "https://github.com/OpenDataPlane/odp-dpdk/commit/56c6bdbe8fe9db4c0441162ec269ef4e1ebd1a6a.patch"; + hash = "sha256-aj4HuGb0BUxsKtFS3X3gXqBoRVRnKEBNxa/4heWhBlE="; + }) ]; nativeBuildInputs = [ @@ -44,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ./dpdk_25.03.patch ]; }) + intel-ipsec-mb libconfig libpcap numactl diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index ac45945a4243..ba915b3482e1 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-s3p4JpMivznfUPBA0R+IPVtrOgwSAPsaXJKtYOpXNOk="; + hash = "sha256-Gc8ZLCsE5k4YtoN6VYT9FfnuqFDNBwcrdDbcDQLjDE4="; }; - vendorHash = "sha256-ZZm9vaVS8kkrVo5NViQd5UpBm+XseNuN81F13D+UL1k="; + vendorHash = "sha256-riNqDuD+LftGnQfRQwOB1VHVV7R2rp4cSU5d9jBvJQM="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index f8d770154a24..4e71a31ba63f 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -212,6 +212,7 @@ goBuild (finalAttrs: { + lib.optionalString stdenv.hostPlatform.isDarwin '' rm ml/backend/ggml/ggml_test.go rm ml/nn/pooling/pooling_test.go + rm model/models/nemotronh/model_omni_test.go ''; overrideModAttrs = ( diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index a1299dc6b332..cf2b23c991a4 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ols"; - version = "dev-2026-03"; + version = "dev-2026-05"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; tag = finalAttrs.version; - hash = "sha256-QjkzR9Wnc+Poq7dxDlik9k1maEs8xiFuNbwRdv8nqyo="; + hash = "sha256-9tQVyauvXGTkKnQUSYKAhjL5ZZbhglqdcxdcs27P2k4="; }; postPatch = '' diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index f6518f9553f8..0149f028048e 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "omnictl"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-IxPsm361gYdYWDy16vai5JsmJ5NWUSIRQ9k2Qnwi2K8="; + hash = "sha256-3nqyhJnJgOyegLtJchqoo6BtGbvvRaGxwo28Ef1gb4k="; }; - vendorHash = "sha256-snrOKwD4xbMTdjP13KLTVVB7ikXG+yHS8QT60/tHZ3I="; + vendorHash = "sha256-6Yy/qEcZb4nheCplXmYo65NUJzImEQpRW/+g0rA3VW4="; ldflags = [ "-s" diff --git a/pkgs/by-name/on/one-click-backup/package.nix b/pkgs/by-name/on/one-click-backup/package.nix index 754011079651..d9cb3826e789 100644 --- a/pkgs/by-name/on/one-click-backup/package.nix +++ b/pkgs/by-name/on/one-click-backup/package.nix @@ -5,7 +5,7 @@ cmake, ninja, qt6, - extra-cmake-modules, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules ninja qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix index bcda401e031d..7d66e1199cbe 100644 --- a/pkgs/by-name/oo/ooniprobe-cli/package.nix +++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "ooniprobe-cli"; - version = "3.29.0"; + version = "3.29.1"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-bh17+yMs7DMffoJstYbYnvwEAue34rPmKadFQQQxYxQ="; + hash = "sha256-l45gVWddIQpVb3VDQ44K0MEjLiowLX120S0R/EMrAJU="; }; vendorHash = "sha256-kbvdUqAz9k3AHtitoVr4q1kGMf2Jzfs6iSRUl1sp4UU="; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index d959271bcbfc..78e694468196 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-NiB8V7B5H57t4NjKlAcQdK1E1dfS3nc/+8tWbSE3MBQ="; + hash = "sha256-J0B/N4Bb7lRK4/BiILliy/Gw7FayM3liG+4NiskOq9U="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-8bsC6LM+v7RTbhAjGYHKClKoiC/rLhzt+UGVp3CVDB0="; + npmDepsHash = "sha256-jPGSJ+f5xuhnB4E9/FlgQkC37W6Yw2aGh8O8f8ajVC4="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index ea5895282f95..f934093ffc48 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -83,10 +83,10 @@ stdenv.mkDerivation (finalAttrs: { gnutls libnghttp2.dev ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ] - ++ lib.optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ usrsctp ]; diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix index 4a817f26827e..6f99a452cf40 100644 --- a/pkgs/by-name/op/openclaw/package.nix +++ b/pkgs/by-name/op/openclaw/package.nix @@ -11,7 +11,7 @@ versionCheckHook, rolldown, installShellFiles, - version ? "2026.4.22", + version ? "2026.5.7", }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "openclaw"; @@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "openclaw"; repo = "openclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-BB+stGBDgMRAPHrVWJS2dFRjw2WrVrFdVf/23Tq1UeA="; + hash = "sha256-ICkq6YfMJVvRC93sM+7/q2JI82wUhjaYAI3pRzmTHYc="; }; - pnpmDepsHash = "sha256-z45mB/w7sorAE3CTliDpvMm9eq+/l9L/mmhYJt0t9O4="; + pnpmDepsHash = "sha256-LXaRfZ0WY8VDpDc2zFr+Oel6AuYo6SiTrp37yokT1VU="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; @@ -58,45 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { chmod -R u+w node_modules/rolldown node_modules/@rolldown/pluginutils \ node_modules/.pnpm/node_modules/rolldown node_modules/.pnpm/node_modules/@rolldown/pluginutils - # In Nix sandbox, npm install has no network access. - # 1) Skip missing/mismatched deps in closure walk instead of aborting. - # 2) Never fall through to the npm-install path. - substituteInPlace scripts/stage-bundled-plugin-runtime-deps.mjs \ - --replace-fail \ - 'if (installedVersion === null || !dependencyVersionSatisfied(spec, installedVersion)) { - return null; - }' \ - 'if (installedVersion === null || !dependencyVersionSatisfied(spec, installedVersion)) { - continue; - }' \ - --replace-fail \ - ' if ( - stageInstalledRootRuntimeDeps({ - directDependencyPackageRoot, - fingerprint, - packageJson, - pluginDir, - pruneConfig, - repoRoot, - stampPath, - }) - ) { - continue; - }' \ - ' if ( - stageInstalledRootRuntimeDeps({ - directDependencyPackageRoot, - fingerprint, - packageJson, - pluginDir, - pruneConfig, - repoRoot, - stampPath, - }) - ) { - continue; - } - continue; // nix: sandbox has no npm' pnpm build pnpm ui:build @@ -111,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp --reflink=auto -r package.json dist node_modules $libdir/ - cp --reflink=auto -r assets docs skills patches extensions qa $libdir/ + cp --reflink=auto -r docs skills patches extensions qa $libdir/ rm -f $libdir/node_modules/.pnpm/node_modules/clawdbot \ $libdir/node_modules/.pnpm/node_modules/moltbot \ @@ -137,9 +98,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { in '' installShellCompletion --cmd openclaw \ - --bash <(OPENCLAW_SKIP_PLUGIN_CLI=1 ${emulator} $out/bin/openclaw completion --shell bash) \ - --fish <(OPENCLAW_SKIP_PLUGIN_CLI=1 ${emulator} $out/bin/openclaw completion --shell fish) \ - --zsh <(OPENCLAW_SKIP_PLUGIN_CLI=1 ${emulator} $out/bin/openclaw completion --shell zsh) + --bash <(${emulator} $out/bin/openclaw completion --shell bash) \ + --fish <(${emulator} $out/bin/openclaw completion --shell fish) \ + --zsh <(${emulator} $out/bin/openclaw completion --shell zsh) '' ); @@ -148,10 +109,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; - patches = [ - ./skip-bundled-runtime-install.patch - ]; - meta = { description = "Self-hosted, open-source AI assistant/agent"; longDescription = '' diff --git a/pkgs/by-name/op/openclaw/skip-bundled-runtime-install.patch b/pkgs/by-name/op/openclaw/skip-bundled-runtime-install.patch deleted file mode 100644 index 539ba54d20c5..000000000000 --- a/pkgs/by-name/op/openclaw/skip-bundled-runtime-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/plugins/bundled-runtime-deps.ts b/src/plugins/bundled-runtime-deps.ts -index 5dca7aa..fac598b 100644 ---- a/src/plugins/bundled-runtime-deps.ts -+++ b/src/plugins/bundled-runtime-deps.ts -@@ -823,6 +823,12 @@ export function installBundledRuntimeDeps(params: { - missingSpecs: string[]; - env: NodeJS.ProcessEnv; - }): void { -+ // Refuse to spawn `npm install` in environments that opt out (e.g. the Nix -+ // build sandbox). Bundled runtime deps are expected to already be staged by -+ // the package build; a runtime install would require network access. -+ if (params.env.OPENCLAW_SKIP_PLUGIN_CLI === "1") { -+ throw new Error("bundled runtime deps install skipped (OPENCLAW_SKIP_PLUGIN_CLI=1)"); -+ } - const installExecutionRoot = params.installExecutionRoot ?? params.installRoot; - fs.mkdirSync(params.installRoot, { recursive: true }); - fs.mkdirSync(installExecutionRoot, { recursive: true }); diff --git a/pkgs/by-name/or/oranchelo-icon-theme/package.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix index fb396745f57d..5be293cff3e4 100644 --- a/pkgs/by-name/or/oranchelo-icon-theme/package.nix +++ b/pkgs/by-name/or/oranchelo-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - plasma5Packages, + kdePackages, hicolor-icon-theme, }: @@ -23,11 +23,12 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - plasma5Packages.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix index 7eb3de6fd611..b36d9ad1aeff 100644 --- a/pkgs/by-name/os/osmium/package.nix +++ b/pkgs/by-name/os/osmium/package.nix @@ -24,14 +24,18 @@ gtk3, libnotify, libpulseaudio, + writeShellApplication, + curl, + yq, + common-updater-scripts, }: stdenv.mkDerivation rec { pname = "osmium"; - version = "0.0.19"; + version = "0.0.19-alpha"; src = fetchurl { - url = "https://updater.osmium.chat/Osmium-${version}-alpha-x64.tar.gz"; + url = "https://updater.osmium.chat/Osmium-${version}-x64.tar.gz"; hash = "sha256-Qwh6K2QlJJapqR0BkaA0LvwLEsqktnLzOnyJg+7sMFo="; }; @@ -98,6 +102,21 @@ stdenv.mkDerivation rec { startupWMClass = "Osmium"; }; + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "update-osmium"; + runtimeInputs = [ + curl + yq + common-updater-scripts + ]; + text = '' + version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq .version)" + update-source-version osmium "${version}" + ''; + }); + }; + meta = { description = "Globally distributed community messaging and voice/video platform"; homepage = "https://osmium.chat/"; diff --git a/pkgs/by-name/os/osmscout-server/package.nix b/pkgs/by-name/os/osmscout-server/package.nix index abef0c0d53df..1d25bed26056 100644 --- a/pkgs/by-name/os/osmscout-server/package.nix +++ b/pkgs/by-name/os/osmscout-server/package.nix @@ -9,6 +9,7 @@ libmicrohttpd, libosmscout, libpostal, + libtiff, marisa, osrm-backend, protobuf_21, @@ -50,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libsForQt5.kirigami2 libsForQt5.qtquickcontrols2 libsForQt5.qtlocation valhalla @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { osrm-backend libmicrohttpd libpostal + libtiff sqlite marisa kyotocabinet @@ -67,10 +68,13 @@ stdenv.mkDerivation (finalAttrs: { ]; qmakeFlags = [ - "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant + "SCOUT_FLAVOR=qtcontrols" "CONFIG+=disable_mapnik" # Disable the optional mapnik backend ]; + # valhalla 3.6 headers use std::ranges/std::views (C++20). + env.NIX_CFLAGS_COMPILE = "-std=c++20"; + meta = { description = "Maps server providing tiles, geocoder, and router"; homepage = "https://github.com/rinigus/osmscout-server"; diff --git a/pkgs/by-name/os/osquery/info.json b/pkgs/by-name/os/osquery/info.json index 0c58702304b0..4cb76d403cc4 100644 --- a/pkgs/by-name/os/osquery/info.json +++ b/pkgs/by-name/os/osquery/info.json @@ -5,9 +5,9 @@ }, "osquery": { "fetchSubmodules": true, - "hash": "sha256-T1diraffNXozuOtwAXweZhfybcIJTFvvTy0s/HFU6M0=", + "hash": "sha256-m66JfsC1+YU1k3BKEwHx6jmqpRleaqP6f8M/NXJU8dg=", "owner": "osquery", "repo": "osquery", - "rev": "5.22.1" + "rev": "5.23.0" } } diff --git a/pkgs/by-name/ot/otel-cli/package.nix b/pkgs/by-name/ot/otel-cli/package.nix index 53651ae26252..d988f7f8de82 100644 --- a/pkgs/by-name/ot/otel-cli/package.nix +++ b/pkgs/by-name/ot/otel-cli/package.nix @@ -43,9 +43,7 @@ buildGoModule (finalAttrs: { description = "Command-line tool for sending OpenTelemetry traces"; changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - emattiza - ]; + maintainers = [ ]; mainProgram = "otel-cli"; }; }) diff --git a/pkgs/by-name/ot/otel-tui/package.nix b/pkgs/by-name/ot/otel-tui/package.nix index a33b813dfd54..6586c5854013 100644 --- a/pkgs/by-name/ot/otel-tui/package.nix +++ b/pkgs/by-name/ot/otel-tui/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "otel-tui"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "ymtdzzz"; repo = "otel-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-+OvbBmFGyS5tpFtgn1DDxWp+LD5BAl9ojSIDGokfcRk="; + hash = "sha256-teTV4i27Xjf5E1/2C1e8HFf6Tkct2wgZZfu9SSM18II="; }; - vendorHash = "sha256-2cH4DYogEfVywynfpZk6XfaiZaNyzbsDiwGSwolREPQ="; + vendorHash = "sha256-5ki/hR809LmMEHV8Mb7n2nEETAZR2Qs29AW5vvSzuu4="; env.GOWORK = "off"; diff --git a/pkgs/by-name/ou/outline/package.nix b/pkgs/by-name/ou/outline/package.nix index 592ec0065733..b7889be1b65b 100644 --- a/pkgs/by-name/ou/outline/package.nix +++ b/pkgs/by-name/ou/outline/package.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-LHU3OQglvxLVemDKoDxeI7cGyuSnIUYoPV3aj/LR9XA="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/outline/outline/blob/main/package.json#L398 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; nativeBuildInputs = [ @@ -29,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: { ]; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-j1MGkIJGjXsoT9aOADRtdywRNI2k5hKeD3O20iUh0sA="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-yMHpM/1hQ/86MItCu8SP82CgF/ED97l6lVHF+Cf8h+U="; }; buildPhase = '' diff --git a/pkgs/by-name/ou/outline/yarn-4.14-support.patch b/pkgs/by-name/ou/outline/yarn-4.14-support.patch new file mode 100644 index 000000000000..6c50d24297b0 --- /dev/null +++ b/pkgs/by-name/ou/outline/yarn-4.14-support.patch @@ -0,0 +1,22 @@ +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -12,3 +12,8 @@ npmPreapprovedPackages: + npmAuditIgnoreAdvisories: + - "1113517" # GHSA-mw96-cpmx-2vgc rollup <2.80.0 path traversal (workbox-build, build-time) + - "1113686" # GHSA-5c6j-r48x-rmvq serialize-javascript RCE (@rollup/plugin-terser, build-time) ++ ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,7 +2,7 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + + "@antfu/install-pkg@npm:^1.1.0": diff --git a/pkgs/by-name/ow/ownserver/bump-metrics.patch b/pkgs/by-name/ow/ownserver/bump-metrics.patch new file mode 100644 index 000000000000..57a5f897315e --- /dev/null +++ b/pkgs/by-name/ow/ownserver/bump-metrics.patch @@ -0,0 +1,104 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -18,18 +18,6 @@ + checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + + [[package]] +-name = "ahash" +-version = "0.8.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +-dependencies = [ +- "cfg-if", +- "once_cell", +- "version_check", +- "zerocopy 0.7.35", +-] +- +-[[package]] + name = "aho-corasick" + version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1584,12 +1572,12 @@ + + [[package]] + name = "metrics" +-version = "0.24.1" ++version = "0.24.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3" ++checksum = "ff56c2e7dce6bd462e3b8919986a617027481b1dcc703175b58cf9dd98a2f071" + dependencies = [ +- "ahash", + "portable-atomic", ++ "rapidhash", + ] + + [[package]] +@@ -2126,7 +2114,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" + dependencies = [ +- "zerocopy 0.8.24", ++ "zerocopy", + ] + + [[package]] +@@ -2327,7 +2315,7 @@ + dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +- "zerocopy 0.8.24", ++ "zerocopy", + ] + + [[package]] +@@ -2378,6 +2366,15 @@ + ] + + [[package]] ++name = "rapidhash" ++version = "4.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59" ++dependencies = [ ++ "rustversion", ++] ++ ++[[package]] + name = "raw-cpuid" + version = "11.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -4242,31 +4239,11 @@ + + [[package]] + name = "zerocopy" +-version = "0.7.35" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +-dependencies = [ +- "zerocopy-derive 0.7.35", +-] +- +-[[package]] +-name = "zerocopy" + version = "0.8.24" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" + dependencies = [ +- "zerocopy-derive 0.8.24", +-] +- +-[[package]] +-name = "zerocopy-derive" +-version = "0.7.35" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn 2.0.100", ++ "zerocopy-derive", + ] + + [[package]] diff --git a/pkgs/by-name/ow/ownserver/package.nix b/pkgs/by-name/ow/ownserver/package.nix index 712076924a4a..4ee452b05dd2 100644 --- a/pkgs/by-name/ow/ownserver/package.nix +++ b/pkgs/by-name/ow/ownserver/package.nix @@ -18,7 +18,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-bseDssSMerBlzlCvL3rD3X6ku5qDRYvI1wxq2W7As5k="; }; - cargoHash = "sha256-SJm66CDrg6ZpIeKx27AnZAVs/Z25E/KmHYuZ9G4UwHQ="; + # Bump vendored `metrics` past 0.24.2 which fixes a borrow-checker error + # under newer rustc (https://github.com/rust-lang/rust/issues/141402). + cargoPatches = [ ./bump-metrics.patch ]; + + cargoHash = "sha256-EzuG3ev/6EqTGi0J0wppZz+cZJiH12WbBQLKOrTxTzs="; nativeBuildInputs = [ pkg-config @@ -29,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ]; + # `proxy_client::fetch_token_test` spins up a warp server during `cargo test`. + __darwinAllowLocalNetworking = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index 236ffc6b17cf..8e217fc9a977 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; - fetcherVersion = 2; - hash = "sha256-vcTdeNh5+hzqzB9PXpRBeY+aG9LjbtaEfRkDWxIsIIc="; + fetcherVersion = 3; + hash = "sha256-fomJmm0GXIClng63wql3hCo1Pf4CbVUiEtbvAv9DPIo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index c89a8f2caba1..b0d806ba2f23 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -23,25 +23,25 @@ # runs without an external linter, which leaves `jsPlugins` configs inert. stdenv.mkDerivation (finalAttrs: { pname = "oxlint"; - version = "1.62.0"; + version = "1.63.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-BsfLVHGSyje1GAEaRfe4qmv6lcOiJjTmnd0L8/xIp24="; + hash = "sha256-nB9Z5GACDfmP+y3bGjNB8KKlOWV+kBCq56i7FLekyss="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-9DBME09qjjfypmj09Zuc8NdVTWC5/kAU83YAb+TeCPY="; + hash = "sha256-1TsKLbReN7zvH5RnbmszPbj2/40jySgFgADcFKjn87s="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-rgrwA8xZcEkxoFofHBz+AbGXLLCcihPb3435HAaphHs="; + hash = "sha256-ws46dHtlaVbTRlOx4xx6gcB+ySKCc+e0K8ZUmCAJ2wY="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix index 3ed251572bca..5e97421da8c4 100644 --- a/pkgs/by-name/p3/p3x-onenote/package.nix +++ b/pkgs/by-name/p3/p3x-onenote/package.nix @@ -8,23 +8,18 @@ let pname = "p3x-onenote"; - version = "2025.10.111"; + onenote = lib.importJSON ./sources.json; + + version = onenote.version; plat = { aarch64-linux = "-arm64"; - armv7l-linux = "-armv7l"; x86_64-linux = ""; } .${stdenv.hostPlatform.system}; - hash = - { - aarch64-linux = "sha256-sfnRzY+1flUdIM1ey9u00j9eiDa4u5bY/f3fupV+FKM="; - armv7l-linux = "sha256-ZnFSJE1VmvqSKZHBsMtvBbypsbY35z9X5T4bYT0DytU="; - x86_64-linux = "sha256-lgZjVVBWPloqMWX0oryNB0lxgmJCBqC7pp0AjeUMjQM="; - } - .${stdenv.hostPlatform.system}; + hash = onenote.hash.${stdenv.hostPlatform.system}; src = fetchurl { url = "https://github.com/patrikx3/onenote/releases/download/v${version}/P3X-OneNote-${version}${plat}.AppImage"; @@ -50,6 +45,8 @@ appimageTools.wrapType2 { --delete-original $out/p3x-onenote.desktop ''; + passthru.updateScript = ./update.sh; + meta = { homepage = "https://github.com/patrikx3/onenote"; description = "Linux Electron Onenote - A Linux compatible version of OneNote"; @@ -58,7 +55,6 @@ appimageTools.wrapType2 { platforms = [ "x86_64-linux" "aarch64-linux" - "armv7l-linux" ]; mainProgram = "p3x-onenote"; }; diff --git a/pkgs/by-name/p3/p3x-onenote/sources.json b/pkgs/by-name/p3/p3x-onenote/sources.json new file mode 100644 index 000000000000..3f100bd4af7a --- /dev/null +++ b/pkgs/by-name/p3/p3x-onenote/sources.json @@ -0,0 +1,7 @@ +{ + "version": "2026.4.132", + "hash": { + "x86_64-linux": "sha256-RUauH8F7D1K2Oq85nsLaGuPpZ1+T5lLcmHuFNUpVBGw=", + "aarch64-linux": "sha256-N6swIn2L8AZKEpZakpESzuOhcONaJ757BcxzeIaecgg=" + } +} diff --git a/pkgs/by-name/p3/p3x-onenote/update.sh b/pkgs/by-name/p3/p3x-onenote/update.sh new file mode 100755 index 000000000000..41ea564e1a5e --- /dev/null +++ b/pkgs/by-name/p3/p3x-onenote/update.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix + +set -euo pipefail + +SCRIPT_DIR="$(dirname "$0")" + +latest_version() { + curl -s "https://api.github.com/repos/patrikx3/onenote/releases/latest" | jq -r '.tag_name | sub("^v"; "")' +} + +fetch_sri() { + local version=$1 + local plat=$2 + local system=$3 + local hashi + + hash=$(nix-prefetch-url https://github.com/patrikx3/onenote/releases/download/v${version}/P3X-OneNote-${version}${plat}.AppImage) + error=$? + + if [ $error -gt 0 ]; then + echo "ERROR $error Fetching $version for $system" >&2 + return $error + fi + + nix hash convert --hash-algo sha256 --to sri $hash --extra-experimental-features nix-command +} + +system_plat() { + case "$1" in + x86_64-linux) echo "" ;; + aarch64-linux) echo "-arm64" ;; + *) echo "BAD SYSTEM: $1" >&2; exit 2 ;; + esac +} + +generate_json() { + local version="$1" + local systems=("x86_64-linux" "aarch64-linux") + + echo "{" + echo " \"version\": \"${version}\"," + echo " \"hash\": {" + + local first=1 + for system in "${systems[@]}"; do + local plat + plat=$(system_plat "$system") + + local sri + sri=$(fetch_sri "$version" "$plat" "$system") + + # JSON comma handling + if [ $first -eq 0 ]; then + echo "," + fi + first=0 + + echo -n " \"${system}\": \"${sri}\"" + done + + echo "" + echo " }" + echo "}" +} + +if [ -z "${VERSION:-}" ]; then + echo "VERSION not set, fetching latest release…" >&2 + VERSION="$(latest_version)" +fi + +echo "p3x-onenote: v$VERSION" +JSON=$(generate_json "$VERSION") +echo "$JSON" > "$SCRIPT_DIR/sources.json" + +cat "$SCRIPT_DIR/sources.json" diff --git a/pkgs/by-name/pa/pa-notify/package.nix b/pkgs/by-name/pa/pa-notify/package.nix index 1ec4996f8bfd..c996fd76530c 100644 --- a/pkgs/by-name/pa/pa-notify/package.nix +++ b/pkgs/by-name/pa/pa-notify/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, glib, libnotify, libpulseaudio, @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config ]; diff --git a/pkgs/by-name/pa/packetdrill/package.nix b/pkgs/by-name/pa/packetdrill/package.nix index 4b414c467211..a68e0ef0e6c1 100644 --- a/pkgs/by-name/pa/packetdrill/package.nix +++ b/pkgs/by-name/pa/packetdrill/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bison, flex, cmake, @@ -10,33 +9,19 @@ }: stdenv.mkDerivation { pname = "packetdrill"; - version = "unstable-2020-08-22"; + version = "2.0-unstable-2026-04-29"; src = fetchFromGitHub { owner = "google"; repo = "packetdrill"; - rev = "68a34fa73cf221e5f52d6fa4f203bcd93062be1b"; - sha256 = "0djkwb6l2959f44d98vwb092rghf0qmii8391vrpxqb99j6pv4h6"; + rev = "faa0dfb54065118625e169d3111ce09c65b20229"; + hash = "sha256-+9qfNT2veOsShj9JvLiBm7i842zFhUiPmrt8QA/ZuKs="; }; - patches = [ - # Upstream fix for -fno-common toolchains - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/google/packetdrill/commit/c08292838de81a71ee477d5bf9d95b1130a1292b.patch"; - sha256 = "1irbar1zkydmgqb12r3xd80dwj2jfxnxayxpb4nmbma8xm7knb10"; - stripLen = 3; - }) - ]; setSourceRoot = '' export sourceRoot=$(realpath */gtests/net/packetdrill) ''; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=unused-result" - "-Wno-error=stringop-truncation" - "-Wno-error=address-of-packed-member" - ]; nativeBuildInputs = [ bison flex diff --git a/pkgs/by-name/pa/paisa/package.nix b/pkgs/by-name/pa/paisa/package.nix index 0d5433b363be..a5379f97e915 100644 --- a/pkgs/by-name/pa/paisa/package.nix +++ b/pkgs/by-name/pa/paisa/package.nix @@ -4,7 +4,7 @@ buildGoModule, buildNpmPackage, fetchFromGitHub, - nodejs_20, + nodejs_22, versionCheckHook, node-gyp, python3, @@ -20,10 +20,7 @@ }: let - # paisa docker builds with nodejs 22, but we need node 20 so we can build - # node-canvas from source (which currently fails with nodejs 22 due to some - # deprecations in the v8 javascript engine and nan c++ - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_20; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_22; }; in buildGoModule (finalAttrs: { pname = "paisa"; @@ -45,6 +42,12 @@ buildGoModule (finalAttrs: { npmDepsHash = "sha256-86LvGTSs2PaxrYMGaU7yOUGiAMZY1MfFIexpYVNwvZ8="; + # canvas fails to build with Node 22 (upstream nan/V8 incompatibility). + # It is only used client-side via pdf-js, so the native binding is never + # loaded. Other install scripts in this tree are no-ops or re-run during + # `vite build`. See Automattic/node-canvas#2448. + npmFlags = [ "--ignore-scripts" ]; + buildInputs = [ # needed for building node-canvas from source which is a dependency of # pdfjs @@ -92,11 +95,6 @@ buildGoModule (finalAttrs: { }; meta = { - # package is marked as broken on darwin, because due to upgrades to the - # darwin clang compiler the native node-addon-api cannot be built anymore. - # this can only be fixed by upstream upgrading dependencies (especially - # node-gyp and node-addon-api). - broken = stdenv.isDarwin; homepage = "https://paisa.fyi/"; changelog = "https://github.com/ananthakumaran/paisa/releases/tag/v${finalAttrs.version}"; description = "Personal finance manager, building on top of the ledger double entry accounting tool"; diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix index 087da6b185ee..331835719e4e 100644 --- a/pkgs/by-name/pa/pangolin-cli/package.nix +++ b/pkgs/by-name/pa/pangolin-cli/package.nix @@ -10,20 +10,20 @@ buildGoModule (finalAttrs: { pname = "pangolin-cli"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "cli"; tag = finalAttrs.version; - hash = "sha256-0G5HsAa9I0ilPQ92qQIuYssfGvoZhLrF3kyO1+0JqEQ="; + hash = "sha256-3p2yazDYKORVanPOQNY0XDhj1RbvBcFztKa7oosFW98="; }; ldflags = [ "-X github.com/fosrl/cli/internal/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-FCIp0VLmRO6TUPRDNd3Zl/CULwy00D8F4YTo/oQge+s="; + vendorHash = "sha256-J6dILAwneeUL/+c6505F24xjg6Nus8t4L3vUAMbaeHM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 2ff6ad636a4a..1991beab067c 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -80,8 +80,8 @@ let pnpmDeps = fetchPnpmDeps { inherit pnpm; inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-pG7olcBq5P52CvZYLqUjb+RwxjbQbSotlS50pvgm7WQ="; + fetcherVersion = 3; + hash = "sha256-HO+IDNB3NXWgvV0cvZ5zx46JuXv6Tgroz+YfVump5MA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix index 09d47a182a21..dfe02f4359f5 100644 --- a/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix +++ b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix @@ -7,7 +7,7 @@ gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme papirus-icon-theme hicolor-icon-theme diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 974703db4286..df8f52c95f5d 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -5,7 +5,7 @@ cmake, cubeb, curl, - extra-cmake-modules, + kdePackages, ffmpeg, gtk3, libxrandr, @@ -75,7 +75,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config strip-nondeterminism wrapGAppsHook3 @@ -84,6 +84,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + kdePackages.extra-cmake-modules curl ffmpeg gtk3 diff --git a/pkgs/by-name/pd/pdf-oxide/package.nix b/pkgs/by-name/pd/pdf-oxide/package.nix index de648b91deb4..70cae989b2c4 100644 --- a/pkgs/by-name/pd/pdf-oxide/package.nix +++ b/pkgs/by-name/pd/pdf-oxide/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pdf-oxide"; - version = "0.3.38"; + version = "0.3.43"; src = fetchFromGitHub { owner = "yfedoseev"; repo = "pdf_oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-kvV8SzW+2vQ86o/c9vV71O9quqQ2LVvBBvTdTwAG5wY="; + hash = "sha256-pIB6x50yIBLsOlKdU9zjeS/71KR0vNc7tmu2QTEn4JA="; }; - cargoHash = "sha256-Z5nNxCrf2QEUA5XCXp5aG59UnznvdS9jjQb57R8gxHs="; + cargoHash = "sha256-3Wk5TYZDoCkzR+S186t39oMT9SfubmGXcDuucwIiaac="; __structuredAttrs = true; cargoBuildFlags = [ diff --git a/pkgs/by-name/pd/pdfrip/Cargo.lock b/pkgs/by-name/pd/pdfrip/Cargo.lock deleted file mode 100644 index 58c91b5a09d2..000000000000 --- a/pkgs/by-name/pd/pdfrip/Cargo.lock +++ /dev/null @@ -1,1028 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bytecount" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "4.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12ed66a79a555082f595f7eb980d08669de95009dd4b3d61168c573ebe38fc9" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4645eab3431e5a8403a96bea02506a8b35d28cd0f0330977dd5d22f9c84f43" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "datasize" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65c07d59e45d77a8bda53458c24a828893a99ac6cdd9c84111e09176ab739a2" -dependencies = [ - "datasize_derive", -] - -[[package]] -name = "datasize_derive" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613e4ee15899913285b7612004bbd490abd605be7b11d35afada5902fb6b91d5" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "deflate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" -dependencies = [ - "adler32", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "env_logger" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fax" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cec1797683c06c2f3de5edb3fde4d99c70e96f3204f6aaff944078353e5c55" -dependencies = [ - "fax_derive", -] - -[[package]] -name = "fax_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1d7ffc9f2dc8316348c75281a99c8fdc60c1ddf4f82a366d117bf1b74d5a39" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "globalcache" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd40efe5b4f0021ca3c36a140cb365563be3c579653b573a5a8ac69bd6f9028" -dependencies = [ - "async-trait", - "tuple", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "inflate" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" -dependencies = [ - "adler32", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "istring" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875cc6fb9aecbc1a9bd736f2d18b12e0756b4c80c5e35e28262154abcb077a39" -dependencies = [ - "datasize", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "pdf" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e375ec076445f61d4dbc4636e9e788f841d279c65d6fea8a3875caddd4f2dd82" -dependencies = [ - "aes", - "bitflags 1.3.2", - "cbc", - "datasize", - "deflate", - "fax", - "globalcache", - "inflate", - "istring", - "itertools", - "jpeg-decoder", - "log", - "md5", - "once_cell", - "pdf_derive", - "sha2", - "snafu", - "stringprep", - "weezl", -] - -[[package]] -name = "pdf_derive" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4007262775d0798de87b15cbc64cf1aed5f7ee87eec847e297b69d8ed4b4f8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pdfrip" -version = "2.0.1" -dependencies = [ - "anyhow", - "bytecount", - "clap", - "colored", - "crossbeam", - "indicatif", - "log", - "pdf", - "pretty_env_logger", -] - -[[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - -[[package]] -name = "proc-macro2" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "serde" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tuple" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb9f6bd73479481158ba8ee3edf17aca93354623d13f02e96a2014fdbc1c37e" -dependencies = [ - "num-traits", - "serde", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" diff --git a/pkgs/by-name/pd/pdfrip/package.nix b/pkgs/by-name/pd/pdfrip/package.nix index 7f0f7e3b5fef..a42cee24d8de 100644 --- a/pkgs/by-name/pd/pdfrip/package.nix +++ b/pkgs/by-name/pd/pdfrip/package.nix @@ -6,22 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pdfrip"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "mufeedvh"; repo = "pdfrip"; tag = "v${finalAttrs.version}"; - hash = "sha256-9KDWd71MJ2W9Xp3uqp0iZMmkBwIay+L4gnPUt7hylS0="; + hash = "sha256-VytsSVcKx1/A9BSlmRdkD61txDvFOaSfG411565q9eY="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-JKZ29fW/B4rJe6g6VKkgZdxlA2eaaAgjztFQ/5kDF1o="; meta = { description = "PDF password cracking utility"; diff --git a/pkgs/by-name/pe/peacock/package.nix b/pkgs/by-name/pe/peacock/package.nix index b2ffe06fce40..e74931c727bd 100644 --- a/pkgs/by-name/pe/peacock/package.nix +++ b/pkgs/by-name/pe/peacock/package.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kDR2ObXzo8UudjfqU/lQl6dqblFhIEgnr20EKjiWKVw="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/thepeacockproject/Peacock/blob/master/package.json#L109 + ./yarn-4.14-support.patch + ]; + nativeBuildInputs = [ nodejs yarn-berry.yarnBerryConfigHook @@ -75,8 +81,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-Ecpls4iGBVqSLm/4kyY0EsRa6NINodHc05DtwOfZYG4="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-DgkmBd9/voLLxIo1R7MNknFmH62RUYrG0MeV074ZX7U="; }; meta = { diff --git a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch new file mode 100644 index 000000000000..1885f6de9f13 --- /dev/null +++ b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -14,4 +14,7 @@ plugins: + - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs + spec: "https://mskelton.dev/yarn-outdated/v2" + +-yarnPath: .yarn/releases/yarn-4.7.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix index 6be7ed05d005..d908de56244e 100644 --- a/pkgs/by-name/pe/pear-desktop/package.nix +++ b/pkgs/by-name/pe/pear-desktop/package.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10_29_2; - fetcherVersion = 2; - hash = "sha256-xZQ8rnLGD0ZxxUUPLHmNJ6mA+lnUHCTBvtJTiIPxaZU="; + fetcherVersion = 3; + hash = "sha256-BHxieFMMUFbHJHWu8spz0z803kx+kwJ99oYkDpm6a58="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index 7399c0ef32cb..eb1285cc4242 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -14,20 +14,20 @@ which, # runtime - nodejs_20, + nodejs_24, # tests nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "peertube"; - version = "8.0.2"; + version = "8.1.5"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; tag = "v${finalAttrs.version}"; - hash = "sha256-u4LDk9r88h3EqX6ZRMPCQmjOvfJDXwV2YYrKEkGBWgs="; + hash = "sha256-vLKjTn8tdHb/DUHj/w3ovXmRNzD8CMSKCaPleW+i7Tc="; }; outputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-1CmfcDZ23oITP8GQGIBeZP4Z5AON0f3CtdHGnpZxHgQ="; + hash = "sha256-gvjk4OmKR6W/nllUCSaiX/lVXJSac9r04xr7fNiBftI="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - nodejs_20 + nodejs_24 ]; preBuild = '' @@ -79,11 +79,11 @@ stdenv.mkDerivation (finalAttrs: { # Build PeerTube cli npm run build:peertube-cli - patchShebangs ~/apps/peertube-cli/dist/peertube.js + patchShebangs ~/apps/peertube-cli/dist/peertube.mjs # Build PeerTube runner npm run build:peertube-runner - patchShebangs ~/apps/peertube-runner/dist/peertube-runner.js + patchShebangs ~/apps/peertube-runner/dist/peertube-runner.mjs # Clean up declaration files find \ @@ -130,11 +130,11 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $cli/bin mv ~/apps/peertube-cli/{dist,node_modules,package.json} $cli - ln -s $cli/dist/peertube.js $cli/bin/peertube-cli + ln -s $cli/dist/peertube.mjs $cli/bin/peertube-cli mkdir -p $runner/bin mv ~/apps/peertube-runner/{dist,node_modules,package.json} $runner - ln -s $runner/dist/peertube-runner.js $runner/bin/peertube-runner + ln -s $runner/dist/peertube-runner.mjs $runner/bin/peertube-runner # Create static gzip and brotli files fd -e css -e eot -e html -e js -e json -e svg -e webmanifest -e xlf \ @@ -145,7 +145,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests.peertube = nixosTests.peertube; + passthru = { + nodejs = nodejs_24; + tests.peertube = nixosTests.peertube; + }; meta = { description = "Free software to take back control of your videos"; diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix index f54e0664e8ca..5c15cf400ab3 100644 --- a/pkgs/by-name/pg/pgadmin4/package.nix +++ b/pkgs/by-name/pg/pgadmin4/package.nix @@ -9,13 +9,14 @@ yarn-berry_4, nodejs, stdenv, + pkgsBuildHost, server-mode ? true, }: let pname = "pgadmin"; version = "9.14"; - yarnHash = "sha256-j/5qoCrhC7xBPaS6NhZFFQtJ7ThL/wkFXoCtyreLHco="; + yarnHash = "sha256-mJa5L8N40JWogQ8/LllSdX/uJHMzKULCow9+e5gFe/A="; src = fetchFromGitHub { owner = "pgadmin-org"; @@ -24,6 +25,9 @@ let hash = "sha256-NQe1ZN8jQEJE5qSpL5MjgLwWLGrGXCIHaCd8zLpsx3s="; }; + # Remove after https://github.com/pgadmin-org/pgadmin4/commit/79e490c5fa6031af7baa83f04f751bdc790dc408 is released + yarnPatch = ./yarn-4.14-support.patch; + # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier pythonPackages = python3.pkgs.overrideScope (final: prev: { }); @@ -49,6 +53,7 @@ pythonPackages.buildPythonApplication rec { inherit missingHashes; src = src + "/web"; hash = yarnHash; + patches = [ yarnPatch ]; }; # from Dockerfile @@ -61,6 +66,7 @@ pythonPackages.buildPythonApplication rec { ./expose-setup.py.patch # check for permission of /etc/pgadmin/config_system and don't fail ./check-system-config-dir.patch + ]; postPatch = '' @@ -109,8 +115,10 @@ pythonPackages.buildPythonApplication rec { echo Building the web frontend... cd web ( - export LD=$CC # https://github.com/imagemin/optipng-bin/issues/108 - yarnBerryConfigHook + PATH=$PATH:${lib.makeBinPath [ pkgsBuildHost.git ]} + git apply ${yarnPatch} + export LD=$CC # https://github.com/imagemin/optipng-bin/issues/108 + yarnBerryConfigHook ) yarn webpacker cp -r * ../pip-build/pgadmin4 diff --git a/pkgs/by-name/pg/pgadmin4/yarn-4.14-support.patch b/pkgs/by-name/pg/pgadmin4/yarn-4.14-support.patch new file mode 100644 index 000000000000..62b859642205 --- /dev/null +++ b/pkgs/by-name/pg/pgadmin4/yarn-4.14-support.patch @@ -0,0 +1,25 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,5 +1,10 @@ ++approvedGitRepositories: ++ - "**" ++ + checksumBehavior: update + ++enableScripts: true ++ + logFilters: + - code: YN0013 + level: discard +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/pg/pgcenter/package.nix b/pkgs/by-name/pg/pgcenter/package.nix index 32c3ef8454f7..16d718c020c1 100644 --- a/pkgs/by-name/pg/pgcenter/package.nix +++ b/pkgs/by-name/pg/pgcenter/package.nix @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { doCheck = false; meta = { - homepage = "https://pgcenter.org/"; + homepage = "https://github.com/lesovsky/pgcenter"; changelog = "https://github.com/lesovsky/pgcenter/raw/v${finalAttrs.version}/doc/Changelog"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix index ab9d06f47d11..e8ac7a04be46 100644 --- a/pkgs/by-name/pg/pgsql-tools/package.nix +++ b/pkgs/by-name/pg/pgsql-tools/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt-legacy (lib.getLib stdenv.cc.cc) ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r _internal $out/lib/pgsql-tools/ makeBinaryWrapper $out/lib/pgsql-tools/ossdbtoolsservice_main $out/bin/ossdbtoolsservice_main \ - ${lib.optionalString stdenv.isLinux ''--prefix LD_LIBRARY_PATH : "${ + ${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ libxcrypt-legacy (lib.getLib stdenv.cc.cc) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 1d2b4e70e8d2..b9565e076212 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, cmake, - extra-cmake-modules, + kdePackages, exiv2, graphicsmagick, libarchive, @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules qt6.qttools qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ph/phylophlan/package.nix b/pkgs/by-name/ph/phylophlan/package.nix index 78b307e46972..729c93d9fcbf 100644 --- a/pkgs/by-name/ph/phylophlan/package.nix +++ b/pkgs/by-name/ph/phylophlan/package.nix @@ -8,60 +8,63 @@ diamond, python3Packages, }: -let - finalAttrs = { - pname = "phylophlan"; - version = "3.2.1"; - pyproject = true; - src = fetchFromGitHub { - owner = "biobakery"; - repo = "phylophlan"; - tag = finalAttrs.version; - hash = "sha256-rPTEdu0W3LD27tDIWCOQ3K+RJuj97I9aEeYFdM77jOs="; - }; +python3Packages.buildPythonApplication (finalAttrs: { + pname = "phylophlan"; + version = "3.2.1"; + pyproject = true; - build-system = with python3Packages; [ setuptools ]; + src = fetchFromGitHub { + owner = "biobakery"; + repo = "phylophlan"; + tag = finalAttrs.version; + hash = "sha256-rPTEdu0W3LD27tDIWCOQ3K+RJuj97I9aEeYFdM77jOs="; + }; - # It has no tests - doCheck = false; + build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ - biopython - dendropy - matplotlib - numpy - pandas - seaborn - distutils - requests - scipy - tqdm - ]; + # It has no tests + doCheck = false; + dependencies = with python3Packages; [ + biopython + dendropy + matplotlib + numpy + pandas + seaborn + distutils + requests + scipy + tqdm + ]; + + preFixup = '' # Minimum needed external tools # See https://github.com/biobakery/phylophlan/wiki#dependencies - propagatedBuildInputs = [ - raxml - mafft - trimal - blast - diamond - ]; + makeWrapperArgs+=(--prefix PATH : ${ + lib.makeBinPath [ + raxml + mafft + trimal + blast + diamond + ] + } + ) + ''; - postInstall = '' - # Not revelant in this context - rm -f $out/bin/phylophlan_write_default_configs.sh - ''; + postInstall = '' + # Not revelant in this context + rm -f $out/bin/phylophlan_write_default_configs.sh + ''; - meta = { - homepage = "https://github.com/biobakery/phylophlan"; - description = "Precise phylogenetic analysis of microbial isolates and genomes from metagenomes"; - changelog = "https://github.com/biobakery/phylophlan/releases"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ theobori ]; - mainProgram = "phylophlan"; - }; + meta = { + homepage = "https://github.com/biobakery/phylophlan"; + description = "Precise phylogenetic analysis of microbial isolates and genomes from metagenomes"; + changelog = "https://github.com/biobakery/phylophlan/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "phylophlan"; }; -in -python3Packages.buildPythonApplication finalAttrs +}) diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index e61574f72bc7..7a1374f3f89a 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -81,7 +81,7 @@ buildNpmPackage (finalAttrs: { meta = { description = "Coding agent CLI with read, bash, edit, write tools and session management"; - homepage = "https://shittycodingagent.ai/"; + homepage = "https://pi.dev/"; 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; diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix index 8cc21edf6fda..f33a2e2200d7 100644 --- a/pkgs/by-name/pi/pihole-ftl/package.nix +++ b/pkgs/by-name/pi/pihole-ftl/package.nix @@ -5,7 +5,7 @@ lib, libidn2, libunistring, - mbedtls, + mbedtls_4, ncurses, nettle, nix-update-script, @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pihole-ftl"; - version = "6.4.1"; + version = "6.6.1"; src = fetchFromGitHub { owner = "pi-hole"; repo = "FTL"; tag = "v${finalAttrs.version}"; - hash = "sha256-OpbBd+HS/gwcWNe/6VB3glout1sifJ8o5EnKuXfyZ/o="; + hash = "sha256-UMLTym9LSx8rlWKkFtHGtSEM0Stdpkfkz/7Iy/05jf8="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { gmp libidn2 libunistring - mbedtls + mbedtls_4 ncurses nettle readline diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json index f4d5cc104b57..81ee95e55a6f 100644 --- a/pkgs/by-name/pi/piliplus/git-hashes.json +++ b/pkgs/by-name/pi/piliplus/git-hashes.json @@ -3,7 +3,6 @@ "chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=", "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=", "extended_nested_scroll_view": "sha256-ocjIy7gpCikoqRMqY4oGw/p9YaQ2v2clhon2pIzTXk4=", - "file_picker": "sha256-4zwyrsyXb6KnCzSRGBLgypH79ifKVji8Y8lIb5AIc58=", "floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=", "flutter_smart_dialog": "sha256-sehrQraEWmYvUd9pdG4l3edbtR4yTcJOqPbuhzIrih4=", "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=", @@ -16,7 +15,9 @@ "media_kit_libs_windows_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", "media_kit_native_event_loop": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", "media_kit_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", - "native_device_orientation": "sha256-MCgN6HXCeONLrDAOt27Ve8kUvIrOfFRbfJtX8p92Txk=", + "native_device_orientation": "sha256-8abnUV7ZTAo0DAjekf353ey6xFvxfilTfbQOUWIahtk=", + "screen_brightness_android": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=", + "screen_brightness_platform_interface": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=", "super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=", "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=", "window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo=" diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix index 7ba91e42e2a3..2b100ce4b535 100644 --- a/pkgs/by-name/pi/piliplus/package.nix +++ b/pkgs/by-name/pi/piliplus/package.nix @@ -14,7 +14,7 @@ let srcInfo = lib.importJSON ./src-info.json; description = "Third-party Bilibili client developed in Flutter"; - version = "2.0.6"; + version = "2.0.7"; in flutter341.buildFlutterApplication { pname = "piliplus"; diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json index b9741f7494dd..cd591fe1d4d2 100644 --- a/pkgs/by-name/pi/piliplus/pubspec.lock.json +++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json @@ -244,11 +244,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af", + "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.5" + "version": "8.12.6" }, "cached_network_image": { "dependency": "direct main", @@ -487,21 +487,21 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd", + "sha256": "6a642e1daa10190af89ba6cb6386c0df7d071a3592080bfe1e44faa63ae1df65", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.4.0" + "version": "13.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", + "sha256": "04b173a92e2d9161dfead145667037c8d834db725ce2e7b942bfe18fd2f45a46", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.3" + "version": "8.1.0" }, "dio": { "dependency": "direct main", @@ -634,6 +634,16 @@ "source": "hosted", "version": "2.2.0" }, + "ffi_leak_tracker": { + "dependency": "transitive", + "description": { + "name": "ffi_leak_tracker", + "sha256": "4093d4ef9ca06ffe2786e73bfb25e22aa92112b9bb4ec941f11e3e6b61489a97", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, "file": { "dependency": "transitive", "description": { @@ -647,13 +657,12 @@ "file_picker": { "dependency": "direct main", "description": { - "path": ".", - "ref": "mod", - "resolved-ref": "d1dde80df07a6ec46d9291cfeba6c01de53b5305", - "url": "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git" + "name": "file_picker", + "sha256": "1d4afa261268e59863af47b9f9dd9a230502d4c702b9d9183353646fe6d5b6e1", + "url": "https://pub.dev" }, - "source": "git", - "version": "11.0.2" + "source": "hosted", + "version": "12.0.0-beta.1" }, "file_selector_linux": { "dependency": "transitive", @@ -1556,7 +1565,7 @@ "description": { "path": ".", "ref": "master", - "resolved-ref": "731bb77e39cca77065c86ece38902d35f5d653d2", + "resolved-ref": "a987a459f17af0002397e49800ba4f68912b375c", "url": "https://github.com/bggRGjQaUbCoE/flutter_native_device_orientation.git" }, "source": "git", @@ -1616,21 +1625,21 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20", + "sha256": "4bf625947f6c7713ee242296a682e23e44823c09cf9d79e4f1238923c92db852", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.1" + "version": "10.1.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "sha256": "db762cb2f4f25ee60fb6359773861b0f199e00b90d237bd85a76a1e806b46ef4", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "4.1.0" }, "path": { "dependency": "direct main", @@ -1905,11 +1914,12 @@ "screen_brightness_android": { "dependency": "direct overridden", "description": { - "name": "screen_brightness_android", - "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96", - "url": "https://pub.dev" + "path": "screen_brightness_android", + "ref": "dev", + "resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9", + "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git" }, - "source": "hosted", + "source": "git", "version": "2.1.3" }, "screen_brightness_ios": { @@ -1925,11 +1935,12 @@ "screen_brightness_platform_interface": { "dependency": "direct main", "description": { - "name": "screen_brightness_platform_interface", - "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c", - "url": "https://pub.dev" + "path": "screen_brightness_platform_interface", + "ref": "dev", + "resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9", + "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git" }, - "source": "hosted", + "source": "git", "version": "2.1.0" }, "screen_retriever": { @@ -1996,21 +2007,21 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa", + "sha256": "a857d8b1479250aff6b57a51b2c02d31ca05848d441817c43f1640c885c286c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.2" + "version": "13.1.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a", + "sha256": "7f7ae28cf400d13f811e297ff37742dba83b79e0a6f5dce14eec0248274e6ce9", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.1.0" }, "shared_preferences": { "dependency": "transitive", @@ -2463,11 +2474,11 @@ "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1", + "sha256": "2b09acadd7a2862d33c3577e77e7a2aabb684f47ccca1711f1413bd7307a6a72", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.2" + "version": "1.6.0" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -2544,21 +2555,21 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "sha256": "ba7d5750e3441caa1bbe31d9e516348fcf8dfcb32aa29ef87a844a59f4d1f1d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.15.0" + "version": "6.1.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", + "sha256": "73b1d78920a9d6e03f8b4e43e612b87bf3152a0e5c5e5150267762b7c4116904", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "3.0.3" }, "window_manager": { "dependency": "direct main", @@ -2604,6 +2615,6 @@ }, "sdks": { "dart": ">=3.11.0 <4.0.0", - "flutter": "3.41.6" + "flutter": "3.41.9" } } diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json index b08a6a6c28bb..b9bda4a36985 100644 --- a/pkgs/by-name/pi/piliplus/src-info.json +++ b/pkgs/by-name/pi/piliplus/src-info.json @@ -1,6 +1,6 @@ { - "rev": "7b6d8bef994c5a50c2b476978e739dee651129df", - "revCount": 4915, - "commitDate": 1777542771, - "hash": "sha256-jKF0FTTmq5xRB607iya3PtsgRFl73uXiuDA2oSGNbfs=" + "rev": "b7b40c557e708ace77ed65098005193eb89b8208", + "revCount": 4940, + "commitDate": 1777948879, + "hash": "sha256-E0ezM87Ecw54XD/MccPhRjg4iQ8LJRewQKbH/bPV9MI=" } diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 368ac7efd747..1ab6568aab57 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -47,7 +47,7 @@ buildDotnetModule rec { glib libadwaita ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Transitive dylib deps that Pinta's NativeImportResolver dlopen's by bare name. # These are not pulled in by wrapGAppsHook4's LD_LIBRARY_PATH on Darwin, so symlink is needed. graphene @@ -73,7 +73,7 @@ buildDotnetModule rec { projectFile = "Pinta"; - env = lib.optionalAttrs (!stdenv.isDarwin) { + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }; @@ -93,7 +93,7 @@ buildDotnetModule rec { mkdir -p "$out/share/icons" cp -r "$out/lib/Pinta/icons/." "$out/share/icons/" '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' dotnet build installer/linux/install.proj \ -target:Install \ -p:ContinuousIntegrationBuild=true \ @@ -102,7 +102,7 @@ buildDotnetModule rec { -p:PublishDir="$out/lib/Pinta" \ -p:InstallPrefix="$out" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Symlink all dylibs from runtimeDeps into the assembly dir. # GirCore and Pinta's own NativeImportResolver both search here by bare name. for dir in ${lib.concatMapStringsSep " " (d: "${lib.getLib d}/lib") runtimeDeps}; do diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix index 11e5008e6600..26a3e1a0f173 100644 --- a/pkgs/by-name/pi/pipe-rename/package.nix +++ b/pkgs/by-name/pi/pipe-rename/package.nix @@ -3,18 +3,21 @@ rustPlatform, fetchCrate, python3, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pipe-rename"; - version = "1.6.6"; + version = "1.6.7"; src = fetchCrate { - inherit (finalAttrs) pname version; - hash = "sha256-eZldAhqmoIkNZaI6r31hI43KCPDDeWk3fKpY3/BaUQE="; + pname = "pipe-rename"; + inherit (finalAttrs) version; + hash = "sha256-9Pub+OCN+PiKHfCxflwkHp6JNSB8AqAtKsNTlAsANbA="; }; - cargoHash = "sha256-9xOL8qtUha4dL7V+GC8TnPGjBprKADqzIwOqqMyPB5A="; + cargoHash = "sha256-oYJNiUIi/uYxzd9DfgBgEaEy3g32r44seI56ur9UMcc="; nativeCheckInputs = [ python3 ]; @@ -28,11 +31,17 @@ rustPlatform.buildRustPackage (finalAttrs: { patchShebangs tests/editors/env-editor.py ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Rename your files using your favorite text editor"; homepage = "https://github.com/marcusbuffett/pipe-rename"; + changelog = "https://github.com/marcusbuffett/pipe-rename/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "renamer"; }; }) diff --git a/pkgs/by-name/pi/pipecontrol/package.nix b/pkgs/by-name/pi/pipecontrol/package.nix deleted file mode 100644 index 7dbdf94f9fd3..000000000000 --- a/pkgs/by-name/pi/pipecontrol/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pipewire, - cmake, - extra-cmake-modules, - libsForQt5, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pipecontrol"; - version = "0.2.12"; - - src = fetchFromGitHub { - owner = "portaloffreedom"; - repo = "pipecontrol"; - tag = "v${finalAttrs.version}"; - hash = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook - libsForQt5.qttools - ]; - - buildInputs = [ - pipewire - ] - ++ (with libsForQt5; [ - qtbase - kirigami2 - kcoreaddons - ki18n - qtquickcontrols2 - ]); - - meta = { - description = "Pipewire control GUI program in Qt (Kirigami2)"; - mainProgram = "pipecontrol"; - homepage = "https://github.com/portaloffreedom/pipecontrol"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ tilcreator ]; - }; -}) diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index 12b2b89a0220..a09ef1f3ff0f 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -32,18 +32,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "pipeline"; - version = "3.3.1"; + version = "4.0.2"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "pipeline"; tag = finalAttrs.version; - hash = "sha256-je3WZdx+4iaemPubZgGTVBX+Tsw6tcG/9hy8hCZneXk="; + hash = "sha256-JdAixbzq6cpnT5bxBxm1tnFnH9hhgSzULm+0hiH6bnw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version; - hash = "sha256-jyTHMbb0mH35hvIi0EyotrVaBhj0BVIRK4kP2s5xVvc="; + hash = "sha256-7DNhJ1qNP0uUrPXRc3BCWHst2uX4KqMbVWRqAfK0kzE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix index e91edb7f3326..5eede3ded518 100644 --- a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix +++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix @@ -18,6 +18,8 @@ python3Packages.buildPythonApplication (finalAttrs: { build-system = [ python3Packages.poetry-core ]; + pythonRelaxDeps = [ "typer" ]; + dependencies = with python3Packages; [ setuptools # for pkg_resources tomlkit diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 69ac3e942d5a..4c1497c9976f 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.67.2"; + version = "0.68.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-sUSdrNerXaWRmK/MlpHqiYP8dkFbquJeYrV//A3FQFg="; + hash = "sha256-ZDQzuzrGyY2IsSOxiPKFDxTKBVIQbIDSRappYI9bdAc="; }; - cargoHash = "sha256-ntl+3MCx6ncYJOo6s+IYARrQcqXXdePWdZf3+5/NxxM="; + cargoHash = "sha256-m5OfXsdI3MsKHX2Vpck6iCftRNb7yIwn4m1ruIwvklc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 49da7b57e417..bf610a7e681b 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-04-29"; + version = "0-unstable-2026-05-08"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "6c973a1b2cc4702635ceccabe0c4b9e87d564a24"; - hash = "sha256-OquWb+1a5Bo1T6q9URiTXMvvZagkhL5dCelPlcyRbjw="; + rev = "2c817196d3698a5964356f8cd2da44048228b9dd"; + hash = "sha256-L5S97cp3EE/MLOzpO/Q3/B6zOtn1iRkZjfzEl3RDGNU="; }; vendorHash = "sha256-BbCCOgx6Tis2e07nSftdIi7cv8cHIXlsZl5Qk4fsWh8="; diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix index d3a8c7e16d93..584908cb2aae 100644 --- a/pkgs/by-name/pl/plakar/package.nix +++ b/pkgs/by-name/pl/plakar/package.nix @@ -33,7 +33,7 @@ buildGo125Module (finalAttrs: { # mount: fusermount: exec: "fusermount": executable file not found in $PATH "TestExecuteCmdMountDefault" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBTreeScanMemory" "TestBTreeScanPebble" "TestExecuteCmdServerDefault" diff --git a/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix b/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix index cff991ada664..ab29bb988432 100644 --- a/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix +++ b/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasma-plugin-blurredwallpaper"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "bouteillerAlan"; repo = "blurredwallpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-T0fE0Jqw3lIbGCK6kteU1pv1clzU8mMmrJr/UN5e0hg="; + hash = "sha256-uz5IND6e1lEEyMXZrW7R3zuaWEmD4/EkNCP0lAs99d0="; }; installPhase = '' diff --git a/pkgs/by-name/pl/playbar2/package.nix b/pkgs/by-name/pl/playbar2/package.nix deleted file mode 100644 index c878dd67a748..000000000000 --- a/pkgs/by-name/pl/playbar2/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - cmake, - libsForQt5, - fetchFromGitHub, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "playbar2"; - version = "2.5"; - - src = fetchFromGitHub { - owner = "jsmitar"; - repo = "PlayBar2"; - tag = "v${finalAttrs.version}"; - hash = "sha256-kC04yyt0vCsie8HGJySSiDNzkWKAGncmyOKrRx2pYkc="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.extra-cmake-modules - ]; - - buildInputs = [ - libsForQt5.plasma-framework - libsForQt5.kwindowsystem - ]; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - description = "Mpris2 Client for Plasma5"; - homepage = "https://github.com/jsmitar/PlayBar2"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pjones ]; - }; -}) diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 2d2f2bbe6cec..f96534cab492 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -74,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; - fetcherVersion = 2; - hash = "sha256-tCp5qLZVo93H8VIToU3mkmwNsVXOAd1IEsL6RlazPXo="; + fetcherVersion = 3; + hash = "sha256-k/2ya08JaTEt+dr5xfw1ordwENGm17YFyfKGFej5fdc="; }; patches = [ diff --git a/pkgs/by-name/po/podofo_0_10/package.nix b/pkgs/by-name/po/podofo_0_10/package.nix index 6f82a5c9c7b2..0470a0ad3825 100644 --- a/pkgs/by-name/po/podofo_0_10/package.nix +++ b/pkgs/by-name/po/podofo_0_10/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-lYykDGhxFWLwuZhfBIgbw3B0SEhrAP7vLNNXsPKRFZw="; + hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI="; }; outputs = [ diff --git a/pkgs/by-name/po/polonium/package.nix b/pkgs/by-name/po/polonium/package.nix deleted file mode 100644 index 3b817fa47fca..000000000000 --- a/pkgs/by-name/po/polonium/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildNpmPackage, - libsForQt5, -}: - -# how to update: -# 1. check out the tag for the version in question -# 2. run `prefetch-npm-deps package-lock.json` -# 3. update npmDepsHash with the output of the previous step - -buildNpmPackage rec { - pname = "polonium"; - version = "1.0rc"; - - src = fetchFromGitHub { - owner = "zeroxoneafour"; - repo = "polonium"; - rev = "v" + version; - hash = "sha256-AdMeIUI7ZdctpG/kblGdk1DBy31nDyolPVcTvLEHnNs="; - }; - - npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; - - dontConfigure = true; - - # the installer does a bunch of stuff that fails in our sandbox, so just build here and then we - # manually do the install - buildFlags = [ - "res" - "src" - ]; - - nativeBuildInputs = with libsForQt5; [ plasma-framework ]; - - dontNpmBuild = true; - - dontWrapQtApps = true; - - installPhase = '' - runHook preInstall - - plasmapkg2 --install pkg --packageroot $out/share/kwin/scripts - - runHook postInstall - ''; - - meta = { - description = "Auto-tiler that uses KWin 6.0+ tiling functionality"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - peterhoeg - kotatsuyaki - HeitorAugustoLN - ]; - inherit (libsForQt5.plasma-framework.meta) platforms; - }; -} diff --git a/pkgs/by-name/po/polyglot/package.nix b/pkgs/by-name/po/polyglot/package.nix index 9b4c5afa479f..a5ac46703c0a 100644 --- a/pkgs/by-name/po/polyglot/package.nix +++ b/pkgs/by-name/po/polyglot/package.nix @@ -70,7 +70,7 @@ maven.buildMavenPackage rec { meta = { description = "Conlang construction toolkit"; homepage = "https://draquet.github.io/PolyGlot/readme.html"; - changelog = "https://github.com/DraqueT/PolyGlot/releases/tag/${version}"; + changelog = "https://github.com/DraqueT/PolyGlot/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ noodlez1232 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/po/polygon-cli/package.nix b/pkgs/by-name/po/polygon-cli/package.nix index 32ac6c642d99..101342e088cc 100644 --- a/pkgs/by-name/po/polygon-cli/package.nix +++ b/pkgs/by-name/po/polygon-cli/package.nix @@ -31,7 +31,6 @@ python3.pkgs.buildPythonPackage rec { description = "Command-line tool for polygon.codeforces.com"; mainProgram = "polygon-cli"; homepage = "https://github.com/kunyavskiy/polygon-cli"; - changelog = "https://github.com/kunyavskiy/polygon-cli/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ khaser ]; }; diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index a93e9924255a..194b1c65ef8b 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -16,14 +16,14 @@ let mapAttrsToList ; - version = "0.32.6"; + version = "0.32.7"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-VwmjuXlYsh2dGKf7ux8DyLZec7xMISuQ7SSb9+LwzfU="; + hash = "sha256-JPRyLQzQmC3EiIp+rOMx24JVneFUN7ovC2eYrKxf3ik="; }; - vendorHash = "sha256-b4H7gAMG7DXEbvkZFsoEZrKpuvPW0vkfv1qqBPBaGAM="; + vendorHash = "sha256-ST33a/YNJiE70ORWNxS9gFNfHcNGGiQhOpUwqgbEJiQ="; getEnvoy = buildGoModule { pname = "pomerium-get-envoy"; diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix index 8d7209ebedc7..3fc2a6198896 100644 --- a/pkgs/by-name/po/postcss/package.nix +++ b/pkgs/by-name/po/postcss/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "postcss"; - version = "8.5.8"; + version = "8.5.10"; src = fetchFromGitHub { owner = "postcss"; repo = "postcss"; tag = finalAttrs.version; - hash = "sha256-28IUSx5R1KbyM8OV0U7FrhU+qL2zaJShMVvSQMChcA4="; + hash = "sha256-fvK4jX1hFkxVABr+uuebnE2OW3dRhoRKMDMH8R0tjuc="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-SwTVjgS4Hkl1SgXqSdjjbyKqUW2TfD1ruLu2Jcl51gg="; + hash = "sha256-7SwgvsbSbRj1SZAEhjWp3B4D3VtAvg7UN35/5x3f5Wk="; }; dontBuild = true; diff --git a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix index 84824fd0bd1d..a1cf1f23840e 100644 --- a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix +++ b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "prettier-plugin-jinja-template"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "davidodenwald"; repo = "prettier-plugin-jinja-template"; tag = "v${finalAttrs.version}"; - hash = "sha256-qAmN4VJCJana7YbrQC/51JKCbP2DN10HpIt+S88yvPE="; + hash = "sha256-OBpY8XYG6Hn2sQpWoJkNJGsnZ1Lh7LAviofgCRFMXwk="; }; - npmDepsHash = "sha256-/m0+z2fSwX77zRY4Yg4xdyI/ZEzAKNUuicaqz0b8f5w="; + npmDepsHash = "sha256-YsrDWoaA5EdQi3uzuWBx3Jv1US0qWwkh+636dfvlAkI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index 66a29f0c2660..791506a71b0f 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -80,11 +80,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-uMLRFBZP7/42R6nReONcb9/kVGCn3yGHLcLFajMZLmQ="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/prettier/prettier/blob/main/package.json#L265 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-dpxzbtWyXsHS6tH6DJ9OqSsUSc+YqYeAPJYb95Qy5wQ="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-+cDMrVwkTU5rYOQ7d2TqpsYx5F4JVZCpmf1vjOBhZ3M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prettier/yarn-4.14-support.patch b/pkgs/by-name/pr/prettier/yarn-4.14-support.patch new file mode 100644 index 000000000000..ac5d685b2049 --- /dev/null +++ b/pkgs/by-name/pr/prettier/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -9,4 +9,7 @@ nodeLinker: node-modules + plugins: + - .yarn/plugins/plugin-setup-editor.cjs + +-yarnPath: .yarn/releases/yarn-4.9.2.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index a167d85ead6a..eba8d5e42f61 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -2,7 +2,6 @@ lib, cmake, exiv2, - extra-cmake-modules, fetchFromGitLab, imagemagick, libarchive, @@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config qt6Packages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/pr/pricehist/package.nix b/pkgs/by-name/pr/pricehist/package.nix index 498227b709c7..72295b65be8a 100644 --- a/pkgs/by-name/pr/pricehist/package.nix +++ b/pkgs/by-name/pr/pricehist/package.nix @@ -1,44 +1 @@ -{ - lib, - python3Packages, - fetchFromGitLab, -}: - -python3Packages.buildPythonApplication (finalAttrs: { - pname = "pricehist"; - version = "1.4.14"; - pyproject = true; - - src = fetchFromGitLab { - owner = "chrisberkhout"; - repo = "pricehist"; - tag = finalAttrs.version; - hash = "sha256-BnyoSYVjs2odnOzSpvgMF860PDkz7tPNnM0s3Fep5G0="; - }; - - pythonRelaxDeps = [ "lxml" ]; - - dependencies = with python3Packages; [ - requests - lxml - cssselect - curlify - ]; - - build-system = with python3Packages; [ - poetry-core - ]; - - nativeCheckInputs = with python3Packages; [ - responses - pytest-mock - pytestCheckHook - ]; - - meta = { - description = "Command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats"; - homepage = "https://gitlab.com/chrisberkhout/pricehist"; - license = lib.licenses.mit; - mainProgram = "pricehist"; - }; -}) +{ python3Packages }: python3Packages.toPythonApplication python3Packages.pricehist diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 5fa0fb32bf3a..b1c6e194d927 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -3,8 +3,8 @@ stdenv, fetchFromGitHub, cmake, + pkg-config, cmark, - extra-cmake-modules, gamemode, jdk17, kdePackages, @@ -44,8 +44,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ninja - extra-cmake-modules + kdePackages.extra-cmake-modules jdk17 stripJavaArchivesHook ]; diff --git a/pkgs/by-name/pr/projclean/package.nix b/pkgs/by-name/pr/projclean/package.nix index 221b34554dae..a6322a294b15 100644 --- a/pkgs/by-name/pr/projclean/package.nix +++ b/pkgs/by-name/pr/projclean/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "projclean"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "projclean"; tag = "v${finalAttrs.version}"; - hash = "sha256-EScezOsfiirg8YbhteFxuVTodeup8tUzZdcrWveJxWE="; + hash = "sha256-lVXqaN8zaJ/T9ot2ONKjOJfejWjsHLNG3d3o8sdaYQM="; }; - cargoHash = "sha256-9atTgWg1iYCeXsRLLMOR87CbpIezD3ozMMOgumRNKAg="; + cargoHash = "sha256-jVONodcFCdjKOt7GkIUlWw+4yisDNJ/srqqP99gdsAc="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix index c56ddb2a060a..0452b3d00f6f 100644 --- a/pkgs/by-name/pr/projectable/package.nix +++ b/pkgs/by-name/pr/projectable/package.nix @@ -6,6 +6,8 @@ libgit2, openssl, zlib, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -15,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "dzfrias"; repo = "projectable"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-GM/dPmLnv1/Qj6QhBxPu5kO/SDnbY7Ntupf1FGkmrUY="; }; @@ -36,12 +38,17 @@ rustPlatform.buildRustPackage (finalAttrs: { OPENSSL_NO_VENDOR = true; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "TUI file manager built for projects"; homepage = "https://github.com/dzfrias/projectable"; - changelog = "https://github.com/dzfrias/projectable/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/dzfrias/projectable/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "prj"; }; }) diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix index 0bcbcfb4916c..6c5a0f00306d 100644 --- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix @@ -1,20 +1,23 @@ { lib, borgmatic, + nixosTests, fetchFromGitHub, python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finallAttrs: { pname = "prometheus-borgmatic-exporter"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "maxim-mityutko"; repo = "borgmatic-exporter"; - tag = "v${version}"; - hash = "sha256-fhsGpQolZxX5VAAEV3hiLF7bo4pbVt9GWyertf2oeO0="; + tag = "v${finallAttrs.version}"; + hash = "sha256-pa1f31jrfDzUB3+xexJUwG0byiFszj/zEt+dIwlEv0o="; }; pythonRelaxDeps = [ "prometheus-client" ]; @@ -33,6 +36,7 @@ python3Packages.buildPythonApplication rec { prometheus-client timy waitress + flask-caching ]); nativeCheckInputs = with python3Packages; [ @@ -40,13 +44,17 @@ python3Packages.buildPythonApplication rec { pytest-mock ]; + __darwinAllowLocalNetworking = true; + + passthru.tests.borgmatic = nixosTests.prometheus-exporters.borgmatic; + meta = { description = "Prometheus exporter for Borgmatic"; homepage = "https://github.com/maxim-mityutko/borgmatic-exporter"; - changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/${src.tag}"; + changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/${finallAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ flandweber ]; mainProgram = "borgmatic-exporter"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index 2063f5d67260..fc9a7ba7a902 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "protols"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "coder3101"; repo = "protols"; tag = finalAttrs.version; - hash = "sha256-GgCJPL18xcMSipaM4YwyuaR1sEadu1Zwyt5qWJXdS3c="; + hash = "sha256-OREJDG0RycYhULTbqx2dXaXlIYexebUFdCiJbBN3cXE="; }; - cargoHash = "sha256-1HZlNW4wLMXpFp+Z3HAEC0w3Ro+Rh/EdPxoBuFeyDjE="; + cargoHash = "sha256-uero/p1ATagY6k8t6QCdfPRLeZreVrvshe3dE/M9dkg="; env.FALLBACK_INCLUDE_PATH = "${protobuf}/include"; diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index 377f4bad6075..fd3b1b0db84e 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.235.0"; + version = "3.236.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.235.0-linux-x64.tar.gz"; - sha256 = "01z8gy049da2h3iwqn2pcmd04q93smbjypmlka5zfcai4vwd5hv9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.236.0-linux-x64.tar.gz"; + sha256 = "0nk76ra5ypa152gpffn4zp40z4q6aidkr347gc6zpqrqx5wgrnrp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.235.0-darwin-x64.tar.gz"; - sha256 = "0n5z5crkz1h9xpiic1kvs6418pk9f636x41hncka8ll4h73hk986"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.236.0-darwin-x64.tar.gz"; + sha256 = "0j7a6yp2bh3sgbgj6sncaxcxj7xjf2hr18whc92mi50nihd9af0y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.235.0-linux-arm64.tar.gz"; - sha256 = "177qpi8c1dagl1sv66h28vsp0rnk92c58hy4hlvlkkssj6i0d3wi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.236.0-linux-arm64.tar.gz"; + sha256 = "1df72nwmnx1lwygk94r5q09mw7cha4z2wjwbdg6mgk5yd0d6padq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.235.0-darwin-arm64.tar.gz"; - sha256 = "03wha0231261iwngj2wrvzh72r4dp8l27xhn32b71hwgykgfayg6"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.236.0-darwin-arm64.tar.gz"; + sha256 = "0m13ngr74g2b53zkmfqrp530brs54fkw71v4jv53zc6l0mvr5cj5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/pu/puppet/package.nix b/pkgs/by-name/pu/puppet/package.nix index 37d5afc1bc6c..ecffefd5d439 100644 --- a/pkgs/by-name/pu/puppet/package.nix +++ b/pkgs/by-name/pu/puppet/package.nix @@ -24,7 +24,6 @@ meta = { description = "Server automation framework and application"; homepage = "https://github.com/puppetlabs/puppet"; - changelog = "https://github.com/puppetlabs/puppet/blob/main/CHANGELOG.md"; license = lib.licenses.asl20; mainProgram = "puppet"; maintainers = with lib.maintainers; [ baloo ]; diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index a74729bebef3..34d8a37c009a 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pyenv"; - version = "2.6.28"; + version = "2.6.29"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; tag = "v${finalAttrs.version}"; - hash = "sha256-1jbpelEVcm+HqjsT8yaQPTaoOhEBCSq64LzTzr0X93I="; + hash = "sha256-RS/aqQWXqM2ByK4PZY8qN2I7KSsbzsGkkyqtnRUWfmE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 551a9b8ec3d8..5cceb499d9b5 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -11,7 +11,7 @@ copyDesktopItems, }: let - version = "2.66.2"; + version = "2.66.3"; in python3Packages.buildPythonApplication rec { inherit version; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-LXmmbgnm1CZzwNtNj0TEaKh3xN6np5SseE1hoP25Emc="; + hash = "sha256-EGYrEWB3YVVVNmc/KqtyLYbQPTcrv6+Piwqi347DB4c="; }; desktopItems = [ diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix index f206e410b6e0..5904135eacf4 100644 --- a/pkgs/by-name/py/pyrosimple/package.nix +++ b/pkgs/by-name/py/pyrosimple/package.nix @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { }; pythonRelaxDeps = [ + "parsimonious" "prometheus-client" "python-daemon" ]; diff --git a/pkgs/by-name/py/pywalfox-native/package.nix b/pkgs/by-name/py/pywalfox-native/package.nix index 254aae3766ce..134313b53dd6 100644 --- a/pkgs/by-name/py/pywalfox-native/package.nix +++ b/pkgs/by-name/py/pywalfox-native/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, python3, }: -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "pywalfox-native"; version = "2.9.0"; pyproject = true; @@ -11,8 +11,8 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "Frewacom"; repo = "pywalfox-native"; - rev = "7ecbbb193e6a7dab424bf3128adfa7e2d0fa6ff9"; - hash = "sha256-i1DgdYmNVvG+mZiFiBmVHsQnFvfDFOFTGf0GEy81lpE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8qMDwK4TgMqtGVGUnH3hyoyVlR3cQv28i7O4de+iuqU="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -26,4 +26,4 @@ python3.pkgs.buildPythonApplication { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ tsandrini ]; }; -} +}) diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index 154550045e24..85343193cf40 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -84,10 +84,12 @@ stdenv.mkDerivation (finalAttrs: { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org"; changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${finalAttrs.version}/Changelog"; - license = with lib.licenses; [ - gpl2Only - gpl3Only - ]; + license = + with lib.licenses; + AND [ + gpl2Plus # code + gpl3Plus # assets + ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Anton-Latukha diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix index c01d32a4b43c..8314c20757d8 100644 --- a/pkgs/by-name/qd/qdelay/package.nix +++ b/pkgs/by-name/qd/qdelay/package.nix @@ -18,7 +18,7 @@ writableTmpDirAsHomeHook, buildVST3 ? true, - buildLV2 ? stdenv.isLinux, + buildLV2 ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index 1799ab01f934..1da91154fb60 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -23,6 +23,7 @@ taglib, vulkan-headers, vulkan-tools, + rubberband, # Configurable options qtVersion ? "6", # Can be 5 or 6 }: @@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-tools ] ++ lib.optionals (qtVersion == "6") [ + rubberband qt6.qt5compat qt6.qtbase qt6.qtsvg diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 7b6f3e34fba4..8fe37b094015 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.4.25"; + version = "26.5.6"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-wge2r4R++ao8z4mBwwM93gJhGcp1ZIcXOqj3pzQr8LI="; + hash = "sha256-q+1EjgrhF1Zt+LZM5BXZ+UJqGavMPsRJ3ZfD+LbVQds="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qr/qrupdate/disable-aarch64-single-precision-tests.patch b/pkgs/by-name/qr/qrupdate/disable-aarch64-single-precision-tests.patch new file mode 100644 index 000000000000..a9f4c1c475d5 --- /dev/null +++ b/pkgs/by-name/qr/qrupdate/disable-aarch64-single-precision-tests.patch @@ -0,0 +1,111 @@ +--- i/test/tqr1up.f ++++ w/test/tqr1up.f +@@ -31,7 +31,7 @@ + m = 60 + n = 40 + write (*,*) 'sqr1up test (full factorization):' +- call stest(m,n,0) ++c call stest(m,n,0) + write (*,*) 'dqr1up test (full factorization):' + call dtest(m,n,0) + write (*,*) 'cqr1up test (full factorization):' +@@ -40,7 +40,7 @@ + call ztest(m,n,0) + + write (*,*) 'sqr1up test (economized factorization):' +- call stest(m,n,1) ++c call stest(m,n,1) + write (*,*) 'dqr1up test (economized factorization):' + call dtest(m,n,1) + write (*,*) 'cqr1up test (economized factorization):' +@@ -51,7 +51,7 @@ + m = 40 + n = 60 + write (*,*) 'sqr1up test (rows < columns):' +- call stest(m,n,0) ++c call stest(m,n,0) + write (*,*) 'dqr1up test (rows < columns):' + call dtest(m,n,0) + write (*,*) 'cqr1up test (rows < columns):' +--- i/test/tqrdec.f ++++ w/test/tqrdec.f +@@ -32,7 +32,7 @@ + n = 40 + j = 12 + write (*,*) 'sqrdec test (full factorization):' +- call stest(m,n,j,0) ++c call stest(m,n,j,0) + write (*,*) 'dqrdec test (full factorization):' + call dtest(m,n,j,0) + write (*,*) 'cqrdec test (full factorization):' +@@ -41,7 +41,7 @@ + call ztest(m,n,j,0) + + write (*,*) 'sqrdec test (economized factorization):' +- call stest(m,n,j,1) ++c call stest(m,n,j,1) + write (*,*) 'dqrdec test (economized factorization):' + call dtest(m,n,j,1) + write (*,*) 'cqrdec test (economized factorization):' +--- i/test/tqrder.f ++++ w/test/tqrder.f +@@ -32,7 +32,7 @@ + n = 40 + j = 30 + write (*,*) 'sqrder test (full factorization):' +- call stest(m,n,j) ++c call stest(m,n,j) + write (*,*) 'dqrder test (full factorization):' + call dtest(m,n,j) + write (*,*) 'cqrder test (full factorization):' +--- i/test/tqrinc.f ++++ w/test/tqrinc.f +@@ -32,7 +32,7 @@ + n = 40 + j = 28 + write (*,*) 'sqrinc test (full factorization):' +- call stest(m,n,j,0) ++c call stest(m,n,j,0) + write (*,*) 'dqrinc test (full factorization):' + call dtest(m,n,j,0) + write (*,*) 'cqrinc test (full factorization):' +@@ -41,7 +41,7 @@ + call ztest(m,n,j,0) + + write (*,*) 'sqrinc test (economized factorization):' +- call stest(m,n,j,1) ++c call stest(m,n,j,1) + write (*,*) 'dqrinc test (economized factorization):' + call dtest(m,n,j,1) + write (*,*) 'cqrinc test (economized factorization):' +--- i/test/tqrinr.f ++++ w/test/tqrinr.f +@@ -32,7 +32,7 @@ + n = 40 + j = 30 + write (*,*) 'sqrinr test (full factorization):' +- call stest(m,n,j) ++c call stest(m,n,j) + write (*,*) 'dqrinr test (full factorization):' + call dtest(m,n,j) + write (*,*) 'cqrinr test (full factorization):' +--- i/test/tqrshc.f ++++ w/test/tqrshc.f +@@ -33,7 +33,7 @@ + i = 20 + j = 40 + write (*,*) 'sqrshc test (left shift, full factorization):' +- call stest(m,n,i,j,0) ++c call stest(m,n,i,j,0) + write (*,*) 'dqrshc test (left shift, full factorization):' + call dtest(m,n,i,j,0) + write (*,*) 'cqrshc test (left shift, full factorization):' +@@ -44,7 +44,7 @@ + i = 40 + j = 20 + write (*,*) 'sqrshc test (right shift, economized factorization):' +- call stest(m,n,i,j,1) ++c call stest(m,n,i,j,1) + write (*,*) 'dqrshc test (right shift, economized factorization):' + call dtest(m,n,i,j,1) + write (*,*) 'cqrshc test (right shift, economized factorization):' diff --git a/pkgs/by-name/qr/qrupdate/package.nix b/pkgs/by-name/qr/qrupdate/package.nix index ed7974a8be76..9dd97a281227 100644 --- a/pkgs/by-name/qr/qrupdate/package.nix +++ b/pkgs/by-name/qr/qrupdate/package.nix @@ -42,10 +42,15 @@ stdenv.mkDerivation (finalAttrs: { "-DBLA_VENDOR=Generic" ]; - # https://github.com/mpimd-csc/qrupdate-ng/issues/4 - patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - ./disable-zch1dn-test.patch - ]; + patches = + # https://github.com/mpimd-csc/qrupdate-ng/issues/4 + lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + ./disable-zch1dn-test.patch + ] + # https://github.com/mpimd-csc/qrupdate-ng/issues/7 + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + ./disable-aarch64-single-precision-tests.patch + ]; postPatch = '' sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' -i ./CMakeLists.txt diff --git a/pkgs/by-name/qs/qstopmotion/package.nix b/pkgs/by-name/qs/qstopmotion/package.nix index c127d0814be4..7a4cf0fc8c03 100644 --- a/pkgs/by-name/qs/qstopmotion/package.nix +++ b/pkgs/by-name/qs/qstopmotion/package.nix @@ -5,7 +5,7 @@ # nativeBuildInputs cmake, - extra-cmake-modules, + kdePackages, gettext, gphoto2, libgphoto2, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext gphoto2 libgphoto2 diff --git a/pkgs/by-name/qt/qtengine/package.nix b/pkgs/by-name/qt/qtengine/package.nix index 70ee18462c95..eff435bf7ada 100644 --- a/pkgs/by-name/qt/qtengine/package.nix +++ b/pkgs/by-name/qt/qtengine/package.nix @@ -4,7 +4,6 @@ cmake, ninja, kdePackages, - libsForQt5, fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { @@ -18,11 +17,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aJ5ZdIX10nmhzMLjP6QMuFJHvljJD+xcojuKZjPkr70="; }; - outputs = [ - "out" - "qt5" - ]; - nativeBuildInputs = [ cmake ninja @@ -35,34 +29,9 @@ stdenv.mkDerivation (finalAttrs: { kdePackages.kiconthemes ]; - # Workaround for Qt5/Qt6 dual support, similar to breeze (pkgs/kde/plasma/breeze) cmakeFlags = [ "-DQT6_PLUGINDIR=${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}" - "-DQT5_PLUGINDIR=${placeholder "qt5"}/${libsForQt5.qtbase.qtPluginPrefix}" - "-DQT5_LIBDIR=${placeholder "qt5"}/lib" - "-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5" - "-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core" - "-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus" - "-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui" - "-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets" - "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" - "-DQt5ThemeSupport_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5ThemeSupport" - "-DQt5ThemeSupport_LIBRARY=${libsForQt5.qtbase.out}/lib/libQt5ThemeSupport.a" - "-DQt5ThemeSupport_INCLUDE_DIR=${libsForQt5.qtbase.dev}/include/QtThemeSupport/${libsForQt5.qtbase.version}" - "-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network" - "-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml" - "-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick" - "-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels" - "-DQt5QuickControls2_DIR=${libsForQt5.qtquickcontrols2.dev}/lib/cmake/Qt5QuickControls2" - - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DBUILD_QT5=OFF" ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix index d1701d6666d0..7768bafc85a4 100644 --- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix +++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, unstableGitUpdater, cmake, - extra-cmake-modules, + kdePackages, libsForQt5, mkcal, pkg-config, @@ -31,15 +31,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config ]; buildInputs = [ + kdePackages.extra-cmake-modules mkcal ] ++ (with libsForQt5; [ - kcalendarcore + __internalKF5.kcalendarcore qtbase qtpim ]); diff --git a/pkgs/by-name/qt/qtpass/package.nix b/pkgs/by-name/qt/qtpass/package.nix index 702caa5e6578..5b6fa8274981 100644 --- a/pkgs/by-name/qt/qtpass/package.nix +++ b/pkgs/by-name/qt/qtpass/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtpass"; - version = "1.4.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; tag = "v${finalAttrs.version}"; - hash = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; + hash = "sha256-0qbKM24v7xRiuBEs+rHP2l1W8bCl7uJRc3jzpDdjp/c="; }; postPatch = '' diff --git a/pkgs/by-name/qu/quast/package.nix b/pkgs/by-name/qu/quast/package.nix index ffef7d3c0e83..84dbd28329b8 100644 --- a/pkgs/by-name/qu/quast/package.nix +++ b/pkgs/by-name/qu/quast/package.nix @@ -15,7 +15,7 @@ in pythonPackages.buildPythonApplication rec { pname = "quast"; version = "5.3.0"; - format = "setuptools"; + format = "other"; src = fetchurl { url = "https://github.com/ablab/quast/releases/download/quast_${version}/quast-${version}.tar.gz"; diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index 80b4f0a84eb2..a9b394da46d9 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -14,12 +14,12 @@ }: buildGo126Module (finalAttrs: { pname = "qui"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "qui"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bp3kih7x0NZTEylk9/Ul10+RN51fCs90ZmWrJtcwH40="; + hash = "sha256-Rdg8fcoUY7WrNXj+LZyMXx6hFo8+OGrCLjhE3JD1y4o="; }; qui-web = stdenvNoCC.mkDerivation (finalAttrs': { @@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-Ps/m0sr2xJOTkKOUi6G+iHY7Ork9crepP5kuz0xh/aQ="; + hash = "sha256-hCiIbVroyMhl2xT0WAGbmLSXfUH6RJHlC1g3isMlUJs="; }; postBuild = '' @@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: { ''; }); - vendorHash = "sha256-FJWJgvX5SDp70kPaZAnTWzcKKrLOjkAVf6OFTBmyLos="; + vendorHash = "sha256-7MzKE3pBvoW/ajB6gHtBBS1M/NuQsRw3ZSNtCJzrEyI="; preBuild = '' cp -r ${finalAttrs.qui-web}/* web/dist diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index d6ae7ba2f694..5e16807f8899 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -25,13 +25,16 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src patches missingHashes; - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-7ty3ESydrDzXrUIdgDC1DqYrkhRX5FsIeOJ0rWP5X0k="; + hash = "sha256-6WfpOAt9XRw4fC+Ix9OoDPvg7oIxcdKRX5ttIywG14E="; }; patches = [ # Make it possible to launch Steam games from r2modman. ./steam-launch-fix.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/ebkr/r2modmanPlus/blob/develop/package.json#L117 + ./yarn-4.14-support.patch ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/r2/r2modman/yarn-4.14-support.patch b/pkgs/by-name/r2/r2modman/yarn-4.14-support.patch new file mode 100644 index 000000000000..017f2d295ca9 --- /dev/null +++ b/pkgs/by-name/r2/r2modman/yarn-4.14-support.patch @@ -0,0 +1,21 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1 +1,6 @@ + nodeLinker: node-modules ++ ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix index ba24f457a295..3e57ffa770ad 100644 --- a/pkgs/by-name/ra/radicle-tui/package.nix +++ b/pkgs/by-name/ra/radicle-tui/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv zlib ]; diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index 10195ae3446e..fd13e9e97291 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-dl-googletest.patch - ./tests-c++17.patch ]; postPatch = '' @@ -96,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { done substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart + # jsoncpp 1.9.7 only exports std::string_view overloads under C++17 + substituteInPlace CMakeLists.txt \ + --replace-fail "set(CMAKE_CXX_STANDARD 14)" "set(CMAKE_CXX_STANDARD 17)" + # We don't find the radiotray-ng-notification icon otherwise substituteInPlace data/radiotray-ng.desktop \ --replace radiotray-ng-notification radiotray-ng-on diff --git a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch deleted file mode 100644 index 234de3ff40f7..000000000000 --- a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 58ab5c2..4f56a25 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,5 +1,7 @@ - include(GoogleTest) - -+set(CMAKE_CXX_STANDARD 17) -+ - function(add_gmock_test target) - add_executable(${target} ${ARGN}) - target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index 692a7c5b2979..d3ca8cfaded3 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch, go-md2man, llama-cpp-vulkan, @@ -16,14 +15,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ramalama"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "containers"; repo = "ramalama"; tag = "v${finalAttrs.version}"; - hash = "sha256-AqX8pNbeDPCxlwaSJg4+XVrfypvXGR77q8tkI7t3vTY="; + hash = "sha256-9y7H1Iq/Dn89NIJDegY8lbII4ehx3jhulyOEkBIm4Nk="; }; build-system = with python3Packages; [ @@ -43,14 +42,6 @@ python3Packages.buildPythonApplication (finalAttrs: { go-md2man ]; - patches = [ - # fix darwin tests: https://github.com/containers/ramalama/pull/2567 - (fetchpatch { - url = "https://github.com/containers/ramalama/commit/2b51b749b706261a5f704b4d785dbd45447b14b6.patch"; - hash = "sha256-HV7gn0W7b0P7OS53Js5JdHoFjvE7tO4e3RMReGZpRIo="; - }) - ]; - postPatch = '' substituteInPlace ramalama/config.py --replace-fail "{sys.prefix}" "$out" ''; diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 333aeb46c4ac..58f55f30a3a9 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication { pname = "ranger"; - version = "1.9.4-unstable-2026-04-14"; + version = "1.9.4-unstable-2026-04-26"; pyproject = true; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "9f671c6a577d19520ee3afd6e1a93bb35c10582c"; - hash = "sha256-lZqVi8NakD7a0xCXLNWrbU3Rt1sR6EsWULsBvFM5Klc="; + rev = "51e19b8c7f30c241bb7266deb86e05c5984d6ea9"; + hash = "sha256-qWI/7F2zOUm7QuH4RtfFOXlB1OZ6NrGfWLt5FlW+gqA="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ra/rare/package.nix b/pkgs/by-name/ra/rare/package.nix index da9065af5a47..d757d8813f02 100644 --- a/pkgs/by-name/ra/rare/package.nix +++ b/pkgs/by-name/ra/rare/package.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: { postInstall = '' install -Dm644 misc/rare.desktop -t $out/share/applications/ - install -Dm644 $out/${python3Packages.python.sitePackages}/rare/resources/images/Rare.png $out/share/pixmaps/rare.png + install -Dm644 $out/${python3Packages.python.sitePackages}/rare/resources/images/Rare.png $out/share/icons/rare.png ''; preFixup = '' diff --git a/pkgs/by-name/ra/raspa/package.nix b/pkgs/by-name/ra/raspa/package.nix index e8589739f396..be044efb051b 100644 --- a/pkgs/by-name/ra/raspa/package.nix +++ b/pkgs/by-name/ra/raspa/package.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation (finalAttrs: { openblas ]; + # K&R `T func()` declarations whose definitions take real args + env.CFLAGS = "-std=gnu17"; + # Prepare for the Python binding packaging. strictDeps = true; diff --git a/pkgs/by-name/ra/ratpoison/package.nix b/pkgs/by-name/ra/ratpoison/package.nix index 58916d67cf6f..96e0e17305dc 100644 --- a/pkgs/by-name/ra/ratpoison/package.nix +++ b/pkgs/by-name/ra/ratpoison/package.nix @@ -59,6 +59,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/getopt.h \ + --replace-fail "extern int getopt ();" \ + "extern int getopt (int argc, char *const *argv, const char *shortopts);" + ''; + configureFlags = [ # >=1.4.9 requires this even with readline in inputs "--enable-history" diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index 34e810b5693a..a0a15d0b128e 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -13,13 +13,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "reaction"; - version = "2.3.1-11"; + version = "2.3.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "ppom"; repo = "reaction"; - rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; + rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; # TODO: return to tagged release hash = "sha256-QlSXZ2Wk1OXzAY2x6YjtW+xNchY+Ghb/6AsJgjfgoFE="; }; diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix index cba74eed9242..a47fd3a92766 100644 --- a/pkgs/by-name/re/reaper/package.nix +++ b/pkgs/by-name/re/reaper/package.nix @@ -40,17 +40,17 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "reaper"; - version = "7.67"; + version = "7.71"; src = fetchurl { url = url_for_platform finalAttrs.version stdenv.hostPlatform.qemuArch; hash = if stdenv.hostPlatform.isDarwin then - "sha256-obsp3zSJ71nfmY8TEnFrs1v545klBSUZcruIb39/BnM=" + "sha256-78TB6NNr9KemIra8w/87suP9RrlWhrCAW6d5sTrEL4E=" else { - x86_64-linux = "sha256-VZSt3epsSvqBSiYjK0JIX0kWLTagxbcEBBk2t0b6WXI="; - aarch64-linux = "sha256-XYMeykqf9QCzD6jHU/9Lrx266A3pBq3YePKDP2Sjfhc="; + x86_64-linux = "sha256-OozJHud6PMOkFU2wMmdOYS0PKfyaAV+HHhROJfSr0GM="; + aarch64-linux = "sha256-59Divnr+4NVml9sYlFSlL7FLk1uHRVirAThODLbeAjk="; } .${stdenv.hostPlatform.system}; }; diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index fc89f717fe57..faf03afd13aa 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "26.1.6"; + version = "26.1.7"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-XIYhSv30tNe/vS4x5lRax2n+sxy3EnuJfdg3IJHP+Ck="; + sha256 = "sha256-RI5+uAg3iGMmWREWYn+ChnEB9WyPa2tImB35Vuhoe7Q="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-SiMh5Fi3uNOoKzPGEJ+sBkR/uIpci9mKONJiBG7wjtA="; + vendorHash = "sha256-d+qn0JiNF8YcsuhDSp/RPCly5nTy/daHaCUap2hLKCM="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/re/reevr/package.nix b/pkgs/by-name/re/reevr/package.nix index bf1a80125869..9d042c2fbead 100644 --- a/pkgs/by-name/re/reevr/package.nix +++ b/pkgs/by-name/re/reevr/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/re/regreet/package.nix b/pkgs/by-name/re/regreet/package.nix index 0f673686620f..55ba48ba3415 100644 --- a/pkgs/by-name/re/regreet/package.nix +++ b/pkgs/by-name/re/regreet/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, pkg-config, wrapGAppsHook4, + accountsservice, + dbus, glib, gtk4, pango, @@ -13,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "regreet"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rharish101"; repo = "ReGreet"; rev = finalAttrs.version; - hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8="; + hash = "sha256-2yA+LJmF99PJZbOVib3XCjsU95ZwKlXC2PofODFxbf8="; }; - cargoHash = "sha256-abCQ3RsnZ/a1DbjQFOiA7Xs7bbqSJxwNps8yV6Q4FIw="; + cargoHash = "sha256-BlN63s09uSqYtQdV10VVTngqybfUEdgvsPlplM9PlD0="; buildFeatures = [ "gtk4_8" ]; @@ -31,6 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: { wrapGAppsHook4 ]; buildInputs = [ + accountsservice + dbus glib gtk4 pango diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix index 51e2b978cffd..1520b75fa0dc 100644 --- a/pkgs/by-name/re/remarshal_0_17/package.nix +++ b/pkgs/by-name/re/remarshal_0_17/package.nix @@ -30,15 +30,17 @@ let }); pythonPackages = python.pkgs; in -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication (finalAttrs: { pname = "remarshal"; version = "0.17.1"; # last version with YAML 1.1 support, do not update pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { - owner = "dbohdan"; + owner = "remarshal-project"; repo = "remarshal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA="; }; @@ -62,11 +64,11 @@ pythonPackages.buildPythonApplication rec { # nixpkgs-update: no auto update meta = { - changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}"; + changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${finalAttrs.src.tag}"; description = "Convert between TOML, YAML and JSON"; license = lib.licenses.mit; - homepage = "https://github.com/dbohdan/remarshal"; + homepage = "https://github.com/remarshal-project/remarshal"; maintainers = with lib.maintainers; [ hexa ]; mainProgram = "remarshal"; }; -} +}) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 46890cf5bd07..62016011a4c6 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.26.0"; + version = "1.26.8"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-9SLFc2giE0AjD88OJz0z7mn9j/pN7Fd8/xWub6FDs/U="; + hash = "sha256-enFTy+RIYrvq9ScLPExSaKDGQy+MLSbKAQTREIkJB28="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/remodel/package.nix b/pkgs/by-name/re/remodel/package.nix deleted file mode 100644 index 57001d3ec0c2..000000000000 --- a/pkgs/by-name/re/remodel/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - pkg-config, - openssl, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "remodel"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "rojo-rbx"; - repo = "remodel"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI="; - }; - - cargoHash = "sha256-41EkXciQZ7lGlD+gVlZEahrGPeEMmaIaiF7tYff9xXw="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ]; - - meta = { - description = "Roblox file manipulation tool"; - mainProgram = "remodel"; - longDescription = '' - Remodel is a command line tool for manipulating Roblox files and the instances contained within them. - ''; - homepage = "https://github.com/rojo-rbx/remodel"; - downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${finalAttrs.version}"; - changelog = "https://github.com/rojo-rbx/remodel/raw/v${finalAttrs.version}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index c71030bc00a7..44b29adaa74e 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; - fetcherVersion = 2; - hash = "sha256-gDffEtUWqSWbwr4S0HZIPTvSrXDvl/q2Y5QuA+U6Ndk="; + fetcherVersion = 3; + hash = "sha256-ldxhP+I455PEfBrkJIlHudNvAsI4EN34ZkQXMBciOo4="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix index ba674528eff9..fda9a021c9d6 100644 --- a/pkgs/by-name/re/reqable/package.nix +++ b/pkgs/by-name/re/reqable/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "reqable"; - version = "3.0.40"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb"; - hash = "sha256-ddbFkkJjgQyZJEe7sL5cBbpmamSzg7mVg/zr3kXGLzI="; + hash = "sha256-lJby2hewmjGpq2MwED/ZJbbGg7qt0aDwwqRVhoo/uys="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index 6d0d52b413f0..ef7cfcf649c8 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -60,6 +60,7 @@ lib.checkListOfEnum "${pname}: color variants" # Package may install many small files. dontPatchELF = true; dontRewriteSymlinks = true; + dontWrapQtApps = true; # FIXME: https://github.com/yeyushengfan258/Reversal-icon-theme/issues/108 dontCheckForBrokenSymlinks = true; diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index 47b5ed765492..e05011220826 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-wanxiang"; - version = "15.6.1"; + version = "15.9.12"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-h33dhVBI14JARrGIpPPy7AAXHZs4F6s5AtUm9ZafR3Y="; + hash = "sha256-qg6QyI2RHKkCfjj41IXfL2cIXt82NR9oh52A/V0O67g="; }; installPhase = '' diff --git a/pkgs/by-name/ri/rimsort/package.nix b/pkgs/by-name/ri/rimsort/package.nix index ef675ed6a5bc..3c2a7d6b4b51 100644 --- a/pkgs/by-name/ri/rimsort/package.nix +++ b/pkgs/by-name/ri/rimsort/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, fetchzip, makeBinaryWrapper, + nix-update-script, makeDesktopItem, copyDesktopItems, @@ -16,13 +17,13 @@ }: let pname = "rimsort"; - version = "1.0.73"; + version = "1.0.76"; src = fetchFromGitHub { owner = "RimSort"; repo = "RimSort"; - rev = "v${version}"; - hash = "sha256-xNmJ1XvnLTKhicVchzG9CQtRVoZjRkBEvfn/WWesDRU="; + tag = "v${version}"; + hash = "sha256-EO1j4GPRQSB+QEF4tB87x4nCUKpdWU9aGlDFghwxar0="; fetchSubmodules = true; }; @@ -49,14 +50,15 @@ let }).run; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname; inherit version; + inherit src; unpackPhase = '' runHook preUnpack - cp -r ${src} source + cp -r ${finalAttrs.src} source chmod -R 755 source cp ${steamworksSrc}/redistributable_bin/linux64/libsteam_api.so source/ @@ -168,6 +170,14 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + # To skip checking the pre-release 'Edge' release as 'vEdge'. + "--version-regex" + "v([0-9.]+)" + ]; + }; + meta = { description = "Open source mod manager for the video game RimWorld"; homepage = "https://github.com/RimSort/RimSort"; @@ -186,4 +196,4 @@ stdenv.mkDerivation { # steamworksSrc is x86_64-linux only platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix index 0daffa857a31..f57a1dec9280 100644 --- a/pkgs/by-name/ri/ripsecrets/package.nix +++ b/pkgs/by-name/ri/ripsecrets/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -17,12 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-2HsUNN3lyGb/eOUEN/vTOQbAy59DQSzIaOqdk9+KhfU="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Command-line tool to prevent committing secret keys into your source code"; homepage = "https://github.com/sirwart/ripsecrets"; changelog = "https://github.com/sirwart/ripsecrets/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "ripsecrets"; }; }) diff --git a/pkgs/by-name/ri/river-tag-overlay/package.nix b/pkgs/by-name/ri/river-tag-overlay/package.nix index 69d950312bb5..f4e409a41326 100644 --- a/pkgs/by-name/ri/river-tag-overlay/package.nix +++ b/pkgs/by-name/ri/river-tag-overlay/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromSourcehut, fetchpatch, + fetchpatch2, wayland, pixman, pkg-config, @@ -26,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/791eaadf46482121a4c811ffba13d03168d74d8f.patch"; sha256 = "CxSDcweHGup1EF3oD/2vhP6RFoeYorj0BwmlgA3tbPE="; }) + # Specify argument types for C23 compatibility (gcc 15). + (fetchpatch2 { + url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/b7d9232f9106c6d2c3ecce802495f14069ce3406.patch"; + hash = "sha256-/fNpVPY09zwwymS/VNaonqX7jtdflC3Iot5R26VsTTw="; + }) ]; buildInputs = [ diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix index 1799adfc7b29..25f77a07ba3f 100644 --- a/pkgs/by-name/rk/rkdeveloptool/package.nix +++ b/pkgs/by-name/rk/rkdeveloptool/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5 env.CPPFLAGS = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ] - ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=vla-cxx-extension" ] ); meta = { diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 7c4455e58447..1c91e27c0bd0 100644 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage { cmake zig_0_13 ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage { llvmPackages.llvm.dev makeBinaryWrapper ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc stdenv.cc.cc.lib ]; @@ -67,13 +67,13 @@ rustPlatform.buildRustPackage { ''; postInstall = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/roc \ --set NIX_GLIBC_PATH ${glibc.out}/lib \ --set NIX_LIBGCC_S_PATH ${stdenv.cc.cc.lib}/lib \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} '' - + lib.optionalString (!stdenv.isLinux) '' + + lib.optionalString (!stdenv.hostPlatform.isLinux) '' wrapProgram $out/bin/roc --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} ''; @@ -84,12 +84,12 @@ rustPlatform.buildRustPackage { ]; checkPhase = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' runHook preCheck NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck '' - + lib.optionalString (!stdenv.isLinux) '' + + lib.optionalString (!stdenv.hostPlatform.isLinux) '' runHook preCheck cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index ff8b89b8a7d9..20c37876c342 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -30,13 +30,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5p0WmTKHqiRtNeWxJuBUKVHc2DHtAGMyBsXq9SpytWA="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/RocketChat/Rocket.Chat.Electron/blob/master/package.json#L182 + ./yarn-4.14-support.patch + ]; + # This might need to be updated between releases. # See https://nixos.org/manual/nixpkgs/stable/#javascript-yarnBerry-missing-hashes missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-Y6wdGp8Q5DW3f7pIrcE3ElKHFHYPxcAQFiM4R1cSYUA="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-xb4HwmLjO1xCQ/KEav3EM2FwCu0vi/tXZVY+gSoonyQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch b/pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch new file mode 100644 index 000000000000..2977561bd557 --- /dev/null +++ b/pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -6,4 +6,7 @@ enableGlobalCache: false + + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.6.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/ro/rott/package.nix b/pkgs/by-name/ro/rott/package.nix deleted file mode 100644 index 7eeef91b2f76..000000000000 --- a/pkgs/by-name/ro/rott/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchzip, - SDL_compat, - SDL_mixer, - makeDesktopItem, - copyDesktopItems, - unzip, - buildShareware ? false, - withSharewareData ? buildShareware, -}: -assert withSharewareData -> buildShareware; - -let - datadir = "share/data/rott-shareware/"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rott"; - version = "1.1.2"; - - __structuredAttrs = true; - srcs = [ - (fetchurl { - url = "https://icculus.org/rott/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-ECUW6MMS9rC79sYj4fAcv7vDFKzorf4fIB1HsVvZJ/8="; - }) - ] - ++ lib.optional withSharewareData (fetchzip { - url = "http://icculus.org/rott/share/1rott13.zip"; - hash = "sha256-l0pP+mNPAabGh7LZrwcB6KOhPRSycrZpAlPVTyDXc6Y="; - stripRoot = false; - }); - - sourceRoot = "rott-${finalAttrs.version}/rott"; - - nativeBuildInputs = [ copyDesktopItems ] ++ lib.optional withSharewareData unzip; - - buildInputs = [ - SDL_compat - SDL_mixer - ]; - - enableParallelBuilding = true; - - makeFlags = [ - "SHAREWARE=${if buildShareware then "1" else "0"}" - ''EXTRACFLAGS=-DDATADIR=\"${if withSharewareData then "${placeholder "out"}/${datadir}" else ""}\"'' - ]; - - installPhase = '' - runHook preInstall - - ${lib.optionalString withSharewareData '' - mkdir -p "$out/${datadir}" - unzip -d "$out/${datadir}" ../../source/ROTTSW13.SHR - ''} - install -Dm755 -t $out/bin rott - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "rott"; - exec = "rott"; - desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}"; - categories = [ "Game" ]; - }) - ]; - - meta = { - description = "SDL port of Rise of the Triad"; - mainProgram = "rott"; - homepage = "https://icculus.org/rott/"; - license = with lib.licenses; [ gpl2Plus ] ++ lib.optional withSharewareData unfreeRedistributable; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/ru/rumqttd/bump-metrics.patch b/pkgs/by-name/ru/rumqttd/bump-metrics.patch new file mode 100644 index 000000000000..5affdc273678 --- /dev/null +++ b/pkgs/by-name/ru/rumqttd/bump-metrics.patch @@ -0,0 +1,548 @@ +--- a/rumqttd/Cargo.toml ++++ b/rumqttd/Cargo.toml +@@ -32,8 +32,8 @@ + config = "0.14" + tracing = { version="0.1", features=["log"] } + tracing-subscriber = { version="0.3.18", features=["env-filter"] } +-metrics = "0.22.1" +-metrics-exporter-prometheus = { version = "0.13.1", default-features = false, features = ["http-listener"] } ++metrics = "0.24.5" ++metrics-exporter-prometheus = { version = "0.16", default-features = false, features = ["http-listener"] } + clap = { version = "4.4", features = ["derive"] } + axum = "0.7.4" + rand = "0.8.5" +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -24,7 +24,7 @@ + checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" + dependencies = [ + "cfg-if", +- "getrandom", ++ "getrandom 0.2.12", + "once_cell", + "version_check", + "zerocopy", +@@ -256,10 +256,10 @@ + "axum-core", + "bytes", + "futures-util", +- "http 1.0.0", +- "http-body 1.0.0", ++ "http", ++ "http-body", + "http-body-util", +- "hyper 1.2.0", ++ "hyper", + "hyper-util", + "itoa", + "matchit", +@@ -289,8 +289,8 @@ + "async-trait", + "bytes", + "futures-util", +- "http 1.0.0", +- "http-body 1.0.0", ++ "http", ++ "http-body", + "http-body-util", + "mime", + "pin-project-lite", +@@ -329,6 +329,12 @@ + checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + + [[package]] ++name = "base64" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" ++ ++[[package]] + name = "benchmarks" + version = "0.4.0" + dependencies = [ +@@ -564,7 +570,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.12", + "once_cell", + "tiny-keccak", + ] +@@ -836,6 +842,12 @@ + checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] ++name = "foldhash" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" ++ ++[[package]] + name = "foreign-types" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -983,6 +995,18 @@ + ] + + [[package]] ++name = "getrandom" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasip2", ++] ++ ++[[package]] + name = "gimli" + version = "0.28.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1005,7 +1029,7 @@ + "futures-core", + "futures-sink", + "futures-util", +- "http 1.0.0", ++ "http", + "indexmap", + "slab", + "tokio", +@@ -1021,14 +1045,20 @@ + + [[package]] + name = "hashbrown" +-version = "0.14.3" ++version = "0.15.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" ++checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" + dependencies = [ +- "ahash", ++ "foldhash", + ] + + [[package]] ++name = "hashbrown" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" ++ ++[[package]] + name = "heck" + version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1051,17 +1081,6 @@ + + [[package]] + name = "http" +-version = "0.2.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +-dependencies = [ +- "bytes", +- "fnv", +- "itoa", +-] +- +-[[package]] +-name = "http" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +@@ -1073,23 +1092,12 @@ + + [[package]] + name = "http-body" +-version = "0.4.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +-dependencies = [ +- "bytes", +- "http 0.2.11", +- "pin-project-lite", +-] +- +-[[package]] +-name = "http-body" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" + dependencies = [ + "bytes", +- "http 1.0.0", ++ "http", + ] + + [[package]] +@@ -1100,8 +1108,8 @@ + dependencies = [ + "bytes", + "futures-util", +- "http 1.0.0", +- "http-body 1.0.0", ++ "http", ++ "http-body", + "pin-project-lite", + ] + +@@ -1125,29 +1133,6 @@ + + [[package]] + name = "hyper" +-version = "0.14.28" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +-dependencies = [ +- "bytes", +- "futures-channel", +- "futures-core", +- "futures-util", +- "http 0.2.11", +- "http-body 0.4.6", +- "httparse", +- "httpdate", +- "itoa", +- "pin-project-lite", +- "socket2", +- "tokio", +- "tower-service", +- "tracing", +- "want", +-] +- +-[[package]] +-name = "hyper" + version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +@@ -1156,14 +1141,15 @@ + "futures-channel", + "futures-util", + "h2", +- "http 1.0.0", +- "http-body 1.0.0", ++ "http", ++ "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", ++ "want", + ] + + [[package]] +@@ -1173,13 +1159,17 @@ + checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" + dependencies = [ + "bytes", ++ "futures-channel", + "futures-util", +- "http 1.0.0", +- "http-body 1.0.0", +- "hyper 1.2.0", ++ "http", ++ "http-body", ++ "hyper", + "pin-project-lite", + "socket2", + "tokio", ++ "tower", ++ "tower-service", ++ "tracing", + ] + + [[package]] +@@ -1194,12 +1184,12 @@ + + [[package]] + name = "indexmap" +-version = "2.2.3" ++version = "2.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" ++checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" + dependencies = [ + "equivalent", +- "hashbrown 0.14.3", ++ "hashbrown 0.17.0", + ] + + [[package]] +@@ -1295,9 +1285,9 @@ + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.186" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + + [[package]] + name = "libloading" +@@ -1375,22 +1365,24 @@ + + [[package]] + name = "metrics" +-version = "0.22.1" ++version = "0.24.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd71d9db2e4287c3407fa04378b8c2ee570aebe0854431562cdd89ca091854f4" ++checksum = "ff56c2e7dce6bd462e3b8919986a617027481b1dcc703175b58cf9dd98a2f071" + dependencies = [ +- "ahash", + "portable-atomic", ++ "rapidhash", + ] + + [[package]] + name = "metrics-exporter-prometheus" +-version = "0.13.1" ++version = "0.16.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" ++checksum = "dd7399781913e5393588a8d8c6a2867bf85fb38eaf2502fdce465aad2dc6f034" + dependencies = [ +- "base64 0.21.7", +- "hyper 0.14.28", ++ "base64 0.22.1", ++ "http-body-util", ++ "hyper", ++ "hyper-util", + "indexmap", + "ipnet", + "metrics", +@@ -1398,20 +1390,22 @@ + "quanta", + "thiserror 1.0.57", + "tokio", ++ "tracing", + ] + + [[package]] + name = "metrics-util" +-version = "0.16.2" ++version = "0.19.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ece71ab046dcf45604e573329966ec1db5ff4b81cfa170a924ff4c959ab5451a" ++checksum = "b8496cc523d1f94c1385dd8f0f0c2c480b2b8aeccb5b7e4485ad6365523ae376" + dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +- "hashbrown 0.14.3", ++ "hashbrown 0.15.5", + "metrics", +- "num_cpus", + "quanta", ++ "rand 0.9.4", ++ "rand_xoshiro", + "sketches-ddsketch", + ] + +@@ -1961,14 +1955,30 @@ + ] + + [[package]] ++name = "r-efi" ++version = "5.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" ++ ++[[package]] + name = "rand" + version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" + dependencies = [ + "libc", +- "rand_chacha", +- "rand_core", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.4", ++] ++ ++[[package]] ++name = "rand" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" ++dependencies = [ ++ "rand_chacha 0.9.0", ++ "rand_core 0.9.5", + ] + + [[package]] +@@ -1978,7 +1988,17 @@ + checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" + dependencies = [ + "ppv-lite86", +- "rand_core", ++ "rand_core 0.6.4", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.9.5", + ] + + [[package]] +@@ -1987,7 +2007,34 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.12", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" ++dependencies = [ ++ "getrandom 0.3.4", ++] ++ ++[[package]] ++name = "rand_xoshiro" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" ++dependencies = [ ++ "rand_core 0.9.5", ++] ++ ++[[package]] ++name = "rapidhash" ++version = "4.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59" ++dependencies = [ ++ "rustversion", + ] + + [[package]] +@@ -2069,7 +2116,7 @@ + dependencies = [ + "cc", + "cfg-if", +- "getrandom", ++ "getrandom 0.2.12", + "libc", + "spin", + "untrusted", +@@ -2100,7 +2147,7 @@ + "fixedbitset 0.5.7", + "flume", + "futures-util", +- "http 1.0.0", ++ "http", + "log", + "matches", + "native-tls", +@@ -2122,7 +2169,7 @@ + + [[package]] + name = "rumqttd" +-version = "0.19.0" ++version = "0.20.0" + dependencies = [ + "async-tungstenite 0.25.0", + "axum", +@@ -2136,7 +2183,7 @@ + "parking_lot", + "pretty_assertions", + "pretty_env_logger", +- "rand", ++ "rand 0.8.5", + "rustls-pemfile", + "rustls-webpki", + "serde", +@@ -2466,9 +2513,9 @@ + + [[package]] + name = "sketches-ddsketch" +-version = "0.2.2" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" ++checksum = "0c6f73aeb92d671e0cc4dca167e59b2deb6387c375391bc99ee743f326994a2b" + + [[package]] + name = "slab" +@@ -2943,10 +2990,10 @@ + "byteorder", + "bytes", + "data-encoding", +- "http 1.0.0", ++ "http", + "httparse", + "log", +- "rand", ++ "rand 0.8.5", + "sha1", + "thiserror 1.0.57", + "url", +@@ -2962,10 +3009,10 @@ + "byteorder", + "bytes", + "data-encoding", +- "http 1.0.0", ++ "http", + "httparse", + "log", +- "rand", ++ "rand 0.8.5", + "rustls 0.23.17", + "rustls-pki-types", + "sha1", +@@ -3053,8 +3100,8 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" + dependencies = [ +- "getrandom", +- "rand", ++ "getrandom 0.2.12", ++ "rand 0.8.5", + ] + + [[package]] +@@ -3091,6 +3138,15 @@ + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] ++name = "wasip2" ++version = "1.0.3+wasi-0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" ++dependencies = [ ++ "wit-bindgen", ++] ++ ++[[package]] + name = "wasm-bindgen" + version = "0.2.91" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -3339,6 +3395,12 @@ + ] + + [[package]] ++name = "wit-bindgen" ++version = "0.57.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" ++ ++[[package]] + name = "ws_stream_tungstenite" + version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/ru/rumqttd/package.nix b/pkgs/by-name/ru/rumqttd/package.nix index e426d9139c0e..e22b81a2c7db 100644 --- a/pkgs/by-name/ru/rumqttd/package.nix +++ b/pkgs/by-name/ru/rumqttd/package.nix @@ -15,7 +15,12 @@ rustPlatform.buildRustPackage (finalAttrs: { tag = "rumqttd-${finalAttrs.version}"; hash = "sha256-WFhVSFAp5ZIqranLpU86L7keQaReEUXxxGhvikF+TBw="; }; - cargoHash = "sha256-UP1uhG+Ow/jN/B8i//vujP7vpoQ5PjYGCrXs0b1bym4="; + + # Bump vendored `metrics` past 0.24.2 which fixes a borrow-checker error + # under newer rustc (https://github.com/rust-lang/rust/issues/141402). + cargoPatches = [ ./bump-metrics.patch ]; + + cargoHash = "sha256-rVJBYOleIHFNwWNrz0JU8rwiMv9E1QfPjDvtrfXvWlQ="; buildAndTestSubdir = "rumqttd"; diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix index 247989343f6e..007c498ad761 100644 --- a/pkgs/by-name/ru/ruqola/package.nix +++ b/pkgs/by-name/ru/ruqola/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitLab, cmake, - extra-cmake-modules, kdePackages, qt6, nix-update-script, @@ -23,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index 1efa21210414..daed6eaab0fd 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -1,39 +1,36 @@ { - bash, - fetchFromGitHub, lib, rustPlatform, + fetchFromGitHub, versionCheckHook, nix-update-script, + bashNonInteractive, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-parallel"; - version = "1.21.0"; + version = "1.22.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "aaronriekenberg"; repo = "rust-parallel"; rev = "v${finalAttrs.version}"; - hash = "sha256-86CUFtq6XpTYL7zpDBBfbSXlPYhWofwMjJSK698lclI="; + hash = "sha256-6SDWYIJDoDKANYZvYM2hdFzXTyqbfRA2uKQDFn+6erg="; }; - cargoHash = "sha256-g2R3dEvDv3uzZVXBFvsCoX/M0XuHhoE/mMHni6qEN1g="; + cargoHash = "sha256-uFx0Sli6uwmhHKQoT1aX0S5NwuWLu3M6g5pQYYpAsEI="; - postPatch = '' - substituteInPlace tests/dummy_shell.sh \ - --replace-fail "/bin/bash" "${bash}/bin/bash" + checkInputs = [ bashNonInteractive ]; + + # Some test require the output of tracing which for some reason hides info if RUST_LOG is set to "" which it is by default + logLevel = "info"; + + preCheck = '' + patchShebangs ./tests/dummy_shell.sh ''; - checkFlags = [ - "--skip=runs_echo_commands_dry_run" - "--skip=test_keep_order_with_sleep" - - "--skip=runs_regex_command_with_dollar_signs" - "--skip=runs_regex_from_command_line_args_nomatch_1" - "--skip=runs_regex_from_input_file_badline_j1" - ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index f478c6f6c06f..055006a3ca85 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, openssl, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -20,10 +21,15 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-uP1lZarcwQhBKyASQIiNUs053EuxJy112P2e3hy2uZY="; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; env.OPENSSL_NO_VENDOR = true; + passthru.tests = { + inherit (nixosTests) rustical; + }; + meta = { description = "Yet another calendar server aiming to be simple, fast and passwordless"; homepage = "https://github.com/lennart-k/rustical"; diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index 5684f57ac98d..11c1b657625d 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -4,7 +4,7 @@ cctools, darwin, dotnetCorePackages, - fetchFromGitLab, + fetchFromForgejo, libx11, libgdiplus, moltenvk, @@ -34,10 +34,10 @@ buildDotnetModule rec { pname = "ryubing"; version = "1.3.3"; - src = fetchFromGitLab { + src = fetchFromForgejo { domain = "git.ryujinx.app"; - owner = "Ryubing"; - repo = "Ryujinx"; + owner = "projects"; + repo = "Ryubing"; tag = version; hash = "sha256-LhQaXxmj5HIgfmrsDN8GhhVXlXHpDO2Q8JtNLaCq0mk="; }; diff --git a/pkgs/by-name/ry/ryubing/updater.sh b/pkgs/by-name/ry/ryubing/updater.sh index a851801cccea..c89a86c3502e 100755 --- a/pkgs/by-name/ry/ryubing/updater.sh +++ b/pkgs/by-name/ry/ryubing/updater.sh @@ -6,7 +6,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" # If NEW_VERSION or COMMIT are not set, fetch the latest version if [ -z ${NEW_VERSION+x} ] && [ -z ${COMMIT+x} ]; then - RELEASE_DATA=$(curl -s "https://git.ryujinx.app/api/v4/projects/1/repository/tags?order_by=updated&sort=desc") + RELEASE_DATA=$(curl -s "https://git.ryujinx.app/api/v1/repos/projects/Ryubing/tags") if [ -z "$RELEASE_DATA" ] || [[ $RELEASE_DATA =~ "imposed ratelimits" ]]; then echo "failed to get release job data" >&2 exit 1 @@ -27,7 +27,7 @@ fi cd ../../../.. if [[ "${1-default}" != "--deps-only" ]]; then - SHA="$(nix-prefetch-git https://git.ryujinx.app/ryubing/ryujinx --rev "$NEW_VERSION" --quiet | jq -r '.sha256')" + SHA="$(nix-prefetch-git https://git.ryujinx.app/projects/Ryubing --rev "$NEW_VERSION" --quiet | jq -r '.sha256')" SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA") update-source-version ryubing "$NEW_VERSION" "$SRI" fi diff --git a/pkgs/by-name/s2/s2png/package.nix b/pkgs/by-name/s2/s2png/package.nix index cb6d617e80ad..3fc87a93f284 100644 --- a/pkgs/by-name/s2/s2png/package.nix +++ b/pkgs/by-name/s2/s2png/package.nix @@ -1,38 +1,32 @@ { lib, - stdenv, + rustPlatform, fetchFromGitHub, - diffutils, - gd, - pkg-config, }: -stdenv.mkDerivation (finalAttrs: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "s2png"; - version = "0.7.2"; + version = "1.0.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "dbohdan"; repo = "s2png"; rev = "v${finalAttrs.version}"; - sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; + sha256 = "sha256-BRVubGy5GpP0zhJ26DXBwlqflfZTnLVfhQk5qFj29x4="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - diffutils - gd - ]; - installFlags = [ - "prefix=" - "DESTDIR=$(out)" - ]; + cargoHash = "sha256-aka4q3Wh0s1iaIUJkPuL/2FnJH5KdbpOOWLIAWirBFk="; meta = { homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.dbohdan ]; + maintainers = with lib.maintainers; [ + dbohdan + kybe236 + ]; platforms = lib.platforms.unix; mainProgram = "s2png"; }; diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index 86fef3fafafc..c8f965653c42 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { maintainers = with lib.maintainers; [ pmeinhold ]; platforms = lib.platforms.linux; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://zimpl.zib.de/download/CHANGELOG.txt"; description = "Zuse Institute Mathematical Programming Language"; longDescription = '' diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index c1f3dc77015d..5a3b4ed4dfb4 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { "out" "doc" ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "man" ]; diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix index 11f0aa1ebda9..deb4fd651e2a 100644 --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -199,9 +199,9 @@ let }; buildAttrs = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then buildAttrsLinux - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then buildAttrsDarwin else throw "platform not supported"; diff --git a/pkgs/by-name/se/sendspin-go/package.nix b/pkgs/by-name/se/sendspin-go/package.nix index 6b4a94974662..34d2fc6a9ff2 100644 --- a/pkgs/by-name/se/sendspin-go/package.nix +++ b/pkgs/by-name/se/sendspin-go/package.nix @@ -12,18 +12,18 @@ buildGoModule (finalAttrs: { pname = "sendspin-go"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Sendspin"; repo = "sendspin-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-ME4LZp5NNLSAtdkIUZJWWWQTUr5Lt3y+HscJAR/AS7c="; + hash = "sha256-I4LhgW4uyA9m+tWQKhcAsh+55jtO77TP9AFBpGjGtJs="; }; __structuredAttrs = true; - vendorHash = "sha256-g2u3kkP6FUtHoCnY4PxqTp/d1wYQuz0uFZkeuobtl7U="; + vendorHash = "sha256-QAmC6bgOSlV8we9j3rDQ9V3sLdSvELu8zzn5UAw/uIY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/se/serve/package.nix b/pkgs/by-name/se/serve/package.nix index bfbfc44ddb32..7c7cd1eb0713 100644 --- a/pkgs/by-name/se/serve/package.nix +++ b/pkgs/by-name/se/serve/package.nix @@ -23,8 +23,8 @@ buildNpmPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-IJMu0XHwEn2TZP/He79FFGl/PeXOCTD51lIgmImpyKo="; + fetcherVersion = 3; + hash = "sha256-N5oasGilHECndJZYdRHZFvAa4aYwmPtOTBZtcty4g/k="; }; nativeBuildInputs = [ pnpm_9 ]; diff --git a/pkgs/by-name/se/serverpod_cli/package.nix b/pkgs/by-name/se/serverpod_cli/package.nix index a3c51d338071..8253189cefa2 100644 --- a/pkgs/by-name/se/serverpod_cli/package.nix +++ b/pkgs/by-name/se/serverpod_cli/package.nix @@ -8,14 +8,14 @@ }: buildDartApplication rec { pname = "serverpod_cli"; - version = "3.4.7"; + version = "3.4.8"; # Fetch the whole monorepo src = fetchFromGitHub { owner = "serverpod"; repo = "serverpod"; tag = version; - hash = "sha256-Axp8dmrAtcaiWAKB3H7e/ybUAIPx3++EVxRpwhGy/1U="; + hash = "sha256-JBMlOhfcb1Uv4CouBbu2ipq6lrPzJYPgp8Km17Q1hig="; }; sourceRoot = "${src.name}/tools/serverpod_cli"; diff --git a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json index 4d7a8f074a65..b0c3d37927f4 100644 --- a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json +++ b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json @@ -74,11 +74,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af", + "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.5" + "version": "8.12.6" }, "checked_yaml": { "dependency": "transitive", @@ -374,11 +374,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", + "sha256": "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.19" + "version": "0.12.20" }, "meta": { "dependency": "direct main", @@ -514,51 +514,51 @@ "dependency": "transitive", "description": { "name": "serverpod_client", - "sha256": "215f3d535f4e6beb2e8d1a7fcc467709d0d65454ae4bf33661d7f2b63f965bf3", + "sha256": "e3bd9dc071e81eca5c7d2647bd9220d2e1af5a3b8b551c1f701dd9b4bc6d6845", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.7" + "version": "3.4.8" }, "serverpod_lints": { "dependency": "direct dev", "description": { "name": "serverpod_lints", - "sha256": "d7f2e10538dda09bd3cf3f770b5201dac5aec9d59c3bc0f859d16a8c5ac0c324", + "sha256": "f12f6e48ca9790ca45a7489abef02aaa7882906f5a57e7c38e427538eb07540b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.7" + "version": "3.4.8" }, "serverpod_serialization": { "dependency": "direct main", "description": { "name": "serverpod_serialization", - "sha256": "2ddb7e6eda049925c8114f25ad58ed5bee86ebff020b146d5c9c35e153a8a925", + "sha256": "ccccb6f1b1103322a079848dafd32fec4455bc9923047c76cca6d2dbdcf7ded9", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.7" + "version": "3.4.8" }, "serverpod_service_client": { "dependency": "direct main", "description": { "name": "serverpod_service_client", - "sha256": "e8aa179181262cf3352748941d70952b366edd60697f30ce03c7f43cd7cb50f5", + "sha256": "03bd5c9fca5a3721bdb9a4b66f87b1b8e79abc7eeabe56e6b214ddea8170104a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.7" + "version": "3.4.8" }, "serverpod_shared": { "dependency": "direct main", "description": { "name": "serverpod_shared", - "sha256": "7b9720d2e0419cf9c79c1b246f9d799729246fbda5d225eaaf95051647a74764", + "sha256": "dc499d84279affb35175c4d3427f199b0586c279a6d05a3c8d346836e11d20b6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.7" + "version": "3.4.8" }, "shelf": { "dependency": "transitive", @@ -684,31 +684,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20", + "sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.31.0" + "version": "1.31.1" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e", + "sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.11" + "version": "0.7.12" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34", + "sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.17" + "version": "0.6.18" }, "test_descriptor": { "dependency": "direct dev", @@ -754,11 +754,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499", + "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.1.0" + "version": "15.2.0" }, "watcher": { "dependency": "direct main", diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index 5b5bffdadd70..0d4cdd1178fd 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -8,7 +8,8 @@ }: buildGoModule (finalAttrs: { pname = "sesh"; - version = "2.26.1"; + version = "2.26.2"; + __structuredAttrs = true; nativeBuildInputs = [ go-mockery @@ -19,7 +20,7 @@ buildGoModule (finalAttrs: { owner = "joshmedeski"; repo = "sesh"; tag = "v${finalAttrs.version}"; - hash = "sha256-egh50ajgs2ngB9eALk4xq7W1n8OrTYeMBRsveisH2LQ="; + hash = "sha256-zx3PvPBV+IP61i+eJOmuC+ck9sOFsZZ9jj1fD3p4ccI="; }; # NOTE: prevent crash when getting vendor deps/hash diff --git a/pkgs/by-name/sf/sfxr-qt/package.nix b/pkgs/by-name/sf/sfxr-qt/package.nix index 3395549600e2..f98e984f2bb2 100644 --- a/pkgs/by-name/sf/sfxr-qt/package.nix +++ b/pkgs/by-name/sf/sfxr-qt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + kdePackages, libsForQt5, cmake, SDL, @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - libsForQt5.extra-cmake-modules + kdePackages.extra-cmake-modules (python3.withPackages ( pp: with pp; [ pyyaml diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix index d2d70e1b6ce4..74eba4a8c2fb 100644 --- a/pkgs/by-name/sg/sg-323/package.nix +++ b/pkgs/by-name/sg/sg-323/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/sh/shadcn/package.nix b/pkgs/by-name/sh/shadcn/package.nix index dd8f3cda6e82..52e60403f530 100644 --- a/pkgs/by-name/sh/shadcn/package.nix +++ b/pkgs/by-name/sh/shadcn/package.nix @@ -30,8 +30,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces ; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-clTcaTar7m2jEX9cMPtSPeBtt17LaMzlwlLXhPKc+kk="; + fetcherVersion = 3; + hash = "sha256-OESxer0YIbWql3NgdhvUhgMW4wc0nIyUYRESjmM1A1s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shelfmark-frontend/package.nix b/pkgs/by-name/sh/shelfmark-frontend/package.nix deleted file mode 100644 index 95fcfeac6214..000000000000 --- a/pkgs/by-name/sh/shelfmark-frontend/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - buildNpmPackage, - shelfmark, -}: - -buildNpmPackage (finalAttrs: { - pname = "shelfmark-frontend"; - inherit (shelfmark) version src; - - sourceRoot = "${finalAttrs.src.name}/src/frontend"; - - npmDepsHash = "sha256-VCnxEcaqWo31oIpF6X8Lid4I/aaQCQZ9l9rV6TTqXPI="; - - installPhase = '' - runHook preInstall - cp -r dist $out - runHook postInstall - ''; - - meta = { - description = "Shelfmark frontend"; - homepage = "https://github.com/calibrain/shelfmark/tree/main/src/frontend"; - inherit (shelfmark.meta) changelog license maintainers; - }; -}) diff --git a/pkgs/by-name/sh/shelfmark/package.nix b/pkgs/by-name/sh/shelfmark/package.nix index ca13ad35ae59..18db8a5a8a52 100644 --- a/pkgs/by-name/sh/shelfmark/package.nix +++ b/pkgs/by-name/sh/shelfmark/package.nix @@ -1,15 +1,19 @@ { lib, stdenv, + buildNpmPackage, fetchFromGitHub, - python3Packages, + python314Packages, + nix-update-script, makeWrapper, nixosTests, - shelfmark-frontend, unrar-free, + _experimental-update-script-combinators, }: let + python3Packages = python314Packages; + pythonDeps = with python3Packages; [ flask flask-cors @@ -32,18 +36,35 @@ let authlib apprise ]; -in -stdenv.mkDerivation (finalAttrs: { - pname = "shelfmark"; - version = "1.2.1"; + + version = "1.2.3"; src = fetchFromGitHub { owner = "calibrain"; repo = "shelfmark"; - tag = "v${finalAttrs.version}"; - hash = "sha256-Fe7zu51gFG2QgcBWcGkFi64CdZW4ohZg+7jdmeMFVLI="; + tag = "v${version}"; + hash = "sha256-abRM2ZWfA5nyD0YF7BVmZ6AU37+qd7osjQVGqhjdEV0="; }; + frontend = buildNpmPackage (finalAttrs: { + pname = "shelfmark-frontend"; + inherit version src; + + sourceRoot = "${finalAttrs.src.name}/src/frontend"; + + npmDepsHash = "sha256-c/KDGUe+X4dfzbDXpkzYsEzvBxJjq46PTzqbgoCdGgw="; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "shelfmark"; + inherit version src; + nativeBuildInputs = [ python3Packages.wrapPython makeWrapper @@ -60,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r shelfmark $out/libexec/shelfmark cp -r data $out/libexec/data - ln -s ${finalAttrs.passthru.frontend} $out/libexec/frontend-dist + ln -s ${frontend} $out/libexec/frontend-dist makeWrapper ${python3Packages.python.interpreter} $out/bin/shelfmark \ --prefix PATH : ${ @@ -77,12 +98,21 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - frontend = shelfmark-frontend.override { - shelfmark = finalAttrs.finalPackage; - }; + inherit frontend; + tests = { inherit (nixosTests) shelfmark; }; + + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (nix-update-script { + extraArgs = [ + "--subpackage=frontend" + "--version=skip" + ]; + }) + ]; }; meta = { diff --git a/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch b/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch new file mode 100644 index 000000000000..291b61fc6954 --- /dev/null +++ b/pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch @@ -0,0 +1,134 @@ +From 12b0c98a4e844ab18545c8ba521ac1ef71301938 Mon Sep 17 00:00:00 2001 +From: Naomi Roberts +Date: Thu, 4 Dec 2025 19:59:48 +0000 +Subject: [PATCH] Remove Windows-specific dep + +Signed-off-by: Naomi Roberts +--- + electron/package.json | 1 - + electron/src/main/app.js | 17 +---------------- + electron/webpack.config.cjs | 4 +--- + package.json | 1 - + pnpm-lock.yaml | 11 ----------- + 5 files changed, 2 insertions(+), 32 deletions(-) + +diff --git a/electron/package.json b/electron/package.json +index a7b2bd3e..ce55d877 100644 +--- a/electron/package.json ++++ b/electron/package.json +@@ -26,7 +26,6 @@ + "electron-updater": "^6.8.4" + }, + "dependencies": { +- "@paymoapp/electron-shutdown-handler": "^1.1.2", + "@xhayper/discord-rpc": "^1.3.4", + "concurrently": "^9.2.1", + "jimp": "0.22.12", +diff --git a/electron/src/main/app.js b/electron/src/main/app.js +index 5875d276..682d3bb1 100644 +--- a/electron/src/main/app.js ++++ b/electron/src/main/app.js +@@ -7,7 +7,6 @@ import Jimp from 'jimp' + import fs from 'fs' + + import { BrowserWindow, MessageChannelMain, Notification, Tray, Menu, nativeImage, app, dialog, ipcMain, powerMonitor, shell, session } from 'electron' +-import electronShutdownHandler from '@paymoapp/electron-shutdown-handler' + + import { development, getWindowState, saveWindowState, getDefaultBounds } from './util.js' + import Discord from './discord.js' +@@ -157,21 +156,7 @@ export default class App { + notification.show() + }) + +- if (process.platform === 'win32') { +- app.setAppUserModelId('com.github.rockinchaos.shiru') +- // this message usually fires in dev-mode from the parent process +- process.on('message', data => { +- if (data === 'graceful-exit') this.destroy() +- }) +- electronShutdownHandler.setWindowHandle(this.mainWindow.getNativeWindowHandle()) +- electronShutdownHandler.blockShutdown('Saving torrent data...') +- electronShutdownHandler.on('shutdown', async () => { +- await this.destroy() +- electronShutdownHandler.releaseShutdown() +- }) +- } else { +- process.on('SIGTERM', () => this.destroy()) +- } ++ process.on('SIGTERM', () => this.destroy()) + + this.mainWindow.loadURL(development ? 'http://localhost:5000/app.html' : `file://${join(__dirname, '/app.html')}`) + +diff --git a/electron/webpack.config.cjs b/electron/webpack.config.cjs +index 716dfcf7..3c9e4d1f 100644 +--- a/electron/webpack.config.cjs ++++ b/electron/webpack.config.cjs +@@ -78,9 +78,7 @@ module.exports = [ + path: join(__dirname, 'build'), + filename: 'main.js' + }, +- externals: { +- '@paymoapp/electron-shutdown-handler': 'require("@paymoapp/electron-shutdown-handler")' +- }, ++ externals: {}, + resolve: { + aliasFields: [], + alias: { +diff --git a/package.json b/package.json +index 52de5f3a..470faf9d 100644 +--- a/package.json ++++ b/package.json +@@ -48,7 +48,6 @@ + "svelte-keybinds": "patches/svelte-keybinds.patch" + }, + "onlyBuiltDependencies": [ +- "@paymoapp/electron-shutdown-handler", + "bufferutil", + "electron", + "fs-native-extensions", +diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml +index c373d877..e774678a 100644 +--- a/pnpm-lock.yaml ++++ b/pnpm-lock.yaml +@@ -257,9 +257,6 @@ importers: + + electron: + dependencies: +- '@paymoapp/electron-shutdown-handler': +- specifier: ^1.1.2 +- version: 1.1.2 + '@xhayper/discord-rpc': + specifier: ^1.3.4 + version: 1.3.4(bufferutil@4.0.8)(utf-8-validate@6.0.4) +@@ -848,9 +845,6 @@ packages: + '@paralleldrive/cuid2@2.3.1': + resolution: {integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==} + +- '@paymoapp/electron-shutdown-handler@1.1.2': +- resolution: {integrity: sha512-/MIC+wdRlVw1Sm56qJcT17O/KBpQARP2tOcAgg1OKB4W83B9IyBBtIoLXkRlpCOEJnGEleuv5HiSBryUgwbFvQ==} +- + '@peculiar/asn1-cms@2.6.1': + resolution: {integrity: sha512-vdG4fBF6Lkirkcl53q6eOdn3XYKt+kJTG59edgRZORlg/3atWWEReRCx5rYE1ZzTTX6vLK5zDMjHh7vbrcXGtw==} + +@@ -4112,9 +4106,6 @@ packages: + node-addon-api@4.3.0: + resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} + +- node-addon-api@5.1.0: +- resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==} +- + node-addon-api@6.1.0: + resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} + +@@ -10823,8 +10814,6 @@ snapshots: + + node-addon-api@4.3.0: {} + +- node-addon-api@5.1.0: {} +- + node-addon-api@6.1.0: {} + + node-api-version@0.2.1: +-- +2.53.0 + diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix new file mode 100644 index 000000000000..71f050bff3e9 --- /dev/null +++ b/pkgs/by-name/sh/shiru/package.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + pnpm, + nodejs, + fetchFromGitHub, + python3, + electron_39, + makeDesktopItem, + makeBinaryWrapper, + copyDesktopItems, + fetchPnpmDeps, + pnpmConfigHook, + nix-update-script, +}: +let + electron = electron_39; +in +stdenv.mkDerivation (finalAttrs: { + pname = "shiru"; + version = "6.6.0"; + + src = fetchFromGitHub { + owner = "RockinChaos"; + repo = "shiru"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LccI6Z4hhkmzWHt0CKum9giJMVGm3qM0ZKNvChUCYQ4="; + }; + + patches = [ + # electron-shutdown-handler is only used on Windows and tries to download + # files during build + ./0001-Remove-Windows-specific-dep.patch + ]; + + nativeBuildInputs = [ + nodejs + pnpm + pnpmConfigHook + python3 + makeBinaryWrapper + copyDesktopItems + ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + prePnpmInstall = '' + cd electron + ''; + fetcherVersion = 3; + hash = "sha256-bTo6sEQuUghwm2I99WB7+akL4AOZ1ZN2ovaLWrd5MMg="; + }; + + buildPhase = '' + runHook preBuild + + cd electron + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + npm run web:build + + ./node_modules/.bin/electron-builder --dir \ + --c.electronDist=electron-dist \ + --c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/lib/shiru" + cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/shiru" + + install -Dm644 buildResources/icon.png "$out/share/icons/hicolor/512x512/apps/shiru.png" + + makeWrapper '${electron}/bin/electron' "$out/bin/shiru" \ + --add-flags "$out/share/lib/shiru/resources/app.asar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + --inherit-argv0 + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "shiru"; + exec = "shiru %U"; + icon = "shiru"; + desktopName = "Shiru"; + genericName = "Personal Media Library"; + comment = "Manage your personal media library, organize your collection, and stream your content in real time, no waiting required!"; + categories = [ + "Video" + "AudioVideo" + ]; + keywords = [ "Anime" ]; + mimeTypes = [ "x-scheme-handler/shiru" ]; + }) + ]; + + strictDeps = true; + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stream your personal media library in real-time"; + homepage = "https://github.com/RockinChaos/Shiru"; + changelog = "https://github.com/RockinChaos/Shiru/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + naomieow + ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "shiru"; + }; +}) diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index 0bc7c9ed2ed8..e7db98e5c729 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage (finalAttrs: { pname = "shogihome"; - version = "1.27.1"; + version = "1.27.2"; src = fetchFromGitHub { owner = "sunfish-shogi"; repo = "shogihome"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uns66oj5TGlIgOTayRqFa8wGntbgm9Molerzn5yJWDE="; + hash = "sha256-VaHIDhTYcGT4J7ken/Cz0QwSlL42RMcP4lqFR4P7/SM="; }; - npmDepsHash = "sha256-xl4B77luiMTT1L7E4FXP3q2lZT2WhUhH9zDu1HYAjQ0="; + npmDepsHash = "sha256-2NeiCpcX1j7z+PtIF3euQamVTa+6G4SEHPGk8IVC1Dw="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 28a6b33a7ac2..52bed4866986 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-5rghSHGigsw193OJLiVegjNs1qDj+sCq1KJ1J8oPnrA="; + fetcherVersion = 3; + hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shutter/package.nix b/pkgs/by-name/sh/shutter/package.nix index 8a8efe811e9e..78135dd6fddc 100644 --- a/pkgs/by-name/sh/shutter/package.nix +++ b/pkgs/by-name/sh/shutter/package.nix @@ -64,13 +64,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "shutter"; - version = "0.99.6"; + version = "0.99.7"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "shutter-project"; repo = "shutter"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-2wRPmTpFfgU8xW9Fyn1+TMowcKm3pukT1ck06IWPiGo="; + tag = finalAttrs.version; + sha256 = "sha256-iri4yj2DujsEfpa6u4f5bpaOhWL0h/XbSlolkSJgKgE="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 8a33b1575517..0ea34b0dec7c 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # Chromium's Darwin toolchain defines _LIBCPP_HARDENING_MODE itself; keep # cc-wrapper from injecting a conflicting default. - hardeningDisable = lib.optionals stdenv.isDarwin [ + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "libcxxhardeningfast" "libcxxhardeningextensive" ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config gclient2nix.gclientUnpackHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk xcodebuild ]; @@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: { glib pulseaudio ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.compiler-rt ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace modules/audio_device/linux/pulseaudiosymboltable_linux.cc \ --replace-fail "libpulse.so.0" "${pulseaudio}/lib/libpulse.so.0" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix Darwin Python script shebangs for sandbox builds patchShebangs build/mac/should_use_hermetic_xcode.py build/toolchain/apple/linker_driver.py @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace build/config/mac/BUILD.gn \ --replace-fail "apple-macos" "apple-darwin" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace modules/audio_device/linux/alsasymboltable_linux.cc \ --replace-fail "libasound.so.2" "${alsa-lib}/lib/libasound.so.2" ''; @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { ''; gnFlags = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags # are copied from pkgs/applications/networking/browsers/chromium/common.nix. ''target_os="linux"'' @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ''target_os="mac"'' ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"'' "use_sysroot=true" @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { "use_custom_libcxx=false" ''rust_sysroot_absolute="${buildPackages.rustc}"'' ] - ++ lib.optionals (stdenv.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [ ''host_toolchain="//build/toolchain/linux/unbundle:host"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'' ]; diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix index 763d3b4689e9..f2cd825097f3 100644 --- a/pkgs/by-name/si/simple-completion-language-server/package.nix +++ b/pkgs/by-name/si/simple-completion-language-server/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage { pname = "simple-completion-language-server"; - version = "0-unstable-2025-07-29"; + version = "0-unstable-2026-04-21"; src = fetchFromGitHub { owner = "estin"; repo = "simple-completion-language-server"; - rev = "cc57b08ebc68805266beacb512a453e16f86bf17"; - hash = "sha256-TiVzgwsP1KZxTxW71eQyp1bkDnyTaMJdBYmkdvl1RX0="; + rev = "f8319589ab87b18f441627999f4a8316dd712234"; + hash = "sha256-PKJVaj5et+afrMk7x/H/d/ygabjDALGKM3fr/16EKoQ="; }; - cargoHash = "sha256-M+kjdT9X69kdZcBHC2ChR7WGgxtcUaU8woE2bqhu8IM="; + cargoHash = "sha256-RgRmbQVZK/4U37CO8AjNQOqR/SXvL1TQU03LX7LnqPY="; buildFeatures = lib.optional withCitation [ "citation" ]; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 008c17992d87..b371758d3073 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -8,7 +8,7 @@ let pname = "simplex-chat-desktop"; - version = "6.4.11"; + version = "6.5.1"; sources = { "aarch64-linux" = fetchurl { @@ -17,7 +17,7 @@ let }; "x86_64-linux" = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-0b88H6eMYO+EgRnWzd9x/MUCr7CE/AHDZnKILQJS1DQ="; + hash = "sha256-xRHMdHaV+ppxAm1BDOP743N53oDnVPt8b7H+cRqzuZE="; }; }; diff --git a/pkgs/by-name/si/sirial/package.nix b/pkgs/by-name/si/sirial/package.nix index ec2f6325c5c4..ab6ea58cabc4 100644 --- a/pkgs/by-name/si/sirial/package.nix +++ b/pkgs/by-name/si/sirial/package.nix @@ -18,7 +18,7 @@ writableTmpDirAsHomeHook, buildVST3 ? true, - buildLV2 ? stdenv.isLinux, + buildLV2 ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix index 9461a0e0b1a4..5f89ef9d5ba5 100644 --- a/pkgs/by-name/si/siril/package.nix +++ b/pkgs/by-name/si/siril/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "siril"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitLab { owner = "free-astro"; repo = "siril"; tag = finalAttrs.version; - hash = "sha256-qE1K3/o7ubrIEWldRgus1quSVehJqjFxhsKb1HQPNLA="; + hash = "sha256-4arzjGhWr5avQKVUvF6HYmQMdbKGh75vNIahNOgsLxU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix index 1bfbd5db6c06..1cf9d00585b2 100644 --- a/pkgs/by-name/sl/slidev-cli/package.nix +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "slidev-cli"; - version = "52.14.2"; + version = "52.15.1"; src = fetchFromGitHub { owner = "slidevjs"; repo = "slidev"; tag = "v${finalAttrs.version}"; - hash = "sha256-dyvEY4jrptPt3FzOpjwkAv8akXXArzyobpzV2Y3fCr0="; + hash = "sha256-2SksaDC/OC53ZGyraS/WzySSbPEnlzdURGInZ2neQwU="; }; pnpmWorkspaces = [ "@slidev/cli..." ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; fetcherVersion = 3; - hash = "sha256-2BNnxPM608vRx1uQit2lf+IckLNX5/yG3fvpEeZF+C8="; + hash = "sha256-DGDzNvau1XjPjkGZqcFZGkjYd3cneXO/gCdnwjjkQDY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/sndpeek/ambiguous-complex.patch b/pkgs/by-name/sn/sndpeek/ambiguous-complex.patch new file mode 100644 index 000000000000..6d391f2a27b8 --- /dev/null +++ b/pkgs/by-name/sn/sndpeek/ambiguous-complex.patch @@ -0,0 +1,40 @@ +diff --git a/src/marsyas/MagFFT.cpp b/src/marsyas/MagFFT.cpp +index 056f998..525ffa8 100644 +--- a/src/marsyas/MagFFT.cpp ++++ b/src/marsyas/MagFFT.cpp +@@ -37,10 +37,10 @@ typedef struct { float re ; float im ; } complex ; + + #define CABS(x) hypot( (x).re, (x).im ) + +-complex cadd(), csub(), cmult(), smult(), cdiv(), conjg(), csqrt() ; ++::complex cadd(), csub(), cmult(), smult(), cdiv(), conjg(), csqrt() ; + +-extern complex zero ; +-extern complex one ; ++extern ::complex zero ; ++extern ::complex one ; + extern float synt ; + + +diff --git a/src/sndpeek/sndpeek.cpp b/src/sndpeek/sndpeek.cpp +index 77fca13..a95275f 100644 +--- a/src/sndpeek/sndpeek.cpp ++++ b/src/sndpeek/sndpeek.cpp +@@ -1583,7 +1583,7 @@ void displayFunc( ) + // take forward FFT; result in buffer as FFT_SIZE/2 complex values + rfft( (float *)buffer, g_fft_size/2, FFT_FORWARD ); + // cast to complex +- complex * cbuf = (complex *)buffer; ++ ::complex * cbuf = (::complex *)buffer; + + // reset drawing offsets + x = -1.8f; +@@ -1910,7 +1910,7 @@ void extract_buffer( ) + // take the forward fft, leaving fftsize/2 complex values + rfft( (float *)buffer, g_buffer_size/2, FFT_FORWARD ); + // cast to complex +- complex * cbuf = (complex *)buffer; ++ ::complex * cbuf = (::complex *)buffer; + + // get magnitude spectrum + for( i = 0; i < g_buffer_size/2; i++ ) diff --git a/pkgs/by-name/sn/sndpeek/package.nix b/pkgs/by-name/sn/sndpeek/package.nix index ae6082b93820..b28c4aee720d 100644 --- a/pkgs/by-name/sn/sndpeek/package.nix +++ b/pkgs/by-name/sn/sndpeek/package.nix @@ -15,17 +15,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "sndpeek"; - version = "1.4"; + version = "1.41"; src = fetchurl { url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${finalAttrs.version}.tgz"; - sha256 = "2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf"; + hash = "sha256-ZVMLZRDQfCCI5f+i5LEb34uHKqiTkT2pa2sBjnSyTk0="; }; - sourceRoot = "sndpeek-${finalAttrs.version}/src/sndpeek"; - # this patch adds -lpthread to the list of libraries, without it a - # symbol-not-found-error is thrown - patches = [ ./pthread.patch ]; + patches = [ + # this patch adds -lpthread to the list of libraries, without it a + # symbol-not-found-error is thrown + ./pthread.patch + # fix error: reference to 'complex' is ambiguous + ./ambiguous-complex.patch + ]; + + postPatch = '' + cd "src/sndpeek" + ''; buildInputs = [ libglut diff --git a/pkgs/by-name/sn/sndpeek/pthread.patch b/pkgs/by-name/sn/sndpeek/pthread.patch index b2f1d37da6be..b6d2c7b94828 100644 --- a/pkgs/by-name/sn/sndpeek/pthread.patch +++ b/pkgs/by-name/sn/sndpeek/pthread.patch @@ -1,11 +1,11 @@ -diff --git a/makefile.alsa b/makefile.alsa +diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa index 34fb848..cdaeaec 100644 ---- a/makefile.alsa -+++ b/makefile.alsa +--- a/src/sndpeek/makefile.alsa ++++ b/src/sndpeek/makefile.alsa @@ -4,7 +4,7 @@ CPP=g++ INCLUDES=-I../marsyas/ MARSYAS_DIR=../marsyas/ - CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c + CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c -LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile +LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -lpthread diff --git a/pkgs/by-name/sn/snouty/package.nix b/pkgs/by-name/sn/snouty/package.nix index db382182dbd5..7a0a158eee2f 100644 --- a/pkgs/by-name/sn/snouty/package.nix +++ b/pkgs/by-name/sn/snouty/package.nix @@ -5,22 +5,24 @@ installShellFiles, pkg-config, openssl, + writableTmpDirAsHomeHook, + podman, versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snouty"; - version = "0.3.5"; + version = "0.4.2"; src = fetchFromGitHub { owner = "antithesishq"; repo = "snouty"; tag = "v${finalAttrs.version}"; - hash = "sha256-lE0SHk2pkWPAMRI8seBhP4lMVyruhF8DKW/LSRkqcRw="; + hash = "sha256-LDcGeRiDYUKDrQZ8pXrRhPFLS0tE16wtgJ8AN3gIVd0="; }; - cargoHash = "sha256-b5FVhF+MVexf8ZV3+pUomzCA8fq1Un0g51aLg1muxRM="; + cargoHash = "sha256-IYprp5XEc2DSGWmf9IOKAHfnMX8JbmUWgvKK+CoA1i8="; nativeBuildInputs = [ installShellFiles @@ -39,6 +41,13 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh $releaseDir/build/snouty-*/out/_snouty ''; + useNextest = true; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + podman + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "version"; doInstallCheck = true; diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index ef2b6bcb5509..5d60ac9bf611 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -12,16 +12,18 @@ buildGoModule (finalAttrs: { pname = "sops"; - version = "3.12.2"; + version = "3.13.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "getsops"; repo = finalAttrs.pname; tag = "v${finalAttrs.version}"; - hash = "sha256-1VGaS0uhacxjNOP/USmFHlrewkGzRzrV6xamDXY8hgc="; + hash = "sha256-sJAK7iCVmjGAjQ0CBVsJI7L/GwHB9bvm354Cq3WQI1M="; }; - vendorHash = "sha256-HgfJMTTWzQ4+59nuy/et3KxQaZEcfrjcWSr/iOOdpb0="; + vendorHash = "sha256-aBHZPh5ib2BOxoHQH6q8GD/EJOb2x1OBBePicwoI6Gc="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/by-name/so/sortmerna/package.nix b/pkgs/by-name/so/sortmerna/package.nix index 18269b941cc4..9f229cf9958d 100644 --- a/pkgs/by-name/so/sortmerna/package.nix +++ b/pkgs/by-name/so/sortmerna/package.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: { "-DZLIB_STATIC=off" ]; + patches = [ + ./ssw-stdbool.patch + ]; + postPatch = '' # Fix missing pthread dependency for the main binary. substituteInPlace src/sortmerna/CMakeLists.txt \ diff --git a/pkgs/by-name/so/sortmerna/ssw-stdbool.patch b/pkgs/by-name/so/sortmerna/ssw-stdbool.patch new file mode 100644 index 000000000000..d2115cc9fec6 --- /dev/null +++ b/pkgs/by-name/so/sortmerna/ssw-stdbool.patch @@ -0,0 +1,13 @@ +diff --git a/include/ssw.h b/include/ssw.h +index 5259c95..32bb146 100644 +--- a/include/ssw.h ++++ b/include/ssw.h +@@ -35,7 +35,7 @@ struct _profile; + typedef struct _profile s_profile; + + #ifndef __cplusplus +-typedef unsigned char bool; ++#include + static const bool False = 0; + static const bool True = 1; + #endif diff --git a/pkgs/by-name/so/sosreport/os-release.patch b/pkgs/by-name/so/sosreport/os-release.patch new file mode 100644 index 000000000000..212727c0772d --- /dev/null +++ b/pkgs/by-name/so/sosreport/os-release.patch @@ -0,0 +1,9 @@ +--- a/sos/policies/distros/__init__.py ++++ b/sos/policies/distros/__init__.py +@@ -128,6 +128,8 @@ + return True + # next check os-release for a NAME or ID value we expect ++ if not os.path.exists(OS_RELEASE): ++ return False + with open(OS_RELEASE, "r", encoding='utf-8') as f: + return _check_release(f.read()) diff --git a/pkgs/by-name/so/sosreport/package.nix b/pkgs/by-name/so/sosreport/package.nix index af8f7c768f2d..7dc13ab50d97 100644 --- a/pkgs/by-name/so/sosreport/package.nix +++ b/pkgs/by-name/so/sosreport/package.nix @@ -7,18 +7,22 @@ python3Packages.buildPythonPackage rec { pname = "sosreport"; - version = "4.9.1"; + version = "4.11.1"; pyproject = true; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; tag = version; - hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE="; + hash = "sha256-HKGGA9SHCJjAaCPduPx1plUJ10nt3JYAr10J/69Sm/0="; }; build-system = [ python3Packages.setuptools ]; + patches = [ + ./os-release.patch + ]; + nativeBuildInputs = [ gettext ]; @@ -26,6 +30,7 @@ python3Packages.buildPythonPackage rec { dependencies = with python3Packages; [ packaging pexpect + python-magic pyyaml ]; @@ -43,5 +48,6 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/sosreport/sos"; license = lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index ff844e72587c..8fb4b6820388 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { "--disable-alsa" ]; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + enableParallelBuilding = true; strictDeps = true; diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index 9b88bdeb7d98..6e999b65c323 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -3,6 +3,7 @@ stdenv, rustPlatform, fetchFromGitHub, + fetchpatch2, protobuf, nix-update-script, testers, @@ -16,12 +17,20 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "sozu-proxy"; repo = "sozu"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-a/Pna2l1gRv4kxIyGUuUHlN+lIQemGjZXwM65Ccc24Y="; }; cargoHash = "sha256-9ZmlUUdtVAvri9v+EJb6vRQ7Yc3FjRwU5I5Xe8je9/c="; + patches = [ + # Fix build with Rust 1.82+ on Darwin: extern blocks must be unsafe. + (fetchpatch2 { + url = "https://github.com/sozu-proxy/sozu/commit/ec83fad967f2606d5d668679e138631a70ec7de5.patch?full_index=1"; + hash = "sha256-chXehutcI4+gDwY1uUPgE4t0fgGOsEHPP8gMsnXNB10="; + }) + ]; + nativeBuildInputs = [ protobuf ]; doCheck = false; @@ -38,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; homepage = "https://www.sozu.io"; - changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.agpl3Only; maintainers = [ ]; mainProgram = "sozu"; diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index a12a42888ddc..34886c03d2f4 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "spacectl"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-YXPiB/RZsilteKzoOAsQ2aJ1qIlKIicToSVpS8pUWd4="; + hash = "sha256-wUsbybT4kcm38LTcmDy3Khhtk4VlShpaEBOUL4AlfXE="; }; - vendorHash = "sha256-wc6pRnCdIL7Se98eDfyU5OMOghJ2VrR1POM7lHo3Af8="; + vendorHash = "sha256-W42yLY7zMl+ojkqW0+/NIbmgVMUm8JqRTCDWsfV6gys="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index d7f259024804..911948f33a97 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "spacetimedb"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "clockworklabs"; repo = "spacetimedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-wSJ1co0IpnNva6G9u5oZAjLIw5/bNxOvng2zp/YUFus="; + hash = "sha256-KlMkgxfsUoLJ4h05td62eKfqWl9fYQ61FTsA1COkQrQ="; }; - cargoHash = "sha256-O1Uug4Xny6AQnybQ978chz+2auY99MUI0o66r44gezI="; + cargoHash = "sha256-csiDZKGLcorwVemK0g8Vi0+/Zq+b2UtC047ROrC/nOI="; nativeBuildInputs = [ pkg-config @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=codegen" "--skip=publish" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flakes on darwin in nix build sandbox, timing out waiting for listen addr "--skip=cli_can_ping_spacetimedb_on_disk" "--skip=cli_can_publish_spacetimedb_on_disk" diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix index 226157212a55..46d8de4ffe87 100644 --- a/pkgs/by-name/sp/speed-dreams/package.nix +++ b/pkgs/by-name/sp/speed-dreams/package.nix @@ -39,7 +39,7 @@ }: let - glLibs = lib.optionals stdenv.isLinux [ + glLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libGLU libglut @@ -73,7 +73,7 @@ let stdenv.cc.cc.lib ]; runtimeLibPath = lib.makeLibraryPath runtimeLibs; - libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in stdenv.mkDerivation (finalAttrs: { version = "2.4.2"; @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace "$out/share/applications/speed-dreams.desktop" \ --replace-fail "Exec=$out/games/speed-dreams-2" "Exec=speed-dreams" - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' # Symlink for desktop icon mkdir -p $out/share/icons/hicolor/{96x96,scalable}/apps ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/icons/hicolor/96x96/apps/speed-dreams-2.png" @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapperArgs=( --prefix ${libPathVar} : "$out/lib/games/speed-dreams-2/lib:$out/lib:${runtimeLibPath}" ) - ${lib.optionalString stdenv.isLinux "makeWrapperArgs+=(--set SDL_VIDEODRIVER x11)"} + ${lib.optionalString stdenv.hostPlatform.isLinux "makeWrapperArgs+=(--set SDL_VIDEODRIVER x11)"} makeWrapper "$out/games/speed-dreams-2" "$out/bin/speed-dreams" "''${makeWrapperArgs[@]}" ''; @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { minizip rhash ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libGLU libglut diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index 7508ecf07a87..c9532cfabb7d 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { src ; inherit pnpm; - fetcherVersion = 2; - hash = "sha256-PTfZopse+9RS7qh0miLu3duYlWDfifZS254tZKqgxKk="; + fetcherVersion = 3; + hash = "sha256-NaKI2369TlF8DDMy6Q3RUqb2B2/T756Zd6gu4ATz/yc="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix index a44e694a70e2..91906e1f72d6 100644 --- a/pkgs/by-name/sp/spotify/darwin.nix +++ b/pkgs/by-name/sp/spotify/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.84.476"; + version = "1.2.88.483"; src = # WARNING: This Wayback Machine URL redirects to the closest timestamp. @@ -20,13 +20,13 @@ stdenv.mkDerivation { # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg if stdenv.hostPlatform.isAarch64 then (fetchurl { - url = "https://web.archive.org/web/20260228212834/https://download.scdn.co/SpotifyARM64.dmg"; - hash = "sha256-Zj5qATaW1QPTInC/Y/jZx2xq5eHG/OQixpj8DWUpEXY="; + url = "https://web.archive.org/web/20260501151114/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-rBoJ5PKge4pr90FqYwsG+6JqyKvc3sKyPXM7OXXEmz8="; }) else (fetchurl { - url = "https://web.archive.org/web/20260228213541/https://download.scdn.co/Spotify.dmg"; - hash = "sha256-4Lm4g0gAQ3EA7Sj2wDTbjEXRxcNoGWHLvdEx/57nry4="; + url = "https://web.archive.org/web/20260501151019/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-o/qDYnVhkrca2TBDoqxsKWq0QfDQyHdhU4llbmIGUBQ="; }); nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index 84527870ec55..8fe795e4681c 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.82.428.g0ac8be2b"; + version = "1.2.84.475.ga1a748ff"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "92"; + rev = "93"; # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { name = "spotify-${finalAttrs.version}-${finalAttrs.rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${finalAttrs.rev}.snap"; - hash = "sha512-/9lB4gLotYvM2QkHt8cKS8P4IXrBVzgoXEk4bWR3GQum0OnJqK/qCC9evmCZ7PAqbbyh5/8vSblM+QXXXiQiMA=="; + hash = "sha512-X9IslXh1MHExJpBu45mXnIowdhmvkBko+fupk23WhKNoUPSR37jbj5Ee4V2ZYKxCtgyDgX8Px1YKynu3KEVUFg=="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sqlit-tui/package.nix b/pkgs/by-name/sq/sqlit-tui/package.nix index 9d11745d6850..02b192d386f6 100644 --- a/pkgs/by-name/sq/sqlit-tui/package.nix +++ b/pkgs/by-name/sq/sqlit-tui/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "sqlit-tui"; - version = "1.3.1.1"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Maxteabag"; repo = "sqlit"; tag = "v${finalAttrs.version}"; - hash = "sha256-MG5ZhYrEdOVngDkFVU8gWx9Kpfn+UFcxkdimqv7lAVE="; + hash = "sha256-lcZe7EiN/wZllRO7KnXryoeGiUVBhSE4AYaRniZV6Cw="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix index cb9d521feffa..08fa8d0ca4cc 100644 --- a/pkgs/by-name/ss/ssh-vault/package.nix +++ b/pkgs/by-name/ss/ssh-vault/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ssh-vault"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "ssh-vault"; repo = "ssh-vault"; tag = finalAttrs.version; - hash = "sha256-BC10Nir/MUxhD6QSF8p7cDdlrscC72Eoot/u8RAwM8g="; + hash = "sha256-kJscLetdP4D6DzzERfohezdsJqGcm/dmYTC+ZxjvRvo="; }; - cargoHash = "sha256-NRFmCeL8ZhJ1Y29VPWK3Yqg6losB/9+QE/8GqpUeJTs="; + cargoHash = "sha256-XFKqEwWDg8FUeObhI6oOIXNh8c7gsWgSWy3YThExuU4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix index c9adc50fefea..782ddd4dcf50 100644 --- a/pkgs/by-name/st/star/package.nix +++ b/pkgs/by-name/st/star/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ xxd ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; enableParallelBuilding = true; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "CXXFLAGS_SIMD=" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export CXXFLAGS="$CXXFLAGS -DSHM_NORESERVE=0" ''; diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index 55efa152c717..b64a87251b15 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { preCheck = '' # Remove test that requires networking rm pkg/plugin/aqua/client/client_integration_test.go - ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' # Remove "[It] should make a request to fetch registries" test that fails on x86_64-darwin rm pkg/plugin/aqua/client/client_test.go ''} diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index fbacbcc72b92..92b10f2647f1 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; - version = "0-unstable-2026-05-03"; + version = "0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "molybdenumsoftware"; repo = "statix"; - rev = "91e28aa76179b5769e8eff7ff4b09464d0913f27"; - hash = "sha256-JDCJ8fgIs5ZdYygQxlR63H/V4VyfmVMR4FleWwAl+AM="; + rev = "f61bc82c0c90569de508f0c71a6ba7f4aba9cca7"; + hash = "sha256-4LtWT+BFSPaq5DXQPlZ+xVrW/osS9yhG5T0tEfSdczs="; }; cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ="; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = lib.optional withJson "json"; passthru.updateScript = nix-update-script { - version = "branch"; + extraArgs = [ "--version=branch" ]; }; meta = { diff --git a/pkgs/by-name/st/strobealign/include-cstdint.patch b/pkgs/by-name/st/strobealign/include-cstdint.patch new file mode 100644 index 000000000000..6b0536d588d4 --- /dev/null +++ b/pkgs/by-name/st/strobealign/include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/ext/robin_hood.h b/ext/robin_hood.h +index a8f3a78..1c1b1d8 100644 +--- a/ext/robin_hood.h ++++ b/ext/robin_hood.h +@@ -41,6 +41,7 @@ + + #include + #include ++#include + #include + #include + #include // only to support hash of smart pointers diff --git a/pkgs/by-name/st/strobealign/package.nix b/pkgs/by-name/st/strobealign/package.nix index 54f6e6ab866b..891544b36c54 100644 --- a/pkgs/by-name/st/strobealign/package.nix +++ b/pkgs/by-name/st/strobealign/package.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ah21ptyfZbgdJrtCCftYhGh1hfcJ9JpXNsXUp8pZDJw="; }; + patches = [ + ./include-cstdint.patch + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 0542002f0f6c..715d0d674b23 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -2,22 +2,25 @@ buildNpmPackage, fetchFromGitHub, lib, + nix-update-script, }: buildNpmPackage rec { pname = "stylelint"; - version = "17.0.0"; + version = "17.11.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; tag = version; - hash = "sha256-LQqKAKVdFJkIZQDwv2X6dxGDFPZ3xdTQIx+8kAlijDU="; + hash = "sha256-mJGZ7zZ9Fi1VEVHWKu9CmKJsCLdmiHe3mqoGM0OGTRw="; }; - npmDepsHash = "sha256-FdFM1Mo/P7jw+0nY8kR4ThTLJDxG8fp/tZiYSFzRSac="; + npmDepsHash = "sha256-RgXZgNEfx76XLrB4E8r/+a0Pi+82PVb/TOeUa0gFhTY="; dontNpmBuild = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Mighty CSS linter that helps you avoid errors and enforce conventions"; mainProgram = "stylelint"; diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix index e3bddfe28ecf..5171ce570fd6 100644 --- a/pkgs/by-name/su/substudy/package.nix +++ b/pkgs/by-name/su/substudy/package.nix @@ -26,6 +26,11 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "-p substudy" ]; + checkFlags = [ + # flaky: relies on sqlite ms timestamps differing across 3 quick inserts + "--skip=cache::tests::test_cache" + ]; + preCheck = '' # That's to make sure the `test_ai_request_static` # test has access to the cache at `$HOME/.cache` diff --git a/pkgs/by-name/su/subtitlecomposer/package.nix b/pkgs/by-name/su/subtitlecomposer/package.nix index e725df5c9e34..91c8ca2e58c0 100644 --- a/pkgs/by-name/su/subtitlecomposer/package.nix +++ b/pkgs/by-name/su/subtitlecomposer/package.nix @@ -2,11 +2,12 @@ lib, fetchFromGitLab, cmake, - extra-cmake-modules, - ffmpeg_6, + pkg-config, + ffmpeg_7, openal, stdenv, - libsForQt5, + qt6, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -21,16 +22,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zGbI960NerlOEUvhOLm+lEJdbhj8VFUfm8pkOYGRcGw="; }; + cmakeFlags = [ + "-DQT_MAJOR_VERSION=6" + "-DQT_FIND_PRIVATE_MODULES=ON" + ]; + nativeBuildInputs = [ cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook + kdePackages.extra-cmake-modules + pkg-config + qt6.wrapQtAppsHook ]; buildInputs = [ - ffmpeg_6 + ffmpeg_7 openal + qt6.qt5compat ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ kcodecs kconfig kconfigwidgets diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 5a04072a41a2..f2dad1fd6e10 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -2,21 +2,20 @@ lib, rustPlatform, fetchFromGitHub, - cmake, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "subxt"; - version = "0.44.2"; + version = "0.50.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-3yTX2H4T0nnA0Kh1Lx1/blK/Edd1ZOHQVEXiiOLxino="; + tag = "v${finalAttrs.version}"; + hash = "sha256-nMal78+TYZ1f9X/YZhsqOsEIrjxhi9fEcevnQW8u97o="; }; - cargoHash = "sha256-zJpzsPHK9Mq0KF0WvbBINxSQVr0m4Z5+M6/nFD8jiMg="; + cargoHash = "sha256-sqspcTwODoRzaaUSXT+2yPUTzUqcW1gNu0c1Lv9D1u0="; # Only build the command line client cargoBuildFlags = [ @@ -24,20 +23,21 @@ rustPlatform.buildRustPackage (finalAttrs: { "subxt" ]; - # Needed by wabt-sys - nativeBuildInputs = [ cmake ]; - # Requires a running substrate node doCheck = false; meta = { homepage = "https://github.com/paritytech/subxt"; - description = "Submit transactions to a substrate node via RPC"; + description = "Subxt is a CLI tool for interacting with chains in the Polkadot network"; + changelog = "https://github.com/paritytech/subxt/releases/tag/${finalAttrs.src.tag}"; mainProgram = "subxt"; license = with lib.licenses; [ gpl3Plus asl20 ]; - maintainers = [ lib.maintainers.FlorianFranzen ]; + maintainers = with lib.maintainers; [ + FlorianFranzen + kilyanni + ]; }; }) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 2f2e7b4892e6..9584cc17b9c7 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -18,7 +18,7 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "18.3.0"; + version = "18.5.0"; inherit nodejs; @@ -26,7 +26,7 @@ buildNpmPackage rec { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-3HzvVfbcNaXmjtqPxgWuR/yTD2vLa1+5cghk1MIPbMQ="; + hash = "sha256-LPLbHmUsFS0iw0iUfWrc4fXJ+/R33ne7aWcPKEtgtyc="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -69,7 +69,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-HAS7Nn2DLYLG8JeidWBVZAbP2fb0GwzQan7WOvJ5iLs="; + hash = "sha256-/hv9ItFH6k3Gn94/j2dp51LdVoGrUgDRHWewsLjq1Lg="; } ); diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 24c64a9ac658..48c85b702b36 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -37,7 +37,7 @@ buildGoModule { checkFlags = [ "-skip=^TestReturnDirElement/Sort_by_Date$" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Only failing on nix darwin. I suspect this is due to the way # darwin handles file permissions. "-skip=^TestCompressSelectedFiles" diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix index ba9d09b0d00f..98a09588b8f1 100644 --- a/pkgs/by-name/sv/svelte-check/package.nix +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; - fetcherVersion = 2; - hash = "sha256-3bsY31sp5hjTYhRiZniAMVb3kZ1EqOlbyOvljU8jHlY="; + fetcherVersion = 3; + hash = "sha256-43AIkVzpcq/Y+QO2k7pkr6CN340idXJEpie0gVdxra8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index b7122901b341..533851c95ed9 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; - fetcherVersion = 2; - hash = "sha256-v2X2WOEdrDwGO2q9IEjONpHeDFqVp3jGFYYjZ5uFLSE="; + fetcherVersion = 3; + hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sv/svxlink/package.nix b/pkgs/by-name/sv/svxlink/package.nix index 1b7a3bb3fd66..a19e96491929 100644 --- a/pkgs/by-name/sv/svxlink/package.nix +++ b/pkgs/by-name/sv/svxlink/package.nix @@ -40,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "RTLSDR_INCLUDE_DIRS" "${lib.getInclude rtl-sdr}/include") ]; + postPatch = '' + # match jsoncpp's c++17 ABI (string_view overloads); upstream pins c++11 + substituteInPlace cmake/Modules/FindSIGC2.cmake \ + --replace-fail '"--std=c++11"' '"--std=c++17"' + ''; + dontWrapQtApps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/swagger-cli/package.nix b/pkgs/by-name/sw/swagger-cli/package.nix deleted file mode 100644 index 6edc192d6741..000000000000 --- a/pkgs/by-name/sw/swagger-cli/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, -}: - -buildNpmPackage rec { - pname = "swagger-cli"; - version = "4.0.4"; - - src = fetchFromGitHub { - owner = "APIDevTools"; - repo = "swagger-cli"; - rev = "v${version}"; - sha256 = "sha256-WgzfSd57vRwa1HrSgNxD0F5ckczBkOaVmrEZ9tMAcRA="; - }; - - npmDepsHash = "sha256-go9eYGCZmbwRArHVTVa6mxL+kjvBcrLxKw2iVv0a5hY="; - - buildPhase = '' - npm run bump - ''; - - postInstall = '' - find $out/lib/node_modules -xtype l -delete - ''; - - meta = { - description = "Swagger 2.0 and OpenAPI 3.0 command-line tool"; - homepage = "https://apitools.dev/swagger-cli/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya ]; - mainProgram = "swagger-cli"; - }; -} diff --git a/pkgs/by-name/sw/swagger-typescript-api/package.nix b/pkgs/by-name/sw/swagger-typescript-api/package.nix index 564483ef58f0..609e16f551d5 100644 --- a/pkgs/by-name/sw/swagger-typescript-api/package.nix +++ b/pkgs/by-name/sw/swagger-typescript-api/package.nix @@ -9,10 +9,10 @@ }: let pname = "swagger-typescript-api"; - version = "13.7.2"; + version = "13.9.1"; node-modules-hash = { - "x86_64-linux" = "sha256-1Wy9RWNvMmxSY72Qcam/jCVwurGk4ms9PTR5tt6t03I="; + "x86_64-linux" = "sha256-QxnqTaV5oN5WoYvLzTckWrYAZVAUxTSLYHVTmmqhmgM="; }; in stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "acacode"; repo = "swagger-typescript-api"; rev = "v${version}"; - hash = "sha256-2sAE3wD/vUjaxvlhfrBRSErB3PsjQfi4UAcc4tU0le4="; + hash = "sha256-PnQ2aTj8oVUqoqM9voupfBqPu7MZSVflUtuGrXznifo="; }; node_modules = stdenv.mkDerivation { diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix index 7b983139f945..0115d0533378 100644 --- a/pkgs/by-name/sy/synapse-admin/package.nix +++ b/pkgs/by-name/sy/synapse-admin/package.nix @@ -27,10 +27,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rK1Tc1K3wx6/1J8TEw5Lb9g09gbt/1HoZdDrEFzxTQQ="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/Awesome-Technologies/synapse-admin/blob/master/package.json#L13 + ./yarn-4.14-support.patch + ]; + # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles yarnOfflineCache = stdenv.mkDerivation { pname = "yarn-deps"; - inherit (finalAttrs) version src; + inherit (finalAttrs) version src patches; nativeBuildInputs = [ yarn-berry ]; diff --git a/pkgs/by-name/sy/synapse-admin/yarn-4.14-support.patch b/pkgs/by-name/sy/synapse-admin/yarn-4.14-support.patch new file mode 100644 index 000000000000..7acf8fd001bc --- /dev/null +++ b/pkgs/by-name/sy/synapse-admin/yarn-4.14-support.patch @@ -0,0 +1,20 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1 +1,4 @@ +-yarnPath: .yarn/releases/yarn-4.4.1.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix index 5a5bb91918f1..f7780aa46890 100644 --- a/pkgs/by-name/t3/t3code/package.nix +++ b/pkgs/by-name/t3/t3code/package.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation ( dontFixup = true; postPatch = '' - for packageJson in \ - packages/{contracts,shared}/package.json - do - substituteInPlace "$packageJson" \ - --replace-fail '"prepare": "effect-language-service patch",' '"prepare": "true",' - done + substituteInPlace package.json \ + --replace-fail '"prepare": "effect-language-service patch",' '"prepare": "true",' ''; buildPhase = '' @@ -60,7 +56,16 @@ stdenv.mkDerivation ( --ignore-scripts \ --no-progress \ --frozen-lockfile \ - --os="*" + --os="linux" \ + --os="darwin" + + # Work around to prevent a Bun race that can omit this cyclic peer dependency bin link. + # See https://github.com/oven-sh/bun/pull/29014. + for updateBrowserslistDbBinDir in node_modules/.bun/update-browserslist-db@*/node_modules/.bin; do + if [ -d "$updateBrowserslistDbBinDir" ] && [ ! -e "$updateBrowserslistDbBinDir/browserslist" ]; then + ln -s ../browserslist/cli.js "$updateBrowserslistDbBinDir/browserslist" + fi + done runHook postBuild ''; @@ -75,13 +80,13 @@ stdenv.mkDerivation ( runHook postInstall ''; - outputHash = "sha256-MuP+L8PwV9gKbeiJXYtUpgyIAYPmq4G1FolP7uB9J3w="; + outputHash = "sha256-zO4LNUxU0q/+kKBtRQKNTzWHnmGT4ONMRkyJem3ei/o="; outputHashMode = "recursive"; }; in { pname = "t3code"; - version = "0.0.21"; + version = "0.0.22"; strictDeps = true; __structuredAttrs = true; @@ -89,7 +94,7 @@ stdenv.mkDerivation ( owner = "pingdotgg"; repo = "t3code"; tag = "v${finalAttrs.version}"; - hash = "sha256-e0U9DkEh20w1xq4P9Fri3bx2ifCiDK4G/vVPHDP+lXs="; + hash = "sha256-ZSUmu3FT+wpCLwpUv3yrFWC4EzcVvev9cZQ/FyeLjqI="; }; postPatch = '' @@ -178,7 +183,11 @@ stdenv.mkDerivation ( png2icns \ "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \ ${desktopIcon} - write-darwin-bundle "$out" "${appName}" t3code-desktop t3code + + # writeDarwinBundle is a shebangless bash script; run it explicitly via + # stdenv.shell to avoid Darwin's intermittent ENOEXEC fallback issues. + ${stdenv.shell} ${lib.getExe writeDarwinBundle} \ + "$out" "${appName}" t3code-desktop t3code '' + '' mkdir --parents \ diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 83d35290e482..8a5b9f20fe61 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, davfs2, cmake, - extra-cmake-modules, stdenv, pkg-config, kdePackages, diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index ca6b3f073e05..8199970b8f34 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.96.5"; + version = "1.98.0"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-vYYb+2OtuXftjGGG0zWJesHccrClB8YZpclv9KzNN/c="; + hash = "sha256-rm561u8Dfg9XhQF3PmZAMrZee9jcG0eS6tMOLr4eMZA="; }; - vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4="; + vendorHash = "sha256-mbxLXR2TBgiwyVGfLmMR5xWk+0f66mPDas95Wla70Lk="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ta/taskhound/package.nix b/pkgs/by-name/ta/taskhound/package.nix index 54239fc07df8..1df54f53b368 100644 --- a/pkgs/by-name/ta/taskhound/package.nix +++ b/pkgs/by-name/ta/taskhound/package.nix @@ -2,18 +2,19 @@ lib, python3, fetchFromGitHub, + writableTmpDirAsHomeHook, }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "taskhound"; - version = "1.0.0"; + version = "1.1.5"; pyproject = true; src = fetchFromGitHub { owner = "1r0BIT"; repo = "TaskHound"; tag = "v${finalAttrs.version}"; - hash = "sha256-qQ1OpJCgMcRKGkZCRjLiUO+u4SSIA/qExzq2K7m7BD8="; + hash = "sha256-OVCHdhfMkeFUgdvVY6uMBqWpJNIHE4cHFzy1XstvnyU="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -26,11 +27,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: { neo4j pycryptodome requests + rich + rich-argparse ]; nativeCheckInputs = with python3.pkgs; [ pytest-cov-stub pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # Flaky timing-dependent test + "test_rate_limit_accuracy" + "test_parallel_mode" ]; pythonImportsCheck = [ "taskhound" ]; diff --git a/pkgs/by-name/ta/tau-hydrogen/package.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix deleted file mode 100644 index e4fbc333a48e..000000000000 --- a/pkgs/by-name/ta/tau-hydrogen/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - meson, - ninja, - librsvg, - xcursorgen, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tau-hydrogen"; - version = "1.0.16"; - - src = fetchFromGitHub { - owner = "tau-OS"; - repo = "tau-hydrogen"; - rev = finalAttrs.version; - hash = "sha256-nnQ0lkHtkOjJhF4NSMqjt0deddYjMnHHlANlHoZS2wY="; - }; - - nativeBuildInputs = [ - meson - ninja - librsvg - xcursorgen - ]; - - meta = { - description = "GTK icon theme for tauOS"; - homepage = "https://github.com/tau-OS/tau-hydrogen"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix index f7a43380718c..9631bd23d3b7 100644 --- a/pkgs/by-name/ta/tauno-monitor/package.nix +++ b/pkgs/by-name/ta/tauno-monitor/package.nix @@ -10,6 +10,7 @@ gobject-introspection, wrapGAppsHook4, libadwaita, + nix-update-script, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tauno-monitor"; @@ -46,6 +47,8 @@ python3Packages.buildPythonApplication (finalAttrs: { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple serial port monitor"; homepage = "https://github.com/taunoe/tauno-monitor"; @@ -53,5 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ Cameo007 ]; mainProgram = "tauno-monitor"; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index 94b7a1e90bdf..1d836a91f6f1 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -5,16 +5,22 @@ }: buildGoModule (finalAttrs: { pname = "tdl"; - version = "0.19.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-EYS4EK0NmNHnvjMkf5AHrYpZeGw+n2ovFDLanbqpF4Y="; + hash = "sha256-xDCvZ6a7xW5kJ+3nsCQGASypzrosjihI0hlSobBWwj0="; }; - vendorHash = "sha256-GpqgH23eK0h2BYxjN5TNUWEOT72smYdUoD1Iy6L2jL4="; + vendorHash = "sha256-dMuDmW3WtXU1Awuw7KKSCk1o/GKpBfsrqfvb3wVNGWw="; + + postPatch = '' + rm go.work go.work.sum + go mod edit -replace github.com/iyear/tdl/core=./core + go mod edit -replace github.com/iyear/tdl/extension=./extension + ''; ldflags = [ "-s" @@ -22,6 +28,10 @@ buildGoModule (finalAttrs: { "-X=github.com/iyear/tdl/pkg/consts.Version=${finalAttrs.version}" ]; + env.GOGC = "50"; + + buildFlags = [ "-p=1" ]; + # Filter out the main executable subPackages = [ "." ]; diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 62f2db8b663e..f40a42d204e1 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -36,11 +36,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "teamspeak6-client"; - version = "6.0.0-beta3.4"; + version = "6.0.0-beta4"; src = fetchurl { url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz"; - hash = "sha256-ubpAigtYFwzjI4T8i7pWgAhA1pS9MQBQy63QkkbUvyc="; + hash = "sha256-tDMECBWmh4QJzyVdvlkQW7Mqu8Mn6JjFiXMJJS45Efg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix index 79e5e9bfe70c..32e86eb997c9 100644 --- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, adwaita-icon-theme, - libsForQt5, + kdePackages, gtk3, hicolor-icon-theme, jdupes, @@ -52,11 +52,12 @@ lib.checkListOfEnum "tela-circle-icon-theme: color variants" propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; # These fixup steps are slow and unnecessary for this package. # Package may install almost 400 000 small files. diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index 7af830eb456b..5d9d9ed04f69 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -5,7 +5,7 @@ gtk3, jdupes, adwaita-icon-theme, - libsForQt5, + kdePackages, hicolor-icon-theme, }: @@ -27,11 +27,12 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; # These fixup steps are slow and unnecessary. dontPatchELF = true; diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix index 38c2db566da5..4f681cba6af2 100644 --- a/pkgs/by-name/te/temporal-ui-server/package.nix +++ b/pkgs/by-name/te/temporal-ui-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "temporal-ui-server"; - version = "2.44.1"; + version = "2.49.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "ui-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-iZmyz6E28TN7ooyWCBBwULUOg2ZF6KYziC4omqOc8jw="; + hash = "sha256-cCYBMNkQZBdy1OpofI0THT9qDtYdsfI/rl3MWi0K1CU="; }; - vendorHash = "sha256-yScJo+GEGO2LIAts5WPzS4YjPHZK9wZtPrfRg1b7H2Q="; + vendorHash = "sha256-nw4OHa13kRvdR6IFop5eZiB+5+cJCry4sgTnercRq9s="; postInstall = '' mv $out/bin/server $out/bin/temporal-ui-server diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index fb9e36267f19..185cdfd8d26f 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-lq1SDXcmZsAxpFq7mAZo2dx72/qZS2PFx+NV1MsgyIk="; + hash = "sha256-uOX+PTNL6VPu+QN9RiWNonV+WRWYNEadRLvljy49M5Q="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-xeTeCPBUooWdGoRhAz2GOdTWnLvpbUM5UwzNRr56FcA="; + vendorHash = "sha256-LqkHHkX1kMuF4XtpxFPc6Xwas4B+jSMfMxSyv1nzerc="; excludedPackages = [ "test/flake" ]; diff --git a/pkgs/by-name/th/threatest/package.nix b/pkgs/by-name/th/threatest/package.nix index bfe605fd6cd5..959c75afe16a 100644 --- a/pkgs/by-name/th/threatest/package.nix +++ b/pkgs/by-name/th/threatest/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "threatest"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "DataDog"; repo = "threatest"; tag = "v${finalAttrs.version}"; - hash = "sha256-BMx+6InL5FF2MH83C6UJ50CSm0Zd69Fs6uwFnunvmqs="; + hash = "sha256-tfJGaAAe2eCKFg2OACgK/92vqZSTJUk3LUI8QOJY6/g="; }; proxyVendor = true; diff --git a/pkgs/by-name/ti/ticktick/package.nix b/pkgs/by-name/ti/ticktick/package.nix index d35f12d58fcc..a76980ddd4c1 100644 --- a/pkgs/by-name/ti/ticktick/package.nix +++ b/pkgs/by-name/ti/ticktick/package.nix @@ -19,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "8.0.0"; + version = "8.0.10"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "${baseUrl}/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb"; - hash = "sha256-s8mE66Tv3TyL4rMvok6cM5VM6pzWxPkiviS30KWcN1o="; + hash = "sha256-5zIhLpoqZM8+RC4YBhdDyMq2aEg31O8U6Q5gD8Bo9es="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "${baseUrl}/linux/linux_deb_arm64/ticktick-${finalAttrs.version}-arm64.deb"; - hash = "sha256-Lgfa4+VZH1XIAMZr7+RiwxZ1smswQOisOhmFSg2pyTE="; + hash = "sha256-R9dMGUiSXX/CRfVXoW3w2Gk1UfknfmNWoIqkhL/FRJs="; } else throw "Unsupported system: ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix deleted file mode 100644 index db4bd01300e2..000000000000 --- a/pkgs/by-name/ti/tidb/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildGo125Module, - fetchFromGitHub, -}: - -buildGo125Module (finalAttrs: { - pname = "tidb"; - version = "8.5.6"; - - src = fetchFromGitHub { - owner = "pingcap"; - repo = "tidb"; - tag = "v${finalAttrs.version}"; - hash = "sha256-sQ5hialileLC/ZpXoy5zfSnLZAL1I4aiiQf+y5LPIK8="; - }; - - vendorHash = "sha256-YJ47tC1pp+hDMIiKyzROypk+zX76r+c5O9qD2OkVmgw="; - - ldflags = [ - "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${finalAttrs.version}" - "-X github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEdition=Community" - ]; - - subPackages = [ "cmd/tidb-server" ]; - - meta = { - description = "Open-source, cloud-native, distributed, MySQL-Compatible database for elastic scale and real-time analytics"; - homepage = "https://pingcap.com"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ Makuru ]; - mainProgram = "tidb-server"; - }; -}) diff --git a/pkgs/by-name/ti/tiddlywiki/package.nix b/pkgs/by-name/ti/tiddlywiki/package.nix index 001fef2c9e1c..e5c2b4b31141 100644 --- a/pkgs/by-name/ti/tiddlywiki/package.nix +++ b/pkgs/by-name/ti/tiddlywiki/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tiddlywiki"; - version = "5.3.8"; + version = "5.4.0"; src = fetchFromGitHub { owner = "tiddlywiki"; repo = "tiddlywiki5"; tag = "v${finalAttrs.version}"; - hash = "sha256-nBBjD9JB4tliRJ5N1aK3pc9PzCHG1fByj7vWtKnNEzI="; + hash = "sha256-MvX10TwSRQxB8qqLtnlxCelDL6CDlSHGWccv4Xh630I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix index c9522a620638..49bbf01ba051 100644 --- a/pkgs/by-name/ti/tilt/assets.nix +++ b/pkgs/by-name/ti/tilt/assets.nix @@ -8,10 +8,17 @@ src, }: +let + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/tilt-dev/tilt/blob/master/web/package.json#L94 + ./yarn-4.14-support.patch + ]; +in stdenvNoCC.mkDerivation { pname = "tilt-assets"; src = "${src}/web"; - inherit version; + inherit version patches; nativeBuildInputs = [ nodejs @@ -22,6 +29,8 @@ stdenvNoCC.mkDerivation { name = "tilt-assets-deps"; src = "${src}/web"; + inherit patches; + nativeBuildInputs = [ yarn-berry ]; supportedArchitectures = builtins.toJSON { diff --git a/pkgs/by-name/ti/tilt/yarn-4.14-support.patch b/pkgs/by-name/ti/tilt/yarn-4.14-support.patch new file mode 100644 index 000000000000..44b7fd0a4008 --- /dev/null +++ b/pkgs/by-name/ti/tilt/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -6,4 +6,7 @@ enableGlobalCache: false + + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.9.3.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/ti/time12/package.nix b/pkgs/by-name/ti/time12/package.nix index d8de9cb1b581..e4d8f572babf 100644 --- a/pkgs/by-name/ti/time12/package.nix +++ b/pkgs/by-name/ti/time12/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/ti/timescaledb-tune/package.nix b/pkgs/by-name/ti/timescaledb-tune/package.nix index cad42b092ff0..4ae2ba0ff2ba 100644 --- a/pkgs/by-name/ti/timescaledb-tune/package.nix +++ b/pkgs/by-name/ti/timescaledb-tune/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "timescaledb-tune"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb-tune"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-SC91yO3P2Q2QachSfAAzz7ldcnZedZfcnVXHcFXNrIk="; + sha256 = "sha256-3jsRI/ZuFNxjDfRzWQWclUiuC2qrxtUxJ0gcmXXQLUw="; }; vendorHash = "sha256-7u3eceVDnzjhGguijJXbm40qyCPO/Q101Zr5vEcGEqs="; diff --git a/pkgs/by-name/ti/timr-tui/package.nix b/pkgs/by-name/ti/timr-tui/package.nix index de7e88f5bee3..8bef4a38dba3 100644 --- a/pkgs/by-name/ti/timr-tui/package.nix +++ b/pkgs/by-name/ti/timr-tui/package.nix @@ -28,10 +28,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # Enable upstream "sound" feature when requested buildFeatures = lib.optionals enableSound [ "sound" ]; - nativeBuildInputs = lib.optionals (enableSound && stdenv.isLinux) [ pkg-config ]; + nativeBuildInputs = lib.optionals (enableSound && stdenv.hostPlatform.isLinux) [ pkg-config ]; # Runtime/FFI deps for the sound feature (Linux) - buildInputs = lib.optionals (enableSound && stdenv.isLinux) [ + buildInputs = lib.optionals (enableSound && stdenv.hostPlatform.isLinux) [ (alsa-lib-with-plugins.override { plugins = [ alsa-plugins diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix index 68f67fff9ac8..151811fe2962 100644 --- a/pkgs/by-name/to/tofu-ls/package.nix +++ b/pkgs/by-name/to/tofu-ls/package.nix @@ -8,13 +8,15 @@ buildGoModule (finalAttrs: { pname = "tofu-ls"; - version = "0.4.1"; + version = "0.4.2"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "opentofu"; repo = "tofu-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-C38Iqk+1TplSeoZcdhskdtGYUqK1ABtInXQkPDnGCsg="; + hash = "sha256-B7y22tmD8PLO4FRI0rskffRQAZu8Kvi8TyzmjCYsWs8="; }; vendorHash = "sha256-Uq/4rd3OvCBhp53MEMLiWL/V6hkygwdBLSN8Wzwqoew="; @@ -48,6 +50,7 @@ buildGoModule (finalAttrs: { meta = { description = "OpenTofu Language Server"; homepage = "https://github.com/opentofu/tofu-ls"; + changelog = "https://github.com/opentofu/tofu-ls/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "tofu-ls"; diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix index 68e4b6380fcc..ecedeafae150 100644 --- a/pkgs/by-name/to/toml-test/package.nix +++ b/pkgs/by-name/to/toml-test/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "toml-test"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "toml-lang"; repo = "toml-test"; tag = "v${finalAttrs.version}"; - hash = "sha256-J5+JO+BrHzje3YmEC9WWA7U6fn+Eye4DQj/knVR+QhE="; + hash = "sha256-GqBH657RSIK7wyRRtSn5N3wAZSJazlvcw4wp2Zhbb9o="; }; vendorHash = "sha256-JcTW21Zva/7Uvc5AvW9H1IxAcaw3AU0FAdtI3IOtZAc="; diff --git a/pkgs/by-name/to/topydo/package.nix b/pkgs/by-name/to/topydo/package.nix index e25dad19a277..cd5844f1757e 100644 --- a/pkgs/by-name/to/topydo/package.nix +++ b/pkgs/by-name/to/topydo/package.nix @@ -2,31 +2,21 @@ lib, python3, fetchFromGitHub, - fetchpatch, glibcLocales, }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "topydo"; - version = "0.14"; + version = "0.16"; format = "setuptools"; src = fetchFromGitHub { owner = "topydo"; repo = "topydo"; - rev = finalAttrs.version; - sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb"; + tag = finalAttrs.version; + hash = "sha256-f31tp4VBMv1usViYN50IaGeyQpo3oRSf/WDz99UEpss="; }; - patches = [ - # fixes a failing test - (fetchpatch { - name = "update-a-test-reference-ics-file.patch"; - url = "https://github.com/topydo/topydo/commit/9373bb4702b512b10f0357df3576c129901e3ac6.patch"; - hash = "sha256-JpyQfryWSoJDdyzbrESWY+RmRbDw1myvTlsFK7+39iw="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ arrow glibcLocales @@ -44,7 +34,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { # Skip test that has been reported multiple times upstream without result: # bram85/topydo#271, bram85/topydo#274. preCheck = '' - substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls' + substituteInPlace test/test_revert_command.py --replace-fail 'test_revert_ls' 'dont_test_revert_ls' ''; env.LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 37ca49dd32e4..aa39229e81c9 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -102,7 +102,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); - version = "15.0.12"; + version = "15.0.13"; sources = { x86_64-linux = fetchurl { @@ -112,7 +112,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-PNGPJs25t+rG2TVLiWkLd96Iuq5XkOOEextnI+V1kJY="; + hash = "sha256-v21pvipaEPj3WzDybQkDxHLefl14ZMCOJDQAvJatSSU="; }; i686-linux = fetchurl { @@ -122,7 +122,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-Kqg4UTr1IPZkB3caBKMJu2Cj0q0v8ttrhc4JNBuWDA0="; + hash = "sha256-RPJUoRZlY1upYivnnDxSLJI2hoVII56PY7BeCN87lOc="; }; }; diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index 18b20a0cbc3e..a5b1107e143c 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "tor"; - version = "0.4.9.7"; + version = "0.4.9.8"; src = fetchurl { url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz"; - hash = "sha256-WnQPMvaIrInAZjRcOLR7ooawxDlNNRslH/SLalOUYY8="; + hash = "sha256-rB85Ti3Sqwh30n2Sj9DZ6GZi/jymr9/7n9m28PltBd4="; }; outputs = [ diff --git a/pkgs/by-name/to/torcs/without-data.nix b/pkgs/by-name/to/torcs/without-data.nix index fc33dbc6b556..07a10262b220 100644 --- a/pkgs/by-name/to/torcs/without-data.nix +++ b/pkgs/by-name/to/torcs/without-data.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "torcs-without-data"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { - url = "mirror://sourceforge/torcs/torcs-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-S5Z3NUX7NkEZgqbziXIF64/VciedTOVp8s4HsI6Jp68="; + url = "mirror://sourceforge/torcs/all-in-one/${finalAttrs.version}/torcs-${finalAttrs.version}.tar.bz2"; + sha256 = "sha256-+caehtKQKVRnRRsB14ONhQBbphNkSm/oo/hafGoDzUw="; }; patches = [ diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix index db5d3856d771..7e60406bfc9c 100644 --- a/pkgs/by-name/tr/transito/package.nix +++ b/pkgs/by-name/tr/transito/package.nix @@ -74,6 +74,6 @@ buildGoModule (finalAttrs: { maintainers = [ lib.maintainers.McSinyx ]; mainProgram = "transito"; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ts/tsshd/package.nix b/pkgs/by-name/ts/tsshd/package.nix index 451d1ad9a116..7f584dca4c3c 100644 --- a/pkgs/by-name/ts/tsshd/package.nix +++ b/pkgs/by-name/ts/tsshd/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "tsshd"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "trzsz"; repo = finalAttrs.pname; tag = "v${finalAttrs.version}"; - hash = "sha256-B5PTiz9luBxkDA9UMSkGYTcPbnXdL43rkFvbOUS5F6w="; + hash = "sha256-9llfXzAAQgAOeaD+o3AVyhP0uL88uQsCNlqAPNfzDVw="; }; - vendorHash = "sha256-dW05EoAVLqmiPRRG0R4KwKsSijZuxSe15iHkyCImtZY="; + vendorHash = "sha256-btTWkuLkT2e58TYqe0e/cE/0Try/g8XoahiABSSFaGU="; ldflags = [ "-s" diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 43eb7004e36b..526147fe0248 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -2,7 +2,7 @@ lib, stdenv, capnproto, - extra-cmake-modules, + kdePackages, fetchFromGitHub, fontconfig, installShellFiles, @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ capnproto - extra-cmake-modules + kdePackages.extra-cmake-modules installShellFiles pkg-config protobuf diff --git a/pkgs/by-name/tu/turingdb/package.nix b/pkgs/by-name/tu/turingdb/package.nix index ea231abddab7..091b7e8b7cb7 100644 --- a/pkgs/by-name/tu/turingdb/package.nix +++ b/pkgs/by-name/tu/turingdb/package.nix @@ -22,7 +22,7 @@ }: let - turingstdenv = if stdenv.isDarwin then llvmPackages_20.stdenv else stdenv; + turingstdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_20.stdenv else stdenv; in turingstdenv.mkDerivation (finalAttrs: { pname = "turingdb"; @@ -71,7 +71,7 @@ turingstdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals turingstdenv.isDarwin [ llvmPackages_20.openmp ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; cmakeFlags = [ (lib.cmakeBool "NIX_BUILD" true) @@ -80,7 +80,7 @@ turingstdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-lgomp") (lib.cmakeFeature "FLEX_INCLUDE_DIR" "${lib.getDev flex}/include") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "OpenMP_CXX_FLAGS" "-fopenmp") (lib.cmakeFeature "OpenMP_CXX_LIB_NAMES" "omp") (lib.cmakeFeature "OpenMP_omp_LIBRARY" "${lib.getLib llvmPackages_20.openmp}/lib/libomp.dylib") diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix index 304b21a9d7a9..03962bdf8073 100644 --- a/pkgs/by-name/tu/turtle-build/package.nix +++ b/pkgs/by-name/tu/turtle-build/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -17,14 +19,20 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-JZU0Xam4NPiOHdXDtJsTBjOQnaDWReSZMD33sQxeUzQ="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Ninja-compatible build system for high-level programming languages written in Rust"; homepage = "https://github.com/raviqqe/turtle-build"; + changelog = "https://github.com/raviqqe/turtle-build/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "turtle"; }; }) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 051fe263bb78..f0088c68dabe 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -8,11 +8,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "345.260424.1"; + version = "348.260506.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-B0YXpJ75b6N2UNJSOwDd0bgsM4qzJGfYX/ELQk+IQO4="; + hash = "sha256-SzhC2ZF60SfXugpb4RGHV26jtXRqquznzvgr/h8iUyc="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 3340cbd3e001..ad3b51b0bb6a 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -7,6 +7,9 @@ # nativeBuildInputs installShellFiles, + # buildInputs + rust-jemalloc-sys, + buildPackages, versionCheckHook, nix-update-script, @@ -38,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-A/oJeFIY/+Pu9jYp3hwGwkSAXfF0VLTHKGP48wsnheo="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ rust-jemalloc-sys ]; # `ty`'s tests use `insta-cmd`, which depends on the structure of the `target/` directory, # and also fails to find the environment variable `$CARGO_BIN_EXE_ty`, which leads to tests failing. diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix index 186e071f5930..37d341918bb6 100644 --- a/pkgs/by-name/ty/typeshare/package.nix +++ b/pkgs/by-name/ty/typeshare/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, installShellFiles, stdenv, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -13,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8Pm+z407FDBLy0Hq2+T1rttFKnRWTNPPYTCn11SHcS8="; }; @@ -30,6 +32,11 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/typeshare completions zsh) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Command Line Tool for generating language files with typeshare"; mainProgram = "typeshare"; @@ -39,6 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 # or mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 87fab88b53a6..8ebb5226dd57 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -41,8 +41,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces postPatch ; - fetcherVersion = 2; - hash = "sha256-ztig1B10cQQy+4XKZjwwlCxGenwcU+C28TfTWHqZ59Y="; + fetcherVersion = 3; + hash = "sha256-wZvnRSALrupyhpSN8zNL3b6SZnVPXX3BdHrbzHUNtUg="; }; postPatch = '' diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 729552c62856..a084aef8a576 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typos"; - version = "1.45.2"; + version = "1.46.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${finalAttrs.version}"; - hash = "sha256-bribbiFYA8YYT6ZJNVyZ2l6FrAlfSuQ/WldqmHHG5lI="; + hash = "sha256-lABMjUOopauvfMF86SWO8YYIxNimzuFC2FnrOYT7Tfk="; }; - cargoHash = "sha256-cdAjIRWaMWPDJuJg9mw/8Ky8ePYCIFzmn0Ir00UO5HM="; + cargoHash = "sha256-WQeprJvfvH50Wmh7m8WThGE8T4ewbIYicfacQghd2ao="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml index 9b3c869859c7..9f4ec4eaa061 100644 --- a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml +++ b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml @@ -1744,6 +1744,16 @@ license = [ ] homepage = "https://github.com/mgoulao/arkheion" +[arnoptical."0.1.0"] +url = "https://packages.typst.org/preview/arnoptical-0.1.0.tar.gz" +hash = "sha256-F0NWM2AgC5Yq97Hzu3d0X8jkZIL95IGPYxAv1RXLihc=" +typstDeps = [] +description = "Select Arno Pro optical text faces by point size" +license = [ + "MIT", +] +homepage = "https://github.com/adam-rocska/arno-pro-optical-text-typst" + [articulate-coderscompass."0.1.7"] url = "https://packages.typst.org/preview/articulate-coderscompass-0.1.7.tar.gz" hash = "sha256-XyH0cQZHBNGCN8Abq95anO9nGt5bS8e7tC2AknVIiuY=" @@ -1854,6 +1864,19 @@ license = [ ] homepage = "https://github.com/breezykermo/aspirationally" +[astro."0.1.0"] +url = "https://packages.typst.org/preview/astro-0.1.0.tar.gz" +hash = "sha256-ID/j5J+5g2jADqSWOB38iKjLzzk2nNJ6xNbBYyUsLUA=" +typstDeps = [ + "cetz_0_5_0", + "suiji_0_5_1", +] +description = "Draw beautiful astronomical diagrams" +license = [ + "MIT", +] +homepage = "https://github.com/AnvarAtayev/astro" + [athena-tu-darmstadt-exercise."0.2.0"] url = "https://packages.typst.org/preview/athena-tu-darmstadt-exercise-0.2.0.tar.gz" hash = "sha256-dtDAL9DwtJStoXylWkSWIfYJcV24lB5kw9fC9YXwJME=" @@ -2133,6 +2156,18 @@ license = [ ] homepage = "https://github.com/felsenhower/typst-autograph.git" +[awesome-mff-cuni."0.1.0"] +url = "https://packages.typst.org/preview/awesome-mff-cuni-0.1.0.tar.gz" +hash = "sha256-Iw2kwl07R8vJh3FgZeW61FGNotQQwAY4VFuFhQCVhgk=" +typstDeps = [ + "ctheorems_1_1_3", +] +description = "Thesis at the Faculty of Mathematics and Physics, Charles University, Prague" +license = [ + "MIT", +] +homepage = "https://git.brloh.is/petrvel/awesome-mff-cuni" + [axiom."0.1.0"] url = "https://packages.typst.org/preview/axiom-0.1.0.tar.gz" hash = "sha256-X3oNohSxztgI2VM51ascgXgVwegIlKT6GaXXnNAvdmI=" @@ -2143,6 +2178,18 @@ license = [ ] homepage = "https://github.com/SimonBure/axiom" +[axiomst."0.2.1"] +url = "https://packages.typst.org/preview/axiomst-0.2.1.tar.gz" +hash = "sha256-fBnNsF02s/sEP8DYTEA5tAEId0tJH33p11lLhoaQf64=" +typstDeps = [ + "showybox_2_0_4", +] +description = "Academic homework and presentation slides template" +license = [ + "MIT", +] +homepage = "https://github.com/rezaarezvan/axiomst" + [axiomst."0.2.0"] url = "https://packages.typst.org/preview/axiomst-0.2.0.tar.gz" hash = "sha256-ybl0v51WBzb5BZTq0F8FQX/as8Q+ET0bcInejK/OpqM=" @@ -3141,6 +3188,16 @@ license = [ ] homepage = "https://github.com/alexanderkoller/typst-blinky" +[bloated-neurips."0.8.0"] +url = "https://packages.typst.org/preview/bloated-neurips-0.8.0.tar.gz" +hash = "sha256-pRHdBzn1FPdIN0qXNM1DSQ9W8eq4X3LkIClUVcNrtgo=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + [bloated-neurips."0.7.0"] url = "https://packages.typst.org/preview/bloated-neurips-0.7.0.tar.gz" hash = "sha256-9keS/3dURmiljmkXje5HEnrGRclAPsclMFry8IEEA54=" @@ -3193,6 +3250,16 @@ license = [ ] homepage = "https://github.com/daleione/blockcell" +[blockst."0.2.0"] +url = "https://packages.typst.org/preview/blockst-0.2.0.tar.gz" +hash = "sha256-CPJfG++y2NXbdFRsMxjE2MyGjywVd4CpP9NCnVTONc0=" +typstDeps = [] +description = "Render Scratch-style blocks for educational documents" +license = [ + "MIT", +] +homepage = "https://github.com/Loewe1000/blockst" + [blockst."0.1.0"] url = "https://packages.typst.org/preview/blockst-0.1.0.tar.gz" hash = "sha256-32T2QAleiOZZ1tFREdvsv3wos8oP01GpM8P0KJuXFV0=" @@ -3203,6 +3270,30 @@ license = [ ] homepage = "https://github.com/Loewe1000/blockst" +[bluenote-ist."0.1.1"] +url = "https://packages.typst.org/preview/bluenote-ist-0.1.1.tar.gz" +hash = "sha256-WmxgjBEQMulU6rAZ/F88w1xaKJQVHSaTfmknvfklkJA=" +typstDeps = [ + "numbly_0_1_0", + "touying_0_7_3", +] +description = "Seminar slides at the Institute of Science Tokyo" +license = [ + "MIT", +] + +[bluenote-ist."0.1.0"] +url = "https://packages.typst.org/preview/bluenote-ist-0.1.0.tar.gz" +hash = "sha256-CaRN+GQn6SUrgB2DS7SoxSl0/t0PeMqxe8cOFZDRZrA=" +typstDeps = [ + "numbly_0_1_0", + "touying_0_7_2", +] +description = "Seminar slides at the Institute of Science Tokyo" +license = [ + "MIT", +] + [board-n-pieces."0.9.0"] url = "https://packages.typst.org/preview/board-n-pieces-0.9.0.tar.gz" hash = "sha256-al0YD3QVzCTSLoDpNPKeRNhNIMzkKigDtenEuMKZVwQ=" @@ -3321,6 +3412,18 @@ license = [ ] homepage = "https://github.com/LucaCiucci/bob-typ" +[bone."0.1.0"] +url = "https://packages.typst.org/preview/bone-0.1.0.tar.gz" +hash = "sha256-ufg5R3huYGdc4jm4YVJXyFDNXJCKwLaZz+1qBVjeB2U=" +typstDeps = [ + "cetz_0_5_0", +] +description = "A package to draw structural analysis and kinematic diagrams" +license = [ + "MPL-2.0", +] +homepage = "https://codeberg.org/grangelouis/bone" + [bone-resume."0.3.1"] url = "https://packages.typst.org/preview/bone-resume-0.3.1.tar.gz" hash = "sha256-ExZTdl1lFzyqLs8hyV55awurZ7ITRo5bHuc++YpYM7A=" @@ -3400,6 +3503,24 @@ license = [ "Apache-2.0", ] +[bookly."3.1.1"] +url = "https://packages.typst.org/preview/bookly-3.1.1.tar.gz" +hash = "sha256-Vn6lpfnmposJzEpMph/Ev9KfiBELfTrAD23V51fLXzE=" +typstDeps = [ + "equate_0_3_2", + "hydra_0_6_2", + "itemize_0_2_0", + "marginalia_0_3_1", + "showybox_2_0_4", + "suboutline_0_3_0", + "subpar_0_2_2", +] +description = "Book template for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/bookly" + [bookly."3.1.0"] url = "https://packages.typst.org/preview/bookly-3.1.0.tar.gz" hash = "sha256-naxtI0cJfWQ6GiZO5MDuItfGqzAo4pPnkOXWogEBYjQ=" @@ -3740,6 +3861,18 @@ license = [ ] homepage = "https://github.com/tndrle/briefs" +[brilliant-cv."4.0.1"] +url = "https://packages.typst.org/preview/brilliant-cv-4.0.1.tar.gz" +hash = "sha256-4VKrhm5fQg9dJoXYLqvb/+kKuGzB4klWtHawKZ/C7CA=" +typstDeps = [ + "fontawesome_0_6_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/yunanwg/brilliant-CV" + [brilliant-cv."3.3.0"] url = "https://packages.typst.org/preview/brilliant-cv-3.3.0.tar.gz" hash = "sha256-L1Y8wjiZah/KMUsVVKikf2rMtw3Q4OsacL4tepdwuMo=" @@ -4309,6 +4442,16 @@ license = [ ] homepage = "https://github.com/knuesel/callisto" +[calloutly."1.1.0"] +url = "https://packages.typst.org/preview/calloutly-1.1.0.tar.gz" +hash = "sha256-0F6IRJa4trVMSOCNLZ1UzfQ4zmvkP7gxfHL69jk3VdA=" +typstDeps = [] +description = "Create customizable Markdown-style Callouts" +license = [ + "MIT", +] +homepage = "https://github.com/Alpha9463/typst-callout" + [calloutly."1.0.0"] url = "https://packages.typst.org/preview/calloutly-1.0.0.tar.gz" hash = "sha256-DlcM6IksbBoXbyT2Dn2nmLJWhWQ8B34dzzxO0xFkQgQ=" @@ -4383,6 +4526,30 @@ license = [ ] homepage = "https://github.com/VincentTam/pycantonese-parser" +[cap-able."0.1.0"] +url = "https://packages.typst.org/preview/cap-able-0.1.0.tar.gz" +hash = "sha256-HYKhutXlxFYdkSu5+BpynmyaUnNWCx2emHWRDc8ARmg=" +typstDeps = [ + "tablem_0_3_0", +] +description = "Professional three-line tables and figures with bilingual captions, continued tables/figures, subfigures, and 25+ language support for academic documents" +license = [ + "MIT", +] +homepage = "https://github.com/SchrodingerBlume/typst-cap-able" + +[cap-able."0.0.2"] +url = "https://packages.typst.org/preview/cap-able-0.0.2.tar.gz" +hash = "sha256-omVA2eYF55lnlgP5M466KkOIZvdEnnuS6Jj1K7EWYIs=" +typstDeps = [ + "tablem_0_3_0", +] +description = "Professional three-line tables and figures with bilingual captions, continued tables/figures, subfigures, and 25+ language support for academic documents" +license = [ + "MIT", +] +homepage = "https://github.com/SchrodingerBlume/typst-cap-able" + [cap-able."0.0.1"] url = "https://packages.typst.org/preview/cap-able-0.0.1.tar.gz" hash = "sha256-4kAQOkYi5T6Ch8R8lPFPoSpJ7GITGu3dwUBNZ7u5Ro8=" @@ -5061,6 +5228,16 @@ license = [ ] homepage = "https://github.com/csimide/SEU-Typst-Template" +[chef-cookbook."0.3.0"] +url = "https://packages.typst.org/preview/chef-cookbook-0.3.0.tar.gz" +hash = "sha256-APKz/NWasu4lOeps8Rd/Xaq5qPKJ5h6td+GN1pM2S6Q=" +typstDeps = [] +description = "Create simple recipe collections and cookbooks" +license = [ + "MIT", +] +homepage = "https://github.com/Paulmue0/cookbook" + [chef-cookbook."0.2.0"] url = "https://packages.typst.org/preview/chef-cookbook-0.2.0.tar.gz" hash = "sha256-J1Ml51ay/V1GYAperDxeSP/5cqXYIkYXAo7fm9o8WIY=" @@ -5135,6 +5312,16 @@ license = [ ] homepage = "https://github.com/JamesxX/chemicoms-paper" +[cheq."0.3.1"] +url = "https://packages.typst.org/preview/cheq-0.3.1.tar.gz" +hash = "sha256-ZvBXeudBgoDhLcRfLiQO1WyDZylvXzNxQe66qsqVNB8=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + [cheq."0.3.0"] url = "https://packages.typst.org/preview/cheq-0.3.0.tar.gz" hash = "sha256-v/iuiH/dHNHTXRF9beWMQ61GCyo1qBh6/mSbrjhYUxw=" @@ -5326,6 +5513,16 @@ license = [ ] homepage = "https://github.com/soxfox42/chordish" +[chordx."0.7.0"] +url = "https://packages.typst.org/preview/chordx-0.7.0.tar.gz" +hash = "sha256-BtSAZgbtM9qnom95CVJWWAW6a5OMQvT8hbx2vFG8Ak0=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + [chordx."0.6.1"] url = "https://packages.typst.org/preview/chordx-0.6.1.tar.gz" hash = "sha256-qmXQLHMDGw98RjjzJnKPXTJTjjtRB1aR9teNeI4UEdE=" @@ -5908,6 +6105,28 @@ license = [ ] homepage = "https://github.com/daskol/typst-templates" +[classic-thesis-uct."0.1.1"] +url = "https://packages.typst.org/preview/classic-thesis-uct-0.1.1.tar.gz" +hash = "sha256-LXxM8JARS/v/X0IwmpKFXdSMlB9wJTxbWfFL0C0Z3Xk=" +typstDeps = [] +description = "PhD thesis at the University of Cape Town in the Classic Thesis tradition" +license = [ + "GPL-2.0-or-later", + "MIT-0", +] +homepage = "https://github.com/james-hepworth/classic-thesis-uct" + +[classic-thesis-uct."0.1.0"] +url = "https://packages.typst.org/preview/classic-thesis-uct-0.1.0.tar.gz" +hash = "sha256-4bdYUY7IpVaoUr+lVAx72JT111OYAboh4f8CsQqB0LY=" +typstDeps = [] +description = "PhD thesis at the University of Cape Town in the Classic Thesis tradition" +license = [ + "GPL-2.0-or-later", + "MIT-0", +] +homepage = "https://github.com/james-hepworth/classic-thesis-uct" + [classic-tud-math-thesis."0.1.0"] url = "https://packages.typst.org/preview/classic-tud-math-thesis-0.1.0.tar.gz" hash = "sha256-X4uqbg+mWkXzX/fgO+knjwvTTSqnzcNYC14fU9782T4=" @@ -6042,6 +6261,21 @@ license = [ ] homepage = "https://github.com/NicolaiSchmid/clean-ats-cv" +[clean-barm."1.0.1"] +url = "https://packages.typst.org/preview/clean-barm-1.0.1.tar.gz" +hash = "sha256-8nXyqAuxOuCivLVKedaof+uQAKjCjNJXxCQIDblrY8c=" +typstDeps = [ + "codelst_2_0_2", + "decasify_0_11_3", + "prequery_0_2_0", + "transl_0_2_0", +] +description = "Various documents for the Berufsakademie Rhein-Main" +license = [ + "MIT", +] +homepage = "https://git.thebread.dev/thebreadcompany/clean-barm" + [clean-barm."1.0.0"] url = "https://packages.typst.org/preview/clean-barm-1.0.0.tar.gz" hash = "sha256-ojy672eEkugGw9Clq8GUNlNpKbokI6GOzoO8RohLmgE=" @@ -6270,6 +6504,20 @@ license = [ ] homepage = "https://github.com/ahmed-bahlaoui/clean-ensam" +[clean-fuh."0.1.0"] +url = "https://packages.typst.org/preview/clean-fuh-0.1.0.tar.gz" +hash = "sha256-ckiIOYHU7gy+CF8TQF/jmkCJAlfkFXqdG4l08uLt8h0=" +typstDeps = [ + "codelst_2_0_2", + "glossarium_0_5_10", + "hydra_0_6_2", +] +description = "An inofficial Typst Template for University Hagen" +license = [ + "MIT", +] +homepage = "https://github.com/xxchillkroetexx/fuh-typst-template" + [clean-hda."0.3.0"] url = "https://packages.typst.org/preview/clean-hda-0.3.0.tar.gz" hash = "sha256-4463tTJ+FQ2KyYEihSSYL/9/0KtoauqBl4yukzM794A=" @@ -6673,6 +6921,17 @@ license = [ ] homepage = "https://codeberg.org/ruebe5w/clean-othaw" +[clean-print-cv."0.1.0"] +url = "https://packages.typst.org/preview/clean-print-cv-0.1.0.tar.gz" +hash = "sha256-s2n3gMqsucEiXQj2x8Zo6vYh6N7tLHbg9OaYmTyo0nY=" +typstDeps = [] +description = "Create clean, print-friendly, YAML-driven CVs" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/guillermodotn/clean-print-cv" + [clean-uoft-thesis."0.1.1"] url = "https://packages.typst.org/preview/clean-uoft-thesis-0.1.1.tar.gz" hash = "sha256-huXwGuCGWGowQ0pu2T5vgKMLVMOmuylsuA0/LIxj+6w=" @@ -7734,6 +7993,18 @@ license = [ ] homepage = "https://github.com/wensimehrp/conjak" +[consketcher."0.2.0"] +url = "https://packages.typst.org/preview/consketcher-0.2.0.tar.gz" +hash = "sha256-F5c9DXhksu4S/sEQ08AU6wYwKrUM8cZ6MRk8RsCX/iM=" +typstDeps = [ + "fletcher_0_5_8", +] +description = "Draws control blocks using CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/ivaquero/typst-consketcher" + [consketcher."0.1.0"] url = "https://packages.typst.org/preview/consketcher-0.1.0.tar.gz" hash = "sha256-vKgtYoXFkZcAq4n8sGhTP+WR0o+/DAorlttKMwHObZI=" @@ -8714,6 +8985,20 @@ license = [ ] homepage = "https://github.com/Jeomhps/datify-core" +[deal-us-tfc-template."1.1.1"] +url = "https://packages.typst.org/preview/deal-us-tfc-template-1.1.1.tar.gz" +hash = "sha256-MA0TaARGT4PMYZYPhPKVSBEIYPLKiwYB/p4teJd22z8=" +typstDeps = [ + "codly_1_3_0", + "codly-languages_0_1_1", + "hydra_0_6_2", + "outrageous_0_4_0", +] +description = "Template for TFCs at ETSII directed by the DEAL group" +license = [ + "MIT-0", +] + [deal-us-tfc-template."1.1.0"] url = "https://packages.typst.org/preview/deal-us-tfc-template-1.1.0.tar.gz" hash = "sha256-7km2ERzTY0oPKTZp+IxTr2DIaMr4VayB0kUZq6xvJ6w=" @@ -9421,6 +9706,16 @@ license = [ "MIT", ] +[digestify."0.2.0"] +url = "https://packages.typst.org/preview/digestify-0.2.0.tar.gz" +hash = "sha256-zhWY1dLELc/Rh8PiRKgY3FAAHbpHcJVyPuIVIa3gVGk=" +typstDeps = [] +description = "A blazing fast cryptographic hash package for Typst, powered by WebAssembly" +license = [ + "MIT", +] +homepage = "https://github.com/ParaN3xus/digestify" + [digestify."0.1.0"] url = "https://packages.typst.org/preview/digestify-0.1.0.tar.gz" hash = "sha256-Qc8OG1dYAsF2vgw0+APLNG/hrMqg/g05s+V/7zpnOGs=" @@ -9558,6 +9853,17 @@ license = [ ] homepage = "https://github.com/Nifalu/dmi-basilea-thesis" +[documenting-tbre."0.1.0"] +url = "https://packages.typst.org/preview/documenting-tbre-0.1.0.tar.gz" +hash = "sha256-wZ8ryncRj39atgnjzsZBpWbvGs37zyF0u/G7smKTRT4=" +typstDeps = [ + "wordometer_0_1_5", +] +description = "A Typst template for Team Bath Racing Electric Documentation, has support for git-cliff changelogs and acronym tracking" +license = [ + "MIT", +] + [dovenv."0.1.0"] url = "https://packages.typst.org/preview/dovenv-0.1.0.tar.gz" hash = "sha256-H0yY6dW6FwFTkTE6K8A0UmjSbPbIFuh+RH2ggD6JbZw=" @@ -9637,6 +9943,16 @@ license = [ "Unlicense", ] +[dragonling."0.3.0"] +url = "https://packages.typst.org/preview/dragonling-0.3.0.tar.gz" +hash = "sha256-jbn/XMhBEAKZi5c2In3eqVz6Dec7eYGFbRJ+oH/E0nk=" +typstDeps = [] +description = "For creating Dungeons & Dragons 5E content including adventures, stat blocks, spell cards" +license = [ + "MIT", +] +homepage = "https://github.com/coljac/typst-dnd5e" + [dragonling."0.2.0"] url = "https://packages.typst.org/preview/dragonling-0.2.0.tar.gz" hash = "sha256-9zRApaho2RpPKhMTjY6hAT+ZPOKxCMpa6b2iXl+mtDc=" @@ -9776,6 +10092,20 @@ license = [ ] homepage = "https://github.com/swaits/typst-collection" +[easy-wi-hwr."0.1.2"] +url = "https://packages.typst.org/preview/easy-wi-hwr-0.1.2.tar.gz" +hash = "sha256-SzbOoiEBE2xXfQhMvWdZ+8YxtpXR0DJDraXd4+laIUE=" +typstDeps = [ + "glossarium_0_5_10", + "linguify_0_5_0", + "mmdr_0_2_1", +] +description = "Paper template for HWR Berlin (Wirtschaftsinformatik" +license = [ + "MIT", +] +homepage = "https://github.com/lultoni/easy-wi-hwr" + [easy-wi-hwr."0.1.1"] url = "https://packages.typst.org/preview/easy-wi-hwr-0.1.1.tar.gz" hash = "sha256-gWUB+bImYiPNxsURDAA9sbaqBqsJ/0KCEv6D4HFi61A=" @@ -10040,6 +10370,19 @@ license = [ "MIT", ] +[eggs."0.7.0"] +url = "https://packages.typst.org/preview/eggs-0.7.0.tar.gz" +hash = "sha256-vcgg3bVIGTPe1YDh2LZtcRlNIFiCE14lHboHSFItwoY=" +typstDeps = [ + "elembic_1_1_1", + "tidy_0_4_3", +] +description = "Linguistic examples with minimalist syntax" +license = [ + "MIT", +] +homepage = "https://github.com/retroflexivity/typst-eggs" + [eggs."0.6.0"] url = "https://packages.typst.org/preview/eggs-0.6.0.tar.gz" hash = "sha256-R3+PHTaGSVm4kNWrtMW1lkheTKlvHkMA9sxBuHaqhDw=" @@ -10291,6 +10634,19 @@ license = [ ] homepage = "https://github.com/PgBiel/elembic" +[elsearticle."3.0.0"] +url = "https://packages.typst.org/preview/elsearticle-3.0.0.tar.gz" +hash = "sha256-h1hInT2dBFuu8hftVNxVOI6CA6kI+CPuUS6CLLx9zXc=" +typstDeps = [ + "equate_0_3_2", + "subpar_0_2_2", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + [elsearticle."2.1.0"] url = "https://packages.typst.org/preview/elsearticle-2.1.0.tar.gz" hash = "sha256-PCJKHstprcidlbqhoy4QVB4ZOK1APhAtW0IkeLybkwI=" @@ -10566,6 +10922,16 @@ license = [ "GPL-3.0-or-later", ] +[endfield-doc."0.1.1"] +url = "https://packages.typst.org/preview/endfield-doc-0.1.1.tar.gz" +hash = "sha256-xruMhvMEVHx2aglikhTZwMyV5sLJIzS0Usaf9m08e+Y=" +typstDeps = [] +description = "A4 document theme styled after the Arknights: Endfield aesthetic" +license = [ + "MIT", +] +homepage = "https://github.com/Ives-Natsume/typst-endfield-doc-theme.git" + [endfield-doc."0.1.0"] url = "https://packages.typst.org/preview/endfield-doc-0.1.0.tar.gz" hash = "sha256-jXypE1mpEr7pP92ebnh3dHzm8l3SAXx8bkWdsEYft6Q=" @@ -10699,6 +11065,16 @@ license = [ ] homepage = "https://github.com/7ijme/eqalc" +[eqrun."0.1.0"] +url = "https://packages.typst.org/preview/eqrun-0.1.0.tar.gz" +hash = "sha256-nGpz7rKbIIRVImqKneVfM4993c+LuTFaF3ddeqPTZMc=" +typstDeps = [] +description = "Evaluate equations, use the results in further equations" +license = [ + "MIT", +] +homepage = "https://github.com/snlxnet/eqrun" + [equate."0.3.2"] url = "https://packages.typst.org/preview/equate-0.3.2.tar.gz" hash = "sha256-WogaNLFpCsysRfkwnxph0OVFJGs9CTKQYYAG9+7xKhA=" @@ -10900,6 +11276,18 @@ license = [ ] homepage = "https://github.com/SillyFreak/typst-etykett" +[euler-math."0.1.0"] +url = "https://packages.typst.org/preview/euler-math-0.1.0.tar.gz" +hash = "sha256-IYOyrMUl8rLQmS5nLb0oK4GE0KLRANG5bR/GZDEwFrw=" +typstDeps = [ + "theorion_0_6_0", +] +description = "Modern and robust Math Olympiad problems and exams template" +license = [ + "MIT", +] +homepage = "https://github.com/gmborjasb/euler-math" + [examify."0.1.1"] url = "https://packages.typst.org/preview/examify-0.1.1.tar.gz" hash = "sha256-1dgSCLdqpxvX9/eVDAG83hkwlMpJfyrWEk2SqNFHjYQ=" @@ -11420,6 +11808,18 @@ license = [ ] homepage = "https://github.com/han190/fancy-affil" +[fancy-cookbook."2.1.0"] +url = "https://packages.typst.org/preview/fancy-cookbook-2.1.0.tar.gz" +hash = "sha256-fku8Y/m2TJr3NjUA2TLkyqI8XrMLfPG66NilYMfuZAQ=" +typstDeps = [ + "datify_1_0_1", +] +description = "Create simple recipe collections and cookbooks in color and your language" +license = [ + "MIT", +] +homepage = "https://github.com/Ajrarn/fancy-cookbook" + [fancy-cookbook."2.0.0"] url = "https://packages.typst.org/preview/fancy-cookbook-2.0.0.tar.gz" hash = "sha256-rsNVo/c1kVyqZryIuFS5PG+FWORvdopfNs5xJvi99TE=" @@ -11516,6 +11916,18 @@ license = [ ] homepage = "https://github.com/dei-layborer/o-rly-typst" +[ferrmat."0.1.2"] +url = "https://packages.typst.org/preview/ferrmat-0.1.2.tar.gz" +hash = "sha256-qiMKwxldWpW0nPtggaGu/TISLPJ5W5hTVPmWriySDzo=" +typstDeps = [ + "cetz_0_4_0", +] +description = "Visual toolkit for Typst in Portuguese: heading themes with color palettes, math environments, decorative boxes, Gantt charts, exams and annotations" +license = [ + "MIT", +] +homepage = "https://github.com/3sdras/ferrmat" + [ferrmat."0.1.0"] url = "https://packages.typst.org/preview/ferrmat-0.1.0.tar.gz" hash = "sha256-1lm2LlHeBY3e73S4cZGF+GcNd8O9FcrJErU4REg9uB4=" @@ -11687,6 +12099,30 @@ license = [ ] homepage = "https://github.com/itpyi/typst-plot" +[fine-lncs."0.5.1"] +url = "https://packages.typst.org/preview/fine-lncs-0.5.1.tar.gz" +hash = "sha256-5i6itNAeT7qsoL3x/u4VOVFto0BYOc+8aG2CcITwT8o=" +typstDeps = [ + "lemmify_0_1_8", +] +description = "An Springer's Lecture Notes in Computer Science (LNCS) styled template" +license = [ + "MIT", +] +homepage = "https://github.com/Jozott00/typst-fine-lncs" + +[fine-lncs."0.5.0"] +url = "https://packages.typst.org/preview/fine-lncs-0.5.0.tar.gz" +hash = "sha256-BdDOYy6rFsJAzQM7ki4feGtiH3WACZ/HMuXTpUWNYY4=" +typstDeps = [ + "lemmify_0_1_8", +] +description = "An Springer's Lecture Notes in Computer Science (LNCS) styled template" +license = [ + "MIT", +] +homepage = "https://github.com/Jozott00/typst-fine-lncs" + [fine-lncs."0.4.0"] url = "https://packages.typst.org/preview/fine-lncs-0.4.0.tar.gz" hash = "sha256-5MLCrwPQTIbHrqXURRf8VZyenO9kJIYvtjAvMmw7AHc=" @@ -12380,6 +12816,15 @@ license = [ ] homepage = "https://github.com/Tetragramm/flying-circus-typst-template" +[folklore."0.1.0"] +url = "https://packages.typst.org/preview/folklore-0.1.0.tar.gz" +hash = "sha256-fgQlBk6QjRBDOWGIY5bKuo+265j1gIPY/NIgTD1aX+M=" +typstDeps = [] +description = "Typeset fiction novels, with facilities for author commentary" +license = [ + "MIT", +] + [fontawesome."0.6.0"] url = "https://packages.typst.org/preview/fontawesome-0.6.0.tar.gz" hash = "sha256-17IcZiVwT6xCucSIi5kfMDqWG1a503vVyLiiaTyoASU=" @@ -12485,6 +12930,16 @@ license = [ ] homepage = "https://github.com/vsheg/formal" +[formal-homework."0.1.1"] +url = "https://packages.typst.org/preview/formal-homework-0.1.1.tar.gz" +hash = "sha256-sexh6p/N3ZNTGyo+9kDMDsmD5WUEAQMfEdyU2gYoCbc=" +typstDeps = [] +description = "Submit homeworks with simplicity and formality" +license = [ + "GPL-3.0-or-later", +] +homepage = "https://github.com/daqnal/formal-homework" + [formal-homework."0.1.0"] url = "https://packages.typst.org/preview/formal-homework-0.1.0.tar.gz" hash = "sha256-F0qbqrtJGpBJ1TLsADfg0KwVMkiSktk9xlfHjIBX0CQ=" @@ -13283,6 +13738,18 @@ license = [ ] homepage = "https://codeberg.org/drloiseau/genealogy" +[genotypst."0.10.0"] +url = "https://packages.typst.org/preview/genotypst-0.10.0.tar.gz" +hash = "sha256-0IQS3A7P14ZFxcFmki1tUEN6Suk8IkY4RUntHBr1idA=" +typstDeps = [ + "tiptoe_0_4_0", +] +description = "genotypst: A package for bioinformatics data analysis and visualization" +license = [ + "MIT", +] +homepage = "https://github.com/apcamargo/genotypst" + [genotypst."0.9.0"] url = "https://packages.typst.org/preview/genotypst-0.9.0.tar.gz" hash = "sha256-2xolKSP1CDCv1qdRL00cWAVtBJgS1U6nYyt9cl+ypHM=" @@ -13587,6 +14054,18 @@ license = [ ] homepage = "https://github.com/2color/typst-german-fx-invoice" +[gh-minimal-slides."0.1.0"] +url = "https://packages.typst.org/preview/gh-minimal-slides-0.1.0.tar.gz" +hash = "sha256-WpoRyeGABC56wgXQj7A4GyeZVFbhKaNMmfbtdEyWCGU=" +typstDeps = [ + "touying_0_7_3", +] +description = "Style slides as a rendered GitHub README" +license = [ + "MIT", +] +homepage = "https://github.com/xingjian-zhang/gh-minimal-slides" + [gibz-script."0.1.0"] url = "https://packages.typst.org/preview/gibz-script-0.1.0.tar.gz" hash = "sha256-EeO7J3h6bv3HWPRPIZ6cC5dIIAq0HCHqIqP+FXkjUcA=" @@ -15994,6 +16473,16 @@ license = [ ] homepage = "https://github.com/ShabbyGayBar/hitec" +[homiework."0.1.0"] +url = "https://packages.typst.org/preview/homiework-0.1.0.tar.gz" +hash = "sha256-zWiAxdMCD2gvlhv24dbK7MPTDVOfGBs29osc711s018=" +typstDeps = [] +description = "Homework template for university students" +license = [ + "MIT", +] +homepage = "https://github.com/tcfollett/homework-template" + [hsmz-thesis-unofficial."0.3.0"] url = "https://packages.typst.org/preview/hsmz-thesis-unofficial-0.3.0.tar.gz" hash = "sha256-UDRRyoaZUwvQ5p4U309e94AnQ3k4HD1whvx+xL91wWM=" @@ -16061,6 +16550,18 @@ license = [ ] homepage = "https://github.com/HTL3R-Typst/htl3r-da" +[htlium."1.1.1"] +url = "https://packages.typst.org/preview/htlium-1.1.1.tar.gz" +hash = "sha256-xwd8R9qyhLGEyv01Yp+NfKumH6APpbnkGHMuQ+WvWdI=" +typstDeps = [ + "icu-datetime_0_2_2", +] +description = "A template for school protocols, designed for HTL Salzburg, but adaptable to other schools as well" +license = [ + "MIT", +] +homepage = "https://github.com/DeltaAT/htl-protocol" + [htlwienwest-da."0.3.3"] url = "https://packages.typst.org/preview/htlwienwest-da-0.3.3.tar.gz" hash = "sha256-MFvkmwBGhKRC1308oznAnKWAT1fKuo0l00hmHw/Vljk=" @@ -17389,6 +17890,21 @@ license = [ ] homepage = "https://github.com/ad-si/invoice-maker" +[invoice-pro."0.3.0"] +url = "https://packages.typst.org/preview/invoice-pro-0.3.0.tar.gz" +hash = "sha256-rRLJOZ5MZCFf77l5lt22ckeqs0vME64xJb+vl5uNsrE=" +typstDeps = [ + "ibanator_0_1_0", + "letter-pro_3_0_0", + "loom_0_1_0", + "sepay_0_1_1", +] +description = "A professional, DIN 5008 compliant invoice template with automatic calculations and EPC-QR-Code (GiroCode) support" +license = [ + "MIT", +] +homepage = "https://github.com/leonieziechmann/invoice-pro" + [invoice-pro."0.2.0"] url = "https://packages.typst.org/preview/invoice-pro-0.2.0.tar.gz" hash = "sha256-bV/9IGp/8gpOwOKmwDmpzNFMguvJbH1/UIgINtJQnHQ=" @@ -17455,6 +17971,18 @@ license = [ "MIT", ] +[ioppub."0.1.1"] +url = "https://packages.typst.org/preview/ioppub-0.1.1.tar.gz" +hash = "sha256-XJuLIadzoJW8VblO9Q8gWkJA7Equ2mQ83jbWzMEsAoE=" +typstDeps = [ + "equate_0_3_2", +] +description = "IOP Publishing article template for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/munechika-koyo/ioppub" + [ioppub."0.1.0"] url = "https://packages.typst.org/preview/ioppub-0.1.0.tar.gz" hash = "sha256-Sv3iJjQShjHbZtrC6gynLvPhmq38tSMD3z7/22XRo8o=" @@ -18240,6 +18768,19 @@ license = [ ] homepage = "https://github.com/raygo0312/jastylest.git" +[jastylest-zh."0.1.2"] +url = "https://packages.typst.org/preview/jastylest-zh-0.1.2.tar.gz" +hash = "sha256-QGrUdAI86Xivg1nJJXbcyedIi6h9nQuMTWGp4nMU4Jo=" +typstDeps = [ + "cjk-unbreak_0_1_1", + "pointless-size_0_1_1", +] +description = "Article optimized for Chinese typesetting" +license = [ + "MIT", +] +homepage = "https://github.com/mike-unk/jastylest-zh.git" + [jastylest-zh."0.1.1"] url = "https://packages.typst.org/preview/jastylest-zh-0.1.1.tar.gz" hash = "sha256-3uAg9oFE0K3dmNJqJHvVnreHTPmXPgsnmCPc1f8SfOQ=" @@ -18446,6 +18987,16 @@ license = [ ] homepage = "https://git.kb28.ch/HEL/jumble" +[jurlstify."0.1.0"] +url = "https://packages.typst.org/preview/jurlstify-0.1.0.tar.gz" +hash = "sha256-mnUFYSegR1Ytx3nI0JsSp8KxNTbwUnjy00lKgxAPdRk=" +typstDeps = [] +description = "URL typesetting with line-break opportunities, inspired by LaTeX's url package" +license = [ + "MIT", +] +homepage = "https://github.com/SchrodingerBlume/typst-jurlstify" + [jurz."0.1.0"] url = "https://packages.typst.org/preview/jurz-0.1.0.tar.gz" hash = "sha256-m/Mj05WArGW5YDoKNdyt1F0YQTS1Dz5Jw9er8w2vyas=" @@ -19568,6 +20119,36 @@ license = [ ] homepage = "https://github.com/Sematre/typst-letter-pro" +[letterloom."3.0.0"] +url = "https://packages.typst.org/preview/letterloom-3.0.0.tar.gz" +hash = "sha256-Wy99MXOeF+tpIFbNxXm2I8xHJVvfZXQKwjDZLG/riPs=" +typstDeps = [] +description = "A highly customizable template for polished and professional letters" +license = [ + "Unlicense", +] +homepage = "https://github.com/nandac/letterloom" + +[letterloom."2.1.0"] +url = "https://packages.typst.org/preview/letterloom-2.1.0.tar.gz" +hash = "sha256-jONbw7JhT47sBobqYTY5Z2CFTilvyovXRcfVlC6slc0=" +typstDeps = [] +description = "The letterloom package is a user-friendly and customizable template designed to streamline the creation of professional-looking letters" +license = [ + "Unlicense", +] +homepage = "https://github.com/nandac/letterloom" + +[letterloom."2.0.0"] +url = "https://packages.typst.org/preview/letterloom-2.0.0.tar.gz" +hash = "sha256-97XFhwoB8aDZs2t8xLJe47wSBhQo9DcvRAj3/xDedo8=" +typstDeps = [] +description = "The letterloom package is a user-friendly and customizable template designed to streamline the creation of professional-looking letters" +license = [ + "Unlicense", +] +homepage = "https://github.com/nandac/letterloom" + [letterloom."1.0.0"] url = "https://packages.typst.org/preview/letterloom-1.0.0.tar.gz" hash = "sha256-f15LQT7JF0NxpkNHACNrbLO1fJtyIHVYxxFETEkvEVk=" @@ -19986,6 +20567,16 @@ license = [ "MIT", ] +[loom."0.1.1"] +url = "https://packages.typst.org/preview/loom-0.1.1.tar.gz" +hash = "sha256-VW1jJF9OtFQ01ZERhZiVETEU+Dkx7mPWy8I/OLHPhJ8=" +typstDeps = [] +description = "A meta-engine for reactive documents, bidirectional data flow, and global state management" +license = [ + "MIT", +] +homepage = "https://github.com/leonieziechmann/loom" + [loom."0.1.0"] url = "https://packages.typst.org/preview/loom-0.1.0.tar.gz" hash = "sha256-ZIq/CpRRe+52A4MHCXcgz+Z+kH1Ook+rypVXn+knp60=" @@ -20252,6 +20843,16 @@ license = [ ] homepage = "https://github.com/NanamiNakano/typst-mahou-cv" +[malos-presets."1.3.0"] +url = "https://packages.typst.org/preview/malos-presets-1.3.0.tar.gz" +hash = "sha256-6LNt7JeWRSuEwvGnK1e1B2vmyVo0SsCxXgziIL1/NEg=" +typstDeps = [] +description = "A set of bare-bones presets" +license = [ + "MIT", +] +homepage = "https://github.com/MDLC01/malos-presets" + [malos-presets."1.2.0"] url = "https://packages.typst.org/preview/malos-presets-1.2.0.tar.gz" hash = "sha256-PziN2OFY6MAi5z73YaXJ8QBD+mAHm+6rX518lZhBQrc=" @@ -20292,6 +20893,18 @@ license = [ ] homepage = "https://github.com/lluchs/mandolin" +[manifesto."0.2.0"] +url = "https://packages.typst.org/preview/manifesto-0.2.0.tar.gz" +hash = "sha256-a0wH3MPet0kUBYVfJywQUB68Y4kier2xBbsWI+ibt64=" +typstDeps = [ + "zap_0_5_0", +] +description = "Create stunning documentation websites using native HTML export" +license = [ + "MPL-2.0", +] +homepage = "https://codeberg.org/grangelouis/manifesto" + [manifesto."0.1.1"] url = "https://packages.typst.org/preview/manifesto-0.1.1.tar.gz" hash = "sha256-7O/ECFMbaW2EBjqX3wn/WXIfcLnWQTPYau6biwzrkVc=" @@ -20316,6 +20929,18 @@ license = [ ] homepage = "https://github.com/l0uisgrange/manifesto" +[mannot."0.3.3"] +url = "https://packages.typst.org/preview/mannot-0.3.3.tar.gz" +hash = "sha256-J/3lXe+tRQ9kDma1mplsMPQ0UKtikk8pTMde1QwdsSg=" +typstDeps = [ + "tiptoe_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + [mannot."0.3.2"] url = "https://packages.typst.org/preview/mannot-0.3.2.tar.gz" hash = "sha256-/8Nj4YOn8yEc800mJZYFwIOFMJriPtNuio4Cj3gsIR8=" @@ -21084,6 +21709,19 @@ license = [ ] homepage = "https://github.com/Vanille-N/meander.typ" +[mechanical-system-cetz-34j."1.1.5"] +url = "https://packages.typst.org/preview/mechanical-system-cetz-34j-1.1.5.tar.gz" +hash = "sha256-H9jq/g2tCJP/D3ZpK1PxnF54KNev6RaobJzcMJlAtzA=" +typstDeps = [ + "cetz_0_4_2", + "cetz_0_5_0", +] +description = "CeTZ library for drawing mechanical systems" +license = [ + "MIT", +] +homepage = "https://github.com/34j/typst-cetz-mechanical-system" + [mechanical-system-cetz-34j."0.1.0"] url = "https://packages.typst.org/preview/mechanical-system-cetz-34j-0.1.0.tar.gz" hash = "sha256-PPoQ0Gy6Xh19JPPnL2uyGhVomZbOHOOUCFJDp/U/cTc=" @@ -21717,6 +22355,20 @@ license = [ ] homepage = "https://github.com/lelimacon/typst-minimal-cv" +[minimal-note."0.10.1"] +url = "https://packages.typst.org/preview/minimal-note-0.10.1.tar.gz" +hash = "sha256-wy+vT1yORhTNXkaa/RqZqCwq2T6N1cOfkLKXTh8HkR4=" +typstDeps = [ + "algorithmic_1_0_7", + "codly_1_3_0", + "codly-languages_0_1_10", +] +description = "Notes with colorful minimalism" +license = [ + "MIT-0", +] +homepage = "https://github.com/Michel-Liao/minimal-note" + [minimal-note."0.10.0"] url = "https://packages.typst.org/preview/minimal-note-0.10.0.tar.gz" hash = "sha256-bipnk5hl+qg3ejVq2Qxfo8iuRRApjZxIVTK/28rBmkY=" @@ -22129,6 +22781,16 @@ license = [ ] homepage = "https://github.com/OrangeX4/mitex" +[mmdr."0.2.2"] +url = "https://packages.typst.org/preview/mmdr-0.2.2.tar.gz" +hash = "sha256-XhUOJ+rCjIjTD+lMWHUtfVm+1AHnfSjpMy2A/mXdb90=" +typstDeps = [] +description = "A Typst plugin to render Mermaid diagrams" +license = [ + "MIT", +] +homepage = "https://github.com/HSGamer/typst-mmdr" + [mmdr."0.2.1"] url = "https://packages.typst.org/preview/mmdr-0.2.1.tar.gz" hash = "sha256-QjxGCTj4mIDwXAg6tiDL88Lnp/quQ1tOcspzqF7SywI=" @@ -23960,6 +24622,36 @@ license = [ ] homepage = "https://github.com/Duolei-Wang/sustech-thesis-typst" +[modern-swjtu-thesis."0.1.3"] +url = "https://packages.typst.org/preview/modern-swjtu-thesis-0.1.3.tar.gz" +hash = "sha256-QDBoy3Qf/JrKV3MpIZ7fuU/122tOOFiY2oMBpQTVKPE=" +typstDeps = [ + "cuti_0_4_0", + "i-figured_0_2_4", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = " A modern Typst template for the thesis of Southwest Jiaotong University (SWJTU" +license = [ + "MIT", +] +homepage = "https://github.com/somnus0917/modern-swjtu-thesis" + +[modern-swjtu-thesis."0.1.2"] +url = "https://packages.typst.org/preview/modern-swjtu-thesis-0.1.2.tar.gz" +hash = "sha256-7Moos7witAMlMl/FAqlLaZYhBEkpmmsQYGgt/RHnCjQ=" +typstDeps = [ + "cuti_0_4_0", + "i-figured_0_2_4", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = " A modern Typst template for the thesis of Southwest Jiaotong University (SWJTU" +license = [ + "MIT", +] +homepage = "https://github.com/somnus0917/modern-swjtu-thesis" + [modern-sysu-thesis."0.4.1"] url = "https://packages.typst.org/preview/modern-sysu-thesis-0.4.1.tar.gz" hash = "sha256-QTEXNJQ0fY3loIBewro0QWpYqyYwJ8bxXsasr80pV8E=" @@ -24418,6 +25110,16 @@ license = [ ] homepage = "https://github.com/eduardz1/unito-typst-template" +[modern-upc-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-upc-thesis-0.1.0.tar.gz" +hash = "sha256-KurwgQb1IyhSt8kasgysDUUoPkuoL+WbJCmiCQnfP3M=" +typstDeps = [] +description = "中国石油大学（华东）本科毕设论文 Typst 模板。A Typst template for bachelor's thesis of China University of Petroleum (East China" +license = [ + "MIT", +] +homepage = "https://github.com/ttOwwA/ts-upc-thesis-typst" + [modern-ustc-proposal."0.0.1"] url = "https://packages.typst.org/preview/modern-ustc-proposal-0.0.1.tar.gz" hash = "sha256-T8Ww9uol1majaqFX1maCoEyakAse5lOX74dagYyihWU=" @@ -24604,6 +25306,22 @@ license = [ ] homepage = "https://github.com/Timmycheng/wku-thesis" +[modern-xmu-thesis."0.2.2"] +url = "https://packages.typst.org/preview/modern-xmu-thesis-0.2.2.tar.gz" +hash = "sha256-N1nubaBafT8DJObv8XBOpv5dAqI5Chco9EebruAnbIk=" +typstDeps = [ + "hydra_0_6_2", + "i-figured_0_2_4", + "metalogo_1_2_0", + "numbly_0_1_0", + "zebraw_0_6_3", +] +description = "厦门大学学位论文模板。Modern Xiamen University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/HPCesia/modern-xmu-thesis" + [modern-xmu-thesis."0.2.1"] url = "https://packages.typst.org/preview/modern-xmu-thesis-0.2.1.tar.gz" hash = "sha256-Vb4HmFiK9iAsCKydWL286nxT0KVkr/YJnAyRXWbI+ok=" @@ -24669,6 +25387,24 @@ license = [ ] homepage = "https://github.com/Woodman3/modern-ysu-thesis" +[modern-zhaw-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-zhaw-thesis-0.4.0.tar.gz" +hash = "sha256-fLxRlgVQy1Z58VRV6DOm30TdlE4VIoQ5aKGZn/A4vbc=" +typstDeps = [ + "biceps_0_0_1", + "codly_1_3_0", + "codly-languages_0_1_10", + "colorful-boxes_1_4_3", + "datify_1_0_1", + "glossy_0_9_1", + "tieflang_0_1_0", +] +description = "Comprehensive template for ZHAW academic works (theses, exercises, reports...), adapted from the official branding and guidelines" +license = [ + "MIT-0", +] +homepage = "https://github.com/stanlrt/typst-zhaw-thesis" + [modern-zhaw-thesis."0.3.0"] url = "https://packages.typst.org/preview/modern-zhaw-thesis-0.3.0.tar.gz" hash = "sha256-/o1pv0ckiFgzB6MDW6ZI57lAV9BmXWEs+BChKyIDwUg=" @@ -24961,6 +25697,19 @@ license = [ ] homepage = "https://github.com/jxpeng98/Typst-CV-Resume" +[modiagram."0.1.1"] +url = "https://packages.typst.org/preview/modiagram-0.1.1.tar.gz" +hash = "sha256-rzEU23aDkktD7FxpNrBlwGZLA1h2jsKucfyDMljaIXE=" +typstDeps = [ + "cetz_0_4_2", + "zero_0_6_1", +] +description = "Draw molecular orbital and energy pathway diagrams" +license = [ + "MIT", +] +homepage = "https://github.com/Typsium/modiagram" + [modiagram."0.1.0"] url = "https://packages.typst.org/preview/modiagram-0.1.0.tar.gz" hash = "sha256-MT7isp213FNeTFKHaUwrMB3IA5sbmTqUFscWl5dxDXE=" @@ -25122,6 +25871,16 @@ license = [ ] homepage = "https://github.com/frozolotl/muchpdf" +[muddy-mit-thesis."0.2.0"] +url = "https://packages.typst.org/preview/muddy-mit-thesis-0.2.0.tar.gz" +hash = "sha256-mL4otkZyH4hVH9VLgvA+UKOQ+SbXgfXms0A3wdWN4Dw=" +typstDeps = [] +description = "Typst port of the MIT mitthesis LaTeX template (v1.22). Produces a thesis document conforming to MIT Libraries dissertation formatting requirements" +license = [ + "MIT", +] +homepage = "https://github.com/joshpoll/muddy-mit-thesis" + [muddy-mit-thesis."0.1.0"] url = "https://packages.typst.org/preview/muddy-mit-thesis-0.1.0.tar.gz" hash = "sha256-DrNLpbj4gGaMH8/NqHQQIE78wMJbE5hMpqSjKwIHvms=" @@ -25318,6 +26077,40 @@ license = [ ] homepage = "https://github.com/Enter-tainer/natrix" +[navigator."0.1.5"] +url = "https://packages.typst.org/preview/navigator-0.1.5.tar.gz" +hash = "sha256-7VgIBF/oAoFaI8xoHqFvQtxzzFX4shbR528S4pBZZMY=" +typstDeps = [ + "diatypst_0_9_1", + "navigator_0_2_0", + "polylux_0_4_0", + "presentate_0_2_5", + "touying_0_7_3", + "typslides_1_3_3", +] +description = "Navigation tools for Typst presentations" +license = [ + "MIT", +] +homepage = "https://github.com/eusebe/typst-navigator" + +[navigator."0.1.4"] +url = "https://packages.typst.org/preview/navigator-0.1.4.tar.gz" +hash = "sha256-3L7iTJeoBZ9dyyCYfEcYRmx+hRCj9gF1t/7iwCsryXk=" +typstDeps = [ + "diatypst_0_9_1", + "navigator_0_2_0", + "polylux_0_4_0", + "presentate_0_2_5", + "touying_0_7_3", + "typslides_1_3_3", +] +description = "Navigation tools for Typst presentations" +license = [ + "MIT", +] +homepage = "https://github.com/eusebe/typst-navigator" + [navigator."0.1.3"] url = "https://packages.typst.org/preview/navigator-0.1.3.tar.gz" hash = "sha256-HzpFBeaaR/fRH5vaDsweLd/I0jsU6a1zRg86trh9gzI=" @@ -25386,6 +26179,19 @@ license = [ ] homepage = "https://github.com/Haouo/NCKU-Thesis-Typst" +[neat-cv."1.0.0"] +url = "https://packages.typst.org/preview/neat-cv-1.0.0.tar.gz" +hash = "sha256-dHwClZMBD5rCRfvgyGCOLF7vIrnT/70Wpaly4ZAXmWI=" +typstDeps = [ + "datify_1_0_1", + "fontawesome_0_6_0", +] +description = "A modern and elegant CV template for Typst, inspired by Awesome CV and simple-hisptercv" +license = [ + "MIT", +] +homepage = "https://github.com/dialvarezs/neat-cv" + [neat-cv."0.7.0"] url = "https://packages.typst.org/preview/neat-cv-0.7.0.tar.gz" hash = "sha256-TwH9hf85+Sa03m2iD1pwPvleqv19zZClIJrdkViE6Lg=" @@ -25545,6 +26351,26 @@ license = [ ] homepage = "https://codeberg.org/Andrew15-5/neat-timetable" +[neat-tu-dublin."1.0.0"] +url = "https://packages.typst.org/preview/neat-tu-dublin-1.0.0.tar.gz" +hash = "sha256-1E69VCo7HCF5jniwTnXSbzWH5dHmcbNM6QLmsIWT7nU=" +typstDeps = [ + "booktabs_0_0_4", + "cetz_0_4_2", + "cetz-plot_0_1_3", + "codly_1_3_0", + "codly-languages_0_1_10", + "decasify_0_11_3", + "fontawesome_0_6_0", + "subpar_0_2_2", + "wrap-it_0_1_1", +] +description = "Reports and theses for TU Dublin, derived from Angelo Nazzaro's amazing 'TypXidian' template" +license = [ + "MIT", +] +homepage = "https://github.com/rjmurg/Neat-TU-Dublin" + [neoplot."0.0.4"] url = "https://packages.typst.org/preview/neoplot-0.0.4.tar.gz" hash = "sha256-4uxGaRTa+chGnXjwqTF/LKB/Zw5lD06KXSueAvQzV0M=" @@ -25770,6 +26596,15 @@ license = [ ] homepage = "https://github.com/nandac/niram-css" +[non-unlabeled."0.1.0"] +url = "https://packages.typst.org/preview/non-unlabeled-0.1.0.tar.gz" +hash = "sha256-89+EAQrpMTjo7RHhr1HbkBQFq005up/A8OuFNiAymaI=" +typstDeps = [] +description = "Don't number unlabeled objects" +license = [ + "MIT", +] + [nonsense."0.1.0"] url = "https://packages.typst.org/preview/nonsense-0.1.0.tar.gz" hash = "sha256-MhY+xzfZ3HcdEd7NFVOIeGoip9+xZBTP4qt+Jo12lI4=" @@ -26055,6 +26890,32 @@ license = [ "MIT", ] +[ntust-thesis-unofficial."1.0.1"] +url = "https://packages.typst.org/preview/ntust-thesis-unofficial-1.0.1.tar.gz" +hash = "sha256-AKOT/+vE7C2QE2D//8faYmSba7Jme1nU6O0kaH3qPxQ=" +typstDeps = [ + "algorithmic_1_0_7", + "cuti_0_4_0", +] +description = "臺灣科技大學論文模板。Thesis template for National Taiwan University of Science and Technology" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/ntust-thesis-unofficial-typst" + +[ntust-thesis-unofficial."1.0.0"] +url = "https://packages.typst.org/preview/ntust-thesis-unofficial-1.0.0.tar.gz" +hash = "sha256-JI0y28SiUfErpIclLJwLkHwX7A915/MMVIodNQ+BAM4=" +typstDeps = [ + "algorithmic_1_0_7", + "cuti_0_4_0", +] +description = "臺灣科技大學論文模板。Thesis template for National Taiwan University of Science and Technology" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/ntust-thesis-unofficial-typst" + [nulite."0.1.0"] url = "https://packages.typst.org/preview/nulite-0.1.0.tar.gz" hash = "sha256-K67G/vo5Fbm43MDi0TxNIhhktSTzjayEeyrbcejND84=" @@ -26067,6 +26928,16 @@ license = [ ] homepage = "https://github.com/j-mueller/typst-vegalite" +[num2words."0.1.0"] +url = "https://packages.typst.org/preview/num2words-0.1.0.tar.gz" +hash = "sha256-rImaIunyGukjRVf1Due8aff0C+SklvGmHRa+FP+76m8=" +typstDeps = [] +description = "Convert numbers to their written word form" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/mariovagomarzal/typst-num2words" + [numberingx."0.0.1"] url = "https://packages.typst.org/preview/numberingx-0.0.1.tar.gz" hash = "sha256-js60ARCG8xaVtbF0iVm9Dx+nzISfNni78UUHyhi51Hw=" @@ -27301,6 +28172,16 @@ license = [ ] homepage = "https://github.com/sebmestrallet/typst-paris-saclay-thesis-flat" +[parize."0.1.0"] +url = "https://packages.typst.org/preview/parize-0.1.0.tar.gz" +hash = "sha256-7l2i0StYNFmESU8p2VQdj/mOXXGisoARLIv3HtXb5qM=" +typstDeps = [] +description = "Make block-level elements to be part of paragraphs" +license = [ + "MIT", +] +homepage = "https://github.com/tianyi-smile/parize" + [parsely."0.1.0"] url = "https://packages.typst.org/preview/parsely-0.1.0.tar.gz" hash = "sha256-7KqZ9d+ZcAOXCg8/Hww3WGBYoNot014M3Qc8f+ejioI=" @@ -29146,6 +30027,16 @@ license = [ ] homepage = "https://github.com/miawinter98/hdm-thesis" +[primaviz."0.6.0"] +url = "https://packages.typst.org/preview/primaviz-0.6.0.tar.gz" +hash = "sha256-05PMc9jmuR0JwRswMqgW36171w269Xmq8kTQpnrsmaY=" +typstDeps = [] +description = "A pure-Typst charting library with 50+ chart types, 6 themes, and zero dependencies — built entirely with native primitives" +license = [ + "MIT", +] +homepage = "https://github.com/phiat/primaviz" + [primaviz."0.5.3"] url = "https://packages.typst.org/preview/primaviz-0.5.3.tar.gz" hash = "sha256-O0xJbwwBpCGXEraQQ9kg5/+4OmM/346PwNZxitvRXEU=" @@ -29554,6 +30445,18 @@ license = [ ] homepage = "https://github.com/ludwig-austermann/qcm" +[qec-thrust."0.2.0"] +url = "https://packages.typst.org/preview/qec-thrust-0.2.0.tar.gz" +hash = "sha256-Dc9k1IJcENOSBtQnQfJ+M0LEIQaOaBAk80FTKlFS+O8=" +typstDeps = [ + "cetz_0_4_0", +] +description = "A package for drawing quantum error correction codes with Typst" +license = [ + "MIT", +] +homepage = "https://github.com/nzy1997/qec-thrust" + [qec-thrust."0.1.2"] url = "https://packages.typst.org/preview/qec-thrust-0.1.2.tar.gz" hash = "sha256-5gSn0sAhF+OBBBx4C11vCiu/Lp/88YyTSDJIgN7G9QU=" @@ -29789,6 +30692,28 @@ license = [ ] homepage = "https://github.com/ivaquero/qooklet.git" +[quan."0.1.0"] +url = "https://packages.typst.org/preview/quan-0.1.0.tar.gz" +hash = "sha256-fjw0vFO0gmqFPXuIUjyYH1BbSSNfHrUx8IPmocV82mI=" +typstDeps = [] +description = "Circled numbers / 带圈数字" +license = [ + "MIT", +] +homepage = "https://github.com/SchrodingerBlume/typst-quan" + +[quati-abnt."0.0.4"] +url = "https://packages.typst.org/preview/quati-abnt-0.0.4.tar.gz" +hash = "sha256-Ein4k3taWzZ6D1E3UTGyM5YCfjrpDzF3mEyXc3cFajM=" +typstDeps = [ + "glossarium_0_5_10", +] +description = "Documents according to the Associação Brasileira de Normas Técnicas (ABNT" +license = [ + "AGPL-3.0-only", +] +homepage = "https://github.com/gabdumal/quati_abnt" + [quati-abnt."0.0.2"] url = "https://packages.typst.org/preview/quati-abnt-0.0.2.tar.gz" hash = "sha256-1yccweNN/A+WEOnS9Il0pd5IlNahfrFwphuLHkWYEjU=" @@ -30466,6 +31391,16 @@ license = [ ] homepage = "https://github.com/Ri-Nai/typst-rednote" +[rexllent."0.4.1"] +url = "https://packages.typst.org/preview/rexllent-0.4.1.tar.gz" +hash = "sha256-HOp6HDjLSH9kLERCxsvZnxob+lCn+dzmT6eB5ejEY9c=" +typstDeps = [] +description = "Parsing xlsx file into a typst table, powered by wasm" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/typst-rexllent" + [rexllent."0.4.0"] url = "https://packages.typst.org/preview/rexllent-0.4.0.tar.gz" hash = "sha256-p8Q+sCQD/gAi77mPNuEUdONPQW7OqfrRmwyrIYGY6Xw=" @@ -30566,6 +31501,16 @@ license = [ ] homepage = "https://github.com/hongjr03/typst-rexllent" +[rezvan-chalmers-cse-thesis."0.1.0"] +url = "https://packages.typst.org/preview/rezvan-chalmers-cse-thesis-0.1.0.tar.gz" +hash = "sha256-XiWpDWIBS/ISUADgmRQnKUSJMvGQG4LyTjzN6sJzgKg=" +typstDeps = [] +description = "Master's thesis at Chalmers/GU CSE" +license = [ + "MIT", +] +homepage = "https://github.com/rezaarezvan/rezvan-chalmers-cse-thesis" + [rfc-vibe."0.1.0"] url = "https://packages.typst.org/preview/rfc-vibe-0.1.0.tar.gz" hash = "sha256-VsSxsq4j5+l4euhA7k977HSZOtuApGwp+Jwny9zpWm8=" @@ -31511,6 +32456,16 @@ license = [ ] homepage = "https://github.com/curvenote/scienceicons" +[scorify."0.3.0"] +url = "https://packages.typst.org/preview/scorify-0.3.0.tar.gz" +hash = "sha256-0H+YsKi6W91LSBRTMaFUZSkfyKcIeLuqi4hhE/1kSjU=" +typstDeps = [] +description = "Render professional sheet music directly in Typst documents" +license = [ + "MIT", +] +homepage = "https://github.com/justinbornais/typst-sheet-music" + [scorify."0.2.0"] url = "https://packages.typst.org/preview/scorify-0.2.0.tar.gz" hash = "sha256-FwdPe6a4s4ujOveN+j8B+LfG7z4t8q4XIAf28zF5C5g=" @@ -33049,6 +34004,16 @@ license = [ ] homepage = "https://github.com/zhao-leo/BUPT-Report-Typst" +[simple-cheatsheet."0.1.0"] +url = "https://packages.typst.org/preview/simple-cheatsheet-0.1.0.tar.gz" +hash = "sha256-0CMLRj+MOGwe7T1n8gLl6la/wPx6owTNyAc9PnJwYXM=" +typstDeps = [] +description = "Simple, customisable cheatsheet for exams and study notes" +license = [ + "MIT-0", +] +homepage = "https://github.com/stanlrt/typst-simple-cheatsheet" + [simple-cvut-report."0.2.0"] url = "https://packages.typst.org/preview/simple-cvut-report-0.2.0.tar.gz" hash = "sha256-kmtCoNO2j8pEXAk1wNaCwZzyNlh/aQbqZLVaugw5zDo=" @@ -33086,6 +34051,18 @@ license = [ ] homepage = "https://github.com/chillcicada/simple-handout-template" +[simple-hust-report."0.1.1"] +url = "https://packages.typst.org/preview/simple-hust-report-0.1.1.tar.gz" +hash = "sha256-3Q7/2obzZABG3jWDrk0XuqhDmKnSGGZqf1OXaJ1tgNQ=" +typstDeps = [ + "lovelace_0_3_1", +] +description = "A experiment/project report template for HUST students(and also suitable for other schools" +license = [ + "MIT", +] +homepage = "https://github.com/kkkkkkeng/hust-report-template-typst" + [simple-hust-report."0.1.0"] url = "https://packages.typst.org/preview/simple-hust-report-0.1.0.tar.gz" hash = "sha256-fxR79qbbGhXHqU3rgQacq/EY8Sc5X+HEcFND5qjUqmQ=" @@ -33261,6 +34238,18 @@ license = [ ] homepage = "https://github.com/allgoewer/typst-packages" +[simple-research-poster."0.2.0"] +url = "https://packages.typst.org/preview/simple-research-poster-0.2.0.tar.gz" +hash = "sha256-i3zPf23nDrqGK+zU+/VaPnpmlTZbV9jneIRN7pM6qb8=" +typstDeps = [ + "valkyrie_0_2_2", +] +description = "Simple research poster" +license = [ + "MIT-0", +] +homepage = "https://github.com/aneziac/simple-research-poster" + [simple-research-poster."0.1.0"] url = "https://packages.typst.org/preview/simple-research-poster-0.1.0.tar.gz" hash = "sha256-qunQ04+3cEIqMUCrxKyhraJOORUet6zilfoqdCA1J8c=" @@ -33275,6 +34264,16 @@ license = [ ] homepage = "https://github.com/aneziac/simple-research-poster" +[simple-soc-report."0.1.0"] +url = "https://packages.typst.org/preview/simple-soc-report-0.1.0.tar.gz" +hash = "sha256-FDnHIE6KfWjbDMVUe9LnJtHGewu0N3211ajVr3I8/b0=" +typstDeps = [] +description = "Final Year Project report for NUS Computing (unofficial" +license = [ + "MIT-0", +] +homepage = "https://github.com/tzyian/simple-soc-report" + [simple-technical-resume."0.1.1"] url = "https://packages.typst.org/preview/simple-technical-resume-0.1.1.tar.gz" hash = "sha256-/P72crwL3pqiHqKCCuZy/lzvv86CYams967bTppcCrE=" @@ -33712,6 +34711,16 @@ license = [ ] homepage = "https://github.com/Bi0T1N/typst-socialhub-fa" +[solo-lu-df."2.0.0"] +url = "https://packages.typst.org/preview/solo-lu-df-2.0.0.tar.gz" +hash = "sha256-bOugsyzWgNZwE0bsuxWH049MkXou59E8ysV0r7a3gUI=" +typstDeps = [] +description = "Write qualification papers, bachelor’s theses, and master’s theses for University of Latvia, Computer Science programme" +license = [ + "MIT-0", +] +homepage = "https://github.com/kristoferssolo/LU-DF-Typst-Template" + [solo-lu-df."1.1.2"] url = "https://packages.typst.org/preview/solo-lu-df-1.1.2.tar.gz" hash = "sha256-wOj28KaUxwRExEr2utFWsBTpcd/keTZVnzzvWl/VR6w=" @@ -34193,6 +35202,29 @@ license = [ ] homepage = "https://github.com/aarquelle/stagehand" +[starchy-junia."0.2.0"] +url = "https://packages.typst.org/preview/starchy-junia-0.2.0.tar.gz" +hash = "sha256-oZnMx0NzEMRmNCogZZHS1AWEWnKjkgmwQ7mvqVAa9ng=" +typstDeps = [ + "cetz_0_5_0", + "codly_1_3_0", + "codly-languages_0_1_10", + "drafting_0_2_2", + "echarm_0_3_1", + "fletcher_0_5_8", + "glossarium_0_5_10", + "hydra_0_6_2", + "lilaq_0_6_0", + "tidy_0_4_3", + "timeliney_0_4_0", + "zap_0_5_0", +] +description = "Report template based on JUNIA engineering school's writing charter — three models (base, light, expert), bilingual FR/EN, auto-numbered figures and equations" +license = [ + "MIT", +] +homepage = "https://codeberg.org/MathYeiv/starchy-junia" + [starchy-junia."0.1.8"] url = "https://packages.typst.org/preview/starchy-junia-0.1.8.tar.gz" hash = "sha256-0ZJLmkdzn1KR63jChZmESVWHm+ldevEvW34731jkiKs=" @@ -34448,6 +35480,18 @@ license = [ ] homepage = "https://github.com/zh1-z/SJTU-Master-Midterm-Typst-Template" +[steady-rvl-slides."0.1.0"] +url = "https://packages.typst.org/preview/steady-rvl-slides-0.1.0.tar.gz" +hash = "sha256-tcy8oFFJv6KPzLkPu5zQdmcwKB1FOvdQAqxD3x7yh9Y=" +typstDeps = [ + "touying_0_7_0", +] +description = "RVL group meeting slides built on Touying" +license = [ + "MIT", +] +homepage = "https://github.com/chiwei085/RVL-Typst-Template" + [stellar-iac."0.5.0"] url = "https://packages.typst.org/preview/stellar-iac-0.5.0.tar.gz" hash = "sha256-lZqPmrK+Mdip7bI8h5UwgoMjC91AEWkuhAKKcHjU/Cg=" @@ -34512,6 +35556,16 @@ license = [ ] homepage = "https://github.com/xbttkunhao/storytiles" +[strangelion."0.1.0"] +url = "https://packages.typst.org/preview/strangelion-0.1.0.tar.gz" +hash = "sha256-OFbj2aj6ROVhVUcqNfMWDULBSrOB/RiwiFliL6ZyNbg=" +typstDeps = [] +description = "一个为本科生毕业论文设计的 Typst 排版模板。" +license = [ + "MIT", +] +homepage = "https://github.com/strangelion/university-typst-template" + [strath-maestrum."0.0.1"] url = "https://packages.typst.org/preview/strath-maestrum-0.0.1.tar.gz" hash = "sha256-XtcFheFuDXkNgwjXh9Rx7jVuKlfa3MjBWuYsKhf/H/g=" @@ -37697,6 +38751,21 @@ license = [ ] homepage = "https://codeberg.org/a5s/toot" +[touying."0.7.3"] +url = "https://packages.typst.org/preview/touying-0.7.3.tar.gz" +hash = "sha256-fZpwl/9+UnmVRcNR+0VBb/kydTmbYZ8t5KCOFzPR5Yg=" +typstDeps = [ + "cetz_0_5_0", + "fletcher_0_5_8", + "numbly_0_1_0", + "theorion_0_6_0", +] +description = "A powerful package for creating presentation slides in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/touying-typ/touying" + [touying."0.7.2"] url = "https://packages.typst.org/preview/touying-0.7.2.tar.gz" hash = "sha256-Msyfdep3OLVhM1IeTtIdLDRTDrY+KiM1zxFGuH9cbv0=" @@ -38019,6 +39088,18 @@ license = [ ] homepage = "https://github.com/touying-typ/touying" +[touying-aqua."0.7.3"] +url = "https://packages.typst.org/preview/touying-aqua-0.7.3.tar.gz" +hash = "sha256-kG10nMJh96xDGQ/ukb04wscUB+nekbPo42miNOtfE1U=" +typstDeps = [ + "touying_0_7_3", +] +description = "Aqua theme in Touying - a powerful package for creating presentation slides in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/touying-typ/touying" + [touying-aqua."0.7.2"] url = "https://packages.typst.org/preview/touying-aqua-0.7.2.tar.gz" hash = "sha256-up7pTwMd3Dslp2vYAp9ks8orHG/v8i+xwl9QmIW6OWU=" @@ -39882,6 +40963,16 @@ license = [ ] homepage = "https://github.com/freundTech/typst-typearea" +[typewind."0.2.0"] +url = "https://packages.typst.org/preview/typewind-0.2.0.tar.gz" +hash = "sha256-VCfjVlgz5sJZOKOGCpea27KeqAB+xkKo7dHl3B0KeAY=" +typstDeps = [] +description = "tailwindcss colors" +license = [ + "MIT", +] +homepage = "https://github.com/C4illin/typewind" + [typewind."0.1.0"] url = "https://packages.typst.org/preview/typewind-0.1.0.tar.gz" hash = "sha256-5metuBpxNEFLS0vx4SaL2hhNEJGDXWYlSq7OLmhyp34=" @@ -40032,6 +41123,16 @@ license = [ ] homepage = "https://github.com/TeddyHuang-00/typpuccino" +[typshade."0.1.0"] +url = "https://packages.typst.org/preview/typshade-0.1.0.tar.gz" +hash = "sha256-Q5l5zb/lNn27bMXmTqs6Uy3BRYnGkk5MXClWJmGz2LQ=" +typstDeps = [] +description = "Visualize multiple-sequence alignments for bioinformatics" +license = [ + "GPL-2.0-only", +] +homepage = "https://github.com/rice8y/typshade" + [typsidian."0.0.3"] url = "https://packages.typst.org/preview/typsidian-0.0.3.tar.gz" hash = "sha256-E7c7NMfFMZ20lxD1eR2G5I2BJnxCmeQdi+zm6iKcX3c=" @@ -40619,6 +41720,16 @@ license = [ ] homepage = "https://github.com/MarkV43/ufscholar" +[ugm-presentation-unofficial."0.1.0"] +url = "https://packages.typst.org/preview/ugm-presentation-unofficial-0.1.0.tar.gz" +hash = "sha256-eh4BubETJRgYBdgN40n2wYb7z9vUg4UzVoXkEjuEw6k=" +typstDeps = [] +description = "Unofficial UGM presentation" +license = [ + "MIT", +] +homepage = "https://github.com/fepfitra/ugm-presentation-unofficial" + [umbra."0.1.1"] url = "https://packages.typst.org/preview/umbra-0.1.1.tar.gz" hash = "sha256-jWwsmOcVIPdlYkTHHCkViz4NqPM8KjqfHnQUQZxgiPQ=" @@ -40673,6 +41784,19 @@ license = [ ] homepage = "https://github.com/typst/templates" +[uni-ms-pres-schloss."0.1.0"] +url = "https://packages.typst.org/preview/uni-ms-pres-schloss-0.1.0.tar.gz" +hash = "sha256-hkEmnY4Jit5MbHWJaS2PgAwG55gVHDRBExCGsfJI50A=" +typstDeps = [ + "ez-today_2_1_0", + "polylux_0_4_0", +] +description = "Unofficial Typst + Polylux presentation template in the style of the University of Muenster Schloss-Blue" +license = [ + "MIT", +] +homepage = "https://github.com/Woelkchen/uni-ms-pres-schloss/" + [unichar."0.4.0"] url = "https://packages.typst.org/preview/unichar-0.4.0.tar.gz" hash = "sha256-lxUhgjs+n64yqG15Ao2NXnTaBZ1IFeuJKLaBP4eSCIw=" @@ -40739,6 +41863,18 @@ license = [ ] homepage = "https://github.com/MDLC01/unichar" +[unidep."0.1.4"] +url = "https://packages.typst.org/preview/unidep-0.1.4.tar.gz" +hash = "sha256-+nJr2n+eSr7PBJE9IqHTe6lapWsXAJaQpP1iewZgG9s=" +typstDeps = [ + "cetz_0_5_0", +] +description = "Render beautiful, customizable Universal Dependencies (CoNLL-U) dependency trees" +license = [ + "MIT", +] +homepage = "https://github.com/rice8y/unidep" + [unidep."0.1.3"] url = "https://packages.typst.org/preview/unidep-0.1.3.tar.gz" hash = "sha256-5bKKv7Z+t+5GyzA/ZlT9jBKOQO/Z6H6VOpgENS7eNpo=" @@ -40797,6 +41933,16 @@ license = [ ] homepage = "https://github.com/sebastos1/unified-uia-thesis" +[unify."0.8.0"] +url = "https://packages.typst.org/preview/unify-0.8.0.tar.gz" +hash = "sha256-BeHRD+ZAF+K+C5Pl36/KrVKrVZ50kYncS5VOhlSsWy8=" +typstDeps = [] +description = "Format numbers, units, and ranges correctly" +license = [ + "MIT", +] +homepage = "https://github.com/ChHecker/unify" + [unify."0.7.1"] url = "https://packages.typst.org/preview/unify-0.7.1.tar.gz" hash = "sha256-1GvuZQ2u9Ty7hqFxdsVg3yJ/S6rFa/c0/HYjoR2PESA=" @@ -41328,6 +42474,18 @@ license = [ ] homepage = "https://github.com/bkmashiro/ic-individual-project-typst" +[unofficial-iitkgp-thesis."0.1.0"] +url = "https://packages.typst.org/preview/unofficial-iitkgp-thesis-0.1.0.tar.gz" +hash = "sha256-B+G7pdso/TD7m93x0y/GGNWWMVMGB9vJlMWJS6gVMH0=" +typstDeps = [ + "hydra_0_6_2", +] +description = "Unofficial thesis and project reports for the Indian Institute of Technology Kharagpur" +license = [ + "MIT", +] +homepage = "https://github.com/rajeevvermaa/iitkgp-thesis" + [unofficial-kth-thesis-proposal."0.2.0"] url = "https://packages.typst.org/preview/unofficial-kth-thesis-proposal-0.2.0.tar.gz" hash = "sha256-vLgD9GuMEqlbXicFiXnognYOwEkOGq/iNJb+P35gSTk=" @@ -41348,6 +42506,88 @@ license = [ ] homepage = "https://github.com/cseas002/kth-thesis-proposal" +[unofficial-monash-touying."0.1.1"] +url = "https://packages.typst.org/preview/unofficial-monash-touying-0.1.1.tar.gz" +hash = "sha256-wromtAxv9nlk3jlWvN7Q1SQn9B6KxKUiFtXqr7KXuCk=" +typstDeps = [ + "frame-it_2_0_0", + "tidy_0_4_3", + "touying_0_7_3", + "zebraw_0_6_3", +] +description = "Monash-inspired academic slides for Touying" +license = [ + "MIT", +] +homepage = "https://github.com/Eryc123Y/unofficial-monash-slides-typst.git" + +[unofficial-monash-touying."0.1.0"] +url = "https://packages.typst.org/preview/unofficial-monash-touying-0.1.0.tar.gz" +hash = "sha256-ufiWnTgiIkS3wz0ggtSzbwYTGaz9bCjkQQXaaVqXKgY=" +typstDeps = [ + "frame-it_2_0_0", + "tidy_0_4_3", + "touying_0_7_3", + "zebraw_0_6_1", +] +description = "Monash-inspired academic slides for Touying" +license = [ + "MIT", +] +homepage = "https://github.com/Eryc123Y/unofficial-monash-slides-typst" + +[unofficial-ouc-bachelor-thesis."0.2.1"] +url = "https://packages.typst.org/preview/unofficial-ouc-bachelor-thesis-0.2.1.tar.gz" +hash = "sha256-z2T4NzFDIgfdqBwK2DsPaZIkHAwQahO3+nvQpc5E/+g=" +typstDeps = [ + "cuti_0_4_0", + "gb7714-bilingual_0_2_3", + "itemize_0_2_0", + "lovelace_0_3_1", + "pointless-size_0_1_2", + "valkyrie_0_2_2", + "zebraw_0_6_3", +] +description = "Unofficial Bachelor thesis for Ocean University of China (OUC" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/ouc-bachelor-thesis" + +[unofficial-ouc-bachelor-thesis."0.2.0"] +url = "https://packages.typst.org/preview/unofficial-ouc-bachelor-thesis-0.2.0.tar.gz" +hash = "sha256-DfyXehog+L1VGQG5s1npGXBjKijVdSCvL3MUhHrP8gg=" +typstDeps = [ + "cuti_0_4_0", + "gb7714-bilingual_0_2_3", + "itemize_0_2_0", + "lovelace_0_3_1", + "pointless-size_0_1_2", + "valkyrie_0_2_2", + "zebraw_0_6_3", +] +description = "Unofficial Bachelor thesis for Ocean University of China (OUC" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/ouc-bachelor-thesis" + +[unofficial-ouc-bachelor-thesis."0.1.0"] +url = "https://packages.typst.org/preview/unofficial-ouc-bachelor-thesis-0.1.0.tar.gz" +hash = "sha256-FLFPBTc+SbmcYTJlJ7i38sVOzeqMhkvdVnEG8OcJeZg=" +typstDeps = [ + "cuti_0_4_0", + "itemize_0_2_0", + "pointless-size_0_1_2", + "valkyrie_0_2_2", + "zebraw_0_6_1", +] +description = "Unofficial Bachelor thesis for Ocean University of China (OUC" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/ouc-bachelor-thesis" + [unofficial-sdu-lab-report."0.1.1"] url = "https://packages.typst.org/preview/unofficial-sdu-lab-report-0.1.1.tar.gz" hash = "sha256-LOrmkPtvnH7dX3cozigXxdMc4KRRaaJ4lpp+Ad5n6Hw=" @@ -41449,6 +42689,19 @@ license = [ ] homepage = "https://github.com/GrooveWJH/unofficial-sdu-thesis" +[unofficial-sorbonne-presentation."0.4.0"] +url = "https://packages.typst.org/preview/unofficial-sorbonne-presentation-0.4.0.tar.gz" +hash = "sha256-I+JjtKnUnEzKN87KgNP+AHErDCgEap4ifMRIDXasmpg=" +typstDeps = [ + "cetz_0_5_0", + "navigator_0_1_5", + "presentate_0_2_5", +] +description = "A unofficial structured presentation theme for Sorbonne University and IPLESP, based on presentate and navigator" +license = [ + "MIT", +] + [unofficial-sorbonne-presentation."0.3.1"] url = "https://packages.typst.org/preview/unofficial-sorbonne-presentation-0.3.1.tar.gz" hash = "sha256-S/bw84D3/Kv9WKSsiC9tZdYmwQRSA8U/JYoF5IU1C7k=" @@ -42544,6 +43797,18 @@ license = [ ] homepage = "https://github.com/ShinoYumi/typst-vlna/" +[vmesh."0.1.0"] +url = "https://packages.typst.org/preview/vmesh-0.1.0.tar.gz" +hash = "sha256-Sv604uTisP3r8RuwmvInka44T2eSri4PXdzeQteh/0Y=" +typstDeps = [ + "cetz_0_5_0", +] +description = "Visualize 2D and 3D Gmsh files" +license = [ + "MIT", +] +homepage = "https://github.com/chaozg/vmesh" + [vocabulo."0.2.0"] url = "https://packages.typst.org/preview/vocabulo-0.2.0.tar.gz" hash = "sha256-jMadO/jlPFQ3DnnVq1huA6NRqpO8Ohf/1ByNZ3NHEc8=" @@ -42666,6 +43931,16 @@ license = [ ] homepage = "https://github.com/Lieunoir/typst-voronay" +[vtzone."0.1.0"] +url = "https://packages.typst.org/preview/vtzone-0.1.0.tar.gz" +hash = "sha256-PCHWZg/F7ccsnNVy6bqnTYfG0K1dy9yCm7C3fohPdOM=" +typstDeps = [] +description = "Basic vertical layout environment for CJK text" +license = [ + "MIT", +] +homepage = "https://github.com/neruthes/typstpkg-vtzone" + [wavy."0.1.3"] url = "https://packages.typst.org/preview/wavy-0.1.3.tar.gz" hash = "sha256-iLh9y+2tL8G2RKQ7thYYfa9wyKWZR543JoIMbzqo2tA=" @@ -43348,6 +44623,16 @@ license = [ ] homepage = "https://github.com/lartpang/zebra-notes" +[zebraw."0.6.3"] +url = "https://packages.typst.org/preview/zebraw-0.6.3.tar.gz" +hash = "sha256-exUbn9usSGkrqq+iW/X9kwX5ujIQI6KqdlOEpUNhRqw=" +typstDeps = [] +description = "A lightweight and fast package for displaying code blocks with line numbers or highlighting" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/typst-zebraw" + [zebraw."0.6.1"] url = "https://packages.typst.org/preview/zebraw-0.6.1.tar.gz" hash = "sha256-zixd/XpbcsmSQQjc0dIsivNAOWUWCh+KqB4usGvAeLg=" @@ -43584,6 +44869,16 @@ license = [ ] homepage = "https://github.com/langonne/zen-utbm-report" +[zen-zine."0.4.0"] +url = "https://packages.typst.org/preview/zen-zine-0.4.0.tar.gz" +hash = "sha256-3XnLH6U/OHDEwOzoiaVozefcVwMUJKG3Jlr68EwCcVs=" +typstDeps = [] +description = "Excellently type-set a fun little zine" +license = [ + "MIT", +] +homepage = "https://github.com/tomeichlersmith/zen-zine" + [zen-zine."0.3.1"] url = "https://packages.typst.org/preview/zen-zine-0.3.1.tar.gz" hash = "sha256-7z+JjOuwq80dsFub3XY9NiEL+WUZ1jKudoAEVPyFsp4=" diff --git a/pkgs/by-name/u2/u2ps/package.nix b/pkgs/by-name/u2/u2ps/package.nix index d54d224b1eab..fbf8111d7b90 100644 --- a/pkgs/by-name/u2/u2ps/package.nix +++ b/pkgs/by-name/u2/u2ps/package.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ghostscript_headless ]; + # gcc 15 defaults to C23 where bool is a keyword; u2ps does `typedef unsigned char bool;` + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + meta = { description = "Unicode text to postscript converter"; homepage = "https://github.com/arsv/u2ps"; diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index e1d2843c3f93..46ac449b10d6 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -23,7 +23,7 @@ enableOpencv ? stdenv.hostPlatform.isLinux, opencv, enableWayland ? stdenv.hostPlatform.isLinux, - extra-cmake-modules, + kdePackages, wayland, wayland-protocols, wayland-scanner, @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { opencv ] ++ lib.optionals enableWayland [ - extra-cmake-modules + kdePackages.extra-cmake-modules wayland wayland-protocols ] diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix index e9dca0b8f50d..e9c30105aee8 100644 --- a/pkgs/by-name/ug/ugm/package.nix +++ b/pkgs/by-name/ug/ugm/package.nix @@ -1,20 +1,20 @@ { lib, - buildGo125Module, + buildGo126Module, fetchFromGitHub, makeWrapper, nix-update-script, }: -buildGo125Module (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "ugm"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ariasmn"; repo = "ugm"; tag = "v${finalAttrs.version}"; - hash = "sha256-AkiAF9zLgyzXRC6efjQ+eeAL3mOSQM94B8nr09pcY5M="; + hash = "sha256-W4oHJAEppb17t1kxKxDF5fVZkqhOtvm7gCtlmSg7YFA="; }; vendorHash = "sha256-W9v52cxhXdNyW5RGk+SoA1u7Yid+63YYdd9YaGKEWDs="; diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix index 3be31bfcedad..7a635ab6a2f9 100644 --- a/pkgs/by-name/uk/ukmm/package.nix +++ b/pkgs/by-name/uk/ukmm/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ukmm"; - version = "0.17.0"; + version = "0.17.0-1"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = "ukmm"; tag = "v${finalAttrs.version}"; - hash = "sha256-nCyaPEa5wYRii9ehFwsLw390AcbjlrdKdGqxKhuk7CQ="; + hash = "sha256-iNqWNF+X5qFRNpo7OXxCNCP8HR28EukgMAx8a025Ai8="; }; - cargoHash = "sha256-BzgFzEKsVCvNHaBv0fKgt3lGgDxwi560AkIrk4pSWHA="; + cargoHash = "sha256-3qg5yTzalaKoOXYb1yo0K3AT6itJP1DErEQ2S8EfLNg="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 3d593a3c0a46..49896127df7f 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ultrastardx"; - version = "2026.4.0"; + version = "2026.5.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${finalAttrs.version}"; - hash = "sha256-/FT5UP+Usd1vyAyRnXOBs5iT76sqdiSBhoyC4bGKmEw="; + hash = "sha256-67tWYCN2dRtll/XgG8uqqoRUoiNl4/Ne/MHmL7Y3j40="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/un/unnix/package.nix b/pkgs/by-name/un/unnix/package.nix index c088df964b67..54234e0ac55a 100644 --- a/pkgs/by-name/un/unnix/package.nix +++ b/pkgs/by-name/un/unnix/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, installShellFiles, pkg-config, - withBubblewrap ? stdenv.isLinux, + withBubblewrap ? stdenv.hostPlatform.isLinux, makeBinaryWrapper, xz, zstd, diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix index b9f0ee323e30..c31a93e57995 100644 --- a/pkgs/by-name/up/uppy-companion/package.nix +++ b/pkgs/by-name/up/uppy-companion/package.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FF5I4D9obRVJqyjucemnxZiPcNHdQdo3S0z/h96Fe6c="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/transloadit/uppy/blob/main/package.json#L39 + ./yarn-4.14-support.patch + ]; + nativeBuildInputs = [ nodejs yarn-berry_4.yarnBerryConfigHook @@ -30,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-euKvBI3Y15SmBoVOEbS8GIJT/kIOhayLKGVSd8JztqI="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-vmya3c+ec93T8kNoooUu4risqScY0b4cwML7d2kYz88="; }; buildPhase = '' diff --git a/pkgs/by-name/up/uppy-companion/yarn-4.14-support.patch b/pkgs/by-name/up/uppy-companion/yarn-4.14-support.patch new file mode 100644 index 000000000000..1cb3aa5b44da --- /dev/null +++ b/pkgs/by-name/up/uppy-companion/yarn-4.14-support.patch @@ -0,0 +1,22 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -11,3 +11,7 @@ nodeLinker: node-modules + + npmPublishAccess: public + ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index 8d3f30f7dc24..c498932d617d 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "uptime-kuma"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; tag = finalAttrs.version; - hash = "sha256-L/+vadToq9CXz6SZnucIMg4Lf43aZ3OKLVhuFblY7zY="; + hash = "sha256-TJCpmUT/E7Il9h7UM1rs2s8l2Vey+X3PZToFLTgxFdA="; }; - npmDepsHash = "sha256-kD+nOU+FVdnlVphVJ3FGUjuHf1f5UbSbpq7Cjc1muh4="; + npmDepsHash = "sha256-FnUjHi0l/WDBX0T65bomElcEG+mRc81n/s22npeHnlM="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix index edd664cd811b..fe0deaa66631 100644 --- a/pkgs/by-name/ur/uriparser/package.nix +++ b/pkgs/by-name/ur/uriparser/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uriparser"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "uriparser"; repo = "uriparser"; tag = "uriparser-${finalAttrs.version}"; - hash = "sha256-tXEcJ6NAKVoFg/GLkldRcrSlXDcGpvjp7cguM9Xqcps="; + hash = "sha256-BM2Nf7iKlS336RG7f+ZKBm/+yru5wB9p2TVdY7kYgKg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index b4a06d427bca..78e60ba9bd30 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -9,7 +9,7 @@ SDL2_net, libogg, libvorbis, - ffmpeg, + ffmpeg_7, zlib, }: @@ -40,7 +40,7 @@ stdenv.mkDerivation { SDL2_net libogg libvorbis - ffmpeg + ffmpeg_7 clunk zlib ]; diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index 41e39fe23ec1..f222fb9843db 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "vcluster"; - version = "0.31.0"; + version = "0.33.2"; src = fetchFromGitHub { owner = "loft-sh"; repo = "vcluster"; tag = "v${finalAttrs.version}"; - hash = "sha256-yGvKZ70+x+PQiTCB8MxUplymlQLm9iT+ryBHFF1a/Os="; + hash = "sha256-17nJa4xM4+D1v85x2rHFtGU0C+Gi8nph7Q8JRHYXBP4="; }; vendorHash = null; @@ -57,6 +57,7 @@ buildGoModule (finalAttrs: { mainProgram = "vcluster"; maintainers = with lib.maintainers; [ qjoly + roehrijn ]; }; }) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 59e618a9cf55..ac2ff66c2876 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -172,7 +172,8 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString doWrap '' mv "$out/bin/vcpkg" "$out/bin/.vcpkg-wrapped" - printf "%s" "$vcpkgWrapper" | install -Dm555 /dev/stdin "$out/bin/vcpkg" + printf "%s" "$vcpkgWrapper" > "$out/bin/vcpkg" + chmod 555 "$out/bin/vcpkg" ''; passthru.tests = lib.optionalAttrs doWrap { diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 437b939549c1..f0040f63a6b4 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2026.03.18"; + version = "2026.04.27"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; tag = finalAttrs.version; - hash = "sha256-vcs7F8darR/PNJEihebA7AqLWglefGxIacr1fqL36eM="; + hash = "sha256-UyT2+dm3h4w2sHzERPYYTe8QNqODBhbnT8I8cLD3/CY="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index 761a00c43949..8e49779c72c1 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -249,13 +249,13 @@ stdenv.mkDerivation (finalAttrs: { pkg-config zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems imagemagick libicns wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ rsync ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]; buildInputs = [ curl @@ -320,7 +320,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png done; '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{bin,Applications} mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ $out/Applications diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 14326b097d58..149f6c441f31 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.5.0-unstable-2026-05-01"; + version = "3.5.0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "ad8de4361c9d6e93b818d3381e85b14e0c90ad05"; - hash = "sha256-SzIZWZxFVupHNMVtlEC8BuDkj42G7uJkkOZa/In2tFY="; + rev = "9c0c9b02187c20bb767ce16ac7685580430d9b10"; + hash = "sha256-SPsI/bAlO3aQOT+84tJJZ0+UjbR4REXzaiFr6952/sI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index a703d967a871..c0618fd6c98a 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.14.11"; + version = "1.14.13"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ylu1O4zvnVVEXzNQ5j1+Y2X54lVCyqVJLJa1Ngz+7aA="; + hash = "sha256-Xqk/akTa/NcHjSm6h77y6Fkvq7ayBcR0w0HG0Hwfkf8="; }; patches = [ ./fix-deps.patch ]; @@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; pnpm = pnpm_10; - fetcherVersion = 2; - hash = "sha256-GiUV2x8i7ewzn66v5wBUq67oNvrxZzOsh5TuQUtpJNQ="; + fetcherVersion = 3; + hash = "sha256-hk1rnNog5xvuIVI0M1ZJ5xrEuk0zcBiYsbROUycdi+A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix index 2484bdf1e39d..57ee941258a9 100644 --- a/pkgs/by-name/ve/vengi-tools/package.nix +++ b/pkgs/by-name/ve/vengi-tools/package.nix @@ -133,6 +133,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; # Segfaults when building shaders - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; }) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index bed9156bf587..857054812c2a 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { patches ; pnpm = pnpm_10_29_2; - fetcherVersion = 2; - hash = "sha256-o9dxtqXfCKTQpvNrbD/h0F3Hh39TEEA1qqYA9tN3j5I="; + fetcherVersion = 3; + hash = "sha256-Ue1K1KmRi4gF7E519deVY7QH+22dqlECMjdA7Z7qDCA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 0fd8c7674883..6a2516a3e2d3 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -49,7 +49,7 @@ withDevDoc ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD - && !(stdenv.hostPlatform.isRiscV && stdenv.isLinux), + && !(stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.isLinux), # passthru testers, diff --git a/pkgs/by-name/vi/visualvm/package.nix b/pkgs/by-name/vi/visualvm/package.nix index 67772e68ed9a..d0a368acf71e 100644 --- a/pkgs/by-name/vi/visualvm/package.nix +++ b/pkgs/by-name/vi/visualvm/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.2"; + version = "2.2.1"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${finalAttrs.version}/visualvm_${ builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version }.zip"; - sha256 = "sha256-xEqzSNM5Mkt9SQ+23Edb2NMN/o8koBjhQWTGuyZ/0m4="; + sha256 = "sha256-4Ub14FKOp2toMMuIaWJZ2pvE34UJ4m++Psoh8KdCe2M="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index dd18a2d425b8..0e6a6aba443c 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.9.3970.60"; + version = "7.9.3970.64"; suffix = { @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-2ZI1M1G/l5wRd+vfcc189NWURyVQp05mTCtwk+cEYpU="; - x86_64-linux = "sha256-nZn51rotZ8s/tu86OXbBb7LMwqcZPhEvLtfqIOJM1qg="; + aarch64-linux = "sha256-51Lsbs1Vv8Qy9aBUxPzfadpKia+PHnBjptHY4LSN1Mo="; + x86_64-linux = "sha256-WJn7vmIPJ7/e0UG2uoNedji/Vd0QTY2LNJMBNqTF9Po="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index 0bcb9ed27ba0..e40181d50996 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: { moreutils ]; - fetcherVersion = 2; - hash = "sha256-U1hW6j1WRyuh2rUgMxwF8LCRk7wgSlV6cqapBoXvAdU="; + fetcherVersion = 3; + hash = "sha256-0Z/C4x4ZDPC+3o5i6KJgFqmAhHk9CUhoPB9+6yyLtdE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/volatility3/package.nix b/pkgs/by-name/vo/volatility3/package.nix index 3633117be4a0..f7062f825139 100644 --- a/pkgs/by-name/vo/volatility3/package.nix +++ b/pkgs/by-name/vo/volatility3/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "volatility3"; - version = "2.27.0"; + version = "2.28.0"; pyproject = true; src = fetchFromGitHub { owner = "volatilityfoundation"; repo = "volatility3"; tag = "v${finalAttrs.version}"; - hash = "sha256-TtkLxzZq7tmLDpCl1UpOqdCWM7t+dgiUmQMsIg3vUGs="; + hash = "sha256-QO3rwGlVRBWEjReIGRDTK0LPVFN+4omkvxITaFC+5e0="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index c09db62db93a..cfa6c39587b6 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -32,7 +32,7 @@ buildNpmPackage (finalAttrs: { pkg-config nodejs-slim.python ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/vs/vscode-solidity-server/package.nix b/pkgs/by-name/vs/vscode-solidity-server/package.nix index aa91cf45f815..2b26b7c5b3ef 100644 --- a/pkgs/by-name/vs/vscode-solidity-server/package.nix +++ b/pkgs/by-name/vs/vscode-solidity-server/package.nix @@ -21,7 +21,7 @@ buildNpmPackage { npmDepsHash = "sha256-zXhWtPuiu+CRk712KskuHP4vglogJmFoCak6qWczPFM="; - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/vu/vulkanscenegraph/package.nix b/pkgs/by-name/vu/vulkanscenegraph/package.nix index a13aec1f38c4..3602212d89ed 100644 --- a/pkgs/by-name/vu/vulkanscenegraph/package.nix +++ b/pkgs/by-name/vu/vulkanscenegraph/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkanscenegraph"; - version = "1.1.14"; + version = "1.1.15"; src = fetchFromGitHub { owner = "vsg-dev"; repo = "VulkanSceneGraph"; tag = "v${finalAttrs.version}"; - hash = "sha256-879jvD8gP31ENYeTGexV+V4UQtdo2xJDPUaDRKkropg="; + hash = "sha256-+uSgBIjIm+N9nn31hVzEQTygIhDu4/FfhPLNJUG8XPU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vultisig-cli/package.nix b/pkgs/by-name/vu/vultisig-cli/package.nix index 1ac8e0607d3d..d32fc0695366 100644 --- a/pkgs/by-name/vu/vultisig-cli/package.nix +++ b/pkgs/by-name/vu/vultisig-cli/package.nix @@ -18,11 +18,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4I+N9uKZBzw0AePjS8CiALye/fuykBtpAoYxp+5iTW8="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/vultisig/vultisig-sdk/blob/main/package.json#L4 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-Ob0O69CDQwxQ+CnAtCSyweUahqDz0/g/JnJnAoruzIk="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-EW0Vc3502xoL4iDr2hPDXQ39McvvsiBWpMKgZRtF44M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vultisig-cli/yarn-4.14-support.patch b/pkgs/by-name/vu/vultisig-cli/yarn-4.14-support.patch new file mode 100644 index 000000000000..acf6feee69fe --- /dev/null +++ b/pkgs/by-name/vu/vultisig-cli/yarn-4.14-support.patch @@ -0,0 +1,22 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,3 +1,6 @@ + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.13.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 005e4df3d1aa..7b384b67eb9e 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "vunnel"; - version = "0.56.0"; + version = "0.57.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-2Z+TDEQNUlRVC8lPffK7XphI2qa9xfVZ3JMMBrC7HjE="; + hash = "sha256-ofxc4Mbd5MUoIQ+iAUPF54rxWuwQEA2t3T+vjO3UUgA="; leaveDotGit = true; }; diff --git a/pkgs/by-name/wa/wabt/package.nix b/pkgs/by-name/wa/wabt/package.nix index 87324064f225..14e8ca664108 100644 --- a/pkgs/by-name/wa/wabt/package.nix +++ b/pkgs/by-name/wa/wabt/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wabt"; - version = "1.0.40"; + version = "1.0.41"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; tag = finalAttrs.version; - hash = "sha256-Lrdmx/JOiWJdzZeyP6HdZH1SEHJ0N5VfSCYxtMBCF74="; + hash = "sha256-WcSFrVrZBr6ITskBUuD7rQvIPOiAW6VCrhXr1QroFHg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/wa/wahjam/package.nix b/pkgs/by-name/wa/wahjam/package.nix new file mode 100644 index 000000000000..e821cb7e62dd --- /dev/null +++ b/pkgs/by-name/wa/wahjam/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeDesktopItem, + copyDesktopItems, + pkg-config, + libsForQt5, + libogg, + libvorbis, + libresample, + portaudio, + portmidi, +}: + +stdenv.mkDerivation { + pname = "wahjam"; + version = "1.3.1-unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "wahjam"; + repo = "wahjam"; + rev = "4fde74da3be1fa53cdc2d3bc4b577b40951d6809"; + hash = "sha256-WYfLQxToyjAE+R2eaBKpDJGfkvrOTza8a6JbN9AL3aE="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + pkg-config + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtkeychain + libogg + libvorbis + libresample + portaudio + portmidi + ]; + + desktopItems = [ + (makeDesktopItem { + name = "wahjam"; + desktopName = "Wahjam"; + icon = "net.jammr.jammr"; + exec = "wahjam"; + comment = "Play with musicians over the internet"; + categories = [ "AudioVideo" ]; + }) + ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/scalable/apps + + cp qtclient/wahjam $out/bin/wahjam + cp qtclient/net.jammr.jammr.svg $out/share/icons/hicolor/scalable/apps + + runHook postInstall + ''; + + meta = { + description = "Software for musicians to play together over the internet"; + mainProgram = "wahjam"; + homepage = "https://github.com/wahjam/wahjam"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ caseyavila ]; + }; +} diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 05d4a99d0756..00547218c2e9 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -13,20 +13,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; - version = "44.0.0"; + version = "44.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-RdEKYfBvtXxy6l4PLL+ii95qkghQfUkFHjG3XfEuM1c="; + hash = "sha256-nVE18URbDKIrZr7ImPf2Zx5Ftq/oT2mZU0CMuBh+EYE="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-OS5ZeCNks4NuN8KVuUEjuB2ZHZjfB0U0n77p3PmDC4g="; + cargoHash = "sha256-K2Y6atvbvqIuc7Upk4134fZW1y329DlG2gzm8VveyWA="; cargoBuildFlags = [ "--package" "wasmtime-cli" diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 664e45982fba..22ac32255b97 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems makeBinaryWrapper ] - ++ lib.optional stdenv.isDarwin unzip; + ++ lib.optional stdenv.hostPlatform.isDarwin unzip; desktopItems = [ (makeDesktopItem { @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/{bin,opt/Weasis,share/{applications,icons/hicolor/64x64/apps}} mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/opt/Weasis @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeDeps} done '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis.app $out/Applications/ '' diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 16b99c54600f..5b73ae64edad 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -19,23 +19,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-PMvayBLXufAIOrLquoSxXqjxbymaFFAvY1EXI23DFeI="; + hash = "sha256-tq88qWrm243Go64LpH7kU89ryq2xm9nkIJI+ZeQU7IU="; }; - cargoHash = "sha256-9wUb7c91OEnEiWVQrJRN0tFotIo3ZCtodgELUakEKig="; + cargoHash = "sha256-Qxx+BrioVBX5Yy6YVJAnYdNEZVqiZUJTnWNgc74sI44="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/ui"; inherit pnpm; fetcherVersion = 3; - hash = "sha256-GSg97V12KiHVNQeFGbpYm46Bd40WKvnBjt6h1T/t6Tw="; + hash = "sha256-9ifyIKFQiWKM0hzToibU4zuA64PmznqtpFWILFsFvGQ="; }; pnpmRoot = "ui"; diff --git a/pkgs/by-name/we/weechat-matrix-rs/increase-recursion-limit.patch b/pkgs/by-name/we/weechat-matrix-rs/increase-recursion-limit.patch new file mode 100644 index 000000000000..d50e2977a003 --- /dev/null +++ b/pkgs/by-name/we/weechat-matrix-rs/increase-recursion-limit.patch @@ -0,0 +1,10 @@ +diff --git a/src/lib.rs b/src/lib.rs +index 2f1090a..205d90d 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -1,3 +1,5 @@ ++#![recursion_limit = "256"] ++ + mod bar_items; + mod commands; + mod completions; diff --git a/pkgs/by-name/we/weechat-matrix-rs/package.nix b/pkgs/by-name/we/weechat-matrix-rs/package.nix index 0baaef3fe0eb..ed10361b7f68 100644 --- a/pkgs/by-name/we/weechat-matrix-rs/package.nix +++ b/pkgs/by-name/we/weechat-matrix-rs/package.nix @@ -13,26 +13,34 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "weechat-matrix-rs"; version = "0-unstable-2025-10-09"; + src = fetchFromGitHub { owner = "poljar"; repo = "weechat-matrix-rs"; rev = "4cc5777b630ba4d6a9c964248531f283178a4717"; hash = "sha256-CF4xDoRYey9F8/XSW/euNb8IjZXyP6k0Nj61shsmyEo="; }; + + patches = [ ./increase-recursion-limit.patch ]; + cargoHash = "sha256-jAlBCmLJfWWAUHd3ySB930iqAVXMh6ueba7xS///Rt0="; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; + buildInputs = [ weechat openssl sqlite ]; + postInstall = '' mkdir -p $out/lib/weechat/plugins mv $out/lib/libmatrix${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/weechat/plugins/matrix${stdenv.hostPlatform.extensions.sharedLibrary} ''; + passthru.tests.load-plugin = runCommand "${finalAttrs.pname}-test-load" { @@ -50,6 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { exit 1 fi ''; + meta = { description = "Rust plugin for WeeChat to communicate over Matrix"; homepage = "https://github.com/poljar/weechat-matrix-rs"; diff --git a/pkgs/by-name/we/welle-io/package.nix b/pkgs/by-name/we/welle-io/package.nix index 623eff5967c0..ceadc25dbe79 100644 --- a/pkgs/by-name/we/welle-io/package.nix +++ b/pkgs/by-name/we/welle-io/package.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation (finalAttrs: { "-DRTLSDR=true" "-DSOAPYSDR=true" ] - ++ lib.optional withFlac "-DFLAC=true"; + ++ lib.optional withFlac "-DFLAC=true" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DBUNDLE_INSTALL_DIR=${placeholder "out"}/Applications"; meta = { description = "DAB/DAB+ Software Radio"; diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix index b0bc37aaf6b1..2d682e977f8f 100644 --- a/pkgs/by-name/wg/wgo/package.nix +++ b/pkgs/by-name/wg/wgo/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "wgo"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "bokwoon95"; repo = "wgo"; tag = "v${finalAttrs.version}"; - hash = "sha256-J2mS2GIGlNHQVCIVpOMxZIZiqOFW0fu0M+qAbEuOuRo="; + hash = "sha256-C7gVlBkXRJsaUPSWj3OVWKNlT77yXXVyNlE4LZPryZU="; }; vendorHash = "sha256-6ZJNXw/ahaIziQGVNgjbTbm53JiO3dYCqJtdB///cmo="; diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index b507e34814d2..5cbbb917a407 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -100,7 +100,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { for target in examples/{bench,command,cli,quantize,server,stream,talk-llama}/CMakeLists.txt; do if ! grep -q -F 'install('; then echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target - ${lib.optionalString stdenv.isDarwin "echo 'install(TARGETS whisper.coreml LIBRARY)' >> src/CMakeLists.txt"} + ${lib.optionalString stdenv.hostPlatform.isDarwin "echo 'install(TARGETS whisper.coreml LIBRARY)' >> src/CMakeLists.txt"} fi done ''; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index f7fc93208281..08a8e1f7c79d 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "2.1.32", + "version": "2.2.17", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/63e54ba26dd2a1b975c172966dff80bad8ae74c7/Windsurf-darwin-arm64-2.1.32.zip", - "sha256": "0d7ee912cc619678b5d68115f3dfa11a2581d134032410a887babbb595b613fd" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a65d6c4e1fd335336d7a0b601099811667e184ca/Windsurf-darwin-arm64-2.2.17.zip", + "sha256": "af7b195ab35e88a34be38edebabd8adedc6fa53cb67955571d86f338ba47f6bc" }, "x86_64-darwin": { - "version": "2.1.32", + "version": "2.2.17", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/63e54ba26dd2a1b975c172966dff80bad8ae74c7/Windsurf-darwin-x64-2.1.32.zip", - "sha256": "b33d23e38ed15aa11570086c95d1fadddb47635b81571fa82612000c3d5f8d22" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a65d6c4e1fd335336d7a0b601099811667e184ca/Windsurf-darwin-x64-2.2.17.zip", + "sha256": "6799fa251e55c0860b61867835b0258cb0bf8f7e47f5804893734571380f7740" }, "x86_64-linux": { - "version": "2.1.32", + "version": "2.2.17", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/63e54ba26dd2a1b975c172966dff80bad8ae74c7/Windsurf-linux-x64-2.1.32.tar.gz", - "sha256": "b2b8d1644f8684feaa21326d93829f79319381c439fd88663ee570966954d626" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a65d6c4e1fd335336d7a0b601099811667e184ca/Windsurf-linux-x64-2.2.17.tar.gz", + "sha256": "9593de6b22e85190788185b033d1f4f1ad013c36e1cc737c3696f430fbbeeb54" } } diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix index 2bacf54729d9..183a7c5b814a 100644 --- a/pkgs/by-name/wl/wlay/package.nix +++ b/pkgs/by-name/wl/wlay/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, glfw3, libx11, libxau, @@ -30,12 +30,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wayland-scanner ]; buildInputs = [ + kdePackages.extra-cmake-modules glfw3 libx11 libxau diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 240cb2b76924..955713e70ca4 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -7,10 +7,10 @@ let pname = "wootility"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage"; - sha256 = "sha256-37dABMNFqW4E2oQ5Zx4ZFdiq1uAMzvPD1vt7pb5PnZY="; + sha256 = "sha256-KRqXjguylH5FjV6j+ckZwXbg6Wm2y0CE9HQaoNgfyc0="; }; in diff --git a/pkgs/by-name/wo/world-wall-clock/package.nix b/pkgs/by-name/wo/world-wall-clock/package.nix index d8b6b48a9868..ce3ffd2985c8 100644 --- a/pkgs/by-name/wo/world-wall-clock/package.nix +++ b/pkgs/by-name/wo/world-wall-clock/package.nix @@ -32,6 +32,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { enabledTestPaths = [ "tests/*" ]; + disabledTests = [ + # requires real tty + "test_run_app" + ]; + meta = { description = "TUI application that provides a multi-timezone graphical clock in a terminal environment"; homepage = "https://github.com/ddelabru/world-wall-clock"; diff --git a/pkgs/by-name/wp/wpgtk/package.nix b/pkgs/by-name/wp/wpgtk/package.nix index de4b878d5fb9..c222439ab46d 100644 --- a/pkgs/by-name/wp/wpgtk/package.nix +++ b/pkgs/by-name/wp/wpgtk/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "wpgtk"; - version = "6.7.0"; + version = "6.7.1"; pyproject = true; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; tag = finalAttrs.version; - hash = "sha256-X7KKXPNKqs0pVRrR04ZrJgCTDZUj3lcFKnwSaX4/RAM="; + hash = "sha256-TbykgmS/F/6N7ZmcKlX79RhMvOMBsfFNl8TZKLji80w="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 2d5dae6dfae2..5107acca95ff 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, autoPatchelfHook, @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.62.0"; + version = "4.90.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-o6ARRNObHtRqAD71j7L2HkpIalPwGWR+PyQQuHJBKZE="; + hash = "sha256-M2m8dRhTjAYof3S7lVaFYP61p38LvXFSTxantCsUHtE="; }; pnpmDeps = fetchPnpmDeps { @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { src postPatch ; - pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-Crtjchu17OFPWqd3L0AYCpA76YRN4jJc+vLVLo1WLe4="; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-Bo9V3MJaDnKR7TZO4u0mDy9223n7/En8aAdYOgHyYxE="; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper nodejs pnpmConfigHook - pnpm_9 + pnpm_10 jq moreutils ] @@ -73,15 +73,25 @@ stdenv.mkDerivation (finalAttrs: { # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process # so I simply removed it - postBuild = '' - mv packages/vitest-pool-workers packages/~vitest-pool-workers + postBuild = + let + extraDeps = [ + "unenv-preset" + "workers-utils" + "local-explorer-ui" + "codemod" + "cli-shared-helpers" + "miniflare" + "wrangler" + ]; + in + '' + mv packages/vitest-pool-workers packages/~vitest-pool-workers - NODE_ENV="production" pnpm --filter unenv-preset run build - NODE_ENV="production" pnpm --filter workers-utils run build - NODE_ENV="production" pnpm --filter workers-shared run build - NODE_ENV="production" pnpm --filter miniflare run build - NODE_ENV="production" pnpm --filter wrangler run build - ''; + for pkg in ${toString extraDeps}; do + NODE_ENV="production" pnpm --filter "$pkg" run build + done + ''; # I'm sure this is suboptimal but it seems to work. Points: # - when build is run in the original repo, no specific executable seems to be generated; you run the resulting build with pnpm run start diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix index dbee99d4d2a8..4246b93b0ea4 100644 --- a/pkgs/by-name/wt/wtfutil/package.nix +++ b/pkgs/by-name/wt/wtfutil/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "wtfutil"; - version = "0.46.1"; + version = "0.49.1"; src = fetchFromGitHub { owner = "wtfutil"; repo = "wtf"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-GLLTI/hxlkt3OvtTWRNdzQ9jzO4xzJV9RruiJUyWD5g="; + sha256 = "sha256-b7g/EWr8M99jc0BJcu+JTfifuWK/oeFsOi9vkI9RIA0="; }; - vendorHash = "sha256-OSoQkBAx0kJKiKq0pRGrkkSowTynw/MJvYSdhd1Jt/k="; + vendorHash = "sha256-AjrpcP6K937HteHdIyXwEx5srTMWYq4v1Dmd5cch5Pc="; proxyVendor = true; doCheck = false; @@ -35,7 +35,9 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; postPatch = '' - substituteInPlace flags/flags.go --replace-fail 'version := "dev"' 'version := "v${finalAttrs.version}"' + substituteInPlace flags/flags.go \ + --replace-fail 'version := info.Main.Version' 'version := "v${finalAttrs.version}"' \ + --replace-fail 'var official bool' 'official := true' ''; postInstall = '' diff --git a/pkgs/by-name/x2/x2goclient/package.nix b/pkgs/by-name/x2/x2goclient/package.nix index 623e5aec9e0f..99073bcc7865 100644 --- a/pkgs/by-name/x2/x2goclient/package.nix +++ b/pkgs/by-name/x2/x2goclient/package.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { cups libxpm libssh - libsForQt5.phonon libsForQt5.qtbase libsForQt5.qtsvg libsForQt5.qttools diff --git a/pkgs/by-name/xa/xash3d-fwgs/package.nix b/pkgs/by-name/xa/xash3d-fwgs/package.nix index 1a2854c84a25..ec155f7d9c7d 100644 --- a/pkgs/by-name/xa/xash3d-fwgs/package.nix +++ b/pkgs/by-name/xa/xash3d-fwgs/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { bzip2 SDL2 ] - ++ lib.optionals (!buildServer && stdenv.isLinux) [ + ++ lib.optionals (!buildServer && stdenv.hostPlatform.isLinux) [ libx11 ]; diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix index fc2f9d68ee18..21dd4ddda9a4 100644 --- a/pkgs/by-name/xb/xbyak/package.nix +++ b/pkgs/by-name/xb/xbyak/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xbyak"; - version = "7.36"; + version = "7.36.2"; src = fetchFromGitHub { owner = "herumi"; repo = "xbyak"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mpo+T9zk6JE8HcwUg0hfUmQc/62tM2lmEoA5ElaLmnw="; + hash = "sha256-SrP5PYK9GrHQcR0bbwAXPxGCyd4J1qGqXFC1eVh9XVQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix index 185fbb26b8dd..2f29a4ebe58f 100644 --- a/pkgs/by-name/xc/xcb-imdkit/package.nix +++ b/pkgs/by-name/xc/xcb-imdkit/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, uthash, libxcb-util, libxcb-keysyms, @@ -25,12 +25,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules xorgproto uthash ]; buildInputs = [ + kdePackages.extra-cmake-modules libxcb-util libxcb-keysyms ]; diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index b519f2407933..4601ddacc909 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - checkInputs = lib.optionals stdenv.isLinux [ acl ]; + checkInputs = lib.optionals stdenv.hostPlatform.isLinux [ acl ]; # disable tests depending on special filesystem features checkNoDefaultFeatures = true; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # had concurrency issues on 64 cores, also tests are quite fast compared to build dontUseCargoParallelTests = true; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # ---- test_socket_file::test_with_parallel_file_driver stdout ---- # STDOUT: 12:20:56 [WARN] Socket copy not supported by this OS: /private/tmp/nix-build-xcp-0.24.1.drv-0/source/targ> # diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 1caf513cd6e1..c010bf1bc1e8 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.10"; + version = "1.0.12"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-vltoh2n2Tt8TAQdpZDV2woaaacS5Z+o0hDHJfysR4P8="; + hash = "sha256-o1H5Cw20sgcE8I5L5u64YM6l+vhlHIcaY6cEH9it0gQ="; }; - cargoHash = "sha256-eherqBRuIVcs7ZxYfMyiRC4SUIbPzVUcflScoeKrpVA="; + cargoHash = "sha256-/7jxEktXW1+4nFK7ZFUO3oJhmLNuKMwErnqwgjBQiao="; separateDebugInfo = true; strictDeps = true; diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index e31ff0f1be71..94b9c4ca7233 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libintl ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-liconv"; }; diff --git a/pkgs/by-name/xl/xla/grpc-pin-go-sdk.patch b/pkgs/by-name/xl/xla/grpc-pin-go-sdk.patch new file mode 100644 index 000000000000..dfb18b1691a6 --- /dev/null +++ b/pkgs/by-name/xl/xla/grpc-pin-go-sdk.patch @@ -0,0 +1,105 @@ +--- a/bazel/grpc_extra_deps.bzl ++++ b/bazel/grpc_extra_deps.bzl +@@ -1,91 +1,100 @@ + # Copyright 2021 The gRPC Authors + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + """Loads the dependencies necessary for the external repositories defined in grpc_deps.bzl.""" + + load("@bazel_features//:deps.bzl", "bazel_features_deps") + load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") + load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") + load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") + load("@com_envoyproxy_protoc_gen_validate//:dependencies.bzl", "go_third_party") + load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") + load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps") + load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") + load("@envoy_api//bazel:repositories.bzl", "api_dependencies") + load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps") +-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") ++load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_rules_dependencies") + load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") + load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") + load("@rules_python//python:repositories.bzl", "py_repositories") + load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains") + + def grpc_extra_deps(ignore_version_differences = False): + """Loads the extra dependencies. + + These are necessary for using the external repositories defined in + grpc_deps.bzl. Projects that depend on gRPC as an external repository need + to call both grpc_deps and grpc_extra_deps, if they have not already loaded + the extra dependencies. For example, they can do the following in their + WORKSPACE + ``` + load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps", "grpc_test_only_deps") + grpc_deps() + + grpc_test_only_deps() + + load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") + + grpc_extra_deps() + ``` + + Args: + ignore_version_differences: Plumbed directly to the invocation of + apple_rules_dependencies. + """ + rules_shell_dependencies() + rules_shell_toolchains() + + rules_java_dependencies() + + protobuf_deps() + + rules_proto_dependencies() + bazel_features_deps() + + api_dependencies() + + go_rules_dependencies() +- go_register_toolchains(version = "1.22.5") ++ go_download_sdk( ++ name = "go_sdk", ++ sdks = { ++ "linux_amd64": [ ++ "go1.22.5.linux-amd64.tar.gz", ++ "904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0", ++ ], ++ }, ++ version = "1.22.5", ++ ) + gazelle_dependencies() + + # Pull-in the go 3rd party dependencies for protoc_gen_validate, which is + # needed for building C++ xDS protos + go_third_party() + + apple_rules_dependencies(ignore_version_differences = ignore_version_differences) + + apple_support_dependencies() + + # Initialize Google APIs with only C++ and Python targets + switched_rules_by_language( + name = "com_google_googleapis_imports", + cc = True, + grpc = True, + python = True, + ) + + google_cloud_cpp_deps() + + py_repositories() + + googletest_deps() diff --git a/pkgs/by-name/xl/xla/package.nix b/pkgs/by-name/xl/xla/package.nix index 57fb27ee2678..597a12a23400 100644 --- a/pkgs/by-name/xl/xla/package.nix +++ b/pkgs/by-name/xl/xla/package.nix @@ -96,6 +96,19 @@ in '] + extra_patches,' \ '"@xla//third_party/py:rules_python_nix_patchelf.patch", ] + extra_patches,' + '' + # Pin gRPC's rules_go SDK metadata. Without `sdks`, rules_go downloads the + # live Go release manifest into @go_sdk/versions.json, making the deps tar + # change whenever go.dev publishes a new release. + + '' + cp ${./grpc-pin-go-sdk.patch} third_party/grpc/grpc-pin-go-sdk.patch + substituteInPlace workspace2.bzl \ + --replace-fail \ + 'patch_file = ["//third_party/grpc:grpc.patch"],' \ + 'patch_file = [ + "//third_party/grpc:grpc.patch", + "//third_party/grpc:grpc-pin-go-sdk.patch", + ],' ''; # Configure XLA for CPU-only build using the official configure.py script. @@ -146,7 +159,7 @@ in fetchAttrs = { sha256 = { - x86_64-linux = "sha256-QTUqcP5t91Z4s+esxxFz2tGJAJplWXWZuYPqcC7ld+E="; + x86_64-linux = "sha256-9L+oVq/yHqUGLhzSpwqxfYSJ1bIVcnaZgFVB3sjokXs="; } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); preInstall = diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 6633c949e733..f2ad137bbf66 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2026.07"; + version = "2026.08"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-+uWNRYV1tSfb27iXY2rcGEyIUpZco4gp58n5Bj762Gs="; + hash = "sha256-1Dq3Heij3MbHbgO3rM7BYDHiPDToiTZxrAqpN8Jj148="; }; meta = { diff --git a/pkgs/by-name/xl/xloadimage/package.nix b/pkgs/by-name/xl/xloadimage/package.nix deleted file mode 100644 index 945275de5126..000000000000 --- a/pkgs/by-name/xl/xloadimage/package.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchzip, - libx11, - libxt, - autoreconfHook, - quilt, - - libjpeg ? null, - libpng ? null, - libtiff ? null, - - withJpegSupport ? true, - withPngSupport ? true, - withTiffSupport ? true, -}: - -assert withJpegSupport -> libjpeg != null; -assert withPngSupport -> libpng != null; -assert withTiffSupport -> libtiff != null; - -let - version = "4.1"; - deb_patch = "25"; - debian_patches = fetchzip { - url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}-${deb_patch}.debian.tar.xz"; - hash = "sha256-5FbkiYjI8ASUyi1DTFiAcJ9y2z1sEKrNNyKoqnca30I="; - }; -in -stdenv.mkDerivation rec { - pname = "xloadimage"; - inherit version; - - src = fetchurl { - url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz"; - sha256 = "1i7miyvk5ydhi6yi8593vapavhwxcwciir8wg9d2dcyg9pccf2s0"; - }; - - postPatch = '' - QUILT_PATCHES=${debian_patches}/patches quilt push -a - ''; - - nativeBuildInputs = [ - autoreconfHook - quilt - ]; - - buildInputs = [ - libx11 - libxt - ] - ++ lib.optionals withJpegSupport [ - libjpeg - ] - ++ lib.optionals withPngSupport [ - libpng - ] - ++ lib.optionals withTiffSupport [ - libtiff - ]; - - # NOTE: we patch the build-info script so that it never detects the utilities - # it's trying to find; one of the Debian patches adds support for - # $SOURCE_DATE_EPOCH, but we want to make sure we don't even call these. - preConfigure = '' - substituteInPlace build-info \ - --replace-fail '[ -x /bin/date ]' 'false' \ - --replace-fail '[ -x /bin/id ]' 'false' \ - --replace-fail '[ -x /bin/uname ]' 'false' \ - --replace-fail '[ -x /usr/bin/id ]' 'false' - - chmod +x build-info configure - ''; - - enableParallelBuilding = true; - - # creating patch would add more complexity - env.CFLAGS = "-Wno-implicit-int"; - - # NOTE: we're not installing the `uufilter` binary; if needed, the standard - # `uudecode` tool should work just fine. - installPhase = '' - install -Dm755 xloadimage $out/bin/xloadimage - ln -sv $out/bin/{xloadimage,xsetbg} - - install -D -m644 xloadimagerc $out/etc/xloadimagerc.example - install -D -m644 xloadimage.man $out/share/man/man1/xloadimage.1x - ln -sv $out/share/man/man1/{xloadimage,xsetbg}.1x - ''; - - meta = { - description = "Graphics file viewer under X11"; - - longDescription = '' - Can view png, jpeg, gif, tiff, niff, sunraster, fbm, cmuraster, pbm, - faces, rle, xwd, vff, mcidas, vicar, pcx, gem, macpaint, xpm and xbm - files. Can view images, put them on the root window, or dump them. Does a - variety of processing, including: clipping, dithering, depth reduction, - zoom, brightening/darkening and merging. - ''; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; # arbitrary choice - }; -} diff --git a/pkgs/by-name/xm/xmrig-mo/package.nix b/pkgs/by-name/xm/xmrig-mo/package.nix index 974df7f52e4a..d5280ef8f369 100644 --- a/pkgs/by-name/xm/xmrig-mo/package.nix +++ b/pkgs/by-name/xm/xmrig-mo/package.nix @@ -6,13 +6,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.26.0-mo2"; + version = "6.26.0-mo3"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-3WYHkxPcGcA+Y9VhEGYfLs1iUKfLhkgzsRgyS8gWXPA="; + hash = "sha256-Ceh/B0afhVbAhDQcYen+TWNSswXcSiUzCvrQJizVmpQ="; }; meta = { diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index bfbc321b1579..2fc27e57c7d1 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "xonsh"; - version = "0.23.1"; + version = "0.23.5"; pyproject = true; # PyPI package ships incomplete tests @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "xonsh"; repo = "xonsh"; tag = version; - hash = "sha256-/vxEJPPgDdrtSHSWhJY1HjtQv7B+4gNzPQmu/tbhX0k="; + hash = "sha256-jiHcOSkqvQj6/BFyDFUcTvknATAYqeVco0KecCXBWD0="; }; build-system = [ @@ -73,7 +73,7 @@ buildPythonPackage rec { # required by test_xonsh_activator virtualenv ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # required by test_man_completion man util-linux @@ -82,9 +82,7 @@ buildPythonPackage rec { disabledTests = [ # fails on sandbox "test_colorize_file" - "test_repath_HOME_PATH_itself" - "test_repath_HOME_PATH_var" - "test_repath_HOME_PATH_var_brace" + "test_complete_path_tilde_subdir_trailing_sep" # flaky tests in test_integrations.py "test_script" @@ -112,7 +110,7 @@ buildPythonPackage rec { "test_vc_get_branch" "test_dirty_working_directory" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on Darwin "test_bash_and_is_alias_is_only_functional_alias" "test_complete_command" @@ -135,7 +133,7 @@ buildPythonPackage rec { sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/xintegration/test_integrations.py - for script in tests/xintegration/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do + for script in conftest.py tests/xintegration/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script done patchShebangs . diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 60dee43afd92..9bddc8cf641f 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage (finalAttrs: { pname = "yaml-language-server"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "yaml-language-server"; tag = finalAttrs.version; - hash = "sha256-NCJsnA0m8DUeAUpQW83f8QUXzZ9DRHA7eOrVcj40RVk="; + hash = "sha256-I9sLqujD0aTxMrqLziLgjoCLflNyphp2cdvYcAuzZ7s="; }; - npmDepsHash = "sha256-DCEutA4DubP/iQIWMKjbepnhgd5L1GXnlzBokneqtWg="; + npmDepsHash = "sha256-b9B6V17kNnKf3HHjEWzHGjKSeOJR17VEjp780Rq8BM0="; strictDeps = true; diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index 63842ffe98ac..1237c3ae9bbb 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, lib, + pkgs, nodejs, stdenv, testers, @@ -10,9 +11,9 @@ }: let - version_4 = "4.13.0"; + version_4 = "4.14.1"; version_3 = "3.8.7"; - hash_4 = "sha256-FP15a2ueihDm6f/GdXsnqI5drVHo0EtbmrhCZfRdugQ="; + hash_4 = "sha256-0UnU5jRSUFMw+WowvXqYqaaN1ZbZAdLLJ6LPyuK6iCc="; hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo="; in @@ -55,11 +56,31 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = ./update.sh; - tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; + tests = + let + packageTests = + if berryVersion == 4 then + { + inherit (pkgs) + prettier + corepack + katex + ; + } + else + { + inherit (pkgs) + svgo + yarn-lock-converter + ; + }; + in + packageTests + // { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; }; - }; } // (callPackage ./fetcher { yarn-berry = finalAttrs; }); diff --git a/pkgs/by-name/yo/yojimbo/package.nix b/pkgs/by-name/yo/yojimbo/package.nix deleted file mode 100644 index d2493df0cb41..000000000000 --- a/pkgs/by-name/yo/yojimbo/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - premake5, - doxygen, - libsodium, - mbedtls_2, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "yojimbo"; - version = "1.2.3"; - - src = fetchFromGitHub { - owner = "mas-bandwidth"; - repo = "yojimbo"; - tag = "v${finalAttrs.version}"; - sha256 = "sha256-GMYkWQTwHm7fGRSTIt2phv01CjEcw0l4iPQD4uTQ5yM="; - }; - - nativeBuildInputs = [ - premake5 - doxygen - ]; - propagatedBuildInputs = [ - libsodium - mbedtls_2 - ]; - - patches = [ - # https://github.com/mas-bandwidth/serialize/pull/6 - ./silence-uninitialized-warning.patch - ]; - - postBuild = '' - doxygen doxygen.config - ''; - - installPhase = '' - install -Dm755 -t $out/lib bin/libyojimbo.a - cp -r -t $out include - mkdir -p $out/share/doc/yojimbo - cp -r docs/html $out/share/doc/yojimbo - ''; - - doCheck = true; - - enableParallelBuilding = true; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Network library for client/server games with dedicated servers"; - longDescription = '' - yojimbo is a network library for client/server games with dedicated servers. - It's designed around the networking requirements of competitive multiplayer games like first person shooters. - As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance. - ''; - homepage = "https://github.com/mas-bandwidth/yojimbo"; - license = lib.licenses.bsd3; - platforms = lib.platforms.x86_64; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/yo/yojimbo/silence-uninitialized-warning.patch b/pkgs/by-name/yo/yojimbo/silence-uninitialized-warning.patch deleted file mode 100644 index d90b7af06114..000000000000 --- a/pkgs/by-name/yo/yojimbo/silence-uninitialized-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/serialize.h b/serialize.h -index 6e977ac..4d7413d 100644 ---- a/serialize/serialize.h -+++ b/serialize/serialize.h -@@ -1400,7 +1400,7 @@ namespace serialize - - template bool serialize_float_internal( Stream & stream, float & value ) - { -- uint32_t int_value; -+ uint32_t int_value = 0; - if ( Stream::IsWriting ) - { - memcpy( (char*) &int_value, &value, 4 ); diff --git a/pkgs/by-name/yo/your_spotify/client.nix b/pkgs/by-name/yo/your_spotify/client.nix index afdad50b7409..900a50393558 100644 --- a/pkgs/by-name/yo/your_spotify/client.nix +++ b/pkgs/by-name/yo/your_spotify/client.nix @@ -3,33 +3,39 @@ src, version, meta, - offlineCache, + pnpmDeps, apiEndpoint ? "http://localhost:3000", - yarnConfigHook, - yarnBuildHook, + pnpmConfigHook, + pnpm_9, nodejs, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "your_spotify_client"; - inherit version src offlineCache; + inherit version src pnpmDeps; nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook + pnpmConfigHook + pnpm_9 nodejs ]; API_ENDPOINT = "${apiEndpoint}"; - preBuild = '' + + buildPhase = '' + runHook preBuild + pushd ./apps/client/ - ''; - postBuild = '' + pnpm run build + + export NODE_ENV=production substituteInPlace scripts/run/variables.sh --replace-quiet '/app/apps/client/' "./" chmod +x ./scripts/run/variables.sh patchShebangs --build ./scripts/run/variables.sh ./scripts/run/variables.sh popd + + runHook postBuild ''; installPhase = '' @@ -40,4 +46,4 @@ stdenv.mkDerivation (finalAttrs: { ''; inherit meta; -}) +} diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix index 7a15506a7728..6ff861fb86e2 100644 --- a/pkgs/by-name/yo/your_spotify/package.nix +++ b/pkgs/by-name/yo/your_spotify/package.nix @@ -2,9 +2,9 @@ lib, stdenv, fetchFromGitHub, - fetchYarnDeps, - yarnConfigHook, - yarnBuildHook, + fetchPnpmDeps, + pnpmConfigHook, + pnpm_9, nodejs, makeWrapper, callPackage, @@ -14,50 +14,47 @@ stdenv.mkDerivation (finalAttrs: { pname = "your_spotify_server"; - version = "1.16.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "Yooooomi"; repo = "your_spotify"; tag = finalAttrs.version; - hash = "sha256-eVKBrYE6U80G1SS/7nIl4fZb2BELb9lQizKcdcEIJIM="; + hash = "sha256-zyvTahfOq7KXgVqD178hrlqO7YjsjLyuw+pm6PMhJt0="; }; - offlineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-JP5enfy8yyMjZpp0U72S0uR5zJkhpvxog38icOBtQRQ="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_9; + fetcherVersion = 3; + hash = "sha256-KI5ZFU8u1R4QKTXn6mGVi+ziAocgOyyutKqmUOIn+dI="; }; nativeBuildInputs = [ makeWrapper - yarnConfigHook - yarnBuildHook + pnpmConfigHook + pnpm_9 nodejs ]; - preBuild = '' + buildPhase = '' + runHook preBuild pushd ./apps/server/ - ''; - postBuild = '' + pnpm run build popd - rm -r node_modules - export NODE_ENV="production" - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ + runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/your_spotify - cp -r node_modules $out/share/your_spotify/node_modules - rm $out/share/your_spotify/node_modules/@your_spotify/{client,dev,server} - cp -r ./apps/server/{lib,package.json} $out + cp -r apps/server/build $out/share/your_spotify/ mkdir -p $out/bin makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_migrate" \ - --add-flags "$out/lib/migrations.js" --set NODE_PATH "$out/share/your_spotify/node_modules" + --add-flags "$out/share/your_spotify/build/index.js" --add-flags "--migrate" makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_server" \ - --add-flags "$out/lib/index.js" --set NODE_PATH "$out/share/your_spotify/node_modules" + --add-flags "$out/share/your_spotify/build/index.js" runHook postInstall ''; @@ -67,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) src version - offlineCache + pnpmDeps meta ; }; diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index a7e5d5ce3873..bc40ef00f13a 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: { # instead of running git during the build process # use the .COMMIT file generated in the fetcher FOD ./git-rev-parse.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/ytmdesktop/ytmdesktop/blob/v2.0.11/package.json#L77 + ./yarn-4.14-support.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -56,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-fY7JZNUz82ldgpG76+pfiz59eL3BKlfXgoH5x7dY5bM="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-Vvvhi1db/ld2rNz+XhtNzlgI/4z3ym6QENG0GMlZAd0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/yt/ytmdesktop/yarn-4.14-support.patch b/pkgs/by-name/yt/ytmdesktop/yarn-4.14-support.patch new file mode 100644 index 000000000000..577c6d19d696 --- /dev/null +++ b/pkgs/by-name/yt/ytmdesktop/yarn-4.14-support.patch @@ -0,0 +1,22 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,3 +1,6 @@ + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.5.1.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/by-name/z-/z-lua/package.nix b/pkgs/by-name/z-/z-lua/package.nix index ff005466e05c..7609ad13fc1e 100644 --- a/pkgs/by-name/z-/z-lua/package.nix +++ b/pkgs/by-name/z-/z-lua/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "z-lua"; - version = "1.8.24"; + version = "1.8.25"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; - rev = finalAttrs.version; - sha256 = "sha256-1wsBXJd6QXgK4BCg+VTVDY95DP4+xFp0vAbKmztoREI="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-S07YFyh6jKKQn8tpeTNReKLmpVxXzIF3jXCmst6B3+I="; }; dontBuild = true; diff --git a/pkgs/by-name/za/zafiro-icons/package.nix b/pkgs/by-name/za/zafiro-icons/package.nix index 27147a4c3c8c..8217a45db1ab 100644 --- a/pkgs/by-name/za/zafiro-icons/package.nix +++ b/pkgs/by-name/za/zafiro-icons/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - libsForQt5, + kdePackages, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme numix-icon-theme numix-icon-theme-circle @@ -38,6 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; dontPatchELF = true; dontRewriteSymlinks = true; diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix index d8138090e767..ffc6b3564508 100644 --- a/pkgs/by-name/ze/zeal/package.nix +++ b/pkgs/by-name/ze/zeal/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, pkg-config, httplib, libarchive, @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index cc1029bdf509..4d020513e380 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -97,7 +97,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "1.1.6"; + version = "1.1.7"; outputs = [ "out" @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-2yuwjJhrK5tQkMmQnOaOYyQETB5mTKAIGMedw7kmXzg="; + hash = "sha256-S3LMLJhmLCA5FqjZFk+N2pCLGxDxIcwlSdKor/DQ5ps="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-xTK+u0IQ/QlGQuROehudjDJ4ch9/pM3Z9DahrJ+c9mk="; + cargoHash = "sha256-pAoB4cvNsdx8oKq7J+YdFM3VaM+mwBQwUzFFxJGnGMw="; __structuredAttrs = true; diff --git a/pkgs/by-name/ze/zettlr/package.nix b/pkgs/by-name/ze/zettlr/package.nix index 1899d2d99ead..81d0dbf51145 100644 --- a/pkgs/by-name/ze/zettlr/package.nix +++ b/pkgs/by-name/ze/zettlr/package.nix @@ -9,11 +9,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - hash = "sha256-Swic0hKZowOQasv5VAhT/1Gc3I03Zpw4c1FIQE1qsCQ="; + hash = "sha256-JE1BOGHOyzcHz7zFxDRtU2faqCfaXqCPs/O8K2J20jk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 943eece50309..5707257e3e81 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm'; - fetcherVersion = 2; - hash = "sha256-eoZi4JMN9PiiRRd/z/HjqSHX9ta33cL4+d1GMGxJ33U="; + fetcherVersion = 3; + hash = "sha256-QnKYtSBiTFnBmzVRJ8wZsKDzi99Y4039N9fsJmJkDYc="; }; buildInputs = [ diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 58ee6bf093e4..60b534a38e1d 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.16.2"; + version = "11.17.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-1x5nYWPT30AQBk98yuOdB55Ac/7wRKBc4DUwY4kO6LY="; + hash = "sha256-plN7FJfPkEu/479JUrCWqpvTmm8CEqRWNurqeOPJUKA="; }; - npmDepsHash = "sha256-4kCHoYB2oH2jUk+31aGjbfBkdz3wdUOqctVk3/JXrBI="; + npmDepsHash = "sha256-8rFmFr7IXRbi2LW4diXDOka4nPJGr+DcrB8+JPBxzQA="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix deleted file mode 100644 index b90123017bde..000000000000 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - unzip, -}: - -let - - src = fetchurl { - url = "http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip"; - sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0"; - }; - - isoents = fetchurl { - url = "http://www.oasis-open.org/cover/ISOEnts.zip"; - sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; - }; - -in - -stdenv.mkDerivation { - pname = "docbook-sgml"; - version = "3.1"; - - dontUnpack = true; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - o=$out/sgml/dtd/docbook-3.1 - mkdir -p $o - cd $o - unzip ${src} - unzip ${isoents} - sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat - ''; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/default.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/default.nix new file mode 100644 index 000000000000..f2cc962adc74 --- /dev/null +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/default.nix @@ -0,0 +1,17 @@ +{ + callPackage, +}: +{ + docbook_sgml_dtd_31 = callPackage (import ./generic.nix { + version = "3.1"; + hash = "sha256-ICYdJ3G5oFKr+j2PqxqmK+BXkaAQKBxWb5Bzvw5kRTg="; + }) { }; + docbook_sgml_dtd_41 = callPackage (import ./generic.nix { + version = "4.1"; + hash = "sha256-3qr88KNndpLnrUQSwOQcHbPp2mzc2z3TKyzB+cl9YxE="; + }) { }; + docbook_sgml_dtd_45 = callPackage (import ./generic.nix { + version = "4.5"; + hash = "sha256-gEPlFOgMbBnLFGtdN5N9EwW/Or+bAJfDbff3D2Ec30M="; + }) { }; +} diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/generic.nix new file mode 100644 index 000000000000..9027dbc141f9 --- /dev/null +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/generic.nix @@ -0,0 +1,57 @@ +{ version, hash }: +{ + lib, + stdenv, + fetchurl, + unzip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "docbook-sgml"; + inherit version; + + src = fetchurl { + url = "https://archive.docbook.org/sgml/${finalAttrs.version}/${ + if lib.versionAtLeast finalAttrs.version "4.2" then + "docbook-${finalAttrs.version}" + else + "docbk${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}" + }.zip"; + inherit hash; + }; + + isoents = fetchurl { + url = "https://web.archive.org/web/20250220122223/http://xml.coverpages.org/ISOEnts.zip"; + hash = "sha256-3OQ1mjmW7S/TOtXqoRqbz8JLWwaZLiQpUTKwbbGambI="; + }; + + nativeBuildInputs = [ + unzip + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/sgml/dtd/docbook-${finalAttrs.version}" + unzip -d "$out/sgml/dtd/docbook-${finalAttrs.version}" "$src" + unzip -d "$out/sgml/dtd/docbook-${finalAttrs.version}" "$isoents" + + substituteInPlace "$out/sgml/dtd/docbook-${finalAttrs.version}/docbook.cat" \ + --replace-fail "iso-" "ISO" \ + --replace-fail ".gml" "" + + runHook postInstall + ''; + + dontUnpack = true; + strictDeps = true; + __structuredAttrs = true; + + meta = { + description = "DocBook ${finalAttrs.version} SGML Schemas"; + homepage = "https://docbook.org/"; + license = lib.licenses.docBookDtd; + maintainers = with lib.maintainers; [ nickcao ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix deleted file mode 100644 index 86b2590685de..000000000000 --- a/pkgs/data/themes/qtcurve/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - pkg-config, - mkDerivation, - gtk2Support ? true, - gtk2, - qtbase, - qtsvg, - qtx11extras, # Toolkit dependencies - karchive, - kconfig, - kconfigwidgets, - kio, - frameworkintegration, - kguiaddons, - ki18n, - kwindowsystem, - kdelibs4support, - kiconthemes, - libpthread-stubs, - pcre, - libxdmcp, - libx11, - libxau, # X11 dependencies - fetchpatch, -}: - -mkDerivation rec { - pname = "qtcurve"; - version = "1.9.1"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "qtcurve"; - rev = version; - sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; - }; - - patches = [ - # Fix build with CMake 4 - (fetchpatch { - url = "https://github.com/KDE/qtcurve/commit/d2c84577505641e647fbb64bce825b3e0a4129f5.patch"; - sha256 = "sha256-WBmzlVDxRNXZmi6c03cR1MuIr+hBaeFXgNLzhsv0bZo="; - }) - # Remove unnecessary constexpr, this is not allowed in C++14 - (fetchpatch { - url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; - sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; - }) - # Fix build with Qt5.15 - (fetchpatch { - url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch"; - sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek="; - }) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - ]; - - buildInputs = [ - qtbase - qtsvg - qtx11extras - karchive - kconfig - kconfigwidgets - kio - kiconthemes - kguiaddons - ki18n - kwindowsystem - kdelibs4support - frameworkintegration - libpthread-stubs - pcre - libxdmcp - libx11 - libxau - ] - ++ lib.optional gtk2Support gtk2; - - preConfigure = '' - for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt - do - substituteInPlace $i \ - --replace "{_Qt5_PLUGIN_INSTALL_DIR}" "{KDE_INSTALL_QTPLUGINDIR}" - done - substituteInPlace CMakeLists.txt \ - --replace \$\{GTK2_PREFIX\} $out - substituteInPlace gtk2/style/CMakeLists.txt \ - --replace \$\{GTK2_LIBDIR\} $out/lib - patchShebangs tools/gen-version.sh - ''; - - configureFlags = [ - "-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}" - "-DENABLE_QT4=OFF" - ]; - - meta = { - homepage = "https://github.com/QtCurve/qtcurve"; - description = "Widget styles for Qt5/Plasma 5 and gtk2"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index 2c9794730f99..9abeddc2226d 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "1.2.3"; + version = "2.0.7"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "McL4th987bozpaT3ESNCGBxSN+Fw5sW+MOFAiXYm1MI="; + sha256 = "5WpBdzAwpUn6Aen6ShqKB/smcddu0Znn54FYpZ3SlwY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 1cf07e0b7e12..694e96d6814f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "7.3.0"; + version = "7.3.1"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - hash = "sha256-/LhQznVm9w8YO69LFrZw7goDY/S34pldAai8CbJpLGo="; + hash = "sha256-53JzGLlRIeRVq54/YbZd24M8DiS2LuTvgC3/0pRrja4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index a5ebe0633133..ef63e494a253 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -8,24 +8,26 @@ pkg-config, vala, wrapGAppsHook4, + accountsservice, glib, granite7, gsettings-desktop-schemas, gtk4, pantheon-wayland, systemd, + libadwaita, libx11, }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "8.1.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; tag = version; - hash = "sha256-e02cVUEzRGVIJQQh2bONLUhrjRfeSpYQYWup5Sn9HhM="; + hash = "sha256-LmPLjOZVVHKMfYTEyOH2IkB/fw47pK0VqdWrckdBQ6w="; }; nativeBuildInputs = [ @@ -37,12 +39,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + accountsservice glib granite7 gsettings-desktop-schemas gtk4 pantheon-wayland systemd + libadwaita libx11 ]; diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix index b3b89bf9f6a7..44e028c3b2bd 100644 --- a/pkgs/development/compilers/dotnet/source/vmr.nix +++ b/pkgs/development/compilers/dotnet/source/vmr.nix @@ -508,10 +508,11 @@ stdenv.mkDerivation { runHook postInstall ''; - ${if stdenv.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = '' - mkdir -p "$out"/nix-support - echo ${sigtool} > "$out"/nix-support/manual-sdk-deps - ''; + ${if stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = + '' + mkdir -p "$out"/nix-support + echo ${sigtool} > "$out"/nix-support/manual-sdk-deps + ''; # stripping dlls results in: # Failed to load System.Private.CoreLib.dll (error code 0x8007000B) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index 1227b0fe85d8..e803ea01e584 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.9"; + version = "1.25.10"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-DsnvjrzqCXqsN97K6fCachi0Uc2Wvn1u1RPY5Lz5Cc8="; + hash = "sha256-IM8EqS5a+ZdI40G8iZb6KAkMmsmHZfoRXsXd9B169B0="; }; strictDeps = true; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 370163a096f4..f7a7bafc31e8 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -6,41 +6,23 @@ ocaml-ng, dune, zlib, - pcre, pcre2, neko, - mbedtls_2, mbedtls, }: let ocamlDependencies = - version: - if lib.versionAtLeast version "4.3" then - with ocaml-ng.ocamlPackages; - [ - ocaml - findlib - sedlex - xml-light - ptmap - camlp5 - sha - luv - extlib - ] - else - with ocaml-ng.ocamlPackages_4_10; - [ - ocaml - findlib - sedlex - xml-light - ptmap - camlp5 - sha - luv-0-5-12 - extlib-1-7-7 - ]; + version: with ocaml-ng.ocamlPackages; [ + ocaml + findlib + sedlex + xml-light + ptmap + camlp5 + sha + luv + extlib + ]; generic = { @@ -55,11 +37,9 @@ let zlib neko dune + pcre2 + mbedtls ] - ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) - ++ lib.optional (lib.versionAtLeast version "4.1") ( - if lib.versionAtLeast version "4.3" then mbedtls else mbedtls_2 - ) ++ ocamlDependencies version; src = fetchFromGitHub { @@ -150,14 +130,6 @@ let }; in { - haxe_4_0 = generic { - version = "4.0.5"; - hash = "sha256-Ck/py+tZS7dBu/uikhSLKBRNljpg2h5PARX0Btklozg="; - }; - haxe_4_1 = generic { - version = "4.1.5"; - hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY="; - }; haxe_4_3 = generic { version = "4.3.7"; hash = "sha256-sQb7MCoH2dZOvNmDQ9P0yFYrSXYOMn4FS/jlyjth39Y="; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cecf57705f36..24a76365b715 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2525,12 +2525,12 @@ with haskellLib; doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "14.8"; + version = "14.11"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-/tRYc6uIViHXnSMoNXElsgW6E+lNXesYk1LOKS6Tdkg="; + hash = "sha256-ml6yWKNA+5j0vX4gZPz08q6JdLaIh5mLW4N7uuzkl0M="; }; }) ]; @@ -3380,13 +3380,13 @@ with haskellLib; # Manually maintained // ( let - version = "1.11.0"; + version = "1.11.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; tag = "v${version}"; - hash = "sha256-CWhnwL2M83/ItapPVeJqCevRoQttesYxJ1h0Mo6ZCXs="; + hash = "sha256-TuvKVBX60mqyMT6OB5JqVEh1YIWtFMR/igLCaCdC9tw="; }; in { diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 9d679a00f809..c94f74c4e10c 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -134,8 +134,6 @@ self: super: + (oldAttrs.preCompileBuildDriver or ""); }) super.llvm-hs; - sym = markBroken super.sym; - yesod-core = overrideCabal (drv: { # Allow access to local networking when the Darwin sandbox is enabled, so yesod-core can # run tests that access localhost. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f30daa8d4c15..683cd7ef0eba 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5579,7 +5579,6 @@ broken-packages: - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02 - sdr # failure in job https://hydra.nixos.org/build/243807383 at 2024-01-01 - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02 @@ -7129,7 +7128,6 @@ broken-packages: - vty-examples # failure in job https://hydra.nixos.org/build/233235872 at 2023-09-02 - vty-menu # failure in job https://hydra.nixos.org/build/233232391 at 2023-09-02 - vty-ui # failure in job https://hydra.nixos.org/build/233200900 at 2023-09-02 - - vulkan-utils # failure in job https://hydra.nixos.org/build/307522991 at 2025-09-19 - wacom-daemon # failure in job https://hydra.nixos.org/build/233213077 at 2023-09-02 - waddle # failure in job https://hydra.nixos.org/build/233239973 at 2023-09-02 - wai-control # failure in job https://hydra.nixos.org/build/295098171 at 2025-04-22 @@ -7318,7 +7316,6 @@ broken-packages: - xenstore # failure in job https://hydra.nixos.org/build/233234469 at 2023-09-02 - xfconf # failure in job https://hydra.nixos.org/build/233234800 at 2023-09-02 - xformat # failure in job https://hydra.nixos.org/build/233211918 at 2023-09-02 - - xgboost-haskell # failure in job https://hydra.nixos.org/build/295098374 at 2025-04-22 - xhaskell-library # failure in job https://hydra.nixos.org/build/233221178 at 2023-09-02 - xhb # failure in job https://hydra.nixos.org/build/233204853 at 2023-09-02 - xilinx-lava # failure in job https://hydra.nixos.org/build/233247659 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 300313a58b64..0924661fe0d3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -681,7 +681,6 @@ unsupported-platforms: Allure: [ platforms.darwin ] bdcs-api: [ platforms.darwin ] bindings-directfb: [ platforms.darwin ] - bindings-sane: [ platforms.darwin ] bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r bytelog: [ platforms.darwin ] # due to posix-api camfort: [ aarch64-linux ] @@ -695,27 +694,18 @@ unsupported-platforms: Euterpea: [ platforms.darwin ] follow-file: [ platforms.darwin ] freenect: [ platforms.darwin ] - FTGL: [ platforms.darwin ] fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 ghc-gc-hook: [ platforms.darwin ] # requires C11 threads which Apple doesn't support - gi-adwaita: [ platforms.darwin ] - gi-dbusmenu: [ platforms.darwin ] - gi-dbusmenugtk3: [ platforms.darwin ] - gi-ggit: [ platforms.darwin ] gi-gtk-layer-shell: [ platforms.darwin ] # depends on gtk-layer-shell which is not supported on darwin gi-ibus: [ platforms.darwin ] gi-javascriptcore: [ platforms.darwin ] # webkitgtk marked broken on darwin gi-ostree: [ platforms.darwin ] - gi-vte: [ platforms.darwin ] gi-webkit2: [ platforms.darwin ] # webkitgtk marked broken on darwin gi-webkit2webextension: [ platforms.darwin ] # webkitgtk marked broken on darwin gi-wnck: [ platforms.darwin ] - gl: [ platforms.darwin ] # depends on mesa GLHUI: [ platforms.darwin ] # depends on mesa - gnome-keyring: [ platforms.darwin ] grid-proto: [ platforms.darwin ] gtk-sni-tray: [ platforms.darwin ] - h-raylib: [ platforms.darwin ] # depends on mesa haskell-snake: [ platforms.darwin ] hcwiid: [ platforms.darwin ] HDRUtils: [ platforms.darwin ] @@ -728,7 +718,6 @@ unsupported-platforms: jsaddle-webkit2gtk: [ platforms.darwin ] Kulitta: [ platforms.darwin ] # depends on Euterpea LambdaHack: [ platforms.darwin ] - libmodbus: [ platforms.darwin ] libsystemd-journal: [ platforms.darwin ] libtelnet: [ platforms.darwin ] libvirt-hs: [ platforms.darwin ] # spidermonkey is not supported on darwin @@ -737,18 +726,16 @@ unsupported-platforms: lio-fs: [ platforms.darwin ] logging-facade-journald: [ platforms.darwin ] longshot: [ aarch64-linux ] - mpi-hs-binary: [ aarch64-linux, platforms.darwin ] - mpi-hs-cereal: [ aarch64-linux, platforms.darwin ] + mpi-hs-binary: [ aarch64-linux ] + mpi-hs-cereal: [ aarch64-linux ] mpi-hs-store: [ aarch64-linux, platforms.darwin ] - mpi-hs: [ aarch64-linux, platforms.darwin ] + mpi-hs: [ aarch64-linux ] mplayer-spot: [ aarch64-linux, platforms.darwin ] mptcp-pm: [ platforms.darwin ] netlink: [ platforms.darwin ] network-unexceptional: [ platforms.darwin ] # depends on posix-api - notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu oculus: [ platforms.darwin ] ostree-pin: [ platforms.darwin ] # depends on gi-ostree - pam: [ platforms.darwin ] parport: [ platforms.darwin ] persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 piyo: [ platforms.darwin ] @@ -760,14 +747,8 @@ unsupported-platforms: reactive-balsa: [ platforms.darwin ] # depends on alsa-core reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] - rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] - SDL-mixer: [ platforms.darwin ] # depends on mesa - SDL-mpeg: [ platforms.darwin ] # depends on mesa - sdl2-mixer: [ platforms.darwin ] - sdl2-ttf: [ platforms.darwin ] sdr: [ platforms.darwin ] # depends on rtlsdr - sensei: [ platforms.darwin ] sockets: [ platforms.darwin ] # depends on posix-api spade: [ platforms.darwin ] # depends on sdl2-mixer, which doesn't work on darwin synthesizer-alsa: [ platforms.darwin ] @@ -777,14 +758,12 @@ unsupported-platforms: twirl: [ platforms.darwin ] # depends on sdl2-mixer Unixutils-shadow: [ platforms.darwin ] verifiable-expressions: [ aarch64-linux ] - vrpn: [ platforms.darwin ] - vulkan-utils: [ platforms.darwin ] - vulkan: [ i686-linux, armv7l-linux, platforms.darwin ] - VulkanMemoryAllocator: [ i686-linux, armv7l-linux, platforms.darwin ] + vulkan: [ i686-linux, armv7l-linux ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] webkit2gtk3-javascriptcore: [ platforms.darwin ] wiringPi: [ aarch64-darwin ] xattr: [ platforms.darwin ] - xgboost-haskell: [ aarch64-linux, armv7l-linux, platforms.darwin ] + xgboost-haskell: [ aarch64-linux, armv7l-linux ] xmobar: [ platforms.darwin ] xmonad-extras: [ platforms.darwin ] xmonad-volume: [ platforms.darwin ] @@ -802,9 +781,6 @@ supported-platforms: blake3: [ platforms.x86 ] # uses x86 intrinsics btrfs: [ platforms.linux ] # depends on linux bytepatch: [ platforms.x86 ] # due to blake3 - cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32) - cpython: [ platforms.x86 ] # c2hs errors on glibc headers - crc32c: [ platforms.x86 ] # uses x86 intrinsics d3d11binding: [ platforms.windows ] DirectSound: [ platforms.windows ] dx9base: [ platforms.windows ] @@ -815,8 +791,6 @@ supported-platforms: evdev: [ platforms.linux ] geomancy-layout: [ platforms.x86 ] # x86 intrinsics geomancy: [ platforms.x86 ] # x86 intrinsics - ghcjs-base: [ javascript-ghcjs ] - ghcjs-dom-javascript: [ javascript-ghcjs ] gi-gtkosxapplication: [ platforms.darwin ] gtk-mac-integration: [ platforms.darwin ] gtk3-mac-integration: [ platforms.darwin ] @@ -853,7 +827,6 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux miso-action-logger: [ javascript-ghcjs ] # https://github.com/Lermex/miso-action-logger/issues/1 - miso-examples: [ javascript-ghcjs ] OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7b38a8743e96..fa1a48b5ba95 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1204,7 +1204,6 @@ dont-distribute-packages: - graphicstools - graphtype - greencard-lib - - grid-proto - gridbounds - gridland - gross @@ -3255,7 +3254,6 @@ dont-distribute-packages: - source-code-server - SourceGraph - SpacePrivateers - - spade - sparkle - sparrow - sparsebit diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e74f9f728f4e..d47d0a777596 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12674,7 +12674,6 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) ftgl; }; @@ -39184,7 +39183,6 @@ self: { librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) SDL_mixer; }; @@ -39207,7 +39205,6 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) smpeg; }; @@ -46406,8 +46403,7 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" - ] - ++ lib.platforms.darwin; + ]; } ) { }; @@ -107613,7 +107609,6 @@ self: { libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; license = lib.licenses.lgpl3Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) sane-backends; }; @@ -169568,7 +169563,6 @@ self: { ]; description = "Binding for the cpuid machine instruction on x86 compatible processors"; license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only"; - platforms = lib.platforms.x86; } ) { }; @@ -169648,7 +169642,6 @@ self: { testPkgconfigDepends = [ python3 ]; description = "Bindings for libpython"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.sheepforce ]; } ) { inherit (pkgs) python3; }; @@ -170926,7 +170919,6 @@ self: { ]; description = "crc32c"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - platforms = lib.platforms.x86; } ) { }; @@ -270426,7 +270418,6 @@ self: { sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml"; description = "base library for GHCJS"; license = lib.meta.getLicenseFromSpdxId "MIT"; - platforms = [ "javascript-ghcjs" ]; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -270558,7 +270549,6 @@ self: { sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg"; description = "DOM library using JSFFI and GHCJS"; license = lib.meta.getLicenseFromSpdxId "MIT"; - platforms = [ "javascript-ghcjs" ]; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -271370,7 +271360,6 @@ self: { libraryPkgconfigDepends = [ libadwaita ]; description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libadwaita; }; @@ -271863,7 +271852,6 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libdbusmenu; }; @@ -271930,7 +271918,6 @@ self: { ]; description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { @@ -272412,7 +272399,6 @@ self: { libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libgit2-glib; }; @@ -274853,7 +274839,6 @@ self: { libraryPkgconfigDepends = [ vte ]; description = "Vte bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) vte; }; @@ -279586,7 +279571,6 @@ self: { librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libGL; }; @@ -282544,7 +282528,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libgnome-keyring; }; @@ -292033,7 +292016,6 @@ self: { description = "Game engine for Prototyping on a Grid"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -295939,7 +295921,6 @@ self: { ]; description = "Raylib bindings for Haskell"; license = lib.meta.getLicenseFromSpdxId "Apache-2.0"; - badPlatforms = lib.platforms.darwin; } ) { @@ -431328,7 +431309,6 @@ self: { librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; license = lib.licenses.bsd2; - badPlatforms = lib.platforms.darwin; } ) { modbus = null; }; @@ -466239,7 +466219,6 @@ self: { isExecutable = true; description = "A tasty Haskell front-end web framework"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - platforms = [ "javascript-ghcjs" ]; } ) { }; @@ -477587,7 +477566,7 @@ self: { testPkgconfigDepends = [ ompi ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = [ "aarch64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; } ) { ompi = null; }; @@ -477621,7 +477600,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = [ "aarch64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; } ) { }; @@ -477655,7 +477634,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = [ "aarch64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; } ) { }; @@ -499139,7 +499118,6 @@ self: { tuple ]; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; mainProgram = "notifications-tray-icon"; } ) { }; @@ -517529,7 +517507,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) pam; }; @@ -602621,7 +602598,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to librtlsdr"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) rtl-sdr; }; @@ -613489,9 +613465,6 @@ self: { executablePkgconfigDepends = [ SDL2_mixer ]; description = "Haskell bindings to SDL2_mixer"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) SDL2_mixer; }; @@ -613569,7 +613542,6 @@ self: { ]; description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { @@ -616364,7 +616336,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; maintainers = [ lib.maintainers.libjared ]; } ) { }; @@ -649095,7 +649066,6 @@ self: { description = "A simple programming and debugging environment"; license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only"; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "spade"; } ) { }; @@ -741668,7 +741638,6 @@ self: { ]; description = "Bindings to VRPN"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; mainProgram = "test-vrpn"; } ) @@ -742335,8 +742304,7 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" - ] - ++ lib.platforms.darwin; + ]; } ) { inherit (pkgs) vulkan-loader; }; @@ -742410,9 +742378,6 @@ self: { ]; description = "Utils for the vulkan package"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -762729,11 +762694,8 @@ self: { badPlatforms = [ "aarch64-linux" "armv7l-linux" - ] - ++ lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; + ]; mainProgram = "xgb-agaricus"; - broken = true; } ) { inherit (pkgs) xgboost; }; diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index c94536743167..4c66e0ad08b1 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix rpath so love binary can find libliblove.dylib install_name_tool -change "@rpath/libliblove.dylib" "$out/lib/libliblove.dylib" "$out/bin/love" ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2f33ad4c168d..24f3a0b7beb5 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -69,19 +69,19 @@ let in { php82 = mkPhp { - version = "8.2.30"; - hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo="; + version = "8.2.31"; + hash = "sha256-lIGD+gTPJhybk2PAL0KJd7nd+MC/3/jo4fuoFu1XCAM="; }; php83 = mkPhp { - version = "8.3.30"; - hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; + version = "8.3.31"; + hash = "sha256-5phrH9N+slQCEn/kpyeKPgO3+QJbt6S9KSonG9+TD7k="; }; php84 = mkPhp { - version = "8.4.20"; - hash = "sha256-ziXSYQpflSKsj1P7t7goC1wCGZHpvZE3BoycYp2f+1Y="; + version = "8.4.21"; + hash = "sha256-XgvSh/O+Nb9XwhGwEFJ65eEKiBcPluZNM2BE61+u9DA="; }; php85 = mkPhp { - version = "8.5.5"; - hash = "sha256-7iYr7/YcQxll0flxkoVLNiCK3qw4mDw0mLs1AK6HKDw="; + version = "8.5.6"; + hash = "sha256-RFckD2XwxZpiCSDWbNqxsSEApDHgOtn+vjixOhsllX8="; }; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e9b414ebb8db..a4149eeeb8af 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -427,7 +427,7 @@ stdenv.mkDerivation (finalAttrs: { # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch ] - ++ optionals (pythonAtLeast "3.14") [ + ++ optionals (pythonAtLeast "3.14" && pythonOlder "3.15") [ # https://github.com/python/cpython/issues/146264 # https://github.com/python/cpython/pull/146265 ./3.14/hacl-static-ldeps-for-static-modules.patch diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4e1c533bfea9..d4b32534190c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -92,9 +92,9 @@ major = "3"; minor = "15"; patch = "0"; - suffix = "a7"; + suffix = "b1"; }; - hash = "sha256-j1kMQot/DUBt+Si4Vzfno6+ijt3U0UGUEOqAloftHqc="; + hash = "sha256-1NUsz6HXJ+9SNfu31w+h26zxC4s3YNtiKHXaBay+Q3w="; inherit passthruFun; }; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index 3fbb44169a09..25d2d331fff5 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -15,8 +15,8 @@ # https://www.aquamaniac.de/rdm/projects/aqbanking/files aqbanking = { - version = "6.8.2"; - hash = "sha256-ELFMktdv8TZS4AtcSWABYB8NlGXFrLGxtoLUUQIkBuw="; - releaseId = "634"; + version = "6.9.1"; + hash = "sha256-/JSivr+7T8JrmNyTyPo2qAJimM15lfeYIcSA2zVYf2s="; + releaseId = "652"; }; } diff --git a/pkgs/development/libraries/futuresql/default.nix b/pkgs/development/libraries/futuresql/default.nix index dddddd97ae67..05e3a86e519b 100644 --- a/pkgs/development/libraries/futuresql/default.nix +++ b/pkgs/development/libraries/futuresql/default.nix @@ -1,9 +1,8 @@ { stdenv, - lib, fetchurl, cmake, - extra-cmake-modules, + kdePackages, qtbase, }: stdenv.mkDerivation rec { @@ -17,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules ]; buildInputs = [ qtbase ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ]; # a library, nothing to wrap dontWrapQtApps = true; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix deleted file mode 100644 index e04804e60f84..000000000000 --- a/pkgs/development/libraries/kdb/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitLab, - extra-cmake-modules, - qtbase, - kcoreaddons, - python3, - sqlite, - libpq, - libmysqlclient, - qttools, -}: - -mkDerivation { - pname = "kdb"; - version = "3.2.0-unstable-2025-10-17"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kdb"; - rev = "819f9f61d629ffd80990ae17ae6c8078721a142b"; - hash = "sha256-XkpFFzTgLEjPxEzwinbGhHRTULQrhl5TdakJlQuI27A="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - - buildInputs = [ - kcoreaddons - python3 - sqlite - libpq - libmysqlclient - ]; - - propagatedBuildInputs = [ qtbase ]; - - meta = { - description = "Database connectivity and creation framework for various database vendors"; - mainProgram = "kdb3_sqlite3_dump"; - license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 69fe068ef980..720987111984 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,12 +1,16 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, }: mkDerivation { pname = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qtbase ]; outputs = [ "out" diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 1b1176ba8f6b..c9fb1668bb47 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, gtk3, qtsvg, @@ -9,6 +10,7 @@ mkDerivation { pname = "breeze-icons"; nativeBuildInputs = [ + cmake extra-cmake-modules gtk3 ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index ea46176de9fe..702a7f53b745 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -27,6 +27,7 @@ libsForQt5, lib, fetchurl, + kdePackages, }: let @@ -140,7 +141,7 @@ let in ( { - extra-cmake-modules = callPackage ./extra-cmake-modules { }; + inherit (kdePackages) extra-cmake-modules; # TIER 1 attica = callPackage ./attica.nix { }; @@ -154,11 +155,8 @@ let kdnssd = callPackage ./kdnssd.nix { }; kguiaddons = callPackage ./kguiaddons.nix { }; ki18n = callPackage ./ki18n.nix { }; - kidletime = callPackage ./kidletime.nix { }; kirigami2 = callPackage ./kirigami2.nix { }; - kitemmodels = callPackage ./kitemmodels.nix { }; kitemviews = callPackage ./kitemviews.nix { }; - kplotting = callPackage ./kplotting.nix { }; kwayland = callPackage ./kwayland.nix { }; kwidgetsaddons = callPackage ./kwidgetsaddons.nix { }; kwindowsystem = callPackage ./kwindowsystem { }; @@ -175,63 +173,64 @@ let kjobwidgets = callPackage ./kjobwidgets.nix { }; knotifications = callPackage ./knotifications.nix { }; kpackage = callPackage ./kpackage { }; - kunitconversion = callPackage ./kunitconversion.nix { }; syndication = callPackage ./syndication.nix { }; # TIER 3 kactivities-stats = callPackage ./kactivities-stats.nix { }; kbookmarks = callPackage ./kbookmarks.nix { }; - kcmutils = callPackage ./kcmutils.nix { }; kconfigwidgets = callPackage ./kconfigwidgets.nix { }; - kdeclarative = callPackage ./kdeclarative.nix { }; kded = callPackage ./kded.nix { }; - kemoticons = callPackage ./kemoticons.nix { }; kglobalaccel = callPackage ./kglobalaccel.nix { }; kiconthemes = callPackage ./kiconthemes { }; - kinit = callPackage ./kinit { }; kio = callPackage ./kio { }; knewstuff = callPackage ./knewstuff { }; - knotifyconfig = callPackage ./knotifyconfig.nix { }; - kparts = callPackage ./kparts.nix { }; kservice = callPackage ./kservice { }; ktextwidgets = callPackage ./ktextwidgets.nix { }; kwallet = callPackage ./kwallet.nix { }; kxmlgui = callPackage ./kxmlgui.nix { }; - plasma-framework = callPackage ./plasma-framework.nix { }; # TIER 4 frameworkintegration = callPackage ./frameworkintegration.nix { }; - - # PORTING AIDS - kdelibs4support = callPackage ./kdelibs4support { }; - kdesignerplugin = callPackage ./kdesignerplugin.nix { }; } // lib.optionalAttrs config.allowAliases { baloo = mkThrow "baloo"; bluez-qt = mkThrow "bluez-qt"; kapidox = mkThrow "kapidox"; + kcmutils = mkThrow "kcmutils"; kcontacts = mkThrow "kcontacts"; kdav = mkThrow "kdav"; + kdeclarative = mkThrow "kdeclarative"; + kdelibs4support = mkThrow "kdelibs4support"; + kdesignerplugin = mkThrow "kdesignerplugin"; kdesu = mkThrow "kdesu"; + kemoticons = mkThrow "kemoticons"; kfilemetadata = mkThrow "kfilemetadata"; kholidays = mkThrow "kholidays"; khtml = mkThrow "kthml"; kimageformats = mkThrow "kimageformats"; + kidletime = mkThrow "kidletime"; + kinit = mkThrow "kinit"; + kitemmodels = mkThrow "kitemmodels"; kjs = mkThrow "kjs"; kjsembed = mkThrow "kjsembed"; kmediaplayer = mkThrow "kmediaplayer"; + knotifyconfig = mkThrow "knotifyconfig"; + kparts = mkThrow "kparts"; kpeople = mkThrow "kpeople"; + kplotting = mkThrow "kplotting"; kpty = mkThrow "kpty"; kpurpose = mkThrow "kpurpose"; kquickcharts = mkThrow "kquickcharts"; kross = mkThrow "kross"; krunner = mkThrow "krunner"; ktexteditor = mkThrow "ktexteditor"; + kunitconversion = mkThrow "kunitconversion"; kxmlrpcclient = mkThrow "kxmlrpcclient"; modemmanager-qt = mkThrow "modemmanager-qt"; networkmanager-qt = mkThrow "networkmanager-qt"; oxygen-icons = mkThrow "oxygen-icons"; oxygen-icons5 = mkThrow "oxygen-icons"; + plasma-framework = mkThrow "plasma-framework"; prison = mkThrow "prison"; qqc2-desktop-style = mkThrow "qqc2-desktop-style"; threadweaver = mkThrow "threadweaver"; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix deleted file mode 100644 index ce8b89ef80bd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - mkDerivation, - lib, - fetchpatch, - bash, - cmake, - pkg-config, -}: - -mkDerivation { - pname = "extra-cmake-modules"; - - patches = [ - # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 - (fetchpatch { - url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch"; - sha256 = "10y36fc3hnpmcsmjgfxn1rp4chj5yrhgghj7m8gbmcai1q5jr0xj"; - }) - ]; - - outputs = [ "out" ]; # this package has no runtime components - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - bash - ]; - - # note: these will be propagated into the same list extra-cmake-modules is in - propagatedBuildInputs = [ - cmake - pkg-config - ]; - - strictDeps = true; - - setupHook = ./setup-hook.sh; - - meta = { - platforms = lib.platforms.linux ++ lib.platforms.darwin; - homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index b9205856425c..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,123 +0,0 @@ -ecmCMakeFlags() { - appendToVar cmakeFlags "-DECM_DIR=@out@/share/ECM/cmake" -} - -preConfigureHooks+=(ecmCMakeFlags) - -ecmEnvHook() { - addToSearchPath XDG_DATA_DIRS "$1/share" - addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" -} -addEnvHooks "$targetOffset" ecmEnvHook - -ecmPostHook() { - # Because we need to use absolute paths here, we must set *all* the paths. - appendToVar cmakeFlags "-DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - appendToVar cmakeFlags "-DKDE_INSTALL_BINDIR=${!outputBin}/bin" - appendToVar cmakeFlags "-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - appendToVar cmakeFlags "-DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - appendToVar cmakeFlags "-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" - appendToVar cmakeFlags "-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - appendToVar cmakeFlags "-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - appendToVar cmakeFlags "-DKDE_INSTALL_LOCALSTATEDIR=/var" - appendToVar cmakeFlags "-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" - appendToVar cmakeFlags "-DKDE_INSTALL_DATADIR=${!outputBin}/share" - appendToVar cmakeFlags "-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" - appendToVar cmakeFlags "-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" - appendToVar cmakeFlags "-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" - appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" - appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" - appendToVar cmakeFlags "-DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" - appendToVar cmakeFlags "-DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" - appendToVar cmakeFlags "-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" - appendToVar cmakeFlags "-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - appendToVar cmakeFlags "-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" - appendToVar cmakeFlags "-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" - appendToVar cmakeFlags "-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" - appendToVar cmakeFlags "-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" - appendToVar cmakeFlags "-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" - appendToVar cmakeFlags "-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" - appendToVar cmakeFlags "-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/metainfo" - appendToVar cmakeFlags "-DKDE_INSTALL_MANDIR=${!outputBin}/share/man" - appendToVar cmakeFlags "-DKDE_INSTALL_INFODIR=${!outputBin}/share/info" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" - appendToVar cmakeFlags "-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" - appendToVar cmakeFlags "-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" - appendToVar cmakeFlags "-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" - - if [ "$(uname)" = "Darwin" ]; then - appendToVar cmakeFlags "-DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" - fi - - if [ -n "${qtPluginPrefix-}" ]; then - appendToVar cmakeFlags "-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" - appendToVar cmakeFlags "-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" - fi - - if [ -n "${qtQmlPrefix-}" ]; then - appendToVar cmakeFlags "-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" - fi -} -postHooks+=(ecmPostHook) - -xdgDataSubdirs=( \ - "config.kcfg" "kconf_update" "kservices5" "kservicetypes5" \ - "kxmlgui5" "knotifications5" "icons" "locale" "sounds" "templates" \ - "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ -) - -# ecmHostPathsSeen is an associative array of the paths that have already been -# seen by ecmHostPathHook. -declare -gA ecmHostPathsSeen - -ecmHostPathIsNotSeen() { - if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then - # The path has been seen before. - return 1 - else - # The path has not been seen before. - # Now it is seen, so record it. - ecmHostPathsSeen["$1"]=1 - return 0 - fi -} - -ecmHostPathHook() { - ecmHostPathIsNotSeen "$1" || return 0 - - local xdgConfigDir="$1/etc/xdg" - if [ -d "$xdgConfigDir" ] - then - qtWrapperArgs+=(--prefix XDG_CONFIG_DIRS : "$xdgConfigDir") - fi - - for xdgDataSubdir in "${xdgDataSubdirs[@]}" - do - if [ -d "$1/share/$xdgDataSubdir" ] - then - qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "$1/share") - break - fi - done - - local manDir="$1/man" - if [ -d "$manDir" ] - then - qtWrapperArgs+=(--prefix MANPATH : "$manDir") - fi - - local infoDir="$1/info" - if [ -d "$infoDir" ] - then - qtWrapperArgs+=(--prefix INFOPATH : "$infoDir") - fi - - if [ -d "$1/dbus-1" ] - then - appendToVar propagatedUserEnvPkgs "$1" - fi -} -addEnvHooks "$targetOffset" ecmHostPathHook diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index bda5fe20d868..69ffb454a690 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kbookmarks, kcompletion, @@ -18,7 +19,10 @@ mkDerivation { pname = "frameworkintegration"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kbookmarks kcompletion diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index f69797dd8386..bcf2d97dce81 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, + cmake, extra-cmake-modules, boost, kactivities, @@ -10,7 +11,10 @@ mkDerivation { pname = "kactivities-stats"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ boost kactivities diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 67ae3d5a58bf..fa1cedc61365 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, boost, kconfig, @@ -12,7 +13,10 @@ mkDerivation { pname = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ boost kconfig diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 0eb468244092..1b61ef1fffcf 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, bzip2, xz, @@ -12,6 +13,7 @@ mkDerivation { pname = "karchive"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index b0943132b228..0206b38f35c4 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -3,6 +3,7 @@ stdenv, mkDerivation, propagate, + cmake, extra-cmake-modules, kcoreaddons, qttools, @@ -12,7 +13,10 @@ mkDerivation { pname = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index f74215126f64..b0f013ff6bc1 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, kcodecs, @@ -15,6 +16,7 @@ mkDerivation { pname = "kbookmarks"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index cdce670ac423..b2051eb89bc6 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -1,12 +1,16 @@ { mkDerivation, + cmake, extra-cmake-modules, libical, }: mkDerivation { pname = "kcalendarcore"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; propagatedBuildInputs = [ libical ]; outputs = [ "out" diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils.nix b/pkgs/development/libraries/kde-frameworks/kcmutils.nix deleted file mode 100644 index 22d5df058af2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kcmutils.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfigwidgets, - kcoreaddons, - kdeclarative, - ki18n, - kiconthemes, - kitemviews, - kpackage, - kservice, - kxmlgui, - qtdeclarative, -}: - -mkDerivation { - pname = "kcmutils"; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kiconthemes - kitemviews - kpackage - kxmlgui - qtdeclarative - ]; - propagatedBuildInputs = [ - kconfigwidgets - kservice - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 2b27c145750f..4a1f82f81566 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -8,7 +9,10 @@ mkDerivation { pname = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools gperf diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index e99b2bb3998a..991b54aafcba 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kconfig, kwidgetsaddons, @@ -9,7 +10,10 @@ mkDerivation { pname = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kconfig kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index f703b4e56472..52c05e13b05a 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -11,7 +12,10 @@ mkDerivation { "out" "dev" ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix index 6f3c7717360d..6a138df9ea85 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kauth, kcodecs, @@ -15,6 +16,7 @@ mkDerivation { pname = "kconfigwidgets"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index f931a5e4f31e..dfb8c80474be 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -8,7 +9,10 @@ mkDerivation { pname = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools shared-mime-info diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 50b258af73b1..cec7b33620e8 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kcoreaddons, kwindowsystem, @@ -9,7 +10,10 @@ mkDerivation { pname = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kcoreaddons kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index eeb10affd913..f06b3f69910e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -8,7 +9,10 @@ mkDerivation { pname = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools qtx11extras diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix deleted file mode 100644 index 923252690089..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - libepoxy, - kconfig, - kglobalaccel, - kguiaddons, - ki18n, - kiconthemes, - kio, - kpackage, - kwidgetsaddons, - kwindowsystem, - qtdeclarative, -}: - -mkDerivation { - pname = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - libepoxy - kglobalaccel - kguiaddons - ki18n - kiconthemes - kio - kwidgetsaddons - kwindowsystem - ]; - propagatedBuildInputs = [ - kconfig - kpackage - qtdeclarative - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 8d35628ff2ae..d084bdbdebc3 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -3,6 +3,7 @@ lib, propagate, wrapGAppsHook3, + cmake, extra-cmake-modules, kdoctools, gsettings-desktop-schemas, @@ -17,6 +18,7 @@ mkDerivation { pname = "kded"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools wrapGAppsHook3 diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix deleted file mode 100644 index 50d2b42978f7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - mkDerivation, - docbook_xml_dtd_45, - extra-cmake-modules, - kdoctools, - kauth, - karchive, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kcrash, - kdbusaddons, - kded, - kdesignerplugin, - kemoticons, - kglobalaccel, - kguiaddons, - ki18n, - kiconthemes, - kio, - kitemmodels, - kinit, - knotifications, - kparts, - kservice, - ktextwidgets, - kunitconversion, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - networkmanager, - qtbase, - qtsvg, - qttools, - qtx11extras, - libsm, -}: - -mkDerivation { - pname = "kdelibs4support"; - patches = [ - ./nix-kde-include-dir.patch - ]; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - propagatedNativeBuildInputs = [ kdoctools ]; - buildInputs = [ - kcompletion - kconfig - kded - kglobalaccel - ki18n - kio - kservice - kwidgetsaddons - kxmlgui - networkmanager - qtsvg - qtx11extras - libsm - ]; - propagatedBuildInputs = [ - kauth - karchive - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdesignerplugin - kemoticons - kguiaddons - kiconthemes - kitemmodels - kinit - knotifications - kparts - ktextwidgets - kunitconversion - kwindowsystem - qtbase - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch deleted file mode 100644 index eabb70254483..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp -=================================================================== ---- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp -+++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp -@@ -292,7 +292,7 @@ static QString relativeInstallPath(const - return QFile::decodeName(ICON_INSTALL_DIR "/"); - } - if (strcmp("include", type) == 0) { -- return QFile::decodeName(INCLUDE_INSTALL_DIR "/"); -+ return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR")); - } - break; - case 'l': diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh deleted file mode 100644 index 21ac2e83b5da..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required! diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix deleted file mode 100644 index 9a81d0c758e1..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kiconthemes, - kio, - kitemviews, - kplotting, - ktextwidgets, - kwidgetsaddons, - kxmlgui, - qttools, - sonnet, -}: - -mkDerivation { - pname = "kdesignerplugin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kio - kitemviews - kplotting - ktextwidgets - kwidgetsaddons - kxmlgui - sonnet - ]; - propagatedBuildInputs = [ qttools ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 081624f35111..4478be2d3e8d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, avahi, qtbase, @@ -8,7 +9,10 @@ mkDerivation { pname = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ avahi qttools diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 377a102c8a57..fd708d7d735a 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -3,6 +3,7 @@ lib, stdenv, fetchpatch, + cmake, extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, @@ -16,6 +17,7 @@ mkDerivation { pname = "kdoctools"; nativeBuildInputs = [ + cmake extra-cmake-modules # The build system insists on having native Perl. perl diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix deleted file mode 100644 index 27f236df2085..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - karchive, - kcoreaddons, - kservice, - qtbase, -}: - -mkDerivation { - pname = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - kcoreaddons - ]; - propagatedBuildInputs = [ - kservice - qtbase - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 766bc3dec3ed..8e5e2d4a78ba 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kconfig, kcoreaddons, @@ -15,7 +16,10 @@ mkDerivation { pname = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kconfig kcoreaddons diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index f86b9a31f87d..4619dea4f081 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -2,18 +2,22 @@ lib, stdenv, mkDerivation, + cmake, + pkg-config, extra-cmake-modules, wayland-scanner, qtbase, qtx11extras, wayland, - plasma-wayland-protocols, + kdePackages, }: mkDerivation { pname = "kguiaddons"; nativeBuildInputs = [ + cmake + pkg-config extra-cmake-modules ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -24,7 +28,7 @@ mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - plasma-wayland-protocols + kdePackages.plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 5c14db74ef1b..17dfd6e5a8d7 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, gettext, python3, @@ -9,7 +10,10 @@ mkDerivation { pname = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; propagatedNativeBuildInputs = [ gettext python3 diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 69a0ab745610..a1470e6cf69a 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, breeze-icons, karchive, @@ -17,7 +18,10 @@ mkDerivation { patches = [ ./default-theme-breeze.patch ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ breeze-icons karchive diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix deleted file mode 100644 index 34667dbd582a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - wayland-scanner, - qtbase, - qtx11extras, - wayland, - wayland-protocols, - plasma-wayland-protocols, -}: - -mkDerivation { - pname = "kidletime"; - nativeBuildInputs = [ - extra-cmake-modules - wayland-scanner - ]; - buildInputs = [ - qtx11extras - wayland - wayland-protocols - plasma-wayland-protocols - ]; - propagatedBuildInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch deleted file mode 100644 index f9c019c2ae2a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 16 Feb 2020 14:23:44 -0600 -Subject: [PATCH 2/4] start_kdeinit-path - ---- - src/start_kdeinit/start_kdeinit_wrapper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c -index 891f50c..ef664ad 100644 ---- a/src/start_kdeinit/start_kdeinit_wrapper.c -+++ b/src/start_kdeinit/start_kdeinit_wrapper.c -@@ -11,7 +11,7 @@ - #include - #include - --#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" -+#define EXECUTE "/run/wrappers/bin/start_kdeinit" - - #if KDEINIT_OOM_PROTECT - --- -2.23.1 - diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch deleted file mode 100644 index 499c975a9e2d..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 16 Feb 2020 14:24:07 -0600 -Subject: [PATCH 3/4] kdeinit-extra-libs - ---- - src/kdeinit/kinit.cpp | 22 ++++------------------ - 1 file changed, 4 insertions(+), 18 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 0801b75..622dd5f 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -96,9 +96,9 @@ static const char *extra_libs[] = { - "libKF5Parts.5.dylib", - "libKF5Plasma.5.dylib" - #else -- "libKF5KIOCore.so.5", -- "libKF5Parts.so.5", -- "libKF5Plasma.so.5" -+ NIXPKGS_KF5_KIOCORE, -+ NIXPKGS_KF5_PARTS, -+ NIXPKGS_KF5_PLASMA - #endif - }; - #endif -@@ -1524,20 +1524,6 @@ static int initXconnection() - } - #endif - --#ifndef Q_OS_OSX --// Find a shared lib in the lib dir, e.g. libkio.so. --// Completely unrelated to plugins. --static QString findSharedLib(const QString &lib) --{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib; -- if (QFile::exists(path)) { -- return path; -- } -- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? -- return QString(); --} --#endif -- - extern "C" { - - static void secondary_child_handler(int) -@@ -1679,7 +1665,7 @@ int main(int argc, char **argv) - #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) - if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { - for (const char *extra_lib : extra_libs) { -- const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); -+ const QString extra = QString::fromLatin1(extra_lib); - if (!extra.isEmpty()) { - QLibrary l(extra); - l.setLoadHints(QLibrary::ExportExternalSymbolsHint); --- -2.23.1 - diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch deleted file mode 100644 index 2996342deadb..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 17 Feb 2020 04:45:03 -0600 -Subject: [PATCH 4/4] start_kdeinit-environ-hard-limit - ---- - src/start_kdeinit/start_kdeinit.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c -index f2db3e9..4ff2602 100644 ---- a/src/start_kdeinit/start_kdeinit.c -+++ b/src/start_kdeinit/start_kdeinit.c -@@ -148,7 +148,11 @@ int main(int argc, char **argv) - ++i) { - unsigned len; - if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) -- && len && len < (1 << 12)) { -+ && len) { -+ if (len >= (1 << 20)) { -+ fprintf(stderr, "%s: exceeded environment length limit", argv[0]); -+ return 1; -+ } - env[ i ] = malloc(len + 1); - if ((unsigned) read(0, env[ i ], len) == len) { - env[ i ][ len ] = '\0'; --- -2.23.1 - diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix deleted file mode 100644 index 533af32e64bb..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - lib, - stdenv, - writeScript, - extra-cmake-modules, - kdoctools, - kconfig, - kcrash, - ki18n, - kio, - kparts, - kservice, - kwindowsystem, - plasma-framework, -}: - -let - inherit (lib) getLib; -in - -mkDerivation { - pname = "kinit"; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kcrash - ki18n - kio - kservice - kwindowsystem - ]; - patches = [ - ./0002-start_kdeinit-path.patch - ./0003-kdeinit-extra-libs.patch - ./0004-start_kdeinit-environ-hard-limit.patch - ]; - env.CXXFLAGS = toString ( - [ - ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' - ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' - ] - ); - setupHook = writeScript "setup-hook.sh" '' - kinitFixupOutputHook() { - if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then - mkdir -p ''${!outputBin}/lib - find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \; - rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib - fi - } - - fixupOutputHooks+=(kinitFixupOutputHook) - ''; -} diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 2728ac681f35..8da48bc568c7 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -2,6 +2,7 @@ stdenv, lib, mkDerivation, + cmake, extra-cmake-modules, kdoctools, qttools, @@ -38,6 +39,7 @@ mkDerivation { pname = "kio"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 0f56f7c95365..54ed41bd834a 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qtquickcontrols2, @@ -10,6 +11,7 @@ mkDerivation { pname = "kirigami2"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix deleted file mode 100644 index 4078944be08a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, -}: - -mkDerivation { - pname = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtbase ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 526c88c5cb59..81df6bb30535 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -7,7 +8,10 @@ mkDerivation { pname = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; outputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 9be6428824db..a478c6279cfc 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, kcoreaddons, @@ -10,6 +11,7 @@ mkDerivation { pname = "kjobwidgets"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index cfc59cbf1a37..c0749c0536b8 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, attica, karchive, @@ -23,7 +24,10 @@ mkDerivation { pname = "knewstuff"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ karchive kcompletion diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 61e2dd02dc94..44b94f0c53ae 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -2,12 +2,13 @@ mkDerivation, lib, stdenv, + cmake, extra-cmake-modules, kcodecs, kconfig, kcoreaddons, kwindowsystem, - phonon, + libcanberra, qttools, qtx11extras, qtmacextras, @@ -17,6 +18,7 @@ mkDerivation { pname = "knotifications"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; @@ -25,7 +27,7 @@ mkDerivation { kconfig kcoreaddons kwindowsystem - phonon + libcanberra qtx11extras libdbusmenu-qt5 ] diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix deleted file mode 100644 index 1677ada272cd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcompletion, - kconfig, - ki18n, - kio, - phonon, - qtbase, -}: - -mkDerivation { - pname = "knotifyconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion - kconfig - ki18n - kio - phonon - ]; - propagatedBuildInputs = [ qtbase ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 282ddbb3e772..68480da4351a 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kdoctools, karchive, @@ -12,6 +13,7 @@ mkDerivation { pname = "kpackage"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix deleted file mode 100644 index b3f894663537..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - kcoreaddons, - ki18n, - kiconthemes, - kio, - kjobwidgets, - knotifications, - kservice, - ktextwidgets, - kwidgetsaddons, - kxmlgui, -}: - -mkDerivation { - pname = "kparts"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig - kcoreaddons - ki18n - kiconthemes - kjobwidgets - knotifications - kservice - kwidgetsaddons - ]; - propagatedBuildInputs = [ - kio - ktextwidgets - kxmlgui - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix deleted file mode 100644 index d2d2b76e1121..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qttools, - qtbase, -}: - -mkDerivation { - pname = "kplotting"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - qtbase - qttools - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index e819abe4be29..876067422e1c 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kconfig, kcoreaddons, @@ -17,7 +18,10 @@ let self = mkDerivation { pname = "krunner"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kconfig kcoreaddons diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 7466e789a660..bc716b1f9411 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,6 +1,7 @@ { mkDerivation, bison, + cmake, extra-cmake-modules, flex, kconfig, @@ -17,6 +18,7 @@ mkDerivation { pname = "kservice"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index d66ce937972e..4ed3e3527403 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, kcompletion, @@ -15,7 +16,10 @@ mkDerivation { pname = "ktextwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kcompletion kconfig diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix deleted file mode 100644 index edd57f03890a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - ki18n, - qtbase, -}: - -mkDerivation { - pname = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index 0999930fa785..137ff4513ff7 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kdoctools, kconfig, @@ -21,6 +22,7 @@ mkDerivation { pname = "kwallet"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 014ee813cfbd..e9f76c10bed2 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,10 +1,11 @@ { mkDerivation, - propagateBin, lib, + cmake, + pkg-config, extra-cmake-modules, wayland-scanner, - plasma-wayland-protocols, + kdePackages, qtbase, wayland, wayland-protocols, @@ -22,15 +23,20 @@ mkDerivation { ]; nativeBuildInputs = [ + cmake + pkg-config extra-cmake-modules wayland-scanner ]; buildInputs = [ - plasma-wayland-protocols + kdePackages.plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; - setupHook = propagateBin; # XDG_CONFIG_DIRS + outputs = [ + "out" + "dev" + ]; meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 6b7c271f3f6b..e4b041011b09 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -7,7 +8,10 @@ mkDerivation { pname = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; outputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index dd94f7131e7c..59e1e948d4b5 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, libpthread-stubs, libxdmcp, @@ -10,7 +11,10 @@ mkDerivation { pname = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ libpthread-stubs libxdmcp diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index 35d01f5e7d89..e6eb400921b2 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, attica, @@ -21,7 +22,10 @@ mkDerivation { "out" "dev" ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ attica kglobalaccel diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix deleted file mode 100644 index a2f8f948a452..000000000000 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kactivities, - karchive, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdeclarative, - kglobalaccel, - kguiaddons, - ki18n, - kiconthemes, - kio, - knotifications, - kpackage, - kservice, - kwayland, - kwindowsystem, - kxmlgui, - qtbase, - qtdeclarative, - qtscript, - qtx11extras, - kirigami2, - qtquickcontrols2, -}: - -mkDerivation { - pname = "plasma-framework"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kactivities - karchive - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - kglobalaccel - kguiaddons - ki18n - kiconthemes - kio - knotifications - kwayland - kwindowsystem - kxmlgui - qtdeclarative - qtscript - qtx11extras - qtquickcontrols2 - ]; - propagatedBuildInputs = [ - kpackage - kservice - qtbase - kirigami2 - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 41de202c3eed..d9cdbdc74ba7 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, intltool, qtbase, @@ -16,6 +17,7 @@ mkDerivation { pname = "purpose"; nativeBuildInputs = [ + cmake extra-cmake-modules intltool ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid/default.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix index ddb45ae6aa3f..066f9a9571b2 100644 --- a/pkgs/development/libraries/kde-frameworks/solid/default.nix +++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -3,6 +3,7 @@ lib, stdenv, bison, + cmake, extra-cmake-modules, flex, media-player-info, @@ -16,6 +17,7 @@ mkDerivation { patches = [ ./fix-search-path.patch ]; nativeBuildInputs = [ bison + cmake extra-cmake-modules flex ] diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 351972ba5bb5..cb970d563a1f 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, aspell, hunspell, @@ -9,7 +10,10 @@ mkDerivation { pname = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ aspell hunspell diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix index 0b92afc313e2..d0ffb5c27e2f 100644 --- a/pkgs/development/libraries/kde-frameworks/syndication.nix +++ b/pkgs/development/libraries/kde-frameworks/syndication.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, + cmake, extra-cmake-modules, kcodecs, }: @@ -8,6 +9,13 @@ mkDerivation { pname = "syndication"; meta.maintainers = [ lib.maintainers.bkchr ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kcodecs ]; + outputs = [ + "out" + "dev" + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 238087a11d0d..eccd593cf28c 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, perl, qtbase, @@ -9,6 +10,7 @@ mkDerivation { pname = "syntax-highlighting"; nativeBuildInputs = [ + cmake extra-cmake-modules perl ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index fe2e6ce78b38..d8593d70ca38 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,12 +1,16 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, }: mkDerivation { pname = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" diff --git a/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch b/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch deleted file mode 100644 index e41de5e30ac7..000000000000 --- a/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12dbdbb..22495bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.10) - - project( kdiagram ) - -diff --git a/src/KChart/CMakeLists.txt b/src/KChart/CMakeLists.txt -index 676b71f..a9a2928 100644 ---- a/src/KChart/CMakeLists.txt -+++ b/src/KChart/CMakeLists.txt -@@ -359,6 +359,7 @@ install(EXPORT KChartTargets - ecm_generate_pri_file( - BASE_NAME KChart - LIB_NAME KChart -+ VERSION ${KCHARTLIB_VERSION} - DEPS "widgets svg" - FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KChart -diff --git a/src/KGantt/CMakeLists.txt b/src/KGantt/CMakeLists.txt -index 107d762..5cbb254 100644 ---- a/src/KGantt/CMakeLists.txt -+++ b/src/KGantt/CMakeLists.txt -@@ -183,6 +183,7 @@ install(EXPORT KGanttTargets - ecm_generate_pri_file( - BASE_NAME KGantt - LIB_NAME KGantt -+ VERSION ${KGANTTLIB_VERSION} - DEPS "widgets printsupport" - FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KGantt diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix deleted file mode 100644 index e280ffbc21ac..000000000000 --- a/pkgs/development/libraries/kdiagram/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - fetchFromGitLab, - lib, - extra-cmake-modules, - qttools, - qtbase, - qtsvg, -}: - -mkDerivation rec { - pname = "kdiagram"; - version = "2.8.0"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "graphics"; - repo = "kdiagram"; - rev = "v${version}"; - sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8="; - }; - patches = [ - ./cmake-minimum-required.patch - ]; - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - propagatedBuildInputs = [ - qtbase - qtsvg - ]; - meta = { - description = "Libraries for creating business diagrams"; - license = lib.licenses.gpl2; - platforms = qtbase.meta.platforms; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix deleted file mode 100644 index c3e21c328691..000000000000 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitLab, - - cmake, - extra-cmake-modules, - - ki18n, - kirigami2, - qtquickcontrols2, -}: - -mkDerivation rec { - pname = "kirigami-addons"; - version = "0.11.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kirigami-addons"; - rev = "v${version}"; - hash = "sha256-KTkEfGmQf9kj+9e/rJM7jd/4BqubDLu5/oLkX88uENA="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - ki18n - kirigami2 - qtquickcontrols2 - ]; - - meta = { - description = "Add-ons for the Kirigami framework"; - homepage = "https://invent.kde.org/libraries/kirigami-addons"; - # https://invent.kde.org/libraries/kirigami-addons/-/blob/b197d98fdd079b6fc651949bd198363872d1be23/src/treeview/treeviewplugin.cpp#L1-5 - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - }; -} diff --git a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch deleted file mode 100644 index 9d7143b66a15..000000000000 --- a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d589d5..0e1390f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - set(KPROPERTY_GENERATE_PRI TRUE) --cmake_minimum_required(VERSION 3.0 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.10 FATAL_ERROR) - find_package(ECM 1.8.0 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - include(SetKPropertyCMakePolicies NO_POLICY_SCOPE) -diff --git a/cmake/modules/SetKPropertyCMakePolicies.cmake b/cmake/modules/SetKPropertyCMakePolicies.cmake -index bc28d8a..85370c2 100644 ---- a/cmake/modules/SetKPropertyCMakePolicies.cmake -+++ b/cmake/modules/SetKPropertyCMakePolicies.cmake -@@ -9,7 +9,7 @@ cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's - # "Simplify variable reference and escape sequence evaluation" - - if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property. -- cmake_policy(SET CMP0059 OLD) -+ cmake_policy(SET CMP0059 NEW) - endif() - if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3) - cmake_policy(SET CMP0063 NEW) diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix deleted file mode 100644 index 674e40d891dc..000000000000 --- a/pkgs/development/libraries/kproperty/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - lib, - fetchurl, - extra-cmake-modules, - qtbase, - kconfig, - kcoreaddons, - kwidgetsaddons, - kguiaddons, - qttools, -}: - -mkDerivation rec { - pname = "kproperty"; - version = "3.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; - }; - - patches = [ - ./cmake-minimum-required.patch - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - kconfig - kcoreaddons - kwidgetsaddons - kguiaddons - qttools - ]; - - propagatedBuildInputs = [ qtbase ]; - - meta = { - description = "Property editing framework with editor widget similar to what is known from Qt Designer"; - license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/development/libraries/kquickimageedit/0.3.0.nix b/pkgs/development/libraries/kquickimageedit/0.3.0.nix deleted file mode 100644 index 95b6094db054..000000000000 --- a/pkgs/development/libraries/kquickimageedit/0.3.0.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - extra-cmake-modules, - qtbase, - qtdeclarative, -}: - -stdenv.mkDerivation rec { - pname = "kquickimageeditor"; - version = "0.3.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kquickimageeditor"; - rev = "v${version}"; - sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtbase - qtdeclarative - ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; - dontWrapQtApps = true; - - meta = { - description = "Set of QtQuick components providing basic image editing capabilities"; - homepage = "https://invent.kde.org/libraries/kquickimageeditor"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index 5e2ea565969e..561d4cd3d357 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitLab, - extra-cmake-modules, + cmake, kdePackages, qtbase, qtdeclarative, @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-MluY8nkMtg1uLAStDZFDxyJoeDrcp3smZ4U5IG5sXMk="; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + ]; buildInputs = [ kdePackages.kirigami qtbase diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix deleted file mode 100644 index f4da50b1fabb..000000000000 --- a/pkgs/development/libraries/kuserfeedback/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - mkDerivation, - fetchurl, - extra-cmake-modules, - qttools, -}: -mkDerivation rec { - pname = "kuserfeedback"; - version = "1.3.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JSMIuCLdRpDqhasWiMmw2lUSl4rGtDX3ell5/B0v/RM="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - - meta = { - license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.k900 ]; - description = "Framework for collecting user feedback for apps via telemetry and surveys"; - }; -} diff --git a/pkgs/development/libraries/libqaccessibilityclient/default.nix b/pkgs/development/libraries/libqaccessibilityclient/default.nix index 4522f7ad6bbd..d0901b6e5c24 100644 --- a/pkgs/development/libraries/libqaccessibilityclient/default.nix +++ b/pkgs/development/libraries/libqaccessibilityclient/default.nix @@ -4,7 +4,7 @@ fetchurl, cmake, qtbase, - extra-cmake-modules, + kdePackages, }: stdenv.mkDerivation rec { @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules ]; buildInputs = [ qtbase ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ]; outputs = [ "out" diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix deleted file mode 100644 index 722ae70fc806..000000000000 --- a/pkgs/development/libraries/maui-core/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - mkDerivation, - libcanberra, - pulseaudio, - fetchFromGitHub, - cmake, - extra-cmake-modules, - kio, - kidletime, -}: - -mkDerivation rec { - pname = "maui-core"; - version = "0.6.6"; - - src = fetchFromGitHub { - owner = "Nitrux"; - repo = "maui-core"; - tag = "v${version}"; - sha256 = "sha256-o0Xwh9w0cClMw85FwpQB9CNWoSnzARxs6aGfvCA4BhA="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kidletime - kio - libcanberra - pulseaudio - ]; - - meta = { - description = "Core libraries to manage the desktop to be shared between Maui Settings and Cask"; - homepage = "https://github.com/Nitrux/maui-core"; - # Missing license information https://github.com/Nitrux/maui-core/issues/1 - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ onny ]; - platforms = lib.platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix deleted file mode 100644 index 773f2eb75d40..000000000000 --- a/pkgs/development/libraries/mbedtls/2.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ callPackage, fetchpatch }: - -callPackage ./generic.nix { - version = "2.28.10"; - hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s="; - - patches = [ - # cmake 4 compatibility - (fetchpatch { - url = "https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3.patch"; - hash = "sha256-CbDm6CchzoTia7Wbpbe3bo9CmHPOsxY2d055AfbCS0g="; - }) - # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls-framework/pull/173) - (fetchpatch { - name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch"; - url = "https://github.com/Mbed-TLS/mbedtls-framework/commit/e811994babf84e29e56ebf97265f5fefdf18050f.patch"; - hash = "sha256-PGXh7tMnl7VqBOWVZP3UqT5pEd0yh4oszEJNMiVOcGo="; - }) - # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls/pull/10215) - (fetchpatch { - name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch"; - url = "https://github.com/Mbed-TLS/mbedtls/commit/2e1399f1e1ed6fa1072cf9584f5771322b0d001b.patch"; - includes = [ "tests/*" ]; - # drop some context in order to apply the backported patch cleanly - decode = "interdiff -U1 /dev/null -"; - hash = "sha256-OTRnYw7Og6eAsB9pue1jkxO1xnkR48efz5QKjN9H0I8="; - }) - ]; -} diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index 3cb37d84ddc8..fb3e445249a6 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -103,8 +103,5 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ raphaelr ]; - knownVulnerabilities = lib.optionals (lib.versionOlder version "3.0") [ - "Mbed TLS 2 is not maintained anymore. Please migrate to newer versions" - ]; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d65868fa97ea..0557a3dabbf1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -12,7 +12,6 @@ glslang, spirv-tools, intltool, - jdupes, libdisplay-info, libdrm, libgbm, @@ -318,7 +317,6 @@ stdenv.mkDerivation { python3Packages.mako python3Packages.ply python3Packages.pyyaml - jdupes # Use bin output from glslang to not propagate the dev output at # the build time with the host glslang. (lib.getBin glslang) @@ -382,9 +380,6 @@ stdenv.mkDerivation { # Don't depend on build python patchShebangs --host --update $out/bin/* - # NAR doesn't support hard links, so convert them to symlinks to save space. - jdupes --hard-links --link-soft --recurse "$out" - # add RPATH here so Zink can find libvulkan.so patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so $opencl/lib/libRusticlOpenCL.so ''; diff --git a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch deleted file mode 100644 index 39c1b9c0d290..000000000000 --- a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: phonon-gstreamer-4.9.0/gstreamer/backend.cpp -=================================================================== ---- phonon-gstreamer-4.9.0.orig/gstreamer/backend.cpp -+++ phonon-gstreamer-4.9.0/gstreamer/backend.cpp -@@ -85,6 +85,8 @@ Backend::Backend(QObject *parent, const - "--gst-debug-no-color" - }; - -+ qputenv("GST_PLUGIN_PATH_1_0", GST_PLUGIN_PATH_1_0); -+ - int argc = sizeof(args) / sizeof(*args); - char **argv = const_cast(args); - GError *err = 0; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix deleted file mode 100644 index 1c7511becab1..000000000000 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchpatch, - cmake, - gst_all_1, - phonon, - pkg-config, - extra-cmake-modules, - qttools, - qtbase, - qtx11extras, - debug ? false, -}: - -stdenv.mkDerivation rec { - pname = "phonon-backend-gstreamer"; - version = "4.10.0"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"; - }; - - patches = [ - # Hardcode paths to useful plugins so the backend doesn't depend - # on system paths being set. - ./gst-plugin-paths.patch - - # Work around https://bugs.kde.org/show_bug.cgi?id=445196 until a new release. - (fetchpatch { - url = "https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f30a394655cff9398d17961142388b0f2.patch"; - sha256 = "sha256-tNBqVt67LNb9SQogS9ol8/xYIZvVSoVUgXQahMfkFh8="; - }) - ]; - - dontWrapQtApps = true; - - env.NIX_CFLAGS_COMPILE = - let - gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" ( - with gst_all_1; - [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ] - ); - in - toString [ - # This flag should be picked up through pkg-config, but it isn't. - "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" - - ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' - ]; - - buildInputs = with gst_all_1; [ - gstreamer - gst-plugins-base - phonon - qtbase - qtx11extras - ]; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - qttools - ]; - - cmakeBuildType = if debug then "Debug" else "Release"; - - meta = { - homepage = "https://phonon.kde.org/"; - description = "GStreamer backend for Phonon"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - license = lib.licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix deleted file mode 100644 index b262d7ce71dc..000000000000 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - phonon, - pkg-config, - libvlc, - extra-cmake-modules, - qttools, - qtbase, - qtx11extras, - debug ? false, -}: - -stdenv.mkDerivation rec { - pname = "phonon-backend-vlc"; - version = "0.11.3"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c="; - }; - - buildInputs = [ - phonon - libvlc - qtbase - qtx11extras - ]; - - nativeBuildInputs = [ - cmake - pkg-config - qttools - extra-cmake-modules - ]; - - dontWrapQtApps = true; - - cmakeBuildType = if debug then "Debug" else "Release"; - - meta = { - homepage = "https://community.kde.org/Phonon"; - # Dev repo is at https://invent.kde.org/libraries/phonon-vlc - description = "GStreamer backend for Phonon"; - platforms = lib.platforms.linux; - license = with lib.licenses; [ - bsd3 - lgpl21Plus - ]; - }; -} diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix deleted file mode 100644 index 2e04bf90440c..000000000000 --- a/pkgs/development/libraries/phonon/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - libGLU, - libGL, - pkg-config, - libpulseaudio, - extra-cmake-modules, - qtbase, - qttools, - debug ? false, -}: - -let - soname = "phonon4qt5"; - buildsystemdir = "share/cmake/${soname}"; -in - -stdenv.mkDerivation rec { - pname = "phonon"; - version = "4.11.1"; - - meta = { - homepage = "https://community.kde.org/Phonon"; - description = "Multimedia API for Qt"; - mainProgram = "phononsettings"; - license = lib.licenses.lgpl2; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ttuegel ]; - }; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${version}/phonon-${version}.tar.xz"; - sha256 = "0bfy8iqmjhlg3ma3iqd3kxjc2zkzpjgashbpf5x17y0dc2i1whxl"; - }; - - buildInputs = [ - libGLU - libGL - libpulseaudio - qtbase - qttools - ]; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - ]; - - outputs = [ - "out" - "dev" - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - [ - "-fPIC" - ] - ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=enum-constexpr-conversion" - ] - ); - - cmakeBuildType = if debug then "Debug" else "Release"; - - dontWrapQtApps = true; - - preConfigure = '' - appendToVar cmakeFlags "-DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" - appendToVar cmakeFlags "-DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" - appendToVar cmakeFlags "-DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer" - ''; - - postPatch = '' - sed -i PhononConfig.cmake.in \ - -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "/^set(PHONON_INCLUDE_DIR/ s|\''${rootDir}/||" \ - -e "/^set(PHONON_LIBRARY_DIR/ s|\''${rootDir}/||" \ - -e "/^set(PHONON_BUILDSYSTEM_DIR/ s|\''${rootDir}|''${!outputDev}|" - - sed -i cmake/FindPhononInternal.cmake \ - -e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")" - - sed -i cmake/FindPhononInternal.cmake \ - -e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")" - - sed -i CMakeLists.txt \ - -e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")" - ''; - - postFixup = '' - sed -i "''${!outputDev}/lib/pkgconfig/${soname}.pc" \ - -e "/^exec_prefix=/ c exec_prefix=''${!outputBin}/bin" - ''; -} diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix deleted file mode 100644 index 9de688a268bf..000000000000 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - mkDerivation, - fetchurl, - lib, - extra-cmake-modules, - qtbase, -}: - -mkDerivation rec { - pname = "plasma-wayland-protocols"; - version = "1.18.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM="; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ qtbase ]; - - meta = { - description = "Plasma Wayland Protocols"; - license = lib.licenses.lgpl21Plus; - platforms = qtbase.meta.platforms; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix deleted file mode 100644 index 3d1a91c748e5..000000000000 --- a/pkgs/development/libraries/pulseaudio-qt/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - pkg-config, - extra-cmake-modules, - wrapQtAppsHook, - pulseaudio, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pulseaudio-qt"; - version = "1.3.0"; - - src = fetchurl { - url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${lib.versions.majorMinor finalAttrs.version}.tar.xz"; - sha256 = "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - pulseaudio - ]; - - meta = { - description = "Pulseaudio bindings for Qt"; - homepage = "https://invent.kde.org/libraries/pulseaudio-qt"; - license = with lib.licenses; [ lgpl2 ]; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -}) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index fc9122f5cd72..ca9a11ac16ea 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -8,7 +8,7 @@ qtbase, qtsvg, qtx11extras ? null, # Qt 5 only - kwindowsystem, + kwindowsystem ? null, # Qt 6 only qtwayland, libx11, libxext, @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-5V8r8OylZb1hZI/8Yx7+KEUcyOpKxsL+r1loDj1Kdr0="; + hash = "sha256-S/oIkr0C4fj78ih8Tm6pKxlREEMLeF5Va7+3jC6bK3c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 61f4af42b403..1f9ceb1e0edc 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5978,6 +5978,40 @@ final: prev: { } ) { }; + tomlua = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaOlder, + }: + buildLuarocksPackage { + pname = "tomlua"; + version = "1.1.5-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/tomlua-1.1.5-1.rockspec"; + sha256 = "0xqxlw1pzvy63kw8d98nfh0k9269s4dg90md72m8kfcrj7isrb6m"; + }).outPath; + src = fetchzip { + url = "https://github.com/BirdeeHub/tomlua/archive/v1.1.5.zip"; + sha256 = "136jxj26dk3jl17dm86ifvfmpfbj0mf6yp2yy6i8g4xxfqs27n9q"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/BirdeeHub/tomlua"; + maintainers = [ lib.maintainers.birdee ]; + license.fullName = "MIT"; + description = "Speedy toml parsing for lua, implemented in C"; + longDescription = '' + Speedy toml parsing for lua, implemented in C + for use in hot-path or startup-time parsing of toml files.''; + }; + } + ) { }; + toml-edit = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c77a212952f8..ec2553a8a6ce 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -693,6 +693,11 @@ in env = old.env // { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; # for gcc15 }; + + meta = (old.meta or { }) // { + # https://github.com/wahern/luaossl/pull/221 + broken = luaAtLeast "5.5"; + }; }); luaposix = prev.luaposix.overrideAttrs (old: { @@ -1240,6 +1245,22 @@ in ]; }); + tomlua = prev.tomlua.overrideAttrs (old: { + postConfigure = '' + chmod +w "$rockspecFilename" + echo "deploy = { wrap_bin_scripts = false, }" >> "$rockspecFilename" + ''; + checkPhase = '' + runHook preCheck + runHook postCheck + ''; + installCheckPhase = '' + runHook preInstallCheck + make test + runHook postInstallCheck + ''; + }); + tree-sitter-cli = prev.tree-sitter-cli.overrideAttrs (_: { # Keep this package hermetic: provide the already-packaged tree-sitter # binary instead of using the LuaRocks backend that downloads from GitHub. diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 61b6ece1cff7..aacd4a50f780 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -55,7 +55,7 @@ deployAndroidPackage { libxkbfile libxshmfence ]) - ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc; + ++ lib.optional (os == "linux" && stdenv.hostPlatform.isx86_64) pkgsi686Linux.glibc; patchInstructions = (lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index a9ea5548a199..d0767ddc142b 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -76,8 +76,8 @@ deployAndroidPackage rec { # Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink # to still support the old standalone toolchains builds. - if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then - ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle + if [ -d $out/libexec/android-sdk/${package.path} ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then + ln -sf $out/libexec/android-sdk/${package.path} $out/libexec/android-sdk/ndk-bundle elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then echo "The ndk-bundle layout has changed. The nix expressions have to be updated!" exit 1 diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index f46ffe5b9f0e..df216fefdb17 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -28,7 +28,7 @@ deployAndroidPackage { libxrender libxext ]) - ++ lib.optionals (os == "linux" && stdenv.isx86_64) ( + ++ lib.optionals (os == "linux" && stdenv.hostPlatform.isx86_64) ( with pkgsi686Linux; [ glibc diff --git a/pkgs/development/ocaml-modules/bytesrw/default.nix b/pkgs/development/ocaml-modules/bytesrw/default.nix index 2b015aa2a132..eceb3a90ee32 100644 --- a/pkgs/development/ocaml-modules/bytesrw/default.nix +++ b/pkgs/development/ocaml-modules/bytesrw/default.nix @@ -1,35 +1,75 @@ { lib, fetchzip, - libblake3, - libmd, - xxhash, - zlib, - zstd, + topkg, buildTopkgPackage, + withBlake3 ? true, + libblake3, + withLibmd ? true, + libmd, + withMbedtls ? true, + mbedtls_4, + withXxh ? true, + xxhash, + withZlib ? true, + zlib, + withZstd ? true, + zstd, + withCmdliner ? false, + cmdliner, }: buildTopkgPackage rec { pname = "bytesrw"; - version = "0.2.0"; + version = "0.3.0"; minimalOCamlVersion = "4.14.0"; src = fetchzip { url = "https://erratique.ch/software/bytesrw/releases/bytesrw-${version}.tbz"; - hash = "sha256-DMQXclJV5uz/2a6XVHVnBkYgXpGRI83uzmzeed3fDxQ="; + hash = "sha256-EFdHKBH4VrWvOqs+I6tiRW9D2s6lY8Pol4YyuB7fqh8="; }; - # docs say these are optional, but buildTopkgPackage doesn’t handle missing - # dependencies + buildInputs = + lib.optional withBlake3 libblake3 + ++ lib.optional withLibmd libmd + ++ lib.optional withMbedtls mbedtls_4 + ++ lib.optional withXxh xxhash + ++ lib.optional withZlib zlib + ++ lib.optional withZstd zstd + ++ lib.optional withCmdliner cmdliner; - buildInputs = [ - libblake3 - libmd - xxhash - zlib - zstd - ]; + # certown is a CA utility that uses missing b0 APIs (Os.name, Os.Name). + # …but this is only need if enabling Cmdliner + postPatch = lib.optionalString withCmdliner '' + substituteInPlace pkg/pkg.ml --replace-fail \ + 'Pkg.bin ~cond:(b0 && cmdliner && mbedtls) "test/certown";' "" + ''; + + buildPhase = "${topkg.run} build ${ + lib.escapeShellArgs [ + "--with-conf-libblake3" + (lib.boolToString withBlake3) + + "--with-conf-libmd" + (lib.boolToString withLibmd) + + "--with-conf-mbedtls" + (lib.boolToString withMbedtls) + + "--with-conf-xxhash" + (lib.boolToString withXxh) + + "--with-conf-zlib" + (lib.boolToString withZlib) + + "--with-conf-zstd" + (lib.boolToString withZstd) + + "--with-cmdliner" + (lib.boolToString withCmdliner) + ] + }"; meta = { description = "Composable, memory efficient, byte stream readers and writers compatible with effect-based concurrency"; @@ -37,8 +77,8 @@ buildTopkgPackage rec { Bytesrw extends the OCaml Bytes module with composable, memory efficient, byte stream readers and writers compatible with effect-based concurrency. - Except for byte slice life-times, these abstractions intentionnaly - separate away ressource management and the specifics of reading and + Except for byte slice life-times, these abstractions intentionally + separate away resource management and the specifics of reading and writing bytes. ''; homepage = "https://erratique.ch/software/bytesrw"; diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index 938de51ee095..faf5b87a8a6e 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -12,13 +12,13 @@ buildPerlPackage rec { pname = "Image-ExifTool"; - version = "13.52"; + version = "13.58"; src = fetchFromGitHub { owner = "exiftool"; repo = "exiftool"; tag = version; - hash = "sha256-vsIktUk93fA8lqmphl2xk0Hqgh7VJ08LCP98NnD2o/Q="; + hash = "sha256-Mzn1m26uBlulwlfkW+CSRBR8CVqy5oL8cv+85NGgwRc="; }; postPatch = '' diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 72cff19d2bec..65c638296593 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -8,24 +8,25 @@ rustPlatform, curl, pcre2, + valgrind, libiconv, }: buildPecl rec { pname = "ddtrace"; - version = "1.16.0"; + version = "1.19.2"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; fetchSubmodules = true; - hash = "sha256-o9g0PT/EbBlB9h2FGyYJsKoNUcJIhGR0hv3owztcvcw="; + hash = "sha256-pfhoj5a+kUVOuMnAHgL2s05Pcc6uhlTcp2t5aj1eJ0E="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-vcM+iLpJiIxMqw/Xgq4E3hbY77+H1T1UkdJpUOO6dmo="; + hash = "sha256-Onkkea1xntfSKVr2aoCy1Z9wGIdv/L7HRh7LGxv738M="; }; env.NIX_CFLAGS_COMPILE = "-O2"; @@ -48,6 +49,9 @@ buildPecl rec { curl pcre2 ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + valgrind + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 781171fa18a2..0c735d864390 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-stY9je5gMaBIds45NxSLZaXaiapRRd/wUImrJxHnzZI="; + hash = "sha256-R6mFykE9QrM2i5NA+xuRFYzAf/PCCwfdnAWRcsEovfc="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index 58bc5e9164f4..87253105223b 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "adlfs"; - version = "2026.4.0"; + version = "2026.5.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "adlfs"; tag = finalAttrs.version; - hash = "sha256-lqEyREVMdo59NhDZVdOb+w2bf5JVDg/nQHYhC+hKglo="; + hash = "sha256-HscDY/DZZ9/a3NHmE8pSd3alLCJQDG6Fr2l2+DfU/os="; }; build-system = [ diff --git a/pkgs/development/python-modules/affinegap/default.nix b/pkgs/development/python-modules/affinegap/default.nix index 994e32f831c2..914acba0604c 100644 --- a/pkgs/development/python-modules/affinegap/default.nix +++ b/pkgs/development/python-modules/affinegap/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { "affinegap" ]; + # Bulk updater will see an older tag ending with a "2" and switch to it passthru.skipBulkUpdate = true; meta = { diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index 685c161e80bf..aba9b655633a 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "afsapi"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "wlcrs"; repo = "python-afsapi"; tag = finalAttrs.version; - hash = "sha256-5gvA3rFyAlTx7oKrUq9q0lBuwatzMPvRhjy7GYnwdik="; + hash = "sha256-OMz8zJrU1qymvhD9mnf248687wpqfgUnXna7Cbr83No="; }; build-system = [ diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index d21337899238..16c7c83b4739 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Output is slightly different on macOS "test_cast_format_locale" ]; diff --git a/pkgs/development/python-modules/agent-client-protocol/default.nix b/pkgs/development/python-modules/agent-client-protocol/default.nix index edd1c8bb5704..043585007409 100644 --- a/pkgs/development/python-modules/agent-client-protocol/default.nix +++ b/pkgs/development/python-modules/agent-client-protocol/default.nix @@ -19,14 +19,15 @@ buildPythonPackage (finalAttrs: { pname = "agent-client-protocol"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "python-sdk"; tag = finalAttrs.version; - hash = "sha256-8Xf2S85yNsP/HhpCw9UqdoDdeDHdggvYcnvJbilAVuU="; + hash = "sha256-JndUYT3oimoDs6WDA4ixhNCZnswUAZA4nab5DT1xpbQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/ai-edge-litert/default.nix b/pkgs/development/python-modules/ai-edge-litert/default.nix index 58be026d1134..a1df84f92fe2 100644 --- a/pkgs/development/python-modules/ai-edge-litert/default.nix +++ b/pkgs/development/python-modules/ai-edge-litert/default.nix @@ -77,7 +77,7 @@ buildPythonPackage { passthru.updateScript = ./update.py; meta = { - broken = stdenv.isDarwin; # elftools.common.exceptions.ELFError: Magic number does not match + broken = stdenv.hostPlatform.isDarwin; # elftools.common.exceptions.ELFError: Magic number does not match changelog = "https://github.com/google-ai-edge/LiteRT/releases/tag/v${release.version}"; description = "LiteRT is for mobile and embedded devices"; downloadPage = "https://github.com/google-ai-edge/LiteRT"; diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index fe77e9b2a321..316e1f3aed84 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -10,16 +10,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolyric"; - version = "2.0.2"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "timmo001"; repo = "aiolyric"; - tag = version; - hash = "sha256-k0UE9SXHS8lPu3kC+tGtn99rCU2hq+fdCsp6f83+gv4="; + tag = finalAttrs.version; + hash = "sha256-kLsq1pBRWz49DZgX47k132OipDcfn+kby6/GYDL3pPc="; }; build-system = [ @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Python module for the Honeywell Lyric Platform"; homepage = "https://github.com/timmo001/aiolyric"; - changelog = "https://github.com/timmo001/aiolyric/releases/tag/${src.tag}"; + changelog = "https://github.com/timmo001/aiolyric/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiopnsense/default.nix b/pkgs/development/python-modules/aiopnsense/default.nix new file mode 100644 index 000000000000..19541f5a3c3d --- /dev/null +++ b/pkgs/development/python-modules/aiopnsense/default.nix @@ -0,0 +1,55 @@ +{ + lib, + aiohttp, + awesomeversion, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-cov-stub, + pytest-timeout, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "aiopnsense"; + version = "1.0.8"; + pyproject = true; + + disabled = pythonOlder "3.14"; + + src = fetchFromGitHub { + owner = "Snuffy2"; + repo = "aiopnsense"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pJVYbf81/vZRi5elhNhiscXrEqDRLiIrik8N9GcR6yQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + awesomeversion + python-dateutil + ]; + + nativeCheckInputs = [ + aiohttp + pytest-asyncio + pytest-cov-stub + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiopnsense" ]; + + meta = { + description = "Async Python client library for OPNsense"; + homepage = "https://github.com/Snuffy2/aiopnsense"; + changelog = "https://github.com/Snuffy2/aiopnsense/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index aa97da656f53..0cbe83e415b0 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "Noltari"; repo = "aioqsw"; tag = version; - hash = "sha256-SIdEM5YxPnCM6wEJTL19t07Xb89wDAwHzKnz0dKC0tw="; + hash = "sha256-2v3PhhlVeQs/jMnOzji/aKeWD7pWfqXVf4iBOgXD7kc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiortc/default.nix b/pkgs/development/python-modules/aiortc/default.nix index c1111963e9f0..12710d9f4eaf 100644 --- a/pkgs/development/python-modules/aiortc/default.nix +++ b/pkgs/development/python-modules/aiortc/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { dnspython ]; + pythonRelaxDeps = [ "av" ]; + nativeCheckInputs = [ numpy pytestCheckHook diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index 61d956a7c0a7..c56e51a03d3f 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -18,7 +18,6 @@ # test dependencies pytest-aiohttp, pytest-cov-stub, - pytest-timeout, pytest-xdist, pytestCheckHook, @@ -44,6 +43,9 @@ buildPythonPackage (finalAttrs: { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' + + # too narrow timeouts, so remove pytest-timeout + sed -i "/addopts/d" pyproject.toml ''; build-system = [ @@ -63,7 +65,6 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytest-aiohttp pytest-cov-stub - pytest-timeout pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 89b92f988449..8a558ee1fac2 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -18,9 +18,9 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosonic"; - version = "0.30.1"; + version = "0.31.1"; pyproject = true; __darwinAllowLocalNetworking = true; @@ -28,16 +28,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sonic182"; repo = "aiosonic"; - tag = version; - hash = "sha256-VqtPl/dZmxjB7z9AjwBfmYmcxFae2NhWEnsw4l9+IYg="; + tag = finalAttrs.version; + hash = "sha256-f0MSUGdwq0If4LrZmMqYmdyycfTKroCfkkkX/l0v8QM="; }; - postPatch = '' - substituteInPlace pytest.ini --replace-fail \ - "addopts = --black " \ - "addopts = " - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -82,6 +76,11 @@ buildPythonPackage rec { "test_get_with_params_in_url" "test_get_with_params_tuple" "test_get_with_params" + "test_h2_client_level_flag" + "test_h2_connection_reused_across_requests" + "test_h2_custom_ssl_ctx_gets_alpn" + "test_h2_verify_false_applies_to_h2_ssl_context" + "test_h2_with_explicit_http2_flag" "test_keep_alive_cyclic_pool" "test_keep_alive_smart_pool" "test_max_conn_idle_ms" @@ -102,6 +101,7 @@ buildPythonPackage rec { "test_put_patch" "test_read_chunks_by_text_method" "test_read_timeout" + "test_stream_request_body_h2" "test_simple_get" "test_timeouts_overriden" "test_wrapper_delete_http_serv" @@ -122,10 +122,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/sonic182/aiosonic/blob/${src.tag}/CHANGELOG.md"; - description = "Very fast Python asyncio http client"; - license = lib.licenses.mit; + description = "Python asyncio http client"; homepage = "https://github.com/sonic182/aiosonic"; + changelog = "https://github.com/sonic182/aiosonic/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ geraldog ]; }; -} +}) diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix index 3d909a6e51d2..daea4573b0e3 100644 --- a/pkgs/development/python-modules/anndata/default.nix +++ b/pkgs/development/python-modules/anndata/default.nix @@ -126,7 +126,7 @@ buildPythonPackage rec { # Tests that are seemingly broken. See https://github.com/scverse/anndata/issues/2017. "test_concat_dask_sparse_matches_memory" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted "test_dask_distributed_write" "test_read_lazy_h5_cluster" diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index be010b2011cd..e00aa158a551 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -19,6 +19,12 @@ buildPythonPackage rec { hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs="; }; + # support pytest 9: https://github.com/pytest-dev/apipkg/pull/58 + postPatch = '' + substituteInPlace conftest.py \ + --replace-fail 'def pytest_report_header(startdir):' 'def pytest_report_header():' + ''; + build-system = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/appimage/default.nix b/pkgs/development/python-modules/appimage/default.nix index aad575380e85..51038e0652e2 100644 --- a/pkgs/development/python-modules/appimage/default.nix +++ b/pkgs/development/python-modules/appimage/default.nix @@ -5,16 +5,16 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "appimage"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ssh-mitm"; repo = "appimage"; - tag = version; - hash = "sha256-d8LwZ4iZ+fwFaBP/IFoKImI/TsYtVD0rllbYN9XP/es="; + tag = finalAttrs.version; + hash = "sha256-aL0JcA6R2FUMcXykbXaSaUEz1ERs3iKh4c0cbRAClSY="; }; build-system = [ hatchling ]; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "AppImage start scripts"; homepage = "https://github.com/ssh-mitm/appimage"; - changelog = "https://github.com/ssh-mitm/appimage/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/ssh-mitm/appimage/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/ar/default.nix b/pkgs/development/python-modules/ar/default.nix index 420b0e17e648..461f21af25e1 100644 --- a/pkgs/development/python-modules/ar/default.nix +++ b/pkgs/development/python-modules/ar/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ar" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_list" "test_read_content" "test_read_binary" diff --git a/pkgs/development/python-modules/autoskope-client/default.nix b/pkgs/development/python-modules/autoskope-client/default.nix new file mode 100644 index 000000000000..1b150594f15e --- /dev/null +++ b/pkgs/development/python-modules/autoskope-client/default.nix @@ -0,0 +1,45 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "autoskope-client"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mcisk"; + repo = "autoskope_client"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ThrI5BzjxVg4K1fvRZvPfDycAh4A9rm226FSpk3a/zs="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTestMarks = [ + "integration" + ]; + + pythonImportsCheck = [ "autoskope_client" ]; + + meta = { + description = "Python client library for the Autoskope API"; + homepage = "https://github.com/mcisk/autoskope_client"; + changelog = "https://github.com/mcisk/autoskope_client/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index a4faab93c6ad..006cd2ee46d0 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -23,16 +22,17 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "av"; - version = "16.1.0"; + version = "17.0.1"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "PyAV-Org"; repo = "PyAV"; - tag = "v${version}"; - hash = "sha256-mz0VI72lqtur5HdCkPNxInk0pUWxji0boIZnfvdrxIs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IS+qSwvpNbhOazkgZh9hzzaTLxSgU7uZjGmaOIkhskc="; }; build-system = [ @@ -63,13 +63,17 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # network access + "test_index_entries_len_webm" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "av" "av.audio" "av.buffer" - "av.bytesource" "av.codec" "av.container" "av._core" @@ -94,8 +98,8 @@ buildPythonPackage rec { description = "Pythonic bindings for FFmpeg"; mainProgram = "pyav"; homepage = "https://github.com/PyAV-Org/PyAV"; - changelog = "https://github.com/PyAV-Org/PyAV/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/PyAV-Org/PyAV/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd2; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index 8259249666e6..441da9892d46 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "aws-encryption-sdk"; - version = "4.0.4"; + version = "4.0.6"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-encryption-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-u0Fu6ikUJ70RQgptsAGbzmx3+FpXGTpN4Y2rKOSgO2o="; + hash = "sha256-E3Kc0GREozdXzM5LvH1iapYl9yr17TyxauCooeJeLxo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 1099087afc3b..a10cad6d8569 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { pname = "axis"; - version = "69"; + version = "70"; pyproject = true; disabled = pythonOlder "3.14"; @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { owner = "Kane610"; repo = "axis"; tag = "v${finalAttrs.version}"; - hash = "sha256-igeDyGKG235ooe/QrHjbya9WTCzwC8GfMoCwtpaBlR8="; + hash = "sha256-LfWnqYtmQLh1ZhSnLrx40ZfilhUoi9qbd0TgWpehlAg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 2e4c09f6670c..a1edb103979f 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.10.0"; + version = "4.11.0"; pyproject = true; src = fetchPypi { pname = "azure_keyvault_certificates"; inherit version; - hash = "sha256-AE/0enMVL59A9njloHcZt1OjyobwRgv+qvaiMwSHLgU="; + hash = "sha256-/gNWluQ7F8QUrQjvYEbWwT5odw1lzDi9rvjtistu+Hg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index de4f49c186ff..e0eb7ef3f293 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -113,12 +113,12 @@ buildPythonPackage (finalAttrs: { pname = "beets"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; tag = "v${finalAttrs.version}"; - hash = "sha256-DbZV8n+2nbILLIi7niXohcIynwza+w5LVo/jy4wmTbw="; + hash = "sha256-fi6D0P2GtEO41VL6UKAArRedZVxw97yqDUAoilktUho="; }; pyproject = true; @@ -384,6 +384,7 @@ buildPythonPackage (finalAttrs: { substitute = { testPaths = [ ]; }; + tidal = { }; the = { }; titlecase.propagatedBuildInputs = [ titlecase ]; thumbnails = { diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index 3131f75ab469..9a08cd67280b 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Fails on macOS with Trace/BPT trap: 5 - something to do with recursion depth "test_cubic_cubic" ]; diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index 5ea12bfc5043..197784dc6e91 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; src = fetchFromGitHub { owner = "blebox"; repo = "blebox_uniapi"; tag = "v${version}"; - hash = "sha256-+XdUteik6VDPXWgO9vDC34n2fIIDMUI5jTYzs/qCpLU="; + hash = "sha256-DBkd8o2jOVCH3KqJ2FZ4qhJsSMb1UwqBO1ZXoTLsqEY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index da2fa62b5a3b..3f66915ec330 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.43.4"; + version = "1.43.6"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-Cebf3Dt9sCt8m6strnSLAXmsrXztcu5it5pegP1YjKo="; + hash = "sha256-bIsuKXe1+FzayC8eNZDNfn5FLJI0FlTMZMk6Y9oPe+w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 6919cebdfac9..897dbf76fee8 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "caio"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "mosquito"; repo = "caio"; tag = finalAttrs.version; - hash = "sha256-F14uNUELzgAHbk0onY2MrXWRvifa3AeNkw2IFHcRDvo="; + hash = "sha256-IeyksrYpLMc9PJjpYeaOgLx26CeVMoR/3r2RX66ucDs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 5bb4e58d151e..4a751fbd639e 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,6 +5,8 @@ python, # build-system + cmake, + cython, setuptools, # dependencies @@ -28,6 +30,8 @@ buildPythonPackage rec { sourceRoot = "${src.name}/catboost/python-package"; build-system = [ + cmake + cython setuptools ]; @@ -41,6 +45,15 @@ buildPythonPackage rec { six ]; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "cmake (>=3.24, <4.0)" "cmake" \ + --replace-fail "'conan (>=2.4.1, <3.0)', " "" \ + --replace-fail "cython ~= 3.0.10" "cython" + ''; + + dontConfigure = true; + buildPhase = '' runHook preBuild @@ -55,8 +68,5 @@ buildPythonPackage rec { pythonImportsCheck = [ "catboost" ]; - meta = catboost.meta // { - # https://github.com/catboost/catboost/issues/2671 - broken = lib.versionAtLeast numpy.version "2"; - }; + meta = catboost.meta; } diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index 50df4370af1c..4f66fae63b95 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "cf-xarray"; - version = "0.10.11"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; tag = "v${finalAttrs.version}"; - hash = "sha256-SHVSHfB80iLz8uONwH1WoUajef/YT4k0CIzTrHTG3kI="; + hash = "sha256-EUavqGATUZ5w3XzDiPKCveJfaTQwikS4wFIbcAAwH7k="; }; build-system = [ diff --git a/pkgs/development/python-modules/chipwhisperer/default.nix b/pkgs/development/python-modules/chipwhisperer/default.nix index dcc446611b45..a771d220e084 100644 --- a/pkgs/development/python-modules/chipwhisperer/default.nix +++ b/pkgs/development/python-modules/chipwhisperer/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, # build - pythonAtLeast, setuptools, setuptools-scm, cython, @@ -15,7 +14,6 @@ ecpy, fastdtw, libusb1, - numpy, pyserial, tqdm, @@ -108,5 +106,6 @@ buildPythonPackage rec { changelog = "https://github.com/newaetech/chipwhisperer/releases/tag/${version}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.krishnans2006 ]; + broken = true; # Requires NumPy 1.26.4 (unsupported by nixpkgs) }; } diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 536f6426df0b..cf1259dfd1f3 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "12.3.2"; + version = "12.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-tR6HvzesMp11e8h35UpaZxaMa5flN1B4Sil3sbEG0cw="; + hash = "sha256-IH09q15Oq6ow2fBehyikfaiAwv8L9aL6c61tUNjbYIc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index 64e121f02c6a..1612b879b37a 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.1.72"; + version = "0.1.80"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-F8V1BUC0jeGWWFBS1GE931bycm0xJlAmoH1kPpxkk9o="; + hash = "sha256-gRTD/R3JkJDv4rlqEKSjqYdC7hWBqBDPJKsYFeCKy6Y="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/coal/default.nix b/pkgs/development/python-modules/coal/default.nix index 30bd354bbdcc..28a7e1642d4f 100644 --- a/pkgs/development/python-modules/coal/default.nix +++ b/pkgs/development/python-modules/coal/default.nix @@ -17,17 +17,6 @@ toPythonModule ( coal.overrideAttrs (super: { pname = "py-${super.pname}"; - # Finding `boost_system` fails because the stub compiled library of - # Boost.System, which has been a header-only library since 1.69, was - # removed in 1.89. - # See https://www.boost.org/releases/1.89.0/ for details. - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail \ - "find_package(Boost REQUIRED COMPONENTS system)" \ - "find_package(Boost REQUIRED OPTIONAL_COMPONENTS system)" - ''; - cmakeFlags = super.cmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true) (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone) diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index e7dacc08fd18..472abeacc4a9 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "colorcet"; - version = "3.1.0"; + version = "3.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KSGzzYGiKIqvLWPbwM48JtzYgujDicxQXWiGv3qppOs="; + hash = "sha256-SNmmfm5Z3FwKllqhtG/l1Zzclcw2qVlJ8pMT+VCsWfc="; }; build-system = [ diff --git a/pkgs/development/python-modules/countryinfo/default.nix b/pkgs/development/python-modules/countryinfo/default.nix index 0db9aead3932..40d190b2003a 100644 --- a/pkgs/development/python-modules/countryinfo/default.nix +++ b/pkgs/development/python-modules/countryinfo/default.nix @@ -4,42 +4,40 @@ fetchFromGitHub, poetry-core, pydantic, - typer, pytestCheckHook, + typer, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "countryinfo"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "porimol"; repo = "countryinfo"; - tag = "v${version}"; - hash = "sha256-Y4nJnjXg8raJx2f00DFMktdcWoLO09wqTFK6Fc8RKSI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-PE9XiVH6XE+OSySL5Lo0MPWyIEX8xgeHQB7MttMfmz8="; }; - build-system = [ poetry-core ]; + pythonRelaxDeps = [ "typer" ]; - patches = [ ./fix-pyproject-file.patch ]; + build-system = [ poetry-core ]; dependencies = [ pydantic typer ]; - pythonRelaxDeps = [ "typer" ]; - pythonImportsCheck = [ "countryinfo" ]; nativeCheckInputs = [ pytestCheckHook ]; meta = { - homepage = "https://github.com/porimol/countryinfo"; description = "Data about countries, ISO info and states/provinces within them"; + homepage = "https://github.com/porimol/countryinfo"; + changelog = "https://github.com/porimol/countryinfo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - cizniarova - ]; + maintainers = with lib.maintainers; [ cizniarova ]; }; -} +}) diff --git a/pkgs/development/python-modules/countryinfo/fix-pyproject-file.patch b/pkgs/development/python-modules/countryinfo/fix-pyproject-file.patch deleted file mode 100644 index a07a02b15d26..000000000000 --- a/pkgs/development/python-modules/countryinfo/fix-pyproject-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index f31c9e3..31fa9c8 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,3 +1,6 @@ -+[project] -+name = "countryinfo" -+ - [tool.poetry] - name = "countryinfo" - version = "1.0.0" diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 4aa1d26ad9de..f058f4ad8c3c 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "databricks-sdk"; - version = "0.105.0"; + version = "0.106.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xy5Yy5ZCp+9y2DqLMpzdO0KeT3KdRIMkogvou4eiyEI="; + hash = "sha256-l1fXVfEcQkHdRUxN02/K6r5t2IK5yGnEwfv9D1XK/Uc="; }; build-system = [ diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 7ccba3536c87..6357af360a4f 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { pname = "deebot-client"; - version = "18.2.0"; + version = "18.3.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -31,12 +31,12 @@ buildPythonPackage (finalAttrs: { owner = "DeebotUniverse"; repo = "client.py"; tag = finalAttrs.version; - hash = "sha256-t9ODbQhbJvnXfdWbnmjAqO6DQnJ+MzM8TD24KAs7NZ4="; + hash = "sha256-dQh98CIEbxpRga2BbB8X1KtGZ18jvVv4DhyJ1LFNNuw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-9GitKi4NEsXiKXN1cV2NDpOydUkOsAjIWo4QaL254y0="; + hash = "sha256-MNMLOF3j+bGEhDeRln5wLOG6gY+ssSQqrb8vdmyJdtA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/denon-rs232/default.nix b/pkgs/development/python-modules/denon-rs232/default.nix new file mode 100644 index 000000000000..69bb56dbd029 --- /dev/null +++ b/pkgs/development/python-modules/denon-rs232/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-timeout, + pytestCheckHook, + pythonOlder, + serialx, + uv-build, +}: + +buildPythonPackage (finalAttrs: { + pname = "denon-rs232"; + version = "4.1.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "denon-rs232"; + tag = finalAttrs.version; + hash = "sha256-SkfxUen1F5cakQao68uYz5uxAkzJfZtVtuIoFGH6mOU="; + }; + + build-system = [ uv-build ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' \ + --replace-fail '"uv_build>=0.8.4,<0.9.0"' '"uv_build>=0.8.4"' + ''; + + dependencies = [ serialx ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "denon_rs232" ]; + + meta = { + description = "Async library to control Denon receivers over RS232"; + homepage = "https://github.com/home-assistant-libs/denon-rs232"; + changelog = "https://github.com/home-assistant-libs/denon-rs232/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index 871e6cae54a7..702461222ff4 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,15 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; - version = "0.0.177"; + version = "0.0.181"; pyproject = true; + __structuredAttrs = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit (finalAttrs) version; - hash = "sha256-HKm7QTtzxW8ZnuvAsE5JFr61nnr+qWjjeV/5VY1JFIc="; + hash = "sha256-BtW0MXgFTphae3O5XPDnix8RTKDx/tvzpTN4znZjFSI="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index e94b1ad88430..71237c06d376 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.4.0"; + version = "4.4.1"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-TIvgJL+JvRiEf05pyQCfCkahTg7ld8qFOn5VgCPxasY="; + hash = "sha256-6/I5GI2fcD48IOwtbhgqpNn5RHU7Z4PeqMBZUEtiE9g="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix index 205c71de4f14..d80f497386bd 100644 --- a/pkgs/development/python-modules/django-mdeditor/default.nix +++ b/pkgs/development/python-modules/django-mdeditor/default.nix @@ -35,5 +35,9 @@ buildPythonPackage { changelog = "https://github.com/pylixm/django-mdeditor/releases"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ augustebaum ]; + knownVulnerabilities = [ + # https://nvd.nist.gov/vuln/detail/CVE-2025-13030 + "CVE-2025-13030" + ]; }; } diff --git a/pkgs/development/python-modules/earn-e-p1/default.nix b/pkgs/development/python-modules/earn-e-p1/default.nix new file mode 100644 index 000000000000..6497a46b60e7 --- /dev/null +++ b/pkgs/development/python-modules/earn-e-p1/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "earn-e-p1"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Miggets7"; + repo = "earn-e-p1"; + tag = finalAttrs.version; + hash = "sha256-a76+slVhZj6AQIDCcaEym3G6DjIsQQLfi13wIsYGkjA="; + }; + + build-system = [ hatchling ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "earn_e_p1" ]; + + meta = { + description = "Async Python library for communicating with EARN-E P1 energy meters via UDP"; + homepage = "https://github.com/Miggets7/earn-e-p1"; + changelog = "https://github.com/Miggets7/earn-e-p1/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 5412f8ca4d3e..07fc87bbb1e4 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -6,6 +6,8 @@ # build-system setuptools, + setuptools-scm, + versioneer, # dependencies boltons, @@ -27,23 +29,23 @@ buildPythonPackage (finalAttrs: { pname = "eliot"; - version = "1.17.5"; + version = "1.18.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "itamarst"; repo = "eliot"; tag = finalAttrs.version; - hash = "sha256-x6zonKL6Ys1fyUjyOgVgucAN64Dt6dCzdBrxRZa+VDQ="; + hash = "sha256-YUvHdnpWtsy2NlrVLaaewcUPKGLfdfX/zvowV0jcXuw="; }; - patches = [ - # Upstream PR: https://github.com/itamarst/eliot/pull/520 - ./python-3.14.patch + build-system = [ + setuptools + setuptools-scm + versioneer ]; - build-system = [ setuptools ]; - dependencies = [ boltons orjson diff --git a/pkgs/development/python-modules/eliot/python-3.14.patch b/pkgs/development/python-modules/eliot/python-3.14.patch deleted file mode 100644 index af34f0db80f1..000000000000 --- a/pkgs/development/python-modules/eliot/python-3.14.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a5fc2936e8e13ebb73de4254234ca4d6ead15d1e Mon Sep 17 00:00:00 2001 -From: Itamar Turner-Trauring -Date: Sun, 18 Jan 2026 14:15:02 -0500 -Subject: [PATCH] Pass tests for 3.14. - ---- - eliot/tests/test_coroutines.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/eliot/tests/test_coroutines.py b/eliot/tests/test_coroutines.py -index 39c5496c..cb2c1b13 100644 ---- a/eliot/tests/test_coroutines.py -+++ b/eliot/tests/test_coroutines.py -@@ -34,7 +34,8 @@ def run_coroutines(*async_functions): - """ - Run a coroutine until it finishes. - """ -- loop = asyncio.get_event_loop() -+ loop = asyncio.new_event_loop() -+ asyncio.set_event_loop(loop) - futures = [asyncio.ensure_future(f()) for f in async_functions] - - async def wait_for_futures(): diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index dbc358e6ad3c..a1351eecbac6 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "elkm1-lib"; - version = "2.2.14"; + version = "2.2.15"; pyproject = true; src = fetchFromGitHub { owner = "gwww"; repo = "elkm1"; tag = finalAttrs.version; - hash = "sha256-lejeRHteVMO7qz8qMPCG5d8V/rj550FL+WuogM/Lcbw="; + hash = "sha256-LDzc/njgPGjc9uhNMHG4NOn9P2Sy3lFHgwV9oJJLl2o="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix b/pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix new file mode 100644 index 000000000000..ad6b99a36788 --- /dev/null +++ b/pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + bleak, + bleak-retry-connector, +}: + +buildPythonPackage (finalAttrs: { + pname = "eurotronic-cometblue-ha"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rikroe"; + repo = "eurotronic-cometblue"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j3UuN0Cmb2mOo3QGqy0wu19+vRyMahclXKyka2Vy10w="; + }; + + build-system = [ pdm-backend ]; + + dependencies = [ + bleak + bleak-retry-connector + ]; + + # Tests require a real Bluetooth Comet Blue device. + doCheck = false; + + pythonImportsCheck = [ "eurotronic_cometblue_ha" ]; + + meta = { + description = "Python client for Eurotronic GmbH BLE Comet (and rebranded) Radiator TRVs"; + homepage = "https://github.com/rikroe/eurotronic-cometblue"; + changelog = "https://github.com/rikroe/eurotronic-cometblue/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index bfee629c8e92..cfd159e882eb 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "falconpy"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; tag = "v${version}"; - hash = "sha256-2XS9OgUyKrk3B2f3QzrCOmtaZCLnDDmzMmpZgyzt5xA="; + hash = "sha256-Pih9gd20pAN7bDsvwOtpUdh12GRmTD043whQcubZthQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/fumis/default.nix b/pkgs/development/python-modules/fumis/default.nix new file mode 100644 index 000000000000..0e1d9c605786 --- /dev/null +++ b/pkgs/development/python-modules/fumis/default.nix @@ -0,0 +1,76 @@ +{ + lib, + aiohttp, + aioresponses, + awesomeversion, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + rich, + syrupy, + textual, + textual-plotext, + typer, + yarl, +}: + +buildPythonPackage (finalAttrs: { + pname = "fumis"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-fumis"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yh1gxQ8iqHIE/pavzjYUXdaHnnHD0Ae6Yd/Elc/ZNmY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0" "${finalAttrs.version}" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + awesomeversion + mashumaro + orjson + yarl + ]; + + optional-dependencies = { + cli = [ + rich + textual + textual-plotext + typer + ]; + }; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; + + pythonImportsCheck = [ "fumis" ]; + + meta = { + description = "Asynchronous Python client for the Fumis WiRCU API"; + homepage = "https://github.com/frenck/python-fumis"; + changelog = "https://github.com/frenck/python-fumis/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index 55c0b731a2b8..ff9e30f2ef1f 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -18,18 +18,18 @@ let }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp312-aarch64-darwin = "sha256-hQ9VN5Wl8RQ53ShE5q/LqzgNsZHX27W7b05rGeH95jc="; - cp312-aarch64-linux = "sha256-wKQjIAmhM+Smk3XzzlR8ZtwxJpr8hvbV15QTfSMxuE8="; + cp312-aarch64-darwin = "sha256-ZLZmYCOPV7da3Jdh+YFSQ3PzLOjN039L8vKNwbaZ0dU="; + cp312-aarch64-linux = "sha256-c/jZOsTZwZb9e1g2qDUC1Bpu0M5yvCetXC6REyQx9+s="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-yISDKQFJYKZAxXE2vyrcanXcc3FvUHKcpshtaLnwtrI="; - cp313-aarch64-darwin = "sha256-j8E8zsPr1m4q7p1i4ihUuzPSczbRKuZGWp0C/oNx0Lc="; - cp313-aarch64-linux = "sha256-QvHfssbnKwoBmcqqBbOP2wLclJ7xol6054n8XqUtk44="; + cp312-x86_64-linux = "sha256-815AT8MpIalMvFsEfgGtcUztI7oMHd+BteWiC/U9dXo="; + cp313-aarch64-darwin = "sha256-bMS+dXVA9Is/IGQnysvNePXowH3d2GVOOxxuO4cycII="; + cp313-aarch64-linux = "sha256-QH+HuHtVay1z9zjKS5pBw67Q7kEpWKaLEn0hCKjDAOI="; cp313-x86_64-darwin = cp313-aarch64-darwin; - cp313-x86_64-linux = "sha256-wVm6yMfrL0rMgVebo/WGAyb7LKOp139g8U0GhgCbRoc="; - cp314-aarch64-darwin = "sha256-QCytKZtPSzdGDKg0LjFbJS/y5whqa8mcotNfecYXPVw="; - cp314-aarch64-linux = "sha256-qHAOVJwmZ6ojUDSmFJrxaiE4unwfns0VtVdUcEq2zq8="; + cp313-x86_64-linux = "sha256-HXhA/feSim+vn/95Xd5yeUAWTofQvO2YB13x6tOLEvk="; + cp314-aarch64-darwin = "sha256-qCfv866Sa2diUCa4A2UAere+OY5g4Yh1MmjcHw6Haz4="; + cp314-aarch64-linux = "sha256-93FNadd4r4gtdW4iI0CSDo2/wASlCZmGBMubTLHUMkI="; cp314-x86_64-darwin = cp314-aarch64-darwin; - cp314-x86_64-linux = "sha256-WUSCCjJ4uWTwxIsasIOizEmZ9HuZBoWVV0F3wPiXOCY="; + cp314-x86_64-linux = "sha256-+CNAcIlVwkqyD11BtNf70OlM9Od0CEE2DiAkydIilh8="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -37,7 +37,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "13.0.1"; + version = "13.0.2"; inherit format; src = fetchPypi { diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix index df86761b13a2..84dc8b5d795d 100644 --- a/pkgs/development/python-modules/harlequin-postgres/default.nix +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "harlequin-postgres"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchPypi { pname = "harlequin_postgres"; inherit version; - hash = "sha256-01MllGk8dFeWtbpENCGGYs4/nlq7aLLkFZqCXGLrN4s="; + hash = "sha256-Jdy3PpfN+xfDvP3DFGQYqY/xHOaPalH7GyUyLqydUiM="; }; build-system = [ diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index c4bdd3aed5a2..5cbb6c791b4d 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -10,12 +10,12 @@ buildPythonPackage (finalAttrs: { pname = "hcloud"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-sXoudQNFbnpHDfuvayWLt9P17xojIn0CGZ2pHMh9wVY="; + hash = "sha256-JwUu/6saJbs8v8ji0kcuDoUDsgrsq1u61cSw6Gl2ltU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 6784d9b15084..38aea828a10b 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, chameleon, fetchFromGitHub, + gitpython, importlib-metadata, lingva, numpy, @@ -15,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "holidays"; - version = "0.95"; + version = "0.96"; pyproject = true; src = fetchFromGitHub { owner = "vacanza"; repo = "python-holidays"; tag = "v${finalAttrs.version}"; - hash = "sha256-MyTOCHQw/TYvH9Xm3UcXHjza2f/2ICbb3vcTGt1Cpgg="; + hash = "sha256-tsDGtNAF69EzE4cs0j1PeLZBITvy04kG8MUKD2aNWx0="; }; build-system = [ @@ -31,6 +32,7 @@ buildPythonPackage (finalAttrs: { # l10n lingva chameleon + gitpython polib ]; diff --git a/pkgs/development/python-modules/htmltools/default.nix b/pkgs/development/python-modules/htmltools/default.nix index 4f2d237d630b..dd8d04dbf724 100644 --- a/pkgs/development/python-modules/htmltools/default.nix +++ b/pkgs/development/python-modules/htmltools/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "htmltools"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "py-htmltools"; tag = "v${version}"; - hash = "sha256-ugtDYs5YaVo7Yy9EodyRrypHQUjmOIPpsyhwNnZkiko="; + hash = "sha256-psrTSy4NhhsZamB7lQDt+n6LUDiRcHD5+FFqTIIrnZc="; }; build-system = [ diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 22a4a7436c27..c7e420ee7502 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.202605061"; + version = "0.1.202605101"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-gIy3nkEyl2rETMCa+0mry4ys4VmyzeTBvod3x3FmoOY="; + hash = "sha256-j6shiMU0zlxr8ehgMe6fcpN6CUKznGKeqbBLM1XHcmQ="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/kagglesdk/default.nix b/pkgs/development/python-modules/kagglesdk/default.nix index 49ccb2e72a76..097b96bd8e7d 100644 --- a/pkgs/development/python-modules/kagglesdk/default.nix +++ b/pkgs/development/python-modules/kagglesdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "kagglesdk"; - version = "0.1.22"; + version = "0.1.23"; pyproject = true; src = fetchFromGitHub { owner = "Kaggle"; repo = "kagglesdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-tQWkISdaTn/gC5+qxI3rCMRo+4QYE7XPi9mcVgKz3qM="; + hash = "sha256-0KzZy7Hghkljdbbp4AnafBmZL+jw/3q44+caSZ1S1mU="; }; build-system = [ diff --git a/pkgs/development/python-modules/kiosker-python-api/default.nix b/pkgs/development/python-modules/kiosker-python-api/default.nix new file mode 100644 index 000000000000..839edb3b9d2c --- /dev/null +++ b/pkgs/development/python-modules/kiosker-python-api/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + httpx, +}: + +buildPythonPackage (finalAttrs: { + pname = "kiosker-python-api"; + version = "1.2.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Top-North"; + repo = "kiosker-python"; + tag = finalAttrs.version; + hash = "sha256-DGJ1lxi4pP4gyRWDpeUdyPGCKQmzpRaWw8bwHrFUKF0="; + }; + + build-system = [ hatchling ]; + + dependencies = [ httpx ]; + + # Tests require a live Kiosker device (HOST/TOKEN env vars). + doCheck = false; + + pythonImportsCheck = [ "kiosker" ]; + + meta = { + description = "Python wrapper for the Kiosker API"; + homepage = "https://github.com/Top-North/kiosker-python"; + changelog = "https://github.com/Top-North/kiosker-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index b366fb7fcc32..093427f60364 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-cli"; - version = "0.4.24"; + version = "0.4.25"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${finalAttrs.version}"; - hash = "sha256-gDN0qxh1cPaupIrNK+o/8ExWORnRY3k6C5Vgd3A1Rf0="; + hash = "sha256-ygmi2phKJd48FKpCM5noLR6r/0/oMpve9l6MKpNwz/g="; }; sourceRoot = "${finalAttrs.src.name}/libs/cli"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 14bdf2155b4b..8aa5bd54165e 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -32,14 +32,14 @@ buildPythonPackage (finalAttrs: { pname = "langsmith"; - version = "0.7.32"; + version = "0.7.37"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-OFsxQfEIQ0Z82MqWqn8U5kphSk2G89bEfyyXWF7nc84="; + hash = "sha256-E3bszn3w7MaNLVjpgSfEQEyzzqWQp056BjXIcY9YJCM="; }; sourceRoot = "${finalAttrs.src.name}/python"; diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix index 34f63c921fb0..865e31896759 100644 --- a/pkgs/development/python-modules/lazr-uri/default.nix +++ b/pkgs/development/python-modules/lazr-uri/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lazr-uri"; - version = "1.0.7"; + version = "1.0.8"; pyproject = true; src = fetchPypi { pname = "lazr_uri"; inherit version; - hash = "sha256-7Qz28zPkUBFHUq+xzgwpnDasSxCQY+tQNUxPh/glo+4="; + hash = "sha256-DkWFTrImh5WN+4B2Vf9+CVsXZb5kniTMxYGTTQM307Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index db4627042816..58d26f91e334 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -12,13 +12,13 @@ buildPythonPackage (finalAttrs: { pname = "ledger-bitcoin"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "ledger_bitcoin"; - hash = "sha256-IkJFLnjPS1fIuNNQnoMYYP1IUbChv6uV8vXj9H1NFQA="; + hash = "sha256-PLQpftflV++YNJzcvWZ+9zaMBH1oGMfNy8p6+YuABrY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/locust/missing-hashes.json b/pkgs/development/python-modules/locust/missing-hashes.json index d51e45363197..505a48031882 100644 --- a/pkgs/development/python-modules/locust/missing-hashes.json +++ b/pkgs/development/python-modules/locust/missing-hashes.json @@ -1,76 +1,63 @@ { - "@esbuild/aix-ppc64@npm:0.25.1": "6de3a364b7f79f21f66d606d4d29c72ef81c741d71ab4bb941c4eabe7b6a809b1340f4dd5c943827005e421912880741320b9617d17fce762d204cfb94175223", - "@esbuild/android-arm64@npm:0.25.1": "716c98ad3220c71cbaedcfa34aa7c877a3fae911938c3776a66600d7f65980e384799a6832a1b9aea96c6d5a8880610f54744bd0813e743c511d44056ef528d6", - "@esbuild/android-arm@npm:0.25.1": "d2c9e95dd2027f6e14250a90a11136d9ce73a2157a8d104df4a9dd199d3c50cd91f25813536b4776630acb78596bd5a025976962c6d624df7594c32f2d9c1395", - "@esbuild/android-x64@npm:0.25.1": "92f1bec801b414ecdc4b73adfbb4482f4f2cfba423d33296914fa59ffdafb81facc445a7f65d1eea813c078220a0606f4be02252843bb9039ceb2755f643387c", - "@esbuild/darwin-arm64@npm:0.25.1": "9c4cd09c0bd8479e27e04e2397edccebae928184c463684490137d2b7ea3171051b66596db229af2ad3e6a911c1c8a9d10b8aed30d11d0aa155ac0d309fd5dd6", - "@esbuild/darwin-x64@npm:0.25.1": "31b64c02be9438e175e8b343c52e0bbc7964f08a1b44e0adbfa2a1b229ccd0ad0184cdb8313272b4590298833ea0b197d82a909466caffe90105f8acb30402d0", - "@esbuild/freebsd-arm64@npm:0.25.1": "e04018ffd760dd101a5931e0248751bdfca98e3f29be9b41051d55278907f52a3e5ab80c32168e208c2ff287510d6d5b765d3adc841bfd621af7930c10a547e6", - "@esbuild/freebsd-x64@npm:0.25.1": "438215bea2dc716d2c9ffe9b921bbde06e77d96ec0c837fd79f46bc6e195aa50e5f55490228f7433df7aa47810eec5c602a9d9cf956c1794778018632b196f34", - "@esbuild/linux-arm64@npm:0.25.1": "c839788b6db471f144bc2627a117083c9a50402c76cde2f0e5411faaeb3a5cde4972bb7336b87de67cd0a65d4d5b00759668407a03b5d4ed3130d4984837429a", - "@esbuild/linux-arm@npm:0.25.1": "ecf9fd9028d2166619b9a45161a987eebb6ef3dcb0159a2607ab164c58c26a15cf274e0b1088834c07ef9166349276d595fdad5c42bce8d03a55cb213d947efa", - "@esbuild/linux-ia32@npm:0.25.1": "36f208e10a4b778a28a9002338872e52d24dfc18e25d3b41dc53892279c3ee842d76c7b608a30620f128d85344acac0dc86f203f5de7082a21fa2e908c96b68c", - "@esbuild/linux-loong64@npm:0.25.1": "75d95e6ee995c9f2abb202ca430685e5d58fbe9b0b5b01a69b498c9b360d309026d15bae7831de9c0c4f02e45028a92ffb169117c3b56dd1ac7ea8c6ef50628d", - "@esbuild/linux-mips64el@npm:0.25.1": "7fc22eb8a7dc9ee743113cb327eef3591bced4753f416f8dd722794a198a053ab6e120b3b13c1bb6cc89cbd02ea502187b1a3c9ebe8187407665c78995153740", - "@esbuild/linux-ppc64@npm:0.25.1": "84f914a776774bf209c5f96a3708e52477e1966b689a880c0256530063bc581125b5cc04b9700f4aa892e7770ba47c5a950a4be9f1bb3ccbe60a500383602156", - "@esbuild/linux-riscv64@npm:0.25.1": "97f47cd5695686254b58f950ca973df1fcecfebf3bd585629121a65323ffaa7f95cf821392011ee069da492b46fdff771be332c699a438cf123351610e12d621", - "@esbuild/linux-s390x@npm:0.25.1": "10760a999d432d092a8ebe5f09752ee7e8ea77a1afa5f1adfe7f9ccb5bbf77d6e0da6dce5d1a4a7cd731d89b6075723c2bc0328f446ed129c4b63c6441ba22ae", - "@esbuild/linux-x64@npm:0.25.1": "4cdb1625726580eb42432878912d5480a0321559ef2c6425c1db55f89f3fe1c35fb03b3adec92c3f52a4db751d7535f23086b80ed7b219d1edbb254ffbe96e68", - "@esbuild/netbsd-arm64@npm:0.25.1": "f2427b094e072d2db7944b1d2a988dd9f17627976a395b941f225aec2d0565da2ea110a845eafae960af08e3eea74eb327e5eb9dbe06dc1e14f4439596c3b47c", - "@esbuild/netbsd-x64@npm:0.25.1": "c8347ecc18b175923a3cbdaef61b64815ffe0cf2cc285f4034337c2df83e78a118ebfdf2ac3a46a8d8a19ce6a0e0605d27d11570d1758ab90074c99047b82fc0", - "@esbuild/openbsd-arm64@npm:0.25.1": "719812786b4f3ab4471a306c930ab1bf31e9d92f933ea2a34566f07d6269df5058e7d48408127daa197e6fdb21e30697303127d259b76b18936d534619a3eb15", - "@esbuild/openbsd-x64@npm:0.25.1": "21590cbeda028e9b9f8131c54c36bab65a5d5bd5dd4e6bd9f80438045a655e9ac634bb3535a8650b694db267fe23bd2318a59cdec2fae1ba389ed1a00cc0bbe7", - "@esbuild/sunos-x64@npm:0.25.1": "e20ce3891d8717fe2cb885d92d16e9409802316eaa91071be5c7d75164d23dbc5a502be3691039051843d94192e8cf43ade61014a8bce298cfc13a8d3ddd85b0", - "@esbuild/win32-arm64@npm:0.25.1": "749a211eae6a47e5ceb71898df668d083bdec2ed762116fea7772824281f793aceb0487946e20ff604d7e102d1fc8538a73f15b476ca36e07f7ddfb601f6dfa1", - "@esbuild/win32-ia32@npm:0.25.1": "bb45fd889d858678ec68114bfc398965ed8d44e46a9517fcd9f7b397101c2cf94d78938a2640f6f2a1fe65de4ae8830fd426cd21a28302bb92333913b3c16c85", - "@esbuild/win32-x64@npm:0.25.1": "e33291b9834095e6460bd20bb15c49361758bf66d28ccffe0c06a1565211c91f668d9cfc0cbd5bd7a5def693fe7272dbe290b08d4eadba29e750c8a9c739f564", - "@rollup/rollup-android-arm-eabi@npm:4.34.8": "1d21d3ba13ed2cff8b4955b9d7c5fb91fa954be9cdd8f4e5bedc4e1d95733af3249bb7f3f000b9c69e89128a9439bb35990fd5c737372bc9b7fdbea906ac63dd", - "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419", - "@rollup/rollup-android-arm64@npm:4.34.8": "b3c44e5aaab2b429716d58b93353b0429a131a0b7e08ee39f25ceca1faf3cc453346c9cb91dd1cc278eb5621fb701da87608cc3ce323c24d5f3d191781694ec3", - "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc", - "@rollup/rollup-darwin-arm64@npm:4.34.8": "a117920a3f06b6fb3e57f3a240a38ea3184811f931105185942e1cb9865d609662e3849ee53bdf7265d4555b9c9d2b6723fb4c94a9b1e494b522253246767b72", - "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572", - "@rollup/rollup-darwin-x64@npm:4.34.8": "70862e22270122f61690fcf69f07a32f3cce9028c7c296cc6a37bd5ae2fe2e021cf86df877274acf07a927889faf3ffc8721871d749087ea86941853c66a1f27", - "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b", - "@rollup/rollup-freebsd-arm64@npm:4.34.8": "42e5a9a8fb20585ee5fc1a94f758fdfe4d1dde03a4f6476686b1a8835167e2e210192fb8ffd733dd12baaec928a3fc753bf05609798df99bb4d8b2f6ea44f997", - "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d", - "@rollup/rollup-freebsd-x64@npm:4.34.8": "984baffa0968907090146b0237697ee76b64eb18dbde512304e83d793030f2cec01bb08658ccb2e12ff6ecd88dccc4886acaaf8117345e564c9b7752c20a7d51", - "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "3a7fe8a7c80608ee54bc2c5b40424b15b0a3da8ec8201e3303f56bedbf3a34f8446b9968da849705373c02c3bd35c56ca22117c3549c8968b2cd1ad54f2d82ed", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1", - "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "27fbc7ec1a8ac9d44661d4024d704bc1af8c257bd454b3b56cbcf43afe60a617ac4dec50e6c5906a07945d2bed60c8d44b972aee9f53186b24b7df2b9c99e3f3", - "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c", - "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "7ce7073fa830540fc67616b44b3155bacfe84463268ba948aa68719a197684da4ef60882ac1623d168597c3178f936262386de67425c60d645bf66eabf743351", - "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c", - "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "1acb2a29e1a190c2df27c5e1a30424f22ca98dd5c4e12c2103e2810659c95b8e027b5b34dd0127e55b8c818bb28c49dfc9fe6586c508f85b98350ded6bb60717", - "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "50c416ca41ed0df3d54ccf11c7e5487c64f9e2fee97deb21741086c61a99007ee3dc011d34a6261a3d32cff3f46483bce930ae92e96d54abe607576095bc3906", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "b80e0473848b7d26ab845368e75fd834f71fe6b03f1753450a9c521fe99024a5caa40a85ce8bce1bce079971b31dc2266c718e05ff950143f98a3310944863f4", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab", - "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "1efd1e6142b2bbaa986f5c9edc1caee98f3fbd18160da02fd6c05b324b683eec0d8a9b0d4525b67de70873375988d1a4986dfdaf94ec847d9f30a82e5bac1bcd", - "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e", - "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6", - "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "d536c327ad26cf9ad586ad68e146f4cbd64b6bb1daf146f8124f6257f70f42e1d05e37afab902f97049cf8d0b7e60458480a8cf2e49379f1efa1568ac13f6107", - "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4", - "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "9c8e0c8ae968e8400641d782d7cb0b9b06cdec0c0a366c20259e49da0984ffea2a6af15de3e1fdfc92c1906a97044ea676195b945750848c8ddf34abf675eebf", - "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a", - "@rollup/rollup-linux-x64-musl@npm:4.34.8": "994b3a904c79fa72a3c331c983c27296ebb302b08f6c624ecbbf91cfa136f03cbdad4be904fd1a80b44d521e49399aff6e7902b594146a8c73cb6d1ad13dce08", - "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db", - "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5d09e6b59d1b08bb85922170aad0b8ada8bff7a5d63bed3b1ba49d4bbe32fd2557527d85c1bb97bf8d7f20778c2266b35c86bb4b0c035835099a3f6b222bc26c", - "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d", - "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "d4817c6e0744f2a53c24ea6855ed061fb03437fa0187f86363768d0edffc7e1bd281f9003e684779ac5662627daab1f2816084a257a13ade5bc0fd7e63912d94", - "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5", - "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "47679da18b7676a91d123a73298047fca019b4a9dfc4e026c43ba0dfea763ed972a9ce0cd46766317af45ef4d2a09cccc6284c4226a006b05d2e6fb712dad29c", - "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28", - "@swc/core-darwin-arm64@npm:1.6.13": "b55457da071a6368d270fe89d26ad00f14bf8400cf99517c62869b185afd128f9b0123524a0e7ce4397f21449b2b86ab82080c1cb351d1e461f8596bcfedf4b2", - "@swc/core-darwin-x64@npm:1.6.13": "c14d0ca32797bfbecd8ad74684201c1d88b82ac05d7177ad4c7f6fab767148a25e163fba36513f1964805a3b7b58582f2a37cb3b1f1cc18e1c4a9ed4a49ce62a", - "@swc/core-linux-arm-gnueabihf@npm:1.6.13": "b261eb4ced147281393676c7f9ce34b2134a3c2ebcd9a0a05886d116b6eac4c7f4edcfe5d9fcbcc811a8fe15817de1327cda95abe55cbe861e2fab876e4c162d", - "@swc/core-linux-arm64-gnu@npm:1.6.13": "179f4cea2add5ffb4f36cf737ebc4703ab206036e6c9ca3a8df0d91df4c5834e498cba93b24f4eb10a9bec854bcd66f31ec54b79dd25679d00daa36ba352862d", - "@swc/core-linux-arm64-musl@npm:1.6.13": "7a7c77769d06ccc02d2c20190c63adab443241f99b09139818698d4f7841d9a30545f88884027bf8037507a7a6b19fc28708f44989953b89908ff78693fc54b6", - "@swc/core-linux-x64-gnu@npm:1.6.13": "14e1c47f987ab50e67297be4b6c6b2c9186c7947b64c2c14d6077a0f196a684a7d992a79c40a30abdee0d4a1aec53c0506afbf0f1974dfe7520a058b5217daed", - "@swc/core-linux-x64-musl@npm:1.6.13": "00d5da501ce964666ba42d770c5d2a43532baaf3a9844c7cb76790ed475e3d80377528cced0b7f745da0c0fe2b20000b3a223cf792595f266405dadc66b25874", - "@swc/core-win32-arm64-msvc@npm:1.6.13": "84453749f42a0f4b3f3a8938da3be7a98091331647432117fc7511cb32a68d331ff2cb8bb10faa72cb5093ccded1dfa578a7609addbcfe359ad4643660502b62", - "@swc/core-win32-ia32-msvc@npm:1.6.13": "f674cb40b25b6a42214c666f512c7a0e94cbe99f3ea36d70ec83bd7888f6f2a97b7dff99c873a5707a8957704d40348f4493d3a75c3fd8eacc7a98027c51fcb6", - "@swc/core-win32-x64-msvc@npm:1.6.13": "44ba6fba5171022243faa4f908041f8d0d1d75d9f9bba9fc8139440ea9e3f6992973c50aa38a27a8e34df48e7fa95dff3818eb9b73cbcd5d82ae981cc334a6f3" + "@esbuild/aix-ppc64@npm:0.27.2": "78d13201fd4d048d19955fc510db508b14b5fc1a38f4ea506469eac65db770c65fc3727df15b087778178fc8e3304df88559a7441d227451efd8a0b1a688a729", + "@esbuild/android-arm64@npm:0.27.2": "e8aded79b2f1f8841c082396f7476bee51c056ed468e438fe2ee00b6b73e96acd640d0b8d0cc13e63c972898f6cdd275483c36c562d4186f0efc01881672b08a", + "@esbuild/android-arm@npm:0.27.2": "ac673502cf6672dabb4b82a26bb3cc120402acba1b87a92481c0a37c8fa06847fd16503714bb227f6351d836f6f60c644ab50fda95c896d8eeb3e5ec3af96226", + "@esbuild/android-x64@npm:0.27.2": "dcf5c84443645af089e3b82421097c0288a4bdebabf231449ddd66e1b48952e5af975bd26954a50be0441605b91cfe779ca2192bc4b02b7b19192a2a86f912f1", + "@esbuild/darwin-arm64@npm:0.27.2": "cf08b03672941acbea8b509db79a7cb9cf8c81b563c75414c87b8c8442cb1178063eaa14b7cd1ae6cae95dba7e1de9343b721a6d19523a5f21c3d1367e3688b7", + "@esbuild/darwin-x64@npm:0.27.2": "5d3207cf85674b01a817c43064525e39b215802a9ecf352d15e92e926c3e549d95b30e127c2d3f8196ac9472ecca87a861d9f270221ee55884c7a6d0aa636fe1", + "@esbuild/freebsd-arm64@npm:0.27.2": "45f475fc6ab2f4760155ca2b50c4cf0ea8aef2bfad3ba4548f4547898d3cc785dcfc2ea58a190be3c20c715c771d1d694a9eb6ef5fb6b72d93b6abc94f366b98", + "@esbuild/freebsd-x64@npm:0.27.2": "7fb62475cb9cdf54d22f2fa984ef57f891d05f366143227efd1d28d507a3b1f2c723239b3e22b3ac418467e6284a08eaf6dcf0bfd2a0f1bea06d0ac73c2aa8de", + "@esbuild/linux-arm64@npm:0.27.2": "89b8e94e2f4e7cf564623bb6b1d2e9ab218c6d4cafed93778fb797b552d3495f08c99e49d9a2573823bc62660353ce4b4cf17a2828359a3437a9caf8da99673b", + "@esbuild/linux-arm@npm:0.27.2": "fd7c845a5ee2073ef6c5bc9d914844b48b82006ebf00f5acb98a43f600ee83fda578034ed8eb6f7f462ed4e3ecd8b7c6570a78bb708ee7eb10b93751ab879ad6", + "@esbuild/linux-ia32@npm:0.27.2": "23f67cfbab67aa860d7afa842e29fa75eb16af8577a811c54263fc3a276c05e468d532bcdb118d174624ed76a9e133d2520567937d4ed646caf9dd19aadbae15", + "@esbuild/linux-loong64@npm:0.27.2": "b37e531c91346c7b5d31ce6664a334c391a27c3c9fb282136abf232111575387e9d066abf27f29436afc913270a8e2c2b09c1210fbf87e70f1028685d94ec4de", + "@esbuild/linux-mips64el@npm:0.27.2": "8b48a6c7dc8f16147c1087b56710685f3b89279498caab6b63cad3db9402308adf633111d773cfe31756d41fe46e895f2c1ece0fc1ed484ab02e92c28357f0c6", + "@esbuild/linux-ppc64@npm:0.27.2": "4f207f87bfc1253974e00d3cf27316d3e93b7e51fde46ed618367e62f2875dffd66812acb85e8d2949dffc73eed7b3939a42bb93f40ec8fca4a6988173709dab", + "@esbuild/linux-riscv64@npm:0.27.2": "837a0aa03e82a1b853632d153515d68035e57b39ccf730a778311c04e3429aa80f001d990392519a641945501f6ab3af331481eb4551e99718e7cd2ba5862089", + "@esbuild/linux-s390x@npm:0.27.2": "426a4b9d9d4c58d61031a412c64c8cfb0db0e38da3cf4dade253c45a46dc539dccee24700e965e66c7c397a65fef765fc43bdc6b3f46d6bc6f289f79c4b6d7d5", + "@esbuild/linux-x64@npm:0.27.2": "febde9f6908220698cf72947534eca590c2b5ce8b0c9bc6170649c5f64f7f93808bb9be2caabd7c63068dc68e218741f27a17ffb8826d87fb487a0639888b90f", + "@esbuild/netbsd-arm64@npm:0.27.2": "1f69c833bfc5d1d7c58f52fca35637df1686a5bff5c15af900c165b2561a809d805201dc8de712fa73c69205e96a078096cd00b00e9ca8fb5cd8741e4ec943b8", + "@esbuild/netbsd-x64@npm:0.27.2": "29c9cbd018788521145d719013020dfbf744185eaeaff845f0fc925c67630c66743b03486a2531493f79482d2315e910a27a31f89a791e0a9589e04d86d295d7", + "@esbuild/openbsd-arm64@npm:0.27.2": "dccfe8ca6c0d648a26a626b5a4caf3325fed90d7ae343db2a86be9af2479391518c02d54470c2690aec23af1359debe7fbf125d979b5ea891a63fe4b206c2d6f", + "@esbuild/openbsd-x64@npm:0.27.2": "0bc581af266608ba01c530ec1fe2b475630dbd56538562f8b1748f7044727bd08d0784afa9aee8aa0a2afe843bb0b47572b4c6babb2a9953808d37263d730be1", + "@esbuild/openharmony-arm64@npm:0.27.2": "1f04a6d690bd2ef231801b0c46b40359b4d4451409cf46a865613f3942835e7633286c328c31f3a10065491f314e6c7c47d7a8f79c1a1ec25f59ff46f5765c6f", + "@esbuild/sunos-x64@npm:0.27.2": "9543db0acc86a762f9fd708a3226ebc45a1625885532d153928b9d2b0de90b6d78db0f9b77261d345b95c1ba7282ff3ab0fa37932c2dcd9b1c2b7da7cf39cd76", + "@esbuild/win32-arm64@npm:0.27.2": "2bfe0fef3ace4a5b0f7647168ae21eda9344a8bef4924d60d1ca781b59eb1f7fef0858aef6e2fb8c185638117bfb7dc18c55a700db57799955c8f655eaaf1f44", + "@esbuild/win32-ia32@npm:0.27.2": "c510d04bc11f11b7bd6bbf0ea28e2ba484e6232b7655b5cc8ccf8276ef7da760d54a79eaef87a1a40a81632a5ec4a9f7bb08f63920e5d145c8a893ae76d93094", + "@esbuild/win32-x64@npm:0.27.2": "d11933a70f9c908e3cd7202071dc23a9dea8afa58a4c2e22a3beab3516d0898345a5ebb2af47ffb2cc7f5d2a6d788ed4681fa7f37e121f1605149f124d632c67", + "@rollup/rollup-android-arm-eabi@npm:4.55.1": "7977b28d6cca8d7640db7ecc4f76fc6e39c7fa6db24a3edeb912a5a3406115ecc9d70c44c46afc51d1b335303f83a76bf1d23ea3eb54e0b41d5c3044d26fe2e2", + "@rollup/rollup-android-arm64@npm:4.55.1": "750b5c706ccf65a4c901f699391e4b825c5bf8c42360c30ad070c63a6e0f29f323dd73d1a378143ef2848a9ce0ac2320aeb85368eb32565326b49b3300b49858", + "@rollup/rollup-darwin-arm64@npm:4.55.1": "fa5637e268297d44ba608a501a4ef94d6daf83c1c9dec25301b94eb7e3f37696b52be6b9281672d652eedcd24c4e8c395176c4503a94691b982437422bec08aa", + "@rollup/rollup-darwin-x64@npm:4.55.1": "e03540b0ec238fbad6688a1d257ec6e96dbdebfac00920f0ff11b883aa911f9c4fcbfb8a79796eb216c6ebb2f045fd9a417b477a42945ea851d17dc29011360d", + "@rollup/rollup-freebsd-arm64@npm:4.55.1": "61391fb23925c9019beb6e608917a29aea2de80a1fefc874f3df4817c1e4ff4449bc285a71bd00554e295b64303ba9a1ba153962f6fc2bef9b40578a1efdb6bd", + "@rollup/rollup-freebsd-x64@npm:4.55.1": "e5f8c19fb43a252b01ce84a6fcba591213078672720c553a980a88b0005de17322ee713a20095e2c7a2e92feda7177bfb4d2d56cf4cc84cd3763d3bde86676f9", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.55.1": "009639b83c1ef9a9e7d446fb937d92f1ff429ef95c60b9cfbbe8af82ea1bab4efb509e6e5a0df3a2dd5e90ebc33dfccb391152ba5272fcd311bcc7e921a72cdd", + "@rollup/rollup-linux-arm-musleabihf@npm:4.55.1": "0f08bebd570ef1239f204d5e577be401aa6a1d71f947fb73116e1af5b12e7ef67f5ef8893ed604a058e065a3cddc7a632bf78a28a78c8d6694793be1075cfc65", + "@rollup/rollup-linux-arm64-gnu@npm:4.55.1": "a9cfb414e6d54e67958650740c1205780be0054a7ee4c507d320c1180ff3c78e67f4243eca59c5e3cd6126ad4310ff1b9e886c42464673c68a5522e8789eaa6f", + "@rollup/rollup-linux-arm64-musl@npm:4.55.1": "93dfed6c7899266c0bd31c93aff6b3ae1cb457725fdbeafa3f25512d2152f656cab34fe85212546acd772e6e064ace886263dd8038f06bbe73abad92bb7675ac", + "@rollup/rollup-linux-loong64-gnu@npm:4.55.1": "d132d1964b3bccb79dc8d50e4e1ed1950ebf5832458c2eded1c8012bd8704ba022c17ce177be0245cc80291db9e7a4cd67de0aeb3187f97b135421f0019c8e74", + "@rollup/rollup-linux-loong64-musl@npm:4.55.1": "23f3ff2f51344f7ee00faea8c79d640ee1ce72bf051497f5b0b573daf4c81a84f78deb31fc5d4cc9a78cdbaafda4012217b3d19f261841e638b8620587449808", + "@rollup/rollup-linux-ppc64-gnu@npm:4.55.1": "ad2e4d1a2c21cb807b6d5061f653256b26d16f039846358ea40ade27921883e2bf180b8293cc0d19a625834938b411bed54b6bc791dff647d198dd482aab0ce7", + "@rollup/rollup-linux-ppc64-musl@npm:4.55.1": "6c35161babfae55d63caa2ffe34985faa891c8c3e39259ecc67bf9815759ed11a6291935a5796323b954e6d7ca310d9097f66750637f42a895a68290ddb627d8", + "@rollup/rollup-linux-riscv64-gnu@npm:4.55.1": "bc336ba42aa462bd53b63bf57d8625555e407b99e1b863696aa25b5bf92bece017407603f04b28f208bd9ce4661c34d5d933a1fa7799a47ec4fce73c5b473078", + "@rollup/rollup-linux-riscv64-musl@npm:4.55.1": "c097771148f27cab22246748f736d1c9fe9dcf07a57e74d96da42cef9fc2a15188dad115565abbb3ecefbfcb101ecb270e1c6641fdf5329bfd6433574e56224b", + "@rollup/rollup-linux-s390x-gnu@npm:4.55.1": "6ac4638983d52ac6c2983f06d0c4315c0040ed724bcc6e13443d904363bbf1c2af02888f09d4d9f874a2aaece127fe863e697347c862b78be77c9c2f7d426e3c", + "@rollup/rollup-linux-x64-gnu@npm:4.55.1": "2d673e4dcb64844c280888485857c4f4ac782e1cf34cae2cdda29418fa2a6c2cc94222affa28443450a7b53c7194294d4e93af04db51bed7555b55c7503ef3cf", + "@rollup/rollup-linux-x64-musl@npm:4.55.1": "167444a5a61f85dcaadc10a352aaee070b9c83f3f6fc5474f131aa4e16b82c091a1b6275ca6123ff1601ac8fa758f99fbdff40dafda4ebca773e9f511a86787f", + "@rollup/rollup-openbsd-x64@npm:4.55.1": "ded152f0b1072382782d242305f33a26c645bf5b88fdc76dbaf9d04ab9be7209ca9a6f323fe521c87dee6be677ebb917e1ea7963664d20d3479dc0e29ea48ea0", + "@rollup/rollup-openharmony-arm64@npm:4.55.1": "d8e3e5bd8534f47551429aa6fd5bd3d1ff6ffb5d2ffa763f1226abb9a27099236559029ac6069b9379e4aa5d4944a163283abd77bffdae4afe3c7b479143e148", + "@rollup/rollup-win32-arm64-msvc@npm:4.55.1": "228e53886de21e1becd3971e707182b59e856809ca76f1f94e91bd1aa9e215cd71b7dc911d63557c41dec196a25fbda708a56ce17e5f033c66db7314239ebf62", + "@rollup/rollup-win32-ia32-msvc@npm:4.55.1": "aa171c828035fec86fb8f86f1e41398f4fcfbd1aee7d9e0a9639dd7c410b19bb5faae65867873b15204efc41178f5ab49f54ec48a4519f659ad834adad93c6aa", + "@rollup/rollup-win32-x64-gnu@npm:4.55.1": "1c257f36ba62999b9f39af1e97f6175270563b0b0db404c1a897aa28733493f8b54014a997842e5f992639385897c7f59a3648512814858894f8a7498bfa27cc", + "@rollup/rollup-win32-x64-msvc@npm:4.55.1": "9b87a9a0b31a8b6a9bac8c30747026dfd8838b3e8bb3424cd9b5ce61ba9837b46016d7044e94eecf0ee1aee787a00df5e5332f0f685a2e6c67ee20a2a5dfdcde", + "@swc/core-darwin-arm64@npm:1.15.8": "dfe49cf074f8c461fb9ef34daac4e598a60e66e4bd36a18788b424e4c0051ff6ff9087c370be6dc568b859efba9bfff94a10b7f20d3489f2114e6b340281528e", + "@swc/core-darwin-x64@npm:1.15.8": "d24d0c971e07a358f2d73274c98c2b9193f94640d6efc1aed7dd338d857b354fcaee516fa4f9150fbc7d0604da2680f6eb0c45293a2c33204594681d28c0c001", + "@swc/core-linux-arm-gnueabihf@npm:1.15.8": "eb8f889542cd15428d867de0124f16154c9ab9777052969bf3400f45b130f4db1e3401f0d56d760d4b532a01048c6d7756b03fc5509053c86eeee5b84487eb0f", + "@swc/core-linux-arm64-gnu@npm:1.15.8": "f4c7f81fbb67455b6274ff961482bf2b6d1c801c71c2a028029fc9d498a9787ac8ec901a7893da016ea4b634d661b6dd67772bdc11394ed63357df1bc21010a7", + "@swc/core-linux-arm64-musl@npm:1.15.8": "e126e8097c66fd930491a7013dcf781665513db2b4f8e641c1da8ba53550cd3b72586600a8c90530dc5f1ce2766ac58943e835fe96f8217ebfae0d2e14bd4924", + "@swc/core-linux-x64-gnu@npm:1.15.8": "0390b929d8ec4118d793e43023c9c5959ee5144ddf1d97d0844be2facceefb64decfcb0a19333f0a0b91a3decacde00427ffc58b53f0cb657083d7e927d88c3b", + "@swc/core-linux-x64-musl@npm:1.15.8": "acbb5e303556e7e1ef3fc03833cb13a1820dd4549688a058a277337ac8003b4a02a727495faa614fbcfd7d58975fc13389987508729a67d9c752aff39868d81b", + "@swc/core-win32-arm64-msvc@npm:1.15.8": "b6207c4b591d23111589350bb793823e1d3fb68167e4597aa3862b5c8312d7956b842674231092d4b1cd1f211876850b1970139f57533b9c77f3f5fe09e6a0e2", + "@swc/core-win32-ia32-msvc@npm:1.15.8": "9c9975b94c46be4d27030d91556e0099b7951c2787f512fcbcbbd5b7b36669760c52739b86b2d131512c3af076013e50314a734175ee50a86659dbeb0b4d1522", + "@swc/core-win32-x64-msvc@npm:1.15.8": "70987952c6ae2a1391cd45a0d75aea2f59c31a5fa11024a783879c18e56ea916f0d7ad431d2c02b33abd3ab8a3a9e4a74a4099f0d55d6e5c9b7bdb27e80e6e9c" } diff --git a/pkgs/development/python-modules/locust/webui.nix b/pkgs/development/python-modules/locust/webui.nix index 8905429828ef..176eb2b57e45 100644 --- a/pkgs/development/python-modules/locust/webui.nix +++ b/pkgs/development/python-modules/locust/webui.nix @@ -13,10 +13,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "locust-ui"; inherit version src; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/locustio/locust/blob/master/locust/webui/package.json#L89 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-dxt7rRA6kh0msjy3DAUvtj7LoE7vEaf4pmP2B95HoeY="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-4iRQYw1MrIoY0h939h86F2AROKxpfIXSqr/m0IYS3Jg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/locust/yarn-4.14-support.patch b/pkgs/development/python-modules/locust/yarn-4.14-support.patch new file mode 100644 index 000000000000..c9aaabe0983b --- /dev/null +++ b/pkgs/development/python-modules/locust/yarn-4.14-support.patch @@ -0,0 +1,22 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,3 +1,6 @@ + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.12.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix index 12de281f9a14..b1c677511de1 100644 --- a/pkgs/development/python-modules/lxml-html-clean/default.nix +++ b/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lxml-html-clean"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; src = fetchFromGitHub { owner = "fedora-python"; repo = "lxml_html_clean"; tag = version; - hash = "sha256-pMZgECts7QqddI76EHnEDhQ0IoR/yioQXTqcg1npCOA="; + hash = "sha256-mToWK2Cc2cfBmEqcL5z61WydQUb78TWZDGGLR9kNliA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index bb7e36e65961..027768672711 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -25,6 +25,7 @@ watchdog, xattr, pytestCheckHook, + gitUpdater, nixosTests, }: @@ -117,7 +118,13 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "maestral" ]; - passthru.tests.maestral = nixosTests.maestral; + passthru = { + updateScript = gitUpdater { + ignoredVersions = "dev"; + rev-prefix = "v"; + }; + tests.maestral = nixosTests.maestral; + }; meta = { description = "Open-source Dropbox client for macOS and Linux"; diff --git a/pkgs/development/python-modules/mlx-vlm/default.nix b/pkgs/development/python-modules/mlx-vlm/default.nix index 8625d04c1970..7c97f38f7267 100644 --- a/pkgs/development/python-modules/mlx-vlm/default.nix +++ b/pkgs/development/python-modules/mlx-vlm/default.nix @@ -76,6 +76,9 @@ buildPythonPackage (finalAttrs: { "test_glm4v" "test_glm4v_moe" "test_kimi_vl" + + # flaky: statistical bias tolerance occasionally exceeded + "test_turboquant_prod_is_nearly_unbiased_across_seeds" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index a4076d57c0cd..892f0726382c 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook pyvirtualdisplay ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index fc909401f76e..9c9fcda393c0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -443,8 +443,8 @@ in "sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.43.3" - "sha256-GLcwrqtumSe73lggUbs4xR9Bmo9L2bscOsDtVT+2Jgg="; + buildMypyBoto3Package "ec2" "1.43.6" + "sha256-zYVu5tdGQ2oJjCZ//8x+DZowC/rdpvw7vpQiZixpevU="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.43.0" @@ -571,8 +571,8 @@ in "sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.43.0" - "sha256-37wgxUoswgRZGpTYplXtIjyBEwO57aEzlcTOwg8g/pg="; + buildMypyBoto3Package "glue" "1.43.5" + "sha256-oUIJxMN+MuPsZoXzU1unTvupMyddoWCu6l/w/zSLx7Y="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.43.0" "sha256-ciXs8g462XTc+GTyxuGDDEsoR9DMD+bOdSUFe0OLshM="; @@ -590,8 +590,8 @@ in "sha256-nTKK7qqa2apyNM4/U2AphLGvoSqemVKfpAciilJ0pRE="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.43.0" - "sha256-xLN9980fWNie8P+lPG7rKbvIH3qsuioPnnwcB/HDnlc="; + buildMypyBoto3Package "guardduty" "1.43.6" + "sha256-G0b+n8/YssnJeC5vdQSf2wNYlYNXhZYWnNzDw6wjgc8="; mypy-boto3-health = buildMypyBoto3Package "health" "1.43.0" @@ -610,8 +610,8 @@ in "sha256-9lzXp7Ug90MSZ7WdMiXoMnUiaAA9zCk/oS6gc0ulEMo="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.43.0" - "sha256-HHmkU/o6zilpJMmpvE6hWmHw9hf2dJFFctNUjsjbGcA="; + buildMypyBoto3Package "imagebuilder" "1.43.5" + "sha256-fUllCFmyql6wfc5TijqwDavHvL8BDxprU0Yq+MG2nmY="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.43.0" @@ -778,8 +778,8 @@ in "sha256-1kE3yNQBw8a1bYq3xMfAEfqW2p4FduGQ/uAJjI81xds="; mypy-boto3-lexv2-models = - buildMypyBoto3Package "lexv2-models" "1.43.0" - "sha256-oCXwBVVHNBIlBTn99cxrpkj/nUWNk4NReXsLKRvlwRo="; + buildMypyBoto3Package "lexv2-models" "1.43.5" + "sha256-CMdW9o3nNWkgsvP0lB9cBlpx8li5Tl9pZv0grrMLPus="; mypy-boto3-lexv2-runtime = buildMypyBoto3Package "lexv2-runtime" "1.43.0" @@ -934,8 +934,8 @@ in "sha256-Igsngmg9PeJcyqX/Ih+fgzUuBotaf+2UWHK9RKEePL4="; mypy-boto3-mwaa = - buildMypyBoto3Package "mwaa" "1.43.0" - "sha256-w9AGeJrbRrTD31ANqKy6+MIQKenn05akYLfsXfnOw+w="; + buildMypyBoto3Package "mwaa" "1.43.5" + "sha256-TKqSy42P9Pmd9jbfsUadZT2qn4SRE8PPbad4gbUHUo0="; mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.43.0" @@ -1150,16 +1150,16 @@ in "sha256-F1xhitFa4Eac9VlCpfqjCObUH+YvLz7TYDYfI/bPYbc="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.43.0" - "sha256-z7x9WVUzjzg5bSL7cizhgvMgnmQJ68Fhu+d46XIOpDI="; + buildMypyBoto3Package "route53resolver" "1.43.6" + "sha256-/KAlBKNGLO+PLapddz4kSW3ymsGc7Bf/tlhiIV/K9Bs="; mypy-boto3-rum = buildMypyBoto3Package "rum" "1.43.0" "sha256-8or7NMBfeq9jZRzAu0Q1ShoTXTm8GCXR4kov0kaJCcE="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.43.0" - "sha256-O/sCex89+TFv9y/yn0stwNfWXtUDLYvPSJIiKZQihYg="; + buildMypyBoto3Package "s3" "1.43.5" + "sha256-umfbw9qCW2gYg52zgjci87EjBN0RbpTtOY63rehrD2I="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.43.0" @@ -1170,8 +1170,8 @@ in "sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.43.4" - "sha256-7ecv9s2OC88pdn9P4aPArynGQi3VG1CA6FhQcEXN3fo="; + buildMypyBoto3Package "sagemaker" "1.43.5" + "sha256-LQNQUR4kO95oyTH8xZDkZwj3gIaF+rHdR5VbtkXeaT4="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0" @@ -1218,8 +1218,8 @@ in "sha256-Jl7i/d+dPkKuOWhWJft4YaU5EQ2OMkNyhHwOHL1mayA="; mypy-boto3-securityhub = - buildMypyBoto3Package "securityhub" "1.43.0" - "sha256-puy9WXT8LIhXkXQVCabuo9luvtTw59Jj/yz3UmOGJZ0="; + buildMypyBoto3Package "securityhub" "1.43.5" + "sha256-EHkWYodnoUT01mfovLF/+wA4IFy1Sn+H1f4vAitEMJE="; mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.43.0" diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 42d490b6acbd..ae9ed1ea77a8 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchFromGitLab { @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; tag = version; - hash = "sha256-eQYGOLV9P7zrqXB8dW8/CatBUT3xpl5h1TChKbY369g="; + hash = "sha256-OtJzCcaqcy2a46iNRcpknORgdTbzMtILocs5c6Akzrc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix index 9e944b00c189..9c9ed79f7e51 100644 --- a/pkgs/development/python-modules/netbox-dns/default.nix +++ b/pkgs/development/python-modules/netbox-dns/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "netbox-plugin-dns"; - version = "1.5.7"; + version = "1.5.8"; pyproject = true; src = fetchFromGitHub { owner = "peteeckel"; repo = "netbox-plugin-dns"; tag = version; - hash = "sha256-0H6ZFyPAoX7PuXQg95Y8uAVRnwZmLUVGe7W6ONVHJ/M="; + hash = "sha256-IV7/YQ/IhoKH9JJU4eZwmSrj3zB9nRcqko8HA1gtMgg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/development/python-modules/netbox-routing/default.nix index 124dcb064116..f77ef60c6fd5 100644 --- a/pkgs/development/python-modules/netbox-routing/default.nix +++ b/pkgs/development/python-modules/netbox-routing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "netbox-routing"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "DanSheps"; repo = "netbox-routing"; tag = "v${version}"; - hash = "sha256-POnxnLES4Jub4u8pvpehMo0KfOCyAPGH83cRFRPgfOc="; + hash = "sha256-3biANhaAi3uRtaXnAw4i6nWnHkARkkBVqyBHLXIMOdA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index a8a8fa50a527..ac0202f81146 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "nomadnet"; - version = "0.9.11"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "NomadNet"; tag = finalAttrs.version; - hash = "sha256-vIV3FEvwqd2je/DzGWeshEx5Tb+DhOQIg7l0LbffEwY="; + hash = "sha256-uNchcz9kiLX2nUNRC2rTMv7my+19ylZrHTGWbonziFc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index 1f076964712a..0d243825fe84 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -14,6 +14,7 @@ arviz, obstore, pandas, + platformdirs, pyarrow, xarray, zarr, @@ -34,7 +35,7 @@ buildPythonPackage (finalAttrs: { pname = "nutpie"; - version = "0.16.8"; + version = "0.16.9"; pyproject = true; __structuredAttrs = true; @@ -42,12 +43,12 @@ buildPythonPackage (finalAttrs: { owner = "pymc-devs"; repo = "nutpie"; tag = "v${finalAttrs.version}"; - hash = "sha256-OW638p0mUlzv9SSVwhixozFguh31fvc1FxIYsOJD1SI="; + hash = "sha256-2SQrdjQil5fNDzlM+2LgBKaOL5wPP5mB89ofBu4XawI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-4ENBTEBRpSDC6G0vDHx0BO8Kc4KOwnPBXAggSNBQ4tY="; + hash = "sha256-sUq86CxrCgLAeBspWvTIfHYW6MDOtVoTLdBbCu/Ulj8="; }; build-system = [ @@ -77,6 +78,7 @@ buildPythonPackage (finalAttrs: { numba jax jaxlib + platformdirs pymc pytest-timeout pytestCheckHook @@ -84,11 +86,7 @@ buildPythonPackage (finalAttrs: { writableTmpDirAsHomeHook ]; - disabledTests = [ - # ValueError: Variable name 'a/b' cannot contain '/'. - "test_non_identifier_names" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # flaky (assert np.float64(0.0017554642626285276) > 0.01) "test_normalizing_flow" ]; diff --git a/pkgs/development/python-modules/onnxslim/default.nix b/pkgs/development/python-modules/onnxslim/default.nix index 89ec78ae33b2..a73c0f7c833e 100644 --- a/pkgs/development/python-modules/onnxslim/default.nix +++ b/pkgs/development/python-modules/onnxslim/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "onnxslim"; - version = "0.1.82"; + version = "0.1.92"; pyproject = true; src = fetchFromGitHub { owner = "inisis"; repo = "OnnxSlim"; tag = "v${finalAttrs.version}"; - hash = "sha256-hrrCodLaHVo/YRq0HczxogcZQSwZKxZthyLYxz/+XJ0="; + hash = "sha256-8X9SYxSDs6j6PaT364WVVPgEcxzyvEBnpE+1gVe0UIE="; }; build-system = [ diff --git a/pkgs/development/python-modules/pdf-oxide/default.nix b/pkgs/development/python-modules/pdf-oxide/default.nix index 311109fbbe58..c625789e3069 100644 --- a/pkgs/development/python-modules/pdf-oxide/default.nix +++ b/pkgs/development/python-modules/pdf-oxide/default.nix @@ -1,7 +1,5 @@ { - lib, pkgs, - fetchFromGitHub, buildPythonPackage, # build-system @@ -22,6 +20,7 @@ buildPythonPackage (finalAttrs: { ; pyproject = true; + __structuredAttrs = true; nativeBuildInputs = with rustPlatform; [ cargoSetupHook @@ -36,10 +35,15 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; - pythonImportsCheck = [ - "pdf_oxide" + disabledTests = [ + # AssertionError: assert (False or False or False) + "test_version_is_038_or_newer" + #401: two-font encrypted PDF (19203 B) is too small + "test_issue_401_two_embedded_fonts_save_encrypted" ]; + pythonImportsCheck = [ "pdf_oxide" ]; + meta = pkgs.pdf-oxide.meta // { description = "Python bindings for the pdf_oxide library"; }; diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix index 8b9b88b5fe0a..e8b4390fcdb2 100644 --- a/pkgs/development/python-modules/pdf2docx/default.nix +++ b/pkgs/development/python-modules/pdf2docx/default.nix @@ -15,7 +15,7 @@ setuptools, }: let - version = "0.5.12"; + version = "0.5.13"; in buildPythonPackage { pname = "pdf2docx"; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "ArtifexSoftware"; repo = "pdf2docx"; tag = "v${version}"; - hash = "sha256-fn5MnuLCmqjl99Xvs9THwerkIyUeXwPQmn+znvWtgUE="; + hash = "sha256-GZ7aUTSGSly21lMiUOXc6Y8h9WY2zQQxF5M11PwTtCA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 5091c8781993..21cf180d555c 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -14,14 +14,14 @@ webtest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pecan"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-feFb9KJgDcWEvtDyVDHf7WvyCnpbyTWkjSzlAGMzmBU="; + inherit (finalAttrs) pname version; + hash = "sha256-L5+86obo2/Gi0olUIlVHY0oonbcgHndkUWpdzobBFt4="; }; build-system = [ setuptools ]; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "WSGI object-dispatching web framework"; homepage = "https://www.pecanpy.org/"; - changelog = "https://github.com/pecan/pecan/releases/tag/${version}"; + changelog = "https://github.com/pecan/pecan/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ applePrincess ]; }; -} +}) diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index 295c936b3d5f..cd30e613f033 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -28,7 +28,7 @@ }: buildPythonPackage (finalAttrs: { pname = "pgmpy"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index b178b881c0c1..1f3fd633936f 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -24,14 +25,15 @@ buildPythonPackage (finalAttrs: { pname = "phonopy"; - version = "3.4.0"; + version = "3.5.1"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "phonopy"; repo = "phonopy"; tag = "v${finalAttrs.version}"; - hash = "sha256-pCBCZzVSthExY6NhmQKyGj7aFgvHLyztUToYGL4Y3Jo="; + hash = "sha256-P5anv0bg+L5dUdmZBECPNLa1AzjB782s8IfZCun7pN4="; }; postPatch = '' @@ -61,6 +63,11 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytestCheckHook ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + MPLBACKEND = "Agg"; + }; + # prevent pytest from importing local directory preCheck = '' rm -r phonopy diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index e71dd2b293d5..eea442596817 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; tag = "v${version}"; - hash = "sha256-szpS6sl/Wj8nBZ2cYUt3r+8TvZKaB0DngGjjyG3kYrg="; + hash = "sha256-+SlDxNCbuqPqjgJx62snInsWQXWQwnO/sI4mll0Uu4Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/piper-phonemize/default.nix b/pkgs/development/python-modules/piper-phonemize/default.nix index f3a9e40531ae..2c9e443d1400 100644 --- a/pkgs/development/python-modules/piper-phonemize/default.nix +++ b/pkgs/development/python-modules/piper-phonemize/default.nix @@ -31,6 +31,8 @@ buildPythonPackage { doCheck = false; meta = { + # dylib import fails with no LC_RPATH's found + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86; description = "Phonemization libary used by Piper text to speech system"; inherit (piper-phonemize-native.meta) homepage license maintainers; }; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index c807817a0576..ea1c6fde8441 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -1,10 +1,9 @@ { lib, buildPythonPackage, - docutils, fetchPypi, + build, importlib-metadata, - importlib-resources, setuptools, packaging, typing-extensions, @@ -14,19 +13,19 @@ buildPythonPackage rec { pname = "pkg-about"; - version = "2.0.12"; + version = "2.3.0"; pyproject = true; src = fetchPypi { pname = "pkg_about"; inherit version; - hash = "sha256-WFhOMeBvAPaU/AIGoGlSziJ633TrGBgOcbfBxAm3H8E="; + hash = "sha256-g+RduU/aLD+UwZVexONXa8+rQznVmybC5G4ZnIugPqI="; }; - # tox is listed in build requirements but not actually used to build - # keeping it as a requirement breaks the build unnecessarily + # Unnecessarily requires the newest versions available for these postPatch = '' - sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml + sed -i 's/"setuptools>=[^"]*"/"setuptools>=${setuptools.version}"/' pyproject.toml + sed -i 's/"packaging>=[^"]*"/"packaging>=${packaging.version}"/' pyproject.toml ''; build-system = [ @@ -35,11 +34,9 @@ buildPythonPackage rec { ]; dependencies = [ - docutils + build importlib-metadata - importlib-resources packaging - setuptools typing-extensions ]; @@ -48,6 +45,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Tries and fails to install itself via pip + disabledTests = [ "test_about_from_setup" ]; + pythonImportsCheck = [ "pkg_about" ]; meta = { diff --git a/pkgs/development/python-modules/plover-dict-commands/default.nix b/pkgs/development/python-modules/plover-dict-commands/default.nix new file mode 100644 index 000000000000..68e7f0492937 --- /dev/null +++ b/pkgs/development/python-modules/plover-dict-commands/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-dict-commands"; + # See https://pypi.org/project/plover-dict-commands/ + # and https://github.com/KoiOates/plover_dict_commands/issues/4 + version = "0.2.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KoiOates"; + repo = "plover_dict_commands"; + rev = "5dceddc0830fb5a72679d62995f27b2e49850998"; + hash = "sha256-PXsYMqJz8sxgloEtiwxxt6Eo0hyFp5oW0homIAYPz6A="; + }; + + postPatch = '' + # See https://github.com/KoiOates/plover_dict_commands/issues/4 + substituteInPlace setup.cfg \ + --replace-fail "version = 0.2.4" "version = 0.2.5" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_dict_commands" + ]; + + meta = { + description = "Plover plugin for enabling, disabling, and changing the priority of dictionaries"; + homepage = "https://github.com/KoiOates/plover_dict_commands"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-lapwing-aio/default.nix b/pkgs/development/python-modules/plover-lapwing-aio/default.nix new file mode 100644 index 000000000000..b181da5723ce --- /dev/null +++ b/pkgs/development/python-modules/plover-lapwing-aio/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + plover-dict-commands, + plover-last-translation, + plover-modal-dictionary, + plover-python-dictionary, + plover-stitching, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-lapwing-aio"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aerickt"; + repo = "plover-lapwing-aio"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+zXsbXwOtnj3feWdBujIYs7MdbB7VV3VWyio8CeJtB4="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "setuptools<77" "setuptools" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover-dict-commands + plover-last-translation + plover-modal-dictionary + plover-python-dictionary + plover-stitching + ]; + + pythonImportsCheck = [ + "plover_lapwing" + ]; + + meta = { + description = "Plover plugin to automatically install Lapwing dictionaries, dependent plugins, extra dictionaries, and fix the number key behaviour"; + homepage = "https://github.com/aerickt/plover-lapwing-aio"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-last-translation/default.nix b/pkgs/development/python-modules/plover-last-translation/default.nix new file mode 100644 index 000000000000..7f7260565aac --- /dev/null +++ b/pkgs/development/python-modules/plover-last-translation/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-last-translation"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nsmarkop"; + repo = "plover_last_translation"; + tag = finalAttrs.version; + hash = "sha256-G6IvJ/xkayqFR4D3LTPJae2qxRnDpUI0yKTEbtRUxUg="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_last_translation" + ]; + + meta = { + description = "Plugins for Plover to repeat output"; + homepage = "https://github.com/nsmarkop/plover_last_translation"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-modal-dictionary/default.nix b/pkgs/development/python-modules/plover-modal-dictionary/default.nix new file mode 100644 index 000000000000..78aa6ba8f4b2 --- /dev/null +++ b/pkgs/development/python-modules/plover-modal-dictionary/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-modal-dictionary"; + # See https://pypi.org/project/plover-modal-dictionary/#history + # and https://github.com/Kaoffie/plover_modal_dictionary/issues/3 + version = "0.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Kaoffie"; + repo = "plover_modal_dictionary"; + rev = "086f9784377454ace45c333d21ea8ca2666b0a06"; + hash = "sha256-d5BYkjeGXfoYQibjr5wQFUmXU69dNrewkJ/Gi4c9eEI="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_modal_dictionary" + ]; + + meta = { + description = "Modal Dictionaries for Plover"; + homepage = "https://github.com/Kaoffie/plover_modal_dictionary"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-python-dictionary/default.nix b/pkgs/development/python-modules/plover-python-dictionary/default.nix new file mode 100644 index 000000000000..e453c61273ef --- /dev/null +++ b/pkgs/development/python-modules/plover-python-dictionary/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + pytestCheckHook, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-python-dictionary"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "opensteno"; + repo = "plover_python_dictionary"; + tag = finalAttrs.version; + hash = "sha256-4li8WjriJdeLbu+JANuVOb9ejBGusHBm+AaLxyy91A0="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + plover + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "plover_python_dictionary" + ]; + + meta = { + description = "Python dictionaries support for Plover"; + homepage = "https://github.com/opensteno/plover_python_dictionary"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-stitching/default.nix b/pkgs/development/python-modules/plover-stitching/default.nix new file mode 100644 index 000000000000..177dc5e88c4f --- /dev/null +++ b/pkgs/development/python-modules/plover-stitching/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-stitching"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "panathea"; + repo = "plover_stitching"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Md3LIQ73CAJlA91hfVdZZp9RJElINHYfiFFBBOYrIgs="; + }; + + patches = [ + # Make plover-stitching's blackbox test use the current blackbox_test from Plover. + # https://github.com/panathea/plover_stitching/pull/1 + ./plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_stitching" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "S-t-i-t-c-h-i-n-g support for Plover"; + homepage = "https://github.com/panathea/plover_stitching"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch b/pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch new file mode 100644 index 000000000000..4b8f843521c9 --- /dev/null +++ b/pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch @@ -0,0 +1,31 @@ +From 2751875916f23d42c81602d082fa2fd06a396fb1 Mon Sep 17 00:00:00 2001 +From: Yueh-Shun Li +Date: Tue, 5 May 2026 16:34:28 +0800 +Subject: [PATCH] test_blackbox: modernize to fix build + +Use `@blackbox_test` (decorator) from `plover_build_utils.testing` +instead of the historical `BlackboxTester`. +--- + test/test_blackbox.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/test_blackbox.py b/test/test_blackbox.py +index 71eb6d0676e39e4e916b04ae9cc290dff3de9e02..e746705fe21174ac05ee3c6087f9a19171f68189 100644 +--- a/test/test_blackbox.py ++++ b/test/test_blackbox.py +@@ -1,12 +1,12 @@ +-from plover_build_utils.testing import BlackboxTester ++from plover_build_utils.testing import blackbox_test + from plover.registry import registry + from plover import system + +-class TestsBlackbox(BlackboxTester): ++@blackbox_test ++class TestsBlackbox: + + @classmethod + def setup_class(cls): +- super().setup_class() + registry.update() + system.setup('English Stenotype') + diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index 460a7e8fb14e..1abbf78609e9 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -28,20 +28,26 @@ xlib, qtbase, wrapQtAppsHook, + hidapi, + xkbcommon, + pyobjc-framework-Quartz, + pyobjc-framework-Cocoa, + appnope, + pyobjc-core, }: buildPythonPackage (finalAttrs: { __structuredAttrs = true; pname = "plover"; - version = "5.0.0.dev2"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "openstenoproject"; repo = "plover"; tag = "v${finalAttrs.version}"; - hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0="; + hash = "sha256-1NpZmUDq806geKANqswPYglHwInxum/c/Hxq7JhTpbc="; }; # pythonRelaxDeps seemingly doesn't work here @@ -50,6 +56,8 @@ buildPythonPackage (finalAttrs: { sed -i /PySide6-Essentials/d pyproject.toml ''; + pythonRelaxDeps = [ "xkbcommon" ]; + build-system = [ babel setuptools @@ -71,7 +79,7 @@ buildPythonPackage (finalAttrs: { ]; dependencies = [ appdirs - evdev + hidapi packaging pkginfo psutil @@ -85,9 +93,17 @@ buildPythonPackage (finalAttrs: { rtf-tokenize setuptools wcwidth + xkbcommon xlib ] - ++ readme-renderer.optional-dependencies.md; + ++ readme-renderer.optional-dependencies.md + ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + appnope + pyobjc-core + pyobjc-framework-Cocoa + pyobjc-framework-Quartz + ]; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -103,8 +119,10 @@ buildPythonPackage (finalAttrs: { mock ]; - # Segfaults?! - disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; + disabledTestPaths = [ + "test/gui_qt/test_dictionaries_widget.py" # segfaults + "test/gui_qt/test_i18n_files.py" # babel errors + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -126,6 +144,5 @@ buildPythonPackage (finalAttrs: { ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 69721d9f3480..359c350f0f91 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.15.1"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; tag = version; - hash = "sha256-G7V3BqgJs9nyvhZ9xzNwP50yz+2SZfps/gsW6U8eisk="; + hash = "sha256-oR8/hrntE4XzZHdbde+NoKWdsLs9jJ3RLIv8YsoDFt4="; }; pythonRelaxDeps = [ "beautifulsoup4" ]; diff --git a/pkgs/development/python-modules/pricehist/default.nix b/pkgs/development/python-modules/pricehist/default.nix new file mode 100644 index 000000000000..2f46f477fac9 --- /dev/null +++ b/pkgs/development/python-modules/pricehist/default.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitLab, + buildPythonPackage, + cssselect, + curlify, + lxml, + poetry-core, + pytest-mock, + pytestCheckHook, + requests, + responses, +}: +buildPythonPackage (finalAttrs: { + pname = "pricehist"; + version = "1.4.14"; + pyproject = true; + + src = fetchFromGitLab { + owner = "chrisberkhout"; + repo = "pricehist"; + tag = finalAttrs.version; + hash = "sha256-BnyoSYVjs2odnOzSpvgMF860PDkz7tPNnM0s3Fep5G0="; + }; + + pythonRelaxDeps = [ "lxml" ]; + + dependencies = [ + requests + lxml + cssselect + curlify + ]; + + build-system = [ + poetry-core + ]; + + nativeCheckInputs = [ + responses + pytest-mock + pytestCheckHook + ]; + + meta = { + description = "Command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats"; + homepage = "https://gitlab.com/chrisberkhout/pricehist"; + license = lib.licenses.mit; + mainProgram = "pricehist"; + }; +}) diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index d3029dd8b2bf..dca64249d902 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -56,7 +56,7 @@ buildPythonPackage (finalAttrs: { # Tests crash with Abort trap: 6 on Darwin due to tokio runtime # initialization in PyInit_pyo3_async_runtimes being blocked by the sandbox. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "primp" ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index ca276e0c42e8..cefd5f0997e5 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage (finalAttrs: { pname = "publicsuffixlist"; - version = "1.0.2.20260502"; + version = "1.0.2.20260508"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-7/e4XitL6pcv9qlyqXlLpwWCiHmLdYj5hAE0/YfllAE="; + hash = "sha256-rLIVQUjoynd20AvKRxBPNMgLXb3zBZtRNEcYrZur1Ds="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pwkit/default.nix b/pkgs/development/python-modules/pwkit/default.nix index 1fbc0c029dad..4f7739a496f0 100644 --- a/pkgs/development/python-modules/pwkit/default.nix +++ b/pkgs/development/python-modules/pwkit/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pwkit"; - version = "1.2.2"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pkgw"; repo = "pwkit"; tag = "pwkit@${version}"; - hash = "sha256-FEMPHdXj2XCV5fCcdJsVpDMsJntP6zp1yFkjv1ov478="; + hash = "sha256-lEa1AWBhevCOBiAJd0Q0VWDtjSK5O89LYTNnLxKfD8U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycrdt-store/default.nix b/pkgs/development/python-modules/pycrdt-store/default.nix index 374d2efe93f5..5b016b74758e 100644 --- a/pkgs/development/python-modules/pycrdt-store/default.nix +++ b/pkgs/development/python-modules/pycrdt-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt-store"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; __structuredAttrs = true; @@ -26,16 +26,13 @@ buildPythonPackage (finalAttrs: { owner = "y-crdt"; repo = "pycrdt-store"; tag = finalAttrs.version; - hash = "sha256-KlB3BDhL/dt1IaQvWOfq1hgTKptrobgoBpus/mjZ26M="; + hash = "sha256-njahh5wbUGYkXh/ibZYH+2gmvqegaD8LwlhNDpYFTcM="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ - "pycrdt" - ]; dependencies = [ anyio pycrdt diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 01f4e693bb39..54874f82a9c2 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt-websocket"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; __structuredAttrs = true; @@ -35,14 +35,11 @@ buildPythonPackage (finalAttrs: { owner = "y-crdt"; repo = "pycrdt-websocket"; tag = finalAttrs.version; - hash = "sha256-Qux8IxJR1nGbdpGz7RZBKJjYN0qfwfEpd2UDlduOna0="; + hash = "sha256-OZ3LaXFwZY0gcLVHSkNKRrFZuCbggD9EeQNXYIVOSZ0="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ - "pycrdt" - ]; dependencies = [ anyio pycrdt diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix index dd2a079865d3..5b07098ec2e4 100644 --- a/pkgs/development/python-modules/pyezvizapi/default.nix +++ b/pkgs/development/python-modules/pyezvizapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyezvizapi"; - version = "1.0.4.7"; + version = "1.0.4.8"; pyproject = true; src = fetchFromGitHub { owner = "RenierM26"; repo = "pyEzvizApi"; tag = "v${version}"; - hash = "sha256-1VEEi0ZGPFypw2w78B5PPN5Wv6enPudOAHDQ6KkkfTw="; + hash = "sha256-JR+OZ0te2WK7IamZ7FpzbwNc42hjNz2qOW8NlzzOH7Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index 11fec2795b0f..31d8a4fce4c3 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -5,7 +5,6 @@ setuptools, cryptography, python-dateutil, - six, pbr, coverage, oslotest, @@ -36,8 +35,6 @@ buildPythonPackage rec { dependencies = [ cryptography python-dateutil - six - pbr ]; pythonImportsCheck = [ "pyghmi" ]; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 001de77758f4..7780a6a634d2 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { let ext = stdenv.hostPlatform.extensions.sharedLibrary; in - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' cat > pyglet/lib.py < pyglet/lib.py <=0.9,<0.10" uv-build + --replace-fail "uv-build>=0.9,<0.11" uv-build ''; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/pysnmpcrypto/default.nix b/pkgs/development/python-modules/pysnmpcrypto/default.nix index bcd1e2ebe58c..d37a494dad15 100644 --- a/pkgs/development/python-modules/pysnmpcrypto/default.nix +++ b/pkgs/development/python-modules/pysnmpcrypto/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Strong crypto support for Python SNMP library"; homepage = "https://github.com/lextudio/pysnmpcrypto"; - changelog = "https://github.com/lextudio/pysnmpcrypto/blob/${version}/CHANGES.txt"; + changelog = "https://github.com/lextudio/pysnmpcrypto/blob/v${version}/CHANGES.txt"; license = lib.licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index ad99775b980c..d10b65fd4089 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { xlib libayatana-appindicator ] - ++ lib.optionals stdenv.isDarwin [ pyobjc-framework-Quartz ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pyobjc-framework-Quartz ]; nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ]; diff --git a/pkgs/development/python-modules/pyteleinfo/default.nix b/pkgs/development/python-modules/pyteleinfo/default.nix new file mode 100644 index 000000000000..15f3a227417d --- /dev/null +++ b/pkgs/development/python-modules/pyteleinfo/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pydantic-settings, + pyserial, + pyserial-asyncio-fast, + pyhamcrest, + pytest-asyncio, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pyteleinfo"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "esciara"; + repo = "pyteleinfo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uNkCunWlFoGmg80t69z2PXyPL1pGDsezTc8heec97VI="; + }; + + build-system = [ hatchling ]; + + pythonRelaxDeps = [ "pydantic-settings" ]; + + dependencies = [ + pydantic-settings + pyserial + pyserial-asyncio-fast + ]; + + nativeCheckInputs = [ + pyhamcrest + pytest-asyncio + pytest-cov-stub + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "teleinfo" ]; + + meta = { + description = "Python library for decoding and encoding ENEDIS teleinfo frames"; + homepage = "https://github.com/esciara/pyteleinfo"; + changelog = "https://github.com/esciara/pyteleinfo/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index f4344244c7dd..676b41729691 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchPypi { pname = "pytest_md_report"; inherit version; - hash = "sha256-O4Mur2YLRwtXQuWNnJpeMSsHEqcBLSUcwE6QioHOPJY="; + hash = "sha256-yOO38fkaDo59G5RuGyJPTzkYfaDfL4EnMTYaQ2oX9HI="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 59b44dfbec9a..efcce1b04d49 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "python-bsblan"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; tag = "v${finalAttrs.version}"; - hash = "sha256-rp75cUDlciibMCpEEXn6zta6kquwCwXstRkA9A7JJYc="; + hash = "sha256-wK6r1fWXpbPVpUqLaLRjKKB2beXftdHujRL4pq3bhjc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-discovery/default.nix b/pkgs/development/python-modules/python-discovery/default.nix index 52f1d8119f4e..702b42bfd543 100644 --- a/pkgs/development/python-modules/python-discovery/default.nix +++ b/pkgs/development/python-modules/python-discovery/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "python-discovery"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "python-discovery"; tag = finalAttrs.version; - hash = "sha256-udyPGZ3vz+1nld2m3igLNZ+i1pnutkLeXFpHn738KRQ="; + hash = "sha256-PCqE/WwhH+kzWw6Q4L/ZBwgDqHI1G1P8KsMMANO4BIQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-dropbox-api/default.nix b/pkgs/development/python-modules/python-dropbox-api/default.nix new file mode 100644 index 000000000000..234eb501c828 --- /dev/null +++ b/pkgs/development/python-modules/python-dropbox-api/default.nix @@ -0,0 +1,34 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + poetry-core, +}: + +buildPythonPackage (finalAttrs: { + pname = "python-dropbox-api"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdr99"; + repo = "python-dropbox-api"; + tag = finalAttrs.version; + hash = "sha256-J3xgcDULK7Z+2HiarvpV6H+Na80PnfKJcdi3RRUcLzs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "python_dropbox_api" ]; + + meta = { + description = "Lightweight wrapper for the Dropbox API intended for use in Home Assistant"; + homepage = "https://github.com/bdr99/python-dropbox-api"; + changelog = "https://github.com/bdr99/python-dropbox-api/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/python-duco-client/default.nix b/pkgs/development/python-modules/python-duco-client/default.nix new file mode 100644 index 000000000000..7a079ed02de8 --- /dev/null +++ b/pkgs/development/python-modules/python-duco-client/default.nix @@ -0,0 +1,45 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "python-duco-client"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldvdmeer"; + repo = "python-duco-client"; + tag = "v${finalAttrs.version}"; + hash = "sha256-q7Y+66/vJvm05gHyg8mk0vWYySso3DDRvqw6w9hvn9w="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "duco" ]; + + meta = { + description = "Async Python client for the Duco ventilation API"; + homepage = "https://github.com/ronaldvdmeer/python-duco-client"; + changelog = "https://github.com/ronaldvdmeer/python-duco-client/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/python-mbedtls/default.nix b/pkgs/development/python-modules/python-mbedtls/default.nix deleted file mode 100644 index 20bfc02d6bde..000000000000 --- a/pkgs/development/python-modules/python-mbedtls/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - certifi, - cython, - mbedtls_2, - pytestCheckHook, - setuptools, - typing-extensions, -}: - -buildPythonPackage rec { - pname = "python-mbedtls"; - version = "2.10.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "Synss"; - repo = "python-mbedtls"; - rev = version; - hash = "sha256-eKKb12G/0QAcwtv5Yk/92QXhMipeKOfKR1JEaNHDIlg="; - }; - - build-system = [ - cython - setuptools - ]; - - buildInputs = [ mbedtls_2 ]; - - dependencies = [ - certifi - typing-extensions - ]; - - __darwinAllowLocalNetworking = true; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "mbedtls" ]; - - meta = { - description = "Cryptographic library with an mbed TLS back end"; - homepage = "https://github.com/Synss/python-mbedtls"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 9b441a73b899..7e2b087c44e0 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; homepage = "https://github.com/tpaviot/pythonocc-core"; - changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/tpaviot/pythonocc-core/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.lgpl3; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 3c04332f26fe..f81aa25b3cb8 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pytibber"; - version = "0.37.4"; + version = "0.37.5"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; tag = finalAttrs.version; - hash = "sha256-xXZLMLPlOYCDO1+b3/lL5O5NI5UA+4HX+YOMHLwCbig="; + hash = "sha256-6b4f2IR/jkIwhdlrG8HZjIktmKLFs6iB6RZbQAOo7Yc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index c18f7ab8d4df..c0d3c4b189f6 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyvicare"; - version = "2.60.1"; + version = "2.60.2"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; tag = finalAttrs.version; - hash = "sha256-pLXSUEetkGBrdPZ5Lo0gFTIP6pkc9C2tcx6+3Khr7EY="; + hash = "sha256-hXmIPKa37kSEJT/4m41AtemjWf1oO0f1FtnFGzY6cQw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix index de5fbdcd88e3..cc425b42dfbb 100644 --- a/pkgs/development/python-modules/pywebcopy/default.nix +++ b/pkgs/development/python-modules/pywebcopy/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywebcopy"; version = "7.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rajatomar788"; repo = "pywebcopy"; - tag = version; + tag = "v${finalAttrs.version}"; hash = "sha256-ee8uGg4PU1uch8cyiU7QfvdYFUVDz7obq9oC8fKkf1s="; }; @@ -37,11 +37,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "pywebcopy" ]; + disabledTestPaths = [ + # Segfault + "pywebcopy/tests/test_iterparser.py" + ]; + meta = { - changelog = "https://github.com/rajatomar788/pywebcopy/blob/master/docs/changelog.md"; description = "Python package for cloning complete webpages and websites to local storage"; homepage = "https://github.com/rajatomar788/pywebcopy/"; + changelog = "https://github.com/rajatomar788/pywebcopy/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index a4f99229d000..34985288ac20 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "High performance simulators for Qiskit"; # broken on darwin for unknown reasons - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://qiskit.github.io/qiskit-aer/"; downloadPage = "https://github.com/QISKit/qiskit-aer/releases"; changelog = "https://qiskit.github.io/qiskit-aer/release_notes.html"; diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index 2d7640b34fb0..f5d006005bac 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/rustedpy/result"; changelog = "https://github.com/rustedpy/result/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emattiza ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/resvg-py/default.nix b/pkgs/development/python-modules/resvg-py/default.nix index 0438f8882436..4bdfe88c7eda 100644 --- a/pkgs/development/python-modules/resvg-py/default.nix +++ b/pkgs/development/python-modules/resvg-py/default.nix @@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: { pytest pyperclip ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ xclip xvfb-run ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 1bcc2cfafef8..a82a7a88bdd9 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.2.3"; + version = "1.2.5"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; tag = finalAttrs.version; - hash = "sha256-4fb0oyS4LZvvMPKEKAE5lLI7ReCW2V6b5J/pQqMrcNM="; + hash = "sha256-FEpQiq6pnFGCMEGOikkf8QFRVPhlTf0X40foqCBfGpU="; }; patches = [ diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix index d43ba5db2c2e..038276e6aff5 100644 --- a/pkgs/development/python-modules/schedula/default.nix +++ b/pkgs/development/python-modules/schedula/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + pythonAtLeast, fetchFromGitHub, # build-system @@ -79,6 +80,21 @@ buildPythonPackage rec { # ERROR tests/utils/test_form.py::TestDispatcherForm::test_form1 - ModuleNotFoundError: No module named 'chromedriver_autoinstaller' # ERROR tests/utils/test_form.py::TestDispatcherForm::test_form_stripe - ModuleNotFoundError: No module named 'chromedriver_autoinstaller' "tests/utils/test_form.py" + # requires schedula[form] extras + "tests/utils/test_form_items.py" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # itertools iterators no longer picklable in 3.14 (cpython#101588) + "tests/test_dispatcher.py::TestAsyncParallel" + "tests/test_dispatcher.py::TestCopyDispatcher::test_copy" + "tests/utils/test_blue.py::TestBlueDispatcher::test_blue_io" + "tests/utils/test_io.py::TestReadWrite::test_load_dispatcher" + "tests/utils/test_io.py::TestReadWrite::test_save_dispatcher" + # exception repr format changed in 3.14 + "tests/test_dispatcher.py::TestDispatch::test_raises" + # doctest output drift on 3.14 + "tests/test_dispatcher.py::TestDoctest::runTest" + "tests/utils/test_io.py::TestDoctest::runTest" ]; pythonImportsCheck = [ "schedula" ]; diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 71886657bda6..de1dc6f43f95 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - dependencies = lib.optionals (stdenv.isDarwin) [ + dependencies = lib.optionals (stdenv.hostPlatform.isDarwin) [ pyobjc-framework-Cocoa cython ]; - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' substituteInPlace screeninfo/enumerators/xinerama.py \ --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libx11}/lib/libX11.so")' \ --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libxinerama}/lib/libXinerama.so")' diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 290631786c57..13cc74ab3897 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { meta = { description = "Statistical data visualization"; homepage = "https://seaborn.pydata.org/"; - changelog = "https://github.com/mwaskom/seaborn/blob/master/doc/whatsnew/${src.rev}.rst"; + changelog = "https://github.com/mwaskom/seaborn/blob/v${version}/doc/whatsnew/v${version}.rst"; license = with lib.licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix index b95486ac7663..077891120c37 100644 --- a/pkgs/development/python-modules/serialx/default.nix +++ b/pkgs/development/python-modules/serialx/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "serialx"; - version = "1.7.0"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "puddly"; repo = "serialx"; tag = "v${finalAttrs.version}"; - hash = "sha256-yULTP7aaA/O7cz3NBMpdIybvply3ADQZENxjuexKxo8="; + hash = "sha256-A8LdFpxnnluAlwVvNly4IfvCS8eZMDil6OmI4b9kGOA="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -65,11 +65,16 @@ buildPythonPackage (finalAttrs: { socat ]; + __darwinAllowLocalNetworking = true; + disabledTests = [ # tries to access /sys/class/tty in sandbox "test_compat_tools_module" # connects to 192.0.2.1 "test_async_socket_connect_timeout" + # racy + "test_sync_readexactly_total_timeout" + "test_sync_read_until_total_timeout" ]; meta = { diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 91747f2dc663..be98151d4f81 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -34,7 +34,6 @@ buildPythonPackage rec { meta = { description = "SMPP library for Python"; homepage = "https://github.com/python-smpplib/python-smpplib"; - changelog = "https://github.com/python-smpplib/python-smpplib/releases/tag/${version}"; license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 9eaa09b20a85..5b4fa1d28b36 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -25,14 +25,14 @@ buildPythonPackage (finalAttrs: { pname = "speechrecognition"; - version = "3.16.0"; + version = "3.16.1"; pyproject = true; src = fetchFromGitHub { owner = "Uberi"; repo = "speech_recognition"; tag = finalAttrs.version; - hash = "sha256-EIDhWx1s1B0DX4Vmd/a8hRnTBgdBx9ALOonOWFPgUOg="; + hash = "sha256-5BTwUzo2U7/VwmEqldxXddt/ByKebZKY1KhCEoIb9F8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy/1_3.nix b/pkgs/development/python-modules/sqlalchemy/1_3.nix index 19f181bae1cb..b57cd123a030 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_3.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_3.nix @@ -76,7 +76,11 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "sqlalchemy" ]; meta = { - changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/${finalAttrs.src.tag})"; + changelog = + let + shortVersion = lib.replaceString "." "" (lib.versions.majorMinor finalAttrs.version); + in + "https://github.com/sqlalchemy/sqlalchemy/blob/${finalAttrs.src.rev}/doc/build/changelog/changelog_${shortVersion}.rst"; description = "Database Toolkit for Python"; homepage = "https://github.com/sqlalchemy/sqlalchemy"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 15f939786f4c..c4d71b8624e3 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -100,9 +100,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "sqlalchemy" ]; meta = { - changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_${ - builtins.replaceStrings [ "." ] [ "_" ] version - }"; + changelog = + let + shortVersion = lib.replaceString "." "" (lib.versions.majorMinor version); + in + "https://github.com/sqlalchemy/sqlalchemy/blob/${src.rev}/doc/build/changelog/changelog_${shortVersion}.rst"; description = "Database Toolkit for Python"; homepage = "https://github.com/sqlalchemy/sqlalchemy"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index fc45d496991f..05432ca9b957 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system hatchling, @@ -25,25 +24,22 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlfmt"; - version = "0.29.0"; + version = "0.30.0"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "tconbeer"; repo = "sqlfmt"; - tag = "v${version}"; - hash = "sha256-AeG6ga+WaBVvCCkEJbIkaJQg4rEmBcyQNmgJHEYkhrI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/8BTH2nuqO+du6PsTPB59L21HvvAIZKDcG1kV9XHxsg="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ - "click" - ]; + pythonRelaxDeps = [ "click" ]; + dependencies = [ click jinja2 @@ -65,7 +61,7 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); disabledTestPaths = [ # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' @@ -74,11 +70,11 @@ buildPythonPackage rec { ]; meta = { - description = "Sqlfmt formats your dbt SQL files so you don't have to"; + description = "Formatter for dbt SQL files"; homepage = "https://github.com/tconbeer/sqlfmt"; - changelog = "https://github.com/tconbeer/sqlfmt/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/tconbeer/sqlfmt/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pcboy ]; mainProgram = "sqlfmt"; }; -} +}) diff --git a/pkgs/development/python-modules/starlette-wtf/default.nix b/pkgs/development/python-modules/starlette-wtf/default.nix index 354188dfb264..52f07c7a667c 100644 --- a/pkgs/development/python-modules/starlette-wtf/default.nix +++ b/pkgs/development/python-modules/starlette-wtf/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Simple tool for integrating Starlette and WTForms"; - changelog = "https://github.com/muicss/starlette-wtf/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/amorey/starlette-wtf/releases/tag/${version}"; homepage = "https://github.com/muicss/starlette-wtf"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 83811663bcd1..65e7b6e5ed69 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -59,7 +59,6 @@ buildPythonPackage rec { description = "Flash firmware to STM32 microcontrollers in Python"; mainProgram = "stm32loader"; homepage = "https://github.com/florisla/stm32loader"; - changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = lib.licenses.gpl3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index 3d7c74681fea..a1caba5b81f7 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "4.6.0"; + version = "4.6.1"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; tag = "v${version}"; - hash = "sha256-5WAD5ZpzhdIDv1kUVinc5z91N/tQVScO75kOPC1WWlY="; + hash = "sha256-yAxHOcxS4YYX0lvKwUExIBFBM5RDyFgeW9QA0WZBthA="; }; build-system = [ @@ -34,11 +34,6 @@ buildPythonPackage rec { enabledTestPaths = [ "scripts/test_stringzilla.py" ]; - disabledTests = [ - # test downloads CaseFolding.txt from unicode.org - "test_utf8_case_fold_all_codepoints" - ]; - meta = { changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${src.tag}"; description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances"; diff --git a/pkgs/development/python-modules/symfc/default.nix b/pkgs/development/python-modules/symfc/default.nix index 431790167b6c..e0fab3f934bf 100644 --- a/pkgs/development/python-modules/symfc/default.nix +++ b/pkgs/development/python-modules/symfc/default.nix @@ -18,14 +18,15 @@ buildPythonPackage (finalAttrs: { pname = "symfc"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "symfc"; repo = "symfc"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Szj/s0ZsrpEFJMIo9p/9rDFd5yJiHky58Iab/k3log="; + hash = "sha256-UTiVJQQxMmjZjgqfeDJn6g0XQ6i1JVktwgEt2StSsGE="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 4fb2d64a1ecb..ba978ea6f19a 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.90"; + version = "3.1.92"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-zer7pEpPZaMcnr7mhhpDbCEJmyG6mKfYnN1+8nKA5fU="; + hash = "sha256-uvBMYVnYx6fSDmRk4me2wjQHMNwILtE6ANpvtKWX/xg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/terminaltexteffects/default.nix b/pkgs/development/python-modules/terminaltexteffects/default.nix index 81c51924499d..8eded8b9cb24 100644 --- a/pkgs/development/python-modules/terminaltexteffects/default.nix +++ b/pkgs/development/python-modules/terminaltexteffects/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Collection of visual effects that can be applied to terminal piped stdin text"; homepage = "https://chrisbuilds.github.io/terminaltexteffects"; - changelog = "https://chrisbuilds.github.io/terminaltexteffects/changeblog/"; + changelog = "https://chrisbuilds.github.io/terminaltexteffects/changeblog/changeblog/"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 1b870af5d2c0..4d4e0a257e20 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { # otherwise it cannot be imported because extension modules are not compiled in sources checkPhase = '' pushd "$TMPDIR" - ${python.interpreter} -m pytest --pyargs tiledb${lib.optionalString stdenv.isDarwin " -k 'not test_ctx_thread_cleanup and not test_array'"} + ${python.interpreter} -m pytest --pyargs tiledb${lib.optionalString stdenv.hostPlatform.isDarwin " -k 'not test_ctx_thread_cleanup and not test_array'"} popd ''; diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index d0d85974c3fe..c5da7afbc19b 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -11,6 +11,7 @@ deprecated, einops, humanize, + jaxtyping, nibabel, numpy, packaging, @@ -24,6 +25,7 @@ # optional dependencies colorcet, matplotlib, + monai, pandas, ffmpeg-python, scikit-learn, @@ -35,14 +37,14 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.21.2"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "TorchIO-project"; repo = "torchio"; tag = "v${version}"; - hash = "sha256-HyhoF3F4EsJCOkWmoQkFqNsx8YbBsUFlQC+AggaXLXI="; + hash = "sha256-b6ED3IyQgC0A0dqYiXC0GTf6ZqwE1Ka7ojM7OJu1xfI="; }; build-system = [ @@ -53,6 +55,7 @@ buildPythonPackage rec { deprecated einops humanize + jaxtyping nibabel numpy packaging @@ -64,21 +67,28 @@ buildPythonPackage rec { typer ]; - optional-dependencies = { - csv = [ pandas ]; - plot = [ - colorcet - matplotlib - ]; - video = [ ffmpeg-python ]; - sklearn = [ scikit-learn ]; - }; + optional-dependencies = + let + extras = { + csv = [ pandas ]; + monai = [ monai ]; + plot = [ + colorcet + matplotlib + ]; + video = [ ffmpeg-python ]; + sklearn = [ scikit-learn ]; + }; + in + extras // { all = lib.concatLists (lib.attrValues extras); }; nativeCheckInputs = [ matplotlib parameterized pytestCheckHook - ]; + ] + ++ optional-dependencies.monai + ++ optional-dependencies.sklearn; disabledTests = [ # tries to download models: diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 5c6c951288a5..21ea73712f80 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "unstructured-client"; - version = "0.43.2"; + version = "0.44.0"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y/qhgm+mmKNPZhx/km02i7sc31izQH72REXYrKY++OM="; + hash = "sha256-joQj2tMOD3bW/bU0ffZ7Usfh7hRWrVGKfGreC9ks18E="; }; preBuild = '' diff --git a/pkgs/development/python-modules/verspec/default.nix b/pkgs/development/python-modules/verspec/default.nix index 3898aa26827e..c3ea44b0c03d 100644 --- a/pkgs/development/python-modules/verspec/default.nix +++ b/pkgs/development/python-modules/verspec/default.nix @@ -31,7 +31,6 @@ buildPythonPackage rec { meta = { description = "Flexible version handling"; homepage = "https://github.com/jimporter/verspec"; - changelog = "https://github.com/jimporter/averspec/releases/tag/v${version}"; license = with lib.licenses; [ bsd2 # and asl20 diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix index eabe258913c4..e5104ebf1ff5 100644 --- a/pkgs/development/python-modules/victron-mqtt/default.nix +++ b/pkgs/development/python-modules/victron-mqtt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "victron-mqtt"; - version = "2026.4.19"; + version = "2026.5.0"; pyproject = true; src = fetchFromGitHub { owner = "tomer-w"; repo = "victron_mqtt"; tag = "v${finalAttrs.version}"; - hash = "sha256-KJAq/tYQHdlgeUTG+o3yKD5x1XKpYLDlDAr1ti2lbYI="; + hash = "sha256-0VGDGtuMs1Bw+98ddI0Gggxm1nWEWWn4Z/RbuTfzqoY="; }; build-system = [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index d5a886d223cb..86d56facfead 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { "httpx" "validators" "authlib" + "grpcio" "protobuf" ]; diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 7c1cc3ee7138..444a6a521ac8 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { description = "Module for YouTube archiving"; mainProgram = "yark"; homepage = "https://github.com/Owez/yark"; - changelog = "https://github.com/Owez/yark/releases/tag/v${version}"; + changelog = "https://github.com/Owez/yark/releases/tag/v${lib.versions.majorMinor version}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index fb9f12c163cd..4157f6d99236 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -28,8 +28,8 @@ buildPythonPackage rec { version src ; - fetcherVersion = 2; - hash = "sha256-3hhwKUzfdlKmth4uRlfBSdxEOIfhAVaq2PZIOHWGWiM="; + fetcherVersion = 3; + hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0="; }; build-system = [ diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 869c1fa5e121..d494ad4ed2e2 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "zha"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-oB4vxq/DJjmypmcKS6IeYEh+dTvC0Wt9X79vPbtDJgE="; + hash = "sha256-JYwTDD3YmHPgSSwFTGhoL9MY5SZ2jLBlgGqQDEnvF1k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index db72b8d1fcd9..1bed1e893dc2 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "zigpy"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-iBv7FKPeVzHc8xNvRLHDgWAuwHgTf4ByI1fA6Z134v8="; + hash = "sha256-9e+n4C2ViCAHFw2Ed+NxPSAbcVX5KJl7biIIsYr8E4c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index dab7334886fd..44dee171c95c 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "zipfile2"; version = "0.0.12-unstable-2024-09-28"; pyproject = true; @@ -33,7 +33,6 @@ buildPythonPackage rec { meta = { description = "Backwards-compatible improved zipfile class"; homepage = "https://github.com/cournape/zipfile2"; - changelog = "https://github.com/itziakos/zipfile2/releases/tag/v${version}"; license = lib.licenses.psfl; maintainers = [ ]; }; diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index 584b862bf044..760b01e1c851 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-systems"; diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index e903edc87422..2605fc8a38f0 100644 --- a/pkgs/development/rocm-modules/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "aqlprofile"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index fb4436c802f8..9ea6f7e28156 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { "projects/clr" "shared" ]; - hash = "sha256-Xfo6513ERdEoLy+iknQbEgPG7InLcU7E7ssZd4HMvpI="; + hash = "sha256-n8yWWDxE36m2NN0cmqHXQy5omYPiYoqnaNbqWm63q3E="; }; sourceRoot = "${finalAttrs.src.name}/projects/clr"; @@ -242,15 +242,17 @@ stdenv.mkDerivation (finalAttrs: { # "9-4-generic" - since only 942 is valid for 6.4 target it directly # 940/1 - never released publicly, maybe HPE cray specific MI3xx? "942" # MI300A/X, MI325X - # "950" # MI350X TODO: Expected in ROCm 7.x + "950" # MI350X, MI355X # "10-1-generic" # fine for all RDNA1 cards "1010" # "10-3-generic" "1030" # W6800, various Radeon cards + # 1100 through 1103 = RDNA3 # "11-generic" # will handle 7600, hopefully ryzen AI series iGPUs "1100" "1101" "1102" + "1103" # RDNA3 iGPU like Radeon 780M "1150" # Strix Point "1151" # Strix Halo # "12-generic" diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 9b031bd1dc62..da94466388c8 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index 90df1b79285a..3213c827c2be 100644 --- a/pkgs/development/rocm-modules/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index fbc3c3abda78..156e693efdfa 100644 --- a/pkgs/development/rocm-modules/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index e728e602754b..6335fef1d2e3 100644 --- a/pkgs/development/rocm-modules/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index f28c78bf3c24..536f4d0db819 100644 --- a/pkgs/development/rocm-modules/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -24,7 +24,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index 417a68ba9b82..4adc66cc4b44 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index f0a8720037ea..34517595e273 100644 --- a/pkgs/development/rocm-modules/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index f9d1ab7c2c77..3362e768151d 100644 --- a/pkgs/development/rocm-modules/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -21,7 +21,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index 597b3c5b1cf1..dacce14205a9 100644 --- a/pkgs/development/rocm-modules/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index 3d58cec78054..34452bb8f850 100644 --- a/pkgs/development/rocm-modules/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index 35b7a531916a..0eb275ee4a8d 100644 --- a/pkgs/development/rocm-modules/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index b617f1638e31..33dc5ba82caf 100644 --- a/pkgs/development/rocm-modules/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index 718778685ecc..22fee11fd997 100644 --- a/pkgs/development/rocm-modules/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -19,7 +19,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix index ff2914e6f485..c929961ddf16 100644 --- a/pkgs/development/rocm-modules/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -36,7 +36,7 @@ }: let - version = "7.2.2"; + version = "7.2.3"; # major version of this should be the clang version ROCm forked from rocmLlvmVersion = "22.0.0-rocm"; # llvmPackages_base version should match rocmLlvmVersion diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index 28906d5f814a..0528481e4023 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jHAdlqRhEiBtU4h76k0NTGUABiOmb3xKADr5sWme4+8="; + hash = "sha256-raYsrMZASdEIxSstk14b38q9dt5EOq3rKidoFvobnxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index c7ca6a18e81d..3c4c85c678a5 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -44,7 +44,7 @@ let # FIXME: cmake files need patched to include this properly cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "7.2.2"; + version = "7.2.3"; # Targets outside this list will get # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index b77c451e6f82..4c76482c5490 100644 --- a/pkgs/development/rocm-modules/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix index 160182908338..45c613c0736b 100644 --- a/pkgs/development/rocm-modules/rccl/default.nix +++ b/pkgs/development/rocm-modules/rccl/default.nix @@ -40,7 +40,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index f09afe1e6cd5..1411a41167bb 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index 410b0846d1a1..5bd37731db07 100644 --- a/pkgs/development/rocm-modules/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index 77ff15634eb3..3cd83c02d00a 100644 --- a/pkgs/development/rocm-modules/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index 434d4b217459..cf407b26eb44 100644 --- a/pkgs/development/rocm-modules/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index 7c3d1e27406b..a306984f479d 100644 --- a/pkgs/development/rocm-modules/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix index 6db31401caeb..e924874da33c 100644 --- a/pkgs/development/rocm-modules/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix index ad43aba2960e..ddc76d1ce5c3 100644 --- a/pkgs/development/rocm-modules/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index 13e17e183140..a438dd1bc797 100644 --- a/pkgs/development/rocm-modules/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix index 621df5c9b7bd..a9aaf3e4cb87 100644 --- a/pkgs/development/rocm-modules/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-docs-core/default.nix @@ -24,14 +24,14 @@ # FIXME: Move to rocmPackages_common buildPythonPackage (finalAttrs: { pname = "rocm-docs-core"; - version = "1.33.1"; + version = "1.34.0"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-docs-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-eHX5Vz3MmIHi6n90hgBm4Ik+MGhxmniw2Me6pyZVC+k="; + hash = "sha256-dVX+e0nk9/GT0idXNvLwCuN8Fh/r0dWIvqToU9cxKxs="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 689fe641752a..de511274b4ab 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index 4071ff152a8d..d34829e8624f 100644 --- a/pkgs/development/rocm-modules/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix index 5a51f9632891..b2b791faa152 100644 --- a/pkgs/development/rocm-modules/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "7.2.2"; + version = "7.2.3"; pname = "rocminfo"; src = fetchFromGitHub { diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index db5cf76fb7a9..1bf4f2932440 100644 --- a/pkgs/development/rocm-modules/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" @@ -146,7 +146,10 @@ stdenv.mkDerivation (finalAttrs: { patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*} ''; - passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; + passthru.updateScript = rocmUpdateScript { + inherit finalAttrs; + page = "tags"; + }; meta = { description = "MLIR-based convolution and GEMM kernel generator"; diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index d9363b8ed7ab..a3d3745ce1f3 100644 --- a/pkgs/development/rocm-modules/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index 63b9d177371a..eec7a614b15f 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix b/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix index fd5994afd804..eef20eb51927 100644 --- a/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix @@ -46,7 +46,7 @@ # rocprofiler-sdk is the home of rocprofv3 stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-sdk"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index ac296a19be3a..d49a8e2f50a8 100644 --- a/pkgs/development/rocm-modules/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -44,7 +44,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index 8e940cf3acfe..4e3338ea0bae 100644 --- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index 1fa6e6fba8bc..c1ce84ebdbaa 100644 --- a/pkgs/development/rocm-modules/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index dec8a2fdfd7a..1549ca241569 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index 2b4fb32b90c9..e58e3aaab71a 100644 --- a/pkgs/development/rocm-modules/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index d671776e43e9..3be1b9f46f11 100644 --- a/pkgs/development/rocm-modules/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index 0fd3da62e952..45d66b683a00 100644 --- a/pkgs/development/rocm-modules/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index f9135f15831c..a7e4bc5a8c46 100644 --- a/pkgs/development/rocm-modules/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "7.2.2"; + version = "7.2.3"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index bb9fd8a49eb4..78901c918ed1 100644 --- a/pkgs/development/rocm-modules/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rpp-${if useCPU then "cpu" else "hip"}"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index 3e246dc8d4fc..1f2ab4e9c49e 100644 --- a/pkgs/development/rocm-modules/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "tensile"; - version = "7.2.2"; + version = "7.2.3"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch deleted file mode 100644 index 0f7d6e87b040..000000000000 --- a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7067dc..337c4ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.10) - project(massif-visualizer) - - set(QT_MIN_VERSION "5.2.0") diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix deleted file mode 100644 index 0b1c5009c972..000000000000 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - extra-cmake-modules, - shared-mime-info, - wrapQtAppsHook, - qtsvg, - qtxmlpatterns, - karchive, - kconfig, - kcoreaddons, - kparts, - kio, - ki18n, - kdiagram, - kgraphviewer, -}: - -stdenv.mkDerivation rec { - pname = "massif-visualizer"; - version = "0.7.0"; - - src = fetchurl { - url = "mirror://kde/stable/massif-visualizer/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; - }; - - patches = [ ./cmake-minimum-required.patch ]; - - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - wrapQtAppsHook - ]; - - buildInputs = [ - qtsvg - qtxmlpatterns - karchive - kconfig - kcoreaddons - kparts - kio - ki18n - kdiagram - kgraphviewer - ]; - - meta = { - description = "Tool that visualizes massif data generated by valgrind"; - mainProgram = "massif-visualizer"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index c6840241c609..856550b5d6d0 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { # gettext gets pulled in via autoreconfHook because strictDeps is not set, # and is linked against. Without this, it doesn't end up in HOST_PATH. # TODO: enable strictDeps, and either make this dependency explicit, or remove it - ++ lib.optional stdenv.isCygwin gettext; + ++ lib.optional stdenv.hostPlatform.isCygwin gettext; configureFlags = lib.optional guileEnabled "--with-guile" diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index a62f97f5dffc..66ececb749ba 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -2,7 +2,7 @@ let version = "3.14.0"; vendorHash = "sha256-fibx+Ky2cfP71tPzeiDybx+0f/+XvZbDXC7PAWQMRIY="; - nodeModulesHash = "sha256-8QhWOlEWkRPZA3uktm2hDSon+UCPPGznvn/4cXqyvTY="; + nodeModulesHash = "sha256-wQUOUB5uhWbdEP1nP02ihRZf3F1sEvQeZTDxOa5P1lQ="; in { inherit version vendorHash nodeModulesHash; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix index 65dd8518fe04..31197106a149 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; sourceRoot = "${common.src.name}/web"; - fetcherVersion = 2; + fetcherVersion = 3; hash = common.nodeModulesHash; }; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index ec3f4fe34b46..7d8ca0b388de 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -24,6 +24,10 @@ let gclientDeps = gclient2nix.importGclientDeps info.deps; yarn-berry = yarn-berry_4; + + # Only apply to old versions after upstream updates to Yarn 4.14 + # https://github.com/electron/electron/blob/main/package.json#L148 + yarnPatch = ./yarn-4.14-support.patch; in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { @@ -66,6 +70,7 @@ in yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { src = gclientDeps."src/electron".path; + patches = [ yarnPatch ]; hash = info.electron_yarn_hash; }; @@ -185,7 +190,16 @@ in '' + '' ( + PATH=$PATH:${ + lib.makeBinPath ( + with pkgsBuildHost; + [ + git + ] + ) + } cd electron + git apply ${yarnPatch} YARN_ENABLE_SCRIPTS=0 yarnBerryConfigHook ) ( diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 9782b841607e..3760d3ce76c7 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1342,7 +1342,7 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "sha256-HCnJJqfgcilB+Cl2OaezL9Uu1xk0ZBdVEXg2VDR1dwU=", + "electron_yarn_hash": "sha256-4wVNDVy8SMZgh3tTzytUveyBv0MwLlWpjwDgC/+WYVM=", "modules": "140", "node": "22.22.1", "version": "39.8.9" @@ -2690,7 +2690,7 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "sha256-0P2Kt1uJA0lmZjIOr4Bpu6NDl4CwEKEgRz/B92oCs9M=", + "electron_yarn_hash": "sha256-HSLQS89ZdIxni51WDVvr19oDZyaG/PlPG8XfdvEDQhQ=", "modules": "143", "node": "24.14.1", "version": "40.9.2" @@ -4054,7 +4054,7 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=", + "electron_yarn_hash": "sha256-i9/E2hO0vq5kbDwFLvaVl7OoixGpHxBQ6sMiHgnWYuA=", "modules": "145", "node": "24.15.0", "version": "41.3.0" diff --git a/pkgs/development/tools/electron/yarn-4.14-support.patch b/pkgs/development/tools/electron/yarn-4.14-support.patch new file mode 100644 index 000000000000..1bf5818747e2 --- /dev/null +++ b/pkgs/development/tools/electron/yarn-4.14-support.patch @@ -0,0 +1,20 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -12,5 +12,3 @@ npmPreapprovedPackages: + httpProxy: "${HTTP_PROXY:-}" + + httpsProxy: "${HTTPS_PROXY:-}" +- +-yarnPath: .yarn/releases/yarn-4.12.0.cjs +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix index 847cc0241253..332175c1f4d0 100644 --- a/pkgs/development/tools/language-servers/ansible-language-server/default.nix +++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix @@ -19,12 +19,16 @@ stdenv.mkDerivation (finalAttrs: { tag = "v${finalAttrs.vscodeAnsibleVersion}"; hash = "sha256-DsEW3xP8Fa9nwPuyEFVqG6rvAZgr4TDB6jhyixdvqt8="; }; + patches = [ + # Remove when updating, the project migrated to pnpm in https://github.com/ansible/vscode-ansible/commit/afa700ff78ad0839df446d18cb26e71b28559af4 + ./yarn-4.14-support.patch + ]; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-GScYVFdG8MMtPjtXfz7e6Y+A1tFMF9T8suvU+/BhsHY="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-Lm3cz+ydOee34J2tnlMQuSTzBzFKFpQTXcMreMS3ZiU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/language-servers/ansible-language-server/yarn-4.14-support.patch b/pkgs/development/tools/language-servers/ansible-language-server/yarn-4.14-support.patch new file mode 100644 index 000000000000..5a4a11272f63 --- /dev/null +++ b/pkgs/development/tools/language-servers/ansible-language-server/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -20,4 +20,7 @@ supportedArchitectures: + - darwin + - win32 + +-yarnPath: .yarn/releases/yarn-4.12.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 + diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index bdb4bcaff32c..e1c25f8f2dc1 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, gtest, @@ -22,15 +21,15 @@ }: let - nixComponents = nixVersions.nixComponents_2_30; + nixComponents = nixVersions.nixComponents_2_34; common = rec { - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; tag = version; - hash = "sha256-/IU5yJQzUwv/d4mXr+m/AKrw7ufY8r+JAysUhhaHUZY="; + hash = "sha256-S/E16Yf3Qh098qXxl0pimSy/5gkkd1n/Os6B9REWleg="; }; nativeBuildInputs = [ @@ -134,17 +133,6 @@ in // { pname = "nixd"; - patches = [ - # Pull upstream fix for boost-1.89 & boost 1.87 support: - # https://github.com/nix-community/nixd/pull/783 - (fetchpatch { - name = "boost-1.89.patch"; - url = "https://github.com/nix-community/nixd/commit/11dfdf5f2db2e0fc1fea0349fb68739a9c747a41.patch"; - hash = "sha256-aCb9wRKqZSuUXmamzjpYe0vRqEQh4tenwoScv+juYK8="; - stripLen = 1; - }) - ]; - sourceRoot = "${common.src.name}/nixd"; buildInputs = [ diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 5f56e4f6b88a..3975dbc04277 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -22,8 +22,8 @@ let hash = "sha256-hAL2daH0zJ1PJ7v6s1wtSi4dfrATHfA9rQlhnoZnTQw="; }; "10" = { - version = "10.33.2"; - hash = "sha256-envPE9f2zrOUbAOXg3PZm+n94cr8MAC9/tTE95EWdhA="; + version = "10.33.4"; + hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw="; }; }; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix deleted file mode 100644 index ce8fc1d8ea23..000000000000 --- a/pkgs/development/tools/tora/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - extra-cmake-modules, - makeWrapper, - qttools, - wrapQtAppsHook, - boost, - doxygen, - openssl, - libmysqlclient, - postgresql, - graphviz, - loki, - qscintilla, - qtbase, -}: - -stdenv.mkDerivation { - pname = "tora"; - version = "3.2.176"; - - src = fetchFromGitHub { - owner = "tora-tool"; - repo = "tora"; - rev = "39bf2837779bf458fc72a9f0e49271152e57829f"; - sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - makeWrapper - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - boost - doxygen - graphviz - loki - libmysqlclient - openssl - postgresql # needs libecpg, which is not available in libpq package - qscintilla - qtbase - ]; - - preConfigure = '' - substituteInPlace src/widgets/toglobalsetting.cpp \ - --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"' - substituteInPlace extlibs/libermodel/dotgraph.cpp \ - --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot - ''; - - cmakeFlags = [ - "-DWANT_INTERNAL_LOKI=0" - "-DWANT_INTERNAL_QSCINTILLA=0" - # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name - "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include" - "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so" - "-DENABLE_DB2=0" - "-DENABLE_ORACLE=0" - "-DENABLE_TERADATA=0" - "-DQT5_BUILD=1" - "-Wno-dev" - ]; - - # these libraries are only searched for at runtime so we need to force-link them - env.NIX_LDFLAGS = toString [ - "-lgvc" - "-lmysqlclient" - "-lecpg" - "-lssl" - "-L${libmysqlclient}/lib/mariadb" - ]; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.getBin graphviz}/bin" - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - description = "Tora SQL tool"; - mainProgram = "tora"; - maintainers = with lib.maintainers; [ peterhoeg ]; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; - # fails to build on hydra since 2024 - broken = true; - }; -} diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 49028c848e91..f4734c39de7a 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -78,7 +78,7 @@ buildNodejs { revert = true; }) ] - ++ lib.optionals stdenv.is32bit [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ # see: https://github.com/nodejs/node/issues/58458 ./v24-32bit.patch # TODO: remove once included in an future upstream release diff --git a/pkgs/kde/frameworks/kcalendarcore/default.nix b/pkgs/kde/frameworks/kcalendarcore/default.nix index 05f1023a9b61..62da895af35b 100644 --- a/pkgs/kde/frameworks/kcalendarcore/default.nix +++ b/pkgs/kde/frameworks/kcalendarcore/default.nix @@ -6,6 +6,8 @@ mkKdeDerivation { pname = "kcalendarcore"; + hasPythonBindings = true; + extraBuildInputs = [ qtdeclarative libical diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 44ea407b61f6..32cfa04a2737 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/attica-6.25.0.tar.xz", - "hash": "sha256-+jnMdM00/9S+uQYJml9C5BgEMrWDmnWkslHAri+wGrE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/attica-6.26.0.tar.xz", + "hash": "sha256-6y09LYsSwqtNGSxK5vB7AYikCqACswVttjabR7L535Y=" }, "baloo": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/baloo-6.25.0.tar.xz", - "hash": "sha256-13RvV0LZb4XBG2Shquimrx8g5VuBX4Haik5sPFFyotk=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/baloo-6.26.0.tar.xz", + "hash": "sha256-cC9bhoqu9IFTxsOCgRGzszVAMHlJGo83BD69icaZWzA=" }, "bluez-qt": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/bluez-qt-6.25.0.tar.xz", - "hash": "sha256-5yjJaNYzz9WSHdXPW0JKM/F6doLRx4BDfhVxCqP/IQE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/bluez-qt-6.26.0.tar.xz", + "hash": "sha256-6+swHq627GcpsnlpVWg5FlulguviQrQs3nHI+qgNY98=" }, "breeze-icons": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/breeze-icons-6.25.0.tar.xz", - "hash": "sha256-IYhJLYPq2Ayug8uw24DKwLVTiOouPgLUNjVLbKJVnQw=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/breeze-icons-6.26.0.tar.xz", + "hash": "sha256-ThI/rFEd+rK3xQWFeEmlzs+sLOYZTjIwxRzuwxZ2sG4=" }, "extra-cmake-modules": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/extra-cmake-modules-6.25.0.tar.xz", - "hash": "sha256-/+tJUb8JsrjuF+8koott5lDA2w9Z3f+5AJs3ysY680g=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/extra-cmake-modules-6.26.0.tar.xz", + "hash": "sha256-9OENnUWq+1Jz6ZYZYED05CDwvEBxwggoKq6U2a2OF0M=" }, "frameworkintegration": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/frameworkintegration-6.25.0.tar.xz", - "hash": "sha256-641VvQTLAj6gSAz4LDltY7ShSufl9gljoAoNWPR6gCI=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/frameworkintegration-6.26.0.tar.xz", + "hash": "sha256-hOu605tVnicbzsSBfrqRJJA8pmCtT1w/c/IaX0oyBi0=" }, "kapidox": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kapidox-6.25.0.tar.xz", - "hash": "sha256-Aa314g7R1Ng4rm5R7MBGz571im2okDJl4lOc8GVv6mc=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kapidox-6.26.0.tar.xz", + "hash": "sha256-be8hYA76d3rt2OrJdmTg49VfstwImFWebHu6/ah+Fu8=" }, "karchive": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/karchive-6.25.0.tar.xz", - "hash": "sha256-Ejomg1KrY9VIul48Po+/HXNwJeTFGJghzxDjMoq03hU=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/karchive-6.26.0.tar.xz", + "hash": "sha256-p/320LjbiNYKpSvMh9jgDZU5GhrTmksqjp8wJ7j/QDU=" }, "kauth": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kauth-6.25.0.tar.xz", - "hash": "sha256-4amyChuHGKCg6tlD5q6ZlpL+fv5rW9UT/bW6GEnkvfA=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kauth-6.26.0.tar.xz", + "hash": "sha256-5rZWIRTCy3HbbKSP3w6+0t9w4WTEgpWzVDOoCwM4WEc=" }, "kbookmarks": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kbookmarks-6.25.0.tar.xz", - "hash": "sha256-XEqMH4SZ9v8c3QNbVvb+MhJEkTsYlKjGABw6zwgsW9Y=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kbookmarks-6.26.0.tar.xz", + "hash": "sha256-guh5QoGHBobann57XdwIOfULFdkZNXSQ1Qj6zLJjUDA=" }, "kcalendarcore": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcalendarcore-6.25.0.tar.xz", - "hash": "sha256-1qGcPsDN/Gl5v94Iznxi24xS3Z3/ShPk2ol44ASA3+s=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcalendarcore-6.26.0.tar.xz", + "hash": "sha256-OGvg7uOS2EMra3+v096tld0fx0+BeQkoxYD4HmIioXw=" }, "kcmutils": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcmutils-6.25.0.tar.xz", - "hash": "sha256-zHwB6UjXBA6eAC6lN5zowF8qhfKM3UQxruEGvfBmHD0=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcmutils-6.26.0.tar.xz", + "hash": "sha256-bQgQZJtxUoEkzfnb3rizxsbTHXhzJco+SiDFNuy98tk=" }, "kcodecs": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcodecs-6.25.0.tar.xz", - "hash": "sha256-UFH+eDgD2UREojHHljW5bxJmWUlCuDb1muhGBJfHiMU=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcodecs-6.26.0.tar.xz", + "hash": "sha256-7h/jvYvNk6hNRBhqX8UDlba/Q90r+JcjOKeq1yqgvLQ=" }, "kcolorscheme": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcolorscheme-6.25.0.tar.xz", - "hash": "sha256-laijeBd2X5EMWbJpqZWFV1Bbmf9pj9bSILyxZtXjAvU=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcolorscheme-6.26.0.tar.xz", + "hash": "sha256-dBSaA3m9i/ZZDTwff4xQNmXg862vwq29RPxrt2TJafE=" }, "kcompletion": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcompletion-6.25.0.tar.xz", - "hash": "sha256-5BONUl654nqSItZV5BLA3otL17NCidHHylqAjiC1Mjg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcompletion-6.26.0.tar.xz", + "hash": "sha256-lfceuAfk3kDs3+cjTJw9hEQjFxrFJYiuzKZC942QTkg=" }, "kconfig": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kconfig-6.25.0.tar.xz", - "hash": "sha256-jGdcnTWoZvvxtWQ1SliQGbQpzKlJ97o7oK258voVlZw=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kconfig-6.26.0.tar.xz", + "hash": "sha256-i7WqkY2OYOwUCjPbPDKUFNIxncl6FkSzaNpVdhJckrU=" }, "kconfigwidgets": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kconfigwidgets-6.25.0.tar.xz", - "hash": "sha256-xF7h9LLt6YfvyN6sSHENh9nTe7g1Xw1+Ew1VffsgKaI=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kconfigwidgets-6.26.0.tar.xz", + "hash": "sha256-O6vO8irqKT+tDbZfzb9260rJB3vHWO6NrsEICQJC6jw=" }, "kcontacts": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcontacts-6.25.0.tar.xz", - "hash": "sha256-OGgms4htazKkWD5jhJPM08+zdyL6rzGHQtcNa/Dj8Kc=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcontacts-6.26.0.tar.xz", + "hash": "sha256-3OmvNAUPzwnItOzm31oKvtuvAv6FA5/DccXhHpFEPPA=" }, "kcoreaddons": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcoreaddons-6.25.0.tar.xz", - "hash": "sha256-5/CCVXbcRK8McZRTjkgRSqJA+P00AvJwR3cfAJ4WGn4=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcoreaddons-6.26.0.tar.xz", + "hash": "sha256-kv2/q2jlLZ6s9EqZLwHLNk1jlcJEQeL9R91IojsygfY=" }, "kcrash": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kcrash-6.25.0.tar.xz", - "hash": "sha256-sblSxQB4fnYMD8o84gxu2M9IjtEG4OcrxgRQnfhNj9c=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kcrash-6.26.0.tar.xz", + "hash": "sha256-0F2Thjp0XODUq4zP9oSoSoE+5MvMaMnHpRdRB7EH6TE=" }, "kdav": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kdav-6.25.0.tar.xz", - "hash": "sha256-oWxMwbIc3yc54bogt3pSErnaq8fjlSWXcd0Hf1IA8Us=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kdav-6.26.0.tar.xz", + "hash": "sha256-dTWyuabrNeW1Od54Dy0rhGaOuX7sO3ps8U2R++a+3+w=" }, "kdbusaddons": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kdbusaddons-6.25.0.tar.xz", - "hash": "sha256-uHJGP/GHS+7/hs+VHlEEiOlZ1ZXKPSg5+46WOfv/sOI=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kdbusaddons-6.26.0.tar.xz", + "hash": "sha256-iUuy4DLG9tm0pYuLJGeGkqn05w6VP/TavaLtTptUMeI=" }, "kdeclarative": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kdeclarative-6.25.0.tar.xz", - "hash": "sha256-dpLM3/1Vgml26RaSe1mustJKd7Fq+Wf7Jl6f4M3jh/o=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kdeclarative-6.26.0.tar.xz", + "hash": "sha256-mkZOVg5DbNOmJspqq4lPQUxiEtLei5xajtozviE+ANg=" }, "kded": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kded-6.25.0.tar.xz", - "hash": "sha256-AwzIJ8N7SQohgeEgzYMbc8mnaDqHz1XQ1bM0BZ94xZA=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kded-6.26.0.tar.xz", + "hash": "sha256-QmXRFiy9f+vxbRA78b2fq4WPo/VPUnl+0JOENr7jR68=" }, "kdesu": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kdesu-6.25.0.tar.xz", - "hash": "sha256-Ca1L9f56uuQIhPi2RbIpSM0A9BjH1kOgtdUFoC729jQ=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kdesu-6.26.0.tar.xz", + "hash": "sha256-N98zoSNoULa+vXc6Guq1bKWX40dDKSTKWFU2kzfUviQ=" }, "kdnssd": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kdnssd-6.25.0.tar.xz", - "hash": "sha256-hlF1YWxRadJfB4N5jgp5GKQYGAwzgo5GHBYI5hIdNjQ=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kdnssd-6.26.0.tar.xz", + "hash": "sha256-hDna7ZxLlCp0OT2vI8jZf9qr2BuT3DR/kbu0Wiv4Ukg=" }, "kdoctools": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kdoctools-6.25.0.tar.xz", - "hash": "sha256-LFhmJX7dog8zw19kqLyrCN493bTnUbu8LgnpQd+XmRg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kdoctools-6.26.0.tar.xz", + "hash": "sha256-P76l3iFQdhMAB/PBjha4cHdP+k/IXdrOIBrAINAkX7Y=" }, "kfilemetadata": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kfilemetadata-6.25.0.tar.xz", - "hash": "sha256-eLNRarMDj+wSL4bBNw9MfYhX3eqekHJjJCr/rh3R9zg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kfilemetadata-6.26.0.tar.xz", + "hash": "sha256-91lCuaPRvgsJEM1Qoiw8Qy7e3cUGhYyNVRHd9UmAUfI=" }, "kglobalaccel": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kglobalaccel-6.25.0.tar.xz", - "hash": "sha256-gfmELxPbji1DhMDwJlDNB2RB0vupVAggkB//4dL0iX8=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kglobalaccel-6.26.0.tar.xz", + "hash": "sha256-PxnSLRQ1d+XdzIgxcP4ZpW+PZXZuQcT5wBHE373hemE=" }, "kguiaddons": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kguiaddons-6.25.0.tar.xz", - "hash": "sha256-OIUJY8uRl40I54HYGxR8e2b3j0IErYIGMeQqse9e92s=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kguiaddons-6.26.0.tar.xz", + "hash": "sha256-g3U0L4UhBPNv1ypocOuXlRg69FFlks1vpzRF6muBMXI=" }, "kholidays": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kholidays-6.25.0.tar.xz", - "hash": "sha256-E8NFQi+AK9FXquoYssy1Jw61495EkVvM5w8aQjThSXs=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kholidays-6.26.0.tar.xz", + "hash": "sha256-/E9Gy1u45HZvVQ/hqLQBcx15f89q+ny1NnkEjCFaYL4=" }, "ki18n": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/ki18n-6.25.0.tar.xz", - "hash": "sha256-f7rIvIj1yxrwD2pmc4HEvOu6b0F9xqPH7vi97WyRYd4=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/ki18n-6.26.0.tar.xz", + "hash": "sha256-SEqtSGv6/vbIbY1bJlKSWOZ8dMliUMGsIS3fVoRIx8A=" }, "kiconthemes": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kiconthemes-6.25.0.tar.xz", - "hash": "sha256-9o8NgQpT7Fifu8CwXTdU4r0m4LfDzrOThpiwhwKuENU=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kiconthemes-6.26.0.tar.xz", + "hash": "sha256-7WwMC/7VF91bZGLZschOvnvJnHp1IUkhtZePCG34ZT0=" }, "kidletime": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kidletime-6.25.0.tar.xz", - "hash": "sha256-ZOg9RqFbREAXxjQeR54im71su4Mg7xNZdzc3zuid18o=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kidletime-6.26.0.tar.xz", + "hash": "sha256-8O/WfuDlteuSAOkk6UeMHssXm0o44M8SWzd+f6Nz7wc=" }, "kimageformats": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kimageformats-6.25.0.tar.xz", - "hash": "sha256-36DpsWooio+UIzr8uv/IfBxd3AN6ymQ5Q6q1pnaF8ms=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kimageformats-6.26.0.tar.xz", + "hash": "sha256-wZJVLuGDH9XgmvTjYzuyRybftAMRcMQoUCRoO+2vmXI=" }, "kio": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kio-6.25.0.tar.xz", - "hash": "sha256-v3GyInAW32VmZlzq1stGhybXzHCAWegS2u5+pU9AU3g=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kio-6.26.0.tar.xz", + "hash": "sha256-Vn9k25dmmGtVNdiEpdswIDaFwz5n9WiSvO/zDhvVzIo=" }, "kirigami": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kirigami-6.25.0.tar.xz", - "hash": "sha256-2n87czVXsZl1u2sSLgXS9NkhSnCoHiu25xxldho8a0M=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kirigami-6.26.0.tar.xz", + "hash": "sha256-smh4WycRmKzsf+S2F36v3uiQ4YAkXHFokW2jzP8UJf8=" }, "kitemmodels": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kitemmodels-6.25.0.tar.xz", - "hash": "sha256-q3gRmgC4Tqxl/8mG3zD7+bG40AY16PxiY3LoRYDRWMo=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kitemmodels-6.26.0.tar.xz", + "hash": "sha256-qZYgEGL/fSH525ct68LZYVdi3bD9naBppCt/17uh5h0=" }, "kitemviews": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kitemviews-6.25.0.tar.xz", - "hash": "sha256-tX841v0YSksmDQs1129sD7lr3YBHXjyn1BUQI3MOXT0=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kitemviews-6.26.0.tar.xz", + "hash": "sha256-52zJ11YdCq4isHp3VS+83fYcgGa6xc+smVisBlthfnQ=" }, "kjobwidgets": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kjobwidgets-6.25.0.tar.xz", - "hash": "sha256-dWvcChyJqOcy6nKZvTJcOLgWBNp2tM82HM/ItApueB4=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kjobwidgets-6.26.0.tar.xz", + "hash": "sha256-gFe3vRMswrRprEBvlboivDz8JAwQMUhfGfoHKrlC9x4=" }, "knewstuff": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/knewstuff-6.25.0.tar.xz", - "hash": "sha256-jDHvJafXOJRz0SJFrlZK2IhGe475EKwhLhbpM0VAzQg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/knewstuff-6.26.0.tar.xz", + "hash": "sha256-lO85B3ulOnL05VW2+UonYsunlzBhnLgKMcVDVkLr4ao=" }, "knotifications": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/knotifications-6.25.0.tar.xz", - "hash": "sha256-CISt1p8mpFXLi2Mnv4ncetOg5Dl8Q8IC/Pf/cyBOxpU=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/knotifications-6.26.0.tar.xz", + "hash": "sha256-IDOnmIVqnSd25uTO9vPrO8JLk4wNALBrL25xvkThRGo=" }, "knotifyconfig": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/knotifyconfig-6.25.0.tar.xz", - "hash": "sha256-jcN0BtjxMZMhYgF1Ls6WjL042lp2eArXhXXRG0e0QOo=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/knotifyconfig-6.26.0.tar.xz", + "hash": "sha256-Bi4i9IodpIXULvVrN9sfxQL1+TBYcUg2J9IY81dWCig=" }, "kpackage": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kpackage-6.25.0.tar.xz", - "hash": "sha256-vUZcDxwR7ExnZ8mF69FEzB79a28knn0ZvyzAS5VqZj4=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kpackage-6.26.0.tar.xz", + "hash": "sha256-MTzaSjNezbZ7uOL8wVvetZcNsX1VlygsplW/l6mKurU=" }, "kparts": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kparts-6.25.0.tar.xz", - "hash": "sha256-8NY0bjEn0eRFBnMxE75GfYtQy4JzHTAKV5kN0Juq7fE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kparts-6.26.0.tar.xz", + "hash": "sha256-BJws8Ei0y7/+C+qTV72atTuL5nK6UJsrsFj3ZNIbP1s=" }, "kpeople": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kpeople-6.25.0.tar.xz", - "hash": "sha256-i+zlg1cjMESd+nNbWJsd8nZ1nbuzofOk0TTFZ34r9Vg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kpeople-6.26.0.tar.xz", + "hash": "sha256-vRCSzZkA0O47PQjQlx5mmoLRoRyb7G4jItcTtZGRuHM=" }, "kplotting": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kplotting-6.25.0.tar.xz", - "hash": "sha256-n71Hdcmx9Wok2Q7kfNCtV8gW+79g46rrpuK2Mfez/Js=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kplotting-6.26.0.tar.xz", + "hash": "sha256-uxIPRG5r/DdhKeA2Y+SzuecUaryUjMxo2hkYeED58YE=" }, "kpty": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kpty-6.25.0.tar.xz", - "hash": "sha256-603rQkvfIDKNrAoS/aq3Fdv4AOHNCKQYjMLTB1VDcJ8=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kpty-6.26.0.tar.xz", + "hash": "sha256-dhPCbPqnRlov4ooidizrOCZkFOf0qUoSfAncBihiVVM=" }, "kquickcharts": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kquickcharts-6.25.0.tar.xz", - "hash": "sha256-FGWYoeEH6EgGMbMAH9OdJk6B3Vr2oxXexxUkRl0JkkQ=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kquickcharts-6.26.0.tar.xz", + "hash": "sha256-rj4HhKKi0Tlst1HMYfQ6Vn4GbWQ0lxJGsaGDZUgaG1I=" }, "krunner": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/krunner-6.25.0.tar.xz", - "hash": "sha256-os8MmuKWhoJQsVuERtZXBjqVxw2dGCsAeBT7We+lBBk=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/krunner-6.26.0.tar.xz", + "hash": "sha256-NRnH/hcL4TWaTDjdUmneZMAgjM/rlQZhAC3fpOkvK/A=" }, "kservice": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kservice-6.25.0.tar.xz", - "hash": "sha256-BPqfgk5Qwltq1+KSYsZWbgzhHt77n+3jFzmaiFAen3Q=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kservice-6.26.0.tar.xz", + "hash": "sha256-+FKFJMyvtqSVli3TJgxEI3eSAWnxxETxFlfqQlWKU7Y=" }, "kstatusnotifieritem": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kstatusnotifieritem-6.25.0.tar.xz", - "hash": "sha256-emOX8IsVp9UOQHwZPxd0tUiZT2+dEjJ9+7Z0Jwrfya8=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kstatusnotifieritem-6.26.0.tar.xz", + "hash": "sha256-iYkUyUgg+ZiJ2HnzPKu7X757n04kpqHZqbRDlIm8MmY=" }, "ksvg": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/ksvg-6.25.0.tar.xz", - "hash": "sha256-nAUWbiidOWA2lpRO37w7UKGq3NGeW2AgAgE8YUmkQSk=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/ksvg-6.26.0.tar.xz", + "hash": "sha256-86dBLiJ9E7HK/skcG1jdP4aYCr78CLJTW0a+82K0wH4=" }, "ktexteditor": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/ktexteditor-6.25.0.tar.xz", - "hash": "sha256-d+gV7c31cjl/XrdQ1yMrNm9sxidLs0JGq4jy8heXM7Q=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/ktexteditor-6.26.0.tar.xz", + "hash": "sha256-7HvAlPk9UUtfZ1rpXCdN0krMR3adlxYG2HCMyI+BE0E=" }, "ktexttemplate": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/ktexttemplate-6.25.0.tar.xz", - "hash": "sha256-Tp91g7Pcs3mAuZ+yrC3p6Vr4sU/poWZ1K8uDxmzibiU=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/ktexttemplate-6.26.0.tar.xz", + "hash": "sha256-i4RkPDLK9YgS/sWpEKH7mIZbx/ked4r4YPqYt50P8Dg=" }, "ktextwidgets": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/ktextwidgets-6.25.0.tar.xz", - "hash": "sha256-rbNbsZ+yfom5mWRfj51lDR3j6O2btoYSBwX9zRyw894=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/ktextwidgets-6.26.0.tar.xz", + "hash": "sha256-ZRH5kJ+Q+slR4oc6RN1FG4rHHTgIWmLGWm+1Ao5i2E0=" }, "kunitconversion": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kunitconversion-6.25.0.tar.xz", - "hash": "sha256-Np7wQt55fqZHmUxSTMQ5FbUUhQAmz920skvHi9/D3Mg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kunitconversion-6.26.0.tar.xz", + "hash": "sha256-lEBEUwEe7Dc/hY70pYCR0k+627kPlru/RwwJhkbZZ14=" }, "kuserfeedback": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kuserfeedback-6.25.0.tar.xz", - "hash": "sha256-TOn9ZyvtIM5kbNF1Ui0gfg/nU/5Cxc93PAh5J8DzD+M=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kuserfeedback-6.26.0.tar.xz", + "hash": "sha256-bMGNymWiSvKsJiy5yHYZkXAcgIGnEzSHtOyTYAPz+GQ=" }, "kwallet": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kwallet-6.25.0.tar.xz", - "hash": "sha256-b+fI9MVW20hh8ARt/hecMeeJH7bs3PozaS0lK/I9OxE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kwallet-6.26.0.tar.xz", + "hash": "sha256-IyH4WR8fIl09clP66e5h0HidsjGz7q5qX4oUwBNTE4k=" }, "kwidgetsaddons": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kwidgetsaddons-6.25.0.tar.xz", - "hash": "sha256-ip+c3kQn/+w3oFAdM3qtrj3jlzZnT1cf+KE9F9HmyTg=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kwidgetsaddons-6.26.0.tar.xz", + "hash": "sha256-ZQRIguMLMF/p+yAzGjVM2BHKnYC1x/n6ciY58zNP5jA=" }, "kwindowsystem": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kwindowsystem-6.25.0.tar.xz", - "hash": "sha256-tRRIp2ae+hgZCrf6jW9eD3fY+Yec9Ffa20YpskWgJDQ=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kwindowsystem-6.26.0.tar.xz", + "hash": "sha256-X3lit8mG53xdJfpPfQnNiRRLh4Hlfrw3/UXq7BlhuwI=" }, "kxmlgui": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/kxmlgui-6.25.0.tar.xz", - "hash": "sha256-Atl8JOwLwQLCmfNCkFa0UCXiTVnsMUZDF6MGLMH8ICE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/kxmlgui-6.26.0.tar.xz", + "hash": "sha256-Q4OFXOpaf5omnHLdoVSQuNcMHSPReVCWOTczL8XWt6A=" }, "modemmanager-qt": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/modemmanager-qt-6.25.0.tar.xz", - "hash": "sha256-Hxw+9JNEWj+SFUYt2G0l4uQ1X/vOmnABYoi+BMU3uRs=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/modemmanager-qt-6.26.0.tar.xz", + "hash": "sha256-vvRWrApZg7zBShWAyw0yoAEkHzgNkBy1A2E4VTgK86U=" }, "networkmanager-qt": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/networkmanager-qt-6.25.0.tar.xz", - "hash": "sha256-w4dJOIksQ66NSGzXtx5YbzrTaFGMv4ADTcv5dRaXZ1Y=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/networkmanager-qt-6.26.0.tar.xz", + "hash": "sha256-pc/tBq9hVhYff+5W7+FSGm6eJhGTJwafF5mYb5C0MuU=" }, "prison": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/prison-6.25.0.tar.xz", - "hash": "sha256-n0qPpXMuRRQsm6LjWjiQTUQZPvwFDhyiCkFERcOpizQ=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/prison-6.26.0.tar.xz", + "hash": "sha256-BBTdwxC8pe7Pwab51EY7im2BiU20EorEO0+MHhS3O1s=" }, "purpose": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/purpose-6.25.0.tar.xz", - "hash": "sha256-dzq/qR9QzhBBk3P9tOfgsr4AnnOfjeLzRQ0+8Wm2oj4=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/purpose-6.26.0.tar.xz", + "hash": "sha256-zHt1mdGsfOftBzUaNddC+sG35VSyCKexyS6FmztK3TA=" }, "qqc2-desktop-style": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/qqc2-desktop-style-6.25.0.tar.xz", - "hash": "sha256-wJBw5XoZa6q1DmKqxeFwUWZqiY2VrCnYhTxmNKAqudE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/qqc2-desktop-style-6.26.0.tar.xz", + "hash": "sha256-GAX6MTVf+GwCFY/SuNOW/YiDXQHbl9hwAxTEjuM2CYY=" }, "solid": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/solid-6.25.0.tar.xz", - "hash": "sha256-gXf6jxObhVhW4XFCbF8q25bXJ+YubsU2Z12hGqFXsz4=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/solid-6.26.0.tar.xz", + "hash": "sha256-hc+rmweH9ZR4ZhFAmXxIX62rYs7FNf/O8pU9MS9zbEo=" }, "sonnet": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/sonnet-6.25.0.tar.xz", - "hash": "sha256-UQUh8UBJFJQ7MUHgsRHyMwu+799AQF+TwM97hKjBxYk=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/sonnet-6.26.0.tar.xz", + "hash": "sha256-OsThZcCzx57aQWt1S7g3KS81QYihIg8gZfV/aGSJryU=" }, "syndication": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/syndication-6.25.0.tar.xz", - "hash": "sha256-lT9ZNbGgunwscMwhPAFE2cc4VcgCoVJb5sCGVDQo+Vc=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/syndication-6.26.0.tar.xz", + "hash": "sha256-YTC4vJdssHjto0uDPs1VihVrTmvEy1XlesNiyymYukc=" }, "syntax-highlighting": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/syntax-highlighting-6.25.0.tar.xz", - "hash": "sha256-iu7kKOgqyWqtAbvUI1GHBdIU4POlrB/WQ4lWXQjl1QE=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/syntax-highlighting-6.26.0.tar.xz", + "hash": "sha256-pOhtFnzV88QxhYQRlFH4kVUcJM1KD/H375XiR2o5xaw=" }, "threadweaver": { - "version": "6.25.0", - "url": "mirror://kde/stable/frameworks/6.25/threadweaver-6.25.0.tar.xz", - "hash": "sha256-90yjH1VZ9VhwSW31Ny2gnftAnhl8xuD2YJebmM1hFEQ=" + "version": "6.26.0", + "url": "mirror://kde/stable/frameworks/6.26/threadweaver-6.26.0.tar.xz", + "hash": "sha256-rTLa6vrGIHdZCIXzq8S8rBq7xvrrNMILMvYEBkj33hs=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 623eb89a127b..9a08af3eb75c 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -3,6 +3,8 @@ fetchurl, kio-extras, cmake, + pkg-config, + extra-cmake-modules, libsForQt5, samba, libssh, @@ -25,43 +27,47 @@ stdenv.mkDerivation rec { hash = "sha256-qar1jzuALINBu6HOuVBU+RUFnqRH9Z/8e5M8ynGxKsk="; }; - nativeBuildInputs = with libsForQt5; [ + nativeBuildInputs = [ cmake + pkg-config extra-cmake-modules - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; - buildInputs = with libsForQt5; [ - qtbase + buildInputs = + with libsForQt5; + with libsForQt5.__internalKF5; + [ + qtbase - kactivities - kactivities-stats - karchive - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdnssd - kdoctools - kdsoap - kguiaddons - ki18n - kio - # libkexiv2 - phonon - solid - syntax-highlighting + kactivities + kactivities-stats + karchive + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdnssd + kdoctools + kdsoap + kguiaddons + ki18n + kio + # libkexiv2 + # phonon + solid + syntax-highlighting - samba - libssh - libmtp - libimobiledevice - gperf - libtirpc - openexr - taglib - libappimage - ]; + samba + libssh + libmtp + libimobiledevice + gperf + libtirpc + openexr + taglib + libappimage + ]; meta = kio-extras.meta; } diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index ee32c6ccbc42..2d7b54ab7530 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -31,17 +31,17 @@ mkKdeDerivation { "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" - "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.__internalKF5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5Kirigami2_DIR=${libsForQt5.__internalKF5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" ]; # Move Qt5 plugin to Qt5 plugin path diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 1f4790f09a29..236f7f098fb1 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -7,6 +7,7 @@ libsForQt5, wayland-scanner, + extra-cmake-modules, plasma-wayland-protocols, wayland, wayland-protocols, @@ -21,15 +22,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - libsForQt5.extra-cmake-modules + extra-cmake-modules ]; buildInputs = [ libsForQt5.qtbase libsForQt5.qtwayland - libsForQt5.kwayland - libsForQt5.kwindowsystem + libsForQt5.__internalKF5.kwayland + libsForQt5.__internalKF5.kwindowsystem plasma-wayland-protocols wayland diff --git a/pkgs/kde/plasma/oxygen/default.nix b/pkgs/kde/plasma/oxygen/default.nix index 7d4eb0c37874..709405ef0a1b 100644 --- a/pkgs/kde/plasma/oxygen/default.nix +++ b/pkgs/kde/plasma/oxygen/default.nix @@ -27,20 +27,20 @@ mkKdeDerivation { "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" - "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" - "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" - "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5Completion_DIR=${libsForQt5.__internalKF5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.__internalKF5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5I18n_DIR=${libsForQt5.__internalKF5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5Kirigami2_DIR=${libsForQt5.__internalKF5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5Service_DIR=${libsForQt5.__internalKF5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" ]; # Move Qt5 plugin to Qt5 plugin path diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index 1de1631826fe..4fbb8512d45c 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -39,26 +39,26 @@ mkKdeDerivation { "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" "-DQtWaylandScanner_EXECUTABLE=${libsForQt5.qtwayland.dev}/bin/qtwaylandscanner" - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Bookmarks_DIR=${libsForQt5.kbookmarks.dev}/lib/cmake/KF5Bookmarks" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5ItemViews_DIR=${libsForQt5.kitemviews.dev}/lib/cmake/KF5ItemViews" - "-DKF5JobWidgets_DIR=${libsForQt5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets" - "-DKF5KIO_DIR=${libsForQt5.kio.dev}/lib/cmake/KF5KIO" - "-DKF5Notifications_DIR=${libsForQt5.knotifications.dev}/lib/cmake/KF5Notifications" - "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" - "-DKF5Solid_DIR=${libsForQt5.solid.dev}/lib/cmake/KF5Solid" - "-DKF5Wayland_DIR=${libsForQt5.kwayland.dev}/lib/cmake/KF5Wayland" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" - "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" - "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" + "-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Bookmarks_DIR=${libsForQt5.__internalKF5.kbookmarks.dev}/lib/cmake/KF5Bookmarks" + "-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Completion_DIR=${libsForQt5.__internalKF5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5I18n_DIR=${libsForQt5.__internalKF5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5ItemViews_DIR=${libsForQt5.__internalKF5.kitemviews.dev}/lib/cmake/KF5ItemViews" + "-DKF5JobWidgets_DIR=${libsForQt5.__internalKF5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets" + "-DKF5KIO_DIR=${libsForQt5.__internalKF5.kio.dev}/lib/cmake/KF5KIO" + "-DKF5Notifications_DIR=${libsForQt5.__internalKF5.knotifications.dev}/lib/cmake/KF5Notifications" + "-DKF5Service_DIR=${libsForQt5.__internalKF5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5Solid_DIR=${libsForQt5.__internalKF5.solid.dev}/lib/cmake/KF5Solid" + "-DKF5Wayland_DIR=${libsForQt5.__internalKF5.kwayland.dev}/lib/cmake/KF5Wayland" + "-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5XmlGui_DIR=${libsForQt5.__internalKF5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; extraBuildInputs = [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b1f63011bbfe..2ee755b02d98 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -1188,12 +1188,12 @@ in tmux-toggle-popup = mkTmuxPlugin rec { pluginName = "tmux-toggle-popup"; rtpFilePath = "toggle-popup.tmux"; - version = "0.4.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = "loichyan"; repo = "tmux-toggle-popup"; tag = "v${version}"; - hash = "sha256-tiiM5ETSrceyAyqhYRXjG1qCbjzZ0NJL5GWWbWX7Cbo="; + hash = "sha256-daUCkt1Np8ZYvLc3Bx0HvhnI988q7lIayJju/GB6Klw="; }; meta = { homepage = "https://github.com/loichyan/tmux-toggle-popup"; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ad0e93b1d921..7ede2b1b8db3 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,38 +5,38 @@ "lts": false }, "6.1": { - "version": "6.1.170", - "hash": "sha256:0i29gilsvl7vx7p6vqg0bc0d40ir1b968hyfjhdfms55g4pr2y5m", + "version": "6.1.172", + "hash": "sha256:16dlfdzjcsc21m5sfbhamg8y3ay54rz8a0qqvqrmxq691mhjwrzi", "lts": true }, "5.15": { - "version": "5.15.204", - "hash": "sha256:1kfvfvzhdgjcj1pa2aqks3iah00ilfpp1i9bmbwjr3na0crlrzcv", + "version": "5.15.206", + "hash": "sha256:07z6lla7xpnn4sn3l4zw3x7m8ih8w6h54k71qrxrf5zv9i7wxijz", "lts": true }, "5.10": { - "version": "5.10.254", - "hash": "sha256:17c63anhn63n2qki4n92xdr3cij6n3wmfa4sqai87kd1jyjkqivm", + "version": "5.10.255", + "hash": "sha256:19v6g2fq4nqv38irlcd9x14s6d398c56mxzpyc03q4xmpy3v6mir", "lts": true }, "6.6": { - "version": "6.6.137", - "hash": "sha256:1i2npnsnhk41a88vimr521rxg77kljbkqmlyk1zrv7z4ic6ykwcj", + "version": "6.6.138", + "hash": "sha256:03x8ald0sjzdb6kpzrw8adnc78r3mdxrx8mzbxbpwp35vdgnpl5d", "lts": true }, "6.12": { - "version": "6.12.86", - "hash": "sha256:0pdvdpr3nnvh4479j4z5k6i1qkrlzbzigmzqvffg7jy74yrj5vzd", + "version": "6.12.87", + "hash": "sha256:0c4qidff0qs2x0mvba83cw3ksaz2af3xwabvc839xvsc9djaf4nc", "lts": true }, "6.18": { - "version": "6.18.27", - "hash": "sha256:1sp2bj3r3n9cn50wsp5nlmkr37d282bba40ryz5s42vgjj9pn095", + "version": "6.18.28", + "hash": "sha256:0x3vsz25ci192zcv1vmi1lnbdmpafvzbzcja1fighv2qhfa7hq7k", "lts": true }, "7.0": { - "version": "7.0.4", - "hash": "sha256:19spjbd4yc057xl9q79sv5fsvp75k4j082d7lqhxnnlj9kc8286r", + "version": "7.0.5", + "hash": "sha256:0g5c732144ig8rk2nrlsbwdh88q5ghi3n1n6c3y9jlv7q6hv0pwn", "lts": false } } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 935534ec2e3b..8e0f2fc60120 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.25"; - hash = "sha256-MC2hFOGC7WL0mrD4JEeCgRCNBYBYDt63jIP+HCgnTAg="; + version = "6.18.27"; + hash = "sha256-KfCMx6MJw0ELaE12vPC4V5AJV8/EFHLVAUaJS1POl40="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.0.2"; - hash = "sha256-RXdgP6jpy6GfZ70WG6k6rrryjHV2uUaqy4e+4jCgJek="; + version = "7.0.4"; + hash = "sha256-2JOiCfDWfH1nvF0a8D0wOc1tzvc+NCy7cH7Eb8W+FnA="; }; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 8f07e6479bb3..ca2ca6fbb412 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,7 +18,7 @@ in buildLinux ( args // rec { - version = "7.0.3"; + version = "7.0.5"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "16qbgrqq8wkp5gyy60n6rabpbyv47imaw9pnndg2mzisbb3cb808"; + sha256 = "1xnxjknlsx4fr6jf62ncvnad7r7nxkjpkaj9fdj0fqq8h4bpkhh1"; }; # This is based on the following source: diff --git a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix index b974c08af984..180d55a91494 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix @@ -1,5 +1,6 @@ { lib, + config, buildPlatform, callPackage, kaem, @@ -7,6 +8,12 @@ checkMeta, }: rec { + maybeContentAddressed = lib.optionalAttrs config.contentAddressedByDefault { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + derivationWithMeta = attrs: let @@ -18,6 +25,7 @@ rec { inherit (buildPlatform) system; inherit (meta) name; } + // maybeContentAddressed // (removeAttrs attrs [ "meta" "passthru" diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 676aca2ee11f..bbf03f18e69c 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { zstd uthash ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ bpftools elfutils libbpf @@ -153,7 +153,7 @@ stdenv.mkDerivation { ''; postInstall = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Fix the bash completion location installShellCompletion --bash $out/etc/bash_completion.d/sysdig rm $out/etc/bash_completion.d/sysdig diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index 8c26a68b877e..b28159b0c1ac 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -21,7 +21,7 @@ callPackage ./generic.nix args { tests = { inherit (nixosTests.zfs) series_2_3; } - // lib.optionalAttrs stdenv.isx86_64 { + // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { inherit (nixosTests.zfs) installer; }; diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix index 089954fba0a0..e63787fd7a4b 100644 --- a/pkgs/os-specific/linux/zfs/2_4.nix +++ b/pkgs/os-specific/linux/zfs/2_4.nix @@ -21,7 +21,7 @@ callPackage ./generic.nix args { tests = { inherit (nixosTests.zfs) series_2_4; } - // lib.optionalAttrs stdenv.isx86_64 { + // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { inherit (nixosTests.zfs) installer; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d6e6f1db85f1..6df6e6e8f35c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2026.5.0"; + version = "2026.5.1"; components = { "3_day_blinds" = ps: with ps; [ @@ -508,7 +508,8 @@ ]; "autoskope" = ps: with ps; [ - ]; # missing inputs: autoskope_client + autoskope-client + ]; "avea" = ps: with ps; [ avea @@ -1235,8 +1236,9 @@ "denon_rs232" = ps: with ps; [ aiousbwatcher + denon-rs232 serialx - ]; # missing inputs: denon-rs232 + ]; "denonavr" = ps: with ps; [ denonavr @@ -1396,8 +1398,9 @@ ps: with ps; [ aiohasupervisor cronsim + python-dropbox-api securetar - ]; # missing inputs: python-dropbox-api + ]; "droplet" = ps: with ps; [ pydroplet @@ -1421,7 +1424,8 @@ ]; "duco" = ps: with ps; [ - ]; # missing inputs: python-duco-client + python-duco-client + ]; "dunehd" = ps: with ps; [ pdunehd @@ -1449,7 +1453,8 @@ ]; "earn_e_p1" = ps: with ps; [ - ]; # missing inputs: earn-e-p1 + earn-e-p1 + ]; "eastron" = ps: with ps; [ ]; @@ -1760,9 +1765,10 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + eurotronic-cometblue-ha habluetooth serialx - ]; # missing inputs: eurotronic-cometblue-ha + ]; "event" = ps: with ps; [ ]; @@ -2066,7 +2072,8 @@ ]; "fumis" = ps: with ps; [ - ]; # missing inputs: fumis + fumis + ]; "futurenow" = ps: with ps; [ pyfnip @@ -3249,7 +3256,8 @@ ]; "kiosker" = ps: with ps; [ - ]; # missing inputs: kiosker-python-api + kiosker-python-api + ]; "kira" = ps: with ps; [ pykira @@ -4478,7 +4486,8 @@ ]; "omie" = ps: with ps; [ - ]; # missing inputs: pyomie + pyomie + ]; "omnilogic" = ps: with ps; [ omnilogic @@ -4649,7 +4658,8 @@ ]; "opnsense" = ps: with ps; [ - ]; # missing inputs: aiopnsense + aiopnsense + ]; "opower" = ps: with ps; [ fnv-hash-fast @@ -6345,8 +6355,9 @@ "teleinfo" = ps: with ps; [ aiousbwatcher + pyteleinfo serialx - ]; # missing inputs: pyteleinfo + ]; "tellduslive" = ps: with ps; [ tellduslive @@ -7519,6 +7530,7 @@ "autarco" "auth" "automation" + "autoskope" "awair" "aws" "aws_s3" @@ -7609,6 +7621,7 @@ "default_config" "deluge" "demo" + "denon_rs232" "denonavr" "derivative" "devialet" @@ -7635,15 +7648,18 @@ "downloader" "dremel_3d_printer" "drop_connect" + "dropbox" "droplet" "dsmr" "dsmr_reader" "duckdns" + "duco" "dunehd" "duotecno" "dwd_weather_warnings" "dynalite" "eafm" + "earn_e_p1" "easyenergy" "ecobee" "ecoforest" @@ -7685,6 +7701,7 @@ "esphome" "essent" "eufylife_ble" + "eurotronic_cometblue" "event" "everlights" "evil_genius_labs" @@ -7739,6 +7756,7 @@ "frontier_silicon" "fujitsu_fglair" "fully_kiosk" + "fumis" "fyta" "garage_door" "garages_amsterdam" @@ -7910,6 +7928,7 @@ "keenetic_ndms2" "kegtron" "keymitt_ble" + "kiosker" "kira" "kitchen_sink" "kmtronic" @@ -8098,6 +8117,7 @@ "octoprint" "ohme" "ollama" + "omie" "omnilogic" "onboarding" "oncue" @@ -8123,6 +8143,7 @@ "opentherm_gw" "openuv" "openweathermap" + "opnsense" "opower" "oralb" "orvibo" @@ -8374,6 +8395,7 @@ "tedee" "telegram" "telegram_bot" + "teleinfo" "tellduslive" "teltonika" "temper" diff --git a/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff b/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff new file mode 100644 index 000000000000..95705df6e413 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff @@ -0,0 +1,26 @@ +diff --git a/custom_components/blueprints_updater/coordinator.py b/custom_components/blueprints_updater/coordinator.py +index 9cbbe32..92a5ab5 100644 +--- a/custom_components/blueprints_updater/coordinator.py ++++ b/custom_components/blueprints_updater/coordinator.py +@@ -3234,21 +3234,6 @@ def scan_blueprints( + continue + + full_path = os.path.join(root, file) +- real_full_path = os.path.realpath(full_path) +- try: +- if ( +- os.path.commonpath([real_full_path, real_blueprint_path]) +- != real_blueprint_path +- ): +- _LOGGER.warning( +- "Security alert: Ignoring blueprint symlink outside root: %s", +- full_path, +- ) +- continue +- except (ValueError, OSError): +- _LOGGER.warning("Skipping blueprint with invalid path: %s", full_path) +- continue +- + if relative_path := get_blueprint_relative_path(hass, full_path): + try: + with open(full_path, encoding="utf-8") as f: diff --git a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix new file mode 100644 index 000000000000..f003f9aec3ee --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix @@ -0,0 +1,64 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + h2, + home-assistant, + pytest-cov-stub, + pytest-homeassistant-custom-component, + pytest-asyncio, + pytestCheckHook, +}: + +buildHomeAssistantComponent rec { + owner = "luuquangvu"; + domain = "blueprints_updater"; + version = "2.4.0"; + + src = fetchFromGitHub { + inherit owner; + repo = "blueprints-updater"; + tag = version; + hash = "sha256-O5HGjnj9fz+RrCq6sgdYlU1r9qFJhmUdfYWdFrwFngw="; + }; + + patches = [ + # Do not skip blueprints symlinked from the nix store. + # They cannot be updated, but users probably still want to be notified if they have an update. + ./allow-symlinked-blueprints.diff + ]; + + postPatch = '' + # avoid dependency on rather big pytest-timeout + substituteInPlace pyproject.toml \ + --replace-fail '"--timeout=60"' "" + ''; + + dependencies = [ + h2 + ]; + + nativeCheckInputs = [ + home-assistant + pytest-asyncio + pytest-cov-stub + pytest-homeassistant-custom-component + pytestCheckHook + ]; + + disabledTests = [ + # pytest-homeassistant-custom-component tries to create temporary directories inside the nix store + "test_async_fetch_content_forum_invalid_json_sets_fetch_error" + "test_full_update_lifecycle" + "test_restore_blueprint_service" + "test_update_all_service" + ]; + + meta = { + description = "Automatically update Home Assistant blueprints via native update entities"; + homepage = "https://github.com/luuquangvu/blueprints-updater/"; + changelog = "https://github.com/luuquangvu/blueprints-updater/releases/tag/${src.tag}"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/dreo/package.nix b/pkgs/servers/home-assistant/custom-components/dreo/package.nix index f87f1e76f1a5..1835c4fee487 100644 --- a/pkgs/servers/home-assistant/custom-components/dreo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dreo/package.nix @@ -28,6 +28,10 @@ buildHomeAssistantComponent rec { pytestCheckHook ]; + pytestFlags = [ + "-Wignore::pytest.PytestRemovedIn9Warning" + ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix index fe84229bd446..5616b761e4f8 100644 --- a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix +++ b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "homeassistant-ai"; domain = "ha_mcp_tools"; - version = "7.3.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "homeassistant-ai"; repo = "ha-mcp"; tag = "v${version}"; - hash = "sha256-boWqv8lSN/UiqSRhVBgbucX+RC6q14Oa4WzkJPeZzVw="; + hash = "sha256-F13BoZinPnv+tlkiVnG7iAkr2JdEbFE0RIEgmHa/yq4="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/mass-queue/package.nix b/pkgs/servers/home-assistant/custom-components/mass-queue/package.nix new file mode 100644 index 000000000000..333f562ecead --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/mass-queue/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + music-assistant-client, +}: + +buildHomeAssistantComponent rec { + owner = "droans"; + domain = "mass_queue"; + version = "0.10.1"; + + src = fetchFromGitHub { + inherit owner; + repo = "mass_queue"; + tag = "v${version}"; + hash = "sha256-Q41/DAwXByeq0Qim3U735XYpLsI2DQqe5r1mJ3N/I2w="; + }; + + dependencies = [ + music-assistant-client + ]; + + # tests are being fixed in https://github.com/droans/mass_queue/pull/107 + doCheck = false; + + meta = { + changelog = "https://github.com/droans/mass_queue/releases/tag/${src.tag}"; + description = "Actions to control player queues for Music Assistant"; + homepage = "https://github.com/droans/mass_queue"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index e4c2cc79fdd9..8565ff7b7d1f 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -30,6 +30,11 @@ buildHomeAssistantComponent rec { # tests try to open sockets "test_manual_flow_ac_device" "test_manual_flow_cc_device" + # lingering datacoordinator timer on test teardown + "test_refresh_apply_race_condition" + "test_refresh_apply_race_condition_with_proxy" + "test_group5_entity_request_enable" + "test_energy_sensor_request_enable" ]; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix index 8b26b86637a2..fbd3497d1b82 100644 --- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix @@ -28,6 +28,10 @@ buildHomeAssistantComponent rec { mock ]; + pytestFlags = [ + "-Wignore::pytest.PytestRemovedIn9Warning" + ]; + disabledTestPaths = [ # Integration tests require a valid Octopus Energy API Key # https://github.com/BottlecapDave/HomeAssistant-OctopusEnergy/blob/develop/CONTRIBUTING.md#integration-tests diff --git a/pkgs/servers/home-assistant/custom-components/pi-hole-v6/package.nix b/pkgs/servers/home-assistant/custom-components/pi-hole-v6/package.nix new file mode 100644 index 000000000000..7d6bfe7c7fa9 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/pi-hole-v6/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, +}: + +buildHomeAssistantComponent rec { + owner = "bastgau"; + domain = "pi_hole_v6"; + version = "1.17.0"; + + src = fetchFromGitHub { + inherit owner; + repo = "ha-pi-hole-v6"; + tag = "v${version}"; + hash = "sha256-C9QqdAFe1P5bzuMuYWCy8hQINAbc/yOIxdxp2jpM2N8="; + }; + + # has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/bastgau/ha-pi-hole-v6/releases/tag/${src.tag}"; + description = "Pi-hole V6 Integration for Home Assistant"; + longDescription = '' + This custom integration restored compatibility between Home Assistant and Pi-hole, which was no longer supported by the native integration. + Today, this integration offers additional and complementary features. + ''; + homepage = "https://github.com/bastgau/ha-pi-hole-v6"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/plant/package.nix b/pkgs/servers/home-assistant/custom-components/plant/package.nix index 0ac0d110a557..5d89ead15ac6 100644 --- a/pkgs/servers/home-assistant/custom-components/plant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/plant/package.nix @@ -3,6 +3,7 @@ async-timeout, buildHomeAssistantComponent, fetchFromGitHub, + pytest-freezer, pytest-homeassistant-custom-component, pytestCheckHook, }: @@ -10,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "olen"; domain = "plant"; - version = "2026.3.2"; + version = "2026.5.0"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-plant"; tag = "v${version}"; - hash = "sha256-na3T60v4HRmdf8NFIqnLdSQjFfg0Jlny0tse5nx21Zs="; + hash = "sha256-CuDBDVotmNqvHm63FrhaZ9i8l528wSCKHjBFcHCB8aQ="; }; dependencies = [ @@ -24,6 +25,7 @@ buildHomeAssistantComponent rec { ]; nativeCheckInputs = [ + pytest-freezer pytest-homeassistant-custom-component pytestCheckHook ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 3dfe4ff0e434..c8a14915f633 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -20,12 +20,18 @@ stdenv.mkDerivation (finalAttrs: { leaveDotGit = true; # gitInfo plugin }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/dermotduffy/advanced-camera-card/blob/main/package.json#L201 + ./yarn-4.14-support.patch + ]; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { name = "${finalAttrs.pname}-yarn-deps"; - inherit (finalAttrs) src missingHashes; - hash = "sha256-N5GL9//CS33ntGu8v6i9+S38BDsXDD7HvOask1JflJ8="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-4fdSeSxSjd8EjPmu7U3ftxB+OJJc2uuvM3Umr5iY/a8="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/yarn-4.14-support.patch b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/yarn-4.14-support.patch new file mode 100644 index 000000000000..017f2d295ca9 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/yarn-4.14-support.patch @@ -0,0 +1,21 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1 +1,6 @@ + nodeLinker: node-modules ++ ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix index 15555be3ee4b..7664dfc4f47a 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix @@ -16,14 +16,20 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-z2cJ6BIhNnzUo9nIFxVyrPBVWSKf35fyLXK72pE8TJw="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/rejuvenate/lovelace-horizon-card/blob/main/package.json#L4 + ./yarn-4.14-support.patch + ]; + nativeBuildInputs = [ yarn-berry yarn-berry.yarnBerryConfigHook ]; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src; - hash = "sha256-LYPHBnDRcGeXo2btx1A4/e7fr7MYg/2G5GkuG/xDG+I="; + inherit (finalAttrs) src patches; + hash = "sha256-KWbXvivHxoV4xQuY2m/wpajjIZcypeh6nuvRVnrtFM0="; }; buildPhase = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/yarn-4.14-support.patch b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/yarn-4.14-support.patch new file mode 100644 index 000000000000..75225db95b78 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/yarn-4.14-support.patch @@ -0,0 +1,20 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1,2 +1,5 @@ + nodeLinker: node-modules + nmMode: hardlinks-local ++approvedGitRepositories: ++ - "**" ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix index 59facd75fa96..58f41b53f83d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix @@ -4,24 +4,24 @@ fetchFromGitHub, bun, nodejs-slim, + nix-update-script, writableTmpDirAsHomeHook, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "navbar-card"; version = "1.6.0"; src = fetchFromGitHub { owner = "joseluis9595"; repo = "lovelace-navbar-card"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ngKsH83nrDglRQBdQhJzMC8/TRV+uL21vi2ovsLEPuY="; }; - # Create node_modules as a separate derivation node_modules = stdenv.mkDerivation { - pname = "${pname}-node_modules"; - inherit version src; + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; nativeBuildInputs = [ bun @@ -40,6 +40,7 @@ let --frozen-lockfile \ --ignore-scripts \ --no-progress \ + --omit=optional \ --production runHook postBuild @@ -57,15 +58,10 @@ let # Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-F8nNDBl/BYhtwggaZd61oibYE4j5u7WPVjLG8P4UEcc="; - outputHashAlgo = "sha256"; + outputHash = "sha256-By1ZTJ+cZO+vhs0BL8HSu36k+dvG0WPRnuUwIoaclnw="; outputHashMode = "recursive"; }; -in -stdenv.mkDerivation { - inherit pname version src; - nativeBuildInputs = [ bun nodejs-slim @@ -75,7 +71,7 @@ stdenv.mkDerivation { runHook preConfigure # Copy node_modules from the separate derivation - cp -R ${node_modules}/node_modules . + cp -R ${finalAttrs.node_modules}/node_modules . runHook postConfigure ''; @@ -84,7 +80,7 @@ stdenv.mkDerivation { runHook preBuild # Build the project using bun - bun build src/navbar-card.ts --outfile=dist/navbar-card.js --target=browser + NODE_ENV=production bun build src/navbar-card.ts --outfile=dist/navbar-card.js --target=browser runHook postBuild ''; @@ -98,13 +94,25 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.entrypoint = "navbar-card.js"; + passthru = { + entrypoint = "navbar-card.js"; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; + }; meta = { description = "Navbar Card for Home Assistant's Lovelace UI - easily navigate through dashboards"; homepage = "https://github.com/joseluis9595/lovelace-navbar-card"; - changelog = "https://github.com/joseluis9595/lovelace-navbar-card/releases/tag/v${version}"; + changelog = "https://github.com/joseluis9595/lovelace-navbar-card/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; maintainers = [ lib.maintainers.jamiemagee ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sonos-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sonos-card/package.nix new file mode 100644 index 000000000000..55f0f7e61901 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sonos-card/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "sonos-card"; + version = "10.6.8"; + + src = fetchFromGitHub { + owner = "punxaphil"; + repo = "custom-sonos-card"; + tag = "v${version}"; + hash = "sha256-hs2NU/2m/PpjdX9Te5MnXwPoyYVruJbcCKdD004ARxc="; + }; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "npm run lint -- --fix &&" "" \ + --replace-fail "&& bash create-dist-maxi-media-player.sh" "" + ''; + + npmDepsHash = "sha256-dCxu4SKAzEI2sGyZMEMPxmrGA3LE1jppG4VAVq45vSs="; + + installPhase = '' + runHook preInstall + + install -D dist/custom-sonos-card.js $out/custom-sonos-card.js + + runHook postInstall + ''; + + passthru.entrypoint = "custom-sonos-card.js"; + + meta = { + changelog = "https://github.com/punxaphil/custom-sonos-card/releases/tag/${src.tag}"; + description = "Lovelace card for controlling Sonos speakers in Home Assistant"; + homepage = "https://github.com/punxaphil/custom-sonos-card"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2e4c394b2ea5..faefbc37df74 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -262,7 +262,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2026.5.0"; + hassVersion = "2026.5.1"; in python.pkgs.buildPythonApplication rec { @@ -283,13 +283,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-RrXjrwl6BQzjilKluAM8oVihmZqLBpVLWN/OhaJY+1c="; + hash = "sha256-aOiJPhTaJZGbY4P9iPiIe/PrRU+IDQTNS1JFhAJyH4w="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-SXsJqYETHp92ZC/I2jS2ZlerUVVTugFdbOhLCxoLJ9I="; + hash = "sha256-Hp7jYLHMQbqYmuQVH/7XPmV6tgBdhCZXpNhmchxHCUg="; }; build-system = with python.pkgs; [ @@ -332,7 +332,10 @@ python.pkgs.buildPythonApplication rec { ]; dependencies = with python.pkgs; [ - # Only packages required in pyproject.toml + # Mirror what gets installed for Home Assistant Container, which means + # installing what is in requirements.txt. The PEP517 specification gets + # embedded in wheel metadata but only represents a subset. + # Proof: https://github.com/home-assistant/core/blob/2026.5.0/Dockerfile#L40 aiodns aiogithubapi aiohasupervisor @@ -354,23 +357,31 @@ python.pkgs.buildPythonApplication rec { cronsim cryptography fnv-hash-fast + ha-ffmpeg hass-nabucasa + hassil home-assistant-bluetooth + home-assistant-intents httpx ifaddr infrared-protocols jinja2 lru-dict + mutagen orjson packaging pillow propcache psutil-home-assistant pyjwt + pymicro-vad pyopenssl + pyspeex-noise python-slugify + pyturbojpeg pyyaml requests + rf-protocols securetar sqlalchemy standard-aifc @@ -423,11 +434,8 @@ python.pkgs.buildPythonApplication rec { ]) ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled - "assist_pipeline" "frontend" "hue" - "mobile_app" - "radio_frequency" ]; pytestFlags = [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 3af655e51534..a041f7e6c158 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.329"; + version = "0.13.330"; pyproject = true; disabled = pythonOlder "3.13"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; tag = version; - hash = "sha256-ZE/zBXWk/GXBQAJ94pBjrW2GTburiMqlvkcjCFi4NLU="; + hash = "sha256-d+wRZPHdSIjXe6vqC8P85nuThQsiEu/qA3CuIOajsZ0="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 44f1983a0620..3aba4a0529f4 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2026.5.0"; + version = "2026.5.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-awpDHL58GAO1Ijyg+wiSe/E+3XvNpN39GcSUj1cMuVY="; + hash = "sha256-ZETq0RWm5lEYTnOj7eb6u8SKol3zJBNc6ywLD3sNxmk="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 560976fff42c..2990ea4a76cf 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -1,5 +1,6 @@ { lib, + stdenv, home-assistant, }: @@ -8,185 +9,91 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { - abode = getComponentDeps "camera"; - agent_dvr = getComponentDeps "camera"; - air_quality = getComponentDeps "camera" ++ getComponentDeps "conversation"; alexa = map getComponentDeps [ "cloud" "frontend" "stream" ]; - android_ip_webcam = getComponentDeps "camera"; anthropic = getComponentDeps "ai_task" ++ getComponentDeps "openai_conversation"; assist_pipeline = getComponentDeps "frontend"; automation = getComponentDeps "frontend" ++ getComponentDeps "mobile_app"; - axis = getComponentDeps "camera" ++ getComponentDeps "deconz"; - blink = getComponentDeps "camera"; + axis = getComponentDeps "deconz"; bluetooth = getComponentDeps "switchbot"; braviatv = getComponentDeps "ssdp"; - broadlink = getComponentDeps "radio_frequency"; bthome = getComponentDeps "frontend"; - buienradar = getComponentDeps "camera"; - camera = getComponentDeps "conversation" ++ getComponentDeps "stream"; - canary = getComponentDeps "camera"; - climate = getComponentDeps "conversation"; - color_extractor = getComponentDeps "camera" ++ getComponentDeps "conversation"; + camera = getComponentDeps "stream"; deconz = getComponentDeps "frontend"; - demo = getComponentDeps "camera"; - device_tracker = getComponentDeps "conversation"; - dialogflow = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; - dlib_face_detect = getComponentDeps "image_processing"; - dlib_face_identify = getComponentDeps "image_processing"; - doorbird = getComponentDeps "camera"; - dremel_3d_printer = getComponentDeps "camera"; - elevenlabs = getComponentDeps "tts"; elkm1 = getComponentDeps "frontend"; - emulated_hue = getComponentDeps "conversation" ++ [ + emulated_hue = [ defusedxml ]; - emulated_kasa = getComponentDeps "camera" ++ getComponentDeps "conversation"; - environment_canada = getComponentDeps "camera"; - esphome = getComponentDeps "camera" ++ getComponentDeps "radio_frequency"; - fan = getComponentDeps "conversation"; - fish_audio = getComponentDeps "tts"; - foscam = getComponentDeps "camera"; - freebox = getComponentDeps "camera"; - fully_kiosk = getComponentDeps "camera"; gardena_bluetooth = getComponentDeps "husqvarna_automower_ble"; - geofency = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; go2rtc = [ tqdm ]; - google_assistant = getComponentDeps "conversation"; - google_assistant_sdk = getComponentDeps "conversation" ++ getComponentDeps "frontend"; - google_cloud = getComponentDeps "tts"; + google_assistant_sdk = getComponentDeps "frontend"; google_drive = getComponentDeps "frontend"; google_generative_ai_conversation = getComponentDeps "ai_task"; - google_translate = getComponentDeps "tts"; govee_ble = [ ibeacon-ble ]; - gpslogger = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; - group = getComponentDeps "camera" ++ getComponentDeps "conversation"; hassio = getComponentDeps "frontend" ++ getComponentDeps "homeassistant_yellow"; - hikvision = getComponentDeps "camera"; - homeassistant = getComponentDeps "camera" ++ getComponentDeps "conversation"; homeassistant_connect_zbt2 = getComponentDeps "zha"; homeassistant_hardware = getComponentDeps "otbr" ++ getComponentDeps "zha"; homeassistant_sky_connect = getComponentDeps "zha"; homeassistant_yellow = getComponentDeps "zha"; - homekit = getComponentDeps "conversation" ++ getComponentDeps "frontend"; - homekit_controller = getComponentDeps "camera"; + homekit = getComponentDeps "frontend"; http = getComponentDeps "cloud" ++ getComponentDeps "frontend"; - humidifier = getComponentDeps "conversation"; - hyperion = getComponentDeps "camera"; - ifttt = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; - image_processing = getComponentDeps "conversation"; intelliclima = getComponentDeps "intellifire"; - intent = getComponentDeps "conversation"; - kitchen_sink = getComponentDeps "radio_frequency"; - light = getComponentDeps "conversation"; - local_file = getComponentDeps "camera"; - locative = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; logbook = getComponentDeps "alexa"; lovelace = getComponentDeps "frontend" ++ [ pychromecast ]; lutron_caseta = getComponentDeps "frontend"; - mailgun = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; - marytts = getComponentDeps "tts"; mastodon = map getComponentDeps [ - "ffmpeg" "stream" - "tts" ]; - media_player = getComponentDeps "camera" ++ getComponentDeps "conversation"; - microsoft = getComponentDeps "tts"; - microsoft_face_detect = getComponentDeps "conversation"; - microsoft_face_identify = getComponentDeps "conversation"; miele = getComponentDeps "cloud"; - mjpeg = getComponentDeps "camera"; mobile_app = getComponentDeps "frontend"; mopeka = getComponentDeps "switchbot"; - motioneye = getComponentDeps "camera"; - mqtt = getComponentDeps "camera"; - nest = getComponentDeps "camera" ++ [ + nest = [ av ]; - number = getComponentDeps "conversation"; - ntfy = getComponentDeps "camera" ++ getComponentDeps "tts"; - octoprint = getComponentDeps "camera"; ollama = getComponentDeps "ai_task"; - onboarding = getComponentDeps "tts" ++ [ + onboarding = [ pymetno radios rpi-bad-power ]; - onvif = getComponentDeps "camera"; open_router = getComponentDeps "ai_task"; - openai_conversation = getComponentDeps "camera"; - openalpr_cloud = getComponentDeps "camera" ++ getComponentDeps "conversation"; - picotts = getComponentDeps "tts"; - prosegur = getComponentDeps "camera"; - prusalink = getComponentDeps "camera"; - push = getComponentDeps "camera"; raspberry_pi = [ rpi-bad-power ]; reolink = getComponentDeps "stream"; - ring = getComponentDeps "camera"; - roku = getComponentDeps "camera"; rss_feed_template = [ defusedxml ]; script = getComponentDeps "frontend" ++ getComponentDeps "mobile_app"; - sensor = getComponentDeps "camera" ++ getComponentDeps "conversation"; shelly = getComponentDeps "frontend" ++ getComponentDeps "switchbot"; - sighthound = getComponentDeps "conversation" ++ getComponentDeps "image_processing"; - skybell = getComponentDeps "camera"; - sleep_as_android = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; songpal = [ isal ]; sonos = getComponentDeps "frontend"; swiss_public_transport = getComponentDeps "cookidoo"; - switch = getComponentDeps "camera" ++ getComponentDeps "conversation"; - switch_as_x = getComponentDeps "camera" ++ getComponentDeps "conversation"; - synology_dsm = getComponentDeps "camera"; system_log = [ isal ]; - tasmota = getComponentDeps "camera"; - todo = getComponentDeps "conversation"; - traccar = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; - trafikverket_camera = getComponentDeps "camera"; - tts = getComponentDeps "conversation"; - tuya = getComponentDeps "camera"; - twilio = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera"; unifi_discovery = getComponentDeps "unifiprotect"; - unifiprotect = getComponentDeps "camera"; - universal = getComponentDeps "camera" ++ getComponentDeps "conversation"; - uvc = getComponentDeps "camera"; - vivotek = getComponentDeps "camera"; - voicerss = getComponentDeps "tts"; - weather = getComponentDeps "conversation"; - websocket_api = getComponentDeps "camera" ++ getComponentDeps "conversation"; xiaomi_miio = [ arrow ]; - yandextts = getComponentDeps "tts"; yolink = getComponentDeps "cloud"; zeroconf = getComponentDeps "shelly"; zha = getComponentDeps "deconz" ++ getComponentDeps "frontend"; - zoneminder = getComponentDeps "camera"; zwave_js = getComponentDeps "frontend"; }; extraDisabledTestPaths = { - hypontech = [ - # outdated snapshot - "tests/components/hypontech/test_sensor.py::test_sensors" - ]; influxdb = [ # These tests fail because they check for the number of warnings in the # logs and there is an extra warning in the logs: @@ -207,21 +114,6 @@ let "tests/components/minecraft_server/test_init.py" "tests/components/minecraft_server/test_sensor.py" ]; - modem_callerid = [ - # aioserial mock produces wrong state - "tests/components/modem_callerid/test_init.py::test_setup_entry" - ]; - nzbget = [ - # type assertion fails due to introduction of parameterized type - "tests/components/nzbget/test_config_flow.py::test_user_form" - "tests/components/nzbget/test_config_flow.py::test_user_form_show_advanced_options" - "tests/components/nzbget/test_config_flow.py::test_user_form_cannot_connect" - "tests/components/nzbget/test_init.py::test_async_setup_raises_entry_not_ready" - ]; - overseerr = [ - # imports broken future module - "tests/components/overseerr/test_event.py" - ]; systemmonitor = [ # sandbox doesn't grant access to /sys/class/power_supply "tests/components/systemmonitor/test_config_flow.py::test_add_and_remove_processes" @@ -229,8 +121,8 @@ let }; extraDisabledTests = { - conversation = [ - # intent fixture mismatch + conversation = lib.optionals stdenv.hostPlatform.isAarch64 [ + # intent fixture mismatch on aarch64 "test_error_no_device_on_floor" ]; ecovacs = [ @@ -245,30 +137,6 @@ let # 2026.5.0: after reload device is in loaded state instead of retry state "test_usb_device_reactivity" ]; - roborock = [ - # Translation not found for vacuum - "test_clean_segments_mixed_maps" - "test_segments_changed_issue" - ]; - sensor = [ - # Failed: Translation not found for sensor - "test_validate_unit_change_convertible" - "test_validate_statistics_unit_change_no_device_class" - "test_validate_statistics_state_class_removed" - "test_validate_statistics_state_class_removed_issue_cleaned_up" - "test_validate_statistics_unit_change_no_conversion" - "test_validate_statistics_unit_change_equivalent_units_2" - "test_update_statistics_issues" - "test_validate_statistics_mean_type_changed" - ]; - shell_command = [ - # tries to retrieve file from github - "test_non_text_stdout_capture" - ]; - vacuum = [ - # Translation not found for vacuum - "test_segments_changed_issue" - ]; zeroconf = [ # multicast socket bind, not possible in the sandbox "test_subscribe_discovery" diff --git a/pkgs/servers/home-assistant/themes/README.md b/pkgs/servers/home-assistant/themes/README.md new file mode 100644 index 000000000000..0e43f6e4f4ba --- /dev/null +++ b/pkgs/servers/home-assistant/themes/README.md @@ -0,0 +1,13 @@ +# Packaging guidelines + +## isHomeAssistantTheme + +The nixos module checks for `passthru.isHomeAssistantTheme` on every +package passed to `services.home-assistant.themes`, and rejects packages +that don't have it set. Mark a theme package like this: + +```nix +{ passthru.isHomeAssistantTheme = true; } +``` + +Themes are expected to install their `.yaml` files into `$out/themes/`. diff --git a/pkgs/servers/home-assistant/themes/material-you-theme/package.nix b/pkgs/servers/home-assistant/themes/material-you-theme/package.nix new file mode 100644 index 000000000000..65da22973d9f --- /dev/null +++ b/pkgs/servers/home-assistant/themes/material-you-theme/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "material-you-theme"; + version = "5.0.12"; + + src = fetchFromGitHub { + owner = "Nerwyn"; + repo = "material-you-theme"; + tag = version; + hash = "sha256-2wiWHU/iNIhVSJB2EqNhBi4ppsWfO9oNgfU9xU3FnrA="; + }; + + npmDepsHash = "sha256-4FNqAJlupbZT14Sy5mfCsKj7f1xK6tcpKKPrbFoSje8="; + + installPhase = '' + runHook preInstall + install -Dt $out/themes themes/material_you.yaml + runHook postInstall + ''; + + passthru.isHomeAssistantTheme = true; + + meta = { + description = "Material Design 3 Theme for Home Assistant"; + homepage = "https://github.com/Nerwyn/material-you-theme"; + changelog = "https://github.com/Nerwyn/material-you-theme/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jpinz ]; + }; +} diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index 169b829cc7b8..de1fc7d8e3ec 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.31"; - hash = "sha256-Vk/XsnYut0Hfad/X6LZw6gJX1NHc4/6XT8y1KehpLMk="; + version = "7.0.32"; + hash = "sha256-1jK7MhYF+61sa5jAqPpJwmYcXebIZgk/8gFn0037I+E="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 94567b556c1f..332ca241d14a 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -69,7 +69,7 @@ let patches = lib.optionals - (stdenv.isDarwin && lib.versionAtLeast version "7.7" && lib.versionOlder version "8.0") + (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "7.7" && lib.versionOlder version "8.0") [ # Fix VMOD section attribute on macOS # Unreleased commit on master @@ -81,7 +81,7 @@ let # PR: https://github.com/varnishcache/varnish-cache/pull/4339 ./patches/0001-fix-endian-h-compatibility-on-macos.patch ] - ++ lib.optionals (stdenv.isDarwin && lib.versionOlder version "7.6") [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder version "7.6") [ # Fix duplicate OS_CODE definitions on macOS # PR: https://github.com/varnishcache/varnish-cache/pull/4347 ./patches/0002-fix-duplicate-os-code-definitions-on-macos.patch @@ -147,7 +147,7 @@ let lib.maintainers.osnyx ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin && version == "8.0.1"; # https://github.com/NixOS/nixpkgs/issues/495368 + broken = stdenv.hostPlatform.isDarwin && version == "8.0.1"; # https://github.com/NixOS/nixpkgs/issues/495368 }; }; in diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 1ee5ca762e79..7f19be8681fa 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.28.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-T9I3tZOxAzbQxeNa77VcN+HuMmDlDrZvdncBeplui6c="; + hash = "sha256-8OWEo+X0+MuS5/74BNIOOXXnDQjeo209UfwTMqRe8ek="; }; postPatch = '' diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 385a315f9c87..3cf47e5a7334 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -261,7 +261,6 @@ let inherit (prevStage."llvmPackages_${llvmVersion}") compiler-rt libcxx; }; llvmLibrariesDarwinDepsNoCC = prevStage: { inherit (prevStage.darwin) libcxx; }; - llvmLibrariesDeps = _: { }; llvmToolsPackages = prevStage: { inherit (prevStage."llvmPackages_${llvmVersion}") @@ -666,7 +665,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert allDeps isBuiltByBootstrapFilesCompiler [ (stage1Packages prevStage) (darwinPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkDarwinPackages prevStage) @@ -739,7 +737,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ]; assert allDeps isBuiltByNixpkgsCompiler [ - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) ]; @@ -757,7 +754,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (stage1Packages prevStage) (disallowedPackages prevStage) (bintoolsPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) { inherit (prevStage) ccWrapperStdenv; @@ -818,7 +814,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ]; assert allDeps isBuiltByNixpkgsCompiler [ - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) (sdkPackages prevStage) (sdkDarwinPackages prevStage) @@ -837,7 +832,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check mergeDisjointAttrs [ (stage1Packages prevStage) (disallowedPackages prevStage) - (llvmLibrariesDeps prevStage) (sdkPackages prevStage) { inherit (prevStage) ccWrapperStdenv; @@ -894,7 +888,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert allDeps isBuiltByNixpkgsCompiler [ (bintoolsPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) (llvmToolsDeps prevStage) (llvmToolsPackages prevStage) @@ -915,7 +908,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check mergeDisjointAttrs [ (bintoolsPackages prevStage) (disallowedPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkPackagesNoCC prevStage) @@ -965,7 +957,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (lib.filterAttrs (_: pkg: lib.getName pkg != "pkg-config-wrapper") (stage1Packages prevStage)) # pkg-config is a wrapper (bintoolsPackages prevStage) (darwinPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) (llvmToolsDeps prevStage) (llvmToolsPackages prevStage) @@ -1099,7 +1090,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check overrides = self: super: mergeDisjointAttrs [ - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkPackagesNoCC prevStage) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 12a6dffb426f..7df90e856846 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -13,25 +13,29 @@ stdenv: let # Lib attributes are inherited to the lexical scope for performance reasons. inherit (lib) - assertMsg + all attrNames concatLists concatMap concatMapStrings + concatMapStringsSep concatStringsSep elem extendDerivation filter filterAttrs + foldl' getDev head - foldl' + intersectAttrs isAttrs isBool isDerivation isInt isList + isPath isString + listToAttrs mapAttrs mapNullable optional @@ -39,15 +43,22 @@ let optionals pipe remove + seq splitString subtractLists + toExtension toFunction + typeOf unique + unsafeDiscardStringContext + unsafeGetAttrPos + warnIf zipAttrsWith - isPath - seq ; + inherit (lib.generators) toPretty; + inherit (lib.strings) sanitizeDerivationName; + inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags; inherit (import ../../build-support/lib/meson.nix { inherit lib stdenv; }) makeMesonFlags; @@ -100,10 +111,10 @@ let final: let prev = rattrs final; - thisOverlay = lib.toExtension f0 final prev; - pos = builtins.unsafeGetAttrPos "version" thisOverlay; + thisOverlay = toExtension f0 final prev; + pos = unsafeGetAttrPos "version" thisOverlay; in - lib.warnIf + warnIf ( prev ? src && thisOverlay ? version @@ -164,6 +175,10 @@ let "zerocallusedregs" ]; + concretizeFlagImplications = + flag: impliesFlags: list: + if elem flag list then (list ++ impliesFlags) else list; + removedOrReplacedAttrNames = [ "checkInputs" "installCheckInputs" @@ -182,6 +197,45 @@ let "allowedImpureDLLs" ]; + referenceCheckingAttrsToRemove = [ + "allowedReferences" + "allowedRequisites" + "disallowedReferences" + "disallowedRequisites" + ]; + + argumentAttrsToRemove = [ + "meta" + "passthru" + "pos" + "env" + ]; + + attrsToRemoveLast = [ + # Fixed-output derivations may not reference other paths, which means that + # for a fixed-output derivation, the corresponding inputDerivation should + # *not* be fixed-output. To achieve this we simply delete the attributes that + # would make it fixed-output. + "outputHashAlgo" + "outputHash" + "outputHashMode" + + # inputDerivation produces the inputs; not the outputs, so any + # restrictions on what used to be the outputs don't serve a purpose + # anymore. + "allowedReferences" + "allowedRequisites" + "disallowedReferences" + "disallowedRequisites" + "outputChecks" + ]; + + defaultBuilderArgs = [ + "-e" + ./source-stdenv.sh + ./default-builder.sh + ]; + inherit (stdenv) hostPlatform buildPlatform @@ -226,10 +280,12 @@ let # TODO(@Ericson2314): Make always true and remove / resolve #178468 defaultStrictDeps = if config.strictDepsByDefault then true else hostPlatform != buildPlatform; + isSingularDependency = dep: dep == null || isDerivation dep || isString dep || isPath dep; + canExecuteHostOnBuild = buildPlatform.canExecute hostPlatform; - defaultHardeningFlags = - (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or knownHardeningFlags; - stdenvHostSuffix = optionalString (hostPlatform != buildPlatform) "-${hostPlatform.config}"; + defaultHardeningFlags = stdenv.cc.defaultHardeningFlags or knownHardeningFlags; + hostSuffixNecessary = hostPlatform != buildPlatform && stdenvHasCC; + stdenvHostSuffix = "-${hostPlatform.config}"; stdenvStaticMarker = optionalString isStatic "-static"; userHook = config.stdenv.userHook or null; @@ -247,12 +303,20 @@ let ); gccArchFeature = [ "gccarch-${buildPlatform.gcc.arch}" ]; + cachedOutputChecks = { + out = { }; + }; + debugCachedOutputChecks = { + out = { }; + debug = { }; + }; + # Turn a derivation into its outPath without a string context attached. # See the comment at the usage site. unsafeDerivationToUntrackedOutpath = drv: if isDerivation drv && (!drv.__contentAddressed or false) then - builtins.unsafeDiscardStringContext drv.outPath + unsafeDiscardStringContext drv.outPath else drv; @@ -396,40 +460,8 @@ let } requires __structuredAttrs if {dis,}allowedRequisites or {dis,}allowedReferences is set" else actualValue; - outputs' = outputs ++ optional separateDebugInfo' "debug"; + outputs' = if separateDebugInfo' then outputs ++ [ "debug" ] else outputs; - noNonNativeDeps = - ( - depsBuildTarget - ++ depsBuildTargetPropagated - ++ depsHostHost - ++ depsHostHostPropagated - ++ buildInputs - ++ propagatedBuildInputs - ++ depsTargetTarget - ++ depsTargetTargetPropagated - ) == [ ]; - dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenvHasCC; - - concretizeFlagImplications = - flag: impliesFlags: list: - if elem flag list then (list ++ impliesFlags) else list; - - hardeningDisable' = unique ( - pipe hardeningDisable [ - # disabling fortify implies fortify3 should also be disabled - (concretizeFlagImplications "fortify" [ "fortify3" ]) - # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled - (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ]) - # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled - (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ]) - ] - ); - enabledHardeningOptions = - if elem "all" hardeningDisable' then - [ ] - else - subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". erroneousHardeningFlags = subtractLists knownHardeningFlags ( hardeningEnable ++ remove "all" hardeningDisable @@ -438,22 +470,29 @@ let checkDependencyList = checkDependencyList' [ ]; checkDependencyList' = positions: name: deps: - seq (foldl' ( - index: dep: - if dep == null || isDerivation dep || isString dep || isPath dep then - index + 1 - else if isList dep then - seq (checkDependencyList' ([ index ] ++ positions) name dep) (index + 1) - else - throw "Dependency is not of a valid type: ${ - concatMapStrings (ix: "element ${toString ix} of ") ([ index ] ++ positions) - }${name} for ${attrs.name or attrs.pname}" - ) 1 deps) deps; + if all isSingularDependency deps then + deps + else + # iterate again with the index if an invalid type was passed, or we + # need to recurse into a sublist. making sublists take longer is + # worth it, since nobody uses them and handling them makes normal + # dependencies slower + seq (foldl' ( + index: dep: + if isSingularDependency dep then + index + 1 + else if isList dep then + seq (checkDependencyList' ([ index ] ++ positions) name dep) (index + 1) + else + throw "Dependency is not of a valid type: ${ + concatMapStrings (ix: "element ${toString ix} of ") ([ index ] ++ positions) + }${name} for ${attrs.name or attrs.pname}" + ) 1 deps) deps; in if erroneousHardeningFlags != [ ] then abort ( "mkDerivation was called with unsupported hardening flags: " - + lib.generators.toPretty { } { + + toPretty { } { inherit erroneousHardeningFlags hardeningDisable @@ -477,24 +516,44 @@ let outputs = outputs'; - buildBuildOutputs = map (drv: getDev drv.__spliced.buildBuild or drv) ( - checkDependencyList "depsBuildBuild" depsBuildBuild - ); - buildHostOutputs = map (drv: getDev drv.__spliced.buildHost or drv) ( - checkDependencyList "nativeBuildInputs" nativeBuildInputs' - ); - buildTargetOutputs = map (drv: getDev drv.__spliced.buildTarget or drv) ( - checkDependencyList "depsBuildTarget" depsBuildTarget - ); - hostHostOutputs = map (drv: getDev drv.__spliced.hostHost or drv) ( - checkDependencyList "depsHostHost" depsHostHost - ); - hostTargetOutputs = map (drv: getDev drv.__spliced.hostTarget or drv) ( - checkDependencyList "buildInputs" buildInputs' - ); - targetTargetOutputs = map (drv: getDev drv.__spliced.targetTarget or drv) ( - checkDependencyList "depsTargetTarget" depsTargetTarget - ); + buildBuildOutputs = + if depsBuildBuild == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.buildBuild or drv) ( + checkDependencyList "depsBuildBuild" depsBuildBuild + ); + buildHostOutputs = + if nativeBuildInputs' == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.buildHost or drv) ( + checkDependencyList "nativeBuildInputs" nativeBuildInputs' + ); + buildTargetOutputs = + if depsBuildTarget == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.buildTarget or drv) ( + checkDependencyList "depsBuildTarget" depsBuildTarget + ); + hostHostOutputs = + if depsHostHost == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost); + hostTargetOutputs = + if buildInputs' == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs'); + targetTargetOutputs = + if depsTargetTarget == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.targetTarget or drv) ( + checkDependencyList "depsTargetTarget" depsTargetTarget + ); allDependencies = concatLists [ buildBuildOutputs buildHostOutputs @@ -504,24 +563,48 @@ let targetTargetOutputs ]; - propagatedBuildBuildOutputs = map (drv: getDev drv.__spliced.buildBuild or drv) ( - checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated - ); - propagatedBuildHostOutputs = map (drv: getDev drv.__spliced.buildHost or drv) ( - checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs - ); - propagatedBuildTargetOutputs = map (drv: getDev drv.__spliced.buildTarget or drv) ( - checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated - ); - propagatedHostHostOutputs = map (drv: getDev drv.__spliced.hostHost or drv) ( - checkDependencyList "depsHostHostPropagated" depsHostHostPropagated - ); - propagatedHostTargetOutputs = map (drv: getDev drv.__spliced.hostTarget or drv) ( - checkDependencyList "propagatedBuildInputs" propagatedBuildInputs - ); - propagatedTargetTargetOutputs = map (drv: getDev drv.__spliced.targetTarget or drv) ( - checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated - ); + propagatedBuildBuildOutputs = + if depsBuildBuildPropagated == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.buildBuild or drv) ( + checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated + ); + propagatedBuildHostOutputs = + if propagatedNativeBuildInputs == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.buildHost or drv) ( + checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs + ); + propagatedBuildTargetOutputs = + if depsBuildTargetPropagated == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.buildTarget or drv) ( + checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated + ); + propagatedHostHostOutputs = + if depsHostHostPropagated == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.hostHost or drv) ( + checkDependencyList "depsHostHostPropagated" depsHostHostPropagated + ); + propagatedHostTargetOutputs = + if propagatedBuildInputs == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.hostTarget or drv) ( + checkDependencyList "propagatedBuildInputs" propagatedBuildInputs + ); + propagatedTargetTargetOutputs = + if depsTargetTargetPropagated == [ ] then + [ ] + else + map (drv: getDev drv.__spliced.targetTarget or drv) ( + checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated + ); allPropagatedDependencies = concatLists [ propagatedBuildBuildOutputs propagatedBuildHostOutputs @@ -539,7 +622,22 @@ let # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the # hash can't be the same. See #32986. - hostSuffix = optionalString (!dontAddHostSuffix) stdenvHostSuffix; + hostSuffix = optionalString ( + hostSuffixNecessary + && ( + !(attrs ? outputHash) + || + depsBuildTarget == [ ] + && depsBuildTargetPropagated == [ ] + && depsHostHost == [ ] + && depsHostHostPropagated == [ ] + && buildInputs == [ ] + && propagatedBuildInputs == [ ] + && depsTargetTarget == [ ] + && depsTargetTargetPropagated == [ ] + + ) + ) stdenvHostSuffix; # Disambiguate statically built packages. This was originally # introduce as a means to prevent nix-env to get confused between @@ -548,24 +646,28 @@ let # it again. staticMarker = stdenvStaticMarker; in - lib.strings.sanitizeDerivationName ( + sanitizeDerivationName ( if attrs ? name then attrs.name + hostSuffix else # we cannot coerce null to a string below - assert assertMsg ( - attrs ? version && attrs.version != null - ) "The `version` attribute cannot be null."; + assert + (attrs ? version && attrs.version != null) || throw "The `version` attribute cannot be null."; "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}" ); builder = attrs.realBuilder or stdenvShell; args = - attrs.args or [ - "-e" - ./source-stdenv.sh - (attrs.builder or ./default-builder.sh) - ]; + attrs.args or ( + if attrs ? builder then + [ + "-e" + ./source-stdenv.sh + attrs.builder + ] + else + defaultBuilderArgs + ); inherit stdenv; # The `system` attribute of a derivation has special meaning to Nix. @@ -631,6 +733,22 @@ let else null } = + let + enabledHardeningOptions = + if elem "all" hardeningDisable then + [ ] + else + subtractLists (unique ( + pipe hardeningDisable [ + # disabling fortify implies fortify3 should also be disabled + (concretizeFlagImplications "fortify" [ "fortify3" ]) + # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled + (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ]) + # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled + (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ]) + ] + )) (defaultHardeningFlags ++ hardeningEnable); + in concatStringsSep " " enabledHardeningOptions; # TODO: remove platform condition @@ -719,31 +837,37 @@ let attrsOutputChecks = makeOutputChecks attrs; attrsOutputChecksFiltered = filterAttrs (_: v: v != null) attrsOutputChecks; in - builtins.listToAttrs ( - map (name: { - inherit name; - value = - let - raw = zipAttrsWith (_: concatLists) [ - attrsOutputChecksFiltered - (makeOutputChecks attrs.outputChecks.${name} or { }) - ]; - in - # separateDebugInfo = true will put all sorts of files in - # the debug output which could carry references, but - # that's "normal". Notably it symlinks to the source. - # So disable reference checking for the debug output - if separateDebugInfo' && name == "debug" then - removeAttrs raw [ - "allowedReferences" - "allowedRequisites" - "disallowedReferences" - "disallowedRequisites" - ] - else - raw; - }) outputs - ); + # to avoid the listToAttrs in most common situations, we replicate + # what it would produce for most derivations. this can be improved + # in the future at the cost of a mass rebuild - empty attrsets for + # each output is a noop + if + !attrs ? outputs + && !attrs ? outputChecks + && (attrsOutputChecks == { } || attrsOutputChecksFiltered == { }) + then + if separateDebugInfo' then debugCachedOutputChecks else cachedOutputChecks + else + listToAttrs ( + map (name: { + inherit name; + value = + let + raw = zipAttrsWith (_: concatLists) [ + attrsOutputChecksFiltered + (makeOutputChecks (attrs.outputChecks.${name} or { })) + ]; + in + # separateDebugInfo = true will put all sorts of files in + # the debug output which could carry references, but + # that's "normal". Notably it symlinks to the source. + # So disable reference checking for the debug output + if separateDebugInfo' && name == "debug" then + removeAttrs raw referenceCheckingAttrsToRemove + else + raw; + }) outputs + ); }; in derivationArg; @@ -779,11 +903,11 @@ let pos ? # position used in error messages and for meta.position ( if attrs.meta.description or null != null then - builtins.unsafeGetAttrPos "description" attrs.meta + unsafeGetAttrPos "description" attrs.meta else if attrs.version or null != null then - builtins.unsafeGetAttrPos "version" attrs + unsafeGetAttrPos "version" attrs else - builtins.unsafeGetAttrPos "name" attrs + unsafeGetAttrPos "name" attrs ), # Experimental. For simple packages mostly just works, @@ -806,17 +930,11 @@ let ); let - env' = env // { - ${if meta ? mainProgram then "NIX_MAIN_PROGRAM" else null} = meta.mainProgram; - }; + env' = + if attrs ? meta.mainProgram then env // { NIX_MAIN_PROGRAM = attrs.meta.mainProgram; } else env; derivationArg = makeDerivationArgument ( - removeAttrs attrs [ - "meta" - "passthru" - "pos" - "env" - ] + removeAttrs attrs argumentAttrsToRemove // { ${if __structuredAttrs then "env" else null} = checkedEnv; cmakeFlags = makeCMakeFlags attrs; @@ -836,44 +954,32 @@ let checkedEnv = let - overlappingNames = attrNames (builtins.intersectAttrs env' derivationArg); - errors = lib.concatMapStringsSep "\n" ( - name: - " - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${ - lib.generators.toPretty { } derivationArg.${name} - }" - ) overlappingNames; + overlappingArgs = intersectAttrs env' derivationArg; in - assert assertMsg (isAttrs env && !isDerivation env) - "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name."; - assert assertMsg (overlappingNames == [ ]) - "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}"; + assert + (isAttrs env && !isDerivation env) + || throw "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name."; + assert + (overlappingArgs == { }) + || throw ( + let + errors = concatMapStringsSep "\n" ( + name: + " - ${name}: in `env`: ${toPretty { } env'.${name}}; in derivation arguments: ${ + toPretty { } derivationArg.${name} + }" + ) (attrNames overlappingArgs); + + in + "The `env` attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping:\n${errors}" + ); mapAttrs ( n: v: - assert assertMsg (isString v || isBool v || isInt v || isDerivation v) - "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}."; + assert + (isString v || isBool v || isInt v || isDerivation v) + || throw "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${typeOf v}."; v ) env'; - - attrsToRemove = [ - # Fixed-output derivations may not reference other paths, which means that - # for a fixed-output derivation, the corresponding inputDerivation should - # *not* be fixed-output. To achieve this we simply delete the attributes that - # would make it fixed-output. - "outputHashAlgo" - "outputHash" - "outputHashMode" - - # inputDerivation produces the inputs; not the outputs, so any - # restrictions on what used to be the outputs don't serve a purpose - # anymore. - "allowedReferences" - "allowedRequisites" - "disallowedReferences" - "disallowedRequisites" - "outputChecks" - ]; - in extendDerivation validity.handled ( @@ -884,7 +990,7 @@ let # needed to enter a nix-shell with # nix-build shell.nix -A inputDerivation inputDerivation = derivation ( - removeAttrs derivationArg attrsToRemove + removeAttrs derivationArg attrsToRemoveLast // { # Add a name in case the original drv didn't have one name = "inputDerivation" + optionalString (derivationArg ? name) "-${derivationArg.name}"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 900e7a3a5953..dffe6bbe34e7 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -5,7 +5,8 @@ fetchpatch, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, boost, gettext, libime, @@ -46,7 +47,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext fcitx5-lua ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 4c37576ecc04..884d77a7005d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, fcitx5, lua, gettext, @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 3674a7c0bb48..8502124a24d0 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, fcitx5, gettext, qtbase, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 931da19219ca..0bf72df3c504 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, cmake, - extra-cmake-modules, + kdePackages, gettext, fcitx5, fcitx5-qt, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 9d72e72cbf16..93c10d2ea130 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, fcitx5, fcitx5-qt, gettext, @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext # msgfmt ]; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 9ad2eb2460d8..aa5fc1597bb4 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -2,7 +2,7 @@ lib, stdenv, cmake, - extra-cmake-modules, + kdePackages, pkg-config, itstool, udevCheckHook, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config itstool udevCheckHook diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 66908fbef4f8..1f5884f4fed8 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { openssl ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/stdc++fs/d' CMakeLists.txt ''; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 812128c0c029..bc24c8869673 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,30 +1,41 @@ { - fetchurl, + fetchFromGitLab, stdenv, - fetchpatch, lib, + cmake, extra-cmake-modules, kdoctools, wrapQtAppsHook, kconfig, kcrash, - kinit, + kwidgetsaddons, + kxmlgui, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kronometer"; - version = "2.3.0"; + version = "2.3.0-unstable-2026-04-06"; - src = fetchurl { - url = "mirror://kde/stable/kronometer/${version}/src/kronometer-${version}.tar.xz"; - sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "kronometer"; + rev = "ca1e662f4e58540bd072982103204fa1418f5657"; + hash = "sha256-IhKlFGxUqr7wKcNKnRA6gK9QJeR0QyQaSwYlIsr0wyE="; }; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/utilities/kronometer/-/commit/949f1dccd48f4a1e3068e24d241c5ce73fe2ab8f.patch"; - hash = "sha256-zv9ty25vQXr3xB1S7QmXx3YIouOVUoMpdZ9gHBD1gMQ="; - }) + nativeBuildInputs = [ + cmake + extra-cmake-modules + kdoctools + wrapQtAppsHook + ]; + + buildInputs = [ + kconfig + kcrash + kwidgetsaddons + kxmlgui ]; meta = { @@ -34,14 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; mainProgram = "kronometer"; }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapQtAppsHook - ]; - propagatedBuildInputs = [ - kconfig - kcrash - kinit - ]; } diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix index 499e642b4c95..6c52ebb084f9 100644 --- a/pkgs/tools/misc/tdarr/common.nix +++ b/pkgs/tools/misc/tdarr/common.nix @@ -113,9 +113,9 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper copyDesktopItems ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib gtk3 libayatana-appindicator @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { '' + ""; - desktopItems = lib.optionals stdenv.isLinux [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { desktopName = "Tdarr ${componentUpper} Tray"; name = "Tdarr ${componentUpper} Tray"; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 8f6563cd2fb3..ff77c0a7447d 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Convenience script to run a virtualized X-Server"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.artturin ]; mainProgram = "xvfb-run"; diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index 0584cde9b33f..b37568ec7056 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: { ln -sT ${nix-manual} $doc ln -sT ${nix-manual.man} $man '' - + lib.optionalString (stdenv.isLinux && lib.versionAtLeast version "2.34pre") '' + + lib.optionalString (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "2.34pre") '' lndir ${nix-nswrapper} $out ''; diff --git a/pkgs/tools/package-management/nix/modular/src/perl/package.nix b/pkgs/tools/package-management/nix/modular/src/perl/package.nix index d769d45d0f59..bd287e13f6d0 100644 --- a/pkgs/tools/package-management/nix/modular/src/perl/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/perl/package.nix @@ -32,7 +32,7 @@ perl.pkgs.toPerlModule ( ]; # `perlPackages.Test2Harness` is marked broken for Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ perlPackages.Test2Harness diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix deleted file mode 100644 index ea7902622c53..000000000000 --- a/pkgs/tools/security/kwalletcli/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - fetchFromGitHub, - lib, - stdenv, - makeWrapper, - pkg-config, - wrapQtAppsHook, - kcoreaddons, - ki18n, - kwallet, - mksh, - pinentry-qt, -}: - -stdenv.mkDerivation rec { - pname = "kwalletcli"; - version = "3.03"; - - src = fetchFromGitHub { - owner = "MirBSD"; - repo = pname; - rev = "${pname}-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-DUtaQITzHhQrqA9QJd0U/5EDjH0IzY9/kal/7SYQ/Ck="; - }; - - postPatch = '' - substituteInPlace GNUmakefile \ - --replace -I/usr/include/KF5/KCoreAddons -I${kcoreaddons.dev}/include/KF5/KCoreAddons \ - --replace -I/usr/include/KF5/KI18n -I${ki18n.dev}/include/KF5/KI18n \ - --replace -I/usr/include/KF5/KWallet -I${kwallet.dev}/include/KF5/KWallet \ - --replace /usr/bin $out/bin \ - --replace /usr/share/man $out/share/man - - substituteInPlace pinentry-kwallet \ - --replace '/usr/bin/env mksh' ${mksh}/bin/mksh - - substituteInPlace kwalletcli_getpin \ - --replace '/usr/bin/env mksh' ${mksh}/bin/mksh - ''; - - makeFlags = [ "KDE_VER=5" ]; - - nativeBuildInputs = [ - makeWrapper - pkg-config - wrapQtAppsHook - ]; - # if using just kwallet, cmake will be added as a buildInput and fail the build - propagatedBuildInputs = [ - kcoreaddons - ki18n - (lib.getLib kwallet) - ]; - - preInstall = '' - mkdir -p $out/bin $out/share/man/man1 - ''; - - postInstall = '' - for program in pinentry-kwallet kwalletcli_getpin; do - wrapProgram $out/bin/$program \ - --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \ - --set-default PINENTRY pinentry-qt - done - ''; - - meta = { - description = "Command-Line Interface to the KDE Wallet"; - homepage = "https://www.mirbsd.org/kwalletcli.htm"; - license = lib.licenses.miros; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92cd669ee0c1..403b2b4aa6ed 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -29,178 +29,172 @@ let else alias; - deprecatedPlasma5Packages = { - inherit (plasma5Packages) - akonadi-calendar - akonadi-calendar-tools - akonadi-contacts - akonadi-import-wizard - akonadi-mime - akonadi-notes - akonadi-search - akonadiconsole - alligator - analitza - angelfish - applet-window-appmenu - applet-window-buttons - audiotube - aura-browser - baloo-widgets - bismuth - booth - buho - calendarsupport - calindori - cantor - clip - communicator - dolphin-plugins - eventviews - flatpak-kcm - ghostwriter - grantleetheme - incidenceeditor - index - isoimagewriter - juk - kaccounts-integration - kaccounts-providers - kalarm - kalgebra - kalk - kamoso - kasts - kbreakout - kcalutils - kclock - kde-inotify-survey - kde2-decoration - kdebugsettings - kdeconnect-kde - kdecoration - kdegraphics-mobipocket - kdegraphics-thumbnailers - kdenetwork-filesharing - kdepim-runtime - keysmith - kgeography - khotkeys - kidentitymanagement - kimap - kio-admin - kio-extras - kio-gdrive - kipi-plugins - kirigami-gallery - kldap - kmahjongg - kmail-account-wizard - kmailtransport - kmbox - kmime - kmousetool - knotes - koko - kolf - kongress - konqueror - konquest - kontactinterface - kopeninghours - kosmindoormap - kpat - kpimtextedit - kpipewire - kpmcore - kpublictransport - kqtquickcharts - krecorder - kreport - kruler - ksanecore - ksmtp - kspaceduel - ksudoku - ksystemstats - ktnef - ktrip - kweather - kzones - layer-shell-qt - libgravatar - libkcddb - libkdcraw - libkdegames - libkdepim - libkexiv2 - libkgapi - libkipi - libkleo - libkmahjongg - libkomparediff2 - libksane - libkscreen - libksieve - libksysguard - libktorrent - lightly - mailcommon - mailimporter - mauikit - mauikit-accounts - mauikit-calendar - mauikit-documents - mauikit-filebrowsing - mauikit-imagetools - mauikit-terminal - mauikit-texteditor - mauiman - mbox-importer - messagelib - oxygen-sounds - palapeli - parachute - partitionmanager - pim-data-exporter - pim-sieve-editor - pimcommon - plank-player - plasma-bigscreen - plasma-dialer - plasma-disks - plasma-firewall - plasma-phonebook - plasma-remotecontrollers - plasma-sdk - plasma-settings - plasma-welcome - plasmatube - polkit-kde-agent - print-manager - qmlkonsole - rocs - shelf - sierra-breeze-enhanced - soundkonverter - station - telly-skout - tokodon - umbrello - vvave - xwaylandvideobridge - ; - - inherit (libsForQt5) - neochat # Added 2025-07-04 - itinerary # Added 2025-07-04 - libquotient # Added 2025-07-04 - qtwebengine # Added 2026-01-15 - qtwebview # Added 2026-04-03 - ; - - kexi = throw ""; # Added 2025-08-21 - }; + deprecatedPlasma5Packages = [ + "akonadi-calendar" + "akonadi-calendar-tools" + "akonadi-contacts" + "akonadi-import-wizard" + "akonadi-mime" + "akonadi-notes" + "akonadi-search" + "akonadiconsole" + "alligator" + "analitza" + "angelfish" + "applet-window-appmenu" + "applet-window-buttons" + "audiotube" + "aura-browser" + "baloo-widgets" + "bismuth" + "booth" + "buho" + "calendarsupport" + "calindori" + "cantor" + "clip" + "communicator" + "dolphin-plugins" + "eventviews" + "flatpak-kcm" + "ghostwriter" + "grantleetheme" + "incidenceeditor" + "index" + "isoimagewriter" + "juk" + "kaccounts-integration" + "kaccounts-providers" + "kalarm" + "kalgebra" + "kalk" + "kamoso" + "kasts" + "kbreakout" + "kcalutils" + "kclock" + "kde-inotify-survey" + "kde2-decoration" + "kdebugsettings" + "kdeconnect-kde" + "kdecoration" + "kdegraphics-mobipocket" + "kdegraphics-thumbnailers" + "kdenetwork-filesharing" + "kdepim-runtime" + "keysmith" + "kgeography" + "khotkeys" + "kidentitymanagement" + "kimap" + "kio-admin" + "kio-extras" + "kio-gdrive" + "kipi-plugins" + "kirigami-gallery" + "kldap" + "kmahjongg" + "kmail-account-wizard" + "kmailtransport" + "kmbox" + "kmime" + "kmousetool" + "knotes" + "koko" + "kolf" + "kongress" + "konqueror" + "konquest" + "kontactinterface" + "kopeninghours" + "kosmindoormap" + "kpat" + "kpimtextedit" + "kpipewire" + "kpmcore" + "kpublictransport" + "kqtquickcharts" + "krecorder" + "kreport" + "kruler" + "ksanecore" + "ksmtp" + "kspaceduel" + "ksudoku" + "ksystemstats" + "ktnef" + "ktrip" + "kweather" + "kzones" + "layer-shell-qt" + "libgravatar" + "libkcddb" + "libkdcraw" + "libkdegames" + "libkdepim" + "libkexiv2" + "libkgapi" + "libkipi" + "libkleo" + "libkmahjongg" + "libkomparediff2" + "libksane" + "libkscreen" + "libksieve" + "libksysguard" + "libktorrent" + "lightly" + "mailcommon" + "mailimporter" + "mauikit" + "mauikit-accounts" + "mauikit-calendar" + "mauikit-documents" + "mauikit-filebrowsing" + "mauikit-imagetools" + "mauikit-terminal" + "mauikit-texteditor" + "mauiman" + "mbox-importer" + "messagelib" + "oxygen-sounds" + "palapeli" + "parachute" + "partitionmanager" + "pim-data-exporter" + "pim-sieve-editor" + "pimcommon" + "plank-player" + "plasma-bigscreen" + "plasma-dialer" + "plasma-disks" + "plasma-firewall" + "plasma-phonebook" + "plasma-remotecontrollers" + "plasma-sdk" + "plasma-settings" + "plasma-welcome" + "plasmatube" + "polkit-kde-agent" + "print-manager" + "qmlkonsole" + "rocs" + "shelf" + "sierra-breeze-enhanced" + "soundkonverter" + "station" + "telly-skout" + "tokodon" + "umbrello" + "vvave" + "xwaylandvideobridge" + "neochat" # Added 2025-07-04 + "itinerary" # Added 2025-07-04 + "libquotient" # Added 2025-07-04 + "kexi" # Added 2025-08-21 + "qtwebengine" # Added 2026-01-15 + "qtwebview" # Added 2026-04-03 + ]; makePlasma5Throw = name: @@ -221,7 +215,7 @@ let mapAliases = aliases: lib.mapAttrs (n: alias: removeRecurseForDerivations (checkInPkgs n alias)) aliases; - plasma5Throws = mapAliases (lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages); + plasma5Throws = mapAliases (lib.genAttrs deprecatedPlasma5Packages makePlasma5Throw); warnAlias = msg: v: @@ -331,6 +325,8 @@ mapAliases { artichoke = throw "artichoke has been removed due to being archived upstream."; # Added 2025-11-04 artim-dark = aritim-dark; # Added 2025-07-27 artyFX = openav-artyfx; # Added 2026-02-08 + asciinema-automation = throw "'asciinema-automation' has been removed as it doesn't work with asciinema version 3+"; # Added 2026-05-07 + asciinema_3 = warnAlias "'asciinema_3' has been renamed to 'asciinema'" asciinema; # Added 2026-05-07 aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27 asio_1_10 = throw "'asio_1_10' has been removed as it is outdated and unused. Use 'asio' instead"; # Added 2025-12-03 asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27 @@ -371,6 +367,7 @@ mapAliases { bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19 bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20 bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20 + bcompare4 = throw "'bcompare4' has been removed due to outdated KF5 dependencies"; # Added 2025-05-01 bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20 bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20 beets-unstable = throw "beets-unstable has been removed in favor of beets since upstream is releasing versions frequently nowadays"; # Added 2025-10-16 @@ -592,6 +589,7 @@ mapAliases { cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21 + darkly-qt5 = throw "'darkly-qt' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21 dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17 dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25 @@ -642,6 +640,7 @@ mapAliases { dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27 dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13 e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15 + e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26 eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27 easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17 @@ -693,6 +692,7 @@ mapAliases { eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18 fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 + fancontrol-gui = throw "'fancontrol-gui' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17 fastJson = warnAlias "'fastJson' has been renamed to 'libfastjson'" libfastjson; # Added 2026-02-08 fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27 @@ -928,6 +928,8 @@ mapAliases { gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17 hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26 harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26 + haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; + haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'."; helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05 helvum = throw "'helvum' has been removed as it was unmaintained upstream and relied on a vulnerable dependency. Consider using 'crosspipe' instead."; # Added 2026-03-04 HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27 @@ -1007,6 +1009,8 @@ mapAliases { k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01 k3s_1_31 = throw "'k3s_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08 k3s_1_32 = throw "'k3s_1_32' has been removed from nixpkgs as it has reached end of life"; # Added 2026-03-31 + k4dirstat = throw "'k4dirstat' has been removed due to outdated KF5 dependencies; consider using 'qdirstat' instead."; # Added 2026-05-01 + kaffeine = throw "'kaffeine' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27 kanidm = throw "'kanidm' alias has been removed. You must use a versioned package, e.g. 'kanidm_1_x'."; # Added 2026-01-29 kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 @@ -1023,11 +1027,14 @@ mapAliases { kchmviewer = throw "'kchmviewer' has been removed as it was unmaintained upstream since 2022 and depended on qt5 webengine. Consider switching to 'uchmviewer', a fork of 'kchmviewer'."; # Added 2026-02-10 kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17 + kdesvn = throw "'kdesvn' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27 keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08 + kgraphviewer = throw "'kgraphviewer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27 khd = throw "'khd' has been removed as it has been pulled upstream"; # Added 2025-12-18 khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 + kio-fuse = throw "'kio-fuse' has been removed, as Plasma 5 has reached end of life. Use 'kdePackages.kio-fuse' for Plasma 6."; # Added 2026-05-01 kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30 kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27 @@ -1037,9 +1044,13 @@ mapAliases { krb5Full = throw "'krb5Full' has been renamed to/replaced by 'krb5'"; # Converted to throw 2025-10-27 krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 + ksmoothdock = throw "'ksmoothdock' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 + ktextaddons = throw "'ktextaddons' has been removed due to outdated KF5 dependencies. A Qt6 version is available at 'kdePackages.ktextaddons'."; # Added 2026-05-01 kube3d = throw "'kube3d' has been renamed to/replaced by 'k3d'"; # Converted to throw 2025-10-27 kubei = throw "'kubei' has been renamed to/replaced by 'kubeclarity'"; # Converted to throw 2025-10-27 kubo-migrator-all-fs-repo-migrations = throw "'kubo-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27 + kup = throw "'kup' has been removed due to outdated KF5 dependencies. A Qt6 version is available at 'kdePackages.kup'."; # Added 2026-05-01 + kwalletcli = throw "'kwalletcli' has been removed, as Plasma 5 has reached end of life"; # Added 2026-05-01 kwm = throw "'kwm' has been removed since upstream is a 404"; # Added 2025-12-21 ladspaH = warnAlias "'ladspaH' has been renamed to 'ladspa-header'" ladspa-header; # Added 2026-02-08 languageMachines.frog = frog; # Added 2025-10-7 @@ -1348,6 +1359,7 @@ mapAliases { magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 magpie = throw "'magpie' has been removed, no longer used by budgie-desktop."; # Added 2025-11-19 + maia-icon-theme = throw "'maia-icon-theme' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12 mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12 @@ -1359,6 +1371,7 @@ mapAliases { marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27 marwaita-pop_os = throw "'marwaita-pop_os' has been renamed to/replaced by 'marwaita-yellow'"; # Converted to throw 2025-10-27 marwaita-ubuntu = throw "'marwaita-ubuntu' has been renamed to/replaced by 'marwaita-orange'"; # Converted to throw 2025-10-27 + massif-visualizer = throw "'massif-visualizer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07 material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09 @@ -1366,6 +1379,7 @@ mapAliases { matrix-appservice-slack = throw "'matrix-appservice-slack' has been removed, as it relies on Classic Slack Apps, which no longer exist, and is abandoned upstream"; # Added 2025-11-11 matrix-synapse-tools.rust-synapse-compress-state = throw "'matrix-synapse-tools.rust-synapse-compress-state' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27 matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27 + mbedtls_2 = throw "'mbedtls_2' has been removed as it reached its end of life. Migrate to 'mbedtls'."; mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27 mdbook-alerts = throw "'mdbook-alerts' has been removed because it is deprecated and natively supported by mdbook since version 0.5.0"; # Added 2026-01-07 mdbook-linkcheck = throw "'mdbook-linkcheck' has been removed and replaced by 'mdbook-linkcheck2' due to incompatibility with mdbook version 0.5.0+"; # Added 2026-03-03 @@ -1422,6 +1436,7 @@ mapAliases { morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26 moz-phab = throw "'moz-phab' has been renamed to/replaced by 'mozphab'"; # Converted to throw 2025-10-27 mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 + mpage = throw "'mpage' has been removed due to being unmaintained and broken"; # Added 2026-05-05 mpc-cli = throw "'mpc-cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27 mpc_cli = throw "'mpc_cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27 mpdevil = throw "'mpdevil' has been renamed to/replaced by 'plattenalbum'"; # Converted to throw 2025-10-27 @@ -1669,6 +1684,7 @@ mapAliases { pinecone = throw "'pinecone' has been removed, as it is unmaintained and obsolete"; # Added 2026-03-31 pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26 pingvin-share = throw "'pingvin-share' has been removed as it was broken and archived upstream"; # Added 2025-11-08 + pipecontrol = throw "'pipecontrol' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03 plant-it = throw "plant-it backend was discontinued in september 2025"; # Added 2026-01-30 plant-it-frontend = throw "plant-it-frontend has been presented as being Android-only since the server-side was discontinued in september 2025"; # Added 2026-01-30 @@ -1677,6 +1693,7 @@ mapAliases { plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04 platformioPackages.platformio-core = platformio-core; # Added 2025-09-04 + playbar2 = throw "'playbar2' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28 PlistCpp = throw "'PlistCpp' has been renamed to/replaced by 'plistcpp'"; # Converted to throw 2025-10-27 pltScheme = throw "'pltScheme' has been renamed to/replaced by 'racket'"; # Converted to throw 2025-10-27 @@ -1686,6 +1703,7 @@ mapAliases { pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27 podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 + polonium = throw "'polonium' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27 popura = throw "'popura' is abandoned upstream and in nixpkgs and has been removed"; # Added 2026-01-15 @@ -1804,6 +1822,7 @@ mapAliases { redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27 redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09 reiserfsprogs = throw "'reiserfsprogs' has been removed as ReiserFS has not been actively maintained for many years."; # Added 2025-11-13 + remodel = throw "'remodel' has been removed because it was unmaintained upstream, deprecated in favor of 'lune'"; # Added 2026-05-08 remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11 resp-app = throw "'resp-app' has been replaced by 'redisinsight'"; # Added 2025-12-17 responsively-app = throw "'responsively-app' has been removed due to lack of maintenance upstream."; # Added 2025-06-25 @@ -1825,6 +1844,8 @@ mapAliases { rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06 root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17 rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10 + rott = throw "'rott' has been dropped in favor of its maintained fork 'taradino'"; # Added 2026-01-25 + rott-shareware = throw "'rott-shareware' has been dropped in favor of its maintained fork 'taradino-shareware'"; # Added 2026-01-25 rpPPPoE = warnAlias "'rpPPPoE' has been renamed to 'rp-pppoe'" rp-pppoe; # Added 2026-02-12 rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09 rr-unstable = throw "'rr-unstable' has been renamed to/replaced by 'rr'"; # Converted to throw 2025-10-27 @@ -1976,6 +1997,7 @@ mapAliases { superTuxKart = warnAlias "'superTuxKart' has been renamed to 'supertuxkart'" supertuxkart; # Added 2026-02-12 surge-XT = warnAlias "'surge-XT' has been renamed to 'surge-xt'" surge-xt; # Added 2026-02-12 svt-av1-psy = warnAlias "'svt-av1-psy' has been replaced by 'svt-av1-psyex'" svt-av1-psyex; # Added 2026-01-10 + swagger-cli = throw "'swagger-cli' has been removed as it is broken and unmaintained. Upstream suggests using 'redocly' instead"; # Added 2026-04-23 swig4 = throw "'swig4' has been renamed to/replaced by 'swig'"; # Converted to throw 2025-10-27 swiProlog = throw "'swiProlog' has been renamed to/replaced by 'swi-prolog'"; # Converted to throw 2025-10-27 swiPrologWithGui = throw "'swiPrologWithGui' has been renamed to/replaced by 'swi-prolog-gui'"; # Converted to throw 2025-10-27 @@ -2000,6 +2022,7 @@ mapAliases { targetPlatform = warnAlias "'targetPlatform' has been renamed to/replaced by 'stdenv.targetPlatform'" stdenv.targetPlatform; # Converted to warning 2025-10-28 taro = throw "'taro' has been renamed to/replaced by 'taproot-assets'"; # Converted to throw 2025-10-27 taskwarrior = throw "'taskwarrior' has been renamed to/replaced by 'taskwarrior2'"; # Converted to throw 2025-10-27 + tau-hydrogen = throw "'tau-hydrogen' has been removed because it's unmaintained upstream."; # Added 2026-04-26 tbb = onetbb; # Added 2025-09-14 tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14 tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13 @@ -2048,6 +2071,7 @@ mapAliases { thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30 thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30 ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10 + tidb = throw "TiDB has been removed because of hard dependency on TiKV which is challenging to package"; # Added 2026-05-03 timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19 tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11 tkcvs = throw "'tkcvs' has been renamed to/replaced by 'tkrev'"; # Converted to throw 2025-10-27 @@ -2059,6 +2083,7 @@ mapAliases { tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27 tooling-language-server = deputy; # Added 2025-06-22 tor-browser-bundle-bin = throw "'tor-browser-bundle-bin' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2025-10-27 + tora = throw "'tora' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 tracker = throw "'tracker' has been renamed to/replaced by 'tinysparql'"; # Converted to throw 2025-10-27 tracker-miners = throw "'tracker-miners' has been renamed to/replaced by 'localsearch'"; # Converted to throw 2025-10-27 transfig = throw "'transfig' has been renamed to/replaced by 'fig2dev'"; # Converted to throw 2025-10-27 @@ -2274,6 +2299,7 @@ mapAliases { xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22 xkeyboardconfig = xkeyboard-config; # Added 2026-02-04 xkeyboardconfig_custom = xkeyboard-config_custom; # Added 2026-01-19 + xloadimage = throw "'xloadimage' has been removed as it was unmaintained upstream"; # Added 2026-05-05 xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27 xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18 xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28 @@ -2558,6 +2584,7 @@ mapAliases { yarn2nix = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25 yarn2nix-moretea = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25 yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12 + yojimbo = throw "'yojimbo' has been removed as it used an EOL TLS library and was broken."; # Added 2026-05-06 yosys-synlig = throw "yosys-synlig has been removed because it is unmaintained upstream and incompatible with current Yosys versions."; # Added 2026-01-06 youtube-music = lib.warnOnInstantiate "'youtube-music' has been renamed to 'pear-desktop'" pear-desktop; # Added 2025-12-23 yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f095130f6e0..8f1d8a0ce349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2617,8 +2617,6 @@ with pkgs; }; kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; - kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; - keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; keybase = callPackage ../tools/security/keybase { }; @@ -2633,11 +2631,7 @@ with pkgs; inherit (darwin) sigtool; }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; - - kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + kronometer = kdePackages.callPackage ../tools/misc/kronometer { }; limine-full = limine.override { enableAll = true; }; @@ -3251,7 +3245,7 @@ with pkgs; lua = lua5_4; }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rsibreak = kdePackages.callPackage ../applications/misc/rsibreak { }; rubocop = rubyPackages.rubocop; @@ -4157,8 +4151,6 @@ with pkgs; (callPackage ../development/compilers/haxe { }) haxe_4_3 - haxe_4_1 - haxe_4_0 ; haxe = haxe_4_3; @@ -4727,9 +4719,6 @@ with pkgs; acl2 = callPackage ../development/interpreters/acl2 { }; acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; - babashka-unwrapped = callPackage ../development/interpreters/babashka { }; - babashka = callPackage ../development/interpreters/babashka/wrapped.nix { }; - uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { uiua_versionType = "unstable"; }; # BQN interpreters and compilers @@ -5543,19 +5532,12 @@ with pkgs; ]; }; - # Does not actually depend on Qt 5 - inherit (plasma5Packages) extra-cmake-modules; - coccinelle = callPackage ../development/tools/misc/coccinelle { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; credstash = with python3Packages; toPythonApplication credstash; - creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_18) llvm libclang; - }; - css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; cvise = python3Packages.callPackage ../development/tools/misc/cvise { @@ -5707,8 +5689,6 @@ with pkgs; lit = with python3Packages; toPythonApplication lit; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; - maven3 = maven; inherit (maven) buildMaven; @@ -6082,7 +6062,7 @@ with pkgs; ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; }; ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { - ssl_implementation = mbedtls_2; + ssl_implementation = mbedtls; }; # Make bdb5 the default as it is the last release under the custom @@ -6806,7 +6786,6 @@ with pkgs; ) haskellPackages.matterhorn; - mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; mbedtls_4 = callPackage ../development/libraries/mbedtls/4.nix { }; @@ -7151,9 +7130,6 @@ with pkgs; } ); - # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop - plasma5Packages = libsForQt5; - qtEnv = qt5.env; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); @@ -7951,6 +7927,13 @@ with pkgs; ) ); + home-assistant-themes = lib.recurseIntoAttrs ( + lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ../servers/home-assistant/themes; + } + ); + home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; _surrealdbPackage = ../by-name/su/surrealdb/package.nix; @@ -8826,10 +8809,13 @@ with pkgs; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); - docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; - docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { }; + inherit (callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook { }) + docbook_sgml_dtd_31 + docbook_sgml_dtd_45 + ; + docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { }; docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { }; @@ -9657,9 +9643,7 @@ with pkgs; ; k3s = k3s_1_35; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; - - k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + okteta = kdePackages.callPackage ../applications/editors/okteta { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -9710,8 +9694,6 @@ with pkgs; callPackage ../applications/networking/cluster/helm/plugins { } ); - kup = libsForQt5.callPackage ../applications/misc/kup { }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { @@ -9807,7 +9789,7 @@ with pkgs; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; + minitube = kdePackages.callPackage ../applications/video/minitube { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { ocamlPackages = ocaml-ng.ocamlPackages_4_14; @@ -10106,13 +10088,12 @@ with pkgs; quasselClient = quassel.override { monolithic = false; client = true; - tag = "-client-kf5"; + tag = "-client-qt5"; }; quasselDaemon = quassel.override { monolithic = false; enableDaemon = true; - withKDE = false; tag = "-daemon-qt5"; }; @@ -11044,10 +11025,6 @@ with pkgs; quake3hires ; - rott-shareware = callPackage ../by-name/ro/rott/package.nix { - buildShareware = true; - }; - inherit (callPackage ../by-name/sc/scummvm/games.nix { }) beneath-a-steel-sky broken-sword-25 @@ -11294,7 +11271,7 @@ with pkgs; blas-ilp64 = blas.override { isILP64 = true; }; - labplot = libsForQt5.callPackage ../applications/science/math/labplot { }; + labplot = kdePackages.callPackage ../applications/science/math/labplot { }; lapack-ilp64 = lapack.override { isILP64 = true; }; @@ -12077,8 +12054,6 @@ with pkgs; discord-development ; - tora = libsForQt5.callPackage ../development/tools/tora { }; - torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffa9b81a9663..28a2d504dec8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3921,10 +3921,10 @@ with self; CatalystPluginSession = buildPerlPackage { pname = "Catalyst-Plugin-Session"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Plugin-Session-0.43.tar.gz"; - hash = "sha256-Xn180rlbH8IkS8buuPRPg11gPqB/WjkRCIHbYJKLFMQ="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Plugin-Session-0.44.tar.gz"; + hash = "sha256-CSyNgOA1D5Jdx2XycsDuKPmSMAsU9bhphBIgTmyFfEI="; }; buildInputs = [ TestDeep @@ -3933,6 +3933,7 @@ with self; ]; propagatedBuildInputs = [ CatalystRuntime + CryptSysRandom ObjectSignature ]; meta = { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d3e78632338b..56123b35c59b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -478,6 +478,7 @@ mapAliases { python-jsonrpc-server = throw "python-jsonrpc-server has been removed because it was no longer used by anything"; # added 2025-11-11 python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29 python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29 + python-mbedtls = throw "'python-mbedtls' has been removed as it is unmaintained"; python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26 python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcbc1af01ac1..adad50c1a32f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -444,6 +444,8 @@ self: super: with self; { aiopinboard = callPackage ../development/python-modules/aiopinboard { }; + aiopnsense = callPackage ../development/python-modules/aiopnsense { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioprometheus = callPackage ../development/python-modules/aioprometheus { }; @@ -1304,6 +1306,8 @@ self: super: with self; { autopxd2 = callPackage ../development/python-modules/autopxd2 { }; + autoskope-client = callPackage ../development/python-modules/autoskope-client { }; + autoslot = callPackage ../development/python-modules/autoslot { }; av = callPackage ../development/python-modules/av { }; @@ -3840,6 +3844,8 @@ self: super: with self; { dendropy = callPackage ../development/python-modules/dendropy { }; + denon-rs232 = callPackage ../development/python-modules/denon-rs232 { }; + denonavr = callPackage ../development/python-modules/denonavr { }; dep-logic = callPackage ../development/python-modules/dep-logic { }; @@ -4861,6 +4867,8 @@ self: super: with self; { eagle100 = callPackage ../development/python-modules/eagle100 { }; + earn-e-p1 = callPackage ../development/python-modules/earn-e-p1 { }; + easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; easydict = callPackage ../development/python-modules/easydict { }; @@ -5182,6 +5190,8 @@ self: super: with self; { euporie = callPackage ../development/python-modules/euporie { }; + eurotronic-cometblue-ha = callPackage ../development/python-modules/eurotronic-cometblue-ha { }; + eval-type-backport = callPackage ../development/python-modules/eval-type-backport { }; evaluate = callPackage ../development/python-modules/evaluate { }; @@ -6002,6 +6012,8 @@ self: super: with self; { fullmoon = callPackage ../development/python-modules/fullmoon { }; + fumis = callPackage ../development/python-modules/fumis { }; + func-timeout = callPackage ../development/python-modules/func-timeout { }; funcparserlib = callPackage ../development/python-modules/funcparserlib { }; @@ -8367,6 +8379,8 @@ self: super: with self; { kinparse = callPackage ../development/python-modules/kinparse { }; + kiosker-python-api = callPackage ../development/python-modules/kiosker-python-api { }; + kiss-headers = callPackage ../development/python-modules/kiss-headers { }; kitchen = callPackage ../development/python-modules/kitchen { }; @@ -12710,6 +12724,18 @@ self: super: with self; { # https://github.com/opensteno/plover_plugins_registry/blob/master/unsupported.json plover = plover_4; + plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { }; + + plover-lapwing-aio = callPackage ../development/python-modules/plover-lapwing-aio { }; + + plover-last-translation = callPackage ../development/python-modules/plover-last-translation { }; + + plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { }; + + plover-python-dictionary = callPackage ../development/python-modules/plover-python-dictionary { }; + + plover-stitching = callPackage ../development/python-modules/plover-stitching { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { @@ -12925,6 +12951,8 @@ self: super: with self; { price-parser = callPackage ../development/python-modules/price-parser { }; + pricehist = callPackage ../development/python-modules/pricehist { }; + primecountpy = callPackage ../development/python-modules/primecountpy { }; primepy = callPackage ../development/python-modules/primepy { }; @@ -14572,6 +14600,8 @@ self: super: with self; { pyombi = callPackage ../development/python-modules/pyombi { }; + pyomie = callPackage ../development/python-modules/pyomie { }; + pyomo = callPackage ../development/python-modules/pyomo { }; pyopen-wakeword = callPackage ../development/python-modules/pyopen-wakeword/default.nix { }; @@ -15291,6 +15321,8 @@ self: super: with self; { pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; + pyteleinfo = callPackage ../development/python-modules/pyteleinfo { }; + pytenable = callPackage ../development/python-modules/pytenable { }; pytensor = callPackage ../development/python-modules/pytensor { }; @@ -15719,6 +15751,10 @@ self: super: with self; { python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + python-dropbox-api = callPackage ../development/python-modules/python-dropbox-api { }; + + python-duco-client = callPackage ../development/python-modules/python-duco-client { }; + python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; python-editor = callPackage ../development/python-modules/python-editor { }; @@ -15889,8 +15925,6 @@ self: super: with self; { python-matter-server = callPackage ../development/python-modules/python-matter-server { }; - python-mbedtls = callPackage ../development/python-modules/python-mbedtls { }; - python-melcloud = callPackage ../development/python-modules/python-melcloud { }; python-memcached = callPackage ../development/python-modules/python-memcached { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 63b241312cfe..6e753238312f 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -35,7 +35,7 @@ makeScopeWithSplicing' { attrs = { inherit config; inherit libsForQt5; - inherit (pkgs) lib fetchurl; + inherit (pkgs) lib fetchurl kdePackages; }; in (lib.makeOverridable mkFrameworks attrs); @@ -51,15 +51,15 @@ makeScopeWithSplicing' { in (noExtraAttrs ( - kdeFrameworks - // qt5 + qt5 // { inherit - kdeFrameworks qt5 ; + __internalKF5 = lib.dontRecurseIntoAttrs kdeFrameworks; + ### LIBRARIES accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { }; @@ -72,34 +72,18 @@ makeScopeWithSplicing' { fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; - futuresql = callPackage ../development/libraries/futuresql { }; - qgpgme = callPackage ../development/libraries/qgpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; - qtcurve = callPackage ../data/themes/qtcurve { }; - herqq = callPackage ../development/libraries/herqq { }; - kdb = callPackage ../development/libraries/kdb { }; - kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; - kdiagram = callPackage ../development/libraries/kdiagram { }; - kdsoap = callPackage ../development/libraries/kdsoap { }; - kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { }; - kimageannotator = callPackage ../development/libraries/kimageannotator { }; - kproperty = callPackage ../development/libraries/kproperty { }; - - kquickimageedit = callPackage ../development/libraries/kquickimageedit/0.3.0.nix { }; - - kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; - ldutils = callPackage ../development/libraries/ldutils { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -122,26 +106,14 @@ makeScopeWithSplicing' { libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; - libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; - maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = pkgs.mlt.override { qt = qt5; }; - phonon = callPackage ../development/libraries/phonon { }; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; - - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; - - plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1 { }; poppler = callPackage ../development/libraries/poppler { @@ -150,8 +122,6 @@ makeScopeWithSplicing' { suffix = "qt5"; }; - pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; - pyotherside = callPackage ../development/libraries/pyotherside { }; qca = callPackage ../development/libraries/qca { @@ -226,12 +196,27 @@ makeScopeWithSplicing' { xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; } // lib.optionalAttrs config.allowAliases { + futuresql = throw "libsForQt5.futuresql has been removed"; # Added 2026-05-01 + kdb = throw "libsForQt5.kdb has been removed"; # Added 2026-05-01 + kdiagram = throw "libsForQt5.kdiagram has been removed"; # Added 2026-05-01 kf5gpgmepp = throw '' 'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017. Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead. ''; # Added 2025-10-25 + kirigami-addons = throw "libsForQt5.kirigami-addons has been removed"; # Added 2026-05-01 + kproperty = throw "libsForQt5.kproperty has been removed"; # Added 2026-05-01 + kquickimageedit = throw "libsForQt5.kquickimageedit has been removed"; # Added 2026-05-01 + ktextaddons = throw "libsForQt5.ktextaddons has been removed"; # Added 2026-05-01 + kuserfeedback = throw "libsForQt5.kuserfeedback has been removed"; # Added 2026-05-01 + libqaccessibilityclient = throw "libsForQt5.libqaccessibilityclient has been removed"; # Added 2026-05-01 mapbox-gl-native = throw "libsForQt5.mapbox-gl-native has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 maplibre-gl-native = throw "libsForQt5.maplibre-gl-native has been removed due to being broken and superseded by maplibre-native-qt"; # Added 2026-04-11 + maui-core = throw "libsForQt5.maui-core has been removed"; # Added 2026-05-01 + phonon = throw "libsForQt5.phonon has been removed"; # Added 2026-05-01 + phonon-backend-gstreamer = throw "libsForQt5.phonon-backend-gstreamer has been removed"; # Added 2026-05-01 + phonon-backend-vlc = throw "libsForQt5.phonon-backend-vlc has been removed"; # Added 2026-05-01 + plasma-wayland-protocols = throw "libsForQt5.plasma-wayland-protocols has been removed"; # Added 2026-05-01 + pulseaudio-qt = throw "libsForQt5.pulseaudio-qt has been removed"; } )) );