diff options
289 files changed, 2824 insertions, 1922 deletions
diff --git a/.github/labeler.yml b/.github/labeler.yml index d7adc601e5808..b88f7f5179eca 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -369,3 +369,8 @@ - changed-files: - any-glob-to-any-file: - nixos/modules/**/* +"8.has: maintainer-list (update)": + - any: + - changed-files: + - any-glob-to-any-file: + - maintainers/maintainer-list.nix diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 612923fbe6f15..7a168d14a4791 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -20,7 +20,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index ff9e6d5a3814e..6059ba7849591 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14 with: diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 5863d0186f9bc..8e2011cb6d52a 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -91,7 +91,7 @@ jobs: exit 1 fi echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: ${{ env.mergedSha }} diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 82a8eca01adf0..f8d2445941656 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 filter: blob:none diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 6c3eb37236682..062522928c2ac 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 31e105281a77d..aca8808fa261b 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index e0a264cf485f9..bb864ace316b2 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 8e6dd17d3168d..ac5532a25370d 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index f3347a92d1f88..672ebf61ac778 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml index a45198f1475e1..b86594e0d53bb 100644 --- a/.github/workflows/nix-parse.yml +++ b/.github/workflows/nix-parse.yml @@ -24,7 +24,7 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index eba0d6cae3e2c..d9ad593618aea 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -41,7 +41,7 @@ jobs: into: staging-23.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 986b7013d0e7e..a3131e8025342 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 8f85ad89e2f75..36d84d617dc46 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -16,7 +16,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixpkgs-unstable diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36716ae1f4608..7edf4202b1e39 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9094,6 +9094,12 @@ github = "joshua-cooper"; githubId = 35612334; }; + jcaesar = { + name = "Julius Michaelis"; + matrix = "@julius:mtx.liftm.de"; + github = "jcaesar"; + githubId = 1753388; + }; jceb = { name = "Jan Christoph Ebersbach"; email = "jceb@e-jc.de"; @@ -10787,6 +10793,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kotatsuyaki = { + email = "kotatsuyaki@mail.kotatsu.dev"; + github = "kotatsuyaki"; + githubId = 17219127; + name = "kotatsuyaki"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -11584,12 +11596,6 @@ githubId = 918448; name = "Anthony Lodi"; }; - loewenheim = { - email = "loewenheim@mailbox.org"; - github = "loewenheim"; - githubId = 7622248; - name = "Sebastian Zivota"; - }; logo = { email = "logo4poop@protonmail.com"; matrix = "@logo4poop:matrix.org"; @@ -13576,12 +13582,6 @@ githubId = 20026143; name = "Katona László"; }; - MP2E = { - email = "MP2E@archlinux.us"; - github = "MP2E"; - githubId = 167708; - name = "Cray Elliott"; - }; mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; @@ -22471,12 +22471,6 @@ githubId = 51886259; name = "Zokre Zyl"; }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ff096943d76bb..08aa297a7c109 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -524,7 +524,6 @@ with lib.maintainers; { members = [ aanderse edwtjo - MP2E thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index d83e7c4ff71cb..cbbfb346dfb85 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -44,8 +44,6 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - A new option `systemd.sysusers.enable` was added. If enabled, users and groups are created with systemd-sysusers instead of with a custom perl script. -- The default dbus implementation has transitioned to dbus-broker from the classic dbus daemon for better performance and reliability. Users can revert to the classic dbus daemon by setting `services.dbus.implementation = "dbus";`. For detailed deviations, refer to [dbus-broker's deviations page](https://github.com/bus1/dbus-broker/wiki/Deviations). - - `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `hardware.nvidia-container-toolkit.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature. - `system.etc.overlay.enable` option was added. If enabled, `/etc` is @@ -293,6 +291,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `network-interfaces.target` system target was removed as it has been deprecated for a long time. Use `network.target` instead. +- `services.redis.vmOverCommit` now defaults to `true` and no longer enforces Transparent Hugepages (THP) to be disabled. Redis only works with THP configured to `madvise` which is the kernel's default. + - `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use ```nix diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index b946f62d93dc3..f1e19c5b3b720 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -35,6 +35,8 @@ rec { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; + riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt"; + riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -machine virt"; x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max"; }; otherHostGuestMatrix = { diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 1da2fa9f11604..ad88a4f589a20 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -57,9 +57,9 @@ in { package = mkPackageOption pkgs "redis" { }; vmOverCommit = mkEnableOption '' - setting of vm.overcommit_memory to 1 + set `vm.overcommit_memory` sysctl to 1 (Suggested for Background Saving: <https://redis.io/docs/get-started/faq/>) - ''; + '' // { default = true; }; servers = mkOption { type = with types; attrsOf (submodule ({ config, name, ... }: { @@ -312,10 +312,9 @@ in { ''; }) enabledServers); - boot.kernel.sysctl = mkMerge [ - { "vm.nr_hugepages" = "0"; } - ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) - ]; + boot.kernel.sysctl = mkIf cfg.vmOverCommit { + "vm.overcommit_memory" = "1"; + }; networking.firewall.allowedTCPPorts = concatMap (conf: optional conf.openFirewall conf.port diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index 6ab62eb03c25f..c924801bcd8ba 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -1,18 +1,40 @@ { config, lib, pkgs, ... }: let - inherit (builtins) attrNames concatMap length; + inherit (builtins) concatMap; inherit (lib) maintainers; - inherit (lib.attrsets) attrByPath filterAttrs; + inherit (lib.attrsets) attrByPath mapAttrsToList; inherit (lib.lists) flatten optional; inherit (lib.modules) mkIf; inherit (lib.options) literalExpression mkOption; - inherit (lib.strings) hasPrefix; - inherit (lib.types) bool listOf package; + inherit (lib.strings) concatStringsSep makeSearchPath; + inherit (lib.types) bool listOf attrsOf package lines; + inherit (lib.path) subpath; pwCfg = config.services.pipewire; cfg = pwCfg.wireplumber; pwUsedForAudio = pwCfg.audio.enable; + + json = pkgs.formats.json { }; + + configSectionsToConfFile = path: value: + pkgs.writeTextDir + path + (concatStringsSep "\n" ( + mapAttrsToList + (section: content: "${section} = " + (builtins.toJSON content)) + value + )); + + mapConfigToFiles = config: + mapAttrsToList + (name: value: configSectionsToConfFile "share/wireplumber/wireplumber.conf.d/${name}.conf" value) + config; + + mapScriptsToFiles = scripts: + mapAttrsToList + (relativePath: value: pkgs.writeTextDir (subpath.join ["share/wireplumber/scripts" relativePath]) value) + scripts; in { meta.maintainers = [ maintainers.k900 ]; @@ -33,6 +55,114 @@ in description = "The WirePlumber derivation to use."; }; + extraConfig = mkOption { + # Two layer attrset is necessary before using JSON, because of the whole + # config file not being a JSON object, but a concatenation of JSON objects + # in sections. + type = attrsOf (attrsOf json.type); + default = { }; + example = literalExpression ''{ + "log-level-debug" = { + "context.properties" = { + # Output Debug log messages as opposed to only the default level (Notice) + "log.level" = "D"; + }; + }; + "wh-1000xm3-ldac-hq" = { + "monitor.bluez.rules" = [ + { + matches = [ + { + # Match any bluetooth device with ids equal to that of a WH-1000XM3 + "device.name" = "~bluez_card.*"; + "device.product.id" = "0x0cd3"; + "device.vendor.id" = "usb:054c"; + } + ]; + actions = { + update-props = { + # Set quality to high quality instead of the default of auto + "bluez5.a2dp.ldac.quality" = "hq"; + }; + }; + } + ]; + }; + }''; + description = '' + Additional configuration for the WirePlumber daemon when run in + single-instance mode (the default in nixpkgs and currently the only + supported way to run WirePlumber configured via `extraConfig`). + + See also: + - [The configuration file][docs-the-conf-file] + - [Modifying configuration][docs-modifying-config] + - [Locations of files][docs-file-locations] + - and the [configuration section][docs-config-section] of the docs in general + + Note that WirePlumber (and PipeWire) use dotted attribute names like + `device.product.id`. These are not nested, but flat objects for WirePlumber/PipeWire, + so to write these in nix expressions, remember to quote them like `"device.product.id"`. + Have a look at the example for this. + + [docs-the-conf-file]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/conf_file.html + [docs-modifying-config]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/modifying_configuration.html + [docs-file-locations]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/locations.html + [docs-config-section]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration.html + ''; + }; + + extraScripts = mkOption { + type = attrsOf lines; + default = { }; + example = { + "test/hello-world.lua" = '' + print("Hello, world!") + ''; + }; + description = '' + Additional scripts for WirePlumber to be used by configuration files. + + Every item in this attrset becomes a separate lua file with the path + relative to the `scripts` directory specified in the name of the item. + The scripts get passed to the WirePlumber service via the `XDG_DATA_DIRS` + variable. Scripts specified here are preferred over those shipped with + WirePlumber if they occupy the same relative path. + + For a script to be loaded, it needs to be specified as part of a component, + and that component needs to be required by an active profile (e.g. `main`). + Components can be defined in config files either via `extraConfig` or `configPackages`. + + For the hello-world example, you'd have to add the following `extraConfig`: + ```nix + services.pipewire.wireplumber.extraConfig."99-hello-world" = { + "wireplumber.components" = [ + { + name = "test/hello-world.lua"; + type = "script/lua"; + provides = "custom.hello-world"; + } + ]; + + "wireplumber.profiles" = { + main = { + "custom.hello-world" = "required"; + }; + }; + }; + ``` + + See also: + - [Location of scripts][docs-file-locations-scripts] + - [Components & Profiles][docs-components-profiles] + - [Migration - Loading custom scripts][docs-migration-loading-custom-scripts] + + [docs-file-locations-scripts]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/locations.html#location-of-scripts + [docs-components-profiles]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/components_and_profiles.html + [docs-migration-loading-custom-scripts]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/migration.html#loading-custom-scripts + ''; + }; + configPackages = mkOption { type = listOf package; default = [ ]; @@ -57,7 +187,7 @@ in extraLv2Packages = mkOption { type = listOf package; - default = []; + default = [ ]; example = literalExpression "[ pkgs.lsp-plugins ]"; description = '' List of packages that provide LV2 plugins in `lib/lv2` that should @@ -96,9 +226,22 @@ in } ''; + extraConfigPkg = pkgs.buildEnv { + name = "wireplumber-extra-config"; + paths = mapConfigToFiles cfg.extraConfig; + pathsToLink = [ "/share/wireplumber/wireplumber.conf.d" ]; + }; + + extraScriptsPkg = pkgs.buildEnv { + name = "wireplumber-extra-scrips"; + paths = mapScriptsToFiles cfg.extraScripts; + pathsToLink = [ "/share/wireplumber/scripts" ]; + }; + configPackages = cfg.configPackages - ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg - ++ optional pwCfg.systemWide systemwideConfigPkg; + ++ [ extraConfigPkg extraScriptsPkg ] + ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg + ++ optional pwCfg.systemWide systemwideConfigPkg; configs = pkgs.buildEnv { name = "wireplumber-configs"; @@ -110,7 +253,7 @@ in ( concatMap (p: - attrByPath ["passthru" "requiredLv2Packages"] [] p + attrByPath [ "passthru" "requiredLv2Packages" ] [ ] p ) configPackages ); @@ -127,24 +270,10 @@ in assertion = !config.hardware.bluetooth.hsphfpd.enable; message = "Using WirePlumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; } - { - assertion = length - (attrNames - ( - filterAttrs - (name: value: - hasPrefix "wireplumber/" name || name == "wireplumber" - ) - config.environment.etc - )) == 1; - message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.wireplumber.configPackages` instead."; - } ]; environment.systemPackages = [ cfg.package ]; - environment.etc.wireplumber.source = "${configs}/share/wireplumber"; - systemd.packages = [ cfg.package ]; systemd.services.wireplumber.enable = pwCfg.systemWide; @@ -156,10 +285,16 @@ in systemd.services.wireplumber.environment = mkIf pwCfg.systemWide { # Force WirePlumber to use system dbus. DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/dbus/system_bus_socket"; + + # Make WirePlumber find our config/script files and lv2 plugins required by those + # (but also the configs/scripts shipped with WirePlumber) + XDG_DATA_DIRS = makeSearchPath "share" [ configs cfg.package ]; LV2_PATH = "${lv2Plugins}/lib/lv2"; }; - systemd.user.services.wireplumber.environment.LV2_PATH = - mkIf (!pwCfg.systemWide) "${lv2Plugins}/lib/lv2"; + systemd.user.services.wireplumber.environment = mkIf (!pwCfg.systemWide) { + XDG_DATA_DIRS = makeSearchPath "share" [ configs cfg.package ]; + LV2_PATH = "${lv2Plugins}/lib/lv2"; + }; }; } diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index cbff3ab3e617c..d0fca6a41c7b6 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -119,6 +119,8 @@ in wantedBy = [ "multi-user.target" ]; + # https://github.com/rhasspy/wyoming-faster-whisper/issues/27 + environment."HF_HUB_CACHE" = "/tmp"; serviceConfig = { DynamicUser = true; User = "wyoming-faster-whisper"; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index a9fc88e320c6b..8dba0aca64337 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -39,7 +39,7 @@ in implementation = mkOption { type = types.enum [ "dbus" "broker" ]; - default = "broker"; + default = "dbus"; description = '' The implementation to use for the message bus defined by the D-Bus specification. Can be either the classic dbus daemon or dbus-broker, which aims to provide high diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index bb88a185b4618..29bed0e067fa4 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -103,22 +103,20 @@ let lib.concatStringsSep "\n" [ (lib.optionalString brotli.enable '' echo -n "Precompressing static files with Brotli …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output={}.br {}" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output=$file.br $file + ''} echo " done." '') (lib.optionalString gzip.enable '' echo -n "Precompressing static files with Gzip …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} {} > {}.gz" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} $file > $file.gz + ''} echo " done." '') ]; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 8b218cf1a6b2f..02540c362d318 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,8 +7,20 @@ let efi = config.boot.loader.efi; + # We check the source code in a derivation that does not depend on the + # system configuration so that most users don't have to redo the check and require + # the necessary dependencies. + checkedSource = pkgs.runCommand "systemd-boot" { } '' + install -m755 -D ${./systemd-boot-builder.py} $out + ${lib.getExe pkgs.buildPackages.mypy} \ + --no-implicit-optional \ + --disallow-untyped-calls \ + --disallow-untyped-defs \ + $out + ''; + systemdBootBuilder = pkgs.substituteAll rec { - src = ./systemd-boot-builder.py; + src = checkedSource; isExecutable = true; @@ -66,19 +78,9 @@ let ''; }; - checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { } '' - mkdir -p $out/bin - install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder - ${lib.getExe pkgs.buildPackages.mypy} \ - --no-implicit-optional \ - --disallow-untyped-calls \ - --disallow-untyped-defs \ - $out/bin/systemd-boot-builder - ''; - finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' #!${pkgs.runtimeShell} - ${checkedSystemdBootBuilder}/bin/systemd-boot-builder "$@" + ${systemdBootBuilder} "$@" ${cfg.extraInstallCommands} ''; in { diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index a57d66f82eac9..4a7bcd5a82264 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -610,6 +610,11 @@ in { # Returns a comma separated representation of the given list in sorted # order, that matches the output format of switch-to-configuration.pl sortedUnits = xs: lib.concatStringsSep ", " (builtins.sort builtins.lessThan xs); + + dbusService = { + "dbus" = "dbus.service"; + "broker" = "dbus-broker.service"; + }.${nodes.machine.services.dbus.implementation}; in /* python */ '' def switch_to_specialisation(system, name, action="test", fail=False): if name == "": @@ -691,9 +696,9 @@ in { with subtest("continuing from an aborted switch"): # An aborted switch will write into a file what it tried to start # and a second switch should continue from this - machine.succeed("echo dbus-broker.service > /run/nixos/start-list") + machine.succeed("echo ${dbusService} > /run/nixos/start-list") out = switch_to_specialisation("${machine}", "modifiedSystemConf") - assert_contains(out, "starting the following units: dbus-broker.service\n") + assert_contains(out, "starting the following units: ${dbusService}\n") with subtest("fstab mounts"): switch_to_specialisation("${machine}", "") @@ -732,7 +737,7 @@ in { out = switch_to_specialisation("${machine}", "") assert_contains(out, "stopping the following units: test.mount\n") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -740,7 +745,7 @@ in { out = switch_to_specialisation("${machine}", "storeMountModified") assert_lacks(out, "stopping the following units:") assert_contains(out, "NOT restarting the following changed units: -.mount") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -751,7 +756,7 @@ in { out = switch_to_specialisation("${machine}", "swap") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: swapfile.swap") @@ -760,7 +765,7 @@ in { assert_contains(out, "stopping swap device: /swapfile") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -781,7 +786,7 @@ in { assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") # huh + assert_contains(out, "reloading the following units: ${dbusService}\n") # huh assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") @@ -858,7 +863,7 @@ in { assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") # huh + assert_contains(out, "reloading the following units: ${dbusService}\n") # huh assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 54bd0cad3593e..9e519510eb721 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.1-1"; + version = "3.14.2-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-EyMTWsaqJX7H7aCbu5ww9tQBMwJ7BzobWMWg5Y/ZgJE="; + hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; }; postPatch = '' diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 7adaa00d60781..3d919449be3ee 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-yxr98CJuu15TGiIXCBhU2bOgvct6jQ5xAraD9Z0sL2Q="; + hash = "sha256-Z9vRuz5PwOhJ3DQD9zvCilgTMww7bRL4aR6fRoHIayI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ce8SdBvRdFp1BU9OPcByoJjCiSrAkQqtmfCeJ3B+Piw="; + hash = "sha256-hcfkwxwLOUBMj6rvhI5F4OO9UaSP7CAE0JNOGlh2lVY="; }; patches = [ diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 78389b28c9543..4e6e685316bf4 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -14,7 +14,6 @@ , miniupnpc , zeromq , zlib -, db53 , sqlite , qrencode , qtbase ? null @@ -33,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "26.0"; + version = "27.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "00qvaf53jszsk1rr029zmq60v8w0r92192ab65k2krkmh7ybla9l"; + sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; }; nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ db53 sqlite ] + ++ lib.optionals withWallet [ sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index 5c4a7cc8b3549..54ecd28550c2b 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -5,6 +5,7 @@ , bash , makeWrapper , electron +, asar }: let @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper asar ]; dontConfigure = true; dontBuild = true; @@ -48,6 +49,13 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a "opt/Terra Station/"{locales,resources} $out/share/${pname} + # patch pre-built node modules + asar e $out/share/${pname}/resources/app.asar asar-unpacked + find asar-unpacked -name '*.node' -exec patchelf \ + --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + {} \; + asar p asar-unpacked $out/share/${pname}/resources/app.asar + substituteInPlace $out/share/applications/station-electron.desktop \ --replace "/opt/Terra Station/station-electron" ${pname} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix index 1b48776f75606..0f9da8136214c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://git.sr.ht/~casouri/xapian-lite"; description = "A minimal Emacs dynamic module for Xapian"; - maintainers = [ ]; + maintainers = [ lib.maintainers.kotatsuyaki ]; license = lib.licenses.gpl3Plus; inherit (emacs.meta) platforms; }; diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 51a1a2925e92d..2b3ee40951755 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -3,6 +3,7 @@ , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } +, extraProfile ? "" }: let @@ -114,7 +115,7 @@ in buildFHSEnv rec { if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi - ''; + '' + extraProfile; # Run the wrappers directly, instead of going via bash. runScript = ""; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e61f57c76448c..bc44c8e9f6200 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -4,6 +4,9 @@ , dpkg , makeWrapper , electron +, libsecret +, asar +, glib , desktop-file-utils , callPackage }: @@ -28,16 +31,28 @@ stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils ]; + nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils asar ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - installPhase = '' + installPhase = let + libPath = lib.makeLibraryPath [ + libsecret + glib + stdenv.cc.cc.lib + ]; + in + '' runHook preInstall mkdir -p $out/bin $out/share/standardnotes cp -R usr/share/{applications,icons} $out/share cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/ + asar e $out/share/standardnotes/app.asar asar-unpacked + find asar-unpacked -name '*.node' -exec patchelf \ + --add-rpath "${libPath}" \ + {} \; + asar p asar-unpacked $out/share/standardnotes/app.asar makeWrapper ${electron}/bin/electron $out/bin/standardnotes \ --add-flags $out/share/standardnotes/app.asar diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 62d8b5a519dd7..2776640fdf594 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -937,6 +937,7 @@ https://github.com/xiyaowong/transparent.nvim/,HEAD, https://github.com/Wansmer/treesj/,main, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, +https://github.com/simonclean/triptych.nvim/,HEAD, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 07d8e5430a7b7..409cb43eae35d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1822,7 +1822,7 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.14.2024032901"; # compatible with vscode 1.88.1 + version = "0.14.2024032901"; # compatible with vscode 1.88.1 hash = "sha256-+6N7IGO5j0wP5Zg8CwapHeKGWiZzc43VM4jCtqJDJIQ="; }; meta = { @@ -2853,6 +2853,22 @@ let ms-python.python = callPackage ./ms-python.python { }; + ms-python.debugpy = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "debugpy"; + publisher = "ms-python"; + version = "2023.3.13121011"; + hash = "sha256-owYUEyQl2FQytApfuI97N4y9p7/dL0lu6EBk/AzSMjw="; + }; + meta = { + description = "Python debugger (debugpy) extension for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy"; + homepage = "https://github.com/Microsoft/vscode-python-debugger"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.carlthome ]; + }; + }; + ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { }; ms-toolsai.datawrangler = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 3f77dcd105f91..568f43d3564cc 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -202,7 +202,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ - MP2E ashkitten ivar ]; diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 7c409692d939d..b4698480a962d 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten Madouura ]; + maintainers = with maintainers; [ ashkitten Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index c61b1662a6c4d..4ba40b417c8cb 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.264"; + version = "0.265"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-0UWMBKM//XWm8PFl60JvTLGaDBMVZFnVrbX4omy2F4I="; + hash = "sha256-jXGmABFeoT8g2UtVV159gUpdWcBvb9aX3uiFi2neVQI="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index d7e322f39588d..3c571a2adf768 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.18"; + version = "0.8.19"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-TLY6ydYeRuT93jjUeE7EaFNNllwla4h563UhXAxSyko="; + hash = "sha256-oCgnz1WMg7YypIT8Tjk2m+f/43Aj88rDVCxQ92aL3RY="; }; - cargoHash = "sha256-RKJE09Z4XxRLWQ95Om3tru4rI2TD7XmxoHhPHFirREo="; + cargoHash = "sha256-vlU7egAht+kgA5Vx0HAwQOIax9qD4FLRo1ZUNx4RieY="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index e35939536a614..1fda517675416 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-W0XbNZDSeSK6oxOD1JeLNF+c6/6cy/WQrrmQbSKeqk4="; + sha256 = "sha256-aAhceExz5SENL+FhPHyx8HmaNOWjNsynv81Rj2cS5M8="; }; - cargoHash = "sha256-IM2SKovb8FYwA/c4R3N7M+oVuGfuc5sK+r6FP9YMk+I="; + cargoHash = "sha256-vw7fGsTSEVO8s1LzilKJN5lGzOfQcms1h7rnTOyE4Kw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 293c3c5691ecf..44e96cb9085a9 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "23.2"; + version = "24"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-r2iw1vINWgqxoW0Zc8Sloa+wN/GUbUQfJ0e2BSP9vxM="; + sha256 = "sha256-gMwTdwYjYJt1j5MpHw6UD1wqmF7q3ikzjVSOGakIP30="; }; dontUnpack = true; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index ee7d7d3a95b95..eccb7df29166b 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.7.1"; + version = "3.7.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-uiJy4kfcTFUymyE0DxP6GlMX7ONogLFrx6K9IcgwTSE="; + sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 35be59a3166e5..5fe74bbe204a7 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -5,6 +5,7 @@ , makeWrapper # graphs will not sync without matching upstream's major electron version , electron_27 +, autoPatchelfHook , git , nix-update-script }: @@ -30,7 +31,8 @@ in { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index 9fbe6d0f4aa38..8823744bf3a1f 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -20,6 +20,8 @@ appimageTools.wrapType2 { --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' ''; + extraPkgs = pkgs: with pkgs; [ zstd ]; + meta = with lib; { homepage = "https://davidotek.github.io/protonup-qt/"; description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 639c46b9bd374..555af71d37257 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-qHNB+jRLQoiHPuTblpCHg2+6e5j8W6YPsuygRlTidtE="; + hash = "sha256-G8p1eaHebUH2lFNyC2njUzZacE6rayApCb7PBFcpKLk="; }; - cargoHash = "sha256-T+fXSca1u9+c305yuKOF+soxnSZ1YbBs57wco5TLpQw="; + cargoHash = "sha256-iM5PsgCUxBbjeWGEIohZwMiCIdXqj/bhFoL0GtVKKq4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 7f3265cbd8bf4..761e7f0d1d7b1 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.10.7"; + version = "2.10.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-0C8lVQrFxrk9ym4aCz0PhUS2iByx9rj5Id0xFIq4Efc="; + hash = "sha256-VzEgZshzIHXI0J172W1zI1E8dU8iYJq0lO01LpI8Y+U="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index feb1b03d26fe8..14c92f1b773e7 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cmctl"; - version = "1.14.4"; + version = "1.14.5"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-iUXN+8ueCxGsFnwhC2WjrQQSXV7TGUR80xaKqjxcC6o="; + hash = "sha256-WitYq3/veaARZQHoseJnT5h0AGmXVlLzRe8KCOJuY0w="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-ViKsqqM6l/tQSGgj8Yt2L57x+eE1Pd3xCVPuWpIjWOQ="; + vendorHash = "sha256-27XvT33S/vgGo5MQDpHzTN+K1nNPR6OOFggzLhatygI="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index d04faf4400812..032ccfe8f96a5 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , coreutils , findutils -, git +, gitMinimal , gnugrep , gnused , makeWrapper @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs $out/helm-git/helm-git{,-plugin.sh} wrapProgram $out/helm-git/helm-git \ - --prefix PATH : ${lib.makeBinPath [ coreutils findutils git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils findutils gitMinimal gnugrep gnused ]} runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 3651d4652fc70..5a46b80749b08 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-TEQnbQux+rN2WdlIbxh836Lx/ipqTDkoUsjQP8Ubl6s="; + hash = "sha256-E5pu37R2y0hQezM/p6LJXZv2L6QnV89Ir2HoKaqcOqI="; }; - vendorHash = "sha256-xdcHd/LvIm4rawwXtsGMF8Es9pMGMaJJaZ6UQwc24ZU="; + vendorHash = "sha256-5vWAZsLQxPZGpTiT/OowCLNPdE5e+HrAGXpFRw6jgbU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7211d540896b4..b4e0aca9cc58a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,14 +2,14 @@ let versions = if stdenv.isLinux then { - stable = "0.0.50"; - ptb = "0.0.80"; - canary = "0.0.357"; + stable = "0.0.51"; + ptb = "0.0.81"; + canary = "0.0.369"; development = "0.0.17"; } else { - stable = "0.0.301"; - ptb = "0.0.109"; - canary = "0.0.477"; + stable = "0.0.302"; + ptb = "0.0.110"; + canary = "0.0.486"; development = "0.0.39"; }; version = versions.${branch}; @@ -17,15 +17,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-6VXdVLk7Z8NGQMiSdgBRd8NIueUktkId6BXYKNABb+4="; + hash = "sha256-w8zLeaqJXdbI67X/UDxSLQxZei5eraa/BkMZa+GDpYk="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-y/ntnHIYcY35Jszh0PrFy395eJ5dBWwLNpzHMoSZuNA="; + hash = "sha256-/kM23y4Hx/0HwIOQvd+4Y429s/6Q+coa27hgI2U3EcU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-sDwC5kPzAfvQmsrq6M/GPFtUaT9pNAEB4uGI5Mn3oXs="; + hash = "sha256-Ohfp5ypvdmjr5rYR1usdVoEuVwOALRozysIjT/v75Qs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -35,15 +35,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-h7C1wCKtUGcMFUhoKVdD7Vq9TGUaXfmjlVhwmRdhqYw="; + hash = "sha256-Xt0ef+ogGlPA4ebxuAsGQKeMVDoTB58jCRcyM1fHjYE="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-xxLnzELuI0X2r/weP1K2Bb51uRh1JjR72p7cXzy12Kc="; + hash = "sha256-hkRO/4YD1j4gsp+r3+md3ND/xtNmdutJiXlY3UIecIY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-xEDtEtZNhOTtz+zRLLQBSeLbntlVAVQsocAGyAaVePM="; + hash = "sha256-c7KNWsV+pultD+HqRNonSOW9PCGx1AajCfnc94Dokwc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; @@ -60,7 +60,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; + maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "discord"; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 53762baf82fff..af5f6ca321c03 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -17,7 +17,7 @@ let categories = [ "Network" ]; }); - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in @@ -26,7 +26,6 @@ appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps - ln -sf rambox-${version} $out/bin/${pname} install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 130508f95e30b..0b1f3b034cced 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.5.1"; + version = "7.6.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-afKR+P2YPkv4OMIr8LzWeAMZWr0zaJ1R0BQD87gQuSk="; + hash = "sha256-sGOWsFZTO9VQDkCqhsOkW5aY+sh0fLH7kPPe/bAzGvg="; } diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 20775c4ed4afe..7677abfb0ccf3 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -10,6 +10,7 @@ nodePackages.n8n.override { nativeBuildInputs = [ pkgs.nodePackages.node-pre-gyp pkgs.which + pkgs.xcbuild ]; buildInputs = [ @@ -30,6 +31,9 @@ nodePackages.n8n.override { # makes libmongocrypt bindings not look for static libraries in completely wrong places BUILD_TYPE = "dynamic"; + # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. + NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; + dontNpmInstall = true; passthru = { diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 678e9f68ee214..7699d5d399c81 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.42.0"; + version = "1.43.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-aQUz6FK04h3nzieK9fX7odVVt/zcdhXlX3T1Z1rN/ak="; + sha256 = "sha256-5aznAAO53EFeq/fap10ARGerKzQAvLx0zOeG6OWkymw="; }; - vendorHash = "sha256-DATSGSFRMrX972CWCiSIlOhDuAG3zcVyuILZ3IpVirM="; + vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 924f683b52aa8..0ff43b584bea9 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.3"; + version = "24.4.4"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-dthb+FkytNiiS2s7VdMgYxvNbGeBx5gONOYkHHphigY="; + hash = "sha256-nTRCW76UogaTOyxQ5HfWUln6Lip/LpoyPG+m+mMCb1I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 1676ca4c2a4f1..74659a58f13ee 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs -, version ? "1.7.1" +, version ? "1.7.2" , ideSupport ? true , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { - "1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4="; + "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; }."${version}"; }; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 252eadc1c39c9..0792d3375d0a4 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.9.0"; + version = "10.10.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; - sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI="; + sha256 = "sha256-UB5Vr5wyCUZbOaQNckJQ1tAXwh8VSLNI1IgTiJzxV08="; }; # remove large unneeded files diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 1459e2f18e803..b60c38fa1d301 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -1,13 +1,12 @@ -{ fetchFromGitHub -, gitMinimal -, gfold -, lib -, libiconv -, makeWrapper -, rustPlatform -, Security -, stdenv -, testers +{ + fetchFromGitHub, + gfold, + lib, + libiconv, + rustPlatform, + Security, + stdenv, + testers, }: let @@ -26,7 +25,10 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-wDUOYK9e0i600UnJ0w0FPI2GhTa/QTq/2+ICiDWrmEU="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; passthru.tests.version = testers.testVersion { package = gfold; @@ -35,11 +37,10 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = - "CLI tool to help keep track of your Git repositories, written in Rust"; + description = "CLI tool to help keep track of your Git repositories, written in Rust"; homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; mainProgram = "gfold"; }; diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index 279e6d0075e7b..89fd45e45f0dc 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -59,6 +59,5 @@ in buildGoModule { homepage = "https://gg-scm.io/"; changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ zombiezen ]; }; } diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index 2bbcc10202af1..a337443e87ead 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-aLvx9lYQJYUw2XBj+2P+yEJMboUjmHKzxP5QA3N93JA="; + hash = "sha256-fIvNaMfgwnMBUNo6kr37zhKiBgKNzT2E0dLLtqaVBvI="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index bdef9fe1ea7d9..508f416515ad8 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.197"; + version = "5.12.198"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-Z03FDdlg1IBXHpurKr6RwmtZkaptyeQe+0lgKn/GTTQ="; + hash = "sha256-4tWgIwDmGZhMFTVT5VzmGj69zV8FGTV0yBHUy5Iu1Xw="; }; - cargoHash = "sha256-V8TV8RM3T7DYqwNV/r5PkkJVtyAQLdY3BR3sz26phdY="; + cargoHash = "sha256-vKiCKcyB1Q2CNA4HpE8dc5gh+nlrz0VERIMaTGlDH5Y="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 14b0ca9497bc5..273b26808af58 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -1,6 +1,6 @@ { lib +, stdenv , fetchFromGitLab -, mkKdeDerivation , breeze-icons , breeze , cmake @@ -15,7 +15,7 @@ , kirigami , kxmlgui , kdoctools -, mpv +, mpvqt , pkg-config , wrapQtAppsHook , qqc2-desktop-style @@ -23,7 +23,7 @@ , yt-dlp }: -mkKdeDerivation rec { +stdenv.mkDerivation rec { pname = "haruna"; version = "1.0.2"; @@ -56,7 +56,7 @@ mkKdeDerivation rec { kirigami kxmlgui kdoctools - mpv + mpvqt qtbase ]; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 57186eec19f8c..b341a7ffee89a 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -47,14 +47,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "manim"; pyproject = true; - version = "0.18.0.post0"; - disabled = python3.pythonOlder "3.8"; + version = "0.18.1"; + disabled = python3.pythonOlder "3.9"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; rev = "refs/tags/v${version}"; - hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; + hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index e0afa7d932c67..8db7d4b1aa3c9 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -2,7 +2,10 @@ , stdenvNoCC }: let - escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); + # Escape strings for embedding in shell scripts + escaped = s: "'${lib.escape [ "'" ] s}'"; + escapedList = lib.concatMapStringsSep " " escaped; + fileName = pathStr: lib.last (lib.splitString "/" pathStr); scriptsDir = "$out/share/mpv/scripts"; @@ -50,14 +53,14 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy } [ ${with builtins; toString (length extraScripts)} -eq 0 ] || { echo "mpvScripts.buildLua does not support 'extraScripts'" \ - "when 'scriptPath' is a directory" + "when 'scriptPath' is a directory" >&2 exit 1 } mkdir -p "${scriptsDir}" cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" else - install -m644 -Dt "${scriptsDir}" \ - ${escapedList ([ scriptPath ] ++ extraScripts)} + install -m644 -Dt "${scriptsDir}" ${escaped scriptPath} + ${lib.optionalString (extraScripts != []) ''cp -at "${scriptsDir}/" ${escapedList extraScripts}''} fi runHook postInstall diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index 69eba782cc1d7..36bc69bebaf81 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -29,7 +29,6 @@ buildLua { extraScripts = [ "c_concat.sh" ]; postInstall = '' - chmod 0755 $out/share/mpv/scripts/c_concat.sh wrapProgram $out/share/mpv/scripts/c_concat.sh \ --run "mkdir -p ~/.config/mpv/cutter/" ''; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 077b8f0590b28..56ac2575ecdea 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -32,7 +32,7 @@ buildLua { --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; - postInstall = "cp -a sponsorblock_shared $out/share/mpv/scripts/"; + extraScripts = [ "sponsorblock_shared" ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 3df52d08684d5..f278d832958ed 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ]; + maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index deebf1af7b848..f400fced2ac08 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-J7tCEIB9zQ0zZFl1eSuEARd+KqpNClHfYx3wcLawFeM="; + sha256 = "sha256-INxz8W4AMKxRcfpZkhqqsWWWQQVEc2G9iFQBit1YA2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c6e9f450b9907..82767da10d998 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-baEF8vcAmac4bwpzJnGE2WczTa6vojjRQ/oEKgYeXgk="; + sha256 = "sha256-3lFM7bOzsKex6JUdbcw8MNS4PRzaN/E/vngdukgfV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 25fe296df2dae..87732ad75b8cc 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.04.13"; + version = "24.04.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-xEdCsvclZXCJgoOnx5ZyOElCXjGpbrOtC7VOR5Hgvpg="; + hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index c5159fdd61f0f..5713aeb954af3 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.6"; + version = "2.6.7"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-3om/Q67PHtX/aIG4zMCaJTyD9bZNEcyE5LQTeb+zB+M="; + hash = "sha256-6i3EQgARwMLNejgB0NevmLmd9OrNBvjqW+qLrAdqUxE="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index a27d9d2b9955f..43222fa6b19b3 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-Ob02OjqQGV60TE1CBe/Hr/WWiPNQ/33T1vPYPmJBr/4="; + hash = "sha256-31cgihmtBIB8U60ic5wKNyqB4a5sXZmIXxAjQI/43ro="; }; - vendorHash = "sha256-XYYGr/mJYQuiDJFRrr8GlQbotM+Sb8xaBiARjZ/UyIs="; + vendorHash = "sha256-X2E0Sy4rJhrDgPSSOTqUeMEdgq5H3DF5xjh84qlH1Ug="; ldflags = [ "-s" diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index f38d0d6beb9b1..45f17c0c912ed 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + CXXFLAGS = "-std=c++98"; + buildInputs = [ freetype fribidi diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index b4472425324ee..a4e36c18368e6 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; + hash = "sha256-6hVmq09f/Ofp/U96H8pbMMquTVACO/RZITmUCU4Cspo="; }; postPatch = '' diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 23a2432c824ee..723acbc2531f8 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -64,26 +64,26 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "ad82a736c170e97b7c8c035ebd8a801c17eec170"; - hash = "sha256-wN0dam0ZXOAJ+D8bGDMhsdaV3llI9LsiCXwqW9mR3gQ="; + rev = "25d16511e8d42c2744a1d94d90169e3a36e92631"; + hash = "sha256-fXeWM/8jBfJY7KL6PVfRbzB8i4sp6PHsnMSHCX5kzfI="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "d69d979223e883faef9dc6fe3cf573087243c28a"; - hash = "sha256-CUckfNjfDW05crWigzMP5b9UynviXKGZUlIr754OoGU="; + rev = "74278bc4a1122d74945969e6dec405abd1533ec3"; + hash = "sha256-WbpndtAviph6+I/F2bevuMI9DkfSv4SMPgMaP98k6Qo="; }; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; - version = "15.0.0"; + version = "16.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${finalAttrs.version}/apache-arrow-${finalAttrs.version}.tar.gz"; - hash = "sha256-Ad0/cOhdm1uTPsksDbik71BKUQX3jS2GIuhCeftFwl0="; + hash = "sha256-n0BRrpRzyXmR2a+AHi+UrjRVBncZyn+QuBN/nppwC40="; }; sourceRoot = "apache-arrow-${finalAttrs.version}/cpp"; @@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: { ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.27.0"; - hash = "sha256-wptEAXembah04pzqAz6UHeUxp+jMf6Lh/IdyuIhy/a8="; + rev = "v0.44.0"; + hash = "sha256-V739IFTGPtbGPlxcOi8sAaYSDhNUEpITvN9IqdPReug="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index e06530202407e..69ac822d84ee6 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-ChX2LMRbqoKzl+QKkeervrCHr3plAQ21RzC4RqEucCA="; + hash = "sha256-d5qUleQrwWWTIEDj3VvJKpINHpc0rko18if4pv5GonU="; }; - cargoHash = "sha256-nYkXL3SIjG3REE+w2vIlB04FWs7e0d4iu0hRjAPz7aU="; + cargoHash = "sha256-vlrllbcf5Y9DFwdekAHE5xtGlloKxTExXkp1LySEUK0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 06d3e4c49a947..40dafa76288b8 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -6,17 +6,20 @@ python3.pkgs.buildPythonApplication rec { pname = "audiness"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; rev = "refs/tags/${version}"; - hash = "sha256-vc2k3oEMTgzm/C6z6BieRrT3cSP0IkY+D3RXkNGaZTE="; + hash = "sha256-UJe4ZawjAuUoSKEdIgjh8zZu/amYLZ8rpUDahSHokKA="; }; - pythonRelaxDeps = [ "validators" ]; + pythonRelaxDeps = [ + "typer" + "validators" + ]; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 9b8419df89053..7888fc3b9ffe4 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , nixosTests , ayatana-indicator-messages @@ -32,38 +31,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-datetime"; - version = "23.10.1"; + version = "24.2.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-datetime"; rev = finalAttrs.version; - hash = "sha256-cm1zhG9TODGe79n/fGuyVnWL/sjxUc3ZCu9FhqA1NLE="; + hash = "sha256-J3Yp7Dx4UvvdlM8Cp1sPe4Ftm/aAmNzpo4re/jF7pRo="; }; - patches = [ - # Fix test-menus building & running - # Remove when version > 23.10.1 - (fetchpatch { - name = "0001-ayatana-indicator-datetime-Fix-test-menus-tests.patch"; - url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/ddabb4a61a496da14603573b700c5961a3e5b834.patch"; - hash = "sha256-vf8aVXonCoTWMuAQZG6FuklWR2IaGY4hecFtoyNCGg8="; - }) - - # Fix EDS-related tests - # Remove when version > 23.10.1 - (fetchpatch { - name = "0002-ayatana-indicator-datetime-Fix-EDS-colour-tests.patch"; - url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/6d67f7b458911833e72e0b4a162b1d823609d6f8.patch"; - hash = "sha256-VUdMJuma6rmsjUOeyO0W8UNKADODiM+wDVfj6aDhqgw="; - }) - ]; - postPatch = '' - # Queries systemd user unit dir via pkg_get_variable, can't override prefix + # Override systemd prefix substituteInPlace data/CMakeLists.txt \ - --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' \ - --replace-fail '/etc' "\''${CMAKE_INSTALL_FULL_SYSCONFDIR}" + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' # Looking for Lomiri schemas for code generation substituteInPlace src/CMakeLists.txt \ @@ -136,8 +117,8 @@ stdenv.mkDerivation (finalAttrs: { ]} ''; + # schema is already added automatically by wrapper, EDS needs to be added explicitly preFixup = '' - # schema is already added automatically by wrapper, EDS needs to be added explicitly gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${edsDataDir}" ) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index ea91392eeacc3..9f9d962743d75 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -27,20 +27,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-kUvDtqv3Tdnntr4Ny5pM406KA5++AHsCoAiPg4x4Rsw="; + hash = "sha256-nhs44W7cOREdULdXFNZpFGeeZeVTGUffKOBhtL4zAaw="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-VvUpAdF4ouy695om3qpsyrmiMf69OFgfpQyeZArQEDs="; + npmDepsHash = "sha256-p4rBEOK9zKGO1q3SCKpfdX3EPMkYHRvn9UnGBhsksSE="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix index 59085534d0632..b0026988c9a16 100644 --- a/pkgs/by-name/ca/cargo-bloat/package.nix +++ b/pkgs/by-name/ca/cargo-bloat/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; + hash = "sha256-vPk6ERl0VM1TjK/JRMcXqCvKqSTuw78MsmQ0xImQyd4="; }; - cargoHash = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; + cargoHash = "sha256-6fMFGLH16Z1O+ETlr0685TXHup1vJetfzPdNC2Lw9uM="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 95415d03cfec7..b262d0f7547e5 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.5.11"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-FoNWCH4SE7DnKoDMwdUiTnWoFwHSUCAIDQhvgZdgyeU="; + hash = "sha256-wSpWTQ+AuDG3zKocDVatRqVW5yhrOtcbNI+jfMOaXvg="; }; meta = old.meta // (with lib; { diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index f9a18b8a36fc5..aba4e7d2895e0 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "315"; + version = "316"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-N6MDqhYQky80r9wSiDIPusg6iOpDh4S52pf337nojyY="; + hash = "sha256-AoRdeAA+K6VhRxgAF7t2COJtovk8U9B9j8MaBwMjJgw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index f8185f7c347f8..0d5e0ced778ed 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-0HNE7NzTdq1bXj9tBZvBQ3m6Q5iuyAMKMOz0kyOJi7w="; + hash = "sha256-GU1PG5ciUqbRlAveq2ouqnBYIBEdMSSM0H/1eHL+zlo="; }; vendorHash = "sha256-0OZtKIDdEnQLnSj109EpGvaZvMIy7gPAZ+weHzYKGSg="; diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index 9b5e336316e08..50af156ff668d 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -16,26 +17,27 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "typer" "validators" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ poetry-core ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ - pycups - typer - validators - ] ++ typer.optional-dependencies.all; + dependencies = + with python3.pkgs; + [ + pycups + typer + validators + ] + ++ typer.optional-dependencies.all; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "cups_printers" - ]; + pythonImportsCheck = [ "cups_printers" ]; meta = with lib; { description = "Tool for interacting with a CUPS server"; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index ee864183f55ba..9284bc2218b76 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -21,15 +21,15 @@ let src = fetchFromGitHub { owner = "domenkozar"; repo = "nix"; - rev = "ecd0af0c1f56de32cbad14daa1d82a132bf298f8"; - hash = "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM="; + rev = "b24a9318ea3f3600c1e24b4a00691ee912d4de12"; + hash = "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794="; }; buildInputs = old.buildInputs ++ [ libgit2 ]; doCheck = false; doInstallCheck = false; }); - version = "1.0.4"; + version = "1.0.5"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-JODoFPcYKOr39dErx8JFSjeWKmO5PUsHJrF2VU6MFEg="; + hash = "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU="; }; - cargoHash = "sha256-//THEzW0OYEDSLrOELBaWnwjDbUc4jpwRDQfWJO/saA="; + cargoHash = "sha256-a6o28oonA6G0xo83PXwbH86V0aDDAAA2zajE67qsSU0="; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/by-name/di/discordchatexporter-cli/deps.nix b/pkgs/by-name/di/discordchatexporter-cli/deps.nix index c75966de85c34..46c8ca0682791 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/deps.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/deps.nix @@ -2,22 +2,21 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) - (fetchNuGet { pname = "AngleSharp"; version = "1.0.7"; sha256 = "1f0sb4jknw7f9mhg4f5khk1q257mn97b9qyy017jjljhqyxp449f"; }) - (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.4"; sha256 = "1sizwdkj7ysk7nvdrnnnvl67r4smyq45k6ih4si38kxm27sqwhjw"; }) + (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.1"; sha256 = "1qc5b9vlh42yyw00kppkrdz0cji0cxslh97794km9nid8wcv3f54"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; }) + (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.4.2"; sha256 = "1pghspgz9xis139b5v8h2y40gp14x6qfcam27zawq6cp278gnjhi"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.5"; sha256 = "0rlbv93ssw0d8kvhnvrz2f06ka66gz4gbz1va2q135dab99cmrin"; }) - (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.26.7"; sha256 = "1pa96gci9nwav1g93vxq4mc0h1bjasax9j6giya1ms6rdmqxxlyn"; }) + (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.28.2"; sha256 = "10c3v3pqv49y5wi0slswfzkwjh9q93diihpmkbfp3r7yjpv6871d"; }) (fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; }) - (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.2"; sha256 = "0j3z9wdhn6d4np0cjxv2wb5n9blm9frgbxs1p6zdafbxr98qzb73"; }) + (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.4"; sha256 = "0pjzyvq0a975m0y7b0k8wsr7mskykv3bzba98xmcc29nsyib2a8h"; }) (fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) - (fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; }) - (fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; }) - (fetchNuGet { pname = "RazorBlade"; version = "0.5.0"; sha256 = "11s68yqvpp65yam954f281vw9pmb2c5mxnk0n5j6xv1xylng4x5b"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; sha256 = "0v3zijim9k5lcmhn0ajlsix0japvx3c20r9b7x7f7gvraa8w3gl6"; }) + (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) + (fetchNuGet { pname = "RazorBlade"; version = "0.6.0"; sha256 = "11k2j7d7ddb47sj4lkply8v4aqrfxl0b314cv0l4f5syi4ilfa6s"; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; sha256 = "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; }) - (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.10"; sha256 = "0b3n8mfxa4l7bfk0c1s7yfw4m1kvnm2r5pqfvr6s20gjq3wzfih5"; }) + (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.16.0"; sha256 = "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m"; }) + (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.14"; sha256 = "12w9zz6y7cdw6p2gvr34r4qcl35hh19zn9fm0risrrcs8577msxs"; }) ] diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 9f3d709fd1663..ed6f4e836aa3b 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.42.8"; + version = "2.43"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - hash = "sha256-54NTeIs0a8hd2xKQkAxwfyGwEPUlSSXXvDamGLfa9ls="; + hash = "sha256-FbZ2Kt5lKTINpj0EsJGXWY1aK0qitks16GClBWa/iQ4="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 20048c763bdc6..8585876ee001b 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -9,12 +9,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { name = "disko"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q="; + hash = "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index b8344d0bfaee0..9bb0fd4919ea6 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -46,13 +46,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.9.2"; + version = "2.10.2"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-SEt/qw8ixlgRY2+fqyCmhqzLVoAw/BMl//JqQxbuB0s="; + hash = "sha256-1ok2HR9RapS+MF8zuNLhzMZMz0F2AQsKsxNqCT7QF/8="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index 8e4327bc80c30..ad66d38748261 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - hash = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; + hash = "sha256-F2Pt3xbWDZZ3s056KU3qLXUrFQ0wT7QYK4GvR7slMYc="; }; strictDeps = true; diff --git a/pkgs/by-name/ha/hamtransfer/package.nix b/pkgs/by-name/ha/hamtransfer/package.nix new file mode 100644 index 0000000000000..49dbe40cd988b --- /dev/null +++ b/pkgs/by-name/ha/hamtransfer/package.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, sqlite +}: + +rustPlatform.buildRustPackage { + pname = "hamtransfer"; + version = "unstable-2024-04-05"; + + src = fetchFromGitHub { + owner = "ThomasHabets"; + repo = "hamtransfer"; + rev = "6b0ac28e0b8cdcc3ac9aba9cd6115e48c4f26c1e"; + hash = "sha256-yZwbFjs+mnTbU+75dwRhVjvXXoHQuzgE9GlliUQZV1s="; + }; + + cargoHash = "sha256-lFzsURGhEcuTL6dHt4/l54eT3mD7H8tsW/+unisdjKY="; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + buildInputs = [ + sqlite + ]; + + postInstall = '' + mv $out/bin/downloader $out/bin/hamtransfer-downloader + mv $out/bin/uploader $out/bin/hamtransfer-uploader + ''; + + meta = with lib; { + description = "Tool for transferring files over amateur radio using modern techniques"; + homepage = "https://github.com/ThomasHabets/hamtransfer"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ matthewcroughan sarcasticadmin pkharvey ]; + }; +} diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 1347b1fe93fbf..eab2ca256876b 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-04-23"; + version = "0-unstable-2024-04-29"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "33a20182e3164f451b6a4ac2ecadcab5c2c36703"; - hash = "sha256-pHJYZIVFmzPAwyTfcMGJwlfz18nOsS4p0CuDnI1EDL4="; + rev = "9fe79591c1005ce6f93084ae7f7dab0a2891440d"; + hash = "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix index 6f505aa7981ef..291b1f5a249df 100644 --- a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix +++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-monitor-attached"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "coffebar"; repo = "hyprland-monitor-attached"; rev = version; - hash = "sha256-McenpaoEjQIB709VlLkyVGoUwVoMe7TJPb8Lrh1efw8="; + hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI="; }; - cargoHash = "sha256-QH32NYZJcSxTMgHZKqksy2+DLw62G+knJgoj6OGRfQE="; + cargoHash = "sha256-vQfDsP2Tc+Kj95wXIzPTlf6kRdBgdio0QkM9EJRjZjE="; meta = with lib; { description = "Automatically run a script when a monitor connects (or disconnects) in Hyprland"; diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 01f30919e2730..f4e9208838314 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.17.4"; + version = "1.17.5"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-xsUayewn6c+TFqQnvDWe+1y4o76Quq8sK1WkSFFgPkc="; + hash = "sha256-1tyvoDAlh2UuPWDqA7mwC1v5kij3v3aBZBfIG/vluJo="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix new file mode 100644 index 0000000000000..f6c8f77cea7ca --- /dev/null +++ b/pkgs/by-name/kd/kdotool/package.nix @@ -0,0 +1,30 @@ +{ lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + dbus +}: + +rustPlatform.buildRustPackage rec { + version = "0.2.1"; + pname = "kdotool"; + + src = fetchFromGitHub { + owner = "jinliu"; + repo = "kdotool"; + rev = "v${version}"; + hash = "sha256-ogdZziNV4b3h9LiEyWFrD/I/I4k8Z5rNFTNjQpWBQtg="; + }; + + cargoHash = "sha256-pL5vLfNWsZi75mI5K/PYVmgHTPCyIKpQY0YU2CJABN8="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "xdotool-like for KDE Wayland"; + homepage = "https://github.com/jinliu/kdotool"; + license = licenses.asl20; + maintainers = with maintainers; [ kotatsuyaki ]; + }; +} diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix new file mode 100644 index 0000000000000..84c71665ea9c7 --- /dev/null +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gtk3 +, libxml2 +, xkeyboard_config +, wrapGAppsHook +, unstableGitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "labwc-tweaks-gtk"; + version = "0-unstable-2024-04-07"; + + src = fetchFromGitHub { + owner = "labwc"; + repo = "labwc-tweaks-gtk"; + rev = "67adbedd610a1b44e7ba667ae72a5c9b07105119"; + hash = "sha256-RGPm+hvyTWxkd3z841Y8ozXrDD1ZgHCZjimyRdRNrCs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libxml2 + ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb + substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/labwc/labwc-tweaks-gtk"; + description = "Configuration gui app for labwc; gtk fork"; + mainProgram = "labwc-tweaks"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; + }; +}) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index fee334974a276..c79b598469031 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -1,44 +1,42 @@ { lib , stdenv , fetchFromGitHub -, meson -, ninja +, cmake +, perl , pkg-config -, gtk3 -, libxml2 +, qt6 , xkeyboard_config -, wrapGAppsHook , unstableGitUpdater }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "labwc-tweaks"; - version = "unstable-2024-04-02"; + version = "0-unstable-2024-04-27"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks"; - rev = "a1a3cfaefd1908de8752d0d6d6b7170b04ee075c"; - hash = "sha256-uvUsoqiQBuNMBQWAxl/tCIvWsEYmZ4dQ31TrznI/XcA="; + rev = "9007079640e0f38c1d69ac94899229354a5c67b2"; + hash = "sha256-klKPHAhJ6fedFojXPfesjs1dG5NJhBZkzynhka5vD8M="; }; nativeBuildInputs = [ - meson - ninja + cmake + perl pkg-config - wrapGAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - gtk3 - libxml2 + qt6.qtbase + qt6.qtwayland ]; strictDeps = true; postPatch = '' - substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb - substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share + substituteInPlace tweaks-qt/gen-layout-list --replace-fail /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb ''; passthru.updateScript = unstableGitUpdater { }; @@ -51,4 +49,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; -}) +} diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index 0ed4453d62aaf..81300a8a82246 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.7"; + version = "2.7.8"; src = fetchFromGitHub { owner = "littlefs-project"; repo = pname; rev = "v${version}"; - hash = "sha256-MCmi0CBs3RLuYn+1BsS6pIeR/tHS1lGNyV3ZwlsnQCA="; + hash = "sha256-dJt2Tcw+qdcOoZ9ejao9NXys/OYQTvbP9+dD6DCzFAw="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/pkgs/by-name/lo/local-ai/lib.nix b/pkgs/by-name/lo/local-ai/lib.nix new file mode 100644 index 0000000000000..46f3ba88e5db7 --- /dev/null +++ b/pkgs/by-name/lo/local-ai/lib.nix @@ -0,0 +1,30 @@ +{ lib +, writers +, writeText +, linkFarmFromDrvs +}: { + genModels = configs: + let + name = lib.strings.sanitizeDerivationName + (builtins.concatStringsSep "_" ([ "local-ai-models" ] ++ (builtins.attrNames configs))); + + genModelFiles = name: config: + let + templateName = type: name + "_" + type; + + config' = lib.recursiveUpdate config ({ + inherit name; + } // lib.optionalAttrs (lib.isDerivation config.parameters.model) { + parameters.model = config.parameters.model.name; + } // lib.optionalAttrs (config ? template) { + template = builtins.mapAttrs (n: _: templateName n) config.template; + }); + in + [ (writers.writeYAML "${name}.yaml" config') ] + ++ lib.optional (lib.isDerivation config.parameters.model) + config.parameters.model + ++ lib.optionals (config ? template) + (lib.mapAttrsToList (n: writeText "${templateName n}.tmpl") config.template); + in + linkFarmFromDrvs name (lib.flatten (lib.mapAttrsToList genModelFiles configs)); +} diff --git a/pkgs/by-name/lo/local-ai/module.nix b/pkgs/by-name/lo/local-ai/module.nix new file mode 100644 index 0000000000000..d7b70048121f3 --- /dev/null +++ b/pkgs/by-name/lo/local-ai/module.nix @@ -0,0 +1,56 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.services.local-ai; + inherit (lib) mkOption types; +in +{ + options.services.local-ai = { + enable = lib.mkEnableOption "Enable service"; + + package = lib.mkPackageOption pkgs "local-ai" { }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + }; + + port = mkOption { + type = types.port; + default = 8080; + }; + + threads = mkOption { + type = types.int; + default = 1; + }; + + models = mkOption { + type = types.either types.package types.str; + default = "models"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.local-ai = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = lib.escapeShellArgs ([ + "${cfg.package}/bin/local-ai" + "--debug" + "--address" + ":${toString cfg.port}" + "--threads" + (toString cfg.threads) + "--localai-config-dir" + "." + "--models-path" + (toString cfg.models) + ] + ++ cfg.extraArgs); + RuntimeDirectory = "local-ai"; + WorkingDirectory = "%t/local-ai"; + }; + }; + }; +} diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index f597097dc8e36..061122c3f848a 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -6,6 +6,8 @@ , fetchpatch , fetchFromGitHub , protobuf +, protoc-gen-go +, protoc-gen-go-grpc , grpc , openssl , llama-cpp @@ -61,8 +63,8 @@ let inherit (cudaPackages) libcublas cuda_nvcc cuda_cccl cuda_cudart cudatoolkit; - go-llama-ggml = effectiveStdenv.mkDerivation { - name = "go-llama-ggml"; + go-llama = effectiveStdenv.mkDerivation { + name = "go-llama"; src = fetchFromGitHub { owner = "go-skynet"; repo = "go-llama.cpp"; @@ -98,8 +100,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "1b67731e184e27a465b8c5476061294a4af668ea"; - hash = "sha256-0WWbsklpW6HhFRkvWpYh8Lhi8VIansS/zmyIKNQRkIs="; + rev = "784e11dea1f5ce9638851b2b0dddb107e2a609c8"; + hash = "sha256-yAQAUo5J+a6O2kTqhFL1UH0tANxpQn3JhAd3MByaC6I="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -252,8 +254,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "8f253ef3af1c62c04316ba4afa7145fc4d701a8c"; - hash = "sha256-yHHjhpQIn99A/hqFwAb7TfTf4Q9KnKat93zyXS70bT8="; + rev = "858452d58dba3acdc3431c9bced2bb8cfd9bf418"; + hash = "sha256-2fT3RgGpBex1mF6GJsVDo4rb0F31YqxTymsXcrpQAZk="; }; nativeBuildInputs = [ cmake pkg-config ] @@ -371,18 +373,18 @@ let stdenv; pname = "local-ai"; - version = "2.12.4"; + version = "2.13.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-piu2B6u4ZfxiOd9SXrE7jiiiwL2SM8EqXo2s5qeKRl0="; + hash = "sha256-jZE8Ow9FFhnx/jvsURLYlYtSuKpE4UWBezxg/mpHs9g="; }; self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-8Hu1y/PK21twnB7D22ltslFFzRrsB8d1R2hkgIFB/XY="; + vendorHash = "sha256-nWNK2YekQnBSLx4ouNSe6esIe0yFuo69E0HStYLQANg="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -392,12 +394,12 @@ let in '' sed -i Makefile \ - -e 's;git clone.*go-llama-ggml$;${cp} ${go-llama-ggml} sources/go-llama-ggml;' \ + -e 's;git clone.*go-llama\.cpp$;${cp} ${go-llama} sources/go-llama\.cpp;' \ -e 's;git clone.*gpt4all$;${cp} ${gpt4all} sources/gpt4all;' \ -e 's;git clone.*go-piper$;${cp} ${if with_tts then go-piper else go-piper.src} sources/go-piper;' \ - -e 's;git clone.*go-rwkv$;${cp} ${go-rwkv} sources/go-rwkv;' \ + -e 's;git clone.*go-rwkv\.cpp$;${cp} ${go-rwkv} sources/go-rwkv\.cpp;' \ -e 's;git clone.*whisper\.cpp$;${cp} ${whisper-cpp.src} sources/whisper\.cpp;' \ - -e 's;git clone.*go-bert$;${cp} ${go-bert} sources/go-bert;' \ + -e 's;git clone.*go-bert\.cpp$;${cp} ${go-bert} sources/go-bert\.cpp;' \ -e 's;git clone.*diffusion$;${cp} ${if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src} sources/go-stable-diffusion;' \ -e 's;git clone.*go-tiny-dream$;${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream;' \ -e 's, && git checkout.*,,g' \ @@ -415,14 +417,19 @@ let ++ lib.optionals with_stablediffusion go-stable-diffusion.buildInputs ++ lib.optionals with_tts go-piper.buildInputs; - nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals with_cublas [ cuda_nvcc ]; + nativeBuildInputs = [ + protobuf + protoc-gen-go + protoc-gen-go-grpc + makeWrapper + ] + ++ lib.optionals with_cublas [ cuda_nvcc ]; enableParallelBuilding = false; modBuildPhase = '' mkdir sources - make prepare-sources + make prepare-sources protogen-go go mod tidy -v ''; @@ -486,7 +493,7 @@ let passthru.local-packages = { inherit - go-tiny-dream go-rwkv go-bert go-llama-ggml gpt4all go-piper + go-tiny-dream go-rwkv go-bert go-llama gpt4all go-piper llama-cpp-grpc whisper-cpp go-tiny-dream-ncnn espeak-ng' piper-phonemize piper-tts'; }; @@ -498,6 +505,7 @@ let }; passthru.tests = callPackages ./tests.nix { inherit self; }; + passthru.lib = callPackages ./lib.nix { }; meta = with lib; { description = "OpenAI alternative to run local LLMs, image and audio generation"; diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index 82d1b775dab82..7cebc6fff9387 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -5,156 +5,244 @@ , fetchurl , writers , symlinkJoin -, linkFarmFromDrvs , jq }: +let + common-config = { config, ... }: { + imports = [ ./module.nix ]; + services.local-ai = { + enable = true; + package = self; + threads = config.virtualisation.cores; + }; + }; + + inherit (self.lib) genModels; +in { version = testers.testVersion { package = self; version = "v" + self.version; + command = "local-ai --help"; }; - health = + health = testers.runNixOSTest ({ config, ... }: { + name = self.name + "-health"; + nodes.machine = common-config; + testScript = + let + port = "8080"; + in + '' + machine.wait_for_open_port(${port}) + machine.succeed("curl -f http://localhost:${port}/readyz") + ''; + }); + + # https://localai.io/features/embeddings/#bert-embeddings + bert = let - port = "8080"; + model = "embedding"; + model-configs.${model} = { + # Note: q4_0 and q4_1 models can not be loaded + parameters.model = fetchurl { + url = "https://huggingface.co/skeskinen/ggml/resolve/main/all-MiniLM-L6-v2/ggml-model-f16.bin"; + sha256 = "9c195b2453a4fef60a4f6be3a88a39211366214df6498a4fe4885c9e22314f50"; + }; + backend = "bert-embeddings"; + embeddings = true; + }; + + models = genModels model-configs; + + requests.request = { + inherit model; + input = "Your text string goes here"; + }; in testers.runNixOSTest { - name = self.name + "-health"; + name = self.name + "-bert"; nodes.machine = { - systemd.services.local-ai = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${self}/bin/local-ai --debug --localai-config-dir . --address :${port}"; - }; + imports = [ common-config ]; + virtualisation.cores = 2; + virtualisation.memorySize = 2048; + services.local-ai.models = models; }; - testScript = '' - machine.wait_for_open_port(${port}) - machine.succeed("curl -f http://localhost:${port}/readyz") - ''; + passthru = { inherit models requests; }; + testScript = + let + port = "8080"; + in + '' + machine.wait_for_open_port(${port}) + machine.succeed("curl -f http://localhost:${port}/readyz") + machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json") + machine.succeed("curl -f http://localhost:${port}/embeddings --json @${writers.writeJSON "request.json" requests.request} --output embeddings.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .model == \"${model}\"' embeddings.json") + ''; }; +} // lib.optionalAttrs (!self.features.with_cublas && !self.features.with_clblas) { # https://localai.io/docs/getting-started/manual/ llama = let - port = "8080"; - gguf = fetchurl { - url = "https://huggingface.co/TheBloke/Luna-AI-Llama2-Uncensored-GGUF/resolve/main/luna-ai-llama2-uncensored.Q4_K_M.gguf"; - sha256 = "6a9dc401c84f0d48996eaa405174999c3a33bf12c2bfd8ea4a1e98f376de1f15"; + model = "gpt-3.5-turbo"; + + # https://localai.io/advanced/#full-config-model-file-reference + model-configs.${model} = rec { + context_size = 8192; + parameters = { + # https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF + # https://ai.meta.com/blog/meta-llama-3/ + model = fetchurl { + url = "https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF/resolve/main/Meta-Llama-3-8B-Instruct-Q4_K_M.gguf"; + sha256 = "ab9e4eec7e80892fd78f74d9a15d0299f1e22121cea44efd68a7a02a3fe9a1da"; + }; + # defaults from: + # https://deepinfra.com/meta-llama/Meta-Llama-3-8B-Instruct + temperature = 0.7; + top_p = 0.9; + top_k = 0; + # following parameter leads to outputs like: !!!!!!!!!!!!!!!!!!! + #repeat_penalty = 1; + presence_penalty = 0; + frequency_penalty = 0; + max_tokens = 100; + }; + stopwords = [ "<|eot_id|>" ]; + template = { + # Templates implement following specifications + # https://github.com/meta-llama/llama3/tree/main?tab=readme-ov-file#instruction-tuned-models + # ... and are insprired by: + # https://github.com/mudler/LocalAI/blob/master/embedded/models/llama3-instruct.yaml + # + # The rules for template evaluateion are defined here: + # https://pkg.go.dev/text/template + chat_message = '' + <|start_header_id|>{{.RoleName}}<|end_header_id|> + + {{.Content}}${builtins.head stopwords}''; + + chat = "<|begin_of_text|>{{.Input}}<|start_header_id|>assistant<|end_header_id|>"; + }; + }; + + models = genModels model-configs; + + requests = { + # https://localai.io/features/text-generation/#chat-completions + chat-completions = { + inherit model; + messages = [{ role = "user"; content = "1 + 2 = ?"; }]; + }; + # https://localai.io/features/text-generation/#edit-completions + edit-completions = { + inherit model; + instruction = "rephrase"; + input = "Black cat jumped out of the window"; + max_tokens = 50; + }; + # https://localai.io/features/text-generation/#completions + completions = { + inherit model; + prompt = "A long time ago in a galaxy far, far away"; + }; }; - models = linkFarmFromDrvs "models" [ - gguf - ]; in testers.runNixOSTest { name = self.name + "-llama"; - nodes.machine = - let - cores = 4; - in - { - virtualisation = { - inherit cores; - memorySize = 8192; - }; - systemd.services.local-ai = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${self}/bin/local-ai --debug --threads ${toString cores} --models-path ${models} --localai-config-dir . --address :${port}"; - }; - }; + nodes.machine = { + imports = [ common-config ]; + virtualisation.cores = 4; + virtualisation.memorySize = 8192; + services.local-ai.models = models; + }; + passthru = { inherit models requests; }; testScript = let - # https://localai.io/features/text-generation/#chat-completions - request-chat-completions = { - model = gguf.name; - messages = [{ role = "user"; content = "Say this is a test!"; }]; - temperature = 0.7; - }; - # https://localai.io/features/text-generation/#edit-completions - request-edit-completions = { - model = gguf.name; - instruction = "rephrase"; - input = "Black cat jumped out of the window"; - temperature = 0.7; - }; - # https://localai.io/features/text-generation/#completions - request-completions = { - model = gguf.name; - prompt = "A long time ago in a galaxy far, far away"; - temperature = 0.7; - }; + port = "8080"; in '' machine.wait_for_open_port(${port}) machine.succeed("curl -f http://localhost:${port}/readyz") machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${gguf.name}\"' models.json") - machine.succeed("curl -f http://localhost:${port}/v1/chat/completions --json @${writers.writeJSON "request-chat-completions.json" request-chat-completions} --output chat-completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json") + + machine.succeed("curl -f http://localhost:${port}/v1/chat/completions --json @${writers.writeJSON "request-chat-completions.json" requests.chat-completions} --output chat-completions.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"chat.completion\"' chat-completions.json") - machine.succeed("curl -f http://localhost:${port}/v1/edits --json @${writers.writeJSON "request-edit-completions.json" request-edit-completions} --output edit-completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .choices | first.message.content | tonumber == 3' chat-completions.json") + + machine.succeed("curl -f http://localhost:${port}/v1/edits --json @${writers.writeJSON "request-edit-completions.json" requests.edit-completions} --output edit-completions.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"edit\"' edit-completions.json") - machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" request-completions} --output completions.json") + machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString requests.edit-completions.max_tokens}' edit-completions.json") + + machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json") + machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString model-configs.${model}.parameters.max_tokens}' completions.json") ''; }; -} // lib.optionalAttrs self.features.with_tts { +} // lib.optionalAttrs (self.features.with_tts && !self.features.with_cublas && !self.features.with_clblas) { # https://localai.io/features/text-to-audio/#piper tts = let - port = "8080"; - voice-en-us = fetchzip { - url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-danny-low.tar.gz"; - hash = "sha256-5wf+6H5HeQY0qgdqnAG1vSqtjIFM9lXH53OgouuPm0M="; - stripRoot = false; - }; - ggml-tiny-en = fetchurl { - url = "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.en-q5_1.bin"; - hash = "sha256-x3xXZvHO8JtrfUfyG1Rsvd1BV4hrO11tT3CekeZsfCs="; - }; - whisper-en = { - name = "whisper-en"; + model-stt = "whisper-en"; + model-configs.${model-stt} = { backend = "whisper"; - parameters.model = ggml-tiny-en.name; + parameters.model = fetchurl { + url = "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.en-q5_1.bin"; + hash = "sha256-x3xXZvHO8JtrfUfyG1Rsvd1BV4hrO11tT3CekeZsfCs="; + }; }; - models = symlinkJoin { - name = "models"; - paths = [ - voice-en-us - (linkFarmFromDrvs "whisper-en" [ - (writers.writeYAML "whisper-en.yaml" whisper-en) - ggml-tiny-en - ]) - ]; + + model-tts = "piper-en"; + model-configs.${model-tts} = { + backend = "piper"; + parameters.model = "en-us-danny-low.onnx"; }; - in - testers.runNixOSTest { - name = self.name + "-tts"; - nodes.machine = + + models = let - cores = 2; + models = genModels model-configs; in - { - virtualisation = { - inherit cores; - }; - systemd.services.local-ai = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${self}/bin/local-ai --debug --threads ${toString cores} --models-path ${models} --localai-config-dir . --address :${port}"; - }; + symlinkJoin { + inherit (models) name; + paths = [ + models + (fetchzip { + url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-danny-low.tar.gz"; + hash = "sha256-5wf+6H5HeQY0qgdqnAG1vSqtjIFM9lXH53OgouuPm0M="; + stripRoot = false; + }) + ]; }; + + requests.request = { + model = model-tts; + input = "Hello, how are you?"; + }; + in + testers.runNixOSTest { + name = self.name + "-tts"; + nodes.machine = { + imports = [ common-config ]; + virtualisation.cores = 2; + services.local-ai.models = models; + }; + passthru = { inherit models requests; }; testScript = let - request = { - model = "en-us-danny-low.onnx"; - backend = "piper"; - input = "Hello, how are you?"; - }; + port = "8080"; in '' machine.wait_for_open_port(${port}) machine.succeed("curl -f http://localhost:${port}/readyz") - machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" request} --output out.wav") - machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${whisper-en.name} --output transcription.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${request.input}\"' transcription.json") + machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug' models.json") + machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav") + machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json") ''; }; } diff --git a/pkgs/by-name/ma/marwaita-x/package.nix b/pkgs/by-name/ma/marwaita-x/package.nix new file mode 100644 index 0000000000000..1fb947272d30e --- /dev/null +++ b/pkgs/by-name/ma/marwaita-x/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nix-update-script +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marwaita-x"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-x"; + rev = finalAttrs.version; + sha256 = "sha256-AkhysmA7QTHiH6yLEHFHgXFhRXb3l0elvYfy+oXsvZE="; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A new version for Marwaita GTK theme"; + homepage = "https://www.pling.com/p/2044790/"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; + }; +}) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 6e880a4a0c33a..b397c9a3e2b0d 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-/fFVUI++OhOer5DrvcXO+R+4whtb5+3Qg3e4+ikJr1Y="; + hash = "sha256-mqNcMB2nb8+e9XEGKqwaBE/nC4+jRaEFxE17e0JTo8Y="; }; - vendorHash = "sha256-k4xB/jO78VGD+n9HtuoWXoXB+kZCEyPKJTTwj32nGIw="; + vendorHash = "sha256-9Ey4roUm/Y6GfFmLD6ij/A+YIgetStawWmhD+Iq3qc8="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index fbd92b4177d08..d8a385121e1a4 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -1,4 +1,10 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchFromGitHub, + gnuplot, + makeWrapper, +}: rustPlatform.buildRustPackage rec { pname = "mini-calc"; version = "2.13.0"; @@ -11,6 +17,14 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-QFzrJBnGKAgDhjbbik0WP3Y1fNoHMAiWpEHfidFQGPk="; + + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/mini-calc \ + --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" + + ''; + meta = { description = "A fully-featured minimalistic configurable calculator written in Rust"; changelog = "https://github.com/coco33920/calc/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/mi/missidentify/fix-darwin-build.patch b/pkgs/by-name/mi/missidentify/fix-darwin-build.patch new file mode 100644 index 0000000000000..cc54480567afe --- /dev/null +++ b/pkgs/by-name/mi/missidentify/fix-darwin-build.patch @@ -0,0 +1,11 @@ +--- a/main.h ++++ b/main.h +@@ -68,7 +68,7 @@ memset(VAR,0,SIZE * sizeof(TYPE)); + + + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) || defined (__APPLE__) + extern char *__progname; + #else + char *__progname; \ No newline at end of file diff --git a/pkgs/by-name/mi/missidentify/package.nix b/pkgs/by-name/mi/missidentify/package.nix new file mode 100644 index 0000000000000..2fbce5bf96f2a --- /dev/null +++ b/pkgs/by-name/mi/missidentify/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "missidentify"; + version = "1.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/missidentify/missidentify/missidentify-${finalAttrs.version}/missidentify-${finalAttrs.version}.tar.gz"; + hash = "sha256-nnIRN8hpKM0IZCe0HUrrJGrxvBYKeBmdU168rlo8op0="; + }; + + patches = [ + # define PATH_MAX variable to fix a FTBFS in Hurd. + (fetchurl { + name = "fix-FTBFS-Hurd.patch"; + url = "https://salsa.debian.org/pkg-security-team/missidentify/-/raw/14b7169c3157dbad65fc80fdd82ec6634df20ffd/debian/patches/fix-FTBFS-Hurd.patch"; + hash = "sha256-wGEzTfT76s5Q7s/5s913c4x9MMn9c0v/4Lhr+QakPQY="; + }) + # fix a hyphen used as minus sign and a typo in manpage. + (fetchurl { + name = "fix-manpage.patch"; + url = "https://salsa.debian.org/pkg-security-team/missidentify/-/raw/14b7169c3157dbad65fc80fdd82ec6634df20ffd/debian/patches/fix-manpage.patch"; + hash = "sha256-7LzQs6ETRSjdnEhlKOVWC3grevwOmGs0h4Z6AYGysD8="; + }) + # fix darwin build + ./fix-darwin-build.patch + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "--build=arm" ]; + + meta = with lib; { + description = "Find Win32 applications"; + longDescription = '' + Miss Identify is a program to find Win32 applications. In + its default mode it displays the filename of any executable + that does not have an executable extension (i.e. exe, dll, + com, sys, cpl, hxs, hxi, olb, rll, or tlb). The program can + also be run to display all executables encountered, + regardless of the extension. This is handy when looking + for all of the executables on a drive. Other options allow + the user to record the strings found in an executable and + to work recursively. + ''; + mainProgram = "missidentify"; + homepage = "https://missidentify.sourceforge.net"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Only; + }; +}) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 1c0d5863dfa15..20dd5165d26e5 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -1,13 +1,13 @@ { lib , fetchpatch , fetchFromGitHub +, writeShellScript , dash , php , phpCfg ? null , withPgsql ? true # “strongly recommended” according to docs , withMysql ? false , minifyStaticFiles ? false # default files are often not minified -, parallel , esbuild , lightningcss , scour @@ -48,6 +48,13 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-t63POjywZLk5ulppuCedFhhEhOsnB90vy3k/HhM3MGc="; }; + patches = [ + (fetchpatch { + url = "https://github.com/movim/movim/commit/4dd2842f4617f3baaa166157892a532ad07df80d.patch"; + hash = "sha256-32MLS5g60Rhm8HQDBPnUo9k+aB7L8dNMcnSjPIlooks="; + }) + ]; + php = php.buildEnv ({ extensions = ({ all, enabled }: enabled @@ -60,8 +67,7 @@ php.buildComposerProject (finalAttrs: { }); nativeBuildInputs = - lib.optional (lib.any (x: x.enable) (lib.attrValues minify)) parallel - ++ lib.optional minify.script.enable esbuild + lib.optional minify.script.enable esbuild ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; @@ -94,39 +100,30 @@ php.buildComposerProject (finalAttrs: { ''; preBuild = lib.optionalString minify.script.enable '' - find ./public -type f -iname "*.js" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - esbuild {} --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.js" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_script_minify" '' + file="$1" + tmp="$(mktemp)" + esbuild $file --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} '' + lib.optionalString minify.style.enable '' - export BROWSERLIST=${lib.escapeShellArg minify.style.browserslist} - find ./public -type f -iname "*.css" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - lightningcss {} --minify --browserslist --output-file=$tmp - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.css" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_style_minify" '' + export BROWSERLIST="${lib.escapeShellArg minify.style.browserslist}" + file="$1" + tmp="$(mktemp)" + lightningcss $file --minify --browserslist --output-file=$tmp + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} '' + lib.optionalString minify.svg.enable '' - find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - scour -i {} -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_svg_minify" '' + file="$1" + tmp="$(mktemp)" + scour -i $file -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} ''; postInstall = '' diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 2d1c40e09cdf2..57291810870df 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "nom"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-AAgkxBbGH45n140jm28+J3hqYxzUIL6IVLGWD9oBexo="; + hash = "sha256-W0HDoQURZxTvMyFfRGOu8gcZJihtvXvrEaObmi/CAk0="; }; - vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; + vendorHash = "sha256-wWdsLU656wBAUmnVw21wo+a/OLmyhZ2Bq0j8S190XQs="; meta = with lib; { homepage = "https://github.com/guyfedwards/nom"; diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix new file mode 100644 index 0000000000000..cd6052f5369b0 --- /dev/null +++ b/pkgs/by-name/op/opensplat/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + cmake, + ninja, + fetchFromGitHub, + fetchpatch, + python3, + opencv, + nlohmann_json, + nanoflann, + glm, + cxxopts, + config, + # Upstream has rocm/hip support, too. anyone? + cudaSupport ? config.cudaSupport, + cudaPackages, + autoAddDriverRunpath, +}: +let + version = "1.1.2"; + torch = python3.pkgs.torch.override { inherit cudaSupport; }; + # Using a normal stdenv with cuda torch gives + # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; +in +stdenv'.mkDerivation { + pname = "opensplat"; + inherit version; + + src = fetchFromGitHub { + owner = "pierotofy"; + repo = "OpenSplat"; + rev = "refs/tags/v${version}"; + hash = "sha256-3tk62b5fSf6wzuc5TwkdfAKgUMrw3ZxetCJa2RVMS/s="; + }; + + patches = [ + (fetchpatch { + name = "install-executables.patch"; + url = "https://github.com/pierotofy/OpenSplat/commit/b4c4176819b508978583b7ebf66306171807a8e6.patch"; + hash = "sha256-BUgPMcO3lt3ZEzv24u36k3aTEIoloOhxrCGi1KQ5Epk="; + }) + ]; + + postPatch = '' + # the two vendored gsplats are so heavily modified they may be considered a fork + find vendor ! -name 'gsplat*' -maxdepth 1 -mindepth 1 -exec rm -rf {} + + mkdir vendor/{nanoflann,glm} + ln -s ${glm}/include/glm vendor/glm/glm + ln -s ${nanoflann}/include/nanoflann.hpp vendor/nanoflann/nanoflann.hpp + ln -s ${nlohmann_json}/include/nlohmann vendor/json + ln -s ${cxxopts}/include/cxxopts.hpp vendor/cxxopts.hpp + ''; + + nativeBuildInputs = [ + cmake + ninja + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + autoAddDriverRunpath + ]; + + buildInputs = [ + nlohmann_json + torch.cxxdev + torch + opencv + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ]; + + env.TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}"; + + cmakeFlags = [ + (lib.cmakeBool "CMAKE_SKIP_RPATH" true) + ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "GPU_RUNTIME" "CUDA") + (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") + ]; + + meta = { + description = "Production-grade 3D gaussian splatting"; + homepage = "https://github.com/pierotofy/OpenSplat/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jcaesar ]; + platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 85a60640d7112..66587f76d6055 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.0.1"; + version = "23.1.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-pqbwi3btNEM+qiTqtjIxiDv2wMf1LerltFvLCybiW0Y="; + hash = "sha256-2tMCyEBVR/DQP7Dny5iPypv2IWkurfxhZEHC/f+Pe8c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index f91c8ea786185..dc142f44ce591 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -1,20 +1,19 @@ -{ lib -, stdenv -, fetchurl -, jre -, makeWrapper +{ + lib, + stdenv, + fetchurl, + jre, + makeWrapper, + nix-update-script, }: -let - version = "0.14.1"; - peergos = fetchurl { - url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; - hash = "sha256-oCsUuFxTAL0vAabGggGhZHaF40A5TLfkT15HYPiKHlU="; - }; -in stdenv.mkDerivation rec { pname = "peergos"; - inherit version; + version = "0.17.0"; + src = fetchurl { + url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; + hash = "sha256-sQPEKvtQDRQ4dF22tZjPhK7DLtDVAcudxoA4+GOeeZA="; + }; dontUnpack = true; dontBuild = true; @@ -24,21 +23,33 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D ${peergos} $out/share/java/peergos.jar - makeWrapper ${lib.getExe jre} $out/bin/${pname} \ - --add-flags "-jar -Djava.library.path=native-lib $out/share/java/${pname}.jar" + install -D ${src} $out/share/java/peergos.jar + makeWrapper ${lib.getExe jre} $out/bin/peergos \ + --add-flags "-jar -Djava.library.path=native-lib $out/share/java/peergos.jar" runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(v[0-9.]+)$" + ]; + }; + + meta = { + changelog = "https://github.com/Peergos/web-ui/releases/tag/v${version}"; description = "A p2p, secure file storage, social network and application protocol"; - mainProgram = "peergos"; + downloadPage = "https://github.com/Peergos/web-ui"; homepage = "https://peergos.org/"; # peergos have agpt3 license, peergos-web-ui have gpl3, both are used - license = [ licenses.agpl3Only licenses.gpl3Only ]; - platforms = platforms.all; - maintainers = with maintainers; [ raspher ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = [ + lib.licenses.agpl3Only + lib.licenses.gpl3Only + ]; + mainProgram = "peergos"; + maintainers = with lib.maintainers; [ raspher ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/by-name/pw/pwndbg/package.nix b/pkgs/by-name/pw/pwndbg/package.nix index 2967130b7fd10..473a401ce1c54 100644 --- a/pkgs/by-name/pw/pwndbg/package.nix +++ b/pkgs/by-name/pw/pwndbg/package.nix @@ -18,7 +18,7 @@ let python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pwndbg"; version = lib.getVersion pwndbg-py; format = "other"; @@ -31,20 +31,32 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/pwndbg - cp gdbinit.py $out/share/pwndbg + cp gdbinit.py $out/share/pwndbg/gdbinit.py chmod +x $out/share/pwndbg/gdbinit.py + # First line is a import from future, so we need to append our imports after that + sed '2 i import sys, os + 3 i [sys.path.append(p) for p in "${pythonPath}".split(":")] + 4 i os.environ["PATH"] += ":${binPath}"' -i $out/share/pwndbg/gdbinit.py # Don't require an in-package venv touch $out/share/pwndbg/.skip-venv makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ - --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \ - --prefix PATH : ${binPath} \ - --set PYTHONPATH ${pythonPath} \ + --add-flags "-q -x $out/share/pwndbg/gdbinit.py" runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Check if pwndbg is installed correctly + HOME=$TMPDIR LC_CTYPE=C.UTF-8 $out/bin/pwndbg -ex exit + + runHook postInstallCheck + ''; + meta = with lib; { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; mainProgram = "pwndbg"; diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 7b5e20451a984..36158282f783b 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -6,22 +6,26 @@ python3.pkgs.buildPythonApplication rec { pname = "route-graph"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "route-graph"; rev = "refs/tags/${version}"; - hash = "sha256-OOXLmHxWre5t4tysDXV23PTkyUG6Zcpanw0fVCOLFTM="; + hash = "sha256-HmfmUeT5vt0yWVs7GhIPVt4NZtTfe7HYPLRqfQE/tZM="; }; pythonRelaxDeps = [ + "typer" "typing-extensions" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core + ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index 59c8d804f7e26..d08d53ed88c4e 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-XLkq8Oe3EsP0wf0sA7NSZWIsQQnOAGmvlVQad35+5Ws="; + hash = "sha256-VnQIg5HXZZwvYpaYDF1CIphLtE4S+1zADE1WnicXOSQ="; }; vendorHash = null; diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/by-name/st/stduuid/package.nix index c7e31c9900877..af9ea37639817 100644 --- a/pkgs/development/libraries/stduuid/default.nix +++ b/pkgs/by-name/st/stduuid/package.nix @@ -1,7 +1,8 @@ -{ stdenv, cmake, fetchFromGitHub, lib }: let +{ stdenv, cmake, fetchFromGitHub, fetchpatch, lib }: let version = "1.2.3"; in stdenv.mkDerivation { - name = "stduuid-${version}"; + pname = "stduuid"; + inherit version; src = fetchFromGitHub { owner = "mariusbancila"; @@ -12,6 +13,15 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + patches = [ + # stduuid report version 1.0 instead of 1.2.3 for cmake's find_package to properly work + # If version is updated one day, this patch will need to be updated + (fetchpatch { + url = "https://github.com/OlivierLDff/stduuid/commit/b02c70c0a4bef2c82152503e13c9a67d6631b13d.patch"; + hash = "sha256-tv4rllhngdgjXX35kcM69yXo0DXF/BQ+AUbiC1gJIU8="; + }) + ]; + meta = { description = "A C++17 cross-platform implementation for UUIDs"; license = lib.licenses.mit; diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index aa5d12cdfc4fd..6536847abbe48 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaybg"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - hash = "sha256-Qk5iGALlSVSzgBJzYzyLdLHhj/Zq1R4nFseACBmIBuA="; + hash = "sha256-IJcPSBJErf8Dy9YhYAc9eg/llgaaLZCQSB0Brof+kpg="; }; strictDeps = true; diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 9931e4f590892..1036022bc68b8 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.15"; - vendorHash = "sha256-rkvQhZSoKZIl/gFgekLUelem2FGbRL9gp1LEzYN88Dc="; + version = "5.8.16"; + vendorHash = "sha256-bhlD7EgOkWjRTsw1hH0GKjtFkLbOzr28wR4JJKOJwnY="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-HbBg2oCsogY3X4jgjknqwNe2bszXjylvE+h5/iyg2pM="; + hash = "sha256-V67RLa/Tn9ZdV+vnhFSht0wtIYYZOAGAYP9R1Lxn9aI="; }; ldflags = [ diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index 4d02efc2aa4f9..f07299b37cc39 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -28,7 +28,12 @@ stdenv.mkDerivation (finalAttrs: { let tetrio-plus' = if tetrio-plus == null - then callPackage ./tetrio-plus.nix { tetrio-src = finalAttrs.src; } + then + callPackage ./tetrio-plus.nix + { + tetrio-src = finalAttrs.src; + tetrio-version = finalAttrs.version; + } else tetrio-plus; asarPath = diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix index cc5c2f4fce9ae..a9c6f6080b03a 100644 --- a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -14,16 +14,17 @@ , asar , tetrio-src +, tetrio-version }: let - version = "unstable-2024-04-20"; + version = "0.27.2"; src = fetchFromGitLab { owner = "UniQMG"; repo = "tetrio-plus"; - rev = "8091b969cddbff32254eaebf8088efb63f4c519a"; - hash = "sha256-ow9DrS3jWNtTbz8Obj4l8Zdr3u9m7f9V3dYUE2H3thk="; + rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}"; + hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw="; fetchSubmodules = true; # tetrio-plus uses this info for displaying its version, @@ -52,7 +53,7 @@ let sourceRoot = "${src.name}/tpsecore"; - cargoHash = "sha256-r5Qcu2u/ju0b/1PWz9tE5jNlNS3PfzS79Gm1XSKA3W4="; + cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw="; nativeBuildInputs = [ wasm-pack @@ -127,6 +128,11 @@ stdenv.mkDerivation (finalAttrs: { cp -r $src out/tetrioplus chmod -R u+w out/tetrioplus + # Disable the uninstall button in the tetrio-plus popup, + # as it doesn't make sense to mutably uninstall it in a nix package + substituteInPlace out/tetrioplus/desktop-manifest.js \ + --replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false' + # We don't need the tpsecore source code bundled rm -rf out/tetrioplus/tpsecore/ # since we install the compiled version here diff --git a/pkgs/by-name/ue/ueviewer/package.nix b/pkgs/by-name/ue/ueviewer/package.nix new file mode 100644 index 0000000000000..7ce9fc3d18dab --- /dev/null +++ b/pkgs/by-name/ue/ueviewer/package.nix @@ -0,0 +1,97 @@ +{ gccStdenv +, lib +, fetchFromGitHub +, fetchpatch +, unstableGitUpdater +, libpng +, perl +, SDL2 +, zlib +}: + +gccStdenv.mkDerivation (finalAttrs: { + pname = "ueviewer"; + version = "0-unstable-2024-02-23"; + + src = fetchFromGitHub { + owner = "gildor2"; + repo = "UEViewer"; + rev = "a0bfb468d42be831b126632fd8a0ae6b3614f981"; + hash = "sha256-Cz4jK2jJMzz57/RcEzjIjD611vCy7l3xQ0pQZjneTFQ="; + }; + + patches = [ + # Fix compilation on Darwin + # Remove when https://github.com/gildor2/UEViewer/pull/319 merged + (fetchpatch { + name = "0001-ueviewer-Dont-use-c++2a-standard.patch"; + url = "https://github.com/gildor2/UEViewer/commit/d44bef038abca99c84d7f418aedcbcb761de58aa.patch"; + hash = "sha256-v68yoBLz0dUB3evlKApKuajKQiOwbJczVeW5oxYaVyw="; + }) + ]; + + postPatch = '' + patchShebangs build.sh Unreal/Shaders/make.pl Tools/genmake + + # Enable more verbose build output + # Unify -j arguments on make calls + # Show what's being run + substituteInPlace build.sh \ + --replace-fail '# echo ">> Debug: $*"' ' echo ">> Debug: $*"' \ + --replace-fail 'make -j 4 -f $makefile' 'make -f $makefile' \ + --replace-fail 'make -f $makefile' "make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} -f \$makefile SHELL='sh -x'" + + # - Use correct compiler from stdenv + # - Use C++ compiler instead of relying on leniency + # -pipe breaks GCC on Darwin: clang-16: error: no input files + substituteInPlace Tools/genmake \ + --replace-fail 'my $platf = "gcc";' "my \$platf = \"$CXX\";" \ + --replace-fail '-pipe' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + perl + ]; + + buildInputs = [ + libpng + zlib + ] ++ lib.optionals (!gccStdenv.hostPlatform.isDarwin) [ + SDL2 + ]; + + enableParallelBuilding = true; + + buildPhase = '' + runHook preBuild + + ./build.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 umodel $out/bin/umodel + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { + # Tags represent various milestones, nothing that can be mapped to a numerical version number + hardcodeZeroVersion = true; + }; + + meta = with lib; { + description = "Viewer and exporter for Unreal Engine 1-4 assets (aka umodel)"; + homepage = "https://www.gildor.org/en/projects/umodel"; + license = licenses.mit; + mainProgram = "umodel"; + maintainers = with maintainers; [ OPNA2608 ]; + # Hardcoded usage of SSE2 + platforms = platforms.x86; + }; +}) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 6f0022f127dc0..5427471c8229f 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.75.0"; + version = "0.76.0"; src = fetchFromGitHub { owner = "updatecli"; repo = pname; rev = "v${version}"; - hash = "sha256-8jQCwnc/kj3m/02nrA/na422rrvxxF7D3LzUen3O6ms="; + hash = "sha256-UfiwagyE3w+kcPJnDDNTCGrxghnag/RPz6SSdAglyYA="; }; - vendorHash = "sha256-7LC5gzK54u8zEtDOyeU1kgIycGLxOeMWYrrDTvC3gVQ="; + vendorHash = "sha256-STiVtzA78zeo5wywwzvA0dqmBW3REUvcpOXuWjpxReY="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index d3952f621a123..a3a8677e0886e 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,6 +13,9 @@ , moreutils , cacert , nodePackages +, pipewire +, libpulseaudio +, autoPatchelfHook , withTTS ? true # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version @@ -81,6 +84,13 @@ stdenv.mkDerivation (finalAttrs: { nodePackages.pnpm nodePackages.nodejs makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + pipewire + libpulseaudio + stdenv.cc.cc.lib ]; patches = [ @@ -106,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { # using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD ./node_modules/.bin/electron-builder \ --dir \ + -c.asarUnpack="**/*.node" \ -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} ''; @@ -115,8 +126,8 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preInstall - mkdir -p $out/opt/Vesktop/resources - cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources + mkdir -p $out/opt/Vesktop + cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/ pushd build ${libicns}/bin/icns2png -x icon.icns diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 34a031d853e9a..d22ebbe3aba69 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-zmDY5KpKkq/9SYAm+v0QSnLLjxYQCzzXWLlCFkE8bA0="; + hash = "sha256-hQPBptpsxksfILZXXAVIcFf+W7Eea3pcgnndHY4mO9c="; }; vendorHash = null; diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 742e22d14ae8f..1ab0e76ed9d65 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -643,7 +643,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -710,7 +710,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -741,7 +741,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1385,7 +1385,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.59", "which 4.4.2", ] @@ -1468,7 +1468,7 @@ source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d2 dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1634,7 +1634,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -2019,7 +2019,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -2958,7 +2958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -3441,7 +3441,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -3942,7 +3942,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -4185,7 +4185,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5046,7 +5046,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5667,7 +5667,7 @@ checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5902,9 +5902,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" @@ -6624,7 +6624,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6700,7 +6700,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6780,7 +6780,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6958,7 +6958,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7009,7 +7009,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7233,7 +7233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7290,9 +7290,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -7313,7 +7313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8136,7 +8136,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.48", + "syn 2.0.59", "walkdir", ] @@ -8410,7 +8410,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8451,7 +8451,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.48", + "syn 2.0.59", "unicode-ident", ] @@ -8635,7 +8635,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8700,7 +8700,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -9465,7 +9465,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -9594,9 +9594,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -9961,7 +9961,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10140,7 +10140,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10365,7 +10365,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10433,7 +10433,7 @@ dependencies = [ [[package]] name = "tree-sitter" version = "0.20.100" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f21c3b98c0749ac192da67a0d65dfe3eabc4a63#7f21c3b98c0749ac192da67a0d65dfe3eabc4a63" +source = "git+https://github.com/tree-sitter/tree-sitter?rev=7b4894ba2ae81b988846676f54c0988d4027ef4f#7b4894ba2ae81b988846676f54c0988d4027ef4f" dependencies = [ "cc", "regex", @@ -11132,7 +11132,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasm-bindgen-shared", ] @@ -11166,7 +11166,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11303,7 +11303,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -11464,7 +11464,7 @@ checksum = "6d6d967f01032da7d4c6303da32f6a00d5efe1bac124b156e7342d8ace6ffdfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -11744,7 +11744,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.48", + "syn 2.0.59", "witx", ] @@ -11756,7 +11756,7 @@ checksum = "512d816dbcd0113103b2eb2402ec9018e7f0755202a5b3e67db726f229d8dcae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wiggle-generate", ] @@ -11874,7 +11874,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -11885,7 +11885,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -12202,7 +12202,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -12520,7 +12520,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.132.2" +version = "0.132.4" dependencies = [ "activity_indicator", "anyhow", @@ -12811,7 +12811,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -12831,7 +12831,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 6ca00045ab4f3..dc49348a20b9e 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.132.2"; + version = "0.132.4"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-KojFa22CLne36kGfMvZGWjo2Ae3tjYAfL371c0qe/Bk="; + hash = "sha256-4jnPqfLmxp3YpUAIpc/CZ5pv040uDggjeNzJJ2v021E="; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8="; "pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM="; "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; - "tree-sitter-0.20.100" = "sha256-k8au4++UJyaOCNo0cqokaQ5Is3BmIiCBSxiUkbrzhFQ="; + "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE="; "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; "tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index b24f27f326dcb..27c28cad14306 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -1,18 +1,18 @@ { lib , fetchFromGitHub -, nix-update-script +, unstableGitUpdater , stdenvNoCC , ... }: stdenvNoCC.mkDerivation (self: { - name = "alacritty-theme"; - version = "unstable-2024-03-06"; + pname = "alacritty-theme"; + version = "0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "cb786242b6f5e00a57e2f541e7bf1115f3950650"; - hash = "sha256-fZJ0F4zJy6HOwWtZGm5yN4WfeFNJnW/UJhoQSZ0Bpxk="; + rev = "e866efd4ac4e1b4b05892bf9f9bae0540754bca3"; + hash = "sha256-Uv/Nv2aipnMBM7F4IoUiLF4U/27SF9H/EEfnwGfjiIs="; }; dontConfigure = true; @@ -26,8 +26,8 @@ stdenvNoCC.mkDerivation (self: { runHook postInstall ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; }; meta = with lib; { diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/data/themes/fluent-gtk-theme/default.nix index b6f3fdc092ea3..9efa36aa88b71 100644 --- a/pkgs/data/themes/fluent-gtk-theme/default.nix +++ b/pkgs/data/themes/fluent-gtk-theme/default.nix @@ -21,15 +21,15 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { inherit pname; - version = "2023-06-20"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; - rev = version; - hash = "sha256-hUXlzLdcWeOHEJx3+vCMpxvJst6Rr8ISvlzlsUgCrhg="; + repo = "fluent-gtk-theme"; + rev = finalAttrs.version; + hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; }; nativeBuildInputs = [ @@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Fluent design gtk theme"; homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index c18d55db5b448..ed0d0235fc06b 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "onestepback"; - version = "0.994"; + version = "0.997"; srcs = [ (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4="; + url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-v${version}.zip"; + hash = "sha256-uB6pfnTkMKeP71rAvn1olJJeCL84222UT5uxG72sywE="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip"; - hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I="; + url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-wm2-v${version}.zip"; + hash = "sha256-Zdv4ZrQPficbCxPBKF3RFNavlSn/VV/efiZVUT86zRc="; }) ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gtk theme inspired by the NextStep look"; - homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; + homepage = "http://www.vide.memoire.free.fr/pages/onestepback"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index a4050e596d09f..5230e85411818 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-system-settings-unwrapped"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-system-settings"; rev = finalAttrs.version; - hash = "sha256-gi6ZujIs0AEDLsqcTNlRNSS8SyqEU6q0+xaDf55XwuM="; + hash = "sha256-Po5eArO7zyaGatTf6kqci3DdzFDJSZakeglbiMx9kR8="; }; outputs = [ @@ -73,34 +73,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lSKAhtE3oSSv7USvDbbcfBZWAtWMmuKneWawKQABIiM="; }) - # Remove when version > 1.0.2 + # Fixes tests with very-recent python-dbusmock + # Remove when version > 1.1.0 (fetchpatch { - name = "0003-lomiri-system-settings-Use-GSettings-for-DT2W-value.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/29e2533efcac23e41b083b11c540c9221b71de7e.patch"; - hash = "sha256-d52d/b1ZdafaqhOljCg5E3I12XWtFAfG4rmn8CYngB4="; - }) - ] ++ lib.optionals (lib.strings.versionOlder python3.pkgs.python-dbusmock.version "0.30.1") [ - # Makes tests work with newer dbusmock, but breaks with much-newer dbusmock - # See for details: - # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/354 - # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/426 - # Remove/adjust based on merges & next LSS release, and packaged version of dbusmock - (fetchpatch { - name = "0101-lomiri-system-settings-Pass-missing-parameters-to-dbusmock.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/b9aacd88e3789dbb7578f32b31ad5b239db227a2.patch"; - hash = "sha256-jf+jMc+6QxONavlX5C9UZyX23jb6fZnYV8mWFyQGGbU="; - }) - (fetchpatch { - name = "0102-lomiri-system-settings-Fix-BT-plugin-testIsPaired.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/e39b9728e18635413f07f9c9f6ddc73208260b2a.patch"; - hash = "sha256-YUtdlQ2XcanXzsxD40SbML7fSxG75yMKz/XnaQN9YP8="; - }) - (fetchpatch { - name = "0103-lomiri-system-settings-Fix-BT-plugin-testGet-IconName-Type.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/9ad5d9324945f06f764d3a963dbfc7bccefe574b.patch"; - # Merge conflict, relevant change handled further down - excludes = [ "CMakeLists.txt" ]; - hash = "sha256-QCgkVos9Q9/8jd25rqzdEKdnBw0Re47X7B9nLH8QOQU="; + name = "0003-lomiri-system-settings-Revert-Pass-missing-parameter-to-dbusmock-bluez-PairDevice-function.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/67d9e28ebab8bdb9473d5bf8da2b7573e6848fa2.patch"; + hash = "sha256-pFWNne2UH3R5Fz9ayHvIpDXDQbXPs0k4b/oRg0fzi+s="; }) ] ++ [ diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch index 1eac4fde58b4b..dc1d1e2083c00 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch @@ -1,20 +1,18 @@ -From 243477a2bd6e315c77ebaf5b2ed4a9c9c4e1e22a Mon Sep 17 00:00:00 2001 -From: OPNA2608 <christoph.neidahl@gmail.com> -Date: Sat, 25 Nov 2023 10:49:32 +0100 +From c71d5fed4ef1f0b6d56400cddf02d8ac438168c8 Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Wed, 17 Apr 2024 16:18:23 +0200 Subject: [PATCH] Mark problematic tests - ShapeMaterial requires a Qt OpenGL context, doesn't work in our sandbox - SignalSpy on QML shaders compilers don't see changes -- Scaling value from environment not picked up properly since Qt 5.15.11 - https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/34 - TypeError on some properties with Qt 5.15 https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/9 --- - tests/checkresults.sh | 89 ++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 83 insertions(+), 6 deletions(-) + tests/checkresults.sh | 88 ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/tests/checkresults.sh b/tests/checkresults.sh -index fc498985e..730b9d406 100755 +index fc498985e..b5d204d0d 100755 --- a/tests/checkresults.sh +++ b/tests/checkresults.sh @@ -22,6 +22,7 @@ ERRORS_PATTERN='<failure' @@ -25,7 +23,7 @@ index fc498985e..730b9d406 100755 EXCEPTED=0 for _XML in $*; do _TESTNAME=$(basename $_XML | sed -r 's@(.+)\.xml@\1@' -) -@@ -31,7 +32,72 @@ for _XML in $*; do +@@ -31,7 +32,71 @@ for _XML in $*; do exit 1 fi @@ -91,7 +89,6 @@ index fc498985e..730b9d406 100755 + swipearea \ + tst_icon.11.qml \ + tst_icon.13.qml \ -+ dpr1 \ + ' + + EXCEPTIONS='\ @@ -99,7 +96,7 @@ index fc498985e..730b9d406 100755 tst_tabbar.11.qml \ tst_datepicker.bug1567840.SEGFAULT.12.qml \ tst_datepicker.bug1567840.SEGFAULT.13.qml \ -@@ -49,22 +115,28 @@ for _XML in $*; do +@@ -49,22 +114,28 @@ for _XML in $*; do inversemousearea \ tst_listitem_focus_bug.13.qml \ tst_shortcuts.13.qml \ @@ -132,7 +129,7 @@ index fc498985e..730b9d406 100755 WOOT_FILES="${WOOT_FILES} ${_TESTNAME}\n" fi done -@@ -82,6 +154,11 @@ if [ -n "$FATAL_WARNINGS_FILES" ]; then +@@ -82,6 +153,11 @@ if [ -n "$FATAL_WARNINGS_FILES" ]; then echo -e "$FATAL_WARNINGS_FILES" fi @@ -144,7 +141,7 @@ index fc498985e..730b9d406 100755 if [ -n "$EXCEPTED_FILES" ]; then echo The following tests issued $EXCEPTED expected warnings: echo -e "$EXCEPTED_FILES" -@@ -89,7 +166,7 @@ fi +@@ -89,7 +165,7 @@ fi if [ -n "$WOOT_FILES" ]; then echo Woot! Known problematic tests passed! @@ -154,5 +151,5 @@ index fc498985e..730b9d406 100755 fi -- -2.40.1 +2.42.0 diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index f8048b49eb5c1..8767534d368f5 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gitUpdater , substituteAll , testers @@ -35,30 +34,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-toolkit"; - version = "1.3.5012"; + version = "1.3.5100"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-toolkit"; rev = finalAttrs.version; - hash = "sha256-Azz2IOm/7XRvDbyIKaYxrkR47evSB17ejtssuEJayPc="; + hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I="; }; outputs = [ "out" "dev" ]; patches = [ - # Upstreaming effort for these two patches: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/merge_requests/44 - (fetchpatch { - name = "0001-lomiri-ui-toolkit-fix-tests-on-qt-5.15.4.patch"; - url = "https://salsa.debian.org/ubports-team/lomiri-ui-toolkit/-/raw/1ad650c326ba9706d549d1dbe8335c70f6b382c8/debian/patches/0001-fix-tests-on-qt-5.15.4.patch"; - hash = "sha256-Y5HVvulR2760DBzlmYkImbJ/qIeqMISqPpUppbv8xJA="; - }) - (fetchpatch { - name = "0002-lomiri-ui-toolkit-fix-tests-on-qt-5.15.5.patch"; - url = "https://salsa.debian.org/ubports-team/lomiri-ui-toolkit/-/raw/03bcafadd3e4fda34bcb5af23454f4b202cf5517/debian/patches/0002-fix-tests-on-qt-5.15.5.patch"; - hash = "sha256-x8Zk7+VBSlM16a3V1yxJqIB63796H0lsS+F4dvR/z80="; - }) - ./2001-Mark-problematic-tests.patch (substituteAll { src = ./2002-Nixpkgs-versioned-QML-path.patch.in; @@ -70,18 +57,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs documentation/docs.sh tests/ - substituteInPlace tests/tests.pro \ - --replace "\''$\''$PYTHONDIR" "$dev/${python3.sitePackages}" - for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do substituteInPlace $subproject/$subproject.pro \ - --replace "\''$\''$[QT_INSTALL_PREFIX]" "$out" \ - --replace "\''$\''$[QT_INSTALL_LIBS]" "$out/lib" + --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \ + --replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib" done # Install apicheck tool into bin substituteInPlace apicheck/apicheck.pro \ - --replace "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin" + --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin" # Causes redefinition error with our own fortify hardening sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf @@ -98,19 +82,19 @@ stdenv.mkDerivation (finalAttrs: { # Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great # solution, but at least it should get us working localisations substituteInPlace src/LomiriToolkit/i18n.cpp \ - --replace "/usr" "/run/current-system/sw" + --replace-fail "/usr" "/run/current-system/sw" # The code here overrides the regular QML import variables so the just-built modules are found & used in the tests # But we need their QML dependencies too, so put them back in there substituteInPlace export_qml_dir.sh \ - --replace '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}' + --replace-fail '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}' # These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them substituteInPlace \ tests/unit/visual/tst_visual.cpp \ tests/unit/visual/tst_icon.{11,13}.qml \ tests/unit/visual/tst_imageprovider.11.qml \ - --replace '/usr/share' '${suru-icon-theme}/share' + --replace-fail '/usr/share' '${suru-icon-theme}/share' ''; # With strictDeps, QMake only picks up Qt dependencies from nativeBuildInputs @@ -190,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { # Qt-generated wrapper script lacks QML paths to dependencies for qmlModule in Components PerformanceMetrics Test; do substituteInPlace src/imports/$qmlModule/wrapper.sh \ - --replace 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${qtQmlPaths}:' + --replace-fail 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${qtQmlPaths}:' done ''; @@ -198,8 +182,8 @@ stdenv.mkDerivation (finalAttrs: { # Code loads Qt's qt_module.prf, which force-overrides all QMAKE_PKGCONFIG_* variables except PREFIX for QMake-generated pkg-config files for pcFile in Lomiri{Gestures,Metrics,Toolkit}.pc; do substituteInPlace $out/lib/pkgconfig/$pcFile \ - --replace "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \ - --replace "${lib.getDev qtbase}/include" "\''${prefix}/include" + --replace-fail "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \ + --replace-fail "${lib.getDev qtbase}/include" "\''${prefix}/include" done # These are all dev-related tools, but declaring a bin output also moves around the QML modules diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix index 10d4c7c1d98a5..60638800fc904 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "polonium"; - version = "1.0b1"; + version = "1.0rc"; src = fetchFromGitHub { owner = "zeroxoneafour"; repo = pname; rev = "v" + version; - hash = "sha256-2uthjNhQm+hkRCPXGQm2LZunTj+J0SUuUfZL0PeRd4s="; + hash = "sha256-AdMeIUI7ZdctpG/kblGdk1DBy31nDyolPVcTvLEHnNs="; }; npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; @@ -45,7 +45,7 @@ buildNpmPackage rec { meta = with lib; { description = "Auto-tiler that uses KWin 6.0+ tiling functionality"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg kotatsuyaki ]; inherit (plasma-framework.meta) platforms; }; } diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 4bcad690bbbdc..6d58322767d30 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -13,11 +13,11 @@ let iconame = "STM32CubeMX"; package = stdenvNoCC.mkDerivation rec { pname = "stm32cubemx"; - version = "6.10.0"; + version = "6.11.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-B5Sf+zM7h9BiFqDYrLS0JdqZi3dGy6H9gAaJIN3izeM="; + hash = "sha256-By9T43GLM1J63TkRi3kl05h1RflBorU1QHgYOrXQ9N0="; stripRoot = false; }; @@ -84,7 +84,7 @@ let }; in buildFHSEnv { - inherit (package) pname meta; + inherit (package) pname version meta; runScript = "${package.outPath}/bin/stm32cubemx"; targetPkgs = pkgs: with pkgs; [ diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/development/interpreters/boron/default.nix index 541c3525b660c..e6570c2e89194 100644 --- a/pkgs/development/interpreters/boron/default.nix +++ b/pkgs/development/interpreters/boron/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "boron"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${version}.tar.gz"; - sha256 = "sha256-Ni/LJgOABC2wXDMsg1ZAuZWSQdFT9/Fa4lH4+V0gy8M="; + sha256 = "sha256-50HKcK2hQpe9k9RIoVa/N5krTRKlW9AsGYTmHITx7Nc="; }; # this is not a standard Autotools-like `configure` script diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index cedc8ef292328..b440e56812ad2 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.2.1446"; + version = "1.11.3.1456"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-qn7/sPyVDfjZPLeWxlUBBljAW/d8cCw6lEm3/deS73E="; + hash = "sha256-ymOkUUDSj5KzFMBY1D7gErjPAK5E/QjFDGcwDo5fzW0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 70d080e57ab87..d9e8d7e774a71 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; homepage = "https://github.com/libsdl-org/SDL_mixer"; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index b07d860cf0c3b..1640c5e3b86bc 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "SDL multiplatform networking library"; homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 8a11d3375491e..8e5dd411fca28 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitLab, gitUpdater, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "accounts-qt"; - version = "1.16-unstable-2023-11-24"; + version = "1.17"; # pinned to fork with Qt6 support src = fetchFromGitLab { - owner = "nicolasfella"; + owner = "accounts-sso"; repo = "libaccounts-qt"; - rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; - hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; + rev = "refs/tags/VERSION_${finalAttrs.version}"; + hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; }; propagatedBuildInputs = [ glib libaccounts-glib ]; @@ -21,11 +21,15 @@ stdenv.mkDerivation { patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; + passthru.updateScript = gitUpdater { + rev = "VERSION_"; + }; + meta = with lib; { description = "Qt library for accessing the online accounts database"; mainProgram = "accountstest"; - homepage = "https://gitlab.com/accounts-sso"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-qt"; license = licenses.lgpl21; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 85c785be3cb37..7e15b74ebee47 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; + sha256 = "sha256-Y+5fHUe1HAjU/cy7jWKE7zVQUezJNFg4q9tn7H1+NuA="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/development/libraries/cista/default.nix index 30070fe02daed..e2f302b5812b3 100644 --- a/pkgs/development/libraries/cista/default.nix +++ b/pkgs/development/libraries/cista/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "cista"; @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://cista.rocks"; description = "A simple, high-performance, zero-copy C++ serialization & reflection library"; license = licenses.mit; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/coost/default.nix b/pkgs/development/libraries/coost/default.nix index 3d0c15bbc2efd..7a259d44faf05 100644 --- a/pkgs/development/libraries/coost/default.nix +++ b/pkgs/development/libraries/coost/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, gitUpdater -, withCurl ? true, withOpenSSL ? true }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + openssl, + gitUpdater, + withCurl ? true, + withOpenSSL ? true, +}: stdenv.mkDerivation rec { pname = "coost"; @@ -21,9 +30,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] - ++ lib.optional withCurl "-DWITH_LIBCURL=ON" - ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] ++ lib.optional withCurl "-DWITH_LIBCURL=ON" ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; passthru.updateScript = gitUpdater { }; @@ -31,7 +40,7 @@ stdenv.mkDerivation rec { description = "A tiny boost library in C++11"; homepage = "https://github.com/idealvin/coost"; license = licenses.mit; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 4f3e74f5d8a89..f7af4975de561 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -33,6 +33,13 @@ stdenv.mkDerivation rec { src = ./make-zoneinfo-available.diff; inherit tzdata; }) + # The reported version to cmake's find_package() is 3.0.0, but the actual + # version is 3.0.1. This patch fixes that. + (fetchpatch { + name = "fix-cmake-version.patch"; + url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch"; + hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk="; + }) ]; # Tweaks to fix undefined variable substitutions diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix index 29b7bf9927756..a1020fe986797 100644 --- a/pkgs/development/libraries/kddockwidgets/default.nix +++ b/pkgs/development/libraries/kddockwidgets/default.nix @@ -1,24 +1,32 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , qtbase +, qtdeclarative +, qtquickcontrols2 , qtx11extras +, spdlog +, fmt +, nlohmann_json }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "1.7.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k5Hn9kxq1+tH5kV/ZeD4xzQLDgcY4ACC+guP7YJD4C8="; + sha256 = "sha256-V4BMD1kYyaMlqNBo8otpV5yBt/PICzhBTkEMX9N3lbk="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtx11extras ]; + buildInputs = [ spdlog fmt nlohmann_json ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtquickcontrols2 qtx11extras ]; + + dontWrapQtApps = true; meta = with lib; { description = "KDAB's Dock Widget Framework for Qt"; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 06b528ff8cf79..80038b79442af 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.12"; + version = "1.12.13"; src = fetchFromGitHub { - sha256 = "sha256-V/AMdJ3ldlgBaO8gS0FOqb5tTdRGGW/+3LZq/TKkdog="; + sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index c540f4bc26ec3..310d13c978b30 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, gitUpdater, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { pname = "libaccounts-glib"; - version = "1.26"; + version = "1.27"; outputs = [ "out" "dev" "devdoc" "py" ]; src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-glib"; - rev = version; - sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; + rev = "VERSION_${version}"; + sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; nativeBuildInputs = [ @@ -46,11 +46,17 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ + "-Dinstall-py-overrides=true" "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + passthru.updateScript = gitUpdater { + rev = "VERSION_"; + }; + meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-glib"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index acd8b374b58b9..66fa722573fd3 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.76"; + version = "1.0.77"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-qp3zcaoLM6G3DZgb2Jic1OhHetraEmYRiGkbQlSBnjs="; + sha256 = "sha256-SLpyQsRl7yfCAgK3udSSQo8OZOf6FRCzFKIDDUKg1gs="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/liboqs/default.nix b/pkgs/development/libraries/liboqs/default.nix index 4962f9459d79d..e703dc3647faa 100644 --- a/pkgs/development/libraries/liboqs/default.nix +++ b/pkgs/development/libraries/liboqs/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, enableStatic ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, + enableStatic ? stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { @@ -35,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://openquantumsafe.org"; license = licenses.mit; platforms = platforms.all; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; }; } diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/development/libraries/libsv/default.nix index 9c62799375603..4136c64714070 100644 --- a/pkgs/development/libraries/libsv/default.nix +++ b/pkgs/development/libraries/libsv/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "libsv"; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { description = "Public domain cross-platform semantic versioning in C99"; homepage = "https://github.com/uael/sv"; license = licenses.unlicense; - maintainers = []; + maintainers = [ lib.maintainers.sigmanificient ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index 8592dc5f12248..0c4d902f40bb2 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -1,29 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, fetchFromGitHub +, nix-update-script +, stdenv +, testers +, validatePkgConfig +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniz"; - version = "2.2.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "richgel999"; - repo = pname; - rev = version; - sha256 = "sha256-7hc/yNJh4sD5zGQLeHjowbUtV/1mUDQre1tp9yKMSSY="; + repo = "miniz"; + rev = finalAttrs.version; + hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; }; + passthru.updateScript = nix-update-script {}; - nativeBuildInputs = [ cmake ]; + strictDeps = true; + nativeBuildInputs = [ cmake validatePkgConfig ]; postFixup = '' - substituteInPlace "$out"/share/pkgconfig/miniz.pc \ - --replace '=''${prefix}//' '=/' \ - --replace '=''${exec_prefix}//' '=/' + substituteInPlace "$out"/lib/pkgconfig/miniz.pc \ + --replace-fail '=''${prefix}//' '=/' \ + --replace-fail '=''${exec_prefix}//' '=/' ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Single C source file zlib-replacement library"; homepage = "https://github.com/richgel999/miniz"; license = licenses.mit; maintainers = with maintainers; [ astro ]; platforms = platforms.unix; + pkgConfigModules = [ "miniz" ]; }; -} +}) diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index db9c727f8e0b3..02e587661890b 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -20,11 +20,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-pkpmeBueUxKtBS0yaJ4jJS90WyfuiBisKsDIIJvAuQ4="; + sha256 = "sha256-IzMbIpnyh8NBlyftwt+JItfnq7uf0Kx04DuZZvmtQtc="; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 6604596fe4684..c4b8512079546 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -15,10 +15,6 @@ , buildPackages , python3 , config - - # options -, developerBuild ? false -, debug ? false }: let @@ -47,7 +43,6 @@ let qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; - inherit developerBuild; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ @@ -197,7 +192,6 @@ let name = "qmake6-hook"; propagatedBuildInputs = [ qtbase.dev ]; substitutions = { - inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; } ./hooks/qmake-hook.sh) diff --git a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 8c4ce096443fd..130e8290a3feb 100644 --- a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -18,12 +18,6 @@ qmakePrePhase() { "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" ) - if [ -n "@debug@" ]; then - qmakeFlags+=("CONFIG+=debug") - else - qmakeFlags+=("CONFIG+=release") - fi - qmakeFlags+=("${qmakeFlags_orig[@]}") } prePhases+=" qmakePrePhase" diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 9bc68e6cd3d61..5006d6b65530c 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -15,20 +15,6 @@ else # Only set up Qt once. . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ - # Disable debug symbols if qtbase was built without debugging. - # This stops -dev paths from leaking into other outputs. - if [ -z "@debug@" ]; then - NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" - fi - - # Integration with CMake: - # Set the CMake build type corresponding to how qtbase was built. - if [ -n "@debug@" ]; then - cmakeBuildType="Debug" - else - cmakeBuildType="Release" - fi - # Build tools are often confused if QMAKE is unset. export QMAKE=@out@/bin/qmake diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index a14028e1259ad..a327b88991ef0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -92,13 +92,10 @@ # options , libGLSupported ? stdenv.hostPlatform.isLinux , libGL -, debug ? false -, developerBuild ? false , qttranslations ? null }: let - debugSymbols = debug || developerBuild; isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; in stdenv.mkDerivation rec { @@ -106,8 +103,6 @@ stdenv.mkDerivation rec { inherit src version; - debug = debugSymbols; - propagatedBuildInputs = [ libxml2 libxslt @@ -195,7 +190,6 @@ stdenv.mkDerivation rec { CoreBluetooth ] ++ lib.optional withGtk3 gtk3 - ++ lib.optional developerBuild gdb ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; @@ -266,8 +260,6 @@ stdenv.mkDerivation rec { patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so ''; - dontStrip = debugSymbols; - dontWrapQtApps = true; setupHook = ../hooks/qtbase-setup-hook.sh; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index af4fcf30153c5..eb77106fd29fa 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -1,28 +1,84 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchurl, fetchzip, autoreconfHook, writeScript, fetchpatch +, modelUrl ? "", modelHash ? "" # Allow overriding the model URL and hash +}: -stdenv.mkDerivation (rec { +let + modelVersionJSON = lib.importJSON ./model-version.json; + + # Copy from https://gitlab.xiph.org/xiph/rnnoise/-/raw/v${version}/model_version + default_model_version = modelVersionJSON.version; + + # Either use the default model or the one provided by package override + model_url = if (modelUrl == "") then "https://media.xiph.org/rnnoise/models/rnnoise_data-${default_model_version}.tar.gz" else modelUrl; + model_hash = if (modelHash == "") then modelVersionJSON.hash else modelHash; + +in stdenv.mkDerivation (finalAttrs: { pname = "rnnoise"; - version = "2021-01-22"; + version = "0.2"; + + src = fetchzip { + urls = [ + "https://gitlab.xiph.org/xiph/rnnoise/-/archive/v${finalAttrs.version}/rnnoise-v${finalAttrs.version}.tar.gz" + "https://github.com/xiph/rnnoise/archive/v${finalAttrs.version}.tar.gz" + ]; + hash = "sha256-Qaf+0iOprq7ILRWNRkBjsniByctRa/lFVqiU5ZInF/Q="; + }; + + patches = [ + # remove when updating + (fetchpatch { + url = "https://github.com/xiph/rnnoise/commit/372f7b4b76cde4ca1ec4605353dd17898a99de38.patch"; + hash = "sha256-Dzikb59hjVxd1XIEj/Je4evxtGORkaNcqE+zxOJMSvs="; + }) + ]; - src = fetchFromGitHub { - owner = "xiph"; - repo = "rnnoise"; - rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd"; - sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb"; + model = fetchurl { + url = model_url; + hash = model_hash; }; + postPatch = '' + tar xvomf ${finalAttrs.model} + ''; + nativeBuildInputs = [ autoreconfHook ]; postInstall = '' install -Dt $out/bin examples/.libs/rnnoise_demo ''; - meta = with lib; { + passthru.updateScript = writeScript "update-rnnoise.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts nix nix-prefetch findutils moreutils + + prefetch-sri() { + nix-prefetch-url "$1" | xargs nix hash to-sri --type sha256 + } + + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/xiph/rnnoise/tags?per_page=1")" + + version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + + model_version=$(curl -sL "https://raw.githubusercontent.com/xiph/rnnoise/v$version/model_version") + model_url="https://media.xiph.org/rnnoise/models/rnnoise_data-$model_version.tar.gz" + model_hash="$(prefetch-sri $model_url)" + + modelJson=pkgs/development/libraries/rnnoise/model-version.json + + jq --arg version "$model_version" \ + --arg hash "$model_hash" \ + '.version = $version | .hash = $hash' \ + "$modelJson" | sponge "$modelJson" + ''; + + meta = { description = "Recurrent neural network for audio noise reduction"; homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; - license = licenses.bsd3; - maintainers = [ maintainers.nh2 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nh2 ]; mainProgram = "rnnoise_demo"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/libraries/rnnoise/model-version.json b/pkgs/development/libraries/rnnoise/model-version.json new file mode 100644 index 0000000000000..830f8cc360184 --- /dev/null +++ b/pkgs/development/libraries/rnnoise/model-version.json @@ -0,0 +1,4 @@ +{ + "version": "0b50c45", + "hash": "sha256-SsgcXAiE7EvVkHAmqq4WIJt7ds2df3GvWCCUovmPS0M=" +} diff --git a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch index 6a3c7bee051e6..f3a34de9304e3 100644 --- a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch @@ -1,12 +1,12 @@ diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index 168febb34b6..71068469066 100644 +index 672a62a..a5fd1c4 100644 --- a/src/snes/tutorials/makefile +++ b/src/snes/tutorials/makefile @@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 168febb34b6..71068469066 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,7 +30,7 @@ index 168febb34b6..71068469066 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ else \ @@ -38,7 +38,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ else \ @@ -46,7 +46,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ else \ @@ -54,7 +54,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_cuda: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ else \ @@ -62,7 +62,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ else \ @@ -70,7 +70,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ else \ @@ -78,7 +78,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ else \ @@ -86,7 +86,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ else \ @@ -94,7 +94,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ else \ diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 9b0fe4de9e44b..d3021995ff8f5 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-6bEd8KzOfBse5sQ2zp+cZtEAu8xIl3GqrpxSZ7h/edI="; + hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 9803a20368c3b..9d6c3664822d3 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "earlybird"; - version = "1.2.1"; + version = "1.3.2"; minimalOCamlVersion = "4.12"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "hackwaly"; repo = "ocamlearlybird"; rev = version; - hash = "sha256-p29uTdx8+mZKXUL+ng/FzpKuhnykEe8Sy968Wa/KUn4="; + hash = "sha256-E6ZZRkGO6Bqr6jWlV9fL3ibFwUVChHR17TPGeP94hfk="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 8d7b3f6893fea..54db34bc9740e 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "iri"; - version = "0.7.0"; + version = "1.0.0"; minimalOCamlVersion = "4.12"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "zoggy"; repo = "ocaml-iri"; rev = version; - hash = "sha256-Mkg7kIIVpKbeWUras1RqtJsRx2Q3dBnm4QqSMJFweF8="; + hash = "sha256-6Q7qPezmdcO6JSevWl55XAxFuIROZNDrMkYw8VRR7qg="; }; propagatedBuildInputs = [ sedlex uunf uutf ]; diff --git a/pkgs/development/ocaml-modules/mtime/1_x.nix b/pkgs/development/ocaml-modules/mtime/1_x.nix deleted file mode 100644 index e10f2b7d7a3ba..0000000000000 --- a/pkgs/development/ocaml-modules/mtime/1_x.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, mtime }: - -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "mtime is not available for OCaml ${ocaml.version}" - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-mtime"; - version = "1.4.0"; - - src = fetchurl { - url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; - }; - - nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; - - strictDeps = true; - - inherit (topkg) buildPhase installPhase; - inherit (mtime) meta; -} diff --git a/pkgs/development/ocaml-modules/ninja_utils/default.nix b/pkgs/development/ocaml-modules/ninja_utils/default.nix new file mode 100644 index 0000000000000..2510cc93abbcd --- /dev/null +++ b/pkgs/development/ocaml-modules/ninja_utils/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip, buildDunePackage, re }: + +buildDunePackage rec { + pname = "ninja_utils"; + version = "0.9.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchzip { + url = "https://github.com/CatalaLang/ninja_utils/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-VSj1IXfczoI3lSAtOqQPIqsxX+HgyxKzlssKd7By/Lo="; + }; + + propagatedBuildInputs = [ re ]; + + meta = { + description = "Small library used to generate Ninja build files"; + homepage = "https://github.com/CatalaLang/ninja_utils"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 93bee8f101562..086b0789a6a51 100644 --- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tsdl-ttf"; - version = "0.5"; + version = "0.6"; duneVersion = "3"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "sanette"; repo = pname; rev = version; - hash = "sha256-ai9ChsA3HZzTxT9AuHsY1UIA2Q3U3CcOA7jRSG4MDsQ="; + hash = "sha256-1MGbsekaBoCz4vAwg+Dfzsl0xUKgs8dUEr+OpLopnig="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index 4940f38f1b4ac..1930aa5bbff5d 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -3,6 +3,7 @@ , cstruct , dune-configurator , fetchurl +, fetchpatch , fmt , optint , mdx @@ -19,6 +20,14 @@ buildDunePackage rec { hash = "sha256-4OGst19vqEzuNVxO5xxtzS+mEilEBFoEc7lC3j3sTk4="; }; + patches = [ + (fetchpatch { + name = "musl-1.2.5.patch"; + url = "https://github.com/ocaml-multicore/ocaml-uring/commit/abe340086574c124061434054937d1f19ee6bb71.patch"; + hash = "sha256-J4ZQAdQZ9fhT3/vAh5FYMyvMllTowe4GyHJy5RGUTv0="; + }) + ]; + propagatedBuildInputs = [ cstruct fmt diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix index 976ba217ce464..a0c066c4d9751 100644 --- a/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/pkgs/development/python-modules/androidtvremote2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.0.14"; + version = "0.0.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-m53TlNrrCjA4CqvR02Yph7Gr5Dt17VJFBX6MC3arWOI="; + hash = "sha256-aLNmuMuwaMhl/Utv6bVU4fR8zmhj0fUiInL4RHT4dVw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index a7cd85ca8b9e1..4f4c00cd7bed7 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, poetry-core -, aiohttp -, sensor-state-data -, pytestCheckHook -, pytest-asyncio +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + poetry-core, + aiohttp, + sensor-state-data, + pytestCheckHook, + pytest-asyncio, }: buildPythonPackage rec { pname = "anova-wifi"; - version = "0.11.7"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,19 +21,17 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-G87lNPyFnMO0YWKtLv/RgSZ0j0exFro24erwYv87V90="; + hash = "sha256-0RRnQBLglPnPin9/gqWDKIsfi5V7ydrdDKwm93WEnvk="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=anova_wifi --cov-report=term-missing:skip-covered" "" - ''; + substituteInPlace pyproject.toml \ + --replace-fail "--cov=anova_wifi --cov-report=term-missing:skip-covered" "" + ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp sensor-state-data ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 9c7cab503834f..9898dffe82aba 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , empty-files , fetchFromGitHub -, fetchpatch2 , mock , mrjob , numpy @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "11.1.3"; + version = "11.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,16 +29,9 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-VqE2Oj3b+ZfKT+fhJ9DxBClfa8Wz8w/puAnAotN3eG4="; + hash = "sha256-oG1TH9F8IYDZWLuL2TIesNuZQVzGQRqkGk502HTG+O8="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/approvals/ApprovalTests.Python/commit/dac7c8a8aa62f31dca7a687d4dbf08158351d5e1.patch"; - hash = "sha256-TMyfXNtzpGci6tdFRhxiKJRjCWRD5LkaffPY8EVj53E="; - }) - ]; - build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index b07133350e2f1..e88ee4650f060 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,33 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-auth -, google-auth-httplib2 -, google-api-core -, httplib2 -, uritemplate -, oauth2client -, setuptools -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + google-auth, + google-auth-httplib2, + google-api-core, + httplib2, + uritemplate, + oauth2client, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.125.0"; + version = "2.126.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UaA4XP9l7BNRBui+YO5xElVzlt3l9EETriORK63doUM="; + hash = "sha256-l8BBBjDivr0ZTZnpG9Yg2rW8a27AvwM/mpEJtwC4Oss="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-auth google-auth-httplib2 google-api-core @@ -39,9 +38,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - pythonImportsCheck = [ - "googleapiclient" - ]; + pythonImportsCheck = [ "googleapiclient" ]; meta = with lib; { description = "The official Python client library for Google's discovery based APIs"; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index f230ac19194bc..f3cafa489d6e5 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -1,44 +1,41 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, google-cloud-testutils -, mock -, pandas -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + google-cloud-testutils, + mock, + pandas, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.19.3"; + version = "2.21.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N2QeU3mG/SIn+HOLh51gWozfTDFc3GDobhCTR6scodc="; + hash = "sha256-57HIdY/DVj/7mjR7xRcuJ4L0TBIbyA/BUoPiic/2db8="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - pandas = [ - pandas - ]; + pandas = [ pandas ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index c8c055555d3f5..671c5fc37e2ad 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,40 +1,39 @@ -{ lib -, buildPythonPackage -, deprecated -, fetchPypi -, google-api-core -, google-cloud-core -, google-cloud-testutils -, grpc-google-iam-v1 -, grpc-interceptor -, libcst -, mock -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, sqlparse -, setuptools +{ + lib, + buildPythonPackage, + deprecated, + fetchPypi, + google-api-core, + google-cloud-core, + google-cloud-testutils, + grpc-google-iam-v1, + grpc-interceptor, + libcst, + mock, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + sqlparse, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.44.0"; + version = "3.45.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NTzAsG/UVn2BxPwUxE/ZnXqkCA9LwhmDRoq3LdstLIo="; + hash = "sha256-MKtW6krGqnQ3hCmPgh4N5lRAGTe0DGDMegpUUoSpG0M="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ deprecated google-api-core google-cloud-core @@ -46,9 +45,7 @@ buildPythonPackage rec { ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - libcst = [ - libcst - ]; + libcst = [ libcst ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index b31a0b6a93540..9d783b7bde227 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.20.2"; + version = "0.20.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; - rev = version; - hash = "sha256-q5y4QPBCtA1kMhxbOECodSeubj2bULnnNDrZZfxiry4="; + rev = "refs/tags/${version}"; + hash = "sha256-IqjqcBEL4BK/VfRjdxJ9t/DkG8OMAoXJxbW5JXpALuw="; }; patches = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; @@ -75,5 +75,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index a4ab7b504a91a..03dfcf4cf8ec7 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.25"; + version = "0.0.26"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-vDzXrAGJUqG9+wOUWXeKLYraUrILJFAQXf60iCAHRPo="; + hash = "sha256-+HjVxcTbY9nRj2938fqguOXuTM3XzJWccx0J6RK2h4A="; }; build-system = [ diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index ec1811d707d7f..8f89346b81b8f 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pythonOlder +, hatchling +, pythonRelaxDepsHook , manim , ffmpeg @@ -27,17 +29,13 @@ # Optional dependencies , ipython - # Hooks -, pdm-backend -, pythonRelaxDepsHook - # As Module or application? , withGui ? false }: buildPythonPackage rec { pname = "manim-slides"; - format = "pyproject"; - version = "5.1.3"; + version = "5.1.5"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -45,16 +43,19 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-WZR95swapT2Fbu6mbuHLjMu3Okq/wKFabzN7xpZw0/g="; + hash = "sha256-YOveWGukizXvEUOhId7UDJema64ypbg7w06JzrTsKjw="; }; - nativeBuildInputs = [ pdm-backend pythonRelaxDepsHook ]; + build-system = [ + hatchling + pythonRelaxDepsHook + ]; pythonRemoveDeps = [ "opencv-python" ]; pythonRelaxDeps = [ "rtoml" "qtpy" ]; - propagatedBuildInputs = [ + dependencies = [ av click click-default-group diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index f4f421399850a..611c5b11dc0c6 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.0.9"; + version = "2.0.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-50LHGQSR6foL3SqOK/pGQqOcuUgOE9bI1rt/RoIrVsA="; + hash = "sha256-N1VU9bOdVENIX6QsFa0jeVugmXjl3gNkVPS/m8gEB2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 185fffba413a8..d0a925859d03c 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nestedtext"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "nestedtext"; rev = "refs/tags/v${version}"; - hash = "sha256-SHY/MTmYbNh3azkyvwEtuvT+V7YzfLi2B3FvBzv6Omo="; + hash = "sha256-lNqSmEmzuRGdXs/4mwKSh7yDGHnAykpIDIR+abbLCns="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix index 85eb41fa51d43..92e5e77647940 100644 --- a/pkgs/development/python-modules/parquet/default.nix +++ b/pkgs/development/python-modules/parquet/default.nix @@ -1,31 +1,46 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, python-snappy -, thriftpy2 +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + python-snappy, + pythonOlder, + setuptools, + thriftpy2, }: buildPythonPackage rec { pname = "parquet"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jcrobak"; repo = "parquet-python"; - rev = "v${version}"; - sha256 = "1ahvg4dz9fzi4vdm9jmslq3v3jahjj17fdcc5fljgcw6h9yxyl2r"; + rev = "refs/tags/v${version}"; + hash = "sha256-WVDffYKGsyepK4w1d4KUUMmxB6a6ylTbJvG79Bt5G6o="; }; - propagatedBuildInputs = [ + patches = [ + # Refactor deprecated unittest aliases, https://github.com/jcrobak/parquet-python/pull/83 + (fetchpatch { + name = "unittest-aliases.patch"; + url = "https://github.com/jcrobak/parquet-python/commit/746bebd1e84d8945a3491e1ae5e44102ff534592.patch"; + hash = "sha256-4awxlzman/YMfOz1WYNR+mVn1ixGku9sqlaMJ1QITYs="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ python-snappy thriftpy2 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Fails with AttributeError @@ -37,9 +52,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the parquet columnar file format"; - mainProgram = "parquet"; homepage = "https://github.com/jcrobak/parquet-python"; + changelog = "https://github.com/jcrobak/parquet-python/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "parquet"; }; } diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix index b8a25480799b3..2b3f3f48f1375 100644 --- a/pkgs/development/python-modules/py3buddy/default.nix +++ b/pkgs/development/python-modules/py3buddy/default.nix @@ -4,35 +4,38 @@ , pyusb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "py3buddy"; - version = "unstable-2019-09-29"; + version = "1.0"; src = fetchFromGitHub { owner = "armijnhemel"; - repo = pname; - rev = "2b28908454645117368ca56df67548c93f4e0b03"; - sha256 = "12ar4kbplavndarkrbibxi5i607f5sfia5myscvalqy78lc33798"; + repo = "py3buddy"; + rev = finalAttrs.version; + hash = "sha256-KJ0xGEXHY6o2074WFZ0u7gATS+wrrjyzanYretckWYk="; }; propagatedBuildInputs = [ pyusb ]; dontConfigure = true; dontBuild = true; - dontCheck = true; installPhase = '' + runHook preInstall + install -D py3buddy.py $out/${python.sitePackages}/py3buddy.py + + runHook postInstall ''; postInstall = '' install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules ''; - meta = with lib; { + meta = { description = "Code to work with the iBuddy MSN figurine"; homepage = "https://github.com/armijnhemel/py3buddy"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ prusnak ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ prusnak ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index da50d8f45735a..d88cd0abeba92 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -34,15 +34,6 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - postPatch = '' - substituteInPlace pyproject.toml setup.py \ - --replace "setuptools_scm < 8.0.0" "setuptools_scm" - '' + lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace ./cmake_modules/FindPython3Alt.cmake --replace-fail \ - "from distutils import sysconfig" \ - "import sysconfig" - ''; - nativeBuildInputs = [ cmake cython_0 @@ -78,8 +69,6 @@ buildPythonPackage rec { PYARROW_WITH_HDFS = zero_or_one true; PYARROW_WITH_PARQUET = zero_or_one true; PYARROW_WITH_PARQUET_ENCRYPTION = zero_or_one true; - # Plasma is deprecated since arrow 10.0.0 - PYARROW_WITH_PLASMA = zero_or_one false; PYARROW_WITH_S3 = zero_or_one arrow-cpp.enableS3; PYARROW_WITH_GCS = zero_or_one arrow-cpp.enableGcs; PYARROW_BUNDLE_ARROW_CPP_HEADERS = zero_or_one false; @@ -172,7 +161,6 @@ buildPythonPackage rec { "feather" "flight" "fs" - "hdfs" "json" "parquet" ]; diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index b9ac4770f71e9..a385b6f431305 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -1,41 +1,38 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, invoke -, mock -, pytest7CheckHook -, pythonOlder -, setuptools -, sphinx-rtd-theme -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + invoke, + mock, + pytest7CheckHook, + pythonOlder, + setuptools, + sphinx-rtd-theme, + typing-extensions, }: buildPythonPackage rec { pname = "pydash"; - version = "7.0.6"; + version = "8.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dgilland"; repo = "pydash"; rev = "refs/tags/v${version}"; - hash = "sha256-zwtUdP2fFFE5X0SDkBDetAQbKnZ1v24DGdzN3fQLa0A="; + hash = "sha256-4zNljz0U/iQd2DMC43qkdOY/mwtPlizgLmoaB7BVmxw="; }; postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov/d" setup.cfg + sed -i "/--cov/d" pyproject.toml + sed -i "/--no-cov/d" pyproject.toml ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - typing-extensions - ]; + dependencies = [ typing-extensions ]; nativeCheckInputs = [ invoke @@ -44,9 +41,7 @@ buildPythonPackage rec { sphinx-rtd-theme ]; - pythonImportsCheck = [ - "pydash" - ]; + pythonImportsCheck = [ "pydash" ]; disabledTestPaths = [ # Disable mypy testing diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index 637a686f00cbc..f227a1469ab55 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyqt6-webengine"; - version = "6.6.0"; + version = "6.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_WebEngine"; inherit version; - hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc="; + hash = "sha256-aO3HrbbZ4nX13pVogeecyg1x+tQ5q+qhDYI7/1rFUAE="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 6787c0a897822..44251a333ed9c 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -25,7 +25,9 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ lxml mock psutil pytest ]; + propagatedBuildInputs = [ lxml psutil ]; + + nativeCheckInputs = [ mock pytest ]; checkPhase = "pytest tests"; diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix index f3b556699e8b3..dce8df48a430b 100644 --- a/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/pkgs/development/python-modules/pytest-json-report/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytest -, pytest-metadata -, pytest-xdist -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest, + pytest-metadata, + pytest-xdist, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,17 +24,11 @@ buildPythonPackage rec { hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - buildInputs = [ - pytest - ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ - pytest-metadata - ]; + dependencies = [ pytest-metadata ]; nativeCheckInputs = [ pytest-xdist @@ -44,11 +39,12 @@ buildPythonPackage rec { # pytest-flaky is not available at the moment "test_bug_31" "test_environment_via_metadata_plugin" + # AssertionError + "test_report_collectors" + "test_report_crash_and_traceback" ]; - pythonImportsCheck = [ - "pytest_jsonreport" - ]; + pythonImportsCheck = [ "pytest_jsonreport" ]; meta = with lib; { description = "Pytest plugin to report test results as JSON"; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index 6387e833b7fcd..20828ac3e38d7 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -24,15 +24,20 @@ buildPythonPackage rec { }; patches = - /** fix test failure with black<24.2.0; - remove this patch once python-lsp-black>2.0.0 */ + /** includes a series of patches fixing tests not yet released as 2.0.1+ version + they are meant to keep up to date with black releases */ lib.optional - (with lib; (versionOlder version "2.0.1") && (versionAtLeast black.version "24.2.0")) + (with lib; versionAtLeast black.version "24.2.0") (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/python-lsp/python-lsp-black/pull/56.patch"; + url = "https://github.com/python-lsp/python-lsp-black/commit/d43b41431379f9c9bb05fab158c4d97e6d515f8f.patch"; hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U="; }) - ++ [ ]; + ++ lib.optional + (with lib; versionAtLeast black.version "24.3.0") + (fetchpatch { + url = "https://github.com/python-lsp/python-lsp-black/commit/9298585a9d14d25920c33b188d79e820dc98d4a9.patch"; + hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E="; + }); nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index e0c55bf0e9e93..83b1a73820e86 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -1,37 +1,35 @@ { lib , aiohttp -, async-timeout , buildPythonPackage , fetchFromGitHub , gql -, graphql-subscription-manager , pytest-asyncio , pytestCheckHook -, python-dateutil , pythonOlder -, pytz +, setuptools }: buildPythonPackage rec { pname = "pytibber"; - version = "0.29.0"; - format = "setuptools"; + version = "0.29.1"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-rj/uIgIDjmEGD6muUllTb0PdLkedarMgVq38qqNoMI4="; + hash = "sha256-fKeNQifSCxsqR2mhK2w5kG669byYNNLkfxAYTUtfWE0="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp - async-timeout gql - graphql-subscription-manager - python-dateutil ] ++ gql.optional-dependencies.websockets; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index 57ac30017ce44..56790351dcd66 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "quantiphy"; - version = "2.19"; + version = "2.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KenKundert"; repo = "quantiphy"; - rev = "v${version}"; - hash = "sha256-oSWq/D1EX6mxUDElfujyOSEtql0csAm72u2B5RuQddE="; + rev = "refs/tags/v${version}"; + hash = "sha256-QXCs93plNSVNiCLEoXx2raH6EbH1rXyjvpBfl+8eXjc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/quixote/default.nix b/pkgs/development/python-modules/quixote/default.nix new file mode 100644 index 0000000000000..557a59390fb93 --- /dev/null +++ b/pkgs/development/python-modules/quixote/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "quixote"; + version = "3.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "Quixote"; + inherit version; + hash = "sha256-78t6tznI3+vIRkWNi0HDPGhR8aGaET3IMXQvmAPdSSY="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "quixote" ]; + + disabledTestPaths = [ + # Test has additional requirements + "quixote/ptl/test/test_ptl.py" + ]; + + meta = with lib; { + description = "A small and flexible Python Web application framework"; + homepage = "https://pypi.org/project/Quixote/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index e1b886672c80f..33e0c85697c1e 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.216.1"; + version = "2.217.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-z+vtUgR/Yxptz9Hzdb5bpAIIEN9JlSRVPt/aSKI4jHY="; + hash = "sha256-p73M0hBVpakdXGM56ECr4D3mQCBmB7Ud/p+Rj1+/Bic="; }; patches = [ diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 989b5711a810b..3cd175e518f10 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.10"; + version = "1.3.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = "skodaconnect"; rev = "refs/tags/${version}"; - hash = "sha256-H45rL9GFuTnP5VP0cRyqlmWJmX1Zvh7A7JcSKgcZCwA="; + hash = "sha256-Cy2sXj8+t8lIqrKmI9Aa7tNEIvRArynU/02ajJ+tYHg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 057190bda9836..92d55ef4a235c 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , cargo , datasets +, huggingface-hub , fetchFromGitHub , fetchurl , libiconv @@ -11,6 +12,7 @@ , openssl , pkg-config , pytestCheckHook +, python , pythonOlder , requests , rustPlatform @@ -80,6 +82,7 @@ buildPythonPackage rec { }; sourceRoot = "${src.name}/bindings/python"; + maturinBuildFlags = [ "--interpreter ${python.executable}" ]; nativeBuildInputs = [ pkg-config @@ -105,6 +108,7 @@ buildPythonPackage rec { dependencies = [ numpy + huggingface-hub ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index ddea5117a6c07..08e8ad74de225 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,40 +1,57 @@ -{ lib -, buildPythonPackage -, fetchPypi -, lxml -, requests -, pyparsing -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + httpx, + lxml, + pyparsing, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + quixote, + setuptools, }: buildPythonPackage rec { pname = "twill"; - version = "3.2.3"; - format = "setuptools"; + version = "3.2.4"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-m4jrxx7udWkRXzYS0Yfd14tKVHt8kGYPn2eTa4unOdc="; + hash = "sha256-YlZKvOGxLWwGh+MqCXf8tfruxLK60H73k1VQhGOSTc8="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "lxml" ]; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ + httpx lxml - requests pyparsing ]; - pythonImportsCheck = [ - "twill" + nativeCheckInputs = [ + pytestCheckHook + quixote + ]; + + disabledTestPaths = [ + # pytidylib is abandoned + "tests/test_tidy.py" ]; - # pypi package comes without tests, other homepage does not provide all verisons - doCheck = false; + pythonImportsCheck = [ "twill" ]; meta = with lib; { description = "A simple scripting language for Web browsing"; homepage = "https://twill-tools.github.io/twill/"; + changelog = "https://github.com/twill-tools/twill/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 7cfa14ffd4495..fe2ebd26d7d18 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -1,70 +1,84 @@ -{ lib -, attrs -, buildPythonPackage -, cattrs -, click -, click-option-group -, fetchPypi -, hatchling -, pytestCheckHook -, pythonOlder -, tomli -, typing-extensions +{ + lib, + attrs, + buildPythonPackage, + cattrs, + click, + click-option-group, + fetchPypi, + hatchling, + jinja2, + pydantic, + pytestCheckHook, + pythonOlder, + tomli, + typing-extensions, }: buildPythonPackage rec { pname = "typed-settings"; - version = "24.1.0"; - format = "pyproject"; + version = "24.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-luUfVsN6uNYZkXfcAUc5P6Y+WYpfAdU6D01kgQMNniw="; + hash = "sha256-BuosfIlCgCD+h7eA/6/oE98zdURaT3eik+dysBpJR+Y="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - attrs - cattrs - click-option-group - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ]; + dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; passthru.optional-dependencies = { - click = [ + all = [ + attrs + cattrs + click + click-option-group + jinja2 + pydantic + ]; + attrs = [ attrs ]; + cattrs = [ cattrs ]; + click = [ click ]; + option-groups = [ click + click-option-group ]; + jinja = [ jinja2 ]; + pydantic = [ pydantic ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook typing-extensions - ] ++ passthru.optional-dependencies.click; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ - "tests" - ]; + pytestFlagsArray = [ "tests" ]; disabledTests = [ # AssertionError: assert [OptionInfo(p... "test_deep_options" + # 1Password CLI is not available + "TestOnePasswordLoader" + "test_handle_op" ]; - pythonImportsCheck = [ - "typed_settings" + disabledTestPaths = [ + # 1Password CLI is not available + "tests/test_onepassword.py" ]; - meta = { + pythonImportsCheck = [ "typed_settings" ]; + + meta = with lib; { description = "Typed settings based on attrs classes"; homepage = "https://gitlab.com/sscherfke/typed-settings"; changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 153f8a79daf46..196c696ff542b 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -1,10 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, importlib-resources -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + importlib-resources, + pytestCheckHook, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { @@ -12,7 +14,7 @@ buildPythonPackage rec { version = "2.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JelleZijlstra"; @@ -21,25 +23,18 @@ buildPythonPackage rec { hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ importlib-resources + typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "typeshed_client" - ]; + pythonImportsCheck = [ "typeshed_client" ]; - pytestFlagsArray = [ - "tests/test.py" - ]; + pytestFlagsArray = [ "tests/test.py" ]; meta = with lib; { description = "Retrieve information from typeshed and other typing stubs"; diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix index 67d55e64243e5..8201e4ba8104d 100644 --- a/pkgs/development/python-modules/typical/default.nix +++ b/pkgs/development/python-modules/typical/default.nix @@ -1,24 +1,26 @@ -{ lib -, buildPythonPackage -, fastjsonschema -, fetchFromGitHub -, future-typing -, inflection -, orjson -, pandas -, pendulum -, poetry-core -, pydantic -, pytestCheckHook -, pythonOlder -, sqlalchemy -, ujson +{ + lib, + buildPythonPackage, + fastjsonschema, + fetchFromGitHub, + future-typing, + inflection, + orjson, + pandas, + pendulum, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + sqlalchemy, + ujson, }: buildPythonPackage rec { pname = "typical"; version = "2.8.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -29,11 +31,13 @@ buildPythonPackage rec { hash = "sha256-2t9Jhdy9NmYBNzdtjjgUnoK2RDEUsAvDkYMcBRzEcmI="; }; - nativeBuildInputs = [ - poetry-core - ]; + pythonRelaxDeps = [ "pendulum" ]; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ fastjsonschema future-typing inflection @@ -43,10 +47,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pandas pydantic + pytestCheckHook sqlalchemy - pandas ]; disabledTests = [ @@ -54,6 +58,12 @@ buildPythonPackage rec { "test_tagged_union_validate" # TypeError: 'NoneType' object cannot be interpreted as an integer "test_ujson" + # Failed: DID NOT RAISE <class 'ValueError'> + "test_invalid_path" + # AssertionError + "test_primitive" + "test_tojson" + "test_transmute_simple" ]; disabledTestPaths = [ @@ -63,9 +73,7 @@ buildPythonPackage rec { "tests/mypy/test_mypy.py" ]; - pythonImportsCheck = [ - "typic" - ]; + pythonImportsCheck = [ "typic" ]; meta = with lib; { description = "Python library for runtime analysis, inference and validation of Python types"; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index b9046f991f6cd..b417245498979 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { homepage = "https://github.com/pimutils/vdirsyncer"; changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ loewenheim ]; + maintainers = [ ]; mainProgram = "vdirsyncer"; }; } diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 947022eab4f66..0f2748208817e 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,10 +1,10 @@ { stdenv , lib , rustPlatform -, rustc , callPackage , fetchFromGitHub , buildPythonPackage +, pythonAtLeast , libiconv , libffi , libxml2 @@ -22,7 +22,7 @@ let , extraBuildInputs ? [ ] }: buildPythonPackage rec { inherit pname; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; @@ -31,7 +31,7 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - hash = "sha256-nOeOhQ1XY+9qmLGURrI5xbgBUgWe5XRpV38f73kKX2s="; + hash = "sha256-Iu28LMDNmtL2r7gJV5Vbb8HZj18dlkHe+mw/Y1L8YKE="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -69,6 +69,8 @@ let pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ]; meta = with lib; { + # https://github.com/wasmerio/wasmer-python/issues/778 + broken = pythonAtLeast "3.12"; description = "Python extension to run WebAssembly binaries"; homepage = "https://github.com/wasmerio/wasmer-python"; license = licenses.mit; @@ -81,19 +83,19 @@ in wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-twoog8LjQtoli+TlDipSuB7yLFkXQJha9BqobqgZW3Y="; + cargoHash = "sha256-vpbwU1HrIQmQkce9SK8UOHrX5tOLv/XKsfJHteqOteA="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-IqeMOY6emhIC7ekH8kIOZCr3JVkjxUg/lQli+ZZpdq4="; + cargoHash = "sha256-nv4cr52mUIuR3LWRT3eXU5b2LORwuN4iMbLX1efzovI="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA="; + cargoHash = "sha256-FA/xXlPaK8NxZIw7MCm9Fyesgu72Dsxhmb5xzOIINhE="; extraNativeBuildInputs = [ llvm_14 ]; extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; }; @@ -101,6 +103,6 @@ in wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-4nZHMCNumNhdGPOmHXlJ5POYP7K+VPjwhEUMgzGb/Rk="; + cargoHash = "sha256-yew7cB/7RLjW55jZmHFfIvaErgZ6XVxL1ucGGX2Cx18="; }; } diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 5db1981412937..f92ef94177d5d 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -1,46 +1,57 @@ -{ lib -, authlib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools-scm -, tqdm -, validators +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + grpcio, + grpcio-health-checking, + grpcio-tools, + httpx, + pydantic, + pythonOlder, + pythonRelaxDepsHook, + setuptools-scm, + tqdm, + validators, }: buildPythonPackage rec { pname = "weaviate-client"; - version = "4.5.1"; - format = "setuptools"; + version = "4.5.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-gElboFIwEMiwN6HhpPPT+tcmh0pMiDjq7R8TG2eMMKI="; + src = fetchFromGitHub { + owner = "weaviate"; + repo = "weaviate-python-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-P1GiTsRDbJssoLZR//c+b4IJ2Zyb/0PaBLL+wmmI6zc="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "validators>=0.18.2,<=0.21.0" "validators>=0.18.2" \ - --replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0" - ''; - - nativeBuildInputs = [ - setuptools-scm + pythonRelaxDeps = [ + "httpx" + "validators" ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ authlib + grpcio + grpcio-health-checking + grpcio-tools + httpx + pydantic tqdm validators ]; doCheck = false; - pythonImportsCheck = [ - "weaviate" - ]; + pythonImportsCheck = [ "weaviate" ]; meta = with lib; { description = "Python native client for easy interaction with a Weaviate instance"; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 26b39ed87ed5e..ee3a15d11bd0e 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -6,6 +6,7 @@ , pdm-backend , pytest-freezegun , pytest-xdist +, pytest , pytestCheckHook , pythonOlder , ruyaml @@ -26,12 +27,12 @@ buildPythonPackage rec { hash = "sha256-nadyBIzXHbWm0QvympRaYU38tuPJ3TPJg8EbvVv+4L0="; }; - nativeBuildInputs = [ + build-system = [ setuptools pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ click maison ruyaml @@ -51,24 +52,9 @@ buildPythonPackage rec { "yamlfix" ]; - disabledTests = [ - # AssertionError: assert ... Fixed <stdin> in... - "test_check_one_file_no_changes" - "test_config_parsing" - "test_corrects_code_from_stdin" - "test_corrects_one_file" - "test_corrects_three_files" - "test_empty_list_inline_comment_indentation" - "test_find_files" - "test_fix_code_converts_non_valid_false_booleans" - "test_ignores_correct_files" - "test_include_exclude_files" - "test_read_prefixed_environment_variables" - "test_section_whitelines" - "test_whitelines" - "test_sequence_style_env_enum_parsing" - "test_verbose_option" - "test_enforcing_flow_style_together_with_adjustable_newlines" + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" ]; meta = with lib; { diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e290bb2adf29c..2f5a52590c270 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -621,6 +621,7 @@ let tikzDevice = with pkgs; [ which texliveMedium ]; gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which xorg.xdpyinfo ]; + tfevents = [ pkgs.protobuf ]; rsvg = [ pkgs.librsvg.dev ]; ssh = with pkgs; [ libssh ]; s2 = [ pkgs.openssl.dev ]; diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index c5a3f641ff41a..dedda194c8280 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -111,6 +111,16 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/clr/commit/77c581a3ebd47b5e2908973b70adea66891159ee.patch"; hash = "sha256-auBedbd7rghlKav7A9V6l64J7VmtE9GizIdi5gWj+fs="; }) + (fetchpatch { + name = "extend-hip-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocm-hipamd/-/raw/d6d20142c37e1dff820950b16ff8f0523241d935/debian/patches/0026-extend-hip-isa-compatibility-check.patch"; + hash = "sha256-eG0ALZZQLRzD7zJueJFhi2emontmYy6xx8Rsm346nQI="; + }) + (fetchpatch { + name = "improve-rocclr-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocm-hipamd/-/raw/d6d20142c37e1dff820950b16ff8f0523241d935/debian/patches/0025-improve-rocclr-isa-compatibility-check.patch"; + hash = "sha256-8eowuRiOAdd9ucKv4Eg9FPU7c6367H3eP3fRAGfXc6Y="; + }) ]; postPatch = '' @@ -124,6 +134,10 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace hipamd/src/hip_embed_pch.sh \ --replace "\''$LLVM_DIR/bin/clang" "${clang}/bin/clang" + + # https://lists.debian.org/debian-ai/2024/02/msg00178.html + substituteInPlace rocclr/utils/flags.hpp \ + --replace-fail "HIP_USE_RUNTIME_UNBUNDLER, false" "HIP_USE_RUNTIME_UNBUNDLER, true" ''; postInstall = '' diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 567b5bee4f728..e74df33a7bfbf 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -194,7 +194,7 @@ in rec { }; rocblas = callPackage ./rocblas { - inherit rocblas rocmUpdateScript rocm-cmake clr tensile; + inherit rocmUpdateScript rocm-cmake clr tensile; inherit (llvm) openmp; stdenv = llvm.rocmClangStdenv; }; diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index 09bcf10429530..0b57cf6592cbf 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -116,6 +116,11 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; }) + (fetchpatch { + name = "Extend-MIOpen-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/MIOpen/commit/416088b534618bd669a765afce59cfc7197064c1.patch"; + hash = "sha256-OwONCA68y8s2GqtQj+OtotXwUXQ5jM8tpeM92iaD4MU="; + }) ]; outputs = [ diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix index cdbbd70440c20..a830883b4f82e 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/6/rccl/default.nix @@ -65,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: { # Really strange behavior, `#!/usr/bin/env perl` should work... substituteInPlace CMakeLists.txt \ - --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" + --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" \ + --replace-warn "-parallel-jobs=12" "-parallel-jobs=1" \ + --replace-warn "-parallel-jobs=16" "-parallel-jobs=1" ''; postInstall = lib.optionalString buildTests '' diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index 296167bb6f287..f93cceddd68af 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -1,7 +1,7 @@ -{ rocblas -, lib +{ lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , runCommand , cmake @@ -21,57 +21,26 @@ , buildBenchmarks ? false , tensileLogic ? "asm_full" , tensileCOVersion ? "default" -, tensileSepArch ? true -, tensileLazyLib ? true +# https://github.com/ROCm/Tensile/issues/1757 +# Allows gfx101* users to use rocBLAS normally. +# Turn the below two values to `true` after the fix has been cherry-picked +# into a release. Just backporting that single fix is not enough because it +# depends on some previous commits. +, tensileSepArch ? false +, tensileLazyLib ? false , tensileLibFormat ? "msgpack" -, gpuTargets ? [ "all" ] +# `gfx940`, `gfx941` are not present in this list because they are early +# engineering samples, and all final MI300 hardware are `gfx942`: +# https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2032791130 +# +# `gfx1012` is not present in this list because the ISA compatibility patches +# would force all `gfx101*` GPUs to run as `gfx1010`, so `gfx101*` GPUs will +# always try to use `gfx1010` code objects, hence building for `gfx1012` is +# useless: https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2076327152 +, gpuTargets ? [ "gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx942;gfx1010;gfx1030;gfx1100;gfx1101;gfx1102" ] }: -let - # NOTE: Update the default GPU targets on every update - gfx80 = (rocblas.override { - gpuTargets = [ - "gfx803" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx80"; }; - - gfx90 = (rocblas.override { - gpuTargets = [ - "gfx900" - "gfx906:xnack-" - "gfx908:xnack-" - "gfx90a:xnack+" - "gfx90a:xnack-" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx90"; }; - - gfx94 = (rocblas.override { - gpuTargets = [ - "gfx940" - "gfx941" - "gfx942" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx94"; }; - - gfx10 = (rocblas.override { - gpuTargets = [ - "gfx1010" - "gfx1012" - "gfx1030" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx10"; }; - - gfx11 = (rocblas.override { - gpuTargets = [ - "gfx1100" - "gfx1101" - "gfx1102" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx11"; }; - - # Unfortunately, we have to do two full builds, otherwise we get overlapping _fallback.dat files - fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; }; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; version = "6.0.2"; @@ -94,6 +63,8 @@ in stdenv.mkDerivation (finalAttrs: { cmake rocm-cmake clr + ] ++ lib.optionals buildTensile [ + tensile ]; buildInputs = [ @@ -114,80 +85,41 @@ in stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-Dpython=python3" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_C_COMPILER" "hipcc") + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "hipcc") + (lib.cmakeFeature "python" "python3") + (lib.cmakeFeature "AMDGPU_TARGETS" (lib.concatStringsSep ";" gpuTargets)) + (lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile) + (lib.cmakeBool "ROCM_SYMLINK_LIBS" false) + (lib.cmakeFeature "ROCBLAS_TENSILE_LIBRARY_DIR" "lib/rocblas") + (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests) + (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks) + # rocblas header files are not installed unless we set this + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ] ++ lib.optionals buildTensile [ - "-DVIRTUALENV_HOME_DIR=/build/source/tensile" - "-DTensile_TEST_LOCAL_PATH=/build/source/tensile" - "-DTensile_ROOT=/build/source/tensile/${python3.sitePackages}/Tensile" - "-DTensile_LOGIC=${tensileLogic}" - "-DTensile_CODE_OBJECT_VERSION=${tensileCOVersion}" - "-DTensile_SEPARATE_ARCHITECTURES=${if tensileSepArch then "ON" else "OFF"}" - "-DTensile_LAZY_LIBRARY_LOADING=${if tensileLazyLib then "ON" else "OFF"}" - "-DTensile_LIBRARY_FORMAT=${tensileLibFormat}" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" + (lib.cmakeBool "BUILD_WITH_PIP" false) + (lib.cmakeFeature "Tensile_LOGIC" tensileLogic) + (lib.cmakeFeature "Tensile_CODE_OBJECT_VERSION" tensileCOVersion) + (lib.cmakeBool "Tensile_SEPARATE_ARCHITECTURES" tensileSepArch) + (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib) + (lib.cmakeFeature "Tensile_LIBRARY_FORMAT" tensileLibFormat) + (lib.cmakeBool "Tensile_PRINT_DEBUG" true) ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${amd-blis}/include/blis") ]; - postPatch = lib.optionalString (finalAttrs.pname != "rocblas") '' - # Return early and install tensile files manually - substituteInPlace library/src/CMakeLists.txt \ - --replace "set_target_properties( TensileHost PROPERTIES OUTPUT_NAME" "return()''\nset_target_properties( TensileHost PROPERTIES OUTPUT_NAME" - '' + lib.optionalString (buildTensile && finalAttrs.pname == "rocblas") '' - # Link the prebuilt Tensile files - mkdir -p build/Tensile/library - - for path in ${gfx80} ${gfx90} ${gfx94} ${gfx10} ${gfx11} ${fallbacks}; do - ln -s $path/lib/rocblas/library/* build/Tensile/library - done - - unlink build/Tensile/library/TensileManifest.txt - '' + lib.optionalString buildTensile '' - # Tensile REALLY wants to write to the nix directory if we include it normally - cp -a ${tensile} tensile - chmod +w -R tensile - - # Rewrap Tensile - substituteInPlace tensile/bin/{.t*,.T*,*} \ - --replace "${tensile}" "/build/source/tensile" - - substituteInPlace CMakeLists.txt \ - --replace "include(virtualenv)" "" \ - --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" - ''; + patches = [ + (fetchpatch { + name = "Extend-rocBLAS-HIP-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/rocBLAS/commit/89b75ff9cc731f71f370fad90517395e117b03bb.patch"; + hash = "sha256-W/ohOOyNCcYYLOiQlPzsrTlNtCBdJpKVxO8s+4G7sjo="; + }) + ]; - postInstall = lib.optionalString (finalAttrs.pname == "rocblas") '' - ln -sf ${fallbacks}/lib/rocblas/library/TensileManifest.txt $out/lib/rocblas/library - '' + lib.optionalString (finalAttrs.pname != "rocblas") '' - mkdir -p $out/lib/rocblas/library - rm -rf $out/share - '' + lib.optionalString (finalAttrs.pname != "rocblas" && finalAttrs.pname != "rocblas-tensile-fallbacks") '' - rm Tensile/library/{TensileManifest.txt,*_fallback.dat} - mv Tensile/library/* $out/lib/rocblas/library - '' + lib.optionalString (finalAttrs.pname == "rocblas-tensile-fallbacks") '' - mv Tensile/library/{TensileManifest.txt,*_fallback.dat} $out/lib/rocblas/library - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - cp -a $out/bin/* $test/bin - rm $test/bin/*-bench || true - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/*-test || true - '' + lib.optionalString (buildTests || buildBenchmarks ) '' - rm -rf $out/bin + # Pass $NIX_BUILD_CORES to Tensile + postPatch = '' + substituteInPlace cmake/build-options.cmake \ + --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index 8c3d0cdc976db..f603b708265de 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , pkg-config , cmake @@ -42,6 +43,15 @@ stdenv.mkDerivation (finalAttrs: { libxml2 ]; + patches = [ + (fetchpatch { + name = "extend-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocr-runtime/-/raw/076026d43bbee7f816b81fea72f984213a9ff961/debian/patches/0004-extend-isa-compatibility-check.patch"; + hash = "sha256-cC030zVGS4kNXwaztv5cwfXfVwOldpLGV9iYgEfPEnY="; + stripLen = 1; + }) + ]; + postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/6/rocprim/default.nix index e9996cae61e78..3e8525655141e 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/6/rocprim/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , stdenv , fetchFromGitHub , rocmUpdateScript @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nWvq26qRPZ6Au1rc5cR74TKArcdUFg7O9djFi8SvMeM="; }; + patches = [ + (fetchpatch { + name = "arch-conversion-marco.patch"; + url = "https://salsa.debian.org/rocm-team/rocprim/-/raw/70c8aaee3cf545d92685f4ed9bf8f41e3d4d570c/debian/patches/arch-conversion-macro.patch"; + hash = "sha256-oXdmbCArOB5bKE8ozDFrSh4opbO+c4VI6PNhljeUSms="; + }) + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index af33fd789e846..6df403249e9aa 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , buildPythonPackage , pytestCheckHook @@ -34,6 +35,19 @@ buildPythonPackage rec { joblib ]; + patches = [ + (fetchpatch { + name = "Extend-Tensile-HIP-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/Tensile/commit/855cb15839849addb0816a6dde45772034a3e41f.patch"; + hash = "sha256-d+fVf/vz+sxGqJ96vuxe0jRMgbC5K6j5FQ5SJ1e3Sl8="; + }) + (fetchpatch { + name = "Don-t-copy-file-twice-in-copyStaticFiles.patch"; + url = "https://github.com/GZGavinZhao/Tensile/commit/9e14d5a00a096bddac605910a0e4dfb4c35bb0d5.patch"; + hash = "sha256-gOzjJyD1K056OFQ+hK5nbUeBhxLTIgQLoT+0K12SypI="; + }) + ]; + doCheck = false; # Too many errors, not sure how to set this up properly nativeCheckInputs = [ @@ -42,9 +56,9 @@ buildPythonPackage rec { rocminfo ]; - preCheck = '' - export ROCM_PATH=${rocminfo} - ''; + env = { + ROCM_PATH = rocminfo; + }; pythonImportsCheck = [ "Tensile" ]; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 09a2cee47bba9..1d02230ec96bd 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-g6UNFE1EEo40pqdTAmidG4/A+cQ89UZNp++B+q6AzeA="; + hash = "sha256-PqiFx1Bzv4cYwnlr1BDPGiumUUneT5sq64eFFcYPmaA="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 1c781b0f42f44..2d247e3f7d419 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -1,40 +1,48 @@ -{ lib, stdenv, makeWrapper, fetchurl, jre }: +{ lib +, stdenv +, makeWrapper +, fetchurl +, jre +}: -let +stdenv.mkDerivation (finalAttrs: { pname = "allure"; version = "2.29.0"; -in -stdenv.mkDerivation rec { - inherit pname version; - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ jre ]; src = fetchurl { - url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-ohcVXblnCrNs57BWmz+wUwplfIG9fOW8l08LuipNhPs="; + url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; + hash = "sha256-ohcVXblnCrNs57BWmz+wUwplfIG9fOW8l08LuipNhPs="; }; + dontConfigure = true; dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + installPhase = '' - mkdir -p "$out/share" + runHook preInstall + + mkdir -p $out/{bin,share} cd "$out/share" tar xvzf $src - mkdir -p "$out/bin" - makeWrapper $out/share/${pname}-${version}/bin/allure $out/bin/${pname} \ + makeWrapper $out/share/${finalAttrs.meta.mainProgram}-${finalAttrs.version}/bin/allure $out/bin/${finalAttrs.meta.mainProgram} \ --prefix PATH : "${jre}/bin" - ''; - dontCheck = true; + runHook postInstall + ''; - meta = with lib; { + meta = { homepage = "https://docs.qameta.io/allure/"; description = "Allure Report is a flexible, lightweight multi-language test reporting tool."; + longDescription = '' + Allure Report is a flexible, lightweight multi-language test reporting + tool providing clear graphical reports and allowing everyone involved + in the development process to extract the maximum of information from + the everyday testing process. + ''; + license = lib.licenses.asl20; mainProgram = "allure"; - longDescription = "Allure Report is a flexible, lightweight multi-language test reporting tool. It provides clear graphical reports and allows everyone involved in the development process to extract the maximum of information from the everyday testing process"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + maintainers = with lib.maintainers; [ happysalada ]; }; -} - +}) diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 7d36f43232835..b0165266b1a05 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,10 +1,15 @@ { lib -, mkDerivation +, stdenv +, binutils , cmake -, elfutils , extra-cmake-modules +, patchelfUnstable +, wrapQtAppsHook +, elfutils , fetchFromGitHub +, fetchpatch , kconfigwidgets +, kddockwidgets , ki18n , kio , kitemmodels @@ -12,33 +17,48 @@ , kparts , kwindowsystem , libelf +, linuxPackages , qtbase +, qtsvg +, rustc-demangle +, syntax-highlighting , threadweaver -, qtx11extras , zstd -, kddockwidgets -, rustc-demangle }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hotspot"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "refs/tags/v${version}"; - hash = "sha256-DW4R7+rnonmEMbCkNS7TGodw+3mEyHl6OlFK3kbG5HM="; + hash = "sha256-FJkDPWqNwoWg/15tvMnwke7PVtWVuqT0gtJBFQE0qZ4="; fetchSubmodules = true; }; + patches = [ + # Backport stuck UI bug fix + # FIXME: remove in next update + (fetchpatch { + url = "https://github.com/KDAB/hotspot/commit/7639dee8617dba9b88182c7ff4887e8d3714ac98.patch"; + hash = "sha256-aAo9uEy+MBztMhnC5jB08moZBeRCENU22R39pqSBXOY="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules + # stable patchelf corrupts the binary + patchelfUnstable + wrapQtAppsHook ]; + buildInputs = [ (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h kconfigwidgets + kddockwidgets ki18n kio kitemmodels @@ -47,25 +67,24 @@ mkDerivation rec { kwindowsystem libelf qtbase + qtsvg + rustc-demangle + syntax-highlighting threadweaver - qtx11extras zstd - kddockwidgets - rustc-demangle ]; - # hotspot checks for the presence of third party libraries' - # git directory to give a nice warning when you forgot to clone - # submodules; but Nix clones them and removes .git (for reproducibility). - # So we need to fake their existence here. - postPatch = '' - mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git - ''; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ rustc-demangle ]}" + "--suffix PATH : ${lib.makeBinPath [ linuxPackages.perf binutils ]}" ]; + preFixup = '' + patchelf \ + --add-rpath ${lib.makeLibraryPath [ rustc-demangle ]} \ + --add-needed librustc_demangle.so \ + $out/libexec/hotspot-perfparser + ''; + meta = with lib; { description = "A GUI for Linux perf"; mainProgram = "hotspot"; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index a5c9c85047687..08beabc6f74a9 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-r59iW9Bstek1yOZKwBg08jShbinTPXL2RSt6fvhPFCQ="; + hash = "sha256-G1SblnbT0goOsefEy1QbCkp32JKs0usfKMWDsn3k7/M="; }; - cargoHash = "sha256-ZM2Ytu8OSeGQGY0+eOx7/5BrS6ANnpGp8TywsrxbJvY="; + cargoHash = "sha256-z2Kgo8i6fk3sfX6bCBmyqIfFSw75v4NhnUFSBKJQwXs="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/coder/update.sh b/pkgs/development/tools/coder/update.sh index 335c20dd55a4a..60e9a97af2217 100755 --- a/pkgs/development/tools/coder/update.sh +++ b/pkgs/development/tools/coder/update.sh @@ -5,11 +5,10 @@ set -eu -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -LATEST_STABLE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail -sSL https://api.github.com/repos/coder/coder/releases | jq -r 'map(select(.prerelease == false)) | sort_by(.tag_name | sub("^v"; "") | split(".") | map(tonumber)) | .[-1].tag_name | sub("^v"; "")') - -# Fetch the latest mainline version -LATEST_MAINLINE_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/coder/coder/releases | jq -r '.[0].tag_name') -LATEST_MAINLINE_VERSION=$(echo ${LATEST_MAINLINE_TAG} | sed 's/^v//') +# The released tagged as "latest" is always stable. +LATEST_STABLE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail -sSL https://api.github.com/repos/coder/coder/releases/latest | jq -r '.tag_name | sub("^v"; "")') +# The highest version that is not a pre-release is the latest mainline version. +LATEST_MAINLINE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail -sSL https://api.github.com/repos/coder/coder/releases | jq -r 'map(select(.prerelease == false)) | sort_by(.tag_name | sub("^v"; "") | split(".") | map(tonumber)) | .[-1].tag_name | sub("^v"; "")') # Define the platforms declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz" diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 5fe017565f126..d44aedf372bfe 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-1jMVb1Hip7ljmt4WtFg3Qa2/rse2sjISTe3SUS5UCTo="; + hash = "sha256-TjBBKFWyqrqeiddAn5SDiLZ4HirWC4vYwIEA43IFSxY="; }; - vendorHash = "sha256-Yw5p2mTTkYvRjeuF9owirohyClSS3j1gKVg8Ma2NIa8="; + vendorHash = "sha256-wQBeKPT/MSTd89UmtwKH7uX3sv7x1N5MXMKo/DZRmBk="; ldflags = [ "-s" diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index cf21789b126e8..bf9ffa48e439b 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-NbtHBlVavlVw1CH+Gy4VMukqUgQ8EFB2+8hU0hTFnH0="; + hash = "sha256-uFQm7VRxFozV/I1tywey5ljWqzt08aShVjlwUT3oz5w="; }; vendorHash = "sha256-T4afeclCWldFJTzk08Ku8VPnXr/Gz0Fpb7G9YrK/iro="; diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index 3a74e491f0e5d..7f74d8665a80e 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -36,7 +36,7 @@ let srcIcon = fetchurl { url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png"; - hash = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE="; + hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI="; }; desktopItems = makeDesktopItem { diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ad1ea3f61ab49..849c8054b0020 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.3.0"; + version = "5.4.1"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-TleO28Q6JaOz1OAJKbvLhN99a841FEhHL15NTMhS1Oc="; + hash = "sha256-zt+/CKIIaZxfjfMu9L4/bDc5MmaqeEp3MI/m++GQoEc="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-inCBDIVdvkEdDJEwX7vdoWANk+f01VxhBGPKxrjR6Ao="; + vendorHash = "sha256-YxkZ2YlkvMihTYi34lfwpUrmGa4LrrWsP2cpJZY/41A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix index 33371bee93737..625683196923e 100644 --- a/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "strace-analyzer"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "wookietreiber"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wx0/Jb2uaS1qdRQymfE00IEOyfgLtD4lXYasaJgcoxo="; + sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek="; }; - cargoHash = "sha256-3OS3LEEk58+IJDQrgwo+BJq6hblojk22QxDtZY5ofA4="; + cargoHash = "sha256-t1BFc5cNOQJIbufFH2hHI4f7SMrZ5mwVODXukdbHf3M="; nativeCheckInputs = [ strace ]; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index cd73494140da1..c2dd4cb8e5c61 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.24.2"; + version = "19.24.3"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xr6ULlOBmRF1s/oge+AnANLGkP30U6T1tgoBvnCLf/4="; + hash = "sha256-sgtMK1ccf1rX5ZdQpTRClxx112eOFV+BWyTIpMlzLVA="; }; vendorHash = "sha256-iSbQn86b1xZwlyo5nKYI7LEH5AyWCw7MLgD3Q0mtFfk="; diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/development/tools/redisinsight/default.nix index 5c4609e248d85..ffb5d9c547fda 100644 --- a/pkgs/development/tools/redisinsight/default.nix +++ b/pkgs/development/tools/redisinsight/default.nix @@ -1,70 +1,84 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, fixup_yarn_lock -, yarn -, nodejs_18 -, python3 -, fetchYarnDeps -, electron -, desktopToDarwinBundle -, nest-cli -, libsass -, buildPackages -, pkg-config -, sqlite -, xdg-utils +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + fixup-yarn-lock, + yarn, + nodejs_18, + python3, + fetchYarnDeps, + electron, + nest-cli, + libsass, + buildPackages, + pkg-config, + sqlite, + xdg-utils, }: + let nodejs = nodejs_18; in stdenv.mkDerivation (finalAttrs: { - pname = "redisinsight-electron"; + pname = "redisinsight"; version = "2.32"; src = fetchFromGitHub { owner = "RedisInsight"; repo = "RedisInsight"; - rev = "${finalAttrs.version}"; + rev = finalAttrs.version; hash = "sha256-esaH10AyEooym/62F5LJL7oP5UmD6T2UX8g/9QniL9s="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - sha256 = "NHKttywAaWAYkciGzYCnm1speHrWsv1t+dxL1DZgM7o="; + hash = "sha256-NHKttywAaWAYkciGzYCnm1speHrWsv1t+dxL1DZgM7o="; }; feOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/redisinsight/yarn.lock"; - sha256 = "1S1KNUOtmywQ0eyqVS2oRlhpjcL9eps8CR7AtC9ujSU="; + hash = "sha256-1S1KNUOtmywQ0eyqVS2oRlhpjcL9eps8CR7AtC9ujSU="; }; apiOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock"; - sha256 = "P99+1Dhdg/vznC2KepPrVGNlrofJFydXkZVxgwprIx4="; + hash = "sha256-P99+1Dhdg/vznC2KepPrVGNlrofJFydXkZVxgwprIx4="; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper python3 nest-cli libsass pkg-config ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; - - buildInputs = [ sqlite xdg-utils ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + makeWrapper + python3 + nest-cli + libsass + pkg-config + copyDesktopItems + ]; + + buildInputs = [ + sqlite + xdg-utils + ]; configurePhase = '' runHook preConfigure export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - yarn config --offline set yarn-offline-mirror $feOfflineCache - fixup_yarn_lock redisinsight/yarn.lock + yarn config --offline set yarn-offline-mirror ${finalAttrs.feOfflineCache} + fixup-yarn-lock redisinsight/yarn.lock yarn --offline --cwd redisinsight/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - yarn config --offline set yarn-offline-mirror $apiOfflineCache - fixup_yarn_lock redisinsight/api/yarn.lock + yarn config --offline set yarn-offline-mirror ${finalAttrs.apiOfflineCache} + fixup-yarn-lock redisinsight/api/yarn.lock yarn --offline --cwd redisinsight/api/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ @@ -76,29 +90,32 @@ stdenv.mkDerivation (finalAttrs: { ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" export npm_config_nodedir=${nodejs} - pushd redisinsight # Build the sqlite3 package. + pushd redisinsight npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} sqlite3 popd + # Build node-sass + LIBSASS_EXT=auto npm rebuild --verbose node-sass + substituteInPlace redisinsight/api/config/default.ts \ - --replace "process['resourcesPath']" "\"$out/share/redisinsight\"" \ + --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" \ + + # has irrelevant files + rm -r resources/app runHook postConfigure ''; buildPhase = '' runHook preBuild - yarn config --offline set yarn-offline-mirror $offlineCache - pushd node_modules/node-sass - LIBSASS_EXT=auto yarn run build --offline - popd + yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} yarn --offline build:prod yarn --offline electron-builder \ - --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ + --dir \ -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} @@ -108,47 +125,47 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - # resources - mkdir -p "$out/share/redisinsight" - mkdir -p "$out/share/redisinsight/static/resources/plugins" - mkdir -p "$out/share/redisinsight/default" + mkdir -p "$out/share/redisinsight"/{app,defaults,static/plugins,static/resources/plugins} - cp -r release/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/{app.asar,app.asar.unpacked} $out/share/redisinsight/ - cp -r resources/ $out/share/redisinsight + cp -r release/*-unpacked/{locales,resources{,.pak}} "$out/share/redisinsight/app" + mv "$out/share/redisinsight/app/resources/resources" "$out/share/redisinsight" # icons - for icon in "$out/resources/icons/*.png"; do + for icon in "$out/share/redisinsight/resources/icons"/*.png; do mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/redisinsight.png" done - ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications" - makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \ - --add-flags "$out/share/redisinsight/app.asar" \ + --add-flags "$out/share/redisinsight/app/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --chdir "$out/share/redisinsight" \ - --argv0 "$out/share/redisinsight/app.asar" + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --inherit-argv0 runHook postInstall ''; - desktopItem = makeDesktopItem { - name = "redisinsight"; - exec = "redisinsight %u"; - icon = "redisinsight"; - desktopName = "RedisInsight"; - genericName = "RedisInsight Redis Client"; - comment = finalAttrs.meta.description; - categories = [ "Development" ]; - startupWMClass = "redisinsight"; - }; - - meta = with lib; { + desktopItems = [ + (makeDesktopItem { + name = "redisinsight"; + exec = "redisinsight %u"; + icon = "redisinsight"; + desktopName = "RedisInsight"; + genericName = "RedisInsight Redis Client"; + comment = finalAttrs.meta.description; + categories = [ "Development" ]; + startupWMClass = "redisinsight"; + }) + ]; + + meta = { description = "RedisInsight Redis client powered by Electron"; homepage = "https://github.com/RedisInsight/RedisInsight"; - license = licenses.sspl; - maintainers = with maintainers; [ gmemstr ]; - platforms = [ "x86_64-linux" ]; + #license = licenses.sspl; + maintainers = with lib.maintainers; [ + gmemstr + tomasajt + ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index 4ad07b579347b..8ce7e006dce76 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -4,6 +4,7 @@ , pkg-config , openssl , stdenv +, CoreServices , Security , SystemConfiguration }: @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index b70f742772c0e..236fd2f3e0252 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-LCyTbOSSz3O53hZmOPcK+tB5LNZLE4uwfOZrwJZuebc="; + hash = "sha256-FIBMwLgLLgf6m/ciSlYiQ46HHf1ux0QY4RkoidlaEjs="; }; - cargoHash = "sha256-apT60W4lUCMsRvuzGkY8AkA8m8e7ESGGnmOpyv5Ca1I="; + cargoHash = "sha256-MmHwaodr/FLxCucfCkV/Cuflyu8902kpEPuTCKkchNU="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 421559b347be3..ad3827bc74941 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.21"; + version = "0.14.22"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-d5qgljNuEfh9kYQU+jP4tgyly6i7hETFC5tEY67Yq8g="; + hash = "sha256-04CRMlH31MzYpE2pRUrbAvSojbxan4ktqX9J/zjeTkk="; }; - cargoHash = "sha256-u1cayvVatGg03Q3xShC/0ymE8EGHyYFrZD3Q8UD8Mm8="; + cargoHash = "sha256-Nutx3Dvvh7qvgAtengWw0kJve4Ent9y7OXgovUZWTLE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index bd08268d59287..736d546ff2aae 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.32"; + version = "0.2.34"; src = fetchCrate { inherit pname version; - hash = "sha256-4pMIL/wru9uE8Uyp/qvmo6IJxFcB0HLUHRSSV6DoI3g="; + hash = "sha256-+EzI17pnqO19A+KW1AsHtBpYZq1aENA03RkK03j31LI="; }; - cargoHash = "sha256-N1NZONY8y88diAbWn+UaSHGpd4r7naxFWVmCyJkL3tQ="; + cargoHash = "sha256-VIfT7cXrXBE9mfHpDCI3diSD9ToRPH6UUP7ZOWvumbU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 4fa64e779282e..9e24440fb0373 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -29,24 +29,22 @@ dependencies = [ [[package]] name = "age" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d55a4d912c80a92762ffd1c884065f3f9646467d22c95390e824a0ff7def472" +checksum = "edeef7d7b199195a2d7d7a8155d2d04aee736e60c5c7bdd7097d115369a8817d" dependencies = [ "age-core", - "base64 0.13.1", + "base64 0.21.7", "bech32", "chacha20poly1305", "cookie-factory", - "hkdf", "hmac", "i18n-embed", "i18n-embed-fl", "lazy_static", "nom", "pin-project", - "rand 0.7.3", - "rand 0.8.5", + "rand", "rust-embed", "scrypt", "sha2", @@ -57,17 +55,17 @@ dependencies = [ [[package]] name = "age-core" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d2e815ac879dc23c1139e720d21c6cd4d1276345c772587285d965a69b8f32" +checksum = "a5f11899bc2bbddd135edbc30c36b1924fa59d0746bb45beb5933fafe3fe509b" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "chacha20poly1305", "cookie-factory", "hkdf", "io_tee", "nom", - "rand 0.8.5", + "rand", "secrecy", "sha2", ] @@ -234,17 +232,6 @@ dependencies = [ ] [[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -379,12 +366,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" [[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] name = "cpufeatures" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -460,50 +441,29 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", "zeroize", ] [[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "fnv", - "ident_case", "proc-macro2", "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -526,22 +486,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] -name = "decompress" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67605f4868a37e8a9c50003a866a6896104602d5d7ddf7e8a7f398ec97e44ab3" -dependencies = [ - "derive_builder", - "flate2", - "infer", - "lazy_static", - "regex", - "tar", - "thiserror", - "zstd 0.12.4", -] - -[[package]] name = "deranged" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -551,37 +495,6 @@ dependencies = [ ] [[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] name = "deunicode" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -601,15 +514,6 @@ dependencies = [ [[package]] name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" @@ -689,6 +593,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] +name = "fiat-crypto" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" + +[[package]] name = "filetime" version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -764,12 +674,6 @@ dependencies = [ ] [[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -819,24 +723,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -917,7 +810,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -945,9 +838,9 @@ dependencies = [ [[package]] name = "i18n-embed" -version = "0.13.9" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" dependencies = [ "arc-swap", "fluent", @@ -966,9 +859,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" dependencies = [ "dashmap", "find-crate", @@ -999,12 +892,6 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] name = "idna" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1038,15 +925,6 @@ dependencies = [ ] [[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - -[[package]] name = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1266,7 +1144,7 @@ dependencies = [ "tracing", "unscanny", "ureq", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -1291,15 +1169,6 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1391,11 +1260,12 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest 0.10.7", + "digest", + "hmac", ] [[package]] @@ -1465,6 +1335,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + +[[package]] name = "poly1305" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1574,36 +1450,13 @@ checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1613,16 +1466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1631,16 +1475,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1711,7 +1546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom", "libc", "spin", "untrusted", @@ -1720,9 +1555,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1731,9 +1566,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" dependencies = [ "proc-macro2", "quote", @@ -1744,9 +1579,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" dependencies = [ "sha2", "walkdir", @@ -1765,6 +1600,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] name = "rustix" version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1801,7 +1645,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.31.0" +version = "0.33.0" dependencies = [ "age", "anyhow", @@ -1812,7 +1656,6 @@ dependencies = [ "console", "ctrlc", "curl", - "decompress", "dialoguer", "dotenvy", "flate2", @@ -1826,10 +1669,8 @@ dependencies = [ "insta-cmd", "junction", "license", - "memchr", "minijinja", "monotrail-utils", - "nix", "once_cell", "pathdiff", "pep440_rs", @@ -1844,10 +1685,9 @@ dependencies = [ "shlex", "slug", "static_vcruntime", - "sysinfo", "tar", "tempfile", - "toml_edit", + "toml_edit 0.22.9", "url", "walkdir", "which", @@ -1855,7 +1695,7 @@ dependencies = [ "winreg", "xattr", "zip", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -1899,11 +1739,10 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "hmac", "pbkdf2", "salsa20", "sha2", @@ -1955,6 +1794,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] name = "serde" version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2002,7 +1847,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -2093,7 +1938,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote", "unicode-ident", ] @@ -2109,20 +1953,6 @@ dependencies = [ ] [[package]] -name = "sysinfo" -version = "0.29.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - -[[package]] name = "tar" version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2255,7 +2085,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -2277,7 +2107,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.37", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.6.5", ] [[package]] @@ -2432,12 +2273,6 @@ dependencies = [ ] [[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" - -[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2461,12 +2296,6 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -2717,6 +2546,15 @@ dependencies = [ ] [[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] name = "winreg" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2728,12 +2566,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] @@ -2813,30 +2652,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - -[[package]] -name = "zstd" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 7.0.0", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index ac748516386ea..a69e96e702a48 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.31.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-hPfMKp5FUbIKKKFfoS/pxseWmhqW8UOts7DOcRzgHWU="; + hash = "sha256-sgA+Tp4Qysd07+1iNDgn9Hw0nDN8l6/fD41rE5QqWzY="; }; cargoLock = { @@ -61,6 +61,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_add_flask" "--skip=test_add_from_find_links" "--skip=test_autosync_remember" + "--skip=test_basic_list" "--skip=test_basic_tool_behavior" "--skip=test_config_empty" "--skip=test_config_get_set_multiple" @@ -74,6 +75,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_init_lib" "--skip=test_init_script" "--skip=test_lint_and_format" + "--skip=test_list_not_rye_managed" "--skip=test_publish_outside_project" "--skip=test_version" ]; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index b464bee86e067..0bd600423b31d 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.26.1"; + version = "0.27.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-0imHwZNyhJXFai1J5tHqnQ6Ta10nETQ5TILGH0bHc8Y="; + sha256 = "sha256-NbVSFYv3nyEjSf0bFajcMaoWP2bS0EfJT8tDddjS7jg="; }; - cargoHash = "sha256-Lm3agCnxDxcj7op17uiokK8Y790oMxwHJStvP/9DsI0="; + cargoHash = "sha256-e3oQUFtgdjqPiB2YpmqnFUG2scmYJhLSpUaw0W6RxIk="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index b9fa98a228ce9..324218082bc3d 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { description = "A command line utility to work with Sentry"; mainProgram = "sentry-cli"; changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ rizary loewenheim ]; + maintainers = with maintainers; [ rizary ]; }; } diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 3ef4b44953d15..84fe6d4359364 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-cFHcfpsHSDlR82PtZ0leRDpvCD6nw0Qdb3PsYKMnosA="; + sha256 = "sha256-TjuOsF4LFqQGx4j5j/Er97MNhVm72qlvGYZvA5vuXs8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 512bbaa3e8ea5..52b20dee8b153 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.4"; + version = "1.1.6"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-dBiwVO4WreVyIlbJVEyPZj46Dy/3W49mXdo7CiQWiAo="; + hash = "sha256-ffEu37NAT/74l1Kkr+e1hAkawbSeZlTQcHbqg/7jYOQ="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-XsyjcqKZ667iVTVsOKjaD9iORze0Zs8ZHiDYvuXQ07A="; + hash = "sha256-qKWtazbPfPjDxLChZ0FVyV2qQhPUHwF4wpHrFdCRlYg="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-M6MoYPNCGBP0KuNnv8cOnm47FJyxI6MXzsX+FvHxAEA="; + hash = "sha256-a3ol9tkKyVa6MoBq5cscRLAS5o8OCcIUX43opKtePos="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-9H/1qR6ZHHy5/abq2SjoUbUX6Y92/8MQem2inuWhVC8="; + hash = "sha256-IzjuIPXljt8EStcRdGj55SWIpqJdGQeVZVAS5u9sW+Y="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/games/doom-ports/chocolate-doom/default.nix b/pkgs/games/doom-ports/chocolate-doom/default.nix index 30fe2010b022f..4bd3944a42241 100644 --- a/pkgs/games/doom-ports/chocolate-doom/default.nix +++ b/pkgs/games/doom-ports/chocolate-doom/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # darwin times out - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/doom-ports/dhewm3/default.nix b/pkgs/games/doom-ports/dhewm3/default.nix index 9a187c76820d0..19cf87110caa6 100644 --- a/pkgs/games/doom-ports/dhewm3/default.nix +++ b/pkgs/games/doom-ports/dhewm3/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Doom 3 port to SDL"; mainProgram = "dhewm3"; license = lib.licenses.gpl3; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/games/doom-ports/doomseeker/default.nix index c3d3db1d254a7..11aec59bf4db2 100644 --- a/pkgs/games/doom-ports/doomseeker/default.nix +++ b/pkgs/games/doom-ports/doomseeker/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { mainProgram = "doomseeker"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.MP2E ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/doom-ports/eternity-engine/default.nix b/pkgs/games/doom-ports/eternity-engine/default.nix index 7afef923e08b9..5239cae4d8ccb 100644 --- a/pkgs/games/doom-ports/eternity-engine/default.nix +++ b/pkgs/games/doom-ports/eternity-engine/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { mainProgram = "eternity"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/doom-ports/odamex/default.nix b/pkgs/games/doom-ports/odamex/default.nix index 5fc1b57be5dcd..cc1862b0b3715 100644 --- a/pkgs/games/doom-ports/odamex/default.nix +++ b/pkgs/games/doom-ports/odamex/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "A client/server port for playing old-school Doom online"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix index c5d883fcb556b..665bef3bd4a19 100644 --- a/pkgs/games/doom-ports/zandronum/alpha/default.nix +++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainers = with maintainers; [ lassulus MP2E ]; + maintainers = with maintainers; [ lassulus ]; license = licenses.sleepycat; platforms = platforms.linux; }; diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix index c8e1927aafed6..17c9b473870a6 100644 --- a/pkgs/games/doom-ports/zandronum/default.nix +++ b/pkgs/games/doom-ports/zandronum/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; mainProgram = "zandronum-server"; - maintainers = with maintainers; [ lassulus MP2E ]; + maintainers = with maintainers; [ lassulus ]; license = licenses.sleepycat; platforms = platforms.linux; }; diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix index 8e8341997a2b0..996e75c885389 100644 --- a/pkgs/kde/frameworks/kdoctools/default.nix +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -8,9 +8,6 @@ mkKdeDerivation { pname = "kdoctools"; - # lots of self-references, the output is pretty small (~5MB), not worth trying to untangle - outputs = ["out"]; - # Perl could be used both at build time and at runtime. extraNativeBuildInputs = [perl perlPackages.URI]; extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 0b2ebd8ace7f7..975d2e4af93ab 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -91,7 +91,7 @@ in defaultArgs = { inherit version src; - outputs = ["out" "dev"]; + outputs = ["out" "dev" "devtools"]; nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; buildInputs = [qt6.qtbase] ++ extraBuildInputs; diff --git a/pkgs/kde/lib/move-dev-hook.sh b/pkgs/kde/lib/move-dev-hook.sh index da5770e1bba14..a49cb91d22f3c 100644 --- a/pkgs/kde/lib/move-dev-hook.sh +++ b/pkgs/kde/lib/move-dev-hook.sh @@ -2,7 +2,10 @@ # shellcheck disable=SC2154 moveKF6DevTools() { - moveToOutput "${qtPluginPrefix}/designer" "${!outputDev}" + if [ -n "$devtools" ]; then + mkdir -p "$devtools" + moveToOutput "${qtPluginPrefix}/designer" "$devtools" + fi } postInstallHooks+=('moveKF6DevTools') diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index 4ec52aba07936..fc237f97a803a 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -17,7 +17,8 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [mpv qtdeclarative]; + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [mpv]; meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; } diff --git a/pkgs/kde/plasma/breeze-grub/default.nix b/pkgs/kde/plasma/breeze-grub/default.nix index a5fe01b4cad7e..5dd3d199e44a6 100644 --- a/pkgs/kde/plasma/breeze-grub/default.nix +++ b/pkgs/kde/plasma/breeze-grub/default.nix @@ -6,6 +6,8 @@ mkKdeDerivation { nativeBuildInputs = []; buildInputs = []; + outputs = ["out"]; + installPhase = '' runHook preInstall diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 65a04839096f8..4fcee6fa9b10c 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { pname = "alock"; - version = "unstable-2017-07-20"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "alock"; - rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; - sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8="; + rev = "refs/tags/v${version}"; + hash = "sha256-xfPhsXZrTlEqea75SvacDfjM9o21MTudrqfNN9xtdcg="; }; PAM_DEFAULT_SERVICE = "login"; @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { pam libgcrypt libXrender imlib2 ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "^[^.]+$"; # ignore versions without a dot + }; + meta = with lib; { homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index a5b7154e63d6c..dbdf6a24951b8 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -310,12 +310,18 @@ in rec { fzf-tmux-url = mkTmuxPlugin { pluginName = "fzf-tmux-url"; rtpFilePath = "fzf-url.tmux"; - version = "unstable-2021-12-27"; + version = "unstable-2024-04-14"; src = fetchFromGitHub { owner = "wfxr"; repo = "tmux-fzf-url"; - rev = "1241fc5682850fe41812cad81c76541674ee305b"; - sha256 = "1270c5nfvgsdajgfahlacqfb5xwg4hwfrciiy0v03d50vg4h0kdi"; + rev = "28ed7ce3c73a328d8463d4f4aaa6ccb851e520fa"; + hash = "sha256-tl0SjG/CeolrN7OIHj6MgkB9lFmFgEuJevsSuwVs+78="; + }; + meta = with lib; { + homepage = "https://github.com/wfxr/tmux-fzf-url"; + description = "Quickly open urls on your terminal screen!"; + license = licenses.mit; + platforms = platforms.unix; }; }; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 54250001d9eb0..1b7949dcb124d 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -3,7 +3,7 @@ let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; - # TODO(alexfmpe): Find out how to validate the .xip signature in Linux + unxip = if stdenv.buildPlatform.isDarwin then '' open -W ${xip} @@ -14,7 +14,9 @@ let requireXcode = version: sha256: rm -rf ${xip} pbzx -n Content | cpio -i rm Content Metadata + rcodesign verify Xcode.app/Contents/MacOS/Xcode ''; + app = requireFile rec { name = "Xcode.app"; url = "https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_${version}/${xip}"; @@ -83,4 +85,3 @@ in lib.makeExtensible (self: { xcode_15_1 = requireXcode "15.1" "sha256-0djqoSamU87rCpjo50Un3cFg9wKf+pSczRko6uumGM0="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) - diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix index 3204bd7dcf277..5efc80357d8f1 100644 --- a/pkgs/os-specific/linux/below/default.nix +++ b/pkgs/os-specific/linux/below/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "below"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "below"; rev = "v${version}"; - sha256 = "sha256-2mZBpvLPY6yrEAvB1YlFuaXJlmmNuZqhu3xWADNHbx0="; + sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ="; }; - cargoHash = "sha256-cTNxWCd4YH5VuZh0GRfBNtHmLqCQ75uyHqROkv1jbRA="; + cargoHash = "sha256-y2fNypA0MrCdUI/K6QrZWw/5mkYafj2s6jrGHU2zGXw="; prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; postInstall = '' diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix index d025fd5e229a7..106bcf71cd98c 100644 --- a/pkgs/os-specific/linux/drbd/driver.nix +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { # 6.4 and newer provide a in-tree version of the handshake module https://www.kernel.org/doc/html/v6.4/networking/tls-handshake.html installPhase = '' runHook preInstall - install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd - install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd - install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd - install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 + install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 + install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 + install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 ${lib.optionalString (lib.versionOlder kernel.version "6.4") '' - install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 ''} runHook postInstall ''; @@ -41,9 +41,13 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'SHELL=/bin/bash' 'SHELL=${builtins.getEnv "SHELL"}' ''; + # builder.pl had complained about the same file (drbd.ko.xz) provided by two different packages + # builder.pl also had complained about different permissions between the files from the two packages + # The compression is required because the kernel has the CONFIG_MODULE_COMPRESS_XZ option enabled postFixup = '' - for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd/*.ko; do + for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9/*.ko; do xz --compress -6 --threads=0 $ko + chmod 0444 $ko.xz done ''; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 02ca3d30d238c..11791a664c8bb 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.09"; + version = "1.10"; src = fetchFromGitHub { owner = "google"; repo = "google-authenticator-libpam"; rev = version; - hash = "sha256-DS0h6FWMNKnSSj039bH6iyWrERa5M7LBSkbyig6pyxY="; + hash = "sha256-KEfwQeJIuRF+S3gPn+maDb8Fu0FRXLs2/Nlbjj2d3AE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 2b4628762f105..711a14845df76 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ flexiondotorg MP2E ]; + maintainers = with maintainers; [ flexiondotorg ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 37366183dba05..bfc905175084c 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -16,7 +16,7 @@ let baserow_premium = self.buildPythonPackage rec { pname = "baserow_premium"; version = "1.12.1"; - foramt = "setuptools"; + format = "setuptools"; src = fetchFromGitLab { owner = "bramw"; diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index 23c56df62a46a..e3a142983ad7a 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "guacamole-client"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; - hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4="; + hash = "sha256-QmcwfzYAZjcj8kr5LVlumcg1lCUxUTUFKkLUUflSkgA="; }; dontUnpack = true; diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 58628b48a5b85..1b9623eab22f6 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; rev = finalAttrs.version; - hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY="; + hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY="; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3bd9616da23e8..0f90061ad61f0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -388,6 +388,13 @@ let rev = "refs/tags/${version}"; hash = "sha256-vi5f4V0nPb9K3nwdmwMDoNE85Or6haOWjMY4d/2Fj2s="; }; + dependencies = with self; [ + aiohttp + async-timeout + gql + python-dateutil + websockets + ]; }); pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 3187346c07ebd..066265e162cc5 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-nsXIy/JpI7nDu40dUGPosMAOtFt/OzfSWyxD6JuKA+s="; + hash = "sha256-FOut1L4dyPvR1SSQLspA8PakQPewwTP2SgbfyDfWp3c="; rev = "v${version}"; }; - vendorHash = "sha256-KtqXhi8VwH1aZt/vLHuug5MJLchs0t4tqA7PIZUVPHQ="; + vendorHash = "sha256-GIMba/XlINwJilRo5Oi2j7HJJTQQpMOa2kPH17T/vLU="; nativeBuildInputs = [ pkg-config gobject-introspection ]; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index bb7930213ecf2..bfe3f14f51b42 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-bqWPkD8Pzlryv5wG65cEJNLoFVsu6yCymUgyfhrQR0M="; + sha256 = "sha256-L6fdR8j60x2YL5S5g6THN1LL+dy6kzHijjNR47Kuylo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 22ad9d0d94294..77fac1c365f73 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.7"; + version = "3.0.0"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-I+jmMtqWadWfT7nk2D9im6C2BGpPLts/7cdJ3NHsIks="; + hash = "sha256-OX9VJpO+SWIsocaSu+BhF3HT+zrhhgxb5NBvaRTadIY="; stripRoot = false; }; - vendorHash = "sha256-3SyD1mC+tc8cf5MGcw891W5VbX+b7d0cIJQfwNq2NU8="; + vendorHash = "sha256-GRVSZB4GojXv2xAdx8Y5RSuhF/3paRhhq7HOWLRmmHE="; subPackages = [ "cmd/traefik" ]; preBuild = '' GOOS= GOARCH= CGO_ENABLED=0 go generate - CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) + CODENAME=$(grep -Po "CODENAME \?=\s\K.+$" Makefile) buildFlagsArray+=("-ldflags= -s -w \ -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version} \ diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 217724e89dfa2..dd8c10bb51cb3 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.202"; + version = "3.0.203"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-tZBAu8LiqsWZE12UQcUdAr+6HkOOb7Au6Mg5lo0DXTQ="; + sha256 = "sha256-S+go4uMUjzZNvzI5e/h7b2YFNdkzmZbVf7pIXOJeUX0="; }; - vendorHash = "sha256-t9ukiREUEmW6KK7m5Uv5Ce6n/1GsBLom9H35eEyOBys="; + vendorHash = "sha256-AvlDqaJ5w9oDV1slwArr12KA1d3FKVU9H5WK4s3ePtU="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 93ba305ae8948..49d3b6ffb139d 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -39,8 +39,8 @@ let , url , sha256 , description - }: python3.pkgs.buildPythonPackage { - inherit pname version; + , ... + }@args: python3.pkgs.buildPythonPackage ({ format = "wheel"; src = fetchurl { inherit url sha256; }; meta = with lib; { @@ -51,9 +51,11 @@ let license = lib.licenses.mit; sourceProvenance = [ sourceTypes.fromSource ]; }; - }; + } // (removeAttrs args [ "url" "sha256" "description" ])); - extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; }; + extensions = + callPackages ./extensions-generated.nix { inherit mkAzExtension; } + // callPackages ./extensions-manual.nix { inherit mkAzExtension; }; extensionDir = stdenvNoCC.mkDerivation { name = "azure-cli-extensions"; diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix new file mode 100644 index 0000000000000..e69888b216b9f --- /dev/null +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -0,0 +1,16 @@ +{ mkAzExtension +, python3Packages +}: + +{ + azure-devops = mkAzExtension rec { + pname = "azure-devops"; + version = "1.0.0"; + url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; + sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + description = "Tools for managing Azure DevOps"; + propagatedBuildInputs = with python3Packages; [ + distro + ]; + }; +} diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f354dde039c8b..dca993567e1b1 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -49,6 +49,9 @@ in stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/google-cloud-sdk + if [ -d .install/platform/bundledpythonunix ]; then + rm -r .install/platform/bundledpythonunix + fi cp -R * .install $out/google-cloud-sdk/ mkdir -p $out/google-cloud-sdk/lib/surface/{alpha,beta} diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index f4a39b2cbbc5d..874e9b40d6b7c 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -14,10 +14,10 @@ let name = "${pname}-${version}"; executable = fetchurl (if (wine.meta.mainProgram == "wine64") then { - url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe"; + url = "https://download.mikrotik.com/routeros/winbox/${version}/winbox64.exe"; sha256 = "1dxny1qmq4pmdn40j9zk461p3qwwjin5d18ajhczrnqrcr2v1xwi"; } else { - url = "https://download.mikrotik.com/winbox/${version}/winbox.exe"; + url = "https://download.mikrotik.com/routeros/winbox/${version}/winbox.exe"; sha256 = "11vmdkwi38y7wkdkgsqpfs4l2bdaj9yg6c8wlgfzp91227gjn5li"; }); diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index a5e7b24833054..13070ea70513b 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mpris-scrobbler"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mariusor"; repo = "mpris-scrobbler"; rev = "v${version}"; - sha256 = "sha256-HUEUkVL5d6FD698k8iSCJMNeSo8vGJCsExJW/E0EWpQ="; + sha256 = "sha256-Gpgiu3wdxP4XjHzl1S4/wpTh2ZJjqowsD8wpbZuaySs="; }; postPatch = '' diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/tools/games/ukmm/Cargo.lock index cda3a9935855c..c8c049fef936f 100644 --- a/pkgs/tools/games/ukmm/Cargo.lock +++ b/pkgs/tools/games/ukmm/Cargo.lock @@ -4595,7 +4595,7 @@ dependencies = [ [[package]] name = "uk-content" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -4632,7 +4632,7 @@ dependencies = [ [[package]] name = "uk-editor" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "eframe", @@ -4659,7 +4659,7 @@ dependencies = [ [[package]] name = "uk-manager" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4697,7 +4697,7 @@ dependencies = [ [[package]] name = "uk-mod" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4738,7 +4738,7 @@ dependencies = [ [[package]] name = "uk-reader" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "anyhow_ext", @@ -4763,7 +4763,7 @@ dependencies = [ [[package]] name = "uk-ui" -version = "0.11.0" +version = "0.11.1" dependencies = [ "catppuccin-egui", "color-hex", @@ -4797,14 +4797,14 @@ dependencies = [ [[package]] name = "uk-util" -version = "0.11.0" +version = "0.11.1" dependencies = [ "once_cell", ] [[package]] name = "ukmm" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "anyhow_ext", diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index aaa7e8697c44d..aa5469472d85a 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ukmm"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/w1oJVn/JGBKPYhFqbvvY+HlA3owOei64ZqrPUXHu/E="; + hash = "sha256-yxF08kTA/IhM3LKFH523kVY3QfqwUElz3ICkjKPAo7E="; }; cargoLock = { diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix index 78cb959a8fc22..db0f30e846903 100644 --- a/pkgs/tools/graphics/hobbits/default.nix +++ b/pkgs/tools/graphics/hobbits/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "hobbits"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "Mahlet-Inc"; repo = "hobbits"; rev = "v${version}"; - hash = "sha256-zbpYVoWOffMxx2RS5gXw+rpwdxoRutH/yzZqJIc57UU="; + hash = "sha256-SbSuw5e2ll/wU5UBV0MOlvCXb4rvPtsE4l8XzRbBiLI="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix index b8e34332e8ae8..b28254ea3c121 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-bamboo"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-bamboo"; rev = finalAttrs.version; - hash = "sha256-EcpuZN2JU6HSuiQgBPBsoYftdHypiyFlrUxDBlVW6eo="; + hash = "sha256-vEc9z7lFqk+LPP5sTzOYgV7u+/mQY2OsaRsTrtcI/EI="; fetchSubmodules = true; }; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index e186839dbbb25..008ec44955a95 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-Zl/YlN5qIB8rjL4lPwRcKRoId0i1ovMOLJKGmTUHuwo="; + hash = "sha256-1rbpCniRPP9528qCAohN1o5198vypfWmYgCx8sd+NXU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 55a02002e2576..6d97581af26f6 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -59,7 +59,6 @@ , python3 , qemu , R -, radare2 , sng , sqlite , squashfsTools @@ -76,8 +75,26 @@ , writeScript }: +let + python = python3.override { + packageOverrides = final: prev: { + # version 4 or newer would log the followng error but tests currently don't fail because radare2 is disabled + # ValueError: argument TNULL is not a TLSH hex string + tlsh = prev.tlsh.overridePythonAttrs ({ src, ... }: let + version = "3.19.1"; + in { + inherit version; + src = src.override { + rev = version; + hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U="; + }; + }); + }; + }; +in + # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -python3.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "diffoscope"; version = "265"; @@ -124,6 +141,11 @@ python3.pkgs.buildPythonApplication rec { # docx2txt <- makes tests broken: # > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range # > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError + # radare2 + # > FAILED tests/comparators/test_elf_decompiler.py::test_ghidra_diff - IndexError: list index out of range + # > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - AssertionError + # > FAILED tests/comparators/test_macho_decompiler.py::test_ghidra_diff - assert 0 == 1 + # > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - AssertionError # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ @@ -160,7 +182,7 @@ python3.pkgs.buildPythonApplication rec { zip zstd ] - ++ (with python3.pkgs; [ + ++ (with python.pkgs; [ argcomplete debian defusedxml @@ -203,13 +225,12 @@ python3.pkgs.buildPythonApplication rec { procyon qemu R - radare2 tcpdump ubootTools wabt xmlbeans ] - ++ (with python3.pkgs; [ + ++ (with python.pkgs; [ androguard binwalk guestfs @@ -224,7 +245,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ] )); - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ] ++ pythonPath; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index d43914685d2c4..904aca2052141 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-s2TlxksxGYvRqDwRA7eLlXAyT5uPK2DiL8ma1nNVz5Q="; + sha256 = "sha256-SuagtYfLD8yXFpLHNl1J0m5/iapYU+Si6tJl0paStTY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index f14d968a4810a..280b7adde970c 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.4.5"; + version = "2024.4.8"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-JnPsP19c7oE6bRVOd3Afok0A0Sn/tUOoc1DCjurueW0="; + hash = "sha256-bIw7j7KPHlgIucV/onvp92k0OlNgaxqiVq/Cnj0kIuQ="; # registry is not needed for compilation nor for tests. # contains files with the same name but different case, which cause problems with hash on darwin @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-trf4nJ2BmpzWvZb2YG/6i540k1xvLJVesc6g/AEgaVk="; + cargoHash = "sha256-yMpU39SU4Ut7vUQdzkBjhf8p8yCU350HMYKGm5CCado="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index d8972a89912ee..c99c394f100a6 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.10"; + version = "1.23.11"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-ue/ZcIIJJAxUMhsEA3FtrkE5mgtiY626b+GmX62Q8dM="; + hash = "sha256-dKsDvtFs1/WToqpfW84dxDAHRN13TUnZKKk26h3pQ18="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index b665f42413c31..5abdb5bba60d7 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.72"; + version = "4.73"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-kJ+2vedvxZWnKlgALvuwxLSC6Mmk8M1JIArev5m1wx0="; + hash = "sha256-e8ewsx2mx62JTUnpMoSRL44EGDllQuk/k9gRztOkWMc="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index ee7070d06ddad..7f5c9b18438c9 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -1,22 +1,32 @@ { stdenv , lib -, fetchurl -, dpkg , autoPatchelfHook -, makeWrapper , copyDesktopItems -, makeDesktopItem , dbus +, dpkg +, fetchurl +, gtk3 +, libpcap +, makeDesktopItem +, makeWrapper , nftables }: stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2023.3.470"; + version = "2024.4.133"; + + suffix = { + aarch64-linux = "arm64"; + x86_64-linux = "amd64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_2023.3.470-1_amd64.deb"; - hash = "sha256-AYnmisEQKFiEB2iRJifEqRbdzAyBcfrU0ITeUokKLag="; + url = "https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_${version}-1_${suffix}.deb"; + hash = { + aarch64-linux = "sha256-qua+aL4+yvpTBGCVUS1rzJX1KZ3DeaW9Bce9lYWvWOM="; + x86_64-linux = "sha256-xZhyYDMjcv8SLfYwclvWBqPDETbeaxiA6jFCg3Nv5gc="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; nativeBuildInputs = [ @@ -28,6 +38,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + gtk3 + libpcap stdenv.cc.cc.lib ]; @@ -44,12 +56,17 @@ stdenv.mkDerivation rec { }) ]; + autoPatchelfIgnoreMissingDeps = [ + "libpcap.so.0.8" + ]; + installPhase = '' runHook preInstall mv usr $out mv bin $out mv etc $out + patchelf --replace-needed libpcap.so.0.8 ${libpcap}/lib/libpcap.so $out/bin/warp-dex mv lib/systemd/system $out/lib/systemd/ substituteInPlace $out/lib/systemd/system/warp-svc.service \ --replace "ExecStart=" "ExecStart=$out" @@ -72,6 +89,6 @@ stdenv.mkDerivation rec { wolfangaukang devpikachu ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/tools/networking/ghz/default.nix index 89253f3fe4891..eb20a398e419a 100644 --- a/pkgs/tools/networking/ghz/default.nix +++ b/pkgs/tools/networking/ghz/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { description = "Simple gRPC benchmarking and load testing tool"; homepage = "https://ghz.sh"; license = licenses.asl20; - maintainers = [ maintainers.zombiezen ]; }; } diff --git a/pkgs/tools/networking/graphqurl/default.nix b/pkgs/tools/networking/graphqurl/default.nix index e0b6fa9de9c01..3e7d05ce44e1d 100644 --- a/pkgs/tools/networking/graphqurl/default.nix +++ b/pkgs/tools/networking/graphqurl/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "graphqurl"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "hasura"; repo = "graphqurl"; rev = "v${version}"; - hash = "sha256-0dR8lLD0yatAvE3kA90cNOzVRTFpQmzN1l13hdFr3TM="; + hash = "sha256-w7t3p7TOBA0nxUlfRfQkiZ26SCDCwv03A1r+pTgUCqc="; }; - npmDepsHash = "sha256-2kLmhNFO/ySa6S9rBNYCePmsYXWz006IxiOJ7ZUkgPw="; + npmDepsHash = "sha256-17eRYr0vgnq7eFtlYY2CwvluwhbXWClL3onTNBkDF0c="; dontNpmBuild = true; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 33b0d9d4c1526..5443d2c7f957a 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-ohqWubYR9Z5KtMEOyqVfxnmNO6SoaSsA3SOMDivVA54="; + hash = "sha256-4i3bXtg7WCSPDE7fUWVJnOOFNGLAo1F/a2wbuUH785o="; }; - vendorHash = "sha256-DuQwg4vJgwC6IBs+8J5OVdO67OgdhmGTF88zlikHaAQ="; + vendorHash = "sha256-dV/bomGPg0Q3OEDuu6vRVsFRveDVzw6Hv0KLla2uZqc="; proxyVendor = true; ldflags = diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 3b09ddf5694d6..b9e23b6548ef5 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-04-18T16-45-29Z"; + version = "2024-04-29T09-56-05Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-aEhkk1nB8CGzuZfD8a62RwzcvF2HZTm1LPfb13c6x9Q="; + sha256 = "sha256-Fx7D8w5cPrl/TFmMIGZxn00BC0AYaLEh6K1PQ10jTBQ="; }; - vendorHash = "sha256-qb4gR//8UzJAJ5WthfyxYwhR3YCwUGxfy8aRMW2MXks="; + vendorHash = "sha256-vqPSzzNIvy+9J9bPE4hxWvRPuPKpB8ahuu6ENnFmfJ0="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index e2ac3e2264b30..e2a07cf2d2625 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-Pc3sWVUZTOyCxGHcfKJ3fc0vUKtymPTe5DOEP+dScwg="; + hash = "sha256-uOE+Gp42WsqSA5/kQRjk+BKq9igmZCrq/9v1BJMXwFc="; }; - vendorHash = "sha256-e+SJQBfwIkuzRblOQPt8ZKZgROBAZy2y5dyh6ykdFeg="; + vendorHash = "sha256-7E/H8ctv9BU59wPmywNeDhx1R4mqrjpM9E+Hz+AaPlk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/nix/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix index d6cfc630d6e3e..37018ac25a0bb 100644 --- a/pkgs/tools/nix/nixos-option/default.nix +++ b/pkgs/tools/nix/nixos-option/default.nix @@ -10,10 +10,7 @@ stdenv.mkDerivation { name = "nixos-option"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.fileFilter (file: file.name != "default.nix") ./.; - }; + src = ./.; postInstall = '' installManPage ${./nixos-option.8} ''; diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 83ae30ee22a37..1d0d021809603 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.21.0"; + version = "1.21.2"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-5Yoe0Y2WTBc19OzB1QvJCX8FXtBlgxORyUppX6ZWnAM="; + hash = "sha256-iiekjV/X9dAqk9WTxDgi6SK/XkI0aKEfN4Hopgid3Rw="; }; setOutputFlags = false; diff --git a/pkgs/tools/security/biscuit-cli/default.nix b/pkgs/tools/security/biscuit-cli/default.nix index 74dac8b565860..c5ee1da6b52bc 100644 --- a/pkgs/tools/security/biscuit-cli/default.nix +++ b/pkgs/tools/security/biscuit-cli/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "biscuit-cli"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "biscuit-auth"; repo = "biscuit-cli"; rev = version; - sha256 = "sha256-Mvrv3BU0Pw85fs8IbjMKSQLIhtU6SKoLC0cuGdhfAYs="; + sha256 = "sha256-Aj/s5RnkRFZMOJAHY9tdVtq24DgrgMjaYEq7oA9lXFc="; }; - cargoHash = "sha256-tgmM0rswIFrpFyupaASTXYvIyhVu0fXJJN+hg0p+vrQ="; + cargoHash = "sha256-TUu+2i+GJiS7PvzVDwWLa+w+RfbYX+k51WG2LbcqINk="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index a5dafec184fd5..9c87dab3f1c6d 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.0.2"; + version = "11.1.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-hWZXt9hUK0IXnmqKvKdowR42NVu+guMPW3krzgI1KqU="; + hash = "sha256-99bkEoAfNfejO/M1V8KmAmyP+klrCtmkf1l6aZynEgQ="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-Q1Wz3zHow4UeqgZVP9s9xHuLwrG2LE/tsDUdgs6xMNo="; + vendorHash = "sha256-Nb2KSTS85//GC4ikYgrNNoKYJYBYvG9q5GF5RPemklE="; ldflags = [ "-w" diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/tools/security/ghauri/default.nix index fd4a0fa9903f8..c4d176eb2a276 100644 --- a/pkgs/tools/security/ghauri/default.nix +++ b/pkgs/tools/security/ghauri/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ghauri"; - version = "1.3"; + version = "1.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "r0oth3x49"; repo = "ghauri"; rev = "refs/tags/${version}"; - hash = "sha256-CZhkb8GmXXSA5QqhW7IAirwsxQg6YNFT3RHrGsyqAbk="; + hash = "sha256-QO4/dkJU/uhP1AT1kIxDBIGBfLI1rOhOe/cHC8GwhkA="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 61669836f7925..f2abaaf7d8a7f 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "3.0.12"; src = fetchFromGitHub { - owner = "SpiderLabs"; + owner = "owasp-modsecurity"; repo = "ModSecurity"; rev = "v${version}"; sha256 = "sha256-WIFAg9LvKAC8e3gpcIxtNHT53AIfPtUTyrv30woxP4M="; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://github.com/SpiderLabs/ModSecurity"; + homepage = "https://github.com/owasp-modsecurity/ModSecurity"; description = '' ModSecurity v3 library component. ''; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 5420591e58425..b85d98b58fd7b 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v+WqiHecps3rCGf6CF0KJDZUWs7zMrFypVPTANR8b6Y="; + sha256 = "sha256-Tu/h9jhZgulrc5bTJrwq7Ksg69qUVUBjWNdzve4m9JM="; }; - cargoHash = "sha256-v5QxJto9acVJnMUvBK3QdkDH+qO2+wtqitGfSCcaJ5w="; + cargoHash = "sha256-ZXLu/6IQ20u8dk0gaZoBh0rt6CGaRBNVHGgrCW5+yzA="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/tools/text/diffsitter/default.nix index e3c14df854078..8e0a6bbc3d156 100644 --- a/pkgs/tools/text/diffsitter/default.nix +++ b/pkgs/tools/text/diffsitter/default.nix @@ -32,17 +32,17 @@ let in rustPlatform.buildRustPackage rec { pname = "diffsitter"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "afnanenayet"; repo = pname; rev = "v${version}"; - hash = "sha256-rB580TlM0/HXYgPvWtm7KMtXrw6i996HyvCrNr3QmNA="; + hash = "sha256-XYuX8NMVnVyOo3I2CmMS/TE47wQaigc8sen3ap2geSU="; fetchSubmodules = false; }; - cargoHash = "sha256-8ajCXoB+mVhHrstVG+QkWYfXJqDk4+XPcO6yjR4TqpQ="; + cargoHash = "sha256-re0FRoyENpo+BF88U9ARuB05W03Slgm4nw1yxcpOA4o="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 854557eb72377..5e504eca749ae 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -171,10 +171,8 @@ sub writeNixOSConfig { my $nixosConfig = <<EOF; { config, lib, pkgs, ... }: -with lib; - { boot.isContainer = true; - networking.hostName = mkDefault "$containerName"; + networking.hostName = lib.mkDefault "$containerName"; networking.useDHCP = false; $localExtraConfig } diff --git a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix index 61bca460b0e0f..2e9da7634856f 100644 --- a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix +++ b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-per-window-layout"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "coffebar"; repo = pname; rev = version; - hash = "sha256-AhTDcwZnFAaB750PqdXjZvjVrSjwJd3CXv1UtZfcTC0="; + hash = "sha256-oCHX9C/TnTGxHfZBtKhwcWJaijZ92MqCOnf6OgviH1o="; }; - cargoHash = "sha256-uZsXIDdUNZyrDmfWCHDuibziarzIav74Lpu4yObkGbc="; + cargoHash = "sha256-RkIHwIWzKwzpPIFmOkBmOUq07YdLQRVOGblybnACUfs="; meta = with lib; { description = "Per window keyboard layout (language) for Hyprland wayland compositor"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3eb44f6b4185..eaba80f5715d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15324,6 +15324,8 @@ with pkgs; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmapWithCuda = colmap.override { cudaSupport = true; }; + opensplatWithCuda = opensplat.override { cudaSupport = true; }; + chickenPackages_4 = recurseIntoAttrs (callPackage ../development/compilers/chicken/4 { }); chickenPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/chicken/5 { }); chickenPackages = dontRecurseIntoAttrs chickenPackages_5; @@ -16672,7 +16674,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-clone = callPackage ../development/tools/rust/cargo-clone { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { rustPlatform = makeRustPlatform { @@ -24599,8 +24601,6 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; - stduuid = callPackage ../development/libraries/stduuid { }; - steghide = callPackage ../tools/graphics/steghide { }; stegsolve = callPackage ../tools/graphics/stegsolve { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 932ff6505b782..8a7ad8a70aeb3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1184,7 +1184,6 @@ let msat = callPackage ../development/ocaml-modules/msat { }; - mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; @@ -1195,6 +1194,8 @@ let netchannel = callPackage ../development/ocaml-modules/netchannel { }; + ninja_utils = callPackage ../development/ocaml-modules/ninja_utils { }; + nonstd = callPackage ../development/ocaml-modules/nonstd { }; note = callPackage ../development/ocaml-modules/note { }; @@ -1385,7 +1386,7 @@ let inherit (pkgs) unzip; }; - opium = callPackage ../development/ocaml-modules/opium { mtime = mtime_1; }; + opium = callPackage ../development/ocaml-modules/opium { }; opti = callPackage ../development/ocaml-modules/opti { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 092730d890082..8ba934720ea54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12899,6 +12899,8 @@ self: super: with self; { quil = callPackage ../development/python-modules/quil { }; + quixote = callPackage ../development/python-modules/quixote { }; + qutip = callPackage ../development/python-modules/qutip { }; qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; |