diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 30edd8d322e0..46a4447d65e1 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -68,6 +68,8 @@ - `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more. +- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md) + - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/. - `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0). diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1b554157a545..b3f714b1a9e0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5263,12 +5263,6 @@ githubId = 244239; name = "Mauricio Collares"; }; - coloquinte = { - email = "gabriel.gouvine_nix@m4x.org"; - github = "Coloquinte"; - githubId = 4102525; - name = "Gabriel Gouvine"; - }; commandodev = { email = "ben@perurbis.com"; github = "commandodev"; @@ -16952,6 +16946,11 @@ github = "mevatron"; githubId = 714585; }; + mfairley = { + name = "Michael Fairley"; + github = "mfairley"; + githubId = 4374785; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; @@ -18203,6 +18202,12 @@ matrix = "@neoney:matrix.org"; keys = [ { fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; } ]; }; + n3tshift = { + email = "n3tshift@tilde.pink"; + github = "n3tshift"; + githubId = 254145391; + name = "n3tshift"; + }; n8henrie = { name = "Nathan Henrie"; email = "nate@n8henrie.com"; diff --git a/maintainers/scripts/update-octave-packages b/maintainers/scripts/update-octave-packages index 00a1646184d5..49ff2ef71e6b 100755 --- a/maintainers/scripts/update-octave-packages +++ b/maintainers/scripts/update-octave-packages @@ -351,20 +351,20 @@ def _update_package(path, target): text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': - # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` + # in the case of fetchFromGitHub, it's common to see `tag = version;` or `tag = "v${version}";` # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = '(rev\s+=\s+[^;]*;)' + regex = '(tag\s+=\s+[^;]*;)' regex = re.compile(regex) matches = regex.findall(text) n = len(matches) if n == 0: - raise ValueError("Unable to find rev value for {}.".format(pname)) + raise ValueError("Unable to find tag value for {}.".format(pname)) else: - # forcefully rewrite rev, incase tagging conventions changed for a release + # forcefully rewrite tag, incase tagging conventions changed for a release match = matches[0] - text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') - # incase there's no prefix, just rewrite without interpolation + text = text.replace(match, f'tag = "{prefix}${{version}}";') + # in case there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', 'version;') with open(path, 'w') as f: diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix index f7221bdaf8c7..b6ed216d1992 100644 --- a/nixos/modules/services/networking/tayga.nix +++ b/nixos/modules/services/networking/tayga.nix @@ -167,7 +167,7 @@ in networking.interfaces."${cfg.tunDevice}" = { virtual = true; virtualType = "tun"; - virtualOwner = mkIf config.networking.useNetworkd ""; + virtualOwner = null; ipv4 = { addresses = [ { @@ -205,9 +205,7 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; Restart = "always"; - # Hardening Score: - # - nixos-scripts: 2.1 - # - systemd-networkd: 1.6 + # Hardening Score: 1.5 ProtectHome = true; SystemCallFilter = [ "@network-io" @@ -216,9 +214,6 @@ in "~@resources" ]; ProtectKernelLogs = true; - AmbientCapabilities = [ - "CAP_NET_ADMIN" - ]; CapabilityBoundingSet = ""; RestrictAddressFamilies = [ "AF_INET" @@ -226,7 +221,7 @@ in "AF_NETLINK" ]; StateDirectory = "tayga"; - DynamicUser = mkIf config.networking.useNetworkd true; + DynamicUser = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 9e6529e487b4..e4408b6771d2 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -322,7 +322,9 @@ let RemainAfterExit = true; }; script = '' - ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}" + ip tuntap add dev "${i.name}" mode "${i.virtualType}" ${ + lib.optionalString (i.virtualOwner != null) ''user "${i.virtualOwner}"'' + } ''; postStop = '' ip link del dev ${i.name} || true diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 2a6d00296303..92c151142215 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -348,9 +348,10 @@ let virtualOwner = mkOption { default = "root"; - type = types.str; + type = types.nullOr types.str; description = '' In case of a virtual device, the user who owns it. + `null` will not set owner, allowing access to any user. ''; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 52b10f309d1c..35654b0fbe46 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1174,7 +1174,7 @@ in opentelemetry-collector = runTest ./opentelemetry-collector.nix; openvscode-server = runTest ./openvscode-server.nix; openvswitch = runTest ./openvswitch.nix; - optee = handleTestOn [ "aarch64-linux" ] ./optee.nix { }; + optee = runTestOn [ "aarch64-linux" ] ./optee.nix; orangefs = runTest ./orangefs.nix; orthanc = runTest ./orthanc.nix; os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { }; @@ -1418,7 +1418,7 @@ in sharkey = runTest ./web-apps/sharkey.nix; shattered-pixel-dungeon = runTest ./shattered-pixel-dungeon.nix; shiori = runTest ./shiori.nix; - shoko = runTest ./shoko.nix; + shoko = import ./shoko.nix { inherit runTest; }; signal-desktop = runTest ./signal-desktop.nix; silverbullet = runTest ./silverbullet.nix; simple = runTest ./simple.nix; diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 257fd07d1eb3..8acf4e41bf5d 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -1053,6 +1053,7 @@ let } ]; virtual = true; + virtualOwner = null; mtu = 1342; macAddress = "02:de:ad:be:ef:01"; }; @@ -1070,13 +1071,14 @@ let } ]; virtual = true; + virtualOwner = "root"; mtu = 1343; }; }; testScript = '' targetList = """ - tap0: tap persist user 0 + tap0: tap persist tun0: tun persist user 0 """.strip() @@ -1101,6 +1103,10 @@ let machine.wait_until_succeeds("ip link show dev tap0 | grep 'mtu 1342'") machine.wait_until_succeeds("ip link show dev tun0 | grep 'mtu 1343'") assert "02:de:ad:be:ef:01" in machine.succeed("ip link show dev tap0") + with subtest("Test virtualOwner are configured"): + for interface, expected_owner in [("tap0", "-1"), ("tun0", "0")]: + actual_owner = machine.succeed(f"cat /sys/class/net/{interface}/owner").strip() + assert expected_owner == actual_owner, f"{interface} owner: expect {expected_owner}, got {actual_owner}" '' # network-addresses-* only exist in scripted networking + lib.optionalString (!networkd) '' with subtest("Test interfaces' addresses clean up"): diff --git a/nixos/tests/optee.nix b/nixos/tests/optee.nix index f35f075e882a..f9e0bdd2f0f2 100644 --- a/nixos/tests/optee.nix +++ b/nixos/tests/optee.nix @@ -1,70 +1,68 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "optee"; +{ pkgs, lib, ... }: +{ + name = "optee"; - meta = with pkgs.lib.maintainers; { - maintainers = [ jmbaur ]; - }; + meta = with pkgs.lib.maintainers; { + maintainers = [ jmbaur ]; + }; - nodes.machine = - { config, pkgs, ... }: - let - inherit (pkgs) armTrustedFirmwareQemu opteeQemuAarch64 ubootQemuAarch64; + nodes.machine = + { config, pkgs, ... }: + let + inherit (pkgs) armTrustedFirmwareQemu opteeQemuAarch64 ubootQemuAarch64; - # Default environment for qemu-arm64 uboot does not work well with - # large nixos kernel/initrds. - uboot = ubootQemuAarch64.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace board/emulation/qemu-arm/qemu-arm.env \ - --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000" - ''; - }); + # Default environment for qemu-arm64 uboot does not work well with + # large nixos kernel/initrds. + uboot = ubootQemuAarch64.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' + substituteInPlace board/emulation/qemu-arm/qemu-arm.env \ + --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000" + ''; + }); - bios = armTrustedFirmwareQemu.override { - extraMakeFlags = [ - "SPD=opteed" - "BL32=${opteeQemuAarch64}/tee-header_v2.bin" - "BL32_EXTRA1=${opteeQemuAarch64}/tee-pager_v2.bin" - "BL32_EXTRA2=${opteeQemuAarch64}/tee-pageable_v2.bin" - "BL33=${uboot}/u-boot.bin" - "all" - "fip" - ]; - filesToInstall = [ - "build/qemu/release/bl1.bin" - "build/qemu/release/fip.bin" - ]; - postInstall = '' - dd if=$out/bl1.bin of=$out/bios.bin bs=4096 conv=notrunc - dd if=$out/fip.bin of=$out/bios.bin seek=64 bs=4096 conv=notrunc - ''; - }; - in - { - virtualisation = { - inherit bios; - cores = 2; - qemu.options = [ - "-machine virt,secure=on,accel=tcg,gic-version=2" - "-cpu cortex-a57" - ]; - }; - - # VM boots up via qfw - boot.loader.grub.enable = false; - - services.tee-supplicant = { - enable = true; - # pkcs11 trusted application - trustedApplications = [ "${opteeQemuAarch64.devkit}/ta/fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta" ]; - }; + bios = armTrustedFirmwareQemu.override { + extraMakeFlags = [ + "SPD=opteed" + "BL32=${opteeQemuAarch64}/tee-header_v2.bin" + "BL32_EXTRA1=${opteeQemuAarch64}/tee-pager_v2.bin" + "BL32_EXTRA2=${opteeQemuAarch64}/tee-pageable_v2.bin" + "BL33=${uboot}/u-boot.bin" + "all" + "fip" + ]; + filesToInstall = [ + "build/qemu/release/bl1.bin" + "build/qemu/release/fip.bin" + ]; + postInstall = '' + dd if=$out/bl1.bin of=$out/bios.bin bs=4096 conv=notrunc + dd if=$out/fip.bin of=$out/bios.bin seek=64 bs=4096 conv=notrunc + ''; }; - testScript = '' - machine.wait_for_unit("tee-supplicant.service") - out = machine.succeed("${pkgs.opensc}/bin/pkcs11-tool --module ${lib.getLib pkgs.optee-client}/lib/libckteec.so --list-token-slots") - if out.find("OP-TEE PKCS11 TA") < 0: - raise Exception("optee pkcs11 token not found") - ''; - } -) + in + { + virtualisation = { + inherit bios; + cores = 2; + qemu.options = [ + "-machine virt,secure=on,accel=tcg,gic-version=2" + "-cpu cortex-a57" + ]; + }; + + # VM boots up via qfw + boot.loader.grub.enable = false; + + services.tee-supplicant = { + enable = true; + # pkcs11 trusted application + trustedApplications = [ "${opteeQemuAarch64.devkit}/ta/fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta" ]; + }; + }; + testScript = '' + machine.wait_for_unit("tee-supplicant.service") + out = machine.succeed("${pkgs.opensc}/bin/pkcs11-tool --module ${lib.getLib pkgs.optee-client}/lib/libckteec.so --list-token-slots") + if out.find("OP-TEE PKCS11 TA") < 0: + raise Exception("optee pkcs11 token not found") + ''; +} diff --git a/nixos/tests/shoko.nix b/nixos/tests/shoko.nix index 2d464d45d8ab..dfddc19b83c5 100644 --- a/nixos/tests/shoko.nix +++ b/nixos/tests/shoko.nix @@ -1,19 +1,49 @@ -{ lib, ... }: +{ runTest }: + { - name = "Shoko"; + default = runTest ( + { lib, ... }: - nodes.machine = { - services.shoko.enable = true; - }; + { + name = "Shoko"; - testScript = '' - machine.wait_for_unit("shoko.service") - machine.wait_for_open_port(8111) - machine.succeed("curl --fail http://localhost:8111") - ''; + nodes.machine = { + services.shoko.enable = true; + }; - meta.maintainers = with lib.maintainers; [ - diniamo - nanoyaki - ]; + testScript = '' + machine.wait_for_unit("shoko.service") + machine.wait_for_open_port(8111) + machine.succeed("curl --fail http://localhost:8111") + ''; + + meta.maintainers = with lib.maintainers; [ + diniamo + nanoyaki + ]; + } + ); + + withPlugins = runTest ( + { pkgs, lib, ... }: + + { + name = "Shoko with plugins"; + + nodes.machine = { + services.shoko = { + enable = true; + plugins = [ pkgs.luarenamer ]; + }; + }; + + testScript = '' + machine.wait_for_unit("shoko.service") + machine.wait_for_open_port(8111) + machine.succeed("curl --fail http://localhost:8111") + ''; + + meta.maintainers = with lib.maintainers; [ nanoyaki ]; + } + ); } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index c830950dbac9..7540de1da671 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-pM+kqeWYiPXv9DZDBTgwiEwC6Sbqv6uz5vJ5odcixOw="; }; diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index e7b674d85192..63d4e4ffd7d8 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = "${pname}-build"; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc="; }; diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix index 73df5a4b6d29..6e57235a3a13 100644 --- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix +++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-augment"; publisher = "augment"; - version = "0.731.1"; - hash = "sha256-Kv47LVomNt/u0fJKos/R7Q0hhBesOGXGPu5QHaaOKEQ="; + version = "0.747.1"; + hash = "sha256-QQty7jtBHSUHR/BIPCjKMlIuCnn5dbVCqSsXv4LVfdE="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9e5a1688148f..7d10398bdea7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3840,8 +3840,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.12.3"; - hash = "sha256-6G/CpzSSrRzwtay4+t46gz8aBF7qgu79NUhBypTJMrc="; + version = "26.1.0"; + hash = "sha256-xehZZ11C2Bjee1glpnPZaJ25DpbXSCsZONWWy4YNlRo="; }; meta = { description = "Ansible language support"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 8803648654c7..24012d54e91d 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.37.0"; - hash = "sha256-tp72kIpG1NcvHLIDKcKo7OmQ/sQdxz/yb7QhGSWsFzc="; + version = "1.37.1"; + hash = "sha256-xucPJrYqKM+uCxHktfx0o4c0btpluIBMyNigr7d1FJU="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index ee1ad77bd46a..7a0ca956d6f5 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "Groestlcoin"; repo = "electrum-grs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "1k078jg3bw4n3kcxy917m30x1skxm679w8hcw8mlxb94ikrjc66h"; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index 8dbfeec28a8e..68ee881aa07b 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/fU56Dw7tvUnby4S78tyH/dasg4n3rb0hMlIkzvrv4M="; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index d38a8858c733..ad019170b4d2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "aslafy-z"; repo = "helm-git"; rev = "v${version}"; - sha256 = "sha256-jgHFmANmxDS75k0JQIiT8DDw9nSppw1EZeEWM3jirsg="; + sha256 = "sha256-JSy6bI6XHW4JkXwffbfSFJj46BUqJvRG83sfOi8AcHM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index adf82e9f3b00..37aa5825436b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -968,13 +968,13 @@ "vendorHash": "sha256-xTlalKIWvU2MDBvwNjl3cWFVH26EyDthwrnXVmbK+rc=" }, "ns1-terraform_ns1": { - "hash": "sha256-vSq6502jHjEQEgKmgMpUrid88jhsENOVF+3MA6Zm8lg=", + "hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.7.3", + "rev": "v2.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VGGV5UYkb17X//cSy6+cbhTRCVljrrpXhM81orLomdQ=" + "vendorHash": "sha256-QEzQogxM44Yc2iH6r+AtTYhv0p/T7jDwO5axNQE2sMY=" }, "numtide_linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-9mI2bGSiSuTzGBXHzpGjU6I3Vh04aEkCMkfNk6rQbTc=", + "hash": "sha256-nJzWN2OrRiXKLzM1awn68eTW4WFvLavA06+/2BmRPGA=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.177.0", + "rev": "v0.178.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wwZiY8WXGdpOCT+4EcnSQeemDMzKZcMFZQK8SSAUkkA=" + "vendorHash": "sha256-bHsSBrfyUgUzuFOgFHXmPV12e4whsU5LTIzIXHeHlH0=" } } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 51ac55fb5323..0ecbd3d277fe 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { inherit hash; owner = "GNS3"; repo = "gns3-gui"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 7d8e993551e7..9448adc00c00 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication { inherit hash; owner = "GNS3"; repo = "gns3-server"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; }; # GNS3 2.3.26 requires a static BusyBox for the Docker integration diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix index 0fa16c0e036b..25d53a527288 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/help.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/help"; - rev = "refs/tags/cp-25.04.1-1"; + tag = "cp-25.04.1-1"; hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index aa8d54321099..1d085b100488 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -1,7 +1,7 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/core"; - rev = "refs/tags/cp-25.04.1-1"; + tag = "cp-25.04.1-1"; hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk="; fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix index 1248c511813a..8a96bf99e801 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/translations.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/translations"; - rev = "refs/tags/cp-25.04.1-1"; + tag = "cp-25.04.1-1"; hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U="; } diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index 6cf7703a4872..fee86e9c401b 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellycon"; namespace = "plugin.video.jellycon"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellycon"; rev = "v${version}"; - sha256 = "sha256-dCPbPuUtiMhcECd3Aebs3ZGIM6jn6mmCd0rXS+1TQLs="; + sha256 = "sha256-bSAzd0nKD0S3hNEM0azmCNPw9wHQK5XH6lbfcz3sW9o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix b/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix index 764ebfb70f2a..d0f0947c22ca 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "FiniteSingularity"; repo = "obs-advanced-masks"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NtmOWKk3eZeRa3TvclZpg4sj8lbOoY8hUhxs1z6kEW4="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix b/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix index d5027568fbe0..6fda0dc19557 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "wimpysworld"; repo = "obs-dvd-screensaver"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-eUfy3m0r/sLrGLbp3en1ofcVVWZ+t2rZ4knjwfrorhw="; }; strictDeps = true; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix index d493328c1310..9fdb529db1df 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "exeldro"; repo = "obs-media-controls"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-r9fqpg0G9rzGSqq5FUS8ul58rj0796aGZIND8PCJ9jk="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix index 2158ce22db16..3fd0e9a43226 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "exeldro"; repo = "obs-recursion-effect"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-PeWJy423QbX4NULuS15LJ/IR/W+tXCJD9TjZdJOGk6A="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix index 4b364e96e80a..cc5a8b6ac332 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "norihiro"; repo = "obs-vnc"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-bveTfyhHH7RAM24Lp0mWlt52ao9Rn6vCuKjfQH+B8Rw="; }; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index c889f509119a..369e08c71efa 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -91,7 +91,7 @@ let "debian/PkKek-1-*.pem" "debian/patches/OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch" ]; - rev = "refs/tags/debian/2025.02-8"; + tag = "debian/2025.02-8"; hash = "sha256-n/6T5UBwW8U49mYhITRZRgy2tNdipeU4ZgGGDu9OTkg="; }; diff --git a/pkgs/by-name/a2/a2jmidid/package.nix b/pkgs/by-name/a2/a2jmidid/package.nix index 33fd63528c9e..a615756043fb 100644 --- a/pkgs/by-name/a2/a2jmidid/package.nix +++ b/pkgs/by-name/a2/a2jmidid/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "gitea.ladish.org"; owner = "LADI"; repo = "a2jmidid"; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; diff --git a/pkgs/by-name/ab/abiword/package.nix b/pkgs/by-name/ab/abiword/package.nix index 4dba895b52bf..9bd0c0a5f7ce 100644 --- a/pkgs/by-name/ab/abiword/package.nix +++ b/pkgs/by-name/ab/abiword/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "AbiWord"; - rev = "refs/tags/release-${version}"; + tag = "release-${version}"; hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI="; }; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 61012fa0f2ed..ddff771e2744 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-izgSdHK+vVS0UcK32gYDwBn3b1yDCzp2ImjDXZbMrzs="; + hash = "sha256-eKUeQp4hvLqBkHDfclyR5dTt7jjcVMHneqXBPt1N8No="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index bf4281e0baad..154886e64e0f 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -71,7 +71,7 @@ let airflow-src = fetchFromGitHub { owner = "apache"; repo = "airflow"; - rev = "refs/tags/${version}"; + tag = version; # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; diff --git a/pkgs/by-name/ap/apbs/package.nix b/pkgs/by-name/ap/apbs/package.nix index 81ed839f0951..19137459d854 100644 --- a/pkgs/by-name/ap/apbs/package.nix +++ b/pkgs/by-name/ap/apbs/package.nix @@ -19,7 +19,7 @@ let src = fetchFromGitHub { owner = "Electrostatics"; repo = "fetk"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-uFA1JRR05cNcUGaJj9IyGNONB2hU9IOBPzOj/HucNH4="; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Electrostatics"; repo = "apbs"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2DnHU9hMDl4OJBaTtcRiB+6R7gAeFcuOUy7aI63A3gQ="; }; diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix index b8ff6932a0d4..af366dbbd956 100644 --- a/pkgs/by-name/ap/apksigner/package.nix +++ b/pkgs/by-name/ap/apksigner/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # use pname here because the final jar uses this as the filename name = pname; url = "https://android.googlesource.com/platform/tools/apksig"; - rev = "refs/tags/android-15.0.0_r30"; + tag = "android-15.0.0_r30"; hash = "sha256-f/PggxvBv8nYUyL9Ukd4YVpunpRWbLL5UYsYhsiDWRE="; }; diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index d2daa5a58443..c554d5ceaf4a 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -26,7 +26,7 @@ let owner = "World"; repo = "apostrophe"; domain = "gitlab.gnome.org"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Sj5Y4QPMYavdXbU+iVv76qOFNhgBjAeX9+/TvQHZzeI="; }; @@ -36,7 +36,7 @@ let # keep in sync with upstream shipped version # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json - rev = "refs/tags/5.1.0"; + tag = "5.1.0"; hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0="; }; in diff --git a/pkgs/by-name/as/ascii/package.nix b/pkgs/by-name/as/ascii/package.nix index 06180ba28fb7..12cdc6f6f89f 100644 --- a/pkgs/by-name/as/ascii/package.nix +++ b/pkgs/by-name/as/ascii/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "esr"; repo = "ascii"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-TE9YR5Va9tXaf2ZyNxz7d8lZRTgnD4Lz7FyqRDl1HNY="; }; diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index be7053870fca..a55c5cad8a49 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.10.0"; + version = "18.11.0"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; tag = "v${finalAttrs.version}"; - hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M="; + hash = "sha256-yjsCNN15E06te6cueSZksg7mcMyx2FiXKrbGAEcQWmg="; }; - cargoHash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M="; + cargoHash = "sha256-xaALIVJpMek4nbSozxtOEWivRDlMmKdu6KqKiNMp0jk="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 7873573a0436..a3a2046b2b8e 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-Qtxn3VnqJOAIKI4jURFXnH5fHCWtZU419XtnjdqFlkY="; + hash = "sha256-ng+eIM8C557HY9kfAaidhwb/oT875qcPC7zTpXFn0c8="; }; - vendorHash = "sha256-WN71xEU9GBNj0M5tnVthBdxh13UH78zUOaCEtczFDck="; + vendorHash = "sha256-fEoDvnHNQWwk++3n/4R1Q3YKwraxP8OBFLU0hZLcouc="; ldflags = [ "-s" diff --git a/pkgs/by-name/aw/aws-shell/package.nix b/pkgs/by-name/aw/aws-shell/package.nix index 748fcd502e49..a42ced9aec35 100644 --- a/pkgs/by-name/aw/aws-shell/package.nix +++ b/pkgs/by-name/aw/aws-shell/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-shell"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-m96XaaFDFQaD2YPjw8D1sGJ5lex4Is4LQ5RhGzVPvH4="; }; diff --git a/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch b/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch deleted file mode 100644 index 9b0e352ebccf..000000000000 --- a/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt -index 66cbbd52ed..a8b9d41e4e 100644 ---- a/externals/CMakeLists.txt -+++ b/externals/CMakeLists.txt -@@ -230,13 +230,8 @@ - ) - target_link_libraries(zstd_seekable PUBLIC libzstd_static) - -- target_link_libraries(libzstd_static INTERFACE zstd_seekable) -- -- add_library(zstd ALIAS libzstd_static) -- -- install(TARGETS zstd_seekable -- EXPORT zstdExports -- ) -+ add_library(zstd INTERFACE) -+ target_link_libraries(zstd INTERFACE libzstd_static zstd_seekable) - endif() - - # ENet -diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp -index 1e38877a1c..ac85ea1978 100644 ---- a/src/common/zstd_compression.cpp -+++ b/src/common/zstd_compression.cpp -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - - #include - #include diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index f5cdb9ce6803..99d0e32b7935 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -44,7 +44,6 @@ gamemode, enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode, nix-update-script, - fetchpatch2, }: let inherit (lib) @@ -56,24 +55,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2123.4.1"; + version = "2124"; src = fetchzip { url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-86i6GMnonQ8SeeDiOH1XSl3rHamnMTgPnkaeJOlAIuI="; + hash = "sha256-k/Rz7hiYtX0tVW2lrrEwiB8LanvAuhXHxPC79Dy4aUI="; }; - patches = [ - # https://github.com/azahar-emu/azahar/pull/1305 - ./fix-zstd-seekable-include.patch - - # TODO: Remove in next release - (fetchpatch2 { - url = "https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch?full_index=1"; - hash = "sha256-9rmRbv7VFMhHly5qTGaeBLpvtWMu6HkCGUUM+t78Meg="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ cmake @@ -111,8 +99,9 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers xbyak - # https://github.com/azahar-emu/azahar/pull/1281 + # https://github.com/azahar-emu/azahar/issues/1283 # spirv-tools + # spirv-headers # Azahar uses zstd_seekable which is not currently packaged in nixpkgs # zstd diff --git a/pkgs/by-name/ba/barlow/package.nix b/pkgs/by-name/ba/barlow/package.nix index 67fdf32c04af..dc0b0439c40f 100644 --- a/pkgs/by-name/ba/barlow/package.nix +++ b/pkgs/by-name/ba/barlow/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "jpt"; repo = "barlow"; - tag = "${version}"; + tag = version; hash = "sha256-FG68o6qN/296RhSNDHFXYXbkhlXSZJgGhVjzlJqsksY="; }; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index ef2b407dbfbc..9b5f1d48cb2d 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.2.455"; + version = "4.2.482"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-3FHaPIJb40ta/+sguolz2QQBKkGgd1P3CgyEHHxX5xA="; + hash = "sha256-mxBE0U2ABiOdSNj8c3Lqgmy5iFtOulCCkQ+oC2xyENA="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index f96fc1064def..180578191552 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BRL-CAD"; repo = "brlcad"; - rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; }; diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index 55b677cc84bf..ead0880b2857 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -16,7 +16,7 @@ buildGoModule { src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; }; diff --git a/pkgs/by-name/ca/cached-nix-shell/package.nix b/pkgs/by-name/ca/cached-nix-shell/package.nix index af6394ac5543..f85523197cfc 100644 --- a/pkgs/by-name/ca/cached-nix-shell/package.nix +++ b/pkgs/by-name/ca/cached-nix-shell/package.nix @@ -10,7 +10,7 @@ let blake3-src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; - rev = "refs/tags/1.5.1"; + tag = "1.5.1"; hash = "sha256-STWAnJjKrtb2Xyj6i1ACwxX/gTkQo5jUHilcqcgJYxc="; }; in @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xzfc"; repo = "cached-nix-shell"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI="; }; diff --git a/pkgs/by-name/ca/caddyfile-language-server/package.nix b/pkgs/by-name/ca/caddyfile-language-server/package.nix new file mode 100644 index 000000000000..de354fbb2d1e --- /dev/null +++ b/pkgs/by-name/ca/caddyfile-language-server/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchPnpmDeps, + pnpm_8, + nodejs, + pnpmConfigHook, + makeBinaryWrapper, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "caddyfile-language-server"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "caddyserver"; + repo = "vscode-caddyfile"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IusP9Z3e8mQ0mEhI1o1zIqPDB/i0pqlMfnt6M8bzb2w="; + }; + + pnpmWorkspaces = [ "@caddyserver/caddyfile-language-server" ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + pnpm = pnpm_8; + fetcherVersion = 3; + hash = "sha256-D9kYFkmFlvg4r6vR9PHHAwF0qglHsTuRae0Z7CzDq1M="; + }; + + nativeBuildInputs = [ + pnpm_8 + pnpmConfigHook + nodejs + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + pnpm --filter=@caddyserver/caddyfile-language-server run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + rm -rf node_modules packages/server/node_modules + pnpm install --production --offline --force --filter=@caddyserver/caddyfile-language-server + mkdir -p $out/lib/node_modules/caddyfile-language-server/ + mv packages/server/dist/* $out/lib/node_modules/caddyfile-language-server/ + + makeWrapper ${lib.getExe nodejs} $out/bin/caddyfile-language-server \ + --add-flags "$out/lib/node_modules/caddyfile-language-server/index.js" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/caddyserver/vscode-caddyfile/releases/tag/v${finalAttrs.version}"; + description = "Basic language server for caddyfile"; + homepage = "https://github.com/caddyserver/vscode-caddyfile"; + mainProgram = "caddyfile-language-server"; + maintainers = with lib.maintainers; [ pyrox0 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index 87fc242bed68..6d4100e7c8ca 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitLab { owner = "yaal"; repo = "canaille"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4="; }; diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index ca87438bf061..d7d8b6830443 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -10,7 +10,7 @@ let pname = "cargo-mobile2"; - version = "0.22.1"; + version = "0.22.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = "cargo-mobile2"; rev = "cargo-mobile2-v${version}"; - hash = "sha256-+U/uTbTGa3NPK5WpyvR5C5L1ozl+fa15pNNWYZJXgnk="; + hash = "sha256-pSp7w823Jjjg0PEnCc7jVLBbOgvR7JAjtD8OK5voC0A="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-fMtFvPrWMLHE4N9WJv6J4pqHbHPnNKhQWz5qEvB8jKQ="; + cargoHash = "sha256-aci1QF/O2J6Yix4UkxPCVW+c+xoqm7AvdhlkF7y1GqA="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 0e2317ab0265..201a60a54ac4 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "lighttigerXIV"; repo = "catppuccinifier"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE="; }; diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix index 5a7494eecda6..52bb3d857699 100644 --- a/pkgs/by-name/ce/ceph/package.nix +++ b/pkgs/by-name/ce/ceph/package.nix @@ -153,7 +153,7 @@ let src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; - rev = "refs/tags/v7.9.2"; + tag = "v7.9.2"; hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; }; diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 748bce5deb08..310994e29800 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "zelikos"; repo = "rollit"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-25+/TvTba/QF7+QE8+O7u4yc9BNi0pcZeNj11dGkEfg="; }; diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix index 4a97ba3c894f..16ad7447de1d 100644 --- a/pkgs/by-name/ch/chiptrack/package.nix +++ b/pkgs/by-name/ch/chiptrack/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "jturcotte"; repo = "chiptrack"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yQP5hFM5qBWdaF192PBvM4il6qpmlgUCeuwDCiw/LaQ="; }; @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "refs/tags/m129-0.77.1"; + tag = "m129-0.77.1"; hash = "sha256-WRVuQpfRnYrE7KGFRFx66fXtMFmtJbC3xUcRPK1JoOM="; }; # The externals for skia are taken from skia/DEPS diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/by-name/ck/ckb-next/install-dirs.patch similarity index 100% rename from pkgs/tools/misc/ckb-next/install-dirs.patch rename to pkgs/by-name/ck/ckb-next/install-dirs.patch diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/by-name/ck/ckb-next/modprobe.patch similarity index 100% rename from pkgs/tools/misc/ckb-next/modprobe.patch rename to pkgs/by-name/ck/ckb-next/modprobe.patch diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/by-name/ck/ckb-next/package.nix similarity index 78% rename from pkgs/tools/misc/ckb-next/default.nix rename to pkgs/by-name/ck/ckb-next/package.nix index 61682c9b017c..70f4db66cb5d 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/by-name/ck/ckb-next/package.nix @@ -1,51 +1,48 @@ { lib, - wrapQtAppsHook, fetchFromGitHub, replaceVars, udev, stdenv, pkg-config, - qtbase, + qt6, + qt6Packages, cmake, zlib, kmod, libXdmcp, - qttools, - qtx11extras, - libdbusmenu, gnused, withPulseaudio ? stdenv.hostPlatform.isLinux, libpulseaudio, - quazip, udevCheckHook, + wayland-protocols, }: -stdenv.mkDerivation rec { - version = "0.6.2"; +stdenv.mkDerivation { + version = "0.6.2-unstable-2025-09-25"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; - rev = "v${version}"; - hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU="; + rev = "4bf942dba5e73c2778ef797b6b8dd6b0239aca9a"; + hash = "sha256-sKgA1LZXZ64OixhbBWYUyCN4y29DRG0O0b/bAMd1I8M="; }; buildInputs = [ udev - qtbase + qt6.qtbase zlib libXdmcp - qttools - qtx11extras - libdbusmenu - quazip + qt6.qttools + qt6Packages.quazip + qt6.qtwayland + wayland-protocols ] ++ lib.optional withPulseaudio libpulseaudio; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook pkg-config cmake udevCheckHook diff --git a/pkgs/by-name/cn/cns11643-kai/package.nix b/pkgs/by-name/cn/cns11643-kai/package.nix index 04befdc176fd..bc63e2314301 100644 --- a/pkgs/by-name/cn/cns11643-kai/package.nix +++ b/pkgs/by-name/cn/cns11643-kai/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "rypervenche"; repo = "cns11643-fonts"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-A/4iwNvyzOYEpBzxKeq1xM/6aU6EOCATAr0lQlyckKQ="; }; diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix index e76ec150994e..a46f90429f8d 100644 --- a/pkgs/by-name/co/codd/package.nix +++ b/pkgs/by-name/co/codd/package.nix @@ -24,7 +24,7 @@ let src = fetchFromGitHub { owner = "mzabani"; repo = "codd"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-KdZCL09TERy/PolQyYYykEbPtG5yhxrLZSSo9n6p2WE="; }; diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 0f71c6b921ce..7f11746e2d98 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "2.3.29", + "version": "2.3.35", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/x64/Cursor-2.3.29-x86_64.AppImage", - "hash": "sha256-uWgUCXo0MHNyiigiymr0LoMoATePp0dksI7JyR/5bRY=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/linux/x64/Cursor-2.3.35-x86_64.AppImage", + "hash": "sha256-o/NIEtSOlUl67g18mWDG4M0thPA4VIfiWudv0Xiov08=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/arm64/Cursor-2.3.29-aarch64.AppImage", - "hash": "sha256-/oUz5wNRtPKYkEIKpHhcjWZNAAhTMvNdJLm+sXE9pDg=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/linux/arm64/Cursor-2.3.35-aarch64.AppImage", + "hash": "sha256-2l9ppSze2nkvAfszblkhMSl+QhGENNe62AlgCcXBhfM=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-A93Glr2bOL6zSu0XTgNj0Pmt6G2ufRgf4lPJ0xcGhow=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-Jl6t4oHC6nqOGDKUvvfViPgKJzpG2vpvht4JMBLHzVk=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-cp/aTNapbwRXxdUU0fWs3HliV7rCmT/2CbNXqZPMpEs=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-ZHxvA+iDluib9PLl5ilthdd0Z+xT+w9OSD25vySc9wI=" } } } diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 667cc718bf84..23cee1899d55 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.565" + "codebuff": "^1.0.581" } }, "node_modules/chownr": { @@ -18,9 +18,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.565", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.565.tgz", - "integrity": "sha512-tYuW8FZ+vxsZOo4ZE1p87p6z0dDGqshCV0H3nE2WU8uv1DESb4HdhVQOioiFLOhyCM4iRx06gQwphUHxKyLZ6Q==", + "version": "1.0.581", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.581.tgz", + "integrity": "sha512-3lMaeo/TqALXwPWwPvwaIGaVlJcz7cXisEvEGqG4qjOUIFPd+mpiZBw1nF64U67fSxkjvll1/JNKk/mZTEAVng==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 6061482feed9..d6411c2e88ed 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.565"; + version = "1.0.581"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-d27TTkr5pgo0m4CeLtOlcO5FimlJwp0D9TXQHXW7vYc="; + hash = "sha256-A5sEqkw9nm9ijyq7FT0vVNegbDl1LXQHI62dfdP/0WI="; }; - npmDepsHash = "sha256-TJd+0gXQIrXuqFaYO4OAHtZc2Cm6cOt9DtO/QAH3ZYc="; + npmDepsHash = "sha256-CEoacNXow99r4i9cF2BUA5dNcgU1dCBc4dq0n0p7CBU="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/coloquinte/package.nix b/pkgs/by-name/co/coloquinte/package.nix index f711e84a80bb..a4fa5e081480 100644 --- a/pkgs/by-name/co/coloquinte/package.nix +++ b/pkgs/by-name/co/coloquinte/package.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Coloquinte/PlaceRoute"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.coloquinte ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix index 91620d2baa2d..1908dc3f0a58 100644 --- a/pkgs/by-name/co/commitlint-rs/package.nix +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "KeisukeYamashita"; repo = "commitlint-rs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-rNCMvIVJ/aOTNMyAmwX3Ir6IjHf6wxZ1XlGIWp7omkQ="; }; diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix index f3ffa28fac7a..251b1cf456e3 100644 --- a/pkgs/by-name/co/conduktor-ctl/package.nix +++ b/pkgs/by-name/co/conduktor-ctl/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "conduktor"; repo = "ctl"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-zaguB4LLkzXlMQCEVOWkUUsEovU53F0B51w3BnVjre8="; }; diff --git a/pkgs/by-name/cr/create-dmg/package.nix b/pkgs/by-name/cr/create-dmg/package.nix index c1a242369c70..fa99835492da 100644 --- a/pkgs/by-name/cr/create-dmg/package.nix +++ b/pkgs/by-name/cr/create-dmg/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "create-dmg"; repo = "create-dmg"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oWrQT9nuFcJRwwXd5q4IqhG7M77aaazBG0+JSHAzPvw="; }; diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix index 2e1b357a6c58..913ea4ae55e8 100644 --- a/pkgs/by-name/da/davix/package.nix +++ b/pkgs/by-name/da/davix/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cern-fts"; repo = "davix"; - rev = "refs/tags/R_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-n4NeHBgQwGwgHAFQzPc3oEP9k3F/sqrTmkI/zHW+Miw="; }; diff --git a/pkgs/by-name/da/davs2/package.nix b/pkgs/by-name/da/davs2/package.nix index 80cba69d12f0..40bf44c78238 100644 --- a/pkgs/by-name/da/davs2/package.nix +++ b/pkgs/by-name/da/davs2/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pkuvcl"; repo = "davs2"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-SUY3arrVsFecMcbpmQP0+4rtcSRfQc6pzxZDcEuMWPU="; }; diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix index c88618290d3c..c825db3b1f70 100644 --- a/pkgs/by-name/de/debootstrap/package.nix +++ b/pkgs/by-name/de/debootstrap/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "installer-team"; repo = "debootstrap"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-4vINaMRo6IrZ6e2/DAJ06ODy2BWm4COR1JDSY52upUc="; }; diff --git a/pkgs/by-name/de/defuddle-cli/package.nix b/pkgs/by-name/de/defuddle-cli/package.nix index 871042e46e55..85bbbb4b2c24 100644 --- a/pkgs/by-name/de/defuddle-cli/package.nix +++ b/pkgs/by-name/de/defuddle-cli/package.nix @@ -12,7 +12,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "kepano"; repo = "defuddle-cli"; - tag = "${version}"; + tag = version; hash = "sha256-28XmpFKzBKNhRkPOGaacJVw8hjQUZq2nwuR0vNo8aW0="; }; diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix index 601d99c494b0..3b530637a936 100644 --- a/pkgs/by-name/de/deterministic-zip/package.nix +++ b/pkgs/by-name/de/deterministic-zip/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "timo-reymann"; repo = "deterministic-zip"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc="; }; diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 9e86043a6282..9ba1f3c84f90 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -19,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.80.1"; + version = "0.81.1"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-riDe8j/DCSuXpuFi27tmT5KjruuJiCrUeP022V4sYjU="; + hash = "sha256-sMhCYDhQfyuzIuGR3eaf713gkUGfrj6b3Ldt4W3KdUw="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-joctNMzQXC/A9A69sJkKbED9pqMcbK1ZYiHPdJBJKCE="; + hash = "sha256-E+IbJjj7/iVUkGVKJMpoYMYiRXlwOLsxXAGNmdG5tBM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix index 36ba8ee60758..c2f7989ec58a 100644 --- a/pkgs/by-name/di/diffnav/package.nix +++ b/pkgs/by-name/di/diffnav/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dlvhdr"; repo = "diffnav"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QDPH7vBoA4YCmC+CLmeBdspwOhFEV3iSiyBYX6lwOLA="; }; diff --git a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix index ab5a20d74ee8..b5644f536fab 100644 --- a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix +++ b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "slusarz"; repo = "dovecot-fts-flatcurve"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-96sR/pl0G0sSjh/YrXdgVgASJPhrL32xHCbBGrDxzoU="; }; diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix index 25c6cb40a177..f0f4021405ba 100644 --- a/pkgs/by-name/ec/ecwolf/package.nix +++ b/pkgs/by-name/ec/ecwolf/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromBitbucket { owner = "ecwolf"; repo = "ecwolf"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-T5K6B2fWMKMLB/662p/YLEv0Od9n0vUakznyoOnr0kI="; }; diff --git a/pkgs/by-name/en/enpass-cli/package.nix b/pkgs/by-name/en/enpass-cli/package.nix index 4b973979fff9..275044e85ca4 100644 --- a/pkgs/by-name/en/enpass-cli/package.nix +++ b/pkgs/by-name/en/enpass-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "enpass-cli"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitHub { owner = "HazCod"; repo = "enpass-cli"; tag = "v${version}"; - hash = "sha256-13AhK0qDDANEgicggy1Sdlmo5b0Vlf2sEDzJerhUvG8="; + hash = "sha256-SloFiV+tmdjiHjeS/SsDMLZ9gjNB/EOmgexMXpu253I="; }; - vendorHash = "sha256-7K7gdMjJ4cfv6xmuI73U+oW9JlmdN6wGg8vMcD/YThQ="; + vendorHash = "sha256-S02hHPA7WSAMLELhfD+2cmsbhxsCiXdPbikU/GGubPc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix index 9ab3e2973b29..418ced9fd5ce 100644 --- a/pkgs/by-name/en/entangle/package.nix +++ b/pkgs/by-name/en/entangle/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "entangle"; repo = "entangle"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0="; }; diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index a7addc3a02e5..ec8b144b022b 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ce5n7E+eJLPnj/dUnaaDi4R8kKO4+iOcQgdtOin4NcM="; }; diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 4ab7fdb6c3da..4ca493db7b3a 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q="; }; diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index 6fd844ff4e22..197180f5639c 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-yIlaAjPNcA7yIiCe+2kwk5IHIkwUv8bTxK0H3hu91MI="; }; diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix index 6c5a82dde4a1..68017979200c 100644 --- a/pkgs/by-name/ez/eztrace/package.nix +++ b/pkgs/by-name/ez/eztrace/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "eztrace"; repo = "eztrace"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU="; }; diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix index 22eab7204620..139dbd765ab3 100644 --- a/pkgs/by-name/fl/flamerobin/package.nix +++ b/pkgs/by-name/fl/flamerobin/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "mariuz"; repo = "flamerobin"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s="; }; diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 929d8019f937..602508d0b265 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -41,7 +41,7 @@ let src = fetchFromGitLab { owner = "flightgear"; repo = "fgdata"; - tag = "${version}"; + tag = version; hash = "sha256-LNHO/W8p4b8fYcehdfVecldKQ9uJp1zlg60xdgDC45c="; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "flightgear"; repo = "flightgear"; - tag = "${version}"; + tag = version; hash = "sha256-m4bbWwMXwKJrMkb6svGrIZhcsPghrTMgFs8JCx3Wn/A="; }; diff --git a/pkgs/by-name/fn/fnlfmt/package.nix b/pkgs/by-name/fn/fnlfmt/package.nix index f5455d32e54d..9d00ae87dccb 100644 --- a/pkgs/by-name/fn/fnlfmt/package.nix +++ b/pkgs/by-name/fn/fnlfmt/package.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromSourcehut { owner = "~technomancy"; repo = "fnlfmt"; - rev = "refs/tags/${version}"; - hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk="; + tag = version; + hash = "sha256-wbeWAv4xhxh7M6tRd9qpgBRtg1/fqg0AUPvh2M5f60Q="; }; nativeBuildInputs = [ luaPackages.fennel ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "FENNEL=${luaPackages.fennel}/bin/fennel" ]; - sourceRoot = [ "${src.name}/tags/${version}" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix index 2de02227d7bd..1790d42f1054 100644 --- a/pkgs/by-name/fo/footage/package.nix +++ b/pkgs/by-name/fo/footage/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "adhami3310"; repo = "Footage"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-VEL96JrJ5eJEoX2miiB4dqGUXizNlYWCUZkkYkh09B8="; }; diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 0a57dd155d85..d4227a77c1f4 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "13.0.4"; - hash = "sha256-AZQ4ppJES4CsvlkzBX82KfEp3PlFa2Ypd1KmTj/SXJk="; - npmDepsHash = "sha256-v+vl0fxcnqH8Jp4BILDYe5ioFQTQkB2XnFVEtkgadPc="; - vendorHash = "sha256-tq/72teHKowp6jwOKIJxS0OkcFI7UV19uTAv/OB/rm8"; + version = "14.0.0"; + hash = "sha256-kQaaRwVUYIYTTjWcHKb09CzygDR6lhEbnY3FOsnyYpg="; + npmDepsHash = "sha256-rdlVXdoov3zppDgoLODl22AKCdm+AXiV1O63dmo6trg="; + vendorHash = "sha256-7xgm57IqsFOh3CPwGybPHLLlckGLplJpU7M5upYKBl8="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix index 7682e45f07b2..5e8595860e2c 100644 --- a/pkgs/by-name/fp/fprintd/package.nix +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "libfprint"; repo = "fprintd"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aGIz50S0zfE3rV6QJp8iQz3uUVn8WAL68KU70j8GyOU="; }; diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 8d084497a755..49cdbdf5ffd6 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,14 +20,14 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.12-unstable-2025-12-13"; + version = "0.23.12-unstable-2026-01-15"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; # tag = "v${finalAttrs.version}-beta"; - rev = "6717114de5653b08caec20b7bf3f3217723866a4"; - hash = "sha256-PfK4Ny8MyBJ9Xw6ozJUzu+4rX+/rLWNac3lE8dBNPE0="; + rev = "e110a4b603e0f5f275d210aea005698a0d4b26ad"; + hash = "sha256-kq6twf7ce2987iHtwikPzolzzbxr1xcoirqUGpPG4V8="; }; # Darwin requires writable Electron dist @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-at/Kq7M8qSjlDmB6R4z51VRZRvkKAGyjU6sgHho8tBQ="; + hash = "sha256-E6D2Uo06MAcnOKy00e5JoLdKQOeGVr7y7Lu6rZ1F82M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/galene-stream/package.nix b/pkgs/by-name/ga/galene-stream/package.nix index 5f117560e909..4e140debf9f7 100644 --- a/pkgs/by-name/ga/galene-stream/package.nix +++ b/pkgs/by-name/ga/galene-stream/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "erdnaxe"; repo = "galene-stream"; - tag = "${version}"; + tag = version; hash = "sha256-3TdU3vBVuFle+jon2oJLa/rTLIiwYkvzscTDbMEXD1Q="; }; diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 69a1b061e415..abf75565b3cd 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-tjJIIKv4+ElmhLIaZAC/MIqhsZI6RzZBAkXZoN4nLeM="; + hash = "sha256-BLW0ACn3e8tm040UbolXyLtwHlienddQ+9HXj4deNd8="; }; - cargoHash = "sha256-sQJrhkyRYTfk2qQ7FXG6IQ4js9Jq4BSWAh9z0V0jdm8="; + cargoHash = "sha256-htBnnqyHpJFsSERlNsXXKnIRu9CcanqIVd+OwTAmrFw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ge/geoclue2/package.nix b/pkgs/by-name/ge/geoclue2/package.nix index 989b40c5ce9f..95fb94098f4c 100644 --- a/pkgs/by-name/ge/geoclue2/package.nix +++ b/pkgs/by-name/ge/geoclue2/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "geoclue"; repo = "geoclue"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs="; }; diff --git a/pkgs/by-name/gh/ghost-cli/package.nix b/pkgs/by-name/gh/ghost-cli/package.nix index 8bb91e624f9a..836e150aa256 100644 --- a/pkgs/by-name/gh/ghost-cli/package.nix +++ b/pkgs/by-name/gh/ghost-cli/package.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghost-cli"; - version = "1.28.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "TryGhost"; repo = "Ghost-CLI"; tag = "v${finalAttrs.version}"; - hash = "sha256-hmLEkYivIH3uNOz6umEYU+A843a7d1M31OE5RCQ9WRQ="; + hash = "sha256-T8NiGrJNUHrJouIjlOfjshlWggW63JCGw4GFcoMkjR0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-ncZ5ULF1nE0vl+WISfEGZKtABT+pkJtWjHMkT1BjPCE="; + hash = "sha256-osiFLpsEGyXtGDnqJCqu9dP4+Rmay20Ep1PUvRWkIWo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 69f20085ad29..cbae5d1dba14 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.27.4"; + version = "2.27.5"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-bPGWqWNXvl+kHi5/LLdZ8zw/OXxg06mr6ZWjIQH4QJg="; + sha256 = "sha256-e4iEMRzWTnMoY/tjN/w2T0Rq3zGd0sOxoe9vgUouxf8="; }; vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ="; diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix index 919ece7b4b19..1b58d232c8a6 100644 --- a/pkgs/by-name/gi/git-credential-oauth/package.nix +++ b/pkgs/by-name/gi/git-credential-oauth/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "hickford"; repo = "git-credential-oauth"; rev = "v${version}"; - hash = "sha256-QvR09UiLWzonmFPZopXJozMSd58nGW4yVxn/JkAmV3A="; + hash = "sha256-M4SsqF5RE2OZv7Ehf5o79lyeNmNlkiYDPyz2G6HYC88="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index c7d0ed73ae29..05587d6ff6ba 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -4,16 +4,16 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gitxray"; - version = "1.0.19"; + version = "1.0.20"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; - tag = version; - hash = "sha256-jdN91oiKMr8ozjsQG2+lI55nPbjBa+ipWG9GYeFXCDw="; + tag = finalAttrs.version; + hash = "sha256-pnP9vqyobB9MY8axBokzZvM4L8Th3/wDA4adpNyF0G8="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -25,9 +25,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool which leverages Public GitHub REST APIs for various tasks"; homepage = "https://github.com/kulkansecurity/gitxray"; - changelog = "https://github.com/kulkansecurity/gitxray/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/kulkansecurity/gitxray/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "gitxray"; }; -} +}) diff --git a/pkgs/by-name/gl/gle/package.nix b/pkgs/by-name/gl/gle/package.nix index b2aa72fb03ac..f769cf015daa 100644 --- a/pkgs/by-name/gl/gle/package.nix +++ b/pkgs/by-name/gl/gle/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "linas"; repo = "glextrusion"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; sha256 = "sha256-yvCu0EOwxOMN6upeHX+C2sIz1YVjjB/320g+Mf24S6g="; }; diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix index 04853be5b4db..38eaaf08cfc7 100644 --- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix +++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-pgfIutJkpH4oELEQu1/3vJ1RPVLF+r4EAV3KpOLZixY="; + sha256 = "sha256-fKLyUaKcZfrBarKumjLmK+g9C0VZOYixxNXP7rU83co="; }; vendorHash = "sha256-MXWJ/riQTzAgUNJWvAzSvdHTAzRymlHheeNyJoKGAF4="; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 7506de87141d..71a6f5cb9eb5 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.34.2"; + version = "22.35.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${version}"; - hash = "sha256-naCk99ZxupBx590MRBorvsNxlYCuKC/B8fufGnZDH1A="; + hash = "sha256-3TWJyh9xzS/HLRjAc4hsBuu3P0SquHEZXjunWw1FqWU="; }; postPatch = '' diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix index e6bdb12bb62d..563eb31c4a3c 100644 --- a/pkgs/by-name/ha/har-to-k6/package.nix +++ b/pkgs/by-name/ha/har-to-k6/package.nix @@ -8,18 +8,18 @@ buildNpmPackage rec { pname = "har-to-k6"; - version = "0.14.11"; + version = "0.14.12"; src = fetchFromGitHub { owner = "grafana"; repo = "har-to-k6"; tag = "v${version}"; - hash = "sha256-ACt9MNxcEyfg7lkeFBK/KnssbI4jkER0Ua/llQWLpxU="; + hash = "sha256-9LOL67K1hPPioN0eWPEucMb+jy6WcAYsO4Mm34T9NB4="; }; dontNpmBuild = true; - npmDepsHash = "sha256-RuK3CzcMkPt5MFEZpYBDtMMShHTT/115pRk1CmRkiek="; + npmDepsHash = "sha256-dKt3TPZye/HO2j06EcN5G1iShaKazMpHUaWdwvEN5pk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index 6225a757e8ec..626a5f348cd2 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hextazy"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "0xfalafel"; repo = "hextazy"; tag = version; - hash = "sha256-sglKEdmfS8+PHsgZ/Z7HJs9+lrkD0pFvfUDrKtEdRNQ="; + hash = "sha256-ejF2AVVp6Q7pM4tk/lWty83sUTIYhiffjRgn0KJwYO0="; }; - cargoHash = "sha256-E0ia/I7e40lDG24qYUCOwWNKSZ9/VmI5/4BsIKmE61I="; + cargoHash = "sha256-ER9+SJ8kfXJtdh7XB51rYd20IkjyEqWuon9OXpwKLAA="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix index 00f166181a7e..ded0143917db 100644 --- a/pkgs/by-name/hy/hygg/package.nix +++ b/pkgs/by-name/hy/hygg/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "kruseio"; repo = "hygg"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-wxgHlRqe/g9LppWWTzft9hTA8heuFvGkKvA7nG2PsxA="; }; diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix index f5d95e0bf94b..a294bc3e519d 100644 --- a/pkgs/by-name/i3/i3status-rust/package.nix +++ b/pkgs/by-name/i3/i3status-rust/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Eam0MDACJN/a8J1Za7Xwy0Jlv/KGNn4M13C2yaCgLnU="; }; diff --git a/pkgs/by-name/il/illuminanced/package.nix b/pkgs/by-name/il/illuminanced/package.nix index 4151fd7b58e4..a909ba87fd84 100644 --- a/pkgs/by-name/il/illuminanced/package.nix +++ b/pkgs/by-name/il/illuminanced/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "mikhail-m1"; repo = "illuminanced"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ZEVma0uj9rsWB+vfUL7w3dHxI/ppBCG23TirGE+RREk="; }; diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index 0a4eba3b2200..c000b9922a2b 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ingress2gateway"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "ingress2gateway"; rev = "v${version}"; - hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I="; + hash = "sha256-pX/4WFqYkBPnaEki3q3CahBCePUvKQzVulT+oMtUXQc="; }; - vendorHash = "sha256-7b247/9/9kdNIYuaLvKIv3RK/nzQzruMKZeheTag2sA="; + vendorHash = "sha256-NlQbjKU5EoNY70ziDs98394LSxSIyTGsGgP1S22ynDA="; ldflags = [ "-s" diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index 4e7f83da01f1..dd95a1bbce15 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0="; }; diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 5ac25de4e2a2..970efb5a1724 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -14,7 +14,7 @@ buildGoModule { src = fetchFromGitLab { owner = "gaincoder"; repo = "invidious-router"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo="; }; diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix index 88ffd1d860a4..e54ac0d2b3bf 100644 --- a/pkgs/by-name/ip/ipinfo/package.nix +++ b/pkgs/by-name/ip/ipinfo/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = pname; repo = "cli"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; hash = "sha256-sdQdCP2NotrdeqYrSd9c6sExFeuX54I4fxJfEyULPuk="; }; diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index c4a12b766ef6..a4383324033d 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; tag = finalAttrs.version; - hash = "sha256-96NiBE0/sBnIdajKui3pZmR8IGlElbeoyqYEYFWtOuM="; + hash = "sha256-rmmVFsRTnWbVNg6X9O6BHr5yTt9m/DSA8Y+HLnG80Zc="; }; patches = [ ./nocontent.patch ]; diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index 68032948b103..3c67a0fafb9a 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "codeberg.org"; owner = "baarkerlounger"; repo = "jogger"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM="; }; diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 6dc26810e979..8a488ce96be6 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ZTwe6S0AH1yQt5mABtIeWuMbiVSKeOZWMFI26fthLsM="; }; diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix index 7203e0388f3e..55bba282a623 100644 --- a/pkgs/by-name/ka/kapacitor/package.nix +++ b/pkgs/by-name/ka/kapacitor/package.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "influxdata"; repo = "flux"; - rev = "refs/tags/v${libflux_version}"; + tag = "v${libflux_version}"; hash = "sha256-v9MUR+PcxAus91FiHYrMN9MbNOTWewh7MT6/t/QWQcM="; }; patches = [ @@ -73,7 +73,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "influxdata"; repo = "kapacitor"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-vxaLfJq0NFAJst0/AEhNJUl9dAaZY3blZAFthseMSX0="; }; diff --git a/pkgs/by-name/ka/kazv/package.nix b/pkgs/by-name/ka/kazv/package.nix index 048bc2c837cd..bdb82fadac73 100644 --- a/pkgs/by-name/ka/kazv/package.nix +++ b/pkgs/by-name/ka/kazv/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "lily-is.land"; owner = "kazv"; repo = "kazv"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto="; }; diff --git a/pkgs/by-name/kl/klassy/package.nix b/pkgs/by-name/kl/klassy/package.nix new file mode 100644 index 000000000000..2cff91c1a4d5 --- /dev/null +++ b/pkgs/by-name/kl/klassy/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + kdePackages, + gitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "klassy"; + version = "6.4.breeze6.4.0"; + + src = fetchFromGitHub { + owner = "paulmcauley"; + repo = "klassy"; + tag = finalAttrs.version; + hash = "sha256-+bYS2Upr84BS0IdA0HlCK0FF05yIMVbRvB8jlN5EOUM="; + }; + + nativeBuildInputs = [ + cmake + ninja + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook + ]; + + buildInputs = with kdePackages; [ + qtbase + qtdeclarative + qttools + qtsvg + + frameworkintegration + kcmutils + kcolorscheme + kconfig + kcoreaddons + kdecoration + kguiaddons + ki18n + kiconthemes + kirigami + kwidgetsaddons + kwindowsystem + ]; + + # Klassy tries to build for both Qt 5 and 6 at the same time by default + # but that is impossible given how Qt setup hooks are currently designed + # in Nixpkgs. Given that KDE Plasma 5 has already been removed as of the + # time of writing, I figure it's fine to only build the Qt 6 version. + cmakeFlags = [ + (lib.cmakeBool "BUILD_QT6" true) + (lib.cmakeBool "BUILD_QT5" false) + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Highly customizable binary Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop"; + homepage = "https://github.com/paulmcauley/klassy"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + bsd3 + cc0 + gpl2Only + gpl2Plus + gpl3Only + gpl3Plus # KDE-Accepted-GPL + mit + ]; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "klassy-settings"; + }; +}) diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix index bb6c37901481..cd4104b39438 100644 --- a/pkgs/by-name/ko/komari-agent/package.nix +++ b/pkgs/by-name/ko/komari-agent/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "komari-monitor"; repo = "komari-agent"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-aWCsaiYkpj0D9hr7V3pxSk14pMD2E117vwemt9Ckqv0="; }; diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index f49099f74015..16b23b5dec66 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication { owner = "teixeira0xfffff"; repo = "KoodousFinder"; # Not properly tagged, https://github.com/teixeira0xfffff/KoodousFinder/issues/7 - #rev = "refs/tags/v${version}"; + #tag = "v${version}"; rev = "d9dab5572f44e5cd45c04e6fcda38956897855d1"; hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk="; }; diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index acefefcdc13e..a582d8fd6c1d 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg="; }; diff --git a/pkgs/by-name/li/lib2geom/package.nix b/pkgs/by-name/li/lib2geom/package.nix index 17fc5ec2630b..6bd3333901fe 100644 --- a/pkgs/by-name/li/lib2geom/package.nix +++ b/pkgs/by-name/li/lib2geom/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "inkscape"; repo = "lib2geom"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-kbcnefzNhUj/ZKZaB9r19bpI68vxUKOLVAwUXSr/zz0="; }; diff --git a/pkgs/by-name/li/libkazv/package.nix b/pkgs/by-name/li/libkazv/package.nix index e4206da49575..1740c15f8cef 100644 --- a/pkgs/by-name/li/libkazv/package.nix +++ b/pkgs/by-name/li/libkazv/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "lily-is.land"; owner = "kazv"; repo = "libkazv"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw="; }; diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index 65940b449752..a4631e0a5d70 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "loot"; repo = "libloot"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-l8AdqJ0lZH4rBcf4WV3ju+sIHYam6USXCXTqyRPzgeo="; }; diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix index 650bf2778629..449aad351861 100644 --- a/pkgs/by-name/li/libsfdo/package.nix +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "vyivel"; repo = "libsfdo"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xT1pKKElwKSd43XTKuBY+9rogquV1IAAYgWV5lEpAHk="; }; diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix index 8c894f42d192..5c877ab22386 100644 --- a/pkgs/by-name/li/likwid/package.nix +++ b/pkgs/by-name/li/likwid/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "likwid"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "https://ftp.fau.de/pub/likwid/likwid-${version}.tar.gz"; - hash = "sha256-aIkk/gE0BwfCwxi3+GfuYPt1G5X0lUvILTofdqOhUFY="; + hash = "sha256-JceDDmOyA5b8/DsWrnnDm0IgqG03bOt81pSbX/mR23g="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 0f1331ef934a..d18cc930f148 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "lk-jwt-service"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qb+6DzaObeNjV+XVXLR6GkgtodIVTqTxC4G4Ef2xFrE="; + hash = "sha256-x3QYq+PT0MFcRR50CG4NpCxv5KkoCLWzUEkPSdQnZX0="; }; vendorHash = "sha256-GJKSvdv41rRSCGVAgUDxHdXoxRj/h+eDktjRJ3O5QFE="; diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 49fe455bdfef..a8f6609b17b7 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -17,7 +17,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "182"; + version = "183"; outputs = [ "out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-w/VQS8uCpgniwLiJsH/8IG/AGasRxjCv7fADTfpvWLw="; + hash = "sha256-5TIcDK6M/9jDkJDWafRGw+/TaW7Pbvn1yl9ijnzP/Mc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix index 8afe7088df0e..3262818e4a39 100644 --- a/pkgs/by-name/ll/llama-swap/ui.nix +++ b/pkgs/by-name/ll/llama-swap/ui.nix @@ -7,7 +7,7 @@ buildNpmPackage (finalAttrs: { pname = "${llama-swap.pname}-ui"; inherit (llama-swap) version src; - npmDepsHash = "sha256-RKPcMwJ0qVOgbTxoGryrLn7AW0Bfmv9WasoY+gw4B30="; + npmDepsHash = "sha256-fIDn3vfrqTZfzK8dc+Vpckw9M2iyJi5ggHFEV8PeXtU="; postPatch = '' substituteInPlace vite.config.ts \ diff --git a/pkgs/by-name/lu/luarenamer/deps.json b/pkgs/by-name/lu/luarenamer/deps.json new file mode 100644 index 000000000000..e2152a081e39 --- /dev/null +++ b/pkgs/by-name/lu/luarenamer/deps.json @@ -0,0 +1,32 @@ +[ + { + "pname": "KeraLua", + "version": "1.4.5", + "hash": "sha256-O3ozcLw1IVc6ssc3SZfPIvp5s0+xLyLuTZw6qrjyEyE=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.0", + "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.0", + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.0", + "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" + }, + { + "pname": "NLua", + "version": "1.7.5", + "hash": "sha256-1s8cc1RqKnfwafhxpBhOdkr8ZteNjt5fBN2sfLy4e5k=" + }, + { + "pname": "Shoko.Plugin.Abstractions", + "version": "5.2.0", + "hash": "sha256-tNLOeum4rc30OEWRiH1zTzLk5+1MfSEOfvkON1MU/SY=" + } +] diff --git a/pkgs/by-name/lu/luarenamer/nozip.patch b/pkgs/by-name/lu/luarenamer/nozip.patch new file mode 100644 index 000000000000..4275043d6611 --- /dev/null +++ b/pkgs/by-name/lu/luarenamer/nozip.patch @@ -0,0 +1,35 @@ +diff --git a/LuaRenamer/LuaRenamer.csproj b/LuaRenamer/LuaRenamer.csproj +index c4f0508..b9e001c 100644 +--- a/LuaRenamer/LuaRenamer.csproj ++++ b/LuaRenamer/LuaRenamer.csproj +@@ -33,30 +33,4 @@ + + + +- +- +- +- +- +- +- $([System.Text.RegularExpressions.Regex]::Match('$(GitInfo)', '\d+\.\d+\.\d+')) +- $(GitInfo) +- +- +- +- +- +- $(PublishDir)ZipDir/ +- $(PublishDir)../$(ProjectName)_$([MSBuild]::ValueOrDefault("$(RuntimeIdentifier)","Portable"))_$(GitInfo).zip +- +- +- +- +- +- +- +- +- +- +- + diff --git a/pkgs/by-name/lu/luarenamer/package.nix b/pkgs/by-name/lu/luarenamer/package.nix new file mode 100644 index 000000000000..a07b0d64f1fb --- /dev/null +++ b/pkgs/by-name/lu/luarenamer/package.nix @@ -0,0 +1,49 @@ +# SPDX-FileCopyrightText: 2025-2026 Hana Kretzer +# +# SPDX-License-Identifier: MIT +{ + lib, + buildDotnetModule, + fetchFromGitHub, + dotnet-sdk_8, + dotnet-aspnetcore_8, + nix-update-script, +}: + +buildDotnetModule (finalAttrs: { + pname = "luarenamer"; + version = "5.10.1"; + + src = fetchFromGitHub { + owner = "Mik1ll"; + repo = "LuaRenamer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZN7o9q3APgc7vL+IRpk6Phd0Btpzyqdp53aoGp6sA8o="; + }; + + patches = [ + ./nozip.patch + ]; + + dotnet-sdk = dotnet-sdk_8; + dotnet-runtime = dotnet-aspnetcore_8; + + nugetDeps = ./deps.json; + projectFile = "LuaRenamer/LuaRenamer.csproj"; + + executables = [ ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/Mik1ll/LuaRenamer"; + changelog = "https://github.com/Mik1ll/LuaRenamer/releases/tag/${finalAttrs.src.tag}"; + description = "Plugin for Shoko that allows users to rename their collection using Lua"; + license = [ + lib.licenses.gpl3 + lib.licenses.lgpl3 + ]; + maintainers = with lib.maintainers; [ nanoyaki ]; + inherit (dotnet-sdk_8.meta) platforms; + }; +}) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index da183b106722..6e29b7ae09ed 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.5.16"; + version = "3.5.17"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-V0aeQTFRAoheUsI/gFZMaTTgWaCxQXEirkKr2mFnUhBXdesYGwnKmIJk0v1JOtK2RQT0V536yEMsRJVZgfscNw=="; + hash = "sha512-B/0qzOf5xs4lEDludDhRQbBhEEs5r6WkmHkuY8pz3G4o4q6QcCPtm5I8ZcO0mpPcsoljrTonV4UGZplqTTNh6g=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 1aa95871a0b4..80e647ad4191 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; - tag = "${version}"; + tag = version; sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E="; leaveDotGit = true; }; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix index 3783dda751c9..d4bd29df0586 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse-s3-storage-provider"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-aeacw6Fpv4zFhZI4LdsJiV2pcOAMv3aV5CicnwYRxw8="; }; diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 0df9c4fd1f1b..bebf21bcc8f0 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.7.10"; + version = "0.8.2"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-DDkIWCJneL7l59CThzPkHzcB/lcUZrcVDZO/nWsZ2ss="; + hash = "sha256-oMCRZaAkvotP0oD4MjdNASDRk0FUYnH2vR22IojilN8="; }; - vendorHash = "sha256-4dOsXrwUk+muYLIec9hBdMl/W3lk/pMvliEWeYrU5zQ="; + vendorHash = "sha256-SjzOmWU+mrEdLsgeT1Y2+A3skOzWHxJXxWke7aHrt+A="; ldflags = [ "-s" diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index fabbae2157a0..bc4a683c9c65 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -6,18 +6,18 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "md-tui"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "henriklovhaug"; repo = "md-tui"; - tag = "v${version}"; - hash = "sha256-pOo+gifWomZh3hTfqaIRMPEPR5TPinzl8NgYcCit7t4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LBt15MCv+QbjutwRfYI9zX5UAiYF2Y70EQ3DATRLaY8="; }; - cargoHash = "sha256-07U69UdiAqdIv5JVfvbLNfQD/SfPfaiYZsMr6y/r8UY="; + cargoHash = "sha256-2Qr+6y/DOQJYP5EMMI/OdqIMrHBX4tNH29fK+QCsrnQ="; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Markdown renderer in the terminal"; homepage = "https://github.com/henriklovhaug/md-tui"; - changelog = "https://github.com/henriklovhaug/md-tui/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/henriklovhaug/md-tui/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ GaetanLepage @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.all; mainProgram = "mdt"; }; -} +}) diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 21f9dae474db..3a1b810147eb 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-ljp+Cpk8aW1fC9wM7/9dAg9d68scwhYBJmbnJmgoMG8="; + hash = "sha256-72AflpW0z1vpPEYsP07U9NJ84CEPhAbLo+tXxI8Qha4="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-0OK34rZqUL2w0z3NIoEfa+DMpbIZWZ6X3ZeeDf4GCcA="; + cargoHash = "sha256-UCQk76TB7gWFd0077RQ39IXGrGjc6hxhXJW0pBheADU="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/meritous/package.nix b/pkgs/by-name/me/meritous/package.nix index 8a79612d2ad9..5bf5b2830816 100644 --- a/pkgs/by-name/me/meritous/package.nix +++ b/pkgs/by-name/me/meritous/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "meritous"; repo = "meritous"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6KK2anjX+fPsYf4HSOHQ0EQBINqZiVbxo1RmBR6pslg="; }; diff --git a/pkgs/by-name/mf/mfaktc/package.nix b/pkgs/by-name/mf/mfaktc/package.nix index e8c9fd4dafc4..eae83959ecb7 100644 --- a/pkgs/by-name/mf/mfaktc/package.nix +++ b/pkgs/by-name/mf/mfaktc/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "primesearch"; repo = "mfaktc"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-7lJ3+v9exe+n+Txkn1vsvSPYLEP4l/0UgHpc6lAGv1Y="; }; diff --git a/pkgs/by-name/ml/mlmmj/package.nix b/pkgs/by-name/ml/mlmmj/package.nix index 6828fe929cdd..aeedb8f1c644 100644 --- a/pkgs/by-name/ml/mlmmj/package.nix +++ b/pkgs/by-name/ml/mlmmj/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "mlmmj"; repo = "mlmmj"; - rev = "refs/tags/RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version; + tag = "RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version; hash = "sha256-kAo04onxVve3kCaM4h1APsjs3C4iePabkBFJeqvnPxo="; }; diff --git a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix index d2741dc11f01..1c28e1ff628d 100644 --- a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix +++ b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mov-cli"; repo = "mov-cli-test"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-INdPAJxPxfo5bKg4Xn1r7bildxznXrTJxmDI21wylnI="; }; diff --git a/pkgs/by-name/mp/mpv/scripts/modernz.nix b/pkgs/by-name/mp/mpv/scripts/modernz.nix index 357736724488..e9bc5ff1122b 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernz.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernz"; - version = "0.2.8"; + version = "0.2.9"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg="; + hash = "sha256-ocsThwgCeWUSCs1ZD2pwNIvKQZtGQXrvceaMRvgmFPA="; }; postInstall = '' diff --git a/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix index 704e90fc0275..55493e172c3d 100644 --- a/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix @@ -20,7 +20,7 @@ let src = fetchFromGitHub { owner = "murat-dogan"; repo = "node-datachannel"; - rev = "refs/tags/v${nodeDatachannel.version}"; + tag = "v${nodeDatachannel.version}"; hash = "sha256-r5tBg645ikIWm+RU7Muw/JYyd7AMpkImD0Xygtm1MUk="; }; diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix index 8bfae97efb92..eaca2a5ef4c0 100644 --- a/pkgs/by-name/nb/nbfc-linux/package.nix +++ b/pkgs/by-name/nb/nbfc-linux/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "nbfc-linux"; repo = "nbfc-linux"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ARUhm1K3A0bzVRen6VO3KvomkPl1S7vx2+tmg2ZtL8s="; }; diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index cfa7f1fd7926..69ca8dd9c586 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "11.0.14"; + version = "11.0.15"; src = fetchFromGitHub { owner = "nestjs"; repo = "nest-cli"; tag = version; - hash = "sha256-FvZRqQ/wDjEBhug99MZa/ZKcQXCF3I8fXom8hi2AQm4="; + hash = "sha256-yUDlF5UyRE9UdGhw9HDLDpg1voUMQsIenUZZ4UPhBT4="; }; - npmDepsHash = "sha256-KnvcJqTSiW9pCt1MhwsTJmmmvwgtVK5hoLAs/B709MI="; + npmDepsHash = "sha256-qsY1pGKg+qt7meKwH9wKuPF57KtZC7Y8hYgkm5ObOwE="; npmFlags = [ "--legacy-peer-deps" ]; env = { diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 58688dc64611..67f424342b6a 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -230,5 +230,8 @@ buildDotnetModule (finalAttrs: { '' } ''; + knownVulnerabilities = [ + "NexusMods.App has been discontinued upstream: https://www.nexusmods.com/news/15424" + ]; }; }) diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix index 5944893ed5c2..434ab192db67 100644 --- a/pkgs/by-name/ni/nix-fast-build/package.nix +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Mic92"; repo = "nix-fast-build"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-6X4BW+3C2nfkorMfe+tuoeYrdddxPtLqOJ1rZxuxPrc="; }; diff --git a/pkgs/by-name/no/nodeinfo/package.nix b/pkgs/by-name/no/nodeinfo/package.nix index cd76391847a5..8f975cc5b37b 100644 --- a/pkgs/by-name/no/nodeinfo/package.nix +++ b/pkgs/by-name/no/nodeinfo/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { domain = "codeberg.org"; owner = "thefederationinfo"; repo = "nodeinfo-go"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-XwK3QeVDQMZD5G79XPJTAJyilVgYFVgZORHYTBI0gIQ="; }; diff --git a/pkgs/by-name/np/npm-check-updates/package.nix b/pkgs/by-name/np/npm-check-updates/package.nix index 87b340d5f8d1..0980e943f276 100644 --- a/pkgs/by-name/np/npm-check-updates/package.nix +++ b/pkgs/by-name/np/npm-check-updates/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-I9X98vqQgLgWt7q9Tr+0b+IlpTsPZDBQd+PVZlgpzyE="; }; diff --git a/pkgs/by-name/nu/nunicode/package.nix b/pkgs/by-name/nu/nunicode/package.nix index e8afc6c0b768..117a4b4327cd 100644 --- a/pkgs/by-name/nu/nunicode/package.nix +++ b/pkgs/by-name/nu/nunicode/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromBitbucket { owner = "alekseyt"; repo = "nunicode"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-6255YdX7eYSAj0EAE4RgX1m4XDNIF/Nc4ZCvXzTxpag="; }; diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix index 3d07c279b267..9568c5c30b02 100644 --- a/pkgs/by-name/oc/ocis/web.nix +++ b/pkgs/by-name/oc/ocis/web.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "owncloud"; repo = "web"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-hupdtK/V74+X7/eXoDmUjFvSKuhnoOtNQz7o6TLJXG4="; }; diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index a6e5632eed7b..ea99883f164d 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -513,7 +513,7 @@ in src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y="; }; diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix index 201ea4ed7d66..4a17e541f9eb 100644 --- a/pkgs/by-name/ok/oklch-color-picker/package.nix +++ b/pkgs/by-name/ok/oklch-color-picker/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "eero-lehtinen"; repo = "oklch-color-picker"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-dbsE1mYt/GhpkWIBS6MejiKKKz1B+h/3wqGKHCp0p2Q="; }; diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 167f2e8b0842..7cbeeee10eda 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZysAtmGhoSAsU/w81UvA/tpamFrYRv5E09DnvPSbuRE="; + hash = "sha256-PfOEjWy97COEdGpCcSHCdXVWZzJUwDAGoCi4kr2FWQs="; }; vendorHash = "sha256-vlF4TBjfinaY48UNefXFWbrWenD7eYYYMkByI2M32X8="; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 2b79afc7517e..94d08d0cbd97 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -12,19 +12,19 @@ versionCheckHook, writableTmpDirAsHomeHook, }: -let +stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; version = "1.1.21"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8ykONBWMiq9EACHOsdx1AFPoj53Tsxi3EbUDVciH5Ok="; }; node_modules = stdenvNoCC.mkDerivation { - pname = "${pname}-node_modules"; - inherit version src; + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" @@ -70,14 +70,6 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; -in -stdenvNoCC.mkDerivation (finalAttrs: { - inherit - pname - version - src - node_modules - ; nativeBuildInputs = [ bun @@ -97,7 +89,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { configurePhase = '' runHook preConfigure - cp -R ${node_modules}/. . + cp -R ${finalAttrs.node_modules}/. . runHook postConfigure ''; diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix index c5b129189acb..77b48158457d 100644 --- a/pkgs/by-name/op/openllm/package.nix +++ b/pkgs/by-name/op/openllm/package.nix @@ -11,7 +11,7 @@ let version = "23.1.2"; build-system = [ super.poetry-core ]; src = oldAttrs.src.override { - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-YO4Clbo5fmXbysxwwM2qCHJwO5KwDC05VctRVFruJcw="; }; }); @@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "bentoml"; repo = "openllm"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-4KIpe6KjbBDDUj0IjzSccxjgZyBoaUVIQJYk1+W01Vo="; }; diff --git a/pkgs/by-name/op/openssh-askpass/package.nix b/pkgs/by-name/op/openssh-askpass/package.nix new file mode 100644 index 000000000000..777c5b42b897 --- /dev/null +++ b/pkgs/by-name/op/openssh-askpass/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + openssh, + gtk3, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "openssh-askpass"; + inherit (openssh) src version; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + + sourceRoot = "${openssh.pname}-${finalAttrs.version}/contrib"; + makeFlags = "gnome-ssh-askpass3"; + dontConfigure = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/libexec + cp -a gnome-ssh-askpass3 $out/libexec/gtk-ssh-askpass + runHook postInstall + ''; + + meta = { + description = "A passphrase dialog for OpenSSH and GTK"; + homepage = "https://www.openssh.org"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ n3tshift ]; + }; +}) diff --git a/pkgs/by-name/op/optee-client/package.nix b/pkgs/by-name/op/optee-client/package.nix index 49743c558c04..a693484b37e3 100644 --- a/pkgs/by-name/op/optee-client/package.nix +++ b/pkgs/by-name/op/optee-client/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "optee-client"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "OP-TEE"; repo = "optee_client"; rev = finalAttrs.version; - hash = "sha256-hHEIn0WU4XfqwZbOdg9kwSDxDcvK7Tvxtelamfc3IRM="; + hash = "sha256-MZPT3GbAInFGL0OZH1aCDTdmd95LsI8RmpbtPE0fp4s="; }; outputs = [ diff --git a/pkgs/by-name/or/or-tools/gscip-scip10.patch b/pkgs/by-name/or/or-tools/gscip-scip10.patch new file mode 100644 index 000000000000..529cb39632bb --- /dev/null +++ b/pkgs/by-name/or/or-tools/gscip-scip10.patch @@ -0,0 +1,15 @@ +--- a/ortools/gscip/gscip.cc ++++ b/ortools/gscip/gscip.cc +@@ -48,7 +48,13 @@ + #include "scip/cons_indicator.h" + #include "scip/cons_linear.h" + #include "scip/cons_or.h" ++#if SCIP_VERSION_MAJOR >= 10 ++#include "scip/cons_nonlinear.h" ++#define SCIPcreateConsBasicQuadratic SCIPcreateConsBasicQuadraticNonlinear ++#define SCIPcreateConsQuadratic SCIPcreateConsQuadraticNonlinear ++#else + #include "scip/cons_quadratic.h" ++#endif // SCIP_VERSION_MAJOR >= 10 + #include "scip/cons_sos1.h" + #include "scip/cons_sos2.h" diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index f5260e0ac88e..254ea0faadc4 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -64,12 +64,13 @@ let scipopt-scip' = scipopt-scip.overrideAttrs (old: { patches = old.patches or [ ] ++ [ # from https://github.com/google/or-tools/commit/77a28070b9c4c83995ac6bbfa9544722ff3342ce#diff-c95174a817e73db366d414af1e329c1856f70e5158ed3994d43da88765ccc98f + # and updated with https://github.com/google/or-tools/pull/4932/files#diff-e6b0a69b2e4b97ec922abc459d909483d440a1e0d2868bed263927b106b6efe6 ./scip.patch ]; # Their patch forgets to find_package() soplex, bring it back. postPatch = (old.postPatch or "") + '' substituteInPlace CMakeLists.txt \ - --replace-fail 'message(STATUS "Finding Soplex...")' 'find_package(SOPLEX CONFIG HINTS ''${SOPLEX_DIR})' + --replace-fail 'message(STATUS "Finding Soplex")' 'find_package(SOPLEX CONFIG HINTS ''${SOPLEX_DIR})' ''; }); @@ -112,6 +113,16 @@ stdenv.mkDerivation (finalAttrs: { includes = [ "ortools/math_opt/solvers/highs_solver_test.cc" ]; hash = "sha256-/dFk/F/3/BwH5IwIwNU4Ua+4sROPXYCjO8R6jpoZpgo="; }) + # Fix compatibility with SCIP 10.0 + # https://github.com/google/or-tools/issues/4912 + (fetchpatch { + url = "https://github.com/google/or-tools/pull/4932.patch"; + includes = [ "ortools/linear_solver/proto_solver/scip_proto_solver.cc" ]; + hash = "sha256-1jw/r3yAjIpq9o8mqAbNorQgmT1E5nt809N+Gb+D9ZI="; + }) + # Compatibility with SCIP 10.0 also needs the following patch adjusted for or-tools 9.14 + # https://github.com/google/or-tools/pull/4932/files#diff-9559febee3c6051bab4def3c102cb78cbf8a57fc2be4058ace32f89436c784a9 + ./gscip-scip10.patch ]; # or-tools normally attempts to build Protobuf for the build platform when diff --git a/pkgs/by-name/or/or-tools/scip.patch b/pkgs/by-name/or/or-tools/scip.patch index 7a92254118b6..dbb153101564 100644 --- a/pkgs/by-name/or/or-tools/scip.patch +++ b/pkgs/by-name/or/or-tools/scip.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8492dc75..4c12a9bf 100644 +index b3c57799..eeeca4c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -38,9 +38,11 @@ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin") +@@ -52,9 +52,11 @@ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin") set(CPACK_PACKAGE_CONTACT "http://scipopt.org") include(CPack) @@ -17,25 +17,12 @@ index 8492dc75..4c12a9bf 100644 if(SCIPOptSuite_BINARY_DIR) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCIPOptSuite_BINARY_DIR}/bin) -@@ -412,22 +414,11 @@ endif() - #search the selected LP solver library +@@ -517,10 +519,10 @@ endif() message(STATUS "Finding Solver \"${LPS}\"") if(LPS STREQUAL "spx") -- message(STATUS "Finding Soplex") -- find_package(SOPLEX CONFIG HINTS ${SOPLEX_DIR}) + message(STATUS "Finding Soplex") +- find_package(SOPLEX REQUIRED CONFIG HINTS ${SOPLEX_DIR}) - if(NOT SOPLEX_FOUND) -- # Utilities to automatically download missing dependencies -- include(cmake/Dependencies.cmake) -- find_or_download_package( -- NAME SOPLEX -- VERSION 7.0.1 -- URL https://github.com/scipopt/soplex/archive/refs/tags/release-701.tar.gz -- URL_HASH SHA256=80cce994dcbe45fd52b60e31a3aeb5d2c60a7ddbaae495e0ce6bf58481675696 -- COMPONENTS soplex) -- find_package(SOPLEX REQUIRED CONFIG HINTS _deps/local) -- endif() -- if(NOT SOPLEX_FOUND) -+ message(STATUS "Finding Soplex...") + if(NOT TARGET libsoplex-pic OR NOT TARGET libsoplex) message(FATAL_ERROR "Requested LP solver SoPlex not found.") endif() @@ -43,64 +30,41 @@ index 8492dc75..4c12a9bf 100644 if (DEFINED SOPLEX_WITH_PAPILO) message(STATUS "SOPLEX links PAPILO") if((NOT SCIP_WITH_PAPILO)) # TODO not sure how to handle AUTOBUILD -@@ -502,9 +493,9 @@ if(SOPLEX_FOUND) +@@ -593,11 +595,11 @@ if(SOPLEX_FOUND) message(STATUS "Finding SOPLEX - found") # SoPlex headers can be directly included include_directories(${SOPLEX_INCLUDE_DIRS}) - set(LPS_LIBRARIES ${SOPLEX_LIBRARIES}) +- set(LPS_PIC_LIBRARIES ${SOPLEX_PIC_LIBRARIES}) + set(LPS_LIBRARIES libsoplex) - if(SHARED) -- set(LPS_PIC_LIBRARIES ${SOPLEX_PIC_LIBRARIES}) -+ set(LPS_PIC_LIBRARIES libsoplex-pic) - else() - set(LPS_PIC_LIBRARIES ${LPS_LIBRARIES}) - endif() -@@ -514,7 +505,7 @@ if(SOPLEX_FOUND) - set(lpi lpi/lpi_spx2.cpp) - endif() ++ set(LPS_PIC_LIBRARIES libsoplex-pic) + set(lpi lpi/lpi_spx.cpp) else() - message(STATUS "Support SOPLEX: OFF") + message(FATAL_ERROR "SOPLEX not found !") endif() if(CLP_FOUND) -diff --git a/scip-config.cmake.in b/scip-config.cmake.in -index 559552f9..682ac40a 100644 ---- a/scip-config.cmake.in -+++ b/scip-config.cmake.in -@@ -1,17 +1,16 @@ - if(NOT TARGET libscip) -- include("${CMAKE_CURRENT_LIST_DIR}/scip-targets.cmake") --endif() -+ include(CMakeFindDependencyMacro) -+ if(@ZIMPL_NEEDED@) -+ find_dependency(ZIMPL REQUIRED NO_MODULE) -+ endif() -+ if(@SOPLEX_NEEDED@) -+ find_dependency(SOPLEX REQUIRED NO_MODULE) -+ endif() - --if(@ZIMPL_NEEDED@) -- set(ZIMPL_DIR "@CONF_ZIMPL_DIR@") -- find_package(ZIMPL QUIET CONFIG) --endif() -- --if(@SOPLEX_NEEDED@) -- set(SOPLEX_DIR "@CONF_SOPLEX_DIR@") -- find_package(SOPLEX QUIET CONFIG) -+ include("${CMAKE_CURRENT_LIST_DIR}/scip-targets.cmake") - endif() - -+# Legacy - set(SCIP_LIBRARIES libscip) - set(SCIP_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") - set(SCIP_FOUND TRUE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e6fda2d5..2d04b845 100644 +index c6ce7283..6b6b1fc8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -1149,17 +1149,8 @@ install(TARGETS scip libscip EXPORT scip-targets - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +@@ -1213,6 +1213,13 @@ target_link_libraries(scip + add_dependencies(libscip scip_update_githash) + add_dependencies(scip scip_update_githash) + ++if(APPLE) ++ set_target_properties(libscip PROPERTIES ++ INSTALL_RPATH "@loader_path") ++elseif(UNIX) ++ set_target_properties(libscip PROPERTIES ++ INSTALL_RPATH "$ORIGIN") ++endif() + set_target_properties(libscip PROPERTIES + VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH} + SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR} +@@ -1265,17 +1272,8 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR} + install(FILES ${PROJECT_SOURCE_DIR}/src/tclique/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/tclique) # Add all targets to the build-tree export set -export(TARGETS scip libscip @@ -117,11 +81,11 @@ index e6fda2d5..2d04b845 100644 +#export(TARGETS scip libscip +# FILE "${PROJECT_BINARY_DIR}/scip-targets.cmake") - # configure the config file for the build tree - set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}") -@@ -1175,18 +1166,16 @@ ${PROJECT_BINARY_DIR}/scip-config-version.cmake - - #configure the config file for the install + # Configure scip-config.cmake for the build-tree: + # We add the CMake module path from the sources. +@@ -1295,18 +1293,16 @@ ${PROJECT_BINARY_DIR}/scip-config-version.cmake + # We add the current directory of the installed scip-config.cmake as a CMake module path. + set(EXTRA_CMAKE_MODULE_PATH "\${CMAKE_CURRENT_LIST_DIR}") set(CONF_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../include") -if(SOPLEX_NEEDED) - set(CONF_SOPLEX_DIR "\${CMAKE_CURRENT_LIST_DIR}/../soplex") diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix index 348a8ffd49a7..fae94aeb5288 100644 --- a/pkgs/by-name/or/orocos-kdl/package.nix +++ b/pkgs/by-name/or/orocos-kdl/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; - tag = "${version}"; + tag = version; hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is="; fetchSubmodules = true; # Needed to build Python bindings }; diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix index 0e5bb9ee5193..df1ef45f7204 100644 --- a/pkgs/by-name/os/os-agent/package.nix +++ b/pkgs/by-name/os/os-agent/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "home-assistant"; repo = "os-agent"; - tag = "${version}"; + tag = version; hash = "sha256-x0bVY476Gm5D1drRmyszdshrO0Vi/baDsG3ulysu0Kg="; }; diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index ca104d0f6be0..38d3097b71d5 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -6,18 +6,18 @@ osv-scanner, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "osv-scanner"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; - tag = "v${version}"; - hash = "sha256-qpfpFjMMRWzzP1Q/28Bzp+hQ5TDi3ffwJ20PwXKgJjs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IulgR8bXD/NBya5hK49uUbjKoVR9Xg4ZyvhI4eswoRE="; }; - vendorHash = "sha256-0htgQgpZwtHHnGWi7pnvmA9eKsu15Kd6u7VH2s/PhSs="; + vendorHash = "sha256-jMLZ0EARnUX0c40exl9d/lrbr3ClM9JmlUDiirFlBzU="; subPackages = [ "cmd/osv-scanner" @@ -26,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${version}" + "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${finalAttrs.version}" "-X=main.commit=n/a" "-X=main.date=1970-01-01T00:00:00Z" ]; @@ -42,10 +42,10 @@ buildGoModule rec { description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev"; mainProgram = "osv-scanner"; homepage = "https://github.com/google/osv-scanner"; - changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}"; + changelog = "https://github.com/google/osv-scanner/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ stehessel ]; }; -} +}) diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix index b64956b1c3ce..a57e4438b9a8 100644 --- a/pkgs/by-name/ou/outfly/package.nix +++ b/pkgs/by-name/ou/outfly/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "outfly"; repo = "outfly"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-FRvu3FgbT3i5888ll573nhb7naYx04Oi8nrcfgEHxUo="; }; diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix index a0c1d2095715..e03e31ae41f6 100644 --- a/pkgs/by-name/pa/package-version-server/package.nix +++ b/pkgs/by-name/pa/package-version-server/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "zed-industries"; repo = "package-version-server"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E="; }; diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix index bd390f7445af..04dd5b35123c 100644 --- a/pkgs/by-name/pa/pagmo2/package.nix +++ b/pkgs/by-name/pa/pagmo2/package.nix @@ -1,54 +1,67 @@ { - fetchFromGitHub, lib, stdenv, + fetchFromGitHub, cmake, eigen, nlopt, ipopt, boost, onetbb, - # tests pass but take 30+ minutes - runTests ? false, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pagmo2"; version = "2.19.1"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ido3e0hQLDEPT0AmsfAVTPlGbWe5QBkxgRO6Fg1wp/c="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - eigen - nlopt - boost - onetbb - ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt; - - cmakeFlags = [ - "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}" - "-DPAGMO_WITH_EIGEN3=yes" - "-DPAGMO_WITH_NLOPT=yes" - "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-DPAGMO_WITH_IPOPT=yes" - "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # FIXME: fails ipopt test with Invalid_Option on darwin, so disable. - "-DPAGMO_WITH_IPOPT=no" - "-DLLVM_USE_LINKER=gold" + outputs = [ + "out" + "dev" ]; - doCheck = runTests; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + onetbb + ]; + + propagatedBuildInputs = [ + eigen + nlopt + ipopt + boost + ]; + + cmakeFlags = [ + (lib.cmakeBool "PAGMO_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "PAGMO_WITH_EIGEN3" true) + (lib.cmakeBool "PAGMO_WITH_NLOPT" true) + (lib.cmakeBool "PAGMO_WITH_IPOPT" true) + ]; + + env = { + # Workaround clang17+ / lto bug + # See https://github.com/esa/pagmo2/pull/585 + # Should be removed in new release + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-fno-assume-unique-vtables"; + }; + + doCheck = true; + + passthru = { + tests.cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "pagmo" ]; + package = finalAttrs.finalPackage; + }; + }; meta = { homepage = "https://esa.github.io/pagmo2/"; @@ -57,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.costrouc ]; }; -} +}) diff --git a/pkgs/by-name/pa/pandoc-mustache/package.nix b/pkgs/by-name/pa/pandoc-mustache/package.nix index 35d274b74963..96d41b7b757a 100644 --- a/pkgs/by-name/pa/pandoc-mustache/package.nix +++ b/pkgs/by-name/pa/pandoc-mustache/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "michaelstepner"; repo = "pandoc-mustache"; - tag = "${version}"; + tag = version; hash = "sha256-lgbQV4X2N4VuIEtjeSA542yqGdIs5QQ7+bdCoy/aloE="; }; diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix index 236c76334299..34fdbfe53b48 100644 --- a/pkgs/by-name/pc/pcmanfm/package.nix +++ b/pkgs/by-name/pc/pcmanfm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "lxde"; repo = "pcmanfm"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-4kJDCnld//Vbe2KbrLoYZJ/dutagY/GImoOnbpQIdDY="; }; diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix index 552df8b13486..b222c64655a3 100644 --- a/pkgs/by-name/pc/pcsclite/package.nix +++ b/pkgs/by-name/pc/pcsclite/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "salsa.debian.org"; owner = "rousseau"; repo = "PCSC"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-37qeWGEuutF0cOOidoLchKJLQCvJFdVRZXepWzD4pZs="; }; diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 0721b37acb20..e4267107536f 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -6,13 +6,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.6"; + version = "5.9"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - hash = "sha256-EJLAP1uBmWxWEsdLJYTuViMv4o0iEi2fqy79ixyRijU="; + hash = "sha256-G4Bbg8tNlwV8VCVKCamhlQ/pGf8hWCkABm6f8i5doos="; }; outputs = [ "out" ]; @@ -37,7 +37,10 @@ perlPackages.buildPerlPackage rec { description = "PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; homepage = "https://github.com/darold/pgFormatter"; changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + thunze + mfairley + ]; license = [ lib.licenses.postgresql lib.licenses.artistic2 diff --git a/pkgs/by-name/ph/phylophlan/package.nix b/pkgs/by-name/ph/phylophlan/package.nix index 3cb804a29227..e5670ec6ef85 100644 --- a/pkgs/by-name/ph/phylophlan/package.nix +++ b/pkgs/by-name/ph/phylophlan/package.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "biobakery"; repo = "phylophlan"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-KlWKt2tH2lQBh/eQ2Hbcu2gXHEFfmFEc6LrybluxINc="; }; diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 92c4a2847f47..bf16d091e9fb 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -12,13 +12,13 @@ }: buildGo125Module (finalAttrs: { pname = "pocket-id"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-tBjo5evQVRG0oembk1VfAfM3M/FJ4zPWV/9vgAWH9Kc="; + hash = "sha256-n1jNU7+eNO7MFUWB7+EnssACMvNoMcJqPk0AvyIr9h8="; }; sourceRoot = "${finalAttrs.src.name}/backend"; diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix index bcbc8df5825a..22e7dbd85c68 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spoorn"; repo = "poeblix"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-TKadEOk9kM3ZYsQmE2ftzjHNGNKI17p0biMr+Nskigs="; }; diff --git a/pkgs/by-name/po/pokemmo-installer/package.nix b/pkgs/by-name/po/pokemmo-installer/package.nix index 81beed1f60a3..3a57de350668 100644 --- a/pkgs/by-name/po/pokemmo-installer/package.nix +++ b/pkgs/by-name/po/pokemmo-installer/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "coringao"; repo = "pokemmo-installer"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-uSbnXBpkeGM9X6DU7AikT7hG/emu67PXuGdm6xfB8To="; }; diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix index 4d4cea292f5d..2ca7f4de3476 100644 --- a/pkgs/by-name/pr/precice/package.nix +++ b/pkgs/by-name/pr/precice/package.nix @@ -18,13 +18,13 @@ assert petsc.mpiSupport; stdenv.mkDerivation (finalAttrs: { pname = "precice"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "precice"; repo = "precice"; tag = "v${finalAttrs.version}"; - hash = "sha256-1FbTNo2F+jH1EVV6gXc9o0T31UHY/wBK3vQeCV7wW5E="; + hash = "sha256-3Cg9e1n/O1kG806X3PT7IBd6QuBM38qj9BTlzYZqfSs="; }; cmakeFlags = [ diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 70a8c9a86f9f..7c81b57c8346 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -21,7 +21,7 @@ let version = "2.3.0"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY="; }; }); @@ -47,7 +47,7 @@ let src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-O9HAslZ8xbmLgJi3y91M6mc1oIvJZ8nRJyFRuNorRHs="; }; diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix index ede6cb1637ca..dc466d1ff25d 100644 --- a/pkgs/by-name/pr/prisma-language-server/package.nix +++ b/pkgs/by-name/pr/prisma-language-server/package.nix @@ -11,7 +11,7 @@ buildNpmPackage (finalAttrs: { src = fetchFromGitHub { owner = "prisma"; repo = "language-tools"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-hcLjvIi7EZQSr99OLHGWesziBc5HhkvD+dmGOTgOY/c="; }; diff --git a/pkgs/by-name/pr/professor/package.nix b/pkgs/by-name/pr/professor/package.nix index aaafc6e02a3f..3c9765514cb0 100644 --- a/pkgs/by-name/pr/professor/package.nix +++ b/pkgs/by-name/pr/professor/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchFromGitLab { owner = "hepcedar"; repo = "professor"; - rev = "refs/tags/professor-2.4.2"; + tag = "professor-2.4.2"; hash = "sha256-z2Ub7SUTz4Hj3ajnzOV/QXZ+cH2v6zJv9UZM2M2y1Hg="; # workaround unpacking to case-sensitive filesystems postFetch = '' diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix index 40c4b61a8832..9f4fbec335c0 100644 --- a/pkgs/by-name/qu/quickder/package.nix +++ b/pkgs/by-name/qu/quickder/package.nix @@ -22,7 +22,7 @@ let src = fetchFromGitHub { owner = "pyparsing"; repo = "pyparsing"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; }; }); diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index 3189ba9961bb..ba755fa1e2ac 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "irdest"; repo = "irdest"; - tag = "${version}"; + tag = version; hash = "sha256-rdKfKbikyqs0Y/y9A8XRVSKenjHD5rS3blxwy98Tvmg="; }; diff --git a/pkgs/by-name/re/realmd/package.nix b/pkgs/by-name/re/realmd/package.nix index e08e1de89cee..9d49b0197ce8 100644 --- a/pkgs/by-name/re/realmd/package.nix +++ b/pkgs/by-name/re/realmd/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "realmd"; repo = "realmd"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-lmNlrXOOUSDk/8H/ge0IRA64bnau9nYUIkW6OyVxbBg="; }; diff --git a/pkgs/by-name/rh/rhsrvany/package.nix b/pkgs/by-name/rh/rhsrvany/package.nix index a5f548481102..a5fc86f65da4 100644 --- a/pkgs/by-name/rh/rhsrvany/package.nix +++ b/pkgs/by-name/rh/rhsrvany/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "rwmjones"; repo = "rhsrvany"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eeEiAdm7NO5fFYKtHQbeBq4RhP8Xwgw2p2Wkm+n0EWM="; }; diff --git a/pkgs/by-name/ro/root/clang-root.nix b/pkgs/by-name/ro/root/clang-root.nix index 7edef83fcf50..7e3ba20c8788 100644 --- a/pkgs/by-name/ro/root/clang-root.nix +++ b/pkgs/by-name/ro/root/clang-root.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/root-project/llvm-project"; - rev = "refs/tags/ROOT-llvm${version}"; + tag = "ROOT-llvm${version}"; hash = "sha256-qEoQVv/Aw9gqKSNa8ZJGqPzwXvH1yXiSOkvrUWeXI+g="; }; diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 554884b99602..1871c71f61be 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "clad"; # Make sure that this is the same tag as in the ROOT build files! # https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76 - rev = "refs/tags/v2.0"; + tag = "v2.0"; hash = "sha256-Oj7gGSvnGuYdggonPWjrwPn/06cD+ig3eefRh7xaiPs="; }; diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix index aed32b53470a..900cf4140e77 100644 --- a/pkgs/by-name/ru/rush-parallel/package.nix +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rush-parallel"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "rush"; rev = "v${version}"; - hash = "sha256-5xuRA3Jf9SiNc6E/XBP9PCSA7vmioww0G5QkUAzHmEI="; + hash = "sha256-G4EG/hj8vosmCwzFN/R/2VC3ZQJfI04aKDQbQdiSFyI="; }; - vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; + vendorHash = "sha256-1q5qD496PfK/4LnVI6FWuHorg8EseqodAM7NCB03Lt8="; ldflags = [ "-s" diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index 0919260d494b..40e7b4c900a2 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.launchpad.net/safe-rm"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix index 6d0bcff93cdd..035477bf2682 100644 --- a/pkgs/by-name/sa/satyrographos/package.nix +++ b/pkgs/by-name/sa/satyrographos/package.nix @@ -10,7 +10,7 @@ let src = fetchFromGitHub { owner = "na4zagin3"; repo = "satyrographos"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-f9iJTr4nV7dFCMkI8+zv9qvYWRSw8H/xbbZm2LR9cB4="; }; in diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix index 70abeeceb25a..4aa51a9d577d 100644 --- a/pkgs/by-name/sc/schemat/package.nix +++ b/pkgs/by-name/sc/schemat/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "schemat"; - version = "0.4.12"; + version = "0.5.1"; src = fetchFromGitHub { owner = "raviqqe"; repo = "schemat"; tag = "v${finalAttrs.version}"; - hash = "sha256-NUpY4VXrp6A+ACjID9uqD9G31acGtmByyVCjIDT05vI="; + hash = "sha256-mHInvr1fhVyt0Rr3uGvrl5yh4K0sMhf5oJ/RO0Cswls="; }; - cargoHash = "sha256-wPHD+ZOf9BdqpG1s/o8awxe7apbTF2Nr0i/00Vpvnes="; + cargoHash = "sha256-iKdXIWxFjIky7bQmohnuuxHv7dmf68UuwBy1wtl8ow0="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix index 2357476ded2c..f6187a5a5497 100644 --- a/pkgs/by-name/sc/scipopt-gcg/package.nix +++ b/pkgs/by-name/sc/scipopt-gcg/package.nix @@ -13,16 +13,13 @@ stdenv.mkDerivation rec { pname = "scipopt-gcg"; - version = "372-unstable-2025-10-11"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "gcg"; - rev = "83a2d210a03f920dd941d547da94867deb504882"; - hash = "sha256-wbzknCmwDhJ38gItA3DppJxSJfNK7NeIkxZVRd2kmp0="; + tag = "v${version}"; + hash = "sha256-HMhb35Zkjt3yzYk6X1OfigZjJrLuelrkQyCBs/UpFjc="; }; nativeBuildInputs = [ @@ -54,14 +51,9 @@ stdenv.mkDerivation rec { ''; doCheck = true; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)" - ''; - meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + changelog = "https://gcg.or.rwth-aachen.de/doc-3.5.0/RN${lib.versions.major version}${lib.versions.minor version}.html"; description = "Branch-and-Price & Column Generation for Everyone"; license = lib.licenses.lgpl3Plus; homepage = "https://gcg.zib.de"; diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index e6e692a1f743..e5a9dbc3edd2 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -12,16 +12,13 @@ stdenv.mkDerivation rec { pname = "scipopt-papilo"; - version = "2.4.4"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; tag = "v${version}"; - hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A="; + hash = "sha256-oxuXv/xWQiApxrrVdH3aEUOp40Em6kCz/DJXXpCxdzs="; }; nativeBuildInputs = [ cmake ]; @@ -46,7 +43,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; description = "Parallel Presolve for Integer and Linear Optimization"; license = lib.licenses.lgpl3Plus; homepage = "https://github.com/scipopt/papilo"; diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 6b07a7fe84b3..94380ed902da 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -15,17 +15,18 @@ gfortran, criterion, mpfr, + enableZimpl ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation rec { pname = "scipopt-scip"; - version = "9.2.4"; + version = "10.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; - tag = "v${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-nwFRtP63/HPfk9JhcyLKApicgqE9IF+7s5MGGrVJrpM="; + tag = "v${version}"; + hash = "sha256-KW7N2ORspzkaR/gdU//p38BV4GyuhoSIVb6q9RTrCYQ="; }; nativeBuildInputs = [ cmake ]; @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ scipopt-soplex scipopt-papilo - scipopt-zimpl ipopt gmp readline @@ -42,8 +42,12 @@ stdenv.mkDerivation rec { boost gfortran criterion - mpfr # if not included, throws fatal error: mpfr.h not found - ]; + ] + ++ lib.optional enableZimpl scipopt-zimpl; + + cmakeFlags = lib.optional (!enableZimpl) "-DZIMPL=OFF"; + + propagatedBuildInputs = [ mpfr ]; doCheck = true; diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 3e36f07c2f69..43c949d740bb 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -11,16 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "scipopt-soplex"; - version = "7.1.5"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "8.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; - rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-gtz2h5EszE77zYZ8m2UtkYnoquO8GJhAAzsvQW5b+3I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-AppJUule+0x23gF/PwjDMsZ194aqK91UTevQgjPZIgc="; }; nativeBuildInputs = [ cmake ]; @@ -41,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Sequential object-oriented simPlex"; license = with lib.licenses; [ asl20 ]; mainProgram = "soplex"; - maintainers = with lib.maintainers; [ david-r-cox ]; - changelog = "https://scipopt.org/doc-${finalAttrs.scipVersion}/html/RN${lib.versions.major finalAttrs.scipVersion}.php"; + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://soplex.zib.de/doc-${finalAttrs.version}/html/CHANGELOG.php"; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix index 96b9ae0d34de..61fa4a225bfb 100644 --- a/pkgs/by-name/sc/scipopt-ug/package.nix +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -6,21 +6,20 @@ scipopt-scip, zlib, mpi, + gmp, }: stdenv.mkDerivation rec { pname = "scipopt-ug"; - version = "1.0.0-beta6"; + version = "1.0.0"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + scipVersion = "10.0.0"; # Take the SCIPOptSuite source since no other source exists publicly. src = fetchzip { - url = "https://github.com/scipopt/scip/releases/download/v${ - lib.replaceStrings [ "." ] [ "" ] scipVersion - }/scipoptsuite-${scipVersion}.tgz"; - hash = "sha256-ZFgHaC4JL0eFt/do0ucGkarmfL1WdGEecrE1iPBpFh0="; + url = "https://github.com/scipopt/scip/releases/download/v${scipVersion}/scipoptsuite-${scipVersion}.tgz"; + hash = "sha256-Nskb8quLsox7igz1UZCfd+VjR9Q8/oa8dZBYjAdc1EU="; }; sourceRoot = "${src.name}/ug"; @@ -33,6 +32,7 @@ stdenv.mkDerivation rec { scipopt-scip mpi zlib + gmp ]; meta = { diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index 971dc1b5cf19..0158254fded4 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -11,16 +11,13 @@ stdenv.mkDerivation rec { pname = "scipopt-zimpl"; - version = "362"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "zimpl"; tag = "v${version}"; - hash = "sha256-juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; + hash = "sha256-ataepqBfdA7CgqPhbw+Xy7PC3VZTLcSrF2/xnFyx+YI="; }; postPatch = '' @@ -48,7 +45,9 @@ stdenv.mkDerivation rec { ''; meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + platforms = lib.platforms.linux; + broken = stdenv.isDarwin; + changelog = "https://zimpl.zib.de/download/CHANGELOG.txt"; description = "Zuse Institut Mathematical Programming Language"; longDescription = '' ZIMPL is a little language to translate the mathematical model of a diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index 3b0f2b279223..3c4ed11d30b0 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "secretspec"; - version = "0.5.1"; + version = "0.6.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-hrjR+4XrvmgnO1EsHNFq9FoBkK2rgJLpAbz4rOnRLHw="; + hash = "sha256-OBIIKoF0WDkLQDVmEQJ8+EyVhFCq1dESgIbAVfNuyBU="; }; - cargoHash = "sha256-fbxMKz2fIFnqJ0BM5pyYoVrC06ymmBrvTatItfM82po="; + cargoHash = "sha256-y6ayj6FcqZI9VR6bXIKdDKrJTFDxF49ZFXXPnWLG6tQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix index e429a3d59682..b537f3d6e6d3 100644 --- a/pkgs/by-name/sh/shoko-webui/package.nix +++ b/pkgs/by-name/sh/shoko-webui/package.nix @@ -11,13 +11,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shoko-webui"; - version = "2.2.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "Shoko-WebUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-plXTAN3V0tcAe+uMs4XwYHO1UC9DCAxcMPVNKdFobcY="; + hash = "sha256-/frP6qI5xAmogb5a5AA83IJxgOhVUi6X0E4h3Qg5u6w="; }; # Avoid requiring git as a build time dependency. It's used for version @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-4/Qbg+jUagPUiQPoc57drorbEkn1ShsPZynvct+HX7A="; + hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shoko/deps.json b/pkgs/by-name/sh/shoko/deps.json index 95bc329bc12d..b6a073b86b27 100644 --- a/pkgs/by-name/sh/shoko/deps.json +++ b/pkgs/by-name/sh/shoko/deps.json @@ -46,13 +46,13 @@ }, { "pname": "Magick.NET-Q8-AnyCPU", - "version": "13.6.0", - "hash": "sha256-LzHv4Acau5YKP3mnqHY3S9b4TL/xZAr+LqlJkzictPA=" + "version": "14.9.1", + "hash": "sha256-4svX77hA0bfAo9Lbbks6RfAwB4DbUI8mwduMbmyaEfQ=" }, { "pname": "Magick.NET.Core", - "version": "13.6.0", - "hash": "sha256-9y7fLtgmWc830XbH6Vfj61H9W/DGqBqv+tIrg1L9U2c=" + "version": "14.9.1", + "hash": "sha256-FkFcEeK08Jrp9y1znQzy4uyW6sMU1bVi3s5e5em2of4=" }, { "pname": "MessagePack", @@ -299,6 +299,11 @@ "version": "1.1.1", "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.3.4", @@ -1219,11 +1224,6 @@ "version": "1.4.2", "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, - { - "pname": "Shoko.Plugin.Abstractions", - "version": "4.0.0-beta5", - "hash": "sha256-Tc3cOHkEFjaqWTdHvAscMUfOawH5fc93/u2ztXWGtSc=" - }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", "version": "2.1.6", @@ -1294,11 +1294,6 @@ "version": "4.5.0", "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs=" }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.ClientModel", "version": "1.0.0", @@ -1624,11 +1619,6 @@ "version": "4.5.1", "hash": "sha256-5g6C2vb0RCUiSBw/tlCUbmrIbCvT9zQ+w/45o3l6Ctg=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", diff --git a/pkgs/by-name/sh/shoko/package.nix b/pkgs/by-name/sh/shoko/package.nix index 8de64de5b0cb..ac4db1f494bb 100644 --- a/pkgs/by-name/sh/shoko/package.nix +++ b/pkgs/by-name/sh/shoko/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "shoko"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "ShokoServer"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZO5S0zMwzr4giaO1bmQ4dLBIPrv6eZY7k9Os4GiO4C4="; + hash = "sha256-V8DwYLjxklKYmOnYNLp51GRJXgOXKnbgDD4DL4T4lVc="; fetchSubmodules = true; }; @@ -46,7 +46,7 @@ buildDotnetModule (finalAttrs: { ]; }; - tests.shoko = nixosTests.shoko; + tests = { inherit (nixosTests) shoko; }; }; meta = { diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix index 46bf323252e3..a4f76566cc64 100644 --- a/pkgs/by-name/si/simgear/package.nix +++ b/pkgs/by-name/si/simgear/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "flightgear"; repo = "simgear"; - tag = "${version}"; + tag = version; hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4="; }; diff --git a/pkgs/by-name/si/sing-geoip/package.nix b/pkgs/by-name/si/sing-geoip/package.nix index d2153b81c280..10e259820cd2 100644 --- a/pkgs/by-name/si/sing-geoip/package.nix +++ b/pkgs/by-name/si/sing-geoip/package.nix @@ -14,7 +14,7 @@ let src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-geoip"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-nIrbiECK25GyuPEFqMvPdZUShC2JC1NI60Y10SsoWyY="; }; diff --git a/pkgs/by-name/sk/skyscraper/package.nix b/pkgs/by-name/sk/skyscraper/package.nix index ba5b02d99499..55ce287b7c3a 100644 --- a/pkgs/by-name/sk/skyscraper/package.nix +++ b/pkgs/by-name/sk/skyscraper/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Gemba"; repo = "skyscraper"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-z6Y5JUKvwxYgE7sdXvRNOsbUTON5i/DX1q9y4wRXixE="; }; diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 9133809ac988..ade736ca8450 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "xou816"; repo = "spot"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-7zWK0wkh53ojnoznv4T/X//JeyKJVKOrfYF0IkvciIY="; }; diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index f35aae3e0537..36a0d95b8f60 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "sqruff"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "quarylabs"; repo = "sqruff"; tag = "v${version}"; - hash = "sha256-/hMeYhiz2W1zu68LfZmmTK41nV5nJSLMZFQ4HKp0BSw="; + hash = "sha256-fkk7PB2O657J2ZjDdo40gByleGDiFGbgvfrk4Tk4kQo="; }; - cargoHash = "sha256-ytPLhC9qOcdA09xcQGwtUXUaD9QXn0bjyzgT4I/4xjw="; + cargoHash = "sha256-4bYoKtvtUtOfwM3X+/+du5zvukWSvS08wmeXRaOG4lA="; # Disable the `python` feature which doesn't work on Nix yet buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/sr/sr2t/package.nix b/pkgs/by-name/sr/sr2t/package.nix index 6d270415f509..9923f596ac8a 100644 --- a/pkgs/by-name/sr/sr2t/package.nix +++ b/pkgs/by-name/sr/sr2t/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitLab { owner = "0bs1d1an"; repo = "sr2t"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-BPsYnKBTxt5WUd2+WumMdVi8p6iryOWG2MjI97qbaCw="; }; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index d5b9dc05c50c..c4993bbd4eed 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-+bBXpsdF9VSephh8mw8X5ysy+iOCsCEy4Pc9N4IJ42M="; + hash = "sha256-6fbWMgLHSTbBKqxRTSGvOdJop1xx2vAFkN+j8gsuO9U="; }; - vendorHash = "sha256-QR4/f02vtYLaxP+g0Nm87BFUANcjp72psdbtrmfnmAM="; + vendorHash = "sha256-Xo1oQJBd093O8IKfkKq146AuGgqzupMN+PROPKsOz4E="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/startup-disk/package.nix b/pkgs/by-name/st/startup-disk/package.nix index 431a492f3b30..66d62d041a93 100644 --- a/pkgs/by-name/st/startup-disk/package.nix +++ b/pkgs/by-name/st/startup-disk/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitLab { owner = "davide125"; repo = "startup-disk"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-258whEX6hKqfrk2aII15tuFEuB7NQUCNLEmi3OCOWV4="; domain = "gitlab.gnome.org"; }; diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index ba93d9591136..4857005842bc 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.44.1"; + version = "0.44.2"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-W4bQVgEvnmYZomLD4ToProCvAKnh94Mw9Rr18b9GVEg="; + hash = "sha256-3yTX2H4T0nnA0Kh1Lx1/blK/Edd1ZOHQVEXiiOLxino="; }; - cargoHash = "sha256-AdFO0U3vj7yxhGmpXkn6iIQ8+zS6dd+eGVkWnonoy24="; + cargoHash = "sha256-zJpzsPHK9Mq0KF0WvbBINxSQVr0m4Z5+M6/nFD8jiMg="; # Only build the command line client cargoBuildFlags = [ diff --git a/pkgs/by-name/su/sums/package.nix b/pkgs/by-name/su/sums/package.nix index 93e4761f049a..42fa0915a8f6 100644 --- a/pkgs/by-name/su/sums/package.nix +++ b/pkgs/by-name/su/sums/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "leesonwai"; repo = "sums"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-X+AMUH8nJli0Um1bH0gDGLnfHGknqea3DZxH+tdTEr8="; }; diff --git a/pkgs/by-name/su/supergfxctl-plasmoid/package.nix b/pkgs/by-name/su/supergfxctl-plasmoid/package.nix index 2b5ce59fd608..aaf3ac06bd66 100644 --- a/pkgs/by-name/su/supergfxctl-plasmoid/package.nix +++ b/pkgs/by-name/su/supergfxctl-plasmoid/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "jhyub"; repo = "supergfxctl-plasmoid"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Un2uVTde18qloZoWk6bbscyvsBTIAdK1CfxYAZg1+F4="; }; diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 3356ebbcda3b..820be9e6c130 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.36.2"; + version = "0.36.3"; src = fetchFromGitHub { owner = "grafana"; repo = "tanka"; rev = "v${version}"; - sha256 = "sha256-dl/+XArOJ7asR4uHcS9ZnEOCahDFsuE9rG6CZ3dfyK4="; + sha256 = "sha256-ukWPmOEFOMnjwqTy9GkA8+WF3ItXUUvuh8EdKngLlT8="; }; - vendorHash = "sha256-x1GYemyiOSJTG+I5r+L+g6j2uZnRLi4BqY0lnN8siro="; + vendorHash = "sha256-nO0nv7tpUovtooeCr6zFA2mgCvuaLszrjU0EpcMMRmE="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix index 00f2f57b38c1..d8ddc11d38ea 100644 --- a/pkgs/by-name/tc/tcld/package.nix +++ b/pkgs/by-name/tc/tcld/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "temporalio"; repo = "tcld"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jnm6l9Jj1mi9esDS6teKTEMhq7V1QD/dTl3qFhKsW4o="; # Populate values from the git repository; by doing this in 'postFetch' we # can delete '.git' afterwards and the 'src' should stay reproducible. diff --git a/pkgs/by-name/te/textidote/package.nix b/pkgs/by-name/te/textidote/package.nix index 3a1e6ca9e4c9..6ad359dd4e5f 100644 --- a/pkgs/by-name/te/textidote/package.nix +++ b/pkgs/by-name/te/textidote/package.nix @@ -25,7 +25,7 @@ let src = fetchFromGitHub { owner = "sylvainhalle"; repo = "textidote"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QMSoxk5jDn6qsdxffXJ/S4eTIzLjJdAEbdaK8MZIavI="; }; diff --git a/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix b/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix index ad17e2a91092..c190acb8527c 100644 --- a/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix +++ b/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix @@ -42,7 +42,7 @@ let src = fetchFromGitHub { owner = "textlint"; repo = "textlint-rule-helper"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SVeL/3KC/yazSGsmn5We8fJAuVqfcspzN7i2a4+EOlI="; }; diff --git a/pkgs/by-name/te/textpieces/package.nix b/pkgs/by-name/te/textpieces/package.nix index 29b3d744d26e..fe2d28ecb2ba 100644 --- a/pkgs/by-name/te/textpieces/package.nix +++ b/pkgs/by-name/te/textpieces/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "liferooter"; repo = "textpieces"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-BUhcPnvi6cuhaYYNZV9pvOLH/cIV3t7ncpG55fBjqwo="; }; diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix index 9f328cd0beef..6b6420e5b44b 100644 --- a/pkgs/by-name/th/threema-desktop/package.nix +++ b/pkgs/by-name/th/threema-desktop/package.nix @@ -14,7 +14,7 @@ let electronSrc = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web-electron"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-u1rzKFDrLxU/o7Oc2o/WBwbAncNWKJ9GAUBaNDPViZI="; }; @@ -25,7 +25,7 @@ let src = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-GmyWKJdDgiRS7XxNjCyvt92Bn48kpP3+ZsfRouyUCM0="; }; diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index a11fa855328e..6c6268d6db5b 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "topicctl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-48s15CF6prLoaZjJ77bXNM0Y8ZkFlDTEJUb+DtnbwZY="; + sha256 = "sha256-i7Gu7bk7J8+kG6gWpB+8hyIQs7B3TNQmYvLyQQ0ZGtc="; }; - vendorHash = "sha256-ltvWWB0Y5arPV8o3bSYHcDf1ZSRRCrPriXklShj/fjo="; + vendorHash = "sha256-aoFMYgyZnXmPg3fjwydGm85WKcT+Jez07a4JX1o3Mmo="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix index 538929d68616..fc428d9876ef 100644 --- a/pkgs/by-name/ty/typioca/package.nix +++ b/pkgs/by-name/ty/typioca/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE="; }; diff --git a/pkgs/by-name/un/unfs3/package.nix b/pkgs/by-name/un/unfs3/package.nix index 8e250d84f935..383acc1623c2 100644 --- a/pkgs/by-name/un/unfs3/package.nix +++ b/pkgs/by-name/un/unfs3/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "unfs3"; repo = "unfs3"; - rev = "refs/tags/unfs3-${version}"; + tag = "unfs3-${version}"; hash = "sha256-5iAriIutBhwyZVS7AG2fnkrHOI7pNAKfYv062Cy0WXw="; }; diff --git a/pkgs/by-name/ur/urlfinder/package.nix b/pkgs/by-name/ur/urlfinder/package.nix index 567ba1f7b992..522e354a765e 100644 --- a/pkgs/by-name/ur/urlfinder/package.nix +++ b/pkgs/by-name/ur/urlfinder/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "urlfinder"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dtCXCRnI05822+a5Os+I+ZAmL/hC884PRCIPlEY3jok="; }; diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 81a0f478480f..0eaffccd05e7 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "usql"; - version = "0.20.5"; + version = "0.20.8"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; tag = "v${version}"; - hash = "sha256-rMjUT4YBSI16L7bxLIs8hs0A+yQwEX3ZWm1Yym5w2jE="; + hash = "sha256-oaimplnmNpr3nMGNmiXmE9L03SfifjfncI9ZPiJg6JI="; }; buildInputs = [ diff --git a/pkgs/by-name/vm/vmmlib/package.nix b/pkgs/by-name/vm/vmmlib/package.nix index 26d6cc59b1ce..325e9d47e4f0 100644 --- a/pkgs/by-name/vm/vmmlib/package.nix +++ b/pkgs/by-name/vm/vmmlib/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Eyescale"; repo = "vmmlib"; - tag = "${version}"; + tag = version; hash = "sha256-QEfeQcE66XbsFTN/Fojgldem5C+RhbOBmRyBX3sfUrg="; fetchSubmodules = true; diff --git a/pkgs/by-name/wa/wayback-x11/package.nix b/pkgs/by-name/wa/wayback-x11/package.nix index 9c1fde197636..9ef293d241d1 100644 --- a/pkgs/by-name/wa/wayback-x11/package.nix +++ b/pkgs/by-name/wa/wayback-x11/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "wayback"; repo = "wayback"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-/H0+zOAdrejHMNRcc94Wjgc4/s/M1rUegPcX+pBQcrY="; }; diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 7f08b0e5b105..e44878f3465b 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.24.27"; + version = "1.24.29"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-+nd4CchLAC0QbXDCCCdeLUsTyQDXprLHkWDFSljzFLY="; + hash = "sha256-LBMPx/IRxqkdD3dwLwoFHqjnuMUApffaq3ccu4WA2v4="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-mkkBJBd17Ct0xpXGK1k+TZf5GqDIUW8EgFtokTDe8Vw="; + cargoHash = "sha256-oLeVLNJ69tX8cuUVbe6WfAnR2In08iSJLqIhz4/fG20="; postPatch = '' substituteInPlace src/handler.rs \ diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix index 181f70603ec4..8b7a0b441a16 100644 --- a/pkgs/by-name/wh/wheelwizard/package.nix +++ b/pkgs/by-name/wh/wheelwizard/package.nix @@ -19,7 +19,7 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "TeamWheelWizard"; repo = "WheelWizard"; - tag = "${version}"; + tag = version; hash = "sha256-DuEI6bmvNP6wRuZX9Do0FGDsu80ldy0SCefBk6gqT9s="; }; postPatch = '' diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix index f6c711b8cdc9..e3d56ce1e413 100644 --- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix @@ -36,7 +36,7 @@ lib.checkListOfEnum "${pname}: theme variants" src = fetchFromGitHub { owner = "vinceliuice"; repo = "WhiteSur-icon-theme"; - tag = "${version}"; + tag = version; hash = "sha256-oBKDvCVHEjN6JT0r0G+VndzijEWU9L8AvDhHQTmw2E4="; }; diff --git a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix index ce4242c7a1b9..3915bed5ebc9 100644 --- a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix +++ b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "0e4ef622"; repo = "wine-discord-ipc-bridge"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jzsbOKMakNQ6RNMlioX088fGzFBDxOP45Atlsfm2RKg="; }; diff --git a/pkgs/by-name/wi/witr/package.nix b/pkgs/by-name/wi/witr/package.nix index d6acbbcf4b66..1feb5788c844 100644 --- a/pkgs/by-name/wi/witr/package.nix +++ b/pkgs/by-name/wi/witr/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "witr"; - version = "0.2.0"; + version = "0.2.4"; src = fetchFromGitHub { owner = "pranshuparmar"; repo = "witr"; tag = "v${finalAttrs.version}"; - hash = "sha256-gxfoqa7Q1kb9sIN3zwxmjAHQeWdoGNg0yxc5j8unp5g="; + hash = "sha256-T3yngazwAxBSJ9SD5jthwbJd2NRBRZV3itgZacQ1Nlo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix index a21832dc6e66..698b32ed0576 100644 --- a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix +++ b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-MKB6gZdGdAYoNK8SRiDHG8xtMZ5mXdaSn+bH4T6o/K4="; }; diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix index 5fd3feaf9e40..05e13f63740f 100644 --- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix +++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-openwakeword"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yYDZ1wOhCTdYGeRmtbOgx5/zkF0Baxmha7eO/i0p49g="; }; diff --git a/pkgs/by-name/xa/xavs2/package.nix b/pkgs/by-name/xa/xavs2/package.nix index 561b1b0bd237..222a44e73301 100644 --- a/pkgs/by-name/xa/xavs2/package.nix +++ b/pkgs/by-name/xa/xavs2/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pkuvcl"; repo = "xavs2"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-4w/WTXvRQbohKL+YALQCCYglHQKVvehlUYfitX/lLPw="; }; diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix index 8b062b28e657..c867258bbaee 100644 --- a/pkgs/by-name/xf/xfitter/package.nix +++ b/pkgs/by-name/xf/xfitter/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { src = fetchFromGitLab { owner = "fitters"; repo = "xfitter"; - rev = "refs/tags/2.2.0_Future_Freeze"; + tag = "2.2.0_Future_Freeze"; domain = "gitlab.cern.ch"; hash = "sha256-wanxgldvBEuAEOeVok3XgRVStcn9APd+Nj7vpRZUtGs="; }; diff --git a/pkgs/by-name/xl/xlogo/package.nix b/pkgs/by-name/xl/xlogo/package.nix index 4ecc87e9b3a0..ea6d02a00263 100644 --- a/pkgs/by-name/xl/xlogo/package.nix +++ b/pkgs/by-name/xl/xlogo/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { group = "xorg"; owner = "app"; repo = "xlogo"; - rev = "refs/tags/xlogo-${version}"; + tag = "xlogo-${version}"; hash = "sha256-KjJhuiFVn34vEZbC7ds4MrcXCHq9PcIpAuaCGBX/EXc="; }; diff --git a/pkgs/by-name/xr/xr-hardware/package.nix b/pkgs/by-name/xr/xr-hardware/package.nix index e6ea0a99027c..2f85fc3bc39a 100644 --- a/pkgs/by-name/xr/xr-hardware/package.nix +++ b/pkgs/by-name/xr/xr-hardware/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "monado/utilities"; repo = "xr-hardware"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-w35/LoozCJz0ytHEHWsEdCaYYwyGU6sE13iMckVdOzY="; }; diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix index 06e8248be921..2b714b184c92 100644 --- a/pkgs/by-name/yg/yggdrasil-jumper/package.nix +++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "one-d-wide"; repo = "yggdrasil-jumper"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dElC+q76dE3SlVY4+aauNmeqcNdfj0mMjg51WRuywJI="; }; diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix index 27d13226efc9..2ed0c224ed06 100644 --- a/pkgs/by-name/zl/zlcompressor/package.nix +++ b/pkgs/by-name/zl/zlcompressor/package.nix @@ -34,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLCompressor"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-G7tgRenRB6aYpi+BSiQzwSsekvCw4JPUuy1iXVj7HN0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix index c5b40446ea20..fd7ef5e529f1 100644 --- a/pkgs/by-name/zl/zlequalizer/package.nix +++ b/pkgs/by-name/zl/zlequalizer/package.nix @@ -34,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLEqualizer"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ix3UcTs9CEJ2TCJLdpvZOaoB0wgNDrvSQhZzer8yMRw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix index 31d1be13f68a..64fa5d3e0aa0 100644 --- a/pkgs/by-name/zl/zlsplitter/package.nix +++ b/pkgs/by-name/zl/zlsplitter/package.nix @@ -34,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLSplitter"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-6ICXL1jX6MMYf5VasTW9osJ2BNb6jqWfeAtmmEp6L/4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zm/zmqpp/package.nix b/pkgs/by-name/zm/zmqpp/package.nix index 171872f3ed8c..20b18b7922f9 100644 --- a/pkgs/by-name/zm/zmqpp/package.nix +++ b/pkgs/by-name/zm/zmqpp/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "zeromq"; repo = "zmqpp"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-UZyJpBEOf/Ys+i2tiBTjv4PlM5fHjjNLWuGhpgcmYyM="; }; diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix index 91dd61297ad7..074b6df06f96 100644 --- a/pkgs/by-name/zu/zulip-term/package.nix +++ b/pkgs/by-name/zu/zulip-term/package.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "urwid"; repo = "urwid"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo="; }; doCheck = false; diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix index 2e02c75ab969..994a1702b95d 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-mediaplayer-app"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-A1tAXQXDwVZ3ILFcJKCtbOm1iNxPFOXQIS6p7fPbqwM="; }; diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix index df754042206c..809cceec9006 100644 --- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix +++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qqc2-suru-style"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM="; }; diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index 1991c7f5bf31..f95d35e8eb43 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -60,7 +60,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { hash = "sha256-Ckv2SNugHK75Af+ZzI91+QodOHIa5TMcjVQYsO45mQo="; }; - env = { + env = (oldAttrs.env or { }) // { BOOT_JDK = openjdk17-bootstrap.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update SOURCE_DATE_EPOCH = 1745907200; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 7d8592aff977..921929b5a54c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -62,7 +62,7 @@ jdk.overrideAttrs (oldAttrs: rec { hash = "sha256-P2boCbGB66X8LB4sZHGFO8lqHbv6F4kqGVMGBd9yKu0="; }; - env = { + env = (oldAttrs.env or { }) // { BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update SOURCE_DATE_EPOCH = 1765114563; diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.13.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.13.0.json new file mode 100644 index 000000000000..c4ff46160339 --- /dev/null +++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.13.0.json @@ -0,0 +1,36 @@ +{ + "release_date": "2025-07-22", + "release_label": "10.13.0", + "release_product": "tensorrt", + "tensorrt": { + "name": "NVIDIA TensorRT", + "license": "TensorRT", + "version": "10.13.0.35", + "cuda_variant": [ + "11", + "12" + ], + "linux-sbsa": { + "cuda12": { + "md5": "30ba514ad9252fbaec21d0a336fe5b0a", + "relative_path": "tensorrt/10.13.0/tars/TensorRT-10.13.0.35.Linux.aarch64-gnu.cuda-12.9.tar.gz", + "sha256": "b2f7c7ae6da3588729b7a64825246cc59b643adbe373684fb9c5713262ed46c2", + "size": "4377387760" + } + }, + "linux-x86_64": { + "cuda11": { + "md5": "6388feec8573aeced9863a70091aad97", + "relative_path": "tensorrt/10.13.0/tars/TensorRT-10.13.0.35.Linux.x86_64-gnu.cuda-11.8.tar.gz", + "sha256": "4128dd4f40433b957c90f9d04d53311d1636ee046b66a241ab60492f4861de74", + "size": "4788315804" + }, + "cuda12": { + "md5": "de94ac8efa527dfd7fa5700f368ebf74", + "relative_path": "tensorrt/10.13.0/tars/TensorRT-10.13.0.35.Linux.x86_64-gnu.cuda-12.9.tar.gz", + "sha256": "899ff39e237f1351fccac7f6891617f68cbab71c13a7d7c703184424bdbbf621", + "size": "6934362378" + } + } + } +} diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix index 37b87a9747d4..2261509e1317 100644 --- a/pkgs/development/cuda-modules/packages/cuda-samples.nix +++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix @@ -17,6 +17,7 @@ flags, lib, libcublas, + libcudla, libcufft, libcurand, libcusolver, @@ -197,6 +198,7 @@ backendStdenv.mkDerivation (finalAttrs: { libnvjitlink libnvjpeg ] + ++ lib.optionals libcudla.meta.available [ libcudla ] ++ lib.optionals (cudaAtLeast "13") [ cuda_culibos ]; cmakeFlags = [ diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix index a24a06b80b36..10c81dfbbb40 100644 --- a/pkgs/development/cuda-modules/packages/libcudla.nix +++ b/pkgs/development/cuda-modules/packages/libcudla.nix @@ -1,7 +1,7 @@ { backendStdenv, buildRedist, - cudaMajorMinorVersion, + cudaOlder, lib, }: buildRedist { @@ -19,7 +19,7 @@ buildRedist { autoPatchelfIgnoreMissingDeps = [ "libnvcudla.so" ] - ++ lib.optionals (cudaMajorMinorVersion == "11.8") [ + ++ lib.optionals (cudaOlder "12") [ "libcuda.so.1" "libnvdla_runtime.so" ]; @@ -27,12 +27,7 @@ buildRedist { platformAssertions = [ { message = "Only Xavier (7.2) and Orin (8.7) Jetson devices are supported"; - assertion = - let - inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities; - in - hasJetsonCudaCapability - -> (lib.subtractLists [ "7.2" "8.7" ] requestedJetsonCudaCapabilities == [ ]); + assertion = lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]; } ]; } diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix index 6b3481ff6278..a91317465ced 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix @@ -30,40 +30,40 @@ in } ); - # TODO(@connorbaker): A number of the tests fail with 10.2: - # API Usage Error (Unable to load library: libnvinfer_builder_resource_win.so.10.2.0: - # libnvinfer_builder_resource_win.so.10.2.0: cannot open shared object file: No such file or directory) + mkTester = + name: cmdArgs: + writeShellApplication { + name = finalAttrs.name + "-tester-" + name; + runtimeInputs = [ finalAttrs.finalPackage ]; + text = '' + ${lib.toShellVar "cmdArgs" cmdArgs} + echo "running ''${cmdArgs[*]@Q}" + "''${cmdArgs[@]}" + ''; + }; + # TODO(@connorbaker): Add tests for trtexec. testers = let - mkTester = - name: cmdArgs: - writeShellApplication { - name = finalAttrs.name + "-tester-" + name; - runtimeInputs = [ finalAttrs.finalPackage ]; - text = '' - ${lib.toShellVar "cmdArgs" cmdArgs} - echo "running ''${cmdArgs[*]@Q}" - "''${cmdArgs[@]}" - ''; - }; + mkTesters = lib.flip import { + inherit (finalAttrs.passthru) mkTester sample-data; + inherit + atLeast + backendStdenv + finalAttrs + lib + older + ; + }; in - lib.packagesFromDirectoryRecursive { - callPackage = - path: _: - import path { - inherit (finalAttrs.passthru) sample-data; - inherit - atLeast - backendStdenv - finalAttrs - lib - mkTester - older - ; - }; - directory = ./testers; - }; + # Filter out sets of testers which are completely empty (not available on this architecture, this version, etc.). + lib.filterAttrs (_: attrs: attrs != { }) ( + # Construct all the testers from the filesystem. + lib.packagesFromDirectoryRecursive { + callPackage = path: _: mkTesters path; + directory = ./testers; + } + ); # Wrap each of the derivations in testers in a runCommand. tests = lib.mapAttrsRecursiveCond (as: !(lib.isDerivation as)) ( diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix index 047b0e6a5121..87815642a701 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix @@ -1,4 +1,5 @@ { + atLeast, backendStdenv, lib, mkTester, @@ -26,15 +27,16 @@ lib.optionalAttrs (older "10.8") ( "--datadir=${sample-data.outPath + "/mnist"}" "--fp16" ]; - + } + // lib.optionalAttrs (atLeast "10") { bf16 = mkTester "sample_algorithm_selector-bf16" [ "sample_algorithm_selector" "--datadir=${sample-data.outPath + "/mnist"}" "--bf16" ]; } - # Only Orin has a DLA - // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + # Only Xavier and Orin have a DLA + // lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_algorithm_selector-dla" [ "sample_algorithm_selector" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix index e68c51ccb3df..6094b16011f8 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix @@ -1,4 +1,6 @@ { + atLeast, + lib, mkTester, sample-data, ... @@ -21,7 +23,8 @@ "--datadir=${sample-data.outPath + "/mnist"}" "--fp16" ]; - +} +// lib.optionalAttrs (atLeast "10") { bf16 = mkTester "sample_dynamic_reshape-bf16" [ "sample_dynamic_reshape" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix index 58faf35a48fc..3ca3a46bacc2 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix @@ -12,8 +12,8 @@ "--data=${sample-data.outPath + "/int8_api"}" ]; } -# Only Orin has a DLA -// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { +# Only Xavier and Orin have a DLA +// lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_int8_api-dla" [ "sample_int8_api" "--model=${sample-data.outPath + "/resnet50/ResNet50.onnx"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix index 208966cd2640..c8ec26241fdb 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix @@ -11,8 +11,8 @@ "--datadir=${sample-data.outPath + "/mnist"}" ]; } -# Only Orin has a DLA -// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { +# Only Xavier and Orin have a DLA +// lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_io_formats-dla" [ "sample_io_formats" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix index 8e97fdf3c99c..5b43347d7c05 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix @@ -1,27 +1,28 @@ { atLeast, - finalAttrs, lib, mkTester, sample-data, ... }: -{ - default = mkTester "sample_non_zero_plugin" [ - "sample_non_zero_plugin" - "--datadir=${sample-data.outPath + "/mnist"}" - ]; +lib.optionalAttrs (atLeast "10") ( + { + default = mkTester "sample_non_zero_plugin" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; - fp16 = mkTester "sample_non_zero_plugin-fp16" [ - "sample_non_zero_plugin" - "--datadir=${sample-data.outPath + "/mnist"}" - "--fp16" - ]; -} -// lib.optionalAttrs (atLeast "10.0.1") { - columnOrder = mkTester "sample_non_zero_plugin-columnOrder" [ - "sample_non_zero_plugin" - "--datadir=${sample-data.outPath + "/mnist"}" - "--columnOrder" - ]; -} + fp16 = mkTester "sample_non_zero_plugin-fp16" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + } + // lib.optionalAttrs (atLeast "10.0.1") { + columnOrder = mkTester "sample_non_zero_plugin-columnOrder" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + "--columnOrder" + ]; + } +) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix index 1895b87d47e5..bd2791eb4d8f 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix @@ -1,4 +1,5 @@ { + atLeast, backendStdenv, lib, mkTester, @@ -22,15 +23,16 @@ "--datadir=${sample-data.outPath + "/mnist"}" "--fp16" ]; - +} +// lib.optionalAttrs (atLeast "10") { bf16 = mkTester "sample_onnx_mnist-bf16" [ "sample_onnx_mnist" "--datadir=${sample-data.outPath + "/mnist"}" "--bf16" ]; } -# Only Orin has a DLA -// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { +# Only Xavier and Orin have a DLA +// lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_onnx_mnist-dla" [ "sample_onnx_mnist" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix index ef4b4bedfbc0..25260050b501 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix @@ -25,8 +25,8 @@ lib.optionalAttrs false ( "--fp16" ]; } - # Only Orin has a DLA - // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + # Only Xavier and Orin have a DLA + // lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_onnx_mnist_coord_conv_ac-dla" [ "sample_onnx_mnist_coord_conv_ac" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix index 86254b3039d4..55866b2e5b48 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix @@ -25,8 +25,8 @@ lib.optionalAttrs false ( "--fp16" ]; } - # Only Orin has a DLA - // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + # Only Xavier and Orin have a DLA + // lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_progress_monitor-dla" [ "sample_progress_monitor" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9c4be1d03b3..1332333c02c5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -610,7 +610,7 @@ with haskellLib; src = pkgs.fetchgit { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; - rev = "refs/tags/" + super.git-annex.version; + tag = super.git-annex.version; sha256 = "sha256-+OLFMrqpf1Ooy7CQ9S+N/H5R5+aHQtbO1pYwDF4ln8A="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 2af6cf4c6845..6e98ed629910 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-qt"; - rev = "refs/tags/VERSION_${finalAttrs.version}"; + tag = "VERSION_${finalAttrs.version}"; hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; }; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 4573e7c8ba40..863684149df2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -10,6 +10,7 @@ generateSplicesForMkScope, lib, stdenv, + gcc14Stdenv, fetchurl, fetchgit, fetchpatch, @@ -246,12 +247,15 @@ let addPackages = self: let - qtModule = callPackage ../qtModule.nix { - inherit patches; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; - }; + qtModuleWithStdenv = + stdenv: + callPackage ../qtModule.nix { + inherit patches; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; + }; + qtModule = qtModuleWithStdenv stdenv; callPackage = self.newScope { inherit @@ -326,14 +330,22 @@ let qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { }; qtwayland = callPackage ../modules/qtwayland.nix { }; qtwebchannel = callPackage ../modules/qtwebchannel.nix { }; - qtwebengine = callPackage ../modules/qtwebengine.nix { - # Won’t build with Clang 20, as `-Wenum-constexpr-conversion` - # was made a hard error. - stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv; - inherit (srcs.qtwebengine) version; - inherit (darwin) bootstrap_cmds; - python = python3; - }; + qtwebengine = + # Actually propagating stdenv change + let + # Won’t build with Clang 20, as `-Wenum-constexpr-conversion` + # was made a hard error. + # qt5webengine no longer maintained, FTBFS with GCC 15 + stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv; + qtModule' = qtModuleWithStdenv stdenv'; + in + callPackage ../modules/qtwebengine.nix { + inherit (srcs.qtwebengine) version; + inherit (darwin) bootstrap_cmds; + stdenv = stdenv'; + qtModule = qtModule'; + python = python3; + }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { }; qtwebkit = callPackage ../modules/qtwebkit.nix { }; qtwebsockets = callPackage ../modules/qtwebsockets.nix { }; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index a725329d917c..0d6a6ac1664d 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -479,7 +479,7 @@ let src = pkgs.fetchFromGitHub { owner = "fukamachi"; repo = "qlot"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE="; }; diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix index f61c99238f43..519c55ba9bdf 100644 --- a/pkgs/development/ocaml-modules/synchronizer/default.nix +++ b/pkgs/development/ocaml-modules/synchronizer/default.nix @@ -15,7 +15,7 @@ buildDunePackage (finalAttrs: { src = fetchFromGitHub { owner = "OCamlPro"; repo = "synchronizer"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-0XtPHpDlyH1h8W2ZlRvJbZjCN9WP5mzk2N01WFd8eLQ="; }; diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix index f9218e310c2b..4232176fba29 100644 --- a/pkgs/development/octave-modules/bim/default.nix +++ b/pkgs/development/octave-modules/bim/default.nix @@ -13,7 +13,7 @@ buildOctavePackage rec { src = fetchFromGitHub { owner = "carlodefalco"; repo = "bim"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-nK/VZ+thMuMU5RBiNYpzylOuVxKbcfSyrXZfka5+g4I="; }; diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index f5bce5cf9d37..e6ae003b8f7b 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -21,6 +21,9 @@ tqdm, ufonormalizer, ufoprocessor, + + # passthru + afdko, }: buildPythonPackage (finalAttrs: { @@ -139,7 +142,7 @@ buildPythonPackage (finalAttrs: { ]; passthru.tests = { - fullTestsuite = finalAttrs.finalPackage.override { runAllTests = true; }; + fullTestsuite = afdko.override { runAllTests = true; }; }; meta = { diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index e01c0d2d2a72..e2e46c77602d 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = "alabaster"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-aQEhFZUJs0TptfpjQVoIVI9V9a+xKjE2OfStSaJKHGI="; }; diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 85169db32fc0..6deb20ca96cc 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "warsaw"; repo = "public"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-cqum+4hREu0jO9iFoUUzfzn597BoMAhG+aanwnh8hb8="; }; diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index 816f8b412f11..e967ea74b973 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clbarnes"; repo = "backports.strenum"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-j5tALFrLeZ8k+GwAaq0ocmcQWvdWkRUHbOVq5Du4mu0="; }; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 8b604069d732..81ad8dc1a345 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JoelBender"; repo = "bacpypes"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-BHCHI36nTqBj2dkHB/Y5qkC4uJCmzbHGzSFWKNsIdbc="; }; diff --git a/pkgs/development/python-modules/biocframe/default.nix b/pkgs/development/python-modules/biocframe/default.nix index 3eee6572e828..324eea7c5a56 100644 --- a/pkgs/development/python-modules/biocframe/default.nix +++ b/pkgs/development/python-modules/biocframe/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocFrame"; - tag = "${version}"; + tag = version; hash = "sha256-2O4YINYo9ehiBuZSHZmBmNIwud7GkNzAMWEv2/7oSs8="; }; diff --git a/pkgs/development/python-modules/biocutils/default.nix b/pkgs/development/python-modules/biocutils/default.nix index fd950949c22f..eaa860c8522d 100644 --- a/pkgs/development/python-modules/biocutils/default.nix +++ b/pkgs/development/python-modules/biocutils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocUtils"; - tag = "${version}"; + tag = version; hash = "sha256-ziKVF2cxOIRt8cEMOsbf5HAgBGG2vLp+DSMpL+hH6JM="; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index fb20505d5da0..bd0fae8f1523 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.28"; + version = "1.42.29"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-bug70UV9Y3cTDXCfyw+LK5XKeSiwZX0Yq7HQjRnbbsk="; + hash = "sha256-fcDiIx8fd/xSgsT8S35GJ8ePqVhR7sFpUt+MaWtnhV8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 06cf46fa41b0..faa5bbbc67e3 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "botocore-stubs"; - version = "1.42.28"; + version = "1.42.29"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit (finalAttrs) version; - hash = "sha256-qhMfkvJmwKxHmHPo6RTEYlbDnbOuzqDHPt8IRtME6d8="; + hash = "sha256-8vbtyp1TexhlmSqTkqGBTN95PWAxl4uxZJhgWodYJmo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 78907e2f1b45..5f4c316f116d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -23,7 +23,7 @@ let binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-XXJBySIT3ylK1nd3suP2bq4bVSVah/1XhOmkEONbCoY="; }; in @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = "cle"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-rWbZzm5hWi/C+te8zeQChxqYHO0S795tJ6Znocq9TTs="; }; diff --git a/pkgs/development/python-modules/colcon-cd/default.nix b/pkgs/development/python-modules/colcon-cd/default.nix index c2acd60cb967..d2711e0d04db 100644 --- a/pkgs/development/python-modules/colcon-cd/default.nix +++ b/pkgs/development/python-modules/colcon-cd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "colcon"; repo = "colcon-cd"; - tag = "${version}"; + tag = version; hash = "sha256-eOo1DqTvYazr+wWraG9PZe0tTCgaAvhWtELG5rlaGSs="; }; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 5bc41fdd60b6..800bc6a88c15 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "dslackw"; repo = "colored"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PPaPw7pCZJeBz6h5omZ+kcRXsqi6ncLYGM7FNfZ0r4w="; }; diff --git a/pkgs/development/python-modules/conjure-python-client/default.nix b/pkgs/development/python-modules/conjure-python-client/default.nix index 3ba67ac0bab0..de2bb79a2b74 100644 --- a/pkgs/development/python-modules/conjure-python-client/default.nix +++ b/pkgs/development/python-modules/conjure-python-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "palantir"; repo = "conjure-python-client"; - tag = "${version}"; + tag = version; hash = "sha256-dfoP0/v0yFAyBo4wADDGGTggVuFBoG53e5WTBvKQaS0="; }; diff --git a/pkgs/development/python-modules/crontab/default.nix b/pkgs/development/python-modules/crontab/default.nix index f801151e1b8d..8887c456072d 100644 --- a/pkgs/development/python-modules/crontab/default.nix +++ b/pkgs/development/python-modules/crontab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "doctormo"; repo = "python-crontab"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-eJXtvTRwokbewWrTArHJ2FXGDLvlkGA/5ZZR01koMW8="; }; diff --git a/pkgs/development/python-modules/csaf-tool/default.nix b/pkgs/development/python-modules/csaf-tool/default.nix index f18a295ec6a8..40495b680fef 100644 --- a/pkgs/development/python-modules/csaf-tool/default.nix +++ b/pkgs/development/python-modules/csaf-tool/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anthonyharrison"; repo = "csaf"; - tag = "${version}"; + tag = version; hash = "sha256-LR6r03z0nvvAQgFHaTWfukoJmLZ6SLPXfbp/G8N/HtM="; }; diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix index f30b0b4f7452..a54ebfa8b156 100644 --- a/pkgs/development/python-modules/cython/0.nix +++ b/pkgs/development/python-modules/cython/0.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-XsEy2NrG7hq+VXRCRbD4BRaBieU6mVoE0GT52L3mMhs="; }; diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix index 83b031473cd9..a06645526753 100644 --- a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix +++ b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dedupeio"; repo = "pylbfgs"; - tag = "${version}"; + tag = version; hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU="; }; diff --git a/pkgs/development/python-modules/defang/default.nix b/pkgs/development/python-modules/defang/default.nix index a2452e6cca50..0bb3d89e63e0 100644 --- a/pkgs/development/python-modules/defang/default.nix +++ b/pkgs/development/python-modules/defang/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromBitbucket { owner = "johannestaas"; repo = "defang"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-OJfayJeVf2H1/jg7/fu2NiHhRHNCaLGI29SY8BnJyxI="; }; diff --git a/pkgs/development/python-modules/discord-webhook/default.nix b/pkgs/development/python-modules/discord-webhook/default.nix index 901f5d12a631..c1bd7a56b14f 100644 --- a/pkgs/development/python-modules/discord-webhook/default.nix +++ b/pkgs/development/python-modules/discord-webhook/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lovvskillz"; repo = "python-discord-webhook"; - tag = "${version}"; + tag = version; hash = "sha256-7nVvtXo1XjQExZSCF9VaYSCeEByJY2jn5KbVGTi33f0="; }; diff --git a/pkgs/development/python-modules/django-crossdomainmedia/default.nix b/pkgs/development/python-modules/django-crossdomainmedia/default.nix index 998b69818a40..652a02851238 100644 --- a/pkgs/development/python-modules/django-crossdomainmedia/default.nix +++ b/pkgs/development/python-modules/django-crossdomainmedia/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { repo = "django-crossdomainmedia"; # Release is not tagged yet # https://github.com/stefanw/django-crossdomainmedia/issues/1 - # rev = "refs/tags/v${version}"; + # tag = "v${version}"; rev = "45af45a82e2630d99381758c7660fe9bdad06d2d"; hash = "sha256-nwFUm+cxokZ38c5D77z15gIO/kg49oRACOl6+eGGEtQ="; }; diff --git a/pkgs/development/python-modules/django-jquery-js/default.nix b/pkgs/development/python-modules/django-jquery-js/default.nix index ef2d1435ab02..f8aeaa570eb9 100644 --- a/pkgs/development/python-modules/django-jquery-js/default.nix +++ b/pkgs/development/python-modules/django-jquery-js/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromBitbucket { owner = "tim_heap"; repo = "django-jquery"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-TzMo31jFhcvlrmq2TJgQyds9n8eATaChnyhnQ7bwdzs="; }; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 94758d8e7ede..6a54a6e34180 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "django"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-vdY85Ib2knRFLPmZZ6ojiD5R9diuvpVut1+nOVXSp0Y="; }; diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix index 3fbdc3ae0445..d35469b1af38 100644 --- a/pkgs/development/python-modules/django/5_2.nix +++ b/pkgs/development/python-modules/django/5_2.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "django"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-9URe8hB15WP92AU1YgGGFfZhVxn59gfBRrORZ04L+F0="; }; diff --git a/pkgs/development/python-modules/dmgbuild/default.nix b/pkgs/development/python-modules/dmgbuild/default.nix index e0a8f3ef1138..319003ed6b90 100644 --- a/pkgs/development/python-modules/dmgbuild/default.nix +++ b/pkgs/development/python-modules/dmgbuild/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dmgbuild"; repo = "dmgbuild"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PozYxmXumFnptIgb4FM4b/Q5tx0MIS2bVw2kCuGucA8="; }; diff --git a/pkgs/development/python-modules/ewmhlib/default.nix b/pkgs/development/python-modules/ewmhlib/default.nix index 23820d8c1383..f4c1cbc834de 100644 --- a/pkgs/development/python-modules/ewmhlib/default.nix +++ b/pkgs/development/python-modules/ewmhlib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "Kalmat"; repo = "EWMHlib"; - tag = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NELOgUV8KuN+CqmoSbLYImguHlp8dyhGmJtoxJjOBkA="; }; diff --git a/pkgs/development/python-modules/exif/default.nix b/pkgs/development/python-modules/exif/default.nix index 8253298bb616..90a0f51b0a47 100644 --- a/pkgs/development/python-modules/exif/default.nix +++ b/pkgs/development/python-modules/exif/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "TNThieding"; repo = "exif"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-uiHL3m0C6+YnAHRLwzMCSzffrQsSyVcuem6FBtTLxek="; }; diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 158050a9af77..87d3bc908e1e 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "libffcv"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-L2mwGFivq/gtAw+1D6U2jbW6VxYgetHX7OUrjwyybqE="; }; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 40d8434a88d3..7f7f4e307496 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usnistgov"; repo = "fipy"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-usuAj+bIzbCSxYuKeUDxEESbjxPCwYwdD/opaBbgl1w="; }; diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index e5470bf2939f..60eb80034910 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "WillDaSilva"; repo = "flit_scm"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-2nx9kWq/2TzauOW+c67g9a3JZ2dhBM4QzKyK/sqWOPo="; }; diff --git a/pkgs/development/python-modules/fslpy/default.nix b/pkgs/development/python-modules/fslpy/default.nix index d3bbdc549e3d..c2815dc78e89 100644 --- a/pkgs/development/python-modules/fslpy/default.nix +++ b/pkgs/development/python-modules/fslpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { domain = "git.fmrib.ox.ac.uk"; owner = "fsl"; repo = "fslpy"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-lY/7TNOqGK0pRm5Rne1nrqXVQDZPkHwlZV9ITsOwp9Q="; }; diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index d68f038ec3b9..1e84679782a0 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aleaxit"; repo = "gmpy"; - rev = "refs/tags/gmpy_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "gmpy_${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-kMidOjhKJlDRu2qaiq9c+XcwD1tNAoPhRTvvGcOJe8I="; }; diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index beb40cd058a7..fc77bddb0c02 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -12,15 +12,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-resource-manager"; - version = "1.15.0"; + version = "1.16.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_resource_manager"; - inherit version; - hash = "sha256-PQt4w9qnE/lW0k5SWzXp6adtWXxDiDcXEwTUMQhM7a8="; + inherit (finalAttrs) version; + hash = "sha256-zJOPh8w2wmcvBiseVBZQYp4NlUxAWk2sNc7t7nDCZ8M="; }; build-system = [ setuptools ]; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Resource Manager API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${finalAttrs.version}/packages/google-cloud-resource-manager/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index e211585c3940..07ca89dc15f9 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QDWHVdjtexUNGRL+dVehdBwahSW2HmNkZKkQyuOghyI="; }; diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index e23b78d12e85..498a2b00a46f 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "nobodyinperson"; repo = "hledger-utils"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index a46dd176da42..1f0525638641 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -14,9 +14,9 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "homematicip"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; - tag = version; - hash = "sha256-Ye3UDItGbpF+7iqcBruep0Vb/Oj7KkF0z2HeZ44MeA0="; + tag = finalAttrs.version; + hash = "sha256-UdVOYJyWLtqJaZgiRa3M9JL+gPzZeecZwElBXqrAdFM="; }; build-system = [ @@ -79,8 +79,8 @@ buildPythonPackage rec { meta = { description = "Module for the homematicIP REST API"; homepage = "https://github.com/hahn-th/homematicip-rest-api"; - changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${src.tag}"; + changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index a12fe4f9d29f..449665d68b02 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -230,7 +230,7 @@ let owner = "google"; repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! - rev = "refs/tags/${pname}-v${version}"; + tag = "${pname}-v${version}"; hash = "sha256-qSHPwi3is6Ts7pz5s4KzQHBMbcjGp+vAOsejW3o36Ek="; }; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 1151847d6c7c..629e583d2d78 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -121,7 +121,7 @@ buildPythonPackage rec { version = "0.21.2"; src = fetchFromGitHub { inherit (prev.src) owner repo; - rev = "refs/tags/v${final.version}"; + tag = "v${final.version}"; hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ="; }; } diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index f0450aeb1366..c5343acb1878 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-aws"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; tag = "langchain-aws==${version}"; - hash = "sha256-xihQ50g0urP7BL91C0msfaPIVTN2Gb9sWQhKU7eWg1w="; + hash = "sha256-FJRlt8+Xo2TqXevgx/Pb9LF/fjej+VXzfxZwZEC67ok="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 13040be3fbb6..9527031f45cb 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, anyio, backoff, httpx, @@ -19,18 +20,21 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langfuse"; - version = "3.11.0"; + version = "3.11.2"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; - tag = "v${version}"; - hash = "sha256-3hL29Gu1lonkWAOyTqH2q03joXwVQimbVF0R2nYZUIs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CZa1nzgGHQSx/cPkOxbDsfkWpgr/veWRN8zgHeYrJOw="; }; + # https://github.com/langfuse/langfuse/issues/9618 + disabled = pythonAtLeast "3.14"; + build-system = [ poetry-core ]; pythonRelaxDeps = [ "packaging" ]; @@ -63,8 +67,8 @@ buildPythonPackage rec { meta = { description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; homepage = "https://github.com/langfuse/langfuse-python"; - changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${src.tag}"; + changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; -} +}) diff --git a/pkgs/development/python-modules/marqo/default.nix b/pkgs/development/python-modules/marqo/default.nix index a4f68be28e89..a23240eeabf9 100644 --- a/pkgs/development/python-modules/marqo/default.nix +++ b/pkgs/development/python-modules/marqo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marqo-ai"; repo = "py-marqo"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-phO7aR7kQJHw5qxrpMI5DtOaXlaHMsKfaC3UquyD/Rw="; }; diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 050a24bc2d25..ab73bccb8a68 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-H3o2IWGuMqLrJTzQ7w636Ito6f57WBtMXpXXzrZ7UD8="; }; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e84ba439dcd3..44844c120dbc 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -207,8 +207,8 @@ in "sha256-Yj+PL5SHeMuiC3kougQa6zahznlD32+1NQWqoD8xdEg="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.42.20" - "sha256-Psj4WK99bI+zQBUCmUgiL1zl7i/f76Ieu0QxIfGUfvA="; + buildMypyBoto3Package "cleanrooms" "1.42.29" + "sha256-UaGUvnJYw/bCJzIU9exO/eW2cvnUuiDGheFO6Zj3Uoo="; mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.42.3" @@ -443,8 +443,8 @@ in "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.42.15" - "sha256-ZntIoM7u7EpnFzJMsezVzy7XwsX3i6Z+FwhaVAxR0no="; + buildMypyBoto3Package "ec2" "1.42.29" + "sha256-o7pABpOci5Z0fblGTcpep7FnFTW37OQWTnxbIk8CZJo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.42.3" @@ -459,8 +459,8 @@ in "sha256-syjw4M02YXRXsJpM3e7OikE3sSTl/hIIJ3857PP2BII="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.42.13" - "sha256-qINV3eKoz/lYLNIunllwb6u7RC19cHVbs1LInPevkjo="; + buildMypyBoto3Package "ecs" "1.42.29" + "sha256-hXpGVFL8ZLXWs7GNz8Ij3xXzKBd6HMi7/deFq4s5RrM="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.42.3" @@ -762,8 +762,8 @@ in "sha256-UfEbkTcu9ecQoqoXbM6uWxNAh5B/Z6Wj26WHSaLiEj8="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.42.3" - "sha256-6fTkAXpFQ0Io8akKnTdSGENyKmsTu6VtkzVXRsskKZE="; + buildMypyBoto3Package "lakeformation" "1.42.29" + "sha256-Yb24aPwMfxgh4ftE8k6mCvvJCTuUCxD5J+GElQBMD+U="; mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.42.8" @@ -970,8 +970,8 @@ in "sha256-NVhi7X3TpxHLoalx2LTleKBXUiWElWdr4NGdOlnuoXk="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.42.3" - "sha256-Yz43bH+alilEKIqvD41ueohgC4eu2sUy5Z2qfIX82co="; + buildMypyBoto3Package "opensearchserverless" "1.42.29" + "sha256-fC4SP/yP31qx5O5a2rStUATsq+Cs5zWpwGf1XsBWFQI="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.40.0" diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index a38ed796db89..ad9be9312a9b 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { domain = "dev.gajim.org"; owner = "gajim"; repo = "python-nbxmpp"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-q910WbBp0TBqXw8WfYniliVGnr4Hi6dDhVDqZszSL0c="; }; diff --git a/pkgs/development/python-modules/nexusrpc/default.nix b/pkgs/development/python-modules/nexusrpc/default.nix index 7399bd358595..de8c5f30dcbb 100644 --- a/pkgs/development/python-modules/nexusrpc/default.nix +++ b/pkgs/development/python-modules/nexusrpc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexus-rpc"; repo = "sdk-python"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-i2FfJ3aCncbqLY2oBG8zAPTbgxzH30MSmZxhDltN4JA="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/nvdlfw-inspect/default.nix b/pkgs/development/python-modules/nvdlfw-inspect/default.nix new file mode 100644 index 000000000000..21a9be48d090 --- /dev/null +++ b/pkgs/development/python-modules/nvdlfw-inspect/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # dependencies + pyyaml, + torch, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "nvdlfw-inspect"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-dlfw-inspect"; + # No tag, found the commit using `git blame` + rev = "3a7314ac44f8479a3368a69ac4c7938e40e6104c"; + hash = "sha256-qLyPzdwIIXHUDeP226w4yo2B1fqOKZ3yeSXrG3pNQyk="; + }; + + dependencies = [ + pyyaml + torch + ]; + + pythonImportsCheck = [ "nvdlfw_inspect" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Facilitates debugging convergence issues and testing new algorithms/recipes for training LLMs using Nvidia libraries"; + homepage = "https://github.com/NVIDIA/nvidia-dlfw-inspect"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 13dfcec11fb0..523f625c44a8 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchgit { url = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa"; }; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index f2ae52cfcb51..72f88a169d81 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { domain = "foss.heptapod.net"; owner = "openpyxl"; repo = "openpyxl"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-vp+TIWcHCAWlDaBcmC7w/kV7DZTZpa6463NusaJmqKo="; }; diff --git a/pkgs/development/python-modules/pluginlib/default.nix b/pkgs/development/python-modules/pluginlib/default.nix index 7d34cea82d1f..c3e89726e999 100644 --- a/pkgs/development/python-modules/pluginlib/default.nix +++ b/pkgs/development/python-modules/pluginlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Rockhopper-Technologies"; repo = "pluginlib"; - tag = "${version}"; + tag = version; hash = "sha256-mt3VE8iJPCmbws8bAdYMK9to446z8FQtsMZOlkLVUIU="; }; diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix index f4b137c6725a..4d099fd594d3 100644 --- a/pkgs/development/python-modules/plum-py/default.nix +++ b/pkgs/development/python-modules/plum-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "dangass"; repo = "plum"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-gZSRqijKdjqOZe1+4aeycpCPsh6HC5sRbyVjgK+g4wM="; }; diff --git a/pkgs/development/python-modules/port-for/default.nix b/pkgs/development/python-modules/port-for/default.nix index 8f0de56e3ea8..7f983879fb6c 100644 --- a/pkgs/development/python-modules/port-for/default.nix +++ b/pkgs/development/python-modules/port-for/default.nix @@ -8,19 +8,20 @@ buildPythonPackage rec { pname = "port-for"; - version = "0.7.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "kmike"; repo = "port-for"; tag = "v${version}"; - hash = "sha256-/45TQ2crmTupRgL9hgZGw5IvFKywezSIHqHFbeAkMoo="; + hash = "sha256-vv2xjXyUh6g7T0zGDAlOs3K+YM18wSE8rEvgSP1ZBL4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "port_for" ]; meta = { diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 3f42f2e7e7b3..af1195baf61b 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -5,9 +5,6 @@ fetchFromGitHub, cmake, boost, - eigen, - ipopt, - nlopt, pagmo2, python, cloudpickle, @@ -43,9 +40,6 @@ toPythonModule ( buildInputs = [ boost - eigen - ipopt - nlopt pagmo2 pybind11 ]; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 0162f0c33286..3ea76b573612 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { domain = "codeberg.org"; owner = "miurahr"; repo = "pykakasi"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0="; }; diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix index 6f11c43821f6..90fe12d0c1d9 100644 --- a/pkgs/development/python-modules/pylsl/default.nix +++ b/pkgs/development/python-modules/pylsl/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pylsl"; - version = "1.17.6"; + version = "1.18.1"; pyproject = true; src = fetchFromGitHub { owner = "labstreaminglayer"; repo = "pylsl"; tag = "v${version}"; - hash = "sha256-PEeTG+bQNEce9j0obDoaTYXMGp0MRUibbWVXM1IvGGY="; + hash = "sha256-H/ALvRtgv1Ms9VeTJvDRCpg0Q+/4Xjx/NS4whOGmtU8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymonctl/default.nix b/pkgs/development/python-modules/pymonctl/default.nix index 643e56257c1e..7a434581e95e 100644 --- a/pkgs/development/python-modules/pymonctl/default.nix +++ b/pkgs/development/python-modules/pymonctl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "Kalmat"; repo = "PyMonCtl"; - tag = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eFB+HqYBud836VNEA8q8o1KQKA+GHwSC0YfU1KCbDXw="; }; diff --git a/pkgs/development/python-modules/pymongo-search-utils/default.nix b/pkgs/development/python-modules/pymongo-search-utils/default.nix index 5702d09294f0..befb10f13705 100644 --- a/pkgs/development/python-modules/pymongo-search-utils/default.nix +++ b/pkgs/development/python-modules/pymongo-search-utils/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymongo-search-utils"; - version = "0.1.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "mongodb-labs"; repo = "pymongo-search-utils"; tag = version; - hash = "sha256-R0GYfVeLc0zfzfEGBil/AHyt20Y0bEo+eQ9wtdNwJL8="; + hash = "sha256-nNXJwRtN5AICpI/OdS+ToYbUIfMSL88XiO6Hrh2R8NA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 2843018a6c6e..99c041bd444d 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.5.0"; + version = "7.6.0"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "pynetbox"; tag = "v${version}"; - hash = "sha256-gDcTWXGE0GOEmuDSwFgKytCidg8Py1PFMfJCDhuOMoQ="; + hash = "sha256-XflMJ6mrXOeUt+Tlmaa2Tw59M3zssnjgnZ7RoQRdOTQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix index 5e3cbe9954eb..ad9fe9193407 100644 --- a/pkgs/development/python-modules/pytest-postgresql/default.nix +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -7,6 +7,7 @@ pytest-cov-stub, setuptools, mirakuru, + packaging, port-for, psycopg, pytest, @@ -15,29 +16,29 @@ buildPythonPackage rec { pname = "pytest-postgresql"; - version = "6.0.0"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { - owner = "ClearcodeHQ"; + owner = "dbfixtures"; repo = "pytest-postgresql"; tag = "v${version}"; - hash = "sha256-6D9QNcfq518ORQDYCH5G+LLJ7tVWPFwB6ylZR3LOZ5g="; + hash = "sha256-/EekUveW3wb8NlcKacMJpjjU7bpFvnNMpAuZ9h0sbpw="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--max-worker-restart=0" "" sed -i 's#/usr/lib/postgresql/.*/bin/pg_ctl#${postgresql}/bin/pg_ctl#' pytest_postgresql/plugin.py ''; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; dependencies = [ mirakuru port-for psycopg - setuptools # requires 'pkg_resources' at runtime + packaging ]; nativeCheckInputs = [ @@ -50,12 +51,14 @@ buildPythonPackage rec { ]; disabledTestPaths = [ "tests/docker/test_noproc_docker.py" ]; # requires Docker disabledTests = [ - # permissions issue running pg as Nixbld user - "test_executor_init_with_password" # "ValueError: Pytest terminal summary report not found" + "test_postgres_drop_test_database" "test_postgres_loader_in_cli" + "test_postgres_loader_in_ini" "test_postgres_options_config_in_cli" "test_postgres_options_config_in_ini" + "test_postgres_port_search_count_in_cli_is_int" + "test_postgres_port_search_count_in_ini_is_int" ]; pythonImportsCheck = [ "pytest_postgresql" @@ -69,7 +72,7 @@ buildPythonPackage rec { meta = { homepage = "https://pypi.python.org/pypi/pytest-postgresql"; description = "Pytest plugin that enables you to test code on a temporary PostgreSQL database"; - changelog = "https://github.com/ClearcodeHQ/pytest-postgresql/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/dbfixtures/pytest-postgresql/blob/v${version}/CHANGES.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/python-apt/default.nix b/pkgs/development/python-modules/python-apt/default.nix index 99512d60930a..316a3f8eb9e3 100644 --- a/pkgs/development/python-modules/python-apt/default.nix +++ b/pkgs/development/python-modules/python-apt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { domain = "salsa.debian.org"; owner = "apt-team"; repo = "python-apt"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-3mRMqbhKy5CYwpSttq8MgXY147Ov3lPuZaTjUMtmHik="; }; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 06527bddc607..e10c433246b5 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.46.4"; + version = "0.46.5"; pyproject = true; src = fetchFromGitHub { owner = "pyvista"; repo = "pyvista"; tag = "v${version}"; - hash = "sha256-FFrnLiGiP6LSwaoEHx4tih6XPdKCZ/9tjvz00NQDU0Q="; + hash = "sha256-yTCHbAOcAxXrXwKbTXKGuSwoA69hy+XBT1kt6MhdoxQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pywinbox/default.nix b/pkgs/development/python-modules/pywinbox/default.nix index a6dfccf327c1..9815316daf3a 100644 --- a/pkgs/development/python-modules/pywinbox/default.nix +++ b/pkgs/development/python-modules/pywinbox/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "Kalmat"; repo = "PyWinBox"; - tag = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Z/gedrIFNpQvzRWqGxMEl5MoEIo9znZz/FZLMVl0Eb4="; }; diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 6ded6bd638f3..aacc7b0d031b 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-zYhYhojCzlENzgYSenwewjeVHUBX2X6eQbbzc9znBsk="; }; diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 69d66f6f9d5f..7635b0b82646 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-SVzg3McB885RMyAp90Kr6/iVKw3Su9ucTob2jBckBo0="; }; diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 7ec578316d4b..2b63c5c56236 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-kzEuICajlV8mgD0YLhwFJaDQVxYZo9jv3sr/r/P0VG0="; }; diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 120ffc25b80f..80ac838b8312 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vanstinator"; repo = "raincloudy"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 51df98b9bf26..49f29978690d 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -49,14 +49,14 @@ buildPythonPackage (finalAttrs: { pname = "reflex"; - version = "0.8.24"; + version = "0.8.25"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${finalAttrs.version}"; - hash = "sha256-l78pXsaPl6F7C850HD8/as/eJPaH1vOmnbNmuos7Yio="; + hash = "sha256-pp4onogav+kad0JpBRPnar30elP1aYuhA9AMoSjjRss="; }; # For some reason, pre_commit is supposedly missing when python>=3.14 diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index f16f609ce960..48a7351a4682 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.72"; + version = "1.0.73"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-KntbPDsboaDs5jSREQca+N9xUd3lCZzH0pqeCIHmVxw="; + hash = "sha256-0pjz5XKiHe4ReDSeDeKpuT9hmv+XkM6ut3AbiWQDAlE="; }; build-system = [ diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index b54fa72b51be..bf3422f6cdb7 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -1,20 +1,21 @@ { lib, - appdirs, buildPythonPackage, - cryptography, fetchFromGitHub, + + # build-system flit-core, + + # dependencies + appdirs, + cryptography, id, importlib-resources, - nix-update-script, platformdirs, - pretend, pyasn1, pydantic, pyjwt, pyopenssl, - pytestCheckHook, requests, rfc3161-client, rfc8785, @@ -24,10 +25,17 @@ sigstore-protobuf-specs, sigstore-rekor-types, tuf, + + # tests + pretend, + pytestCheckHook, writableTmpDirAsHomeHook, + + # passthru + nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sigstore"; version = "4.1.0"; pyproject = true; @@ -35,32 +43,29 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sigstore"; repo = "sigstore-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Wt9ZoMHTiMlbAab9p8/WF38/OiyCaqHPS5R7/fTAfxw="; }; + build-system = [ flit-core ]; + pythonRelaxDeps = [ "sigstore-models" - "sigstore-rekor-types" - "rfc3161-client" - "cryptography" ]; - build-system = [ flit-core ]; - dependencies = [ appdirs cryptography id importlib-resources + platformdirs + pyasn1 pydantic pyjwt pyopenssl - pyasn1 - rfc8785 - rfc3161-client - platformdirs requests + rfc3161-client + rfc8785 rich securesystemslib sigstore-models @@ -100,9 +105,9 @@ buildPythonPackage rec { meta = { description = "Codesigning tool for Python packages"; homepage = "https://github.com/sigstore/sigstore-python"; - changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/sigstore/sigstore-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bot-wxt1221 ]; mainProgram = "sigstore"; }; -} +}) diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index 76e58efe547a..8d610327ca09 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MisterWil"; repo = "skybellpy"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/+9KYxXYTN0T6PoccAA/pwdwWqOzCSZdNxj6xi6oG74="; }; diff --git a/pkgs/development/python-modules/spacy/lookups-data.nix b/pkgs/development/python-modules/spacy/lookups-data.nix index 0c61a09caded..8be43751fc9b 100644 --- a/pkgs/development/python-modules/spacy/lookups-data.nix +++ b/pkgs/development/python-modules/spacy/lookups-data.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "spacy-lookups-data"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-6sKZ+GgCjLWYnV96nub4xEUFh1qpPQpbnoxyOVrvcD0="; }; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 755a7bee60c7..92460ee2a3ae 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -50,7 +50,7 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc="; }; diff --git a/pkgs/development/python-modules/terminaltables3/default.nix b/pkgs/development/python-modules/terminaltables3/default.nix index ea4351ea7007..6f7b82e329d6 100644 --- a/pkgs/development/python-modules/terminaltables3/default.nix +++ b/pkgs/development/python-modules/terminaltables3/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewdeanmartin"; repo = "terminaltables3"; - #rev = "refs/tags/v${version}"; + #tag = "v${version}"; rev = "f1c465b36eb9b91a984d8864b21376e7c37075b8"; hash = "sha256-UcEovh1Eb4QNPwLGDjCphPlJSSkOdhCJ2fK3tuSWOTc="; }; diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 3c958577ecea..ebf8aff02dc0 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "MatthiasLohr"; repo = "tololib"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dfyc96VcauERv2E5I6nOIXAHbmTHiRLqS+0XH0GB5HM="; }; diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index 766baff5d3cc..e922f19dd851 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -14,7 +14,7 @@ let repo = fetchFromGitHub { owner = "pytorch"; repo = "kineto"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-nAtqGCv8q3Tati3NOGWWLb+gXdvO3qmECeC1WG2Mt3M="; }; in diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index c89f11ded901..8f53a89075d6 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "tuya-device-sharing-sdk"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "tuya"; repo = "tuya-device-sharing-sdk"; tag = finalAttrs.version; - hash = "sha256-uD2Lzs08i/01iEksXpYRGB2lU7I15sQrJLfJZ93+oeY="; + hash = "sha256-kNWg+AXISThwK14ByObUr+/4GMntrZgtEEMNpw/HjLw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vbuild/default.nix b/pkgs/development/python-modules/vbuild/default.nix index f1d2ca66357b..980f0ac52d57 100644 --- a/pkgs/development/python-modules/vbuild/default.nix +++ b/pkgs/development/python-modules/vbuild/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "manatlan"; repo = "vbuild"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-p9v1FiYn0cI+f/25hvjwm7eb1GqxXvNnmXBGwZe9fk0="; }; diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index 8c9d73cf636c..d190652c4be4 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "kraxel"; repo = "virt-firmware"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-kuFTKMhBVlgCBYLTO23IUz/tRLoMRHxjWPIaauu/PWw="; }; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 7a5d69e3a6fb..916164c1c49a 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vmprof"; repo = "vmprof-python"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-7k6mtEdPmp1eNzB4l/k/ExSYtRJVmRxcx50ql8zR36k="; }; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 4ea5c17448e4..0f5dd64cf846 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-WLEXTDVcSpGCmfEI31cQXGf9+4EIUCkcaeaj25f4ERU="; }; diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index 0d477776bd76..dab7334886fd 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cournape"; repo = "zipfile2"; - #rev = "refs/tags/v${version}"; + #tag = "v${version}"; rev = "8823f7253772e5c5811343306a591c00c764c6d0"; hash = "sha256-jDOyIj0sQS1dIsar4nyk5V2mme3Zc6VTms49/4n93ho="; }; diff --git a/pkgs/development/python-modules/zope-index/default.nix b/pkgs/development/python-modules/zope-index/default.nix index 93c2cf8d90ff..232e1a014060 100644 --- a/pkgs/development/python-modules/zope-index/default.nix +++ b/pkgs/development/python-modules/zope-index/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.index"; - tag = "${version}"; + tag = version; hash = "sha256-dHapd/+pJh6qzVx9FGSMmPsGbz8NhAoPqufXm3FOuM8="; }; diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 2e8e1d96c64d..c48010ef21d6 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM="; }; diff --git a/pkgs/misc/optee-os/default.nix b/pkgs/misc/optee-os/default.nix index e191a254a023..c5670f9fd285 100644 --- a/pkgs/misc/optee-os/default.nix +++ b/pkgs/misc/optee-os/default.nix @@ -2,18 +2,19 @@ dtc, fetchFromGitHub, lib, + nukeReferences, pkgsBuildBuild, stdenv, }: let - defaultVersion = "4.6.0"; + defaultVersion = "4.7.0"; defaultSrc = fetchFromGitHub { owner = "OP-TEE"; repo = "optee_os"; rev = defaultVersion; - hash = "sha256-4z706DNfZE+CAPOa362CNSFhAN1KaNyKcI9C7+MRccs="; + hash = "sha256-kvp3GDBZtKlephyW+oxHmXnqvCe1jL+PN1i/MCw6SX0="; }; buildOptee = lib.makeOverridable ( @@ -61,6 +62,7 @@ let nativeBuildInputs = [ dtc + nukeReferences (pkgsBuildBuild.python3.withPackages ( p: with p; [ pyelftools @@ -89,21 +91,30 @@ let mkdir -p $out cp out/core/{tee.elf,tee-pageable_v2.bin,tee.bin,tee-header_v2.bin,tee-pager_v2.bin,tee-raw.bin} $out + nuke-refs $out/* + cp -r out/export-${taTarget} $devkit runHook postInstall ''; - meta = + # The conventional build system for OPTEE trusted applications accepts + # a TA_DEV_KIT_DIR parameter, which expects all artifacts (headers and + # libraries) to exist in that directory. We populate a "devkit" Nix + # output for this purpose, but we must also tell the multiple-output + # setup hook to not move our artifacts after we populate this + # directory. + outputDev = "devkit"; + outputLib = "devkit"; - { - description = "Trusted Execution Environment for ARM"; - homepage = "https://github.com/OP-TEE/optee_os"; - changelog = "https://github.com/OP-TEE/optee_os/blob/${defaultVersion}/CHANGELOG.md"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.jmbaur ]; - } - // extraMeta; + meta = { + description = "Trusted Execution Environment for ARM"; + homepage = "https://github.com/OP-TEE/optee_os"; + changelog = "https://github.com/OP-TEE/optee_os/blob/${defaultVersion}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.jmbaur ]; + } + // extraMeta; } // removeAttrs args [ "extraMeta" ] ) diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index b734d66be00e..abd866dc060e 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -5,7 +5,7 @@ rec { src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-fAs289FFdUnddkikm4ceA9d/w1qqqaWuPXmAiq3cIA8="; }; } diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index e5111151f087..3822cbef1605 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-lcGQQz+kPefHSyc2RNQ4gHgraRJPvn/FcgMJGvCtC48="; }; diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index d3358374bf1b..f2897b10053a 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -15,7 +15,7 @@ buildHomeAssistantComponent rec { src = fetchFromGitHub { inherit owner; repo = domain; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-zSpeiSK8FyXlM1U8jjSVl1nLQX/IplvKHfS6XZUNxo4="; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 74c993862ac5..1f20086586b9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -50,7 +50,7 @@ let src = fetchFromGitHub { owner = "tkdrob"; repo = "aioskybell"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; }; }); @@ -60,7 +60,7 @@ let src = fetchFromGitHub { owner = "bachya"; repo = "aiowatttime"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg="; }; postPatch = '' @@ -110,7 +110,7 @@ let src = fetchFromGitHub { owner = "burnash"; repo = "gspread"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-i+QbnF0Y/kUMvt91Wzb8wseO/1rZn9xzeA5BWg1haks="; }; dependencies = with self; [ @@ -136,7 +136,7 @@ let src = fetchFromGitHub { owner = "engrbm87"; repo = "notifications_android_tv"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-adkcUuPl0jdJjkBINCTW4Kmc16C/HzL+jaRZB/Qr09A="; }; @@ -155,7 +155,7 @@ let version = "2.2"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; }); @@ -211,7 +211,7 @@ let src = fetchFromGitHub { owner = "gagebenne"; repo = "pydexcom"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; }; }); @@ -221,7 +221,7 @@ let src = fetchFromGitHub { owner = "ChrisMandich"; repo = "PyFlume"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-kIE3y/qlsO9Y1MjEQcX0pfaBeIzCCHk4f1Xa215BBHo="; }; dependencies = oldAttrs.propagatedBuildInputs or [ ] ++ [ @@ -234,7 +234,7 @@ let src = fetchFromGitHub { owner = "AustinBrunkhorst"; repo = "pysnooz"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; }; patches = [ ]; @@ -246,7 +246,7 @@ let src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-xOdTzG0bF5p1QpkXv2btwrVugQRjSwdAj8bXcC0IoQg="; }; patches = [ ]; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9e12806bd7ce..584f2793cceb 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -680,7 +680,7 @@ let name = "secure-token"; owner = "kaltura"; repo = "nginx-secure-token-module"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qYTjGS9pykRqMFmNls52YKxEdXYhHw+18YC2zzdjEpU="; }; @@ -978,7 +978,7 @@ let name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-F2cuzCbJdGYX0Zmz9MSXTB7x8+FBR6pPpXtLlDRCcj8="; }; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index 7828fc37ecae..7ab4080fc491 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.27"; - zipHash = "sha256-w+GxgYBVrNnanznS6xjXsibq08rhCP8fQvtIYoBCTNw="; + version = "1.0.28"; + zipHash = "sha256-ivWufoJ98aXJ9av7WNXU9foBDkPENC3f0zOXPjDlOSg="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix index 0e13f54bf5bd..76c8d5fbb531 100644 --- a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix @@ -66,7 +66,7 @@ in src = fetchFromGitHub { owner = "lausser"; repo = "check_mssql_health"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-K6sGrms9z59a9rkZNulwKBexGF2Nkqqak/cRg12ynxc="; fetchSubmodules = true; }; @@ -82,7 +82,7 @@ in src = fetchFromGitHub { owner = "lausser"; repo = "check_nwc_health"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-r8Cb9RnEohNp0GxMAIaj7e08dTWZhuV1jz4/b8tuJ6k="; fetchSubmodules = true; }; @@ -98,7 +98,7 @@ in src = fetchFromGitHub { owner = "lausser"; repo = "check_ups_health"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ZGSTPVJObP49/tDASOCh4wVdMKajheHD+xVTiFf101k="; fetchSubmodules = true; }; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 2288214b3d3c..53752e77eace 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-2X1nJIUwp7kqqz/D3x4bq6vHg1N8zC9AWCn02qsAyAQ="; }; diff --git a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix index b3749325ef1c..eab71766d14c 100644 --- a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "bt909"; repo = "imap-mailstat-exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-aR/94C9SI+FPs3zg3bpexmgGYrhxghyHwpXj25x0yuw="; }; diff --git a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix index 3e337dbf9bf0..d8bf75af4856 100644 --- a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "msroest"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-9oL9Zbzzbr0hZjOdkaH86Tho6gaR+/6uAMreLwYzB8o="; }; diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index af7143179888..ac0a4e2e934c 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -15,7 +15,7 @@ buildGoModule { src = fetchFromGitHub { owner = "letsencrypt"; repo = "unbound_exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xVc6xES3YdKIaP6rwAzI0/RLoer7bcq7VAmfjYii8VI="; }; diff --git a/pkgs/servers/sql/postgresql/ext/ip4r.nix b/pkgs/servers/sql/postgresql/ext/ip4r.nix index 142ea551c03f..a893811a4567 100644 --- a/pkgs/servers/sql/postgresql/ext/ip4r.nix +++ b/pkgs/servers/sql/postgresql/ext/ip4r.nix @@ -13,7 +13,7 @@ postgresqlBuildExtension (finalAttrs: { src = fetchFromGitHub { owner = "RhodiumToad"; repo = "ip4r"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-3chAD4f4A6VlXVSI0kfC/ANcnFy4vBp4FZpT6QRAueQ="; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index d378f5318a91..6c68c60a5667 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -12,7 +12,7 @@ postgresqlBuildExtension (finalAttrs: { src = fetchFromGitHub { owner = "adept"; repo = "pg_relusage"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 1c5831aaac3e..a0adcd2f3bd0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -16,7 +16,7 @@ postgresqlBuildExtension (finalAttrs: { src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-PwUnjwqnmoWQ9kKZuKsAVzVBRyKvT+aexrm5eeRiRIQ="; }; diff --git a/pkgs/shells/fish/plugins/plugin-git.nix b/pkgs/shells/fish/plugins/plugin-git.nix index bef76a97e1fa..ea5c8edbffd7 100644 --- a/pkgs/shells/fish/plugins/plugin-git.nix +++ b/pkgs/shells/fish/plugins/plugin-git.nix @@ -11,7 +11,7 @@ buildFishPlugin rec { src = fetchFromGitHub { owner = "jhillyerd"; repo = "plugin-git"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-p7vvwisu3mvVOE1DcALbzuGJqWBcE1h71UjaopGdxE0="; }; diff --git a/pkgs/shells/fish/plugins/spark.nix b/pkgs/shells/fish/plugins/spark.nix index 68b23fb55d01..818536596f3f 100644 --- a/pkgs/shells/fish/plugins/spark.nix +++ b/pkgs/shells/fish/plugins/spark.nix @@ -11,7 +11,7 @@ let src = fetchFromGitHub { owner = "jorgebucaran"; repo = "spark.fish"; - rev = "refs/tags/${self.version}"; + tag = self.version; hash = "sha256-AIFj7lz+QnqXGMBCfLucVwoBR3dcT0sLNPrQxA5qTuU="; }; diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 93d5daf4c8c9..6e8314d80937 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-HiNydU40FprxVmRRZtnXom2kFYI04mbeuGTq8+BMh7o="; }; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 54ffcc4e3540..054c489ec44e 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "savonet"; repo = "liquidsoap"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-EQFWFtgWvwsV+ZhO36Sd7mpxYOnd4Vv6Z+6xsgi335k="; }; diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index d5356b6e9eb7..bd6c826dcab0 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -18,7 +18,7 @@ let asio = fetchFromGitHub { owner = "chriskohlhoff"; repo = "asio"; - rev = "refs/tags/asio-1-28-2"; + tag = "asio-1-28-2"; hash = "sha256-8Sw0LuAqZFw+dxlsTstlwz5oaz3+ZnKBuvSdLW6/DKQ="; }; @@ -26,7 +26,7 @@ let bitsery = fetchFromGitHub { owner = "fraillt"; repo = "bitsery"; - rev = "refs/tags/v5.2.3"; + tag = "v5.2.3"; hash = "sha256-rmfcIYCrANycFuLtibQ5wOPwpMVhpTMpdGsUfpR3YsM="; }; @@ -34,7 +34,7 @@ let clap = fetchFromGitHub { owner = "free-audio"; repo = "clap"; - rev = "refs/tags/1.1.9"; + tag = "1.1.9"; hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; }; @@ -42,7 +42,7 @@ let function2 = fetchFromGitHub { owner = "Naios"; repo = "function2"; - rev = "refs/tags/4.2.3"; + tag = "4.2.3"; hash = "sha256-+fzntJn1fRifOgJhh5yiv+sWR9pyaeeEi2c1+lqX3X8="; }; @@ -50,7 +50,7 @@ let ghc_filesystem = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; - rev = "refs/tags/v1.5.14"; + tag = "v1.5.14"; hash = "sha256-XZ0IxyNIAs2tegktOGQevkLPbWHam/AOFT+M6wAWPFg="; }; @@ -58,7 +58,7 @@ let tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "refs/tags/v3.4.0"; + tag = "v3.4.0"; hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; @@ -66,7 +66,7 @@ let vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "refs/tags/v3.7.7_build_19-patched"; + tag = "v3.7.7_build_19-patched"; fetchSubmodules = true; hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; }; @@ -79,7 +79,7 @@ multiStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "robbert-vdh"; repo = "yabridge"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-4eA3vQFklIWkhtbd3Nw39bnJT6gPcni79ZyQVqU4+GQ="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fcb0af327c8..1d744ba764a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2303,8 +2303,6 @@ with pkgs; cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; - ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { }; cmdpack = callPackages ../tools/misc/cmdpack { }; @@ -7912,6 +7910,7 @@ with pkgs; generateSplicesForMkScope lib stdenv + gcc14Stdenv fetchurl fetchpatch fetchgit diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 65dac9efe79c..190fbc3a82a6 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -11,9 +11,16 @@ let manifests = _cuda.lib.selectManifests manifestVersions; }; + # NOTE: + # The manifests are largely the same except for TensorRT: + # - linux-x86_64 is generally the best supported and can use the latest release + # - linux-sbsa (post-Orin Jetson and ARM) comes in second; NVIDIA dropped support for CUDA 12 with 10.13.2 (there is no + # 10.13.1), so we use 10.13.0 for all CUDA 12 releases. + # - linux-aarch64 (pre-Thor Jetson) is historically least supported; we use the latest release available. + cudaPackages_12_6 = let - inherit (cudaPackages_12_6.backendStdenv) hasJetsonCudaCapability; + inherit (cudaPackages_12_6.backendStdenv) hasJetsonCudaCapability hostPlatform; in mkCudaPackages { cublasmp = "0.6.0"; @@ -29,12 +36,18 @@ let nvjpeg2000 = "0.9.0"; nvpl = "25.5"; nvtiff = "0.5.1"; - tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.14.1"; + tensorrt = + if hasJetsonCudaCapability then + "10.7.0" + else if hostPlatform.isAarch64 then + "10.13.0" + else + "10.14.1"; }; cudaPackages_12_8 = let - inherit (cudaPackages_12_8.backendStdenv) hasJetsonCudaCapability; + inherit (cudaPackages_12_8.backendStdenv) hasJetsonCudaCapability hostPlatform; in mkCudaPackages { cublasmp = "0.6.0"; @@ -50,12 +63,18 @@ let nvjpeg2000 = "0.9.0"; nvpl = "25.5"; nvtiff = "0.5.1"; - tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.14.1"; + tensorrt = + if hasJetsonCudaCapability then + "10.7.0" + else if hostPlatform.isAarch64 then + "10.13.0" + else + "10.14.1"; }; cudaPackages_12_9 = let - inherit (cudaPackages_12_9.backendStdenv) hasJetsonCudaCapability; + inherit (cudaPackages_12_9.backendStdenv) hasJetsonCudaCapability hostPlatform; in mkCudaPackages { cublasmp = "0.6.0"; @@ -71,7 +90,13 @@ let nvjpeg2000 = "0.9.0"; nvpl = "25.5"; nvtiff = "0.5.1"; - tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.14.1"; + tensorrt = + if hasJetsonCudaCapability then + "10.7.0" + else if hostPlatform.isAarch64 then + "10.13.0" + else + "10.14.1"; }; # NOTE: Thor is supported from CUDA 13.0, so our check needs to capture whether pre-Thor devices were selected. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77401c0a50f6..759ae0c51e3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11074,6 +11074,8 @@ self: super: with self; { nvchecker = callPackage ../development/python-modules/nvchecker { }; + nvdlfw-inspect = callPackage ../development/python-modules/nvdlfw-inspect { }; + nvdlib = callPackage ../development/python-modules/nvdlib { }; nvidia-dlprof-pytorch-nvtx =