diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 792be35e4563..7c9429a23904 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -138,6 +138,13 @@ github = "0xd61"; githubId = 8351869; }; + _0xErwin1 = { + email = "ignacio@feuer.me"; + name = "Ignacio Perez"; + github = "0xErwin1"; + githubId = 67933444; + keys = [ { fingerprint = "B39E B98E 8860 DAFB 0567 0073 A614 B7D2 5134 987A"; } ]; + }; _0xMillyByte = { email = "emilia.daelman@gmail.com"; name = "Emilia Daelman"; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index a9dd9531fadf..2c00b3ee6529 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -148,8 +148,8 @@ let doveConf = let - configVersion = cfg.settings.dovecot_config_version or null; - storageVersion = cfg.settings.dovecot_storage_version or null; + configVersion = cfg.settings.dovecot_config_version; + storageVersion = cfg.settings.dovecot_storage_version; remainingSettings = builtins.removeAttrs cfg.settings [ "dovecot_config_version" "dovecot_storage_version" @@ -163,6 +163,11 @@ let ); isPre24 = versionOlder cfg.package.version "2.4"; + + # HACK: We can not auto-add the default for sieve_script_bin_path unless we have the pigeonhole plugin loaded. Solve this in a better way in the future + hasPigeonhole = builtins.any ( + pkg: pkg.pname or null == "dovecot-pigeonhole" + ) config.environment.systemPackages; in { imports = [ @@ -578,10 +583,30 @@ in # 2.4-only options + dovecot_config_version = mkOption { + default = null; + description = '' + Dovecot configuration version. It uses the same versioning as Dovecot in general, e.g. 3.0.5. It specifies the configuration syntax, the used setting names and the expected default values. + + See . + ''; + type = nullOr str; + }; + + dovecot_storage_version = mkOption { + default = null; + description = '' + Dovecot storage file format version. It uses the same versioning as Dovecot in general, e.g. 3.0.5. It specifies the oldest Dovecot version that must be able to read files written by this Dovecot instance. + + See . + ''; + type = nullOr str; + }; + sieve_script_bin_path = mkOption { - default = if isPre24 then null else "/tmp/dovecot-%{user|username|lower}"; + default = if isPre24 || !hasPigeonhole then null else "/tmp/dovecot-%{user|username|lower}"; defaultText = literalExpression '' - if isPre24 + if isPre24 || !hasPigeonhole then null else "/tmp/dovecot-%{user|username|lower}" ''; diff --git a/nixos/tests/gitlab/gitlab.nix b/nixos/tests/gitlab/gitlab.nix index 762d0a572854..d2ccfe1d7ab3 100644 --- a/nixos/tests/gitlab/gitlab.nix +++ b/nixos/tests/gitlab/gitlab.nix @@ -35,7 +35,7 @@ in nodes = { gitlab = - { ... }: + { config, ... }: { imports = [ ../common/user-account.nix ]; @@ -75,7 +75,14 @@ in services.dovecot2 = { enable = true; - enableImap = true; + enablePAM = true; + settings = { + dovecot_config_version = "2.4.3"; + dovecot_storage_version = config.services.dovecot2.package.version; + protocols.imap = true; + mail_driver = "maildir"; + mail_path = "~/mail"; + }; }; systemd.services.gitlab-backup.environment.BACKUP = "dump"; diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index 19e40b882c4c..493188e4683f 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -15,14 +15,20 @@ let system.stateVersion = config.system.nixos.release; nixpkgs.pkgs = pkgs; - - # use networkd to obtain systemd network setup - networking.useNetworkd = true; }; - container = { - imports = [ common ]; + profile-host-nspawn = { + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.firewall.extraCommands = '' + # open DHCP for nspawn interfaces + ${pkgs.iptables}/bin/iptables -A nixos-fw -i ve-+ -p udp -m udp --dport 67 -j nixos-fw-accept + ''; + }; + + # improvement: move following profile to ../modules/profiles/nspawn-guest.nix + profile-guest-nspawn = { # We re-use the NixOS container option ... boot.isNspawnContainer = true; # ... and revert unwanted defaults @@ -30,6 +36,65 @@ let # systemd-nspawn expects /sbin/init boot.loader.initScript.enable = true; + + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + }; + + profile-host-vmspawn = + { config, pkgs, ... }: + { + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + + networking.firewall.extraCommands = '' + # open DHCP for vmspawn interfaces + ${pkgs.iptables}/bin/iptables -A nixos-fw -i vt-+ -p udp -m udp --dport 67 -j nixos-fw-accept + ''; + + environment.systemPackages = + let + # improvement: following wrapper should be moved to pkgs + vmspawn-wrapped = + pkgs.runCommand "systemd-vmspawn-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } + '' + makeWrapper ${config.systemd.package}/bin/systemd-vmspawn $out/bin/systemd-vmspawn-wrapped \ + --prefix PATH : ${ + lib.makeBinPath [ + pkgs.qemu + pkgs.virtiofsd + pkgs.openssh # ssh-keygen + ] + } \ + --prefix XDG_CONFIG_HOME : ${pkgs.qemu}/share + ''; + in + [ vmspawn-wrapped ]; + }; + + # improvement: move following profile to ../modules/profiles/vmspawn-guest.nix + profile-guest-vmspawn = { + imports = [ ../modules/profiles/qemu-guest.nix ]; + # improvement: move following configuration to qemu-guest.nix + boot.initrd.availableKernelModules = [ + "virtiofs" + ]; + + boot.initrd.systemd.enable = true; + # root is defined by systemd-vmspawn + boot.initrd.systemd.root = null; + + boot.loader.grub.enable = false; + + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + }; + + container = { + imports = [ + common + profile-guest-nspawn + ]; }; containerSystem = evalConfig container; @@ -60,18 +125,8 @@ let vm = { imports = [ common - ../modules/profiles/qemu-guest.nix + profile-guest-vmspawn ]; - # improvement: move following configuration to qemu-guest.nix - boot.initrd.availableKernelModules = [ - "virtiofs" - ]; - - boot.initrd.systemd.enable = true; - # root is defined by systemd-vmspawn - boot.initrd.systemd.root = null; - - boot.loader.grub.enable = false; services.openssh.enable = true; }; @@ -94,14 +149,14 @@ in nodes.machine = { - config, lib, - pkgs, ... }: { - # use networkd to obtain systemd network setup - networking.useNetworkd = true; + imports = [ + profile-host-nspawn + profile-host-vmspawn + ]; # do not try to access cache.nixos.org nix.settings.substituters = lib.mkForce [ ]; @@ -146,32 +201,6 @@ in ]; overrideStrategy = "asDropin"; }; - - networking.firewall.extraCommands = '' - # open DHCP for nspawn interfaces - ${pkgs.iptables}/bin/iptables -A nixos-fw -i ve-+ -p udp -m udp --dport 67 -j nixos-fw-accept - # open DHCP for vmspawn interfaces - ${pkgs.iptables}/bin/iptables -A nixos-fw -i vt-+ -p udp -m udp --dport 67 -j nixos-fw-accept - ''; - - environment.systemPackages = - let - # improvement: following wrapper should be moved to pkgs - vmspawn-wrapped = - pkgs.runCommand "systemd-vmspawn-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } - '' - makeWrapper ${config.systemd.package}/bin/systemd-vmspawn $out/bin/systemd-vmspawn-wrapped \ - --prefix PATH : ${ - lib.makeBinPath [ - pkgs.qemu - pkgs.virtiofsd - pkgs.openssh # ssh-keygen - ] - } \ - --prefix XDG_CONFIG_HOME : ${pkgs.qemu}/share - ''; - in - [ vmspawn-wrapped ]; }; testScript = '' diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 3252b1095731..daa9ccd0e04a 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = if withGui then "elements" else "elementsd"; - version = "23.3.2"; + version = "23.3.3"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${finalAttrs.version}"; - sha256 = "sha256-NLLM+stYOXcnAjEfXRerjvgMXM8jFSOyZhu/A0ZTnRw="; + sha256 = "sha256-u0/IVOr6ivN7SrM44NPNqs0yPBDqElD79pKcn+384B4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f0685afd88d8..3207fbc1fa30 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4093,8 +4093,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.18.0"; - hash = "sha256-OP0UUANqoQoxr+10/NkwveEULKWFrDn/dmEg0CHMZp0="; + version = "1.19.1"; + hash = "sha256-aVtMiSbPLs6zIdcD0TopIAVKvJksSdTy9ND+jGw/G0A="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; @@ -5222,8 +5222,8 @@ let mktplcRef = { name = "csharp-ls"; publisher = "vytautassurvila"; - version = "0.0.30"; - hash = "sha256-BVSazrQxVm4yYBVdtFP3Aojl06xI2msFXIGw64LeePY="; + version = "0.0.31"; + hash = "sha256-d2vHhM+/hzT/JdFzu2WtJiWY2BHGk8SicleHxwm8ciY="; }; meta = { changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce.nix index bac547cb0458..be90baaa2af6 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce"; - version = "0-unstable-2025-06-22"; + version = "0-unstable-2026-04-11"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-libretro"; - rev = "9a301c0773c53702a882bbaa42ee9cbc6d523787"; - hash = "sha256-RS5omi6LthQy8fFfouSEpYtaeD7QDlRENm0YuqHzUc0="; + rev = "ae99235c2139c176c1a8d0fde2957bf701d3cab0"; + hash = "sha256-3bxKLWivTpCmAPYqu5r7AuwvREXRCndq6JQ4hgd18YU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 30a043cc3d91..e4a5ab217821 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2026-04-04"; + version = "0-unstable-2026-04-08"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "3da943f4bcf264c7af83a07b78617e98ce3822cd"; - hash = "sha256-3hJj8BLePPdEEsQriHSWhIMhamr7pvpKswP5/RxtjcM="; + rev = "7d7fc6d9d6a5855118e6580a7b5554e08796a878"; + hash = "sha256-J2VU9BqVLpre2nnpweYpzR3j7jYVbfcNvjQn3SFk4oI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix index aacaf03af8ff..9b1d5daa9d19 100644 --- a/pkgs/applications/emulators/libretro/cores/opera.nix +++ b/pkgs/applications/emulators/libretro/cores/opera.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "opera"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-04-10"; src = fetchFromGitHub { owner = "libretro"; repo = "opera-libretro"; - rev = "889e52a07cd93074577bf1b2ea260a2beae7ff7b"; - hash = "sha256-bsSrkYzkUgUxDz0798aB5etJ0er+RtlcdoJY12gB+WY="; + rev = "4c4ca6bf741c40715723a8b8dae4b6187ff6ac30"; + hash = "sha256-AcuqEuK3bz+WJ0r723+w6Y9WGuNs04zUOWlQ3aMXk/U="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/yabause.nix b/pkgs/applications/emulators/libretro/cores/yabause.nix index 7b6539f8e470..9f12cffb3c67 100644 --- a/pkgs/applications/emulators/libretro/cores/yabause.nix +++ b/pkgs/applications/emulators/libretro/cores/yabause.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "yabause"; - version = "0-unstable-2025-12-20"; + version = "0-unstable-2026-04-10"; src = fetchFromGitHub { owner = "libretro"; repo = "yabause"; - rev = "65af22e96beb6d9b0b9a50a81a39c86a6d604c1c"; - hash = "sha256-LafC48f1m6pRWhXmfN+D+5r9qCNm1v9uLJVq5Wa5naE="; + rev = "76faf7c601359bafc41785325d686644000a7ba9"; + hash = "sha256-UHmUsqAK+As6qfvhto2aOsW9A/lZMypfn2NxFui2x8c="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 562f0cd2dede..a74f9fa8fee0 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -142,9 +142,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "11.5"; + version = "11.6"; url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz"; - hash = "sha256-ETcLV+pdVIpU2Syc1l0LpjX08cPq2s4J7RxBn3BeGdE="; + hash = "sha256-1J0WaXVHj2Ceapzb2goHxlo7eV4GH8RU0/EDTIKNGeA="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -154,7 +154,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-tkx1LB/iZoFvarMvc9QofuQLrZwZyaoL0FUh3nsvYjs="; + hash = "sha256-vI6GnnAqkyQSff9jrGYCTFR6fSIg2i9FT4mvbOlU1M4="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 3fc34b25341f..24836dcc489f 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.15.4"; + version = "3.15.5"; src = fetchFromGitHub { owner = "databus23"; repo = "helm-diff"; rev = "v${version}"; - hash = "sha256-FZd1QW2/SHMrOS1/Ecin9SDuPjLKJ3C2kF7s8zB1zqw="; + hash = "sha256-ti247vkYPW6PH0DNkgdH99MyUy2uc2n+zHgpNET/cgU="; }; - vendorHash = "sha256-P4fxAl3C2CzbIH7U38vHDxcuhSe3GLs1nck3t6IIw48="; + vendorHash = "sha256-b479InQ1ZoOtRgY1cyKeDDoGrOIg0aPqNfDrrY1E4tQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 67018d55cd5c..f475c9783948 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -472,13 +472,13 @@ "vendorHash": "sha256-yOM4JcQxAvYAFPyAFfjJn4FK8pEXF3I55ddMTkijn9c=" }, "grafana_grafana": { - "hash": "sha256-eYVNiyD3hFxE9dqlyfsOZBaX6xVec0uPAuquOdxg78A=", + "hash": "sha256-szkdeprCEbrtZkoNzS6/FlICPsZpB+fgvAovNk8LXLM=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.29.0", + "rev": "v4.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9fBGjh/kstnMHi9aWQoq0tqJfDWoKHESlQwBoRA+8oA=" + "vendorHash": "sha256-xcKcXakpjBQCy5JqWsXnDDQeR+53tyRxWeoLkxsStcs=" }, "gridscale_gridscale": { "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=", @@ -508,13 +508,13 @@ "vendorHash": "sha256-picwxtQOtsBX8SkA64+ekFNDC7zIpg0CG66kelO2THk=" }, "hashicorp_awscc": { - "hash": "sha256-tcDnXPoiwGcy4tW3r/YMM+eivGur90TeAZO5gWhT7DA=", + "hash": "sha256-/mQ8GrCbOudqpQ3+xyJccVCVVUkGsnozNHa4Ll/66RI=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.78.0", + "rev": "v1.79.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-z2KPnztWBOlKTIwloRGdT1GMjBewQ1FlJgZkoGFK7XY=" + "vendorHash": "sha256-ZhN2ap9U5xp2HNeAE7HmLGce19jVH4Y7GpuqrUtYf40=" }, "hashicorp_azuread": { "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=", @@ -923,13 +923,13 @@ "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU=" }, "mongodb_mongodbatlas": { - "hash": "sha256-8TcFJv8e9CJOzF+Fy0QvB2juTvyGAxUvgSKCL3fGYDM=", + "hash": "sha256-3zypsyMu7ZlEKtmA2brnc3Gidlkd96v1DG3C4HQLByw=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v2.9.0", + "rev": "v2.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mgGmFrP/LhjHiYvxKtGBe2S/ZBHn2qT7eX5eBvNjxk8=" + "vendorHash": "sha256-cvnxSUCiu6S5lkT9VAyn9K6lmridRb0WZyrrvMv+B48=" }, "namecheap_namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix index 894b43160725..0d7f385d5cf4 100644 --- a/pkgs/by-name/ai/air/package.nix +++ b/pkgs/by-name/ai/air/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "air"; - version = "1.65.0"; + version = "1.65.1"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; tag = "v${finalAttrs.version}"; - hash = "sha256-pqvnX/PiipZM8jLBN6zN/yVnuCCk+aTII5AH0N4nHEM="; + hash = "sha256-omyWDW5bE+HfXQ2EQZKthB9t+jBEFcPSVtPss5qeoMI="; }; vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw="; diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index b70c74a9f021..807ec4895027 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "10.4.0"; + version = "10.11.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-CbeQi50EbGP+GoXLN/M8iLJ65RI6awXjDoPzEB8Pb38="; + hash = "sha256-LLEmcZEC0DaMdp9a5e1wF74oahGvHQpzpKDnbkPqNto="; }; sourceRoot = "."; diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index 731eb6e88b1c..bfb85e2c32c8 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ansible-navigator"; - version = "26.1.3"; + version = "26.4.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "ansible_navigator"; - hash = "sha256-WWbx4/BARcmDnCZDt7v2uCCyZUNlS8Ur8HYiCf5A/vE="; + hash = "sha256-FpDFWyNnlt28wAG6OgJjwvK+UMCEDyH4P9fQ+t5J8FQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix index 356c4a4bbeaf..b0b73272c95c 100644 --- a/pkgs/by-name/ap/apidog/package.nix +++ b/pkgs/by-name/ap/apidog/package.nix @@ -7,11 +7,11 @@ let pname = "apidog"; - version = "2.8.23"; + version = "2.8.24"; src = fetchurl { url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage"; - hash = "sha256-N3ULCrYJilcc3R102ndXjKH3g/km7WcEMdi+NL8nmqA="; + hash = "sha256-gGhA++wfgURhibGF2tXAmH0orX2VSUiJsAo3wAu6t1g="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index 7653cca489a6..f3e002decb83 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "arkade"; - version = "0.11.92"; + version = "0.11.93"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; tag = finalAttrs.version; - hash = "sha256-7xBtmpi4Mm9C9HSGsuluu7N4IglZisw3fWSgK9DFizo="; + hash = "sha256-VWdWlUBSyRqHtApX2n/eBVBMw34zt+I2hi0Nmvx901o="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ar/armagetronad-dedicated/package.nix b/pkgs/by-name/ar/armagetronad-dedicated/package.nix index 67aa20cb7210..7444b0319c9c 100644 --- a/pkgs/by-name/ar/armagetronad-dedicated/package.nix +++ b/pkgs/by-name/ar/armagetronad-dedicated/package.nix @@ -1,7 +1,11 @@ { armagetronad, -}: + ... +}@args: -armagetronad.override { - dedicatedServer = true; -} +armagetronad.override ( + { + dedicatedServer = true; + } + // args +) diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix index 1b54395c93b2..2568aedbcc11 100644 --- a/pkgs/by-name/ar/armagetronad/package.nix +++ b/pkgs/by-name/ar/armagetronad/package.nix @@ -30,6 +30,7 @@ gnugrep, nixosTests, dedicatedServer ? false, + ... }: let @@ -71,8 +72,8 @@ let # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads ${unstableVersionMajor} = let - rev = "3675f21cd5be4932a7a168b321576e0b09e64aaf"; - hash = "sha256-d2vPFAyx6LhEIxtEUdhrlqqYeCY0NnETlq7TVvX5vVo="; + rev = "ec0dbb09ce081be2879acf67bebcd2a2987fd0a4"; + hash = "sha256-8fH0Q0N2bKCO0t+lOs8EamThpiial2CfEcVP3cZbHX0="; in dedicatedServer: { version = "${unstableVersionMajor}-${lib.substring 0 8 rev}"; @@ -104,8 +105,8 @@ let # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads "${latestVersionMajor}-sty+ct+ap" = let - rev = "22fdbee08ca301c09ae4dee7210ccef02536670d"; - hash = "sha256-F+nnQxI2TTTa+gJYWjQPFjd8tQLCh/dEu/oTV0ie8BI="; + rev = "b74df624eae13e919b4b04f9b18043bce9d04431"; + hash = "sha256-tjEcgyYxaGgHiIH8y9xYM7HEpgZa7DEWIVqK8r0dmaY="; in dedicatedServer: { version = "${latestVersionMajor}-sty+ct+ap-${lib.substring 0 8 rev}"; diff --git a/pkgs/by-name/as/asmrepl/Gemfile b/pkgs/by-name/as/asmrepl/Gemfile new file mode 100644 index 000000000000..84934b784f2f --- /dev/null +++ b/pkgs/by-name/as/asmrepl/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + gem 'asmrepl' + # Extra dependencies + gem 'racc', '~> 1.8' + gem 'rbs', '~> 3.9' diff --git a/pkgs/by-name/as/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock new file mode 100644 index 000000000000..1fcbecc5cfee --- /dev/null +++ b/pkgs/by-name/as/asmrepl/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + asmrepl (1.2.0) + fisk (~> 2.3.1) + fisk (2.3.2) + logger (1.7.0) + racc (1.8.1) + rbs (3.10.3) + logger + tsort + tsort (0.2.0) + +PLATFORMS + ruby + +DEPENDENCIES + asmrepl + racc (~> 1.8) + rbs (~> 3.9) + +BUNDLED WITH + 2.7.2 diff --git a/pkgs/by-name/as/asmrepl/gemset.nix b/pkgs/by-name/as/asmrepl/gemset.nix new file mode 100644 index 000000000000..277e70efd539 --- /dev/null +++ b/pkgs/by-name/as/asmrepl/gemset.nix @@ -0,0 +1,67 @@ +{ + asmrepl = { + dependencies = [ "fisk" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qvkqn34ldlip2yz3kdckqmvniyydswcclwdcalcpdwnahg25xjw"; + type = "gem"; + }; + version = "1.2.0"; + }; + fisk = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zypl29fpqd5pqkp8j67xnq9b2dwhl8kn01fyw1kxy9l2676dlmh"; + type = "gem"; + }; + version = "2.3.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; + racc = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rbs = { + dependencies = [ + "logger" + "tsort" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19nsjb0wkb1zk274q0zy41hfzqraanar3jg6akak8q8134wpyqkh"; + type = "gem"; + }; + version = "3.10.3"; + }; + tsort = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n"; + type = "gem"; + }; + version = "0.2.0"; + }; +} diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/by-name/as/asmrepl/package.nix similarity index 100% rename from pkgs/development/interpreters/asmrepl/default.nix rename to pkgs/by-name/as/asmrepl/package.nix diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/by-name/av/avogadro2/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/avogadro2/default.nix rename to pkgs/by-name/av/avogadro2/package.nix diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/by-name/av/avogadrolibs/package.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix rename to pkgs/by-name/av/avogadrolibs/package.nix diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 75a7338486a4..cdf69b209b90 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-fU38Exv83cKaPFA26zmwYZlkscCbAEz/7Gch5j/qHjk="; + hash = "sha256-aGGvYIYQ3fw1fk5NUwJsMkq2YSugQD94xfy52LvHOKc="; }; patches = [ @@ -36,7 +36,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-0FdPTyoVNrsx0LJYcpfZPKZwUKzyJaU6XNnm2bY9F/s="; + npmDepsHash = "sha256-RmUUdHSVrZYc4F1Qtkbvn/2oKspM/3SnCuT3McKlMn0="; makeCacheWritable = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index fde12b337f56..ddcaa2e1428c 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.45.0"; + version = "5.46.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-5hYMRFdMXlnhHzwbj8Hy48WJBf7L5UUhZUfKSlr06Z0="; + hash = "sha256-uDZYy+Lkvc5YdIdn84l8QbNPcU5EQzOqTTdTezgCudw="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index cd43ed4857f6..be3cc7f5bc2a 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-binstall"; - version = "1.17.9"; + version = "1.18.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${finalAttrs.version}"; - hash = "sha256-GTyMnbPHB7+E8IEdUd7bHBmCTcMI6UqYBysGqzDs8MA="; + hash = "sha256-005RXO9Ah8JA36n27CehwgOOij2d3S3BfmRaaYYqpeg="; }; - cargoHash = "sha256-38KqQcpOtSkV0eYQsXRdte8Pzabv2nU0ipxqzQFHgtg="; + cargoHash = "sha256-bulcxmiQAt0WugUlXLFDjLlZi9q2/jFhZ/AuGbXF2K0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix index 67ba02eed1ee..e0c1a2d17d26 100644 --- a/pkgs/by-name/ca/cargo-wizard/package.nix +++ b/pkgs/by-name/ca/cargo-wizard/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-wizard"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "kobzol"; repo = "cargo-wizard"; rev = "v${finalAttrs.version}"; - hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E="; + hash = "sha256-WLGE2ZuytjSridZwfUTtNQF5woeBbx5ZoHfB9eyvedI="; }; - cargoHash = "sha256-ClulQP+1/RLvOWWB3uKTCn2Sx3+TO25qRs456DWHKu0="; + cargoHash = "sha256-vRakgwZRyYkk3xFfZzl197tgRmx+/g2b8eaDunwrCzM="; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 2bd25e2dcac7..6c4f49889b90 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-xwin"; - version = "0.21.4"; + version = "0.21.5"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${finalAttrs.version}"; - hash = "sha256-mgFMjNxjB4S9/nou6S8NN8ZpXX7K49lLArt/cXcSPIE="; + hash = "sha256-RgR0YBjgpk10IS62+/CdIbZ+7oSnkOC5npIqRrib6eU="; }; - cargoHash = "sha256-Md2pk8kYqUDPzRQedbne4Crg5UbGHHE5OTRz4LXLs3E="; + cargoHash = "sha256-dJkfEPRyXFpMwqExvyimLMc+iOAby5yeEUpHt0MoQ6M="; meta = { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index 0920e8c67502..9251db2e5e27 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ aleksana amerino + _0xErwin1 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ce/certigo/package.nix b/pkgs/by-name/ce/certigo/package.nix index 645e7cfce5e5..8b48559cb5be 100644 --- a/pkgs/by-name/ce/certigo/package.nix +++ b/pkgs/by-name/ce/certigo/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "certigo"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "square"; repo = "certigo"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-dn2GqEiSzlcqNPoAZhPESRsl3LOUBlaPs59rUjf2c5k="; + sha256 = "sha256-U+VbtY34lxLBHWI1BjkPxzSS6q41R9DQkGvDvSDX9WY="; }; - vendorHash = "sha256-hBuR6a0gBhuYICbuiHxJdbDr4hLF4mQvIcMr5FHfOu8="; + vendorHash = "sha256-5DpgOb0YxZ/os23y+siCB73dUwutxXIW5RlCZqdbxao="; meta = { description = "Utility to examine and validate certificates in a variety of formats"; diff --git a/pkgs/by-name/ch/chiri/package.nix b/pkgs/by-name/ch/chiri/package.nix index 335ab3719767..fdb6d7adc99e 100644 --- a/pkgs/by-name/ch/chiri/package.nix +++ b/pkgs/by-name/ch/chiri/package.nix @@ -88,10 +88,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpm build ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/bin - makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri" - ''; + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/bin + makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri" + '' + else + '' + mv $out/bin/Chiri $out/bin/chiri + substituteInPlace $out/share/applications/Chiri.desktop \ + --replace-fail "Exec=Chiri" "Exec=chiri" + ''; doCheck = false; diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix index a84bc540338a..c5aa91058ee1 100644 --- a/pkgs/by-name/cl/cliamp/package.nix +++ b/pkgs/by-name/cl/cliamp/package.nix @@ -16,16 +16,16 @@ buildGoModule (finalAttrs: { pname = "cliamp"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "bjarneo"; repo = "cliamp"; tag = "v${finalAttrs.version}"; - hash = "sha256-0WT3DRII4o58KFK+7UW0QgrJwrJwmPkKmTQeVXmtoZ0="; + hash = "sha256-8Att+SEJd2MdAgQ8SM49S4c4fM7t0/f/kHl6a+DbO2U="; }; - vendorHash = "sha256-+uh+4ZYvnlKmRSIvZFlnfBPqU0CFFe/Op1Gr9hjIr4U="; + vendorHash = "sha256-sS0tjZoZ81Jwn/KJnJD01fTA4z0HxEYYM89Ta398MP0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index d704fcd754d8..38154824f603 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2026-04-01"; + version = "0-unstable-2026-04-09"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "569c6c56e815ae29ad7873b472ebb750c19d0d38"; - hash = "sha256-4IZhCQl+iKChGaT0ghn5MnB+h6U5DJSa7YgPDoObiBg="; + rev = "561aea31f1e263c8386ab7e09b7ffa95e64cd351"; + hash = "sha256-Ee/5nkPdQBXwt5jQOMN+2/nHRwk33HigeY/L0NpTLAY="; }; - npmDepsHash = "sha256-B/EBAhwEEqLgGshK3Fw7nG7Mv9kk0v4ClLglLhooYBM="; + npmDepsHash = "sha256-+3eXdiM0Nll7V6EnDXq88rBjRkPN6GLFASdJ3fMXbq4="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index dfb00ab2f3bd..28dc5721b772 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.36"; + version = "0.3.37"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-nME4B9z66Xvnll37jkNBMmswFk3oYGA9rSLTJufOo1s="; + hash = "sha256-1eZ9HzGK/Zyjb0ffGZc08DKqwMtUh6Ei04vAtgCOQoc="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-mHGuhTGMWWgaLJe71GxgWBwmRcEZGZAQgvJb4TQOKrw="; + cargoHash = "sha256-lWl2E5I/1Qj5TvQfxBfNsMYIIpL+yGlrA7YVokKwtqQ="; env = { CARGO_PROFILE_RELEASE_LTO = "fat"; diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index e004e285a20f..4b87e24a683f 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cotp"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${finalAttrs.version}"; - hash = "sha256-N3UPeEc3xPIRHt1lOwd8c7e61jZk3PPo3sC/7BQBosY="; + hash = "sha256-P7QeT3q//nmv11i0pELfTCC/wi9jHqbYClqSvvkvqwA="; }; - cargoHash = "sha256-3IJV7X3G12+ca723sDhOn4SN9CeqKPzGs59IQBYS5QY="; + cargoHash = "sha256-PhUHFLl0yr/eWy2A+zp+gTNlW+zbruCqQLkHA6Ivf04="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; diff --git a/pkgs/by-name/dc/dcnnt/package.nix b/pkgs/by-name/dc/dcnnt/package.nix index 94b8eb16446f..b65a2077cd8a 100644 --- a/pkgs/by-name/dc/dcnnt/package.nix +++ b/pkgs/by-name/dc/dcnnt/package.nix @@ -7,14 +7,18 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "dcnnt"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = [ + python3Packages.setuptools + ]; + + dependencies = with python3Packages; [ pycryptodome ]; diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix index c0c5e5129a93..d81746b58333 100644 --- a/pkgs/by-name/de/decktape/package.nix +++ b/pkgs/by-name/de/decktape/package.nix @@ -6,16 +6,16 @@ }: buildNpmPackage rec { pname = "decktape"; - version = "3.15.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "astefanutti"; repo = "decktape"; rev = "v${version}"; - hash = "sha256-SsdjqkMEVD0pVgIZ9Upmrz/1KOWcb1KUy/v/xTCVGc0="; + hash = "sha256-hriWwH7/YKCwdDhXwqoOmjOJX3Dk4aKMnCBJKepUTzg="; }; - npmDepsHash = "sha256-Z5fLGMvxVhM8nW81PQ5ZFPHK6m2uoYUv0A4XsTa3Z2Y="; + npmDepsHash = "sha256-wnT6kRiYanwi8G9ZtBmqxAFctJEyyi0XlwaOXTjvlA8="; npmPackFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index babaf2cca466..7e3613bc9ada 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-opaQx42USA9OHRsPHukhBrdLPN2cD/T9QE9plZrBETo="; + hash = "sha256-Dd7q/txbgvlpKi7/sTvxyo9DarZ19BUCYRaO37zK/tU="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/ea/easyeda2kicad/package.nix b/pkgs/by-name/ea/easyeda2kicad/package.nix index 561d3adc4a6b..5f5335710d43 100644 --- a/pkgs/by-name/ea/easyeda2kicad/package.nix +++ b/pkgs/by-name/ea/easyeda2kicad/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonPackage rec { pname = "easyeda2kicad"; - version = "0.8.0"; + version = "1.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-p4G+bRB29uBohqQpI3PrkwyZId5McJ1t2Ru26hBPSks="; + hash = "sha256-EipI+vo7kY5zAYXJc900IYOSi4oNviRDbRPVi5ApDoQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/el/elfio/package.nix b/pkgs/by-name/el/elfio/package.nix index a479c71f8ecd..5d6c06773f7e 100644 --- a/pkgs/by-name/el/elfio/package.nix +++ b/pkgs/by-name/el/elfio/package.nix @@ -4,24 +4,45 @@ fetchFromGitHub, cmake, boost, + gtest, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "elfio"; - version = "3.10"; + version = "3.12"; src = fetchFromGitHub { owner = "serge1"; repo = "elfio"; rev = "Release_${finalAttrs.version}"; - sha256 = "sha256-DuZhkiHXdCplRiOy1Gsu7voVPdCbFt+4qFqlOeOeWQw="; + sha256 = "sha256-tDRBscs2L/3gYgLQvb1+8nNxqkr8v1xBkeDXuOqShX4="; }; + patches = [ + # Add missing #include for gcc 15 + (fetchpatch { + url = "https://github.com/serge1/ELFIO/commit/34d2c64237bb40f09879e7421db120e50e7e2923.patch"; + hash = "sha256-HD+rOwqkuvu4lgeIHhiORNxpuowDfy94i0OgUVqbhJ8="; + }) + # Replace including of by + (fetchpatch { + url = "https://github.com/serge1/ELFIO/commit/575bfdb12cd90fa8913660295103549f151d116a.patch"; + hash = "sha256-9N/NC5U+zs9eFKYLw/kVdrMGySWakWH7HG4fsK0mvNw="; + }) + ]; + nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ boost ]; + nativeCheckInputs = [ + boost + gtest + ]; - cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ]; + cmakeFlags = [ + "-DELFIO_BUILD_TESTS=ON" + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + ]; doCheck = true; diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index df53fde8f4f9..7e128f711181 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "flowblade"; - version = "2.24"; + version = "2.24.1"; src = fetchFromGitHub { owner = "jliljebl"; repo = "flowblade"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-scUmE7wnelgpkaxh5tsNU6EVC9BbHR39embqk3enlIM="; + sha256 = "sha256-N9mWQoVOkgKDW0sp8+zEKk5h/+/D/O270i3peRbOs9w="; }; buildInputs = [ diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/by-name/fo/formiko/package.nix similarity index 65% rename from pkgs/applications/editors/formiko/default.nix rename to pkgs/by-name/fo/formiko/package.nix index d2f0fc1791b6..cc639774d6ce 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/by-name/fo/formiko/package.nix @@ -1,46 +1,52 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, wrapGAppsHook3, gobject-introspection, gtk3, - docutils, - gtksourceview, + gtksourceview4, gtkspell3, librsvg, - pygobject3, webkitgtk_4_1, }: -buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "formiko"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ondratu"; repo = "formiko"; tag = finalAttrs.version; - sha256 = "sha256-slfpkckCvxHJ/jlBP7QAhzaf9TAcS6biDQBZcBTyTKI="; + hash = "sha256-slfpkckCvxHJ/jlBP7QAhzaf9TAcS6biDQBZcBTyTKI="; }; + build-system = [ + python3Packages.setuptools + ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection gtk3 ]; - propagatedBuildInputs = [ - docutils + + buildInputs = [ gobject-introspection gtk3 - gtksourceview + gtksourceview4 gtkspell3 librsvg - pygobject3 webkitgtk_4_1 ]; + dependencies = [ + python3Packages.pygobject3 + python3Packages.docutils + ]; + # Needs a display doCheck = false; diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix index 3feb98b1fbd7..8dad97fc7d3d 100644 --- a/pkgs/by-name/ga/gatekeeper/package.nix +++ b/pkgs/by-name/ga/gatekeeper/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gatekeeper"; - version = "3.22.0"; + version = "3.22.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; tag = "v${finalAttrs.version}"; - hash = "sha256-ARgrazsIx3w9BLqI9kWV794ojvZgIdNMGsjAXs19u1g="; + hash = "sha256-lYLII1aJwrYmoyVYf08KDyvIVuCJIya/97hLQyGKz44="; }; - vendorHash = "sha256-2mnUYuxQ6wXOpK/V+8KpF0f5bkYRBgqJEl1bKOLTHNE="; + vendorHash = "sha256-PnBWUvpq7d3yQP50fgACWx/zcYobIGC+KiuzLqpKDcI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix index 2aa82bebe181..6f8dc3f6aa02 100644 --- a/pkgs/by-name/gi/git-pkgs/package.nix +++ b/pkgs/by-name/gi/git-pkgs/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "git-pkgs"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "git-pkgs"; repo = "git-pkgs"; tag = "v${version}"; - hash = "sha256-2vtzWzl9x6wd6XE0Z3a9Z/Ph9kschBwcTsNGC7JEFrA="; + hash = "sha256-VYITWQfinKxDjShApjoN7h8JKbyW8ft09e6TSYtdjT8="; }; - vendorHash = "sha256-USEs7eL0gwrddZDiKUUejYEBEAzWxt62qBo9o5/7AKc="; + vendorHash = "sha256-0QddQURXTZV/nKhARA7PVu61Mr/VZojf5mrvZvd7uWQ="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index 21a04c5825a0..8a23e9f21d2b 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/pkgs/by-name/gl/glpi-agent/package.nix @@ -16,13 +16,13 @@ perlPackages.buildPerlPackage rec { pname = "glpi-agent"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "glpi-project"; repo = "glpi-agent"; tag = version; - hash = "sha256-JocNClbFH6fSZJDAVQCPaRvHrkLboNbQVTpyHjOV7go="; + hash = "sha256-ug3/ullvEn98UUg4fzDQl5PjVFlbgbaIiz0tuWz9XeA="; }; postPatch = '' diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/by-name/gn/gnuplot/package.nix similarity index 90% rename from pkgs/tools/graphics/gnuplot/default.nix rename to pkgs/by-name/gn/gnuplot/package.nix index 8a1fb92d513c..2a9c7f13d07d 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/by-name/gn/gnuplot/package.nix @@ -28,22 +28,19 @@ gnused, coreutils, withQt ? false, - qttools, - wrapQtAppsHook, - qtbase, - qtsvg, + qt5, }: let withX = !aquaterm && !stdenv.hostPlatform.isDarwin; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnuplot"; version = "6.0.4"; src = fetchurl { - url = "mirror://sourceforge/gnuplot/gnuplot-${version}.tar.gz"; - sha256 = "sha256-RY2UdpYl5z1fYjJQD0nLrcsrGDOA1D0iZqD5cBrrnFs="; + url = "mirror://sourceforge/gnuplot/gnuplot-${finalAttrs.version}.tar.gz"; + hash = "sha256-RY2UdpYl5z1fYjJQD0nLrcsrGDOA1D0iZqD5cBrrnFs="; }; nativeBuildInputs = [ @@ -52,8 +49,8 @@ stdenv.mkDerivation rec { texinfo ] ++ lib.optionals withQt [ - qttools - wrapQtAppsHook + qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -74,8 +71,8 @@ stdenv.mkDerivation rec { libxaw ] ++ lib.optionals withQt [ - qtbase - qtsvg + qt5.qtbase + qt5.qtsvg ] ++ lib.optional withWxGTK wxwidgets_3_2; @@ -131,4 +128,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "gnuplot"; }; -} +}) diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/by-name/gn/gnuplot/set-gdfontpath-from-fontconfig.sh similarity index 100% rename from pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh rename to pkgs/by-name/gn/gnuplot/set-gdfontpath-from-fontconfig.sh diff --git a/pkgs/by-name/gn/gnuplot_aquaterm/package.nix b/pkgs/by-name/gn/gnuplot_aquaterm/package.nix new file mode 100644 index 000000000000..b98f0473a1f5 --- /dev/null +++ b/pkgs/by-name/gn/gnuplot_aquaterm/package.nix @@ -0,0 +1,7 @@ +{ + gnuplot, +}: + +gnuplot.override { + aquaterm = true; +} diff --git a/pkgs/by-name/gn/gnuplot_qt/package.nix b/pkgs/by-name/gn/gnuplot_qt/package.nix new file mode 100644 index 000000000000..dc503dd2a923 --- /dev/null +++ b/pkgs/by-name/gn/gnuplot_qt/package.nix @@ -0,0 +1,7 @@ +{ + gnuplot, +}: + +gnuplot.override { + withQt = true; +} diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix index 55b31be7e04b..1336e28df751 100644 --- a/pkgs/by-name/go/go-away/package.nix +++ b/pkgs/by-name/go/go-away/package.nix @@ -1,6 +1,7 @@ { lib, - buildGoModule, + # tinygo currently only supports Go <=1.25 + buildGo125Module, fetchFromGitea, nix-update-script, @@ -13,7 +14,7 @@ tinygo, }: -buildGoModule (finalAttrs: { +buildGo125Module (finalAttrs: { pname = "go-away"; version = "0.7.0"; diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix index 81bbb2938593..a8703a0248f8 100644 --- a/pkgs/by-name/go/go-httpbin/package.nix +++ b/pkgs/by-name/go/go-httpbin/package.nix @@ -2,19 +2,20 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, nixosTests, nix-update-script, }: buildGoModule (finalAttrs: { pname = "go-httpbin"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "mccutchen"; repo = "go-httpbin"; tag = "v${finalAttrs.version}"; - hash = "sha256-QJskXXieiFr406WI8gGtgcoL4pHEVzNOwM6JyYk+0EA="; + hash = "sha256-+DeBJoi7bXuXx3HcO9bdGlCXiaETwsS4OawVBi3Q57o="; }; vendorHash = null; @@ -24,17 +25,13 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" + "-X main.version=${finalAttrs.version}" ]; - # tests are flaky - doCheck = false; + __darwinAllowLocalNetworking = true; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/go-httpbin --help &> /dev/null - runHook postInstallCheck - ''; passthru = { tests = { inherit (nixosTests) go-httpbin; }; diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index 919fb3ecfb2e..e076c4a1e53b 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "go-ios"; - version = "1.0.206"; + version = "1.0.207"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/dQknNs+fLBJvfiDOaGc26a+bRo8NdhT1B/QPxJmmro="; + sha256 = "sha256-2GjUrt1F8MrPOITCsuWHHsi/85pfzbLeY+WbPfLYDY4="; }; proxyVendor = true; diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index 32cdce4c077b..d1d16d4a4835 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "goeland"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "slurdge"; repo = "goeland"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-7npQ04o2GvbOJt1zS7W+VFs38OnNG8VS7Qs7jM79yBg="; + sha256 = "sha256-s1h7kZGnDrF9gd9MP+TTsvtUj9goMVjlOB4AhCXuUXc="; }; - vendorHash = "sha256-OLgE9PU1/swoHZZG82zAEB1XygZjpK0wrqoGG/4Akvw="; + vendorHash = "sha256-gz1NoEaPfRTyDDDgvWbpnwIpYS1jJRnOPNibVrXqgG0="; ldflags = [ "-s" diff --git a/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch b/pkgs/by-name/go/goldberg-emu/dont-install-unsupported.patch similarity index 100% rename from pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch rename to pkgs/by-name/go/goldberg-emu/dont-install-unsupported.patch diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/by-name/go/goldberg-emu/package.nix similarity index 95% rename from pkgs/applications/emulators/goldberg-emu/default.nix rename to pkgs/by-name/go/goldberg-emu/package.nix index 99e21b7302ac..97b43cb62644 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/by-name/go/goldberg-emu/package.nix @@ -3,9 +3,11 @@ stdenv, fetchFromGitLab, cmake, - protobuf, + protobuf_21, }: - +let + protobuf = protobuf_21; +in stdenv.mkDerivation (finalAttrs: { pname = "goldberg-emu"; version = "0.2.5"; @@ -13,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "mr_goldberg"; repo = "goldberg_emulator"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; }; diff --git a/pkgs/by-name/go/googlesans-code/package.nix b/pkgs/by-name/go/googlesans-code/package.nix index ab563051321a..045dd06334c8 100644 --- a/pkgs/by-name/go/googlesans-code/package.nix +++ b/pkgs/by-name/go/googlesans-code/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "googlesans-code"; - version = "6.001"; + version = "7.000"; src = fetchFromGitHub { owner = "googlefonts"; repo = "googlesans-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-ScFx+uty9x+VTWxw7NJm3M7AYr0C00bdSnJJmFW3Jy0="; + hash = "sha256-XjsjBMCA1RraXhQiNq/D0mb//VnRKOWl1X4XpGzifNA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/by-name/gp/gpg-tui/package.nix similarity index 82% rename from pkgs/tools/security/gpg-tui/default.nix rename to pkgs/by-name/gp/gpg-tui/package.nix index 0d974a230347..e9873c763f32 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/by-name/gp/gpg-tui/package.nix @@ -8,20 +8,20 @@ pkg-config, python3, libiconv, - libresolv, + darwin, x11Support ? true, libxcb, libxkbcommon, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gpg-tui"; version = "0.11.1"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qGm0eHpVFGn8tNdEnmQ4oIfjCxyixMFYdxih7pHvGH0="; }; @@ -44,13 +44,13 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - libresolv + darwin.libresolv ]; meta = { description = "Terminal user interface for GnuPG"; homepage = "https://github.com/orhun/gpg-tui"; - changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/orhun/gpg-tui/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda @@ -58,4 +58,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "gpg-tui"; }; -} +}) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/by-name/gp/gphoto2/package.nix similarity index 86% rename from pkgs/applications/misc/gphoto2/default.nix rename to pkgs/by-name/gp/gphoto2/package.nix index 2c5e1483f332..afed03c7c766 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/by-name/gp/gphoto2/package.nix @@ -13,15 +13,15 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gphoto2"; version = "2.5.32"; src = fetchFromGitHub { owner = "gphoto"; repo = "gphoto2"; - rev = "v${version}"; - sha256 = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA="; }; nativeBuildInputs = [ @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jcumming ]; mainProgram = "gphoto2"; }; -} +}) diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/by-name/gp/gphoto2fs/package.nix similarity index 73% rename from pkgs/applications/misc/gphoto2/gphotofs.nix rename to pkgs/by-name/gp/gphoto2fs/package.nix index 9232705e06d3..c6ed189ad97c 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/by-name/gp/gphoto2fs/package.nix @@ -9,12 +9,12 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gphoto2fs"; version = "0.5.0"; src = fetchurl { - url = "mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2"; - sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; + url = "mirror://sourceforge/gphoto/gphotofs/${finalAttrs.version}/gphotofs-0.5.tar.bz2"; + hash = "sha256-Z27E3mmoHBk//DG9x7WHrCosw3gLFPDnycTApRezQ8w="; }; nativeBuildInputs = [ pkg-config ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { gpl2 ]; }; -} +}) diff --git a/pkgs/by-name/hi/highscore-mupen64plus/package.nix b/pkgs/by-name/hi/highscore-mupen64plus/package.nix index 8ec714a8f5f8..326b0005d161 100644 --- a/pkgs/by-name/hi/highscore-mupen64plus/package.nix +++ b/pkgs/by-name/hi/highscore-mupen64plus/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highscore-mupen64plus"; - version = "0-unstable-2026-01-05"; + version = "0-unstable-2026-04-10"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mupen64plus-highscore"; - rev = "84f913ed4433f37b8a990cace2f9e1cfb641e2dc"; - hash = "sha256-Afrb7WUw5QeST/NRM06UIyUTzxvrGqayFneaXjAw6aM="; + rev = "867c94907cd47f4843f3c8bddd371166c460ba8b"; + hash = "sha256-hnDhyYcKkKh0mvksAOJOLYnyp5gNCk38dxMBT/1ItLQ="; }; postPatch = '' diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index 5e04d15af550..24700a8f185c 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -151,13 +151,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "inspircd"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "inspircd"; repo = "inspircd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-VmMfGpX6TcCuXuJmTptE51TL8cwavceDcOBeW0ipC4o="; + sha256 = "sha256-5KQcVa/ktA3mil7fuBUj/98bAY5CsrJzSSqRB9Zk0Kk="; }; outputs = [ diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 4086b698f0f8..4e4291b865f1 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "istioctl"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = finalAttrs.version; - hash = "sha256-+VdMmBf4YRAroMw0Jub7+Np3qEz648FqTgxCjL20WYQ="; + hash = "sha256-QGohEiUMCiXiaJGmd8x0o7trr2ZOB4cVQcUhPwnzZ/M="; }; - vendorHash = "sha256-OXd29tw9UzrTF1q4ACWuA0xMOIcptDnUrkmnP576vhg="; + vendorHash = "sha256-/RBckWhh+fpogxVz7G6lfnhWjEvqB2b/aXAXQiTBS08="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 1f6a1fe5e186..beec696add34 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "lazygit"; - version = "0.61.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${finalAttrs.version}"; - hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ="; + hash = "sha256-sFmOHsYs39i4mSH/CnetWFBQBviv5QsP0qfCSkaEJZE="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 88a8dc9193ef..1de11e79ce75 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2026-04-03"; + version = "0-unstable-2026-04-10"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "f1b85fef8c82ae05bf24a2bda8eb2730b3b7023e"; - hash = "sha256-wAsU07lEjr9rFfW1WrnzflEriGwr/vzKpE9OM2zsPJA="; + rev = "3e8578d3341c08647470542010b2daf8e7218fa9"; + hash = "sha256-n9R9lff3AaIEE397kOZxG5fE+/jvCYqkBeUL7MKGkZU="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix index 4c6aa7133832..c6776d0c49da 100644 --- a/pkgs/by-name/li/libvgm/package.nix +++ b/pkgs/by-name/li/libvgm/package.nix @@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer; stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2026-03-01"; + version = "0-unstable-2026-04-06"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "9f376fbca88db3e9fd169a8b145b7d6932a020a9"; - hash = "sha256-pWhq+mmk7DJ5qxt9ncWYZlfNw5tjpPHqn5ctCCMfsUk="; + rev = "d1151884997ba4769b070b7c7aaedeffc60a25fb"; + hash = "sha256-SiOB2M7RNo4S5uIr8wXsZ1UtS2+2N8Tqm5iJ+Am3Ep4="; }; outputs = [ diff --git a/pkgs/development/tools/license_finder/Gemfile b/pkgs/by-name/li/license_finder/Gemfile similarity index 100% rename from pkgs/development/tools/license_finder/Gemfile rename to pkgs/by-name/li/license_finder/Gemfile diff --git a/pkgs/development/tools/license_finder/Gemfile.lock b/pkgs/by-name/li/license_finder/Gemfile.lock similarity index 67% rename from pkgs/development/tools/license_finder/Gemfile.lock rename to pkgs/by-name/li/license_finder/Gemfile.lock index 9adea6fc73ff..9a93db190583 100644 --- a/pkgs/development/tools/license_finder/Gemfile.lock +++ b/pkgs/by-name/li/license_finder/Gemfile.lock @@ -1,17 +1,19 @@ GEM remote: https://rubygems.org/ specs: - license_finder (7.0.1) + csv (3.3.5) + license_finder (7.2.1) bundler + csv (~> 3.2) rubyzip (>= 1, < 3) thor (~> 1.2) tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) - rexml (3.2.5) - rubyzip (2.3.2) - thor (1.2.1) - tomlrb (2.0.1) + rexml (3.4.4) + rubyzip (2.4.1) + thor (1.5.0) + tomlrb (2.0.4) with_env (1.1.0) xml-simple (1.1.9) rexml @@ -23,4 +25,4 @@ DEPENDENCIES license_finder BUNDLED WITH - 2.1.4 + 2.7.2 diff --git a/pkgs/development/tools/license_finder/gemset.nix b/pkgs/by-name/li/license_finder/gemset.nix similarity index 66% rename from pkgs/development/tools/license_finder/gemset.nix rename to pkgs/by-name/li/license_finder/gemset.nix index fad868d54e4a..47ebf87d1915 100644 --- a/pkgs/development/tools/license_finder/gemset.nix +++ b/pkgs/by-name/li/license_finder/gemset.nix @@ -1,6 +1,17 @@ { + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf"; + type = "gem"; + }; + version = "3.3.5"; + }; license_finder = { dependencies = [ + "csv" "rubyzip" "thor" "tomlrb" @@ -11,50 +22,50 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb"; + sha256 = "057ghx449d70bakmn3fjr4x6f4rq4cj61l9gnww0c5sbnqcsv7hp"; type = "gem"; }; - version = "7.0.1"; + version = "7.2.1"; }; rexml = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; type = "gem"; }; - version = "3.2.5"; + version = "3.4.4"; }; rubyzip = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; thor = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3"; type = "gem"; }; - version = "1.2.1"; + version = "1.5.0"; }; tomlrb = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g"; + sha256 = "168v339gqaly00i4zqg2ag2h10r3rl7999d0cqrrpb63gaa7fbr6"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.4"; }; with_env = { groups = [ "default" ]; diff --git a/pkgs/development/tools/license_finder/default.nix b/pkgs/by-name/li/license_finder/package.nix similarity index 100% rename from pkgs/development/tools/license_finder/default.nix rename to pkgs/by-name/li/license_finder/package.nix diff --git a/pkgs/by-name/lo/longcat/package.nix b/pkgs/by-name/lo/longcat/package.nix index 68b0cf191656..6588dad4481a 100644 --- a/pkgs/by-name/lo/longcat/package.nix +++ b/pkgs/by-name/lo/longcat/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.13"; + version = "0.0.16"; in buildGoModule { pname = "longcat"; @@ -16,10 +16,10 @@ buildGoModule { owner = "mattn"; repo = "longcat"; tag = "v${version}"; - hash = "sha256-QKtK7v2+Q5/jZrH1m6u9mwgwMQoaLv3pIRc+hYQn4k0="; + hash = "sha256-lI+gykqXWI32TEtvdj9+Lq6iSx7I1iSzP1cYROIZLGM="; }; - vendorHash = "sha256-ka58YOoyBKLX8Z9ak2+rERXsY3rPUaOanfIFErCJCdE="; + vendorHash = "sha256-VcNhzQyhd7gDvlrz7Lh2QRUkMjZj40s2hanNP6gsnMs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix index 37de8f543b19..60b607fed740 100644 --- a/pkgs/by-name/ma/matlab-language-server/package.nix +++ b/pkgs/by-name/ma/matlab-language-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "matlab-language-server"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "mathworks"; repo = "matlab-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-V4CW7mC3F4L7yqpB4AhpLNtOAaEGIWT8AMWCJkTHepI="; + hash = "sha256-DDtgommUDZbrTIGvH8xQyV+qNeDkxwwsx/0uQgGECPM="; }; - npmDepsHash = "sha256-eN6Z/UhzovwJh8EoCTuDnhsYyOxY9/fxOkPf0TqIg3k="; + npmDepsHash = "sha256-BW2J8yTGegugvPxmj1i1K/GDc5bZH8sHOpLOPgwFGKg="; npmBuildScript = "package"; diff --git a/pkgs/by-name/mi/millisecond/package.nix b/pkgs/by-name/mi/millisecond/package.nix index 201d9f274435..56bfe14f0e3b 100644 --- a/pkgs/by-name/mi/millisecond/package.nix +++ b/pkgs/by-name/mi/millisecond/package.nix @@ -23,13 +23,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "millisecond"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "gaheldev"; repo = "Millisecond"; tag = "v${finalAttrs.version}"; - hash = "sha256-2jGmL/bNta84x7/U5iX+sIlZyzqlcT62oLmfu4f8fiA="; + hash = "sha256-zoobnsBUg6Bky2Rhh7qEM+MxjpaR4eF+pEkhGMizuSM="; }; strictDeps = true; diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix index 584caf4cdd67..c0d4a0fa7002 100644 --- a/pkgs/by-name/mi/minify/package.nix +++ b/pkgs/by-name/mi/minify/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "minify"; - version = "2.24.11"; + version = "2.24.12"; src = fetchFromGitHub { owner = "tdewolff"; repo = "minify"; rev = "v${finalAttrs.version}"; - hash = "sha256-AroyZI6bF4nPdGk01pd0hueoVH4690+aWN9MZCz5FJY="; + hash = "sha256-ZOe3CcYn3DSa4skgXe63F9gwX8qrX3RBSkqvuzJtN+o="; }; vendorHash = "sha256-gH9HiNYAARImEdA4TESg8BXuedhs3Priv7dgZwcnrHU="; diff --git a/pkgs/by-name/mm/mmdbctl/package.nix b/pkgs/by-name/mm/mmdbctl/package.nix index c9682be2dc9a..2d7279701824 100644 --- a/pkgs/by-name/mm/mmdbctl/package.nix +++ b/pkgs/by-name/mm/mmdbctl/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "mmdbctl"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "ipinfo"; repo = "mmdbctl"; tag = "mmdbctl-${version}"; - hash = "sha256-+LuFy7HLr6AvF/TetendJTCx6zoAGonJtc9BL7PCDsU="; + hash = "sha256-s1HKPZmuEENBf5a40i0oTtzvPV3UjMhS/1ijc9WtzXo="; }; vendorHash = "sha256-f/FEMTOipss17uVhdvV3QKAmlHsmxnGWrz9csIs7ySk="; diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/by-name/mo/molequeue/package.nix similarity index 79% rename from pkgs/development/libraries/science/chemistry/molequeue/default.nix rename to pkgs/by-name/mo/molequeue/package.nix index 33aa58bd73df..a6475b67ae16 100644 --- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix +++ b/pkgs/by-name/mo/molequeue/package.nix @@ -3,27 +3,27 @@ stdenv, fetchFromGitHub, cmake, - qttools, - wrapQtAppsHook, + qt5, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "molequeue"; version = "0.9.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "molequeue"; - rev = version; + tag = finalAttrs.version; hash = "sha256-+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; - buildInputs = [ qttools ]; + buildInputs = [ qt5.qttools ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -33,9 +33,11 @@ stdenv.mkDerivation rec { # Fix the broken CMake files to use the correct paths postInstall = '' substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \ - --replace "$out/" "" + --replace-fail "$out/" "" ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Desktop integration of high performance computing resources"; mainProgram = "molequeue"; @@ -44,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index 388eaa798da0..185db073aabe 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "nexttrace"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EKsOPE5EGkUtgNIf60ojvMJfZwtSwDzVDDEeKPBLWhY="; + sha256 = "sha256-SJjWDnbHXuokNFErMdnwxzBRgIyfuxmZ5j3IisgG93I="; }; - vendorHash = "sha256-fUM2mWbol1lM6moygeCFiGHyYZfaVzz6edZM6zoGrSg="; + vendorHash = "sha256-4MunvXclgbjnd4ZHLey79GFOH9gDbzqXx1UViUEGL9k="; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/ni/nitrotpm-tools/package.nix b/pkgs/by-name/ni/nitrotpm-tools/package.nix index cbf9a5882ab8..b913d8c32343 100644 --- a/pkgs/by-name/ni/nitrotpm-tools/package.nix +++ b/pkgs/by-name/ni/nitrotpm-tools/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nitrotpm-tools"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "aws"; repo = "NitroTPM-Tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZTASHHa+LQ/hNaM0qfsaGdNwkZQQZnR9+f05DHbviLw="; + hash = "sha256-Jnv1ZKRs59eXnW/O6UCZLIhQolQ9LZjJI6+SqXVws5Q="; }; - cargoHash = "sha256-z0b0bLKrnLdMfGKp9aIg3DPW3MJnEhjy9GjCYy44TTQ="; + cargoHash = "sha256-ckygzrbDzzjL2eBktAHdbA40E7HDeR8S5rZCbbuVIW0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 8d1fe9e9473f..70c867ee72e7 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2026-03-12"; + version = "0-unstable-2026-04-11"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "196d94338d382561e7bacb29948ffcfa5ff1b2a1"; - hash = "sha256-5FKqphXxVSgqGXbqOL3aiZEGFSr5SMjMVIWzB0dA/+I="; + rev = "341154f469b0fbb5bc5b69e591ba97ebf0e58fdb"; + hash = "sha256-94u6d6WyyyamUn4a4p8O9Ujl9R56p1JxthuS03B4auw="; }; installPhase = '' diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index ec506f9f55b8..b7280feec43c 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.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-TUFVyrRX0eqXCY+wOYA9yAFTzsupBO4d7bHmQXRRGDE="; + hash = "sha256-QgAMnVnTsHA1BcKgAhCgvOXDwkYqSFy7EVDqV/wCbhw="; }; vendorHash = "sha256-l2HrTap6qZeKOvvCY6d+issQT2pL6TPU0pIdDN8vfVc="; diff --git a/pkgs/servers/openafs/1.8/bosserver.patch b/pkgs/by-name/op/openafs/bosserver.patch similarity index 100% rename from pkgs/servers/openafs/1.8/bosserver.patch rename to pkgs/by-name/op/openafs/bosserver.patch diff --git a/pkgs/servers/openafs/cellservdb.nix b/pkgs/by-name/op/openafs/cellservdb.nix similarity index 100% rename from pkgs/servers/openafs/cellservdb.nix rename to pkgs/by-name/op/openafs/cellservdb.nix diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/by-name/op/openafs/cross-build.patch similarity index 100% rename from pkgs/servers/openafs/1.8/cross-build.patch rename to pkgs/by-name/op/openafs/cross-build.patch diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/by-name/op/openafs/module.nix similarity index 100% rename from pkgs/servers/openafs/1.8/module.nix rename to pkgs/by-name/op/openafs/module.nix diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/by-name/op/openafs/package.nix similarity index 87% rename from pkgs/servers/openafs/1.8/default.nix rename to pkgs/by-name/op/openafs/package.nix index 76c0d2f64597..287a78cbad5f 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/by-name/op/openafs/package.nix @@ -14,7 +14,6 @@ libkrb5, libxslt, docbook_xsl, - file, docbook_xml_dtd_43, libtool_2, withDevdoc ? false, @@ -27,10 +26,7 @@ }: with (import ./srcs.nix { inherit fetchurl; }); -let - inherit (lib) optional optionalString optionals; -in stdenv.mkDerivation { pname = "openafs"; inherit version srcs; @@ -46,18 +42,18 @@ stdenv.mkDerivation { which bison ] - ++ optionals withDevdoc [ + ++ lib.optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ libkrb5 ] ++ optional withNcurses ncurses; + buildInputs = [ libkrb5 ] ++ lib.optional withNcurses ncurses; patches = [ ./bosserver.patch ./cross-build.patch ] - ++ optional withTsm ./tsmbac.patch; + ++ lib.optional withTsm ./tsmbac.patch; outputs = [ "out" @@ -65,7 +61,7 @@ stdenv.mkDerivation { "man" "doc" ] - ++ optional withDevdoc "devdoc"; + ++ lib.optional withDevdoc "devdoc"; enableParallelBuilding = false; @@ -98,12 +94,12 @@ stdenv.mkDerivation { "--disable-kernel-module" "--disable-fuse-client" "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl" - ${optionalString withTsm "--enable-tivoli-tsm"} - ${optionalString (!withNcurses) "--disable-gtx"} + ${lib.optionalString withTsm "--enable-tivoli-tsm"} + ${lib.optionalString (!withNcurses) "--disable-gtx"} "--disable-linux-d_splice-alias-extra-iput" ) '' - + optionalString withTsm '' + + lib.optionalString withTsm '' export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/opt/tivoli/tsm/client/api/bin64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\"" ''; @@ -114,7 +110,7 @@ stdenv.mkDerivation { make -C "''${d}" index.html done '' - + optionalString withDevdoc '' + + lib.optionalString withDevdoc '' make dox ''; @@ -129,7 +125,7 @@ stdenv.mkDerivation { rm -r $out/lib/openafs '' - + optionalString withDevdoc '' + + lib.optionalString withDevdoc '' mkdir -p $devdoc/share/devhelp/openafs/doxygen cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen @@ -144,7 +140,7 @@ stdenv.mkDerivation { done ''; - passthru.cellservdb = callPackage ../cellservdb.nix { }; + passthru.cellservdb = callPackage ./cellservdb.nix { }; meta = { outputsToInstall = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/by-name/op/openafs/srcs.nix similarity index 100% rename from pkgs/servers/openafs/1.8/srcs.nix rename to pkgs/by-name/op/openafs/srcs.nix diff --git a/pkgs/servers/openafs/1.8/tsmbac.patch b/pkgs/by-name/op/openafs/tsmbac.patch similarity index 100% rename from pkgs/servers/openafs/1.8/tsmbac.patch rename to pkgs/by-name/op/openafs/tsmbac.patch diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix index b106fc5b291e..cf6c70d3dbad 100644 --- a/pkgs/by-name/op/openmm/package.nix +++ b/pkgs/by-name/op/openmm/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmm"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "openmm"; repo = "openmm"; rev = finalAttrs.version; - hash = "sha256-NH9rPAlXpWBqYD9g6z9P0Y3Q51GgOPJUbrQ4GxvtPiA="; + hash = "sha256-YGoQGOP6Use4ivhxlWfKMpEjpm5ovFH1Qf0yVK5jr48="; }; # "This test is stochastic and may occasionally fail". It does. diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix index c6df46483e45..dac98e54b648 100644 --- a/pkgs/by-name/pc/pcm/package.nix +++ b/pkgs/by-name/pc/pcm/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pcm"; - version = "202509"; + version = "202604"; src = fetchFromGitHub { owner = "intel"; repo = "pcm"; rev = finalAttrs.version; - hash = "sha256-RIpyh4JN1/ePoSLQPyB3pgx6ifBcpJK+1d9YQcGZed4="; + hash = "sha256-TWE/5rsCCfoKDAy9i9YDRiUXVnqAX7I08Oq6QgCbzaY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix index 8d8a3053d1c3..1e658c1c71d6 100644 --- a/pkgs/by-name/ph/phpstan/package.nix +++ b/pkgs/by-name/ph/phpstan/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "phpstan"; - version = "2.1.46"; + version = "2.1.47"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan"; tag = finalAttrs.version; - hash = "sha256-VZQhL9w2/eyMQJhnLTU50wVVjS1gGNKLcPkuEkE5ZaA="; + hash = "sha256-xRDNpz01LvhY44Bwvb9MO6YvRpY5kgWIDxED1Yklvxw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index bd89a0e4015f..3dea9563709f 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-04-02"; + version = "0-unstable-2026-04-10"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "2d0d60d0e456af02dfc52d79053d5a3a20fb11ff"; - hash = "sha256-mHTARhEwD7li9xJQdnjDesgZ4DE34N35oBJIqvo4aUY="; + rev = "70e5087371296e2632232f4a3a795f124c73baf3"; + hash = "sha256-URPLE5ZHXpMuB3yLObMCOD5PR14KAbOBsc+aGQKubaA="; }; - vendorHash = "sha256-Dzizb692xTyCmaGpIoXU9OJ0//K+0QQ04vc4Dsnh34Q="; + vendorHash = "sha256-BbCCOgx6Tis2e07nSftdIi7cv8cHIXlsZl5Qk4fsWh8="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix b/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix index 299d9f1e403c..c382319158cc 100644 --- a/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.12.0"; + version = "0.12.1"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-O3cH7fX29tr/rhsovoYnmTL6CE+sZQKGNj4mq1IV/5U="; + hash = "sha256-qsZZoBXhh6lfYqh2uuIyOKGyL8u8IK8Gqgmm7cXzQdw="; }; - vendorHash = "sha256-RCf52lHpF4alljH/CNhCg+zgfvlYbO5WT2rFX63fyyo="; + vendorHash = "sha256-NhodCQVFa/5jxhfdFRe2vxuw8dlSKipfxbzD6NF/Q5w="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index da4dde42567d..335fe85380bb 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "node_exporter"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-cZ7MGh80LIPTrTzgR6W+gl6BUc7ss60mjocwm1BMXC0="; + hash = "sha256-AoW4JO9V/sZDjonNT+Ar8saX/rlb1lB/+Vmu5qGtTlA="; }; vendorHash = "sha256-qTuzF4xeF0riOedwaUR4x/U6Jb0j+GIwUfUfstp2Cao="; diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/by-name/q4/q4wine/package.nix similarity index 79% rename from pkgs/applications/misc/q4wine/default.nix rename to pkgs/by-name/q4/q4wine/package.nix index 5a93c793e10f..bae5afc03705 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/by-name/q4/q4wine/package.nix @@ -4,10 +4,7 @@ stdenv, cmake, sqlite, - qtbase, - qtsvg, - qttools, - wrapQtAppsHook, + qt6, icoutils, # build and runtime deps. wget, fuseiso, @@ -15,28 +12,28 @@ which, # runtime deps. }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "q4wine"; version = "1.4.2"; src = fetchFromGitHub { owner = "brezerk"; repo = "q4wine"; - rev = "v${version}"; - sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I="; }; buildInputs = [ sqlite icoutils - qtbase - qtsvg - qttools + qt6.qtbase + qt6.qtsvg + qt6.qttools ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # Add runtime deps. @@ -60,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rkitover ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ql/qlementine-icons/package.nix b/pkgs/by-name/ql/qlementine-icons/package.nix index d70bb06baf67..a90ff3ce6b61 100644 --- a/pkgs/by-name/ql/qlementine-icons/package.nix +++ b/pkgs/by-name/ql/qlementine-icons/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qlementine-icons"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "oclero"; repo = "qlementine-icons"; tag = "v${finalAttrs.version}"; - hash = "sha256-29XiD3t+KKEe8KRs5LwTN11gEFBJt/Ws6geq6bdH8KA="; + hash = "sha256-dnKl245hLBfENAh0ICQ/OX+3KDC2RE3t7uboiUc1XGY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index f67c544f6489..206f6012bb0c 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quickjs-ng"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "quickjs-ng"; repo = "quickjs"; tag = "v${finalAttrs.version}"; - hash = "sha256-t1GvD1iBRfJwzZHoLxMbE2Gh1Ow8v0ZASxCVnOT7ST4="; + hash = "sha256-kQDaDCljI+NcElufZZAmSGMbI2wyiQC6Lp4CyHW0aBY="; }; outputs = [ diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix index 1d122ae5482d..d6a723d56863 100644 --- a/pkgs/by-name/re/regclient/package.nix +++ b/pkgs/by-name/re/regclient/package.nix @@ -18,16 +18,16 @@ in buildGoModule rec { pname = "regclient"; - version = "0.11.2"; + version = "0.11.3"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-q3dsIQgUyLQXiiBgz//ttT1leGaUROd1GFxXIbbvV2U="; + sha256 = "sha256-/gKvjyFOzyTsgMuqCqZaWl2yun7f+eboQ0iLuXHh4lI="; }; - vendorHash = "sha256-J0kY5tltiicZPdQeq9uHAwqKR7SpFzwgLSryXtxL+9U="; + vendorHash = "sha256-P9ayAWvQY4WgmFTWzk2ZLQ5uwMvIsSfL73C99ROmze8="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index d2e1852f6fd6..f26eb9155949 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20260315"; + version = "20260412"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-iNRDQsDg8G58mSkDnzoGUVfWX3YezIWVwl5CJMKB+wE="; + hash = "sha256-qIFkaDdivE7tOQmk0TpNB8wov5iazegX7eJjMB+lFe0="; }; dontUnpack = true; diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index d1ffe646e6c0..9e9174659829 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -50,16 +50,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rio"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; tag = "v${finalAttrs.version}"; - hash = "sha256-RJRWcwqrmlK398lAh8LIkUj595ESKEyNwkC+V2hoKAE="; + hash = "sha256-UjyngfN7wNok/3gQG0mqbs22Su48LgGVVEVoyjsR7Q4="; }; - cargoHash = "sha256-gqUWK97xPrPpKkRsPA6oaZVJWKiq+l1I8WsHufVSjbo="; + cargoHash = "sha256-uj1uKP9p7UWSLoYo2GbzcWev+ZX2sHeLT2kfUmNg8bg="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 1887fb394869..de0a6fff87ef 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -73,15 +73,15 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "5.6.0-2.26151.2", - "hash": "sha256-J1h9PsPivgmHxcG2sFccStRazssjmO9q8a92bZbnDew=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.6.0-2.26151.2/microsoft.codeanalysis.analyzers.5.6.0-2.26151.2.nupkg" + "version": "5.6.0-2.26172.2", + "hash": "sha256-CJcnDRGIt7//SJLOSXLHoOnGs3QtLGqgpDyNPbjELm8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.6.0-2.26172.2/microsoft.codeanalysis.analyzers.5.6.0-2.26172.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", - "version": "5.6.0-2.26160.112", - "hash": "sha256-ZYIA/XYvgS+wttCu5Gb46cLpTcjHvJC1R4VDxyCuXA0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.6.0-2.26160.112/microsoft.codeanalysis.bannedapianalyzers.5.6.0-2.26160.112.nupkg" + "version": "5.7.0-1.26202.104", + "hash": "sha256-p7ybIuiw34dJb1IehSN4v+II42tznBbYYAtVMiKUTbo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.7.0-1.26202.104/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26202.104.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Common", @@ -103,9 +103,9 @@ }, { "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers", - "version": "5.6.0-2.26160.112", - "hash": "sha256-dcUvJ9J88Z4jGNmO4RZbqtzAYPCix1ooyv7a/q8MK6c=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.6.0-2.26160.112/microsoft.codeanalysis.publicapianalyzers.5.6.0-2.26160.112.nupkg" + "version": "5.7.0-1.26202.104", + "hash": "sha256-JUov6s7HgwbliMPxy86J7ok+LfEcFZooVQBiedCSUeo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.7.0-1.26202.104/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26202.104.nupkg" }, { "pname": "Microsoft.CSharp", @@ -121,15 +121,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "10.0.0-beta.26160.1", - "hash": "sha256-HxAuMFWDuwU7Gl8zXDc6TzyKosD25jAX14obzPWlFnA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26160.1/microsoft.dotnet.arcade.sdk.10.0.0-beta.26160.1.nupkg" + "version": "10.0.0-beta.26201.4", + "hash": "sha256-A1H87Y8Tvf8+cnKj3a59TFi2utka8e9R1j6p9JbOpzs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26201.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26201.4.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "10.0.0-beta.26160.1", - "hash": "sha256-jnGEiC6HTUSRQ9ckKLY1hGni8/awfq3gdzY74U8mjXM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26160.1/microsoft.dotnet.xlifftasks.10.0.0-beta.26160.1.nupkg" + "version": "10.0.0-beta.26201.4", + "hash": "sha256-4UIzFVmuDPIxECOBsAolrCCTb5Mzk5baYHDvGYFh/sc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26201.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26201.4.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -433,9 +433,9 @@ }, { "pname": "Roslyn.Diagnostics.Analyzers", - "version": "5.6.0-2.26160.112", - "hash": "sha256-GLfrXlVVIHDH3+qRdvGI///L9M932GL19KVWXUw6xFE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.6.0-2.26160.112/roslyn.diagnostics.analyzers.5.6.0-2.26160.112.nupkg" + "version": "5.7.0-1.26202.104", + "hash": "sha256-GO3HaDDOCK+PT4/yoQuj1vXvgGzGmgV2ksBbdP51zW0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.7.0-1.26202.104/roslyn.diagnostics.analyzers.5.7.0-1.26202.104.nupkg" }, { "pname": "SQLitePCLRaw.bundle_green", @@ -499,9 +499,9 @@ }, { "pname": "System.CommandLine", - "version": "3.0.0-preview.3.26160.112", - "hash": "sha256-LDm/H50j+VkuGPGo0epbZuOzQuVX3G7YcgIcpX8ipB0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.3.26160.112/system.commandline.3.0.0-preview.3.26160.112.nupkg" + "version": "3.0.0-preview.4.26202.104", + "hash": "sha256-Kuh7UZ+fg4mJWismeSS6PNKGFgSYruYOVY7agur6xe8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.4.26202.104/system.commandline.3.0.0-preview.4.26202.104.nupkg" }, { "pname": "System.ComponentModel.Composition", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 285b7e2c4d18..71fa566c4c49 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -38,18 +38,18 @@ in buildDotnetModule (finalAttrs: { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.131.79-prerelease"; + vsVersion = "2.134.7-prerelease"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${finalAttrs.vsVersion}"; - hash = "sha256-Jxfnb52ebOIL4rw99leN+2axQ+Y2eoq/37YmN5vuCK4="; + hash = "sha256-FzD5KQu5Ij+WBfXib1STBdXZvzvozey1cGghMHFWwvQ="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.6.0-2.26163.11"; + version = "5.7.0-1.26203.6"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index dfbe0fa93939..f478c6f6c06f 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-GWXxpiyqW6K7jM2HEqpWLOuifPJXjDJLk/n+sK6wGBI="; + hash = "sha256-KxECcpXjfqmirJBE1Rzh+KbngXACVUf2DTaKy7+XOSA="; }; - cargoHash = "sha256-NECpU+ttF7CsX0L2yFGs23HFStm+yiptsctszRXRZ7w="; + cargoHash = "sha256-uP1lZarcwQhBKyASQIiNUs053EuxJy112P2e3hy2uZY="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index c5546d7ee9e3..5bc40b4f28e4 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819 buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ - "servo_allocator/use-system-allocator" + "servo-allocator/use-system-allocator" ]; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix index e05a51661f0d..0bb83d0d563c 100644 --- a/pkgs/by-name/sh/shellhub-agent/package.nix +++ b/pkgs/by-name/sh/shellhub-agent/package.nix @@ -12,18 +12,18 @@ buildGoModule (finalAttrs: { pname = "shellhub-agent"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${finalAttrs.version}"; - hash = "sha256-NV2VA/rquf0TwTAsaAA6TIHp1BwD+5jE8uOZg7tW/kI="; + hash = "sha256-3WzB7a8RJlsiKDSpuXgXenfa1q5XG5baI57qrFS0kw8="; }; modRoot = "./agent"; - vendorHash = "sha256-dloFaS/BUnyd9kHB0d2vsibkgFlQwTBkgRBOiBbq2ZY="; + vendorHash = "sha256-idfUmP2LFcnjmGpA/17phpYtGBiTC/cXjlDd/dkZ1i0="; ldflags = [ "-s" diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index f8ed4776cb82..ec2818006a2b 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260407"; + version = "20260413"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-rkIhaYLRBpqMLpwOHhTAEpgqrKRc3UBMwhS1oiCcbvc="; + hash = "sha256-O6hi1L0oMXCJ0MiNZNObcwpszpGdv9gp0gKCjEXZtHw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index 8a0eb178efb6..6af6bdd11282 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -1,12 +1,12 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitLab, versionCheckHook, nix-update-script, }: -buildGoModule (finalAttrs: { +buildGo125Module (finalAttrs: { pname = "sigsum"; version = "0.14.0"; diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index 942af46837d7..32f48513a0d5 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "solanum"; - version = "0-unstable-2026-03-25"; + version = "0-unstable-2026-04-09"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "d8d710c7bc052c3e24f76ca7a63da3a6ba6af8ea"; - hash = "sha256-QnnxRRDou67/PorQ8YzVbQo2E3DF/f+cpR+hVecmyD0="; + rev = "54286cf59235c8688104ee20d4e1d74fe8934317"; + hash = "sha256-0som1lYheX/GVbqwEXwpIWonYKYqFwpAfcRRojlHlmc="; }; postPatch = '' diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json index d82e2904706e..280b9727d440 100644 --- a/pkgs/by-name/so/sourcegit/deps.json +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -1,8 +1,13 @@ [ { "pname": "Avalonia", - "version": "11.3.5", - "hash": "sha256-gW1t+B32H9aVC+ogE5X+4bwjsmbdOcyH83T8Br7IDuY=" + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, + { + "pname": "Avalonia", + "version": "11.3.12", + "hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -10,54 +15,59 @@ "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" }, { - "pname": "Avalonia.AvaloniaEdit", - "version": "11.3.0", - "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4=" + "pname": "Avalonia.BuildServices", + "version": "0.0.28", + "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=" }, { "pname": "Avalonia.BuildServices", - "version": "0.0.31", - "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.5", - "hash": "sha256-umZ6rfL9Qw1/jWpAiMyPu8f6i8ah4u3iR6uJVS6IUfw=" + "version": "11.3.12", + "hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.3.5", - "hash": "sha256-JgMIQ2aFgLkLcL/auPUwQTlmPlurree5HXfLYGGP3o8=" + "version": "11.3.12", + "hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.5", - "hash": "sha256-SJyN+znfG/GUYkw3yNFMxd0Y7Hc9QvckRHPRc/QpkvM=" + "version": "11.3.12", + "hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.5", - "hash": "sha256-7GORVuABhwQymfvSclY6ZGtRN6yXaKs1FKuXuR3ZXmo=" + "version": "11.3.12", + "hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.3.5", - "hash": "sha256-bBqFtDwB9C6cNlrrr2gnqv1YpNVAlEXjmLiv86CrU/o=" + "version": "11.3.12", + "hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.5", - "hash": "sha256-Kq5rZkiQWayrMRD90ex24zxESHTxof0PX8IvA+RutAc=" + "version": "11.3.12", + "hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto=" }, { "pname": "Avalonia.Native", - "version": "11.3.5", - "hash": "sha256-EIpaS2XtO/1Dx0XVSf9XapKMUHmVSXwK/rwgeioPCDo=" + "version": "11.3.12", + "hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.5", - "hash": "sha256-1bAKPdK+ftcdfdiUkwasmpjf3ai07T81PkRjKWFyNf8=" + "version": "11.0.0", + "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.3.12", + "hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU=" }, { "pname": "Avalonia.Skia", @@ -66,43 +76,38 @@ }, { "pname": "Avalonia.Skia", - "version": "11.3.5", - "hash": "sha256-DW2ectX/V583KqirUetmFioMNsuUa0ai2k5WKObFMO4=" + "version": "11.3.12", + "hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.5", - "hash": "sha256-BXf+iZxBEO2pFeAiN0bJNOndFJE+L573qZFiLqRRWG8=" + "version": "11.3.12", + "hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.5", - "hash": "sha256-hkEJC/2usaYDDdIeVKuWfORd+tlg39+xf/2Eiflvb8I=" + "version": "11.3.12", + "hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM=" }, { "pname": "Avalonia.Win32", - "version": "11.3.5", - "hash": "sha256-SNAx4QaNyrhE0BLWhHFtdsB35a5T9qfIQhdMC1YUrzA=" + "version": "11.3.12", + "hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc=" }, { "pname": "Avalonia.X11", - "version": "11.3.5", - "hash": "sha256-v85I2pFMOixIANKCngr2/HyTflYxiSihe08q6Z4513Q=" - }, - { - "pname": "AvaloniaEdit.TextMate", - "version": "11.3.0", - "hash": "sha256-VyXRytKE0aaWirvfr5Hm5uJm8Ckbu/+4wnTjmomgM5s=" + "version": "11.3.12", + "hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w=" }, { "pname": "Azure.AI.OpenAI", - "version": "2.3.0-beta.2", - "hash": "sha256-kAl8ylr8ghuXsGNFrzVS5e12xOrsmT9VieSVgmKJCyY=" + "version": "2.9.0-beta.1", + "hash": "sha256-jMUgCg0s4kTPB5m7nG9Mc1P5oOEIF4tmgCAG5Z+TVe0=" }, { "pname": "Azure.Core", - "version": "1.47.3", - "hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4=" + "version": "1.51.1", + "hash": "sha256-aNwDKJfkYC/QFaP8tCrwG+hFp+ubK6kUvEu4KhpgPTc=" }, { "pname": "BitMiracle.LibTiff.NET", @@ -146,18 +151,18 @@ }, { "pname": "LiveChartsCore", - "version": "2.0.0-rc5.4", - "hash": "sha256-Qw1Iyld75RXpvGJn/EQvd+f4Jh1SVAoqjjl/I0ctyWw=" + "version": "2.0.0-rc6.1", + "hash": "sha256-bz71i+8phXf8H/MG+DhF0m7RsNw2TLtPjREI55V4Mos=" }, { "pname": "LiveChartsCore.SkiaSharpView", - "version": "2.0.0-rc5.4", - "hash": "sha256-hlFYZu25Z2iTgoIL9cczN4BYYHzSXvzC7593e52x914=" + "version": "2.0.0-rc6.1", + "hash": "sha256-ftkvP9ow2jSxOXQsGSDUDp232iY+cLEcwW4u1Bj+qN8=" }, { "pname": "LiveChartsCore.SkiaSharpView.Avalonia", - "version": "2.0.0-rc5.4", - "hash": "sha256-U7Ihj5fs0/DJLerdcPu33xRHCh5K6JY3pPpLiBoV2vw=" + "version": "2.0.0-rc6.1", + "hash": "sha256-OWvyQ72JtajDlN1BDXHyTYP/U0TKnogNDOWCOCqpk6M=" }, { "pname": "MicroCom.Runtime", @@ -166,33 +171,78 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "8.0.0", - "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + "version": "10.0.2", + "hash": "sha256-3lrCf7HOpbkZkQx4/JSpKi8Rl+hp9NAaRi9dp6xqMaQ=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "1.1.1", + "hash": "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "10.0.2", + "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.2", - "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + "version": "10.0.2", + "hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "10.0.2", + "hash": "sha256-Aob6wq51LdquE7SkkxtCzcuHBKWrJcb3Ebi/dU3aqA4=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "10.0.2", + "hash": "sha256-tibCkkT9WliU2E/i0ufx7/Va6H6QZX4hR/1oUp8ecgQ=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "10.0.2", + "hash": "sha256-mkeKUXepn4bfEdZFXdURmNEFdGiHQdpcxnm6joG+pUA=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.3", - "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" + "version": "10.0.2", + "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "10.0.2", + "hash": "sha256-12AfUEDdta/pmZUyEyqSUfOk0YoA7JOfGmIYnZQ//qk=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "10.0.2", + "hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "1.1.1", + "hash": "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "1.1.1", + "hash": "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU=" }, { "pname": "Onigwrap", - "version": "1.0.8", - "hash": "sha256-lH9nH74cPMQnWKO8mwgg+nX4iMUXuh7McfeRL9asQIY=" + "version": "1.0.10", + "hash": "sha256-x1TJeOdANiWDdwgN+GsFznHMgPUnq/6iSN0BlIt0QJM=" }, { "pname": "OpenAI", - "version": "2.3.0", - "hash": "sha256-nIpYfGvE8FaEnE2y+98CAoLoz3+MWo+2eyb3Rgh7qgY=" + "version": "2.9.1", + "hash": "sha256-gYBNaOe49S0VyZxv8Cb1tOcRAvZEn7SwYMAvq7TrZ0w=" }, { "pname": "Pfim", - "version": "0.11.3", - "hash": "sha256-SNngIsloTjRymY64AGw+agXeG4U3kIgE+Pk8NqxMBO8=" + "version": "0.11.4", + "hash": "sha256-84mFvufgL1XS1fRTGBpR4zVB4E7/cj2pI9G0k+l7q7M=" }, { "pname": "SkiaSharp", @@ -226,38 +276,28 @@ }, { "pname": "System.ClientModel", - "version": "1.5.1", - "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow=" + "version": "1.9.0", + "hash": "sha256-8/feim+EOvZj0MU+ghFz257QzNUN+ila9p7eCAOCpug=" }, { - "pname": "System.ClientModel", - "version": "1.6.1", - "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0=" - }, - { - "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + "pname": "System.ComponentModel.Annotations", + "version": "4.5.0", + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, { "pname": "System.Memory.Data", - "version": "8.0.1", - "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" - }, - { - "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + "version": "10.0.1", + "hash": "sha256-C4AaCiuS1BLljZq+3VUTJyHRA6IFPIO0gWZKw2hbt5o=" }, { "pname": "TextMateSharp", - "version": "1.0.70", - "hash": "sha256-fzmSGU8fT/J6W+Yx/qgUqPEiC1Og9ctUyQGDleOggrM=" + "version": "2.0.2", + "hash": "sha256-u8D8zWJNdmzGRzumt0bRrRyrQCXEYiVC5wpNl6cL3WA=" }, { "pname": "TextMateSharp.Grammars", - "version": "1.0.70", - "hash": "sha256-AAH3SXLyIUIfJgdPhwIRPZhdcxdNhis2ODLd9mh1PuE=" + "version": "2.0.2", + "hash": "sha256-DVmf3XRQiLzPBxtoeVYEU2RiD4VhxQwVwzL2S4gtUF4=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index c172e11f4501..62ed91cab6ff 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -22,19 +22,20 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.34"; + version = "2026.07"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-O7HzbrcQGgP3mRSfqLxoHPswVW99S9chb7ZWBeEelsY="; + hash = "sha256-g7V3EbbI8kIy2CW3sof5sdSPp4u7ZbuawqSp63OlV44="; + fetchSubmodules = true; }; patches = [ ./fix-darwin-git-path.patch ]; - dotnet-sdk = dotnetCorePackages.sdk_9_0; - dotnet-runtime = dotnetCorePackages.runtime_9_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix index bda99f002fb7..29c551661a85 100644 --- a/pkgs/by-name/sp/sptlrx/package.nix +++ b/pkgs/by-name/sp/sptlrx/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "sptlrx"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "raitonoberu"; repo = "sptlrx"; rev = "v${finalAttrs.version}"; - hash = "sha256-X1nDvhW8F4UDWIeP0W6EtwB+0Ytf/d76oB/SJV9/neg="; + hash = "sha256-QbF1yMzGGvxEUIMeQ6sI3ykXYW9R/2gFSRkrASbhiJ0="; }; vendorHash = "sha256-2QbGrQwFA+YeoVt4se2silLYbg7cQGY/fCTQb2bXWAM="; diff --git a/pkgs/by-name/sq/sqlcmd/package.nix b/pkgs/by-name/sq/sqlcmd/package.nix index f65a8b90e58c..4e596dec3af8 100644 --- a/pkgs/by-name/sq/sqlcmd/package.nix +++ b/pkgs/by-name/sq/sqlcmd/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "sqlcmd"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-9De00wIuSgg7Z1LCsj3tODImyQJxYFINtqt6PSvrK/Y="; + sha256 = "sha256-FZJiIC8rhZGE0nLY81GUHVXouvhNbx5gj+Xy2z8uxjw="; }; - vendorHash = "sha256-3VORKnBt+HUiFMszw19wiGOUra0K72R5M6OPhPZs+yw="; + vendorHash = "sha256-y2AuRgi8o2ttGkBI/rUEtMbcoIj/BvpVdSVamDbaCpo="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index 98fe217104e1..3bf963480ca9 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "stackql"; - version = "0.10.383"; + version = "0.10.421"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${finalAttrs.version}"; - hash = "sha256-ISbK7O3nupV0BgpneuI3B5xPxGDzwMaNy8wFgZPGKtE="; + hash = "sha256-POHOGkjnf9zwg4mUpd0dyQXQvSitjwB+6wieVvI8DaE="; }; - vendorHash = "sha256-xIiBkearGbIUVHs1G+DSvf2y4qjHI5dU37GwapMTtRk="; + vendorHash = "sha256-go1i5xFt3AE+K37+uZz9sjjsgD521fZ7/nPu26531Q8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ta/talm/package.nix b/pkgs/by-name/ta/talm/package.nix index 3d331423c1c3..496a24c3c9e0 100644 --- a/pkgs/by-name/ta/talm/package.nix +++ b/pkgs/by-name/ta/talm/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "talm"; - version = "0.22.4"; + version = "0.23.1"; src = fetchFromGitHub { owner = "cozystack"; repo = "talm"; tag = "v${finalAttrs.version}"; - hash = "sha256-9CUr49uKvVwjU9rJpt0Y4BNtBUQiJxNcU8YMlNhyd/g="; + hash = "sha256-bxyYDCWQJZ+MrfV30Q3xBMggGU+F7Hs486g3BhQlDtI="; }; vendorHash = "sha256-jDp1WVETDbCtSq+v0BrIiTqoR2cnmI7JXdy5ydnt5wA="; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index fe73a4121271..83e94f625c6d 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "tenv"; - version = "4.9.3"; + version = "4.10.1"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; tag = "v${finalAttrs.version}"; - hash = "sha256-gaz2zGYYYCo3iDAiA3gVg2BYgeZrZMHcALbBHE0pRvM="; + hash = "sha256-Z28ZPRLFV14/4BWwCp7AU70T226nE4z2dUC29jyZYMo="; }; - vendorHash = "sha256-DtcOAdkd9JrfGKwkHixx2Qgjij7u7MVr96oNpPqTz14="; + vendorHash = "sha256-hodj4wBHjIGOJJlEClRIb1RavkNniEqFDvyS3Z7Abf0="; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index 40f205111f98..24f56d2752b8 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tun2proxy"; - version = "0.7.19"; + version = "0.7.20"; src = fetchCrate { pname = "tun2proxy"; inherit (finalAttrs) version; - hash = "sha256-mg1GGtWCjxSPhlb0pjFNPVTblZWfUXQa3643T9siD20="; + hash = "sha256-nc12hjKOUGuxkNsbTMkHYv4HSLGwemx2VKv18u0rvn8="; }; - cargoHash = "sha256-ZoLy3iknPUq2OmXQUomVVWij+mexixB6eDvGhrlsWDk="; + cargoHash = "sha256-iK5lUu6HWaNMA0I+sIpUr5pNwI05szctxzW6cPSyH3g="; env.GIT_HASH = "000000000000000000000000000000000000000000000000000"; diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix index 7bfc0796afef..3be31bfcedad 100644 --- a/pkgs/by-name/uk/ukmm/package.nix +++ b/pkgs/by-name/uk/ukmm/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ukmm"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = "ukmm"; tag = "v${finalAttrs.version}"; - hash = "sha256-NZN+T2N+N+oxrjBRvVbRWbB2KY5im9SN7gPHzfvovl8="; + hash = "sha256-nCyaPEa5wYRii9ehFwsLw390AcbjlrdKdGqxKhuk7CQ="; }; - cargoHash = "sha256-eDYCF+bYh0T/SSrQKjCqZvSd28CSxvGkpHgmBCHLoig="; + cargoHash = "sha256-BzgFzEKsVCvNHaBv0fKgt3lGgDxwi560AkIrk4pSWHA="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix index 5c055b8ef208..b6fe22006c83 100644 --- a/pkgs/by-name/uu/uutils-procps/package.nix +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-procps"; - version = "0.0.1-unstable-2026-03-28"; + version = "0.0.1-unstable-2026-04-10"; src = fetchFromGitHub { owner = "uutils"; repo = "procps"; - rev = "5c471226274a402533c197ac129b4867389968c8"; - hash = "sha256-2X9r02Gda3Qq97PdztoXoBx9RZe67kCgBNMBNCadzjU="; + rev = "a6321bdbcb3c1810581cba24a2e7329c7781dd87"; + hash = "sha256-QYeb7Kw2UzJTpKFv+5vnUjq+QpSkQa2Ch6AITXh1qXs="; }; - cargoHash = "sha256-LpsBis5L4hKteI+KIBdCTcpAXIoOH0XE0DvtF2cY/nQ="; + cargoHash = "sha256-tYeUQxFkTQdQ9aOeEi77FoQIpxY1OiLZIMZTK/dxf7o="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix index 4329c0550222..80c7405dee0b 100644 --- a/pkgs/by-name/uu/uutils-util-linux/package.nix +++ b/pkgs/by-name/uu/uutils-util-linux/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-util-linux"; - version = "0.0.1-unstable-2026-04-01"; + version = "0.0.1-unstable-2026-04-10"; src = fetchFromGitHub { owner = "uutils"; repo = "util-linux"; - rev = "610a351d6c9072f69cc1f98278d070eab16d82e3"; - hash = "sha256-+SUv/rOegmonEl8eNOHSUmEUEoOirrywe4gH08849mU="; + rev = "1906c2a2aaae1ea13a8c8ea58759bae6a762e9f8"; + hash = "sha256-sQz/ynjYtgb2OcRBxOPgw2fWUBbKCP6FQYrA0ml4Ghc="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"' ''; - cargoHash = "sha256-sjhfMzeTDe1ap7W8kVSxTkp90v1v2MulfKzRJAvzn4I="; + cargoHash = "sha256-9AT9i3Q+C07GpaQmuepkbnhKG/pbsFWXTmWXIhtL8+E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/we/wego/package.nix b/pkgs/by-name/we/wego/package.nix index a47c8d67bac1..934e1ad8a152 100644 --- a/pkgs/by-name/we/wego/package.nix +++ b/pkgs/by-name/we/wego/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "wego"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "schachmat"; repo = "wego"; rev = finalAttrs.version; - sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk="; + sha256 = "sha256-RKVVOgM6eEWTHYb++AVTTjPLm/4R9SHFly4boRw9Ktw="; }; - vendorHash = "sha256-aXrXw/7ZtSZXIKDMZuWPV2zAf0e0lU0QCBhua7tHGEY="; + vendorHash = "sha256-PSl0bGzyG9XBZPi8+YzLNq3JEm7QtmfX0272xOgtbek="; meta = { homepage = "https://github.com/schachmat/wego"; diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index 1f68e40fa030..35c8d9939567 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -6,12 +6,12 @@ let pname = "wtfis"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; tag = "v${version}"; - hash = "sha256-XFitQY30hK3byVevqndSAkG08ztwY1BIpJEYhY3PzTs="; + hash = "sha256-2e8T2R33xOX4XZ3Lsk95kI9ea245eTWrxA1RPi2PqEI="; }; in python3.pkgs.buildPythonApplication { diff --git a/pkgs/by-name/xx/xxh/package.nix b/pkgs/by-name/xx/xxh/package.nix index 466b14ab2dac..bcb03a7938ef 100644 --- a/pkgs/by-name/xx/xxh/package.nix +++ b/pkgs/by-name/xx/xxh/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "xxh"; - version = "0.8.14"; + version = "0.8.16"; pyproject = true; src = fetchFromGitHub { owner = "xxh"; repo = "xxh"; tag = finalAttrs.version; - hash = "sha256-Y1yTn0lZemQgWsW9wlW+aNndyTXGo46PCbCl0TGYspQ="; + hash = "sha256-9kFstE0XNkj026NHhxGM+Ccm8GT7Tr7p4oY4O89zWCU="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index ba7d5cd39991..943eece50309 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -36,13 +36,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zipline"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "diced"; repo = "zipline"; tag = "v${finalAttrs.version}"; - hash = "sha256-StseTNZAmJzd+uk5FaBvDXr1wF/AahQp1GXFsZDzSz0="; + hash = "sha256-uZnN+kqtCGydrqnOVkhlNiCNSz4g2qLPiYTXpdmv/Mc="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git_head @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm'; fetcherVersion = 2; - hash = "sha256-d1EvqV+WiLE4mzn4Ewpi9A42xxyIPMewB6CKpSnipi8="; + hash = "sha256-eoZi4JMN9PiiRRd/z/HjqSHX9ta33cL4+d1GMGxJ33U="; }; buildInputs = [ diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix index 07fe457cc53f..404811ffa2f5 100644 --- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix +++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix @@ -213,6 +213,19 @@ buildRedist (finalAttrs: { "__func__(float cospif(const float a))" \ "__func__(float cospif(const float a) throw())" '' + # Fix clang CUDA compilation: host_defines.h redefines __noinline__ as + # __attribute__((noinline)), which conflicts with libstdc++ >=12 using + # __attribute__((__noinline__)) — the macro expands to + # __attribute__((__attribute__((noinline)))) which is invalid. + # Clang natively understands __noinline__ as an attribute so the macro + # is unnecessary. Skip it when clang is the compiler. + + lib.optionalString (cudaOlder "13.0") '' + nixLog "Patching host_defines.h to skip __noinline__ macro under clang" + substituteInPlace "''${!outputInclude:?}/include/crt/host_defines.h" \ + --replace-fail \ + '#if defined(__CUDACC__) || defined(__CUDA_ARCH__) || defined(__CUDA_LIBDEVICE__)' \ + '#if (defined(__CUDACC__) || defined(__CUDA_ARCH__) || defined(__CUDA_LIBDEVICE__)) && !defined(__clang__)' + '' ); brokenAssertions = [ diff --git a/pkgs/development/interpreters/asmrepl/Gemfile b/pkgs/development/interpreters/asmrepl/Gemfile deleted file mode 100644 index 0b617ffb90b2..000000000000 --- a/pkgs/development/interpreters/asmrepl/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source 'https://rubygems.org' do - gem 'asmrepl' -end diff --git a/pkgs/development/interpreters/asmrepl/Gemfile.lock b/pkgs/development/interpreters/asmrepl/Gemfile.lock deleted file mode 100644 index f845e91b6c90..000000000000 --- a/pkgs/development/interpreters/asmrepl/Gemfile.lock +++ /dev/null @@ -1,18 +0,0 @@ -GEM - specs: - -GEM - remote: https://rubygems.org/ - specs: - asmrepl (1.0.3) - fisk (~> 2) - fisk (2.3.0) - -PLATFORMS - ruby - -DEPENDENCIES - asmrepl! - -BUNDLED WITH - 2.2.24 diff --git a/pkgs/development/interpreters/asmrepl/gemset.nix b/pkgs/development/interpreters/asmrepl/gemset.nix deleted file mode 100644 index f3455e515023..000000000000 --- a/pkgs/development/interpreters/asmrepl/gemset.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - asmrepl = { - dependencies = [ "fisk" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10d0zvkhk3ja48vvx28hfsqfrzfl66vdpmk3gcgb5viy174c72v6"; - type = "gem"; - }; - version = "1.0.3"; - }; - fisk = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1mq2a7hjs9xfg514ci0xw90c33rzq1y58ywpnmhp7w767ll6wldd"; - type = "gem"; - }; - version = "2.3.0"; - }; -} diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix index 0565d1ba2287..b6fb9e2550c3 100644 --- a/pkgs/development/python-modules/aioghost/default.nix +++ b/pkgs/development/python-modules/aioghost/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "aioghost"; - version = "0.4.0"; + version = "0.4.10"; pyproject = true; src = fetchFromGitHub { owner = "TryGhost"; repo = "aioghost"; tag = "v${finalAttrs.version}"; - hash = "sha256-VIMkAPUzIzSwXCbwqu+OOvUwd/l2zUJpnvjLlvIoDAk="; + hash = "sha256-Rumg/ABsA2pK1NRPVPW8wZmUL8VwzV48mU97PFWmCEY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix index 8bc8f2947610..f72014c4dec4 100644 --- a/pkgs/development/python-modules/aiosonos/default.nix +++ b/pkgs/development/python-modules/aiosonos/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "aiosonos"; - version = "0.1.11"; + version = "0.1.12"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "aiosonos"; tag = finalAttrs.version; - hash = "sha256-Vd0m96BdFGYslAW/yHYdA4BUo6X8v1eYt6Z9ABinCJU="; + hash = "sha256-uWg/2f1R7QUZLqE6zjcox7EHkyU14p9oRtrlaVy0EL8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 7ec2359dd375..f32d05c9f332 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -14,13 +14,13 @@ buildPythonPackage (finalAttrs: { pname = "apycula"; - version = "0.31"; + version = "0.32"; pyproject = true; # The Pypi archive contains necessary files generated with proprietary tools. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-77pr4HbS2adFeEI3Q3KzcCfJMi4UomOtKnuGAxobxF0="; + hash = "sha256-DWSVcIXkv6g6Zf+8SrZKQUrtOD5RKu01Xl/lo8Ov5n8="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/colcon/0001-update-setuptools.patch b/pkgs/development/python-modules/colcon/0001-update-setuptools.patch new file mode 100644 index 000000000000..3c955a3d4c7f --- /dev/null +++ b/pkgs/development/python-modules/colcon/0001-update-setuptools.patch @@ -0,0 +1,13 @@ +diff --git a/setup.cfg b/setup.cfg +index 3f97885..3b55c34 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -38,7 +38,7 @@ install_requires = + pytest-cov + pytest-repeat + pytest-rerunfailures +- setuptools>=30.3.0,<80 ++ setuptools>=30.3.0 + # toml is also supported but deprecated + tomli>=1.0.0; python_version < "3.11" + packages = find: diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix index 8c53dc78bfed..4b8592491010 100644 --- a/pkgs/development/python-modules/colcon/default.nix +++ b/pkgs/development/python-modules/colcon/default.nix @@ -21,16 +21,20 @@ buildPythonPackage rec { pname = "colcon-core"; - version = "0.19.0"; + version = "0.20.1"; pyproject = true; src = fetchFromGitHub { owner = "colcon"; repo = "colcon-core"; tag = version; - hash = "sha256-R/TVHPT305PwaVSisP0TtbgjCFBwCZkXOAgkYhCKpyY="; + hash = "sha256-FV/G2FcnBgr7mUY/Jr+bVAdEfhHL9qAnpc92hpTfy7Y="; }; + # Upstream tracking issue: https://github.com/ros2/ros2/issues/1738 + # This will break some functionality of building setuptools packages using colcon, other package types should work fine + patches = [ ./0001-update-setuptools.patch ]; + build-system = [ setuptools ]; dependencies = [ @@ -68,7 +72,10 @@ buildPythonPackage rec { description = "Command line tool to build sets of software packages"; homepage = "https://github.com/colcon/colcon-core"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ guelakais ]; + maintainers = with lib.maintainers; [ + amronos + guelakais + ]; mainProgram = "colcon"; }; } diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix index d847937a3af8..7087383d8e06 100644 --- a/pkgs/development/python-modules/copier/default.nix +++ b/pkgs/development/python-modules/copier/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "copier"; - version = "9.14.1"; + version = "9.14.3"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-9+GV+y6vgzsEkqIX3lJXJdwFrBxcKbTO1H6LtykIRac="; + hash = "sha256-wRYqpdMsxm2AHaLpdhsdkC6oDZP2a3VXJx/pNNrQieM="; }; env.POETRY_DYNAMIC_VERSIONING_BYPASS = version; diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index fa4774f5ac7f..8cd8d141d90d 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "coqpit-config"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "idiap"; repo = "coqui-ai-coqpit"; tag = "v${finalAttrs.version}"; - hash = "sha256-lverGecVRwhpdtX5463O6+CMJGye8VXj3JJZ+VhKcn8="; + hash = "sha256-9tIx36wWC9JfbnSF8/TZtHRyiXn77ItNXLq9vDopdS4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-weasyprint/default.nix b/pkgs/development/python-modules/django-weasyprint/default.nix index f496f7948286..682ececb7df3 100644 --- a/pkgs/development/python-modules/django-weasyprint/default.nix +++ b/pkgs/development/python-modules/django-weasyprint/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-weasyprint"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "fdemmer"; repo = "django-weasyprint"; tag = "v${version}"; - hash = "sha256-eSh1p+5MyYb6GIEgSdlFxPzVCenlkwSCTkTzgKjezIg="; + hash = "sha256-EwTEBIqAZGmtSXkSLZgNPCKA98IrymsUEaCHc1uQ2XE="; }; build-system = [ diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index b433505cda2a..9ef51271e140 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.23.12"; + version = "0.23.13"; pyproject = true; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; tag = "v${version}"; - hash = "sha256-31gDJKiNJ6CGIJYItMj8VzQkHQdmWFiDrpiC1ntIrVE="; + hash = "sha256-kXDdUKOs5+1LKqVnGAd1G6pD4IZkAsuNfJPDWj/ffkg="; }; build-system = [ diff --git a/pkgs/development/python-modules/git-find-repos/default.nix b/pkgs/development/python-modules/git-find-repos/default.nix index d97d153ee6c1..e34c406d302b 100644 --- a/pkgs/development/python-modules/git-find-repos/default.nix +++ b/pkgs/development/python-modules/git-find-repos/default.nix @@ -6,14 +6,14 @@ }: buildPythonPackage rec { pname = "git-find-repos"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "acroz"; repo = "git-find-repos"; rev = version; - sha256 = "sha256-4TuZlt6XH4//DBHPuIMl/i3Tp6Uft62dGCTAuZ2rseE="; + sha256 = "sha256-+MiCMgIakpJaWWdN2grerlPbPAnfIXuclvRw8XQ1YiI="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index 31d79fc7167e..d49ad4f323c9 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gitpython"; version = "3.1.46"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ymuJlxGEmWwvmVFYiIW23k5Gl2h09ugFLPosnUWg5S0="; }; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "Python Git Library"; homepage = "https://github.com/gitpython-developers/GitPython"; - changelog = "https://github.com/gitpython-developers/GitPython/blob/${src.tag}/doc/source/changes.rst"; + changelog = "https://github.com/gitpython-developers/GitPython/blob/${finalAttrs.src.tag}/doc/source/changes.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index d661ee0f3436..98c2cff2cbba 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.15"; + version = "1.15.1"; pyproject = true; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-ArQpif3RD6b4oSPe5UjE7KkbtcDlWizALZD5ncq7jBo="; + hash = "sha256-QvdquUEwaHIX94m0/FVJ41/mmmQZz9Nj3F9ZepWgIFM="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix index 1f77fc383daa..5c5e4dfaaa1f 100644 --- a/pkgs/development/python-modules/nhc/default.nix +++ b/pkgs/development/python-modules/nhc/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "nhc"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "vandeurenglenn"; repo = "nhc"; tag = "v${version}"; - hash = "sha256-zA9aIVP7H4v+W4IBGEWqyzKPriDNYJTyXiKFvQCt33c="; + hash = "sha256-lQfuYU/5ONynCv0f+ZNuafblcvuLAdDmRA0FAxp9NTQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 8f46b42d8546..32d457b1596f 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -49,14 +49,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "9.5.5"; + version = "9.6.0"; pyproject = true; src = fetchFromGitHub { owner = "domainaware"; repo = "parsedmarc"; tag = version; - hash = "sha256-iJkXtSkHImVOWvuZuWOsUTXPtXNXYbp5umjpPFmuQvo="; + hash = "sha256-ez7QMFsSvJzxhfCPA4G6oGQhqAzcgKBTJMiMogIJvNg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 8baed9d6cc0e..a74896f22372 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.21"; + version = "0.3.22"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-j9STueuKwRqbq0zS+xxE8I7EDR4s+Cq1evCtP0h3WX4="; + hash = "sha256-yk01aq1rOed312E629Vt5TuXl1vQdgoZZB3c5tk3nEk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-melcloud/default.nix b/pkgs/development/python-modules/python-melcloud/default.nix index 1c90472cedfd..5c81e0547f3c 100644 --- a/pkgs/development/python-modules/python-melcloud/default.nix +++ b/pkgs/development/python-modules/python-melcloud/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-melcloud"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "python-melcloud"; tag = version; - hash = "sha256-ccc6mIYWZEBENbmkbAZ0cFXJFhFNBjXoU/VDe+ETgoQ="; + hash = "sha256-i0/Ra5V3W/TOW+wRZZfKXuGtJTJeHqs+tPuS6KBZasE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 592b266b3ecd..f0e2706896b5 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2025.2.5"; + version = "2026.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-p/U1BkTUbZjunH5ntLQWkzCKoPXpsYjY8GlLJ9yU46I="; + hash = "sha256-e2Q4yl7N7e5C4WyMtwLCrlYqmPsmLawaOwGxIcw0vtU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 09f90e758c0f..f795814512a7 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; tag = finalAttrs.version; - hash = "sha256-nhReZXZdquXBpuD7ymfe6uHBpUqfLYfl3rnsY38NPZc="; + hash = "sha256-cgDL27KyDS8wPgyZ1ez6k9DRD2m9cJxms6w76Haalkg="; }; patches = [ diff --git a/pkgs/development/python-modules/sklearn2pmml/default.nix b/pkgs/development/python-modules/sklearn2pmml/default.nix index 6e364097f442..93e1e83c9485 100644 --- a/pkgs/development/python-modules/sklearn2pmml/default.nix +++ b/pkgs/development/python-modules/sklearn2pmml/default.nix @@ -33,14 +33,14 @@ let in buildPythonPackage (finalAttrs: { pname = "sklearn2pmml"; - version = "0.129.2"; + version = "0.130.0"; pyproject = true; src = fetchFromGitHub { owner = "jpmml"; repo = "sklearn2pmml"; tag = finalAttrs.version; - hash = "sha256-xntm+AUwylJuMhTAYi6o2tIxlzzeo8lkwtSvgeuQpQU="; + hash = "sha256-u+fuOiJ0YTyxVZkKhBhxn0gUHbLRQ69WwSX2GwhYaHU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix index d0ebe9408c30..01b11583d3e6 100644 --- a/pkgs/development/python-modules/textual-image/default.nix +++ b/pkgs/development/python-modules/textual-image/default.nix @@ -2,31 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - - # dependencies rich, - - # tests pillow, pytestCheckHook, syrupy, - setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textual-image"; - version = "0.8.5"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "lnqs"; repo = "textual-image"; - tag = "v${version}"; - hash = "sha256-gkLsM02oQ2H4UUhezbcmaOa2FQfzvFRsa0gd07eNucw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-nWP4pxFcsjDA/SIrKXHjufiQaxHGgPpC1ZIti+TW+f0="; }; - buildInputs = [ setuptools ]; + build-system = [ setuptools ]; dependencies = [ pillow @@ -45,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Render images in the terminal with Textual and rich"; homepage = "https://github.com/lnqs/textual-image/"; - changelog = "https://github.com/lnqs/textual-image/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/lnqs/textual-image/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ gaelj ]; }; -} +}) diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock b/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock index f837b7de6f4a..e5f2b7f2a770 100644 --- a/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock +++ b/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "cc" -version = "1.2.58" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", "shlex", @@ -26,9 +26,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "libc" -version = "0.2.183" +version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" +checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "once_cell" @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1" +checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12" dependencies = [ "libc", "once_cell", @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7" +checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e" dependencies = [ "python3-dll-a", "target-lexicon", @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc" +checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e" dependencies = [ "libc", "pyo3-build-config", @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e" +checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -99,9 +99,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a" +checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb" dependencies = [ "heck", "proc-macro2", @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "python3-dll-a" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +checksum = "d80ba7540edb18890d444c5aa8e1f1f99b1bdf26fb26ae383135325f4a36042b" dependencies = [ "cc", ] @@ -165,7 +165,7 @@ checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-segmentation-rs" -version = "0.2.2" +version = "0.2.4" dependencies = [ "pyo3", "unicode-segmentation", diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix index 68b4bbb76032..59208abaee74 100644 --- a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix +++ b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "unicode-segmentation-rs"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "WeblateOrg"; repo = "unicode-segmentation-rs"; tag = "v${version}"; - hash = "sha256-3Q8a5WfJ3+HKDx2a5O/OvkE16jwuT88T5uyQXa3BRb8="; + hash = "sha256-c/KWCJz8ZbWWE7S+2Uxp3+eQWHXAEZXcVN3C5OrFlrc="; }; postPatch = '' diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 17bb9b3d30a6..7afe8f621f1f 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -17,6 +17,7 @@ roctracer, rocminfo, rocm-smi, + rocprofiler-register, symlinkJoin, numactl, libffi, @@ -112,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { libffi zstd zlib + rocprofiler-register ]; propagatedBuildInputs = [ @@ -136,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: { "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" "-DROCM_PATH=${rocminfo}" "-DBUILD_ICD=ON" - "-DHIP_ENABLE_ROCPROFILER_REGISTER=OFF" # circular dep - may need -minimal and -full builds? "-DAMD_ICD_LIBRARY_DIR=${khronos-ocl-icd-loader}" # Temporarily set variables to work around upstream CMakeLists issue diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix index b850135a33ff..2633e4e2a612 100644 --- a/pkgs/development/rocm-modules/default.nix +++ b/pkgs/development/rocm-modules/default.nix @@ -87,6 +87,7 @@ let rocprofiler-register = self.callPackage ./rocprofiler-register { inherit (llvm) clang; }; + rocprofiler-sdk = self.callPackage ./rocprofiler-sdk { }; rocprof-compute-viewer = self.callPackage ./rocprof-compute-viewer { }; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 8faf6085b49f..c6638ca6c13e 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -8,6 +8,7 @@ cmake, xxd, rocm-device-libs, + rocprofiler-register, elfutils, libdrm, numactl, @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { elfutils libdrm numactl + rocprofiler-register ]; cmakeFlags = [ diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index a51abd2d0f37..770b29be8f46 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -1,19 +1,18 @@ { lib, stdenv, - rocm-runtime, - rocprofiler, numactl, libpciaccess, libxml2, elfutils, + glog, + fmt, fetchFromGitHub, rocmUpdateScript, cmake, clang, - clr, python3Packages, - gpuTargets ? clr.gpuTargets, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -28,26 +27,37 @@ stdenv.mkDerivation (finalAttrs: { "projects/rocprofiler-register" "shared" ]; - fetchSubmodules = true; - hash = "sha256-2u5rLLT4Aif0jwAqqlIzrzh9kICJG15nZAslbiL7H9g="; + hash = "sha256-XhxED3LHIjxBcSVyyEC3pgg0fyKyfKtHkF7umExSboM="; }; sourceRoot = "${finalAttrs.src.name}/projects/rocprofiler-register"; + patches = [ + (fetchpatch { + # [rocprofiler-sdk][rocprofiler-register] add CPackComponent + url = "https://github.com/ROCm/rocm-systems/commit/ef7253365c420ca486f074b9e9119a222e30fea0.patch"; + hash = "sha256-dwqvZ4AaTcOk2mSnxgHp/NbhjlD8W6KVz1H5ZF4i/Tw="; + relative = "projects/rocprofiler-register"; + }) + (fetchpatch { + # [rocprofiler-register] Fix compilation with system fmt/glog + url = "https://github.com/ROCm/rocm-systems/commit/c8ad2522083c6e00539ce5c1c22df766c20084fb.patch"; + hash = "sha256-VloRKV6kUzIfIInltx/bV1EM0FUfeQZrVAx6qgdsLyg="; + relative = "projects/rocprofiler-register"; + }) + ]; + nativeBuildInputs = [ cmake clang - clr ]; - # TODO(@LunNova): use system fmt&glog once upstream fixes flag to not vendor buildInputs = [ numactl libpciaccess libxml2 elfutils - rocm-runtime - - rocprofiler.rocmtoolkit-merged + glog + fmt python3Packages.lxml python3Packages.cppheaderparser @@ -56,12 +66,10 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pandas ]; cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${clr}" - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DBUILD_TEST=OFF" - "-DROCPROFILER_BUILD_TESTS=0" - "-DROCPROFILER_BUILD_SAMPLES=0" + "-DROCPROFILER_REGISTER_BUILD_TESTS=0" + "-DROCPROFILER_REGISTER_BUILD_SAMPLES=0" + "-DROCPROFILER_REGISTER_BUILD_GLOG=OFF" + "-DROCPROFILER_REGISTER_BUILD_FMT=OFF" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch new file mode 100644 index 000000000000..bf13b730dc86 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch @@ -0,0 +1,42 @@ +From 2868bcf8a340ecd4c564c1bd3210753fbd6aad8c Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sun, 5 Apr 2026 15:14:12 +0000 +Subject: [PATCH] [rocprofiler-sdk] rename consumer-test for dependent change + +This target has been renamed on the develop branch in +https://github.com/ROCm/rocm-systems/commit/a2288eb50bd805e5d6d7dfa98834972083e4356a, +however, that commit requires additional commits in order to apply properly. For now +it is easier to fix this by renaming this target so that the other patch applies +cleanly. +--- + .../lib/rocprofiler-sdk/counters/tests/CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt +index 66fd9efa5b..d3b5fbe378 100644 +--- a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt ++++ b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt +@@ -104,16 +104,16 @@ set_tests_properties( + + set(ROCPROFILER_LIB_CONSUMER_TEST_SOURCES consumer_test.cpp) + +-add_executable(consumer-test) +-target_sources(consumer-test PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES}) ++add_executable(consumer-tests) ++target_sources(consumer-tests PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES}) + + target_link_libraries( +- consumer-test rocprofiler-sdk::rocprofiler-sdk-hsa-runtime ++ consumer-tests rocprofiler-sdk::rocprofiler-sdk-hsa-runtime + rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main) + + gtest_add_tests( +- TARGET consumer-test ++ TARGET consumer-tests + SOURCES ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES} + TEST_LIST consumer-tests_TESTS + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch new file mode 100644 index 000000000000..3afe49d59248 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0002-rocprofiler-sdk-add-missing-stl-headers.patch @@ -0,0 +1,69 @@ +From af363337240fb6e4976004900b610317ba459165 Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 21:01:33 +0000 +Subject: [PATCH] [rocprofiler-sdk] add missing stl headers + +These missing includes became apparent when building with +ROCPROFILER_BUILD_GHC_FS=OFF. +--- + source/lib/att-tool/att_lib_wrapper.hpp | 2 ++ + source/lib/rocprofiler-sdk-rocpd/sql.cpp | 1 + + source/lib/rocprofiler-sdk/counters/metrics.cpp | 1 + + source/lib/rocprofiler-sdk/tests/status.cpp | 1 + + 4 files changed, 5 insertions(+) + +diff --git a/source/lib/att-tool/att_lib_wrapper.hpp b/source/lib/att-tool/att_lib_wrapper.hpp +index e7e58c5991..7dcd000a43 100644 +--- a/source/lib/att-tool/att_lib_wrapper.hpp ++++ b/source/lib/att-tool/att_lib_wrapper.hpp +@@ -28,9 +28,11 @@ + #include + + #include ++#include + #include + #include + #include ++#include + #include + + namespace rocprofiler +diff --git a/source/lib/rocprofiler-sdk-rocpd/sql.cpp b/source/lib/rocprofiler-sdk-rocpd/sql.cpp +index b052ec51c3..7e8742686e 100644 +--- a/source/lib/rocprofiler-sdk-rocpd/sql.cpp ++++ b/source/lib/rocprofiler-sdk-rocpd/sql.cpp +@@ -39,6 +39,7 @@ + #include + + #include ++#include + #include + #include + +diff --git a/source/lib/rocprofiler-sdk/counters/metrics.cpp b/source/lib/rocprofiler-sdk/counters/metrics.cpp +index 8adcf0f991..ee3391e904 100644 +--- a/source/lib/rocprofiler-sdk/counters/metrics.cpp ++++ b/source/lib/rocprofiler-sdk/counters/metrics.cpp +@@ -46,6 +46,7 @@ + #include // for dladdr + #include + #include ++#include + #include + #include + #include +diff --git a/source/lib/rocprofiler-sdk/tests/status.cpp b/source/lib/rocprofiler-sdk/tests/status.cpp +index a5a492101d..b01f511b99 100644 +--- a/source/lib/rocprofiler-sdk/tests/status.cpp ++++ b/source/lib/rocprofiler-sdk/tests/status.cpp +@@ -25,6 +25,7 @@ + + #include + ++#include + #include + + TEST(rocprofiler_lib, error_string) +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch new file mode 100644 index 000000000000..47944043df68 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch @@ -0,0 +1,190 @@ +From c767eafb393294214e9d25142a9eebebf234892b Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 21:20:32 +0000 +Subject: [PATCH] [rocprofiler-sdk] add missing + rocprofiler-sdk::rocprofiler-sdk-amd-comgr dependencies + +These targets, mostly tests, were missing dependencies on amd comgr. +--- + .../lib/att-tool/waitcnt/tests/CMakeLists.txt | 1 + + source/lib/python/utilities.cmake | 3 ++- + .../counters/tests/CMakeLists.txt | 13 +++++++++--- + .../pc_sampling/parser/tests/CMakeLists.txt | 20 ++++++++++++++----- + .../pc_sampling/tests/CMakeLists.txt | 4 +++- + .../lib/rocprofiler-sdk/tests/CMakeLists.txt | 2 ++ + .../thread_trace/tests/CMakeLists.txt | 1 + + 7 files changed, 34 insertions(+), 10 deletions(-) + +diff --git a/source/lib/att-tool/waitcnt/tests/CMakeLists.txt b/source/lib/att-tool/waitcnt/tests/CMakeLists.txt +index 4cc800600e..88dbeaf15a 100644 +--- a/source/lib/att-tool/waitcnt/tests/CMakeLists.txt ++++ b/source/lib/att-tool/waitcnt/tests/CMakeLists.txt +@@ -17,6 +17,7 @@ target_link_libraries( + rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-glog + rocprofiler-sdk::rocprofiler-sdk-static-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr + GTest::gtest + GTest::gtest_main) + +diff --git a/source/lib/python/utilities.cmake b/source/lib/python/utilities.cmake +index 8f51fe971b..e527278f38 100644 +--- a/source/lib/python/utilities.cmake ++++ b/source/lib/python/utilities.cmake +@@ -211,7 +211,8 @@ function(rocprofiler_rocpd_python_bindings _VERSION) + rocprofiler-sdk::rocprofiler-sdk-gotcha + rocprofiler-sdk::rocprofiler-sdk-dw + rocprofiler-sdk::rocprofiler-sdk-static-library +- rocprofiler-sdk::rocprofiler-sdk-rocpd-library) ++ rocprofiler-sdk::rocprofiler-sdk-rocpd-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr) + + # if "Development" is specified instead of "Development.Module", we need to link to + # python libraries +diff --git a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt +index 824a5c7ae0..5f0bdf313f 100644 +--- a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt ++++ b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt +@@ -55,6 +55,7 @@ target_sources( + target_link_libraries( + counter_test_constants + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + rocprofiler-sdk::rocprofiler-sdk-hip + rocprofiler-sdk::rocprofiler-sdk-hsa-runtime) +@@ -77,6 +78,7 @@ target_link_libraries( + rocprofiler-sdk::rocprofiler-sdk-hsa-runtime + rocprofiler-sdk::rocprofiler-sdk-hip + rocprofiler-sdk::rocprofiler-sdk-common-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest + GTest::gtest_main) +@@ -111,9 +113,14 @@ add_executable(consumer-tests) + target_sources(consumer-tests PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES}) + + target_link_libraries( +- consumer-tests rocprofiler-sdk::rocprofiler-sdk-hsa-runtime +- rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main) ++ consumer-tests ++ rocprofiler-sdk::rocprofiler-sdk-hsa-runtime ++ rocprofiler-sdk::rocprofiler-sdk-hip ++ rocprofiler-sdk::rocprofiler-sdk-common-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest ++ GTest::gtest_main) + + rocprofiler_add_unit_test( + TARGET consumer-tests +diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt +index 46feb0cf51..8a8168186e 100644 +--- a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt ++++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt +@@ -30,7 +30,9 @@ target_include_directories(pcs_gfx9_test PRIVATE ${PCTEST_INCLUDE_DIR}) + target_link_libraries( + pcs_gfx9_test + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest + GTest::gtest_main) + + rocprofiler_add_unit_test( +@@ -50,7 +52,9 @@ target_include_directories(pcs_id_test PRIVATE ${PCTEST_INCLUDE_DIR}) + target_link_libraries( + pcs_id_test + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest + GTest::gtest_main) + + rocprofiler_add_unit_test( +@@ -72,7 +76,9 @@ target_include_directories(pcs_bench_test PRIVATE ${PCTEST_INCLUDE_DIR}) + target_link_libraries( + pcs_bench_test + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest + GTest::gtest_main) + + add_executable(pcs_thread_test) +@@ -85,7 +91,9 @@ target_include_directories(pcs_thread_test PRIVATE ${PCTEST_INCLUDE_DIR}) + target_link_libraries( + pcs_thread_test + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest + GTest::gtest_main) + + rocprofiler_add_unit_test( +@@ -106,7 +114,9 @@ target_include_directories(pcs_gfx12_test PRIVATE ${PCTEST_INCLUDE_DIR}) + target_link_libraries( + pcs_gfx12_test + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest + GTest::gtest_main) + + rocprofiler_add_unit_test( +diff --git a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt +index 4f91344f06..2268cd9eba 100644 +--- a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt ++++ b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt +@@ -16,7 +16,9 @@ target_sources(pcs-test PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_TEST_SOURCES} + target_link_libraries( + pcs-test + PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library +- rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr ++ rocprofiler-sdk::rocprofiler-sdk-static-library ++ GTest::gtest + GTest::gtest_main) + + rocprofiler_add_unit_test( +diff --git a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt +index 3a33b6b547..15f1728955 100644 +--- a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt ++++ b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt +@@ -30,6 +30,7 @@ target_link_libraries( + rocprofiler-sdk-lib-tests + PRIVATE rocprofiler-sdk::rocprofiler-sdk-static-library + rocprofiler-sdk::rocprofiler-sdk-common-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::counter-test-constants + rocprofiler-sdk::rocprofiler-sdk-hsa-runtime + rocprofiler-sdk::rocprofiler-sdk-drm +@@ -64,6 +65,7 @@ target_link_libraries( + rocprofiler-sdk-lib-tests-shared + PRIVATE rocprofiler-sdk::rocprofiler-sdk-shared-library + rocprofiler-sdk::rocprofiler-sdk-common-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-hsa-runtime + rocprofiler-sdk::rocprofiler-sdk-drm + rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library +diff --git a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt +index 410fa84eb4..7ce4c73e20 100644 +--- a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt ++++ b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt +@@ -15,6 +15,7 @@ target_link_libraries( + rocprofiler-sdk::rocprofiler-sdk-hsa-runtime + rocprofiler-sdk::rocprofiler-sdk-hip + rocprofiler-sdk::rocprofiler-sdk-common-library ++ rocprofiler-sdk::rocprofiler-sdk-amd-comgr + GTest::gtest + GTest::gtest_main + rocprofiler-sdk::counter-test-constants) +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch new file mode 100644 index 000000000000..dd9480b04070 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch @@ -0,0 +1,89 @@ +From 33058e85d1ee985f9b622bbb2a48199eb55afc20 Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 21:34:58 +0000 +Subject: [PATCH] [rocprofiler-sdk] fix find_package dependency scoping issues + +By default, find_package() packages are only made visible to the current +scope. add_subdirectory() enters a new scope, so the packages searched for +in external/CMakeLists.txt are not visible in any other CMake files. This +causes dependency errors for these dependencies. find_package() packages can +be made visible to the entire project by supplying the GLOBAL argument. + +The GLOBAL keyword was added in CMake version 3.24, hence the minimum required +version is also bumped. Other projects across rocm-systems (rocprofiler-register) +also already require CMake 3.24, so that should not cause any problems. + +See https://github.com/ROCm/rocm-systems/pull/1243, that change fixes the +same problem in rocprofiler-register. +--- + CMakeLists.txt | 2 +- + external/CMakeLists.txt | 8 ++++---- + requirements.txt | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25f335afb3..0d86e05170 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.21 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.24 FATAL_ERROR) + + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND CMAKE_CURRENT_SOURCE_DIR STREQUAL + CMAKE_SOURCE_DIR) +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index cab59c07bd..fcc872d118 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -64,7 +64,7 @@ if(ROCPROFILER_BUILD_TESTS) + mark_as_advanced(BUILD_GMOCK) + mark_as_advanced(GTEST_HAS_ABSL) + else() +- find_package(GTest REQUIRED) ++ find_package(GTest REQUIRED GLOBAL) + target_link_libraries(rocprofiler-sdk-gtest INTERFACE GTest::gtest) + endif() + endif() +@@ -90,7 +90,7 @@ if(ROCPROFILER_BUILD_GLOG) + INTERFACE $ + $) + else() +- find_package(glog REQUIRED) ++ find_package(glog REQUIRED GLOBAL) + target_link_libraries(rocprofiler-sdk-glog INTERFACE glog::glog) + endif() + +@@ -111,7 +111,7 @@ if(ROCPROFILER_BUILD_FMT) + rocprofiler-sdk-fmt SYSTEM + INTERFACE $) + else() +- find_package(fmt REQUIRED) ++ find_package(fmt REQUIRED GLOBAL) + target_link_libraries(rocprofiler-sdk-fmt INTERFACE fmt::fmt) + endif() + +@@ -147,7 +147,7 @@ if(ROCPROFILER_BUILD_YAML_CPP) + rocprofiler-sdk-yaml-cpp + INTERFACE $) + else() +- find_package(yaml-cpp 0.8.0 REQUIRED) ++ find_package(yaml-cpp 0.8.0 REQUIRED GLOBAL) + target_link_libraries(rocprofiler-sdk-yaml-cpp INTERFACE yaml-cpp::yaml-cpp) + endif() + +diff --git a/requirements.txt b/requirements.txt +index de7421da0d..3eb60c088b 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,7 +1,7 @@ + black + clang-format>=11.0.0,<12.0.0 + clang-tidy>=15.0.0,<20.0.0 +-cmake>=3.21.0 ++cmake>=3.24.0 + cmake-format + dataclasses + flake8 +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch new file mode 100644 index 000000000000..9652b8eb2170 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch @@ -0,0 +1,76 @@ +From 40b1abf9d3ec8eb3f798946263f144988fa3a416 Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 21:50:57 +0000 +Subject: [PATCH] [rocprofiler-sdk] allow using system elfio dependency + +This adds a new option, ROCPROFILER_BUILD_ELFIO, which can be set to OFF to +make rocprofiler use a system dependency for ELFIO instead of trying to build +it manually. To mimick old behavior, ROCPROFILER_BUILD_ELFIO is set to ON by +default. + +Related: https://github.com/ROCm/rocm-systems/pull/2319 +--- + cmake/rocprofiler_options.cmake | 2 ++ + external/CMakeLists.txt | 33 +++++++++++++++++++-------------- + 2 files changed, 21 insertions(+), 14 deletions(-) + +diff --git a/cmake/rocprofiler_options.cmake b/cmake/rocprofiler_options.cmake +index c29311cc8c..da9ee9ad29 100644 +--- a/cmake/rocprofiler_options.cmake ++++ b/cmake/rocprofiler_options.cmake +@@ -67,6 +67,8 @@ rocprofiler_add_option(ROCPROFILER_BUILD_GOTCHA + "Enable building gotcha library internally" ON) + rocprofiler_add_option(ROCPROFILER_BUILD_YAML_CPP + "Enable building yaml-cpp library internally" ON) ++rocprofiler_add_option(ROCPROFILER_BUILD_ELFIO "Enable building ELFIO library internally" ++ ON) + if(ROCPROFILER_BUILD_TESTS) + rocprofiler_add_option( + ROCPROFILER_BUILD_GTEST +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index fcc872d118..ade8d25c1b 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -201,20 +201,25 @@ target_link_libraries( + INTERFACE $) + + # ELFIO +-rocprofiler_checkout_git_submodule( +- RECURSIVE +- RELATIVE_PATH external/elfio +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} +- REPO_URL https://github.com/serge1/ELFIO.git +- REPO_BRANCH "Release_3.12") +- +-set(ELFIO_BUILD_EXAMPLES OFF) +-set(ELFIO_BUILD_TESTS OFF) +-add_subdirectory(elfio EXCLUDE_FROM_ALL) +-if(TARGET rocprofiler-sdk-elfio) +- get_target_property(ELFIO_INCLUDE_DIR elfio::elfio INTERFACE_INCLUDE_DIRECTORIES) +- target_include_directories(rocprofiler-sdk-elfio SYSTEM +- INTERFACE ${ELFIO_INCLUDE_DIR}) ++if(ROCPROFILER_BUILD_ELFIO) ++ rocprofiler_checkout_git_submodule( ++ RECURSIVE ++ RELATIVE_PATH external/elfio ++ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ++ REPO_URL https://github.com/serge1/ELFIO.git ++ REPO_BRANCH "Release_3.12") ++ ++ set(ELFIO_BUILD_EXAMPLES OFF) ++ set(ELFIO_BUILD_TESTS OFF) ++ add_subdirectory(elfio EXCLUDE_FROM_ALL) ++ if(TARGET rocprofiler-sdk-elfio) ++ get_target_property(ELFIO_INCLUDE_DIR elfio::elfio INTERFACE_INCLUDE_DIRECTORIES) ++ target_include_directories(rocprofiler-sdk-elfio SYSTEM ++ INTERFACE ${ELFIO_INCLUDE_DIR}) ++ endif() ++else() ++ find_package(elfio REQUIRED GLOBAL) ++ target_link_libraries(rocprofiler-sdk-elfio INTERFACE elfio::elfio) + endif() + + # +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch new file mode 100644 index 000000000000..5eab70166b33 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch @@ -0,0 +1,53 @@ +From 0f81ad1a46df9da7c9653812eded2165d0cd794d Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 21:58:13 +0000 +Subject: [PATCH] [rocprofiler-sdk] allow using system otf2 dependency + +This adds a new option, ROCPROFILER_BUILD_OTF2, which can be set to OFF to +make rocprofiler-sdk use a system dependency for OTF2 instead of trying to +build it manually. To mimick old behavior, ROCPROFILER_BUILD_OTF2 is set to +ON by default. + +Related: https://github.com/ROCm/rocm-systems/pull/2319 +--- + cmake/rocprofiler_options.cmake | 2 ++ + external/CMakeLists.txt | 10 +++++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/cmake/rocprofiler_options.cmake b/cmake/rocprofiler_options.cmake +index da9ee9ad29..077898a520 100644 +--- a/cmake/rocprofiler_options.cmake ++++ b/cmake/rocprofiler_options.cmake +@@ -69,6 +69,8 @@ rocprofiler_add_option(ROCPROFILER_BUILD_YAML_CPP + "Enable building yaml-cpp library internally" ON) + rocprofiler_add_option(ROCPROFILER_BUILD_ELFIO "Enable building ELFIO library internally" + ON) ++rocprofiler_add_option(ROCPROFILER_BUILD_OTF2 "Enable building OTF2 library internally" ++ ON) + if(ROCPROFILER_BUILD_TESTS) + rocprofiler_add_option( + ROCPROFILER_BUILD_GTEST +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index ade8d25c1b..0c5d4e5fe5 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -225,7 +225,15 @@ endif() + # + # OTF2 + # +-add_subdirectory(otf2) ++if(ROCPROFILER_BUILD_OTF2) ++ add_subdirectory(otf2) ++else() ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(OTF2 REQUIRED IMPORTED_TARGET otf2) ++ add_library(otf2 INTERFACE) ++ add_library(otf2::otf2 ALIAS otf2) ++ target_link_libraries(otf2 INTERFACE PkgConfig::OTF2) ++endif() + + rocprofiler_checkout_git_submodule( + RECURSIVE +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch new file mode 100644 index 000000000000..57d77fdf14df --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch @@ -0,0 +1,73 @@ +From fda4ff3c2389a5a8b57d44fd9be715ade37d576e Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 22:01:44 +0000 +Subject: [PATCH] [rocprofiler-sdk] Allow using system json dependency + +This adds a new option, ROCPROFILER_BUILD_JSON, which can be set to OFF to +make rocprofiler-sdk use a system dependency for nlohmann_json instead of trying +to build it manually. To mimick old behavior, ROCPROFILER_BUILD_JSON is set to +ON by default. + +Related: https://github.com/ROCm/rocm-systems/pull/2319 +--- + cmake/rocprofiler_options.cmake | 2 ++ + external/CMakeLists.txt | 27 ++++++++++++++++----------- + 2 files changed, 18 insertions(+), 11 deletions(-) + +diff --git a/cmake/rocprofiler_options.cmake b/cmake/rocprofiler_options.cmake +index 077898a520..e35a41c95c 100644 +--- a/cmake/rocprofiler_options.cmake ++++ b/cmake/rocprofiler_options.cmake +@@ -71,6 +71,8 @@ rocprofiler_add_option(ROCPROFILER_BUILD_ELFIO "Enable building ELFIO library in + ON) + rocprofiler_add_option(ROCPROFILER_BUILD_OTF2 "Enable building OTF2 library internally" + ON) ++rocprofiler_add_option(ROCPROFILER_BUILD_JSON "Enable building JSON library internally" ++ ON) + if(ROCPROFILER_BUILD_TESTS) + rocprofiler_add_option( + ROCPROFILER_BUILD_GTEST +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 0c5d4e5fe5..b943be5ad6 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -235,20 +235,25 @@ else() + target_link_libraries(otf2 INTERFACE PkgConfig::OTF2) + endif() + +-rocprofiler_checkout_git_submodule( +- RECURSIVE +- RELATIVE_PATH external/json +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} +- REPO_URL https://github.com/nlohmann/json.git +- REPO_BRANCH "develop") +- + # + # JSON + # +-add_subdirectory(json) +-target_include_directories( +- rocprofiler-sdk-json SYSTEM +- INTERFACE $) ++if(ROCPROFILER_BUILD_JSON) ++ rocprofiler_checkout_git_submodule( ++ RECURSIVE ++ RELATIVE_PATH external/json ++ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ++ REPO_URL https://github.com/nlohmann/json.git ++ REPO_BRANCH "develop") ++ ++ add_subdirectory(json) ++ target_include_directories( ++ rocprofiler-sdk-json SYSTEM ++ INTERFACE $) ++else() ++ find_package(nlohmann_json REQUIRED GLOBAL) ++ target_link_libraries(rocprofiler-sdk-json INTERFACE nlohmann_json::nlohmann_json) ++endif() + + # + # SQLite3 +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch b/pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch new file mode 100644 index 000000000000..33caf8a3561f --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch @@ -0,0 +1,269 @@ +From ae4cffc06a368893d91be2739bb6482182681efc Mon Sep 17 00:00:00 2001 +From: Robin Voetter +Date: Sat, 4 Apr 2026 22:22:56 +0000 +Subject: [PATCH] [rocprofiler-sdk] stop manually setting warning flags on + integration tests + +The primary motivation for this change is that -Werror is added to the compiler +options unconditionally, which causes problems when compiling these tests during +downstream packaging builds. The rocprofiler-sdk::tests-build-flags and +rocprofiler-sdk::tests-common targets already include these warning flags, and this +target also already handles setting -Werror conditionally based on ROCPROF_BUILD_WERROR. +Some integration tests also set -Wpedantic, these have been left as-is. When +ROCPROF_BUILD_WERROR is set to ON (default), behavior is the same as before this commit. +--- + tests/bin/attachment-test/CMakeLists.txt | 6 +++--- + tests/bin/hip-graph/CMakeLists.txt | 5 +++-- + tests/bin/hip-in-libraries/CMakeLists.txt | 6 +++--- + tests/bin/hsa-code-object/CMakeLists.txt | 1 - + tests/bin/hsa-memory-allocation/CMakeLists.txt | 3 +-- + tests/bin/hsa-queue-dependency/CMakeLists.txt | 1 - + tests/bin/multistream/CMakeLists.txt | 5 +++-- + .../bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt | 6 +++--- + tests/bin/reproducible-dispatch-count/CMakeLists.txt | 8 ++++---- + tests/bin/reproducible-runtime/CMakeLists.txt | 8 ++++---- + tests/bin/scratch-memory/CMakeLists.txt | 3 +-- + tests/bin/simple-transpose/CMakeLists.txt | 8 ++++---- + tests/bin/transpose/CMakeLists.txt | 2 +- + tests/bin/vector-operations/CMakeLists.txt | 2 +- + 14 files changed, 31 insertions(+), 33 deletions(-) + +diff --git a/tests/bin/attachment-test/CMakeLists.txt b/tests/bin/attachment-test/CMakeLists.txt +index 332f5e551a..50c644942d 100644 +--- a/tests/bin/attachment-test/CMakeLists.txt ++++ b/tests/bin/attachment-test/CMakeLists.txt +@@ -42,8 +42,8 @@ find_package(rocprofiler-sdk-roctx REQUIRED) + set_source_files_properties(attachment_test.cpp PROPERTIES LANGUAGE HIP) + add_executable(attachment-test) + target_sources(attachment-test PRIVATE attachment_test.cpp) +-target_compile_options(attachment-test PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow +- -Werror) ++target_compile_options(attachment-test PRIVATE -Wpedantic) + + target_link_libraries( +- attachment-test PRIVATE Threads::Threads rocprofiler-sdk-roctx::rocprofiler-sdk-roctx) ++ attachment-test PRIVATE Threads::Threads rocprofiler-sdk-roctx::rocprofiler-sdk-roctx ++ rocprofiler-sdk::tests-build-flags) +diff --git a/tests/bin/hip-graph/CMakeLists.txt b/tests/bin/hip-graph/CMakeLists.txt +index e4d984b68a..dfa9233097 100644 +--- a/tests/bin/hip-graph/CMakeLists.txt ++++ b/tests/bin/hip-graph/CMakeLists.txt +@@ -35,10 +35,11 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(hip-graph.cpp PROPERTIES LANGUAGE HIP) + add_executable(hip-graph) + target_sources(hip-graph PRIVATE hip-graph.cpp) +-target_compile_options(hip-graph PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror) ++target_compile_options(hip-graph PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) +-target_link_libraries(hip-graph PRIVATE Threads::Threads) ++target_link_libraries(hip-graph PRIVATE Threads::Threads ++ rocprofiler-sdk::tests-build-flags) + + # find_package(rocprofiler-sdk-roctx REQUIRED) target_link_libraries(hip-graph PRIVATE + # rocprofiler-sdk-roctx::rocprofiler-sdk-roctx) +diff --git a/tests/bin/hip-in-libraries/CMakeLists.txt b/tests/bin/hip-in-libraries/CMakeLists.txt +index d908704604..5f5d92b80a 100644 +--- a/tests/bin/hip-in-libraries/CMakeLists.txt ++++ b/tests/bin/hip-in-libraries/CMakeLists.txt +@@ -11,8 +11,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + + add_executable(hip-in-libraries) + target_sources(hip-in-libraries PRIVATE hip-in-libraries.cpp) +-target_compile_options(hip-in-libraries PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow +- -Werror) ++target_compile_options(hip-in-libraries PRIVATE -Wpedantic) + target_link_libraries(hip-in-libraries PRIVATE transpose-shared-library + vector-ops-shared-library) + +@@ -20,7 +19,8 @@ find_package(hip REQUIRED) + target_link_libraries(hip-in-libraries PRIVATE hip::host) + + find_package(Threads REQUIRED) +-target_link_libraries(hip-in-libraries PRIVATE Threads::Threads) ++target_link_libraries(hip-in-libraries PRIVATE Threads::Threads ++ rocprofiler-sdk::tests-build-flags) + + if(TRANSPOSE_USE_MPI) + find_package(MPI REQUIRED) +diff --git a/tests/bin/hsa-code-object/CMakeLists.txt b/tests/bin/hsa-code-object/CMakeLists.txt +index 2e11314509..099606dc26 100644 +--- a/tests/bin/hsa-code-object/CMakeLists.txt ++++ b/tests/bin/hsa-code-object/CMakeLists.txt +@@ -72,7 +72,6 @@ add_custom_target(generate_hsaco_targets_code_object DEPENDS ${HSACO_TARGET_LIST + + add_executable(hsa_code_object_testapp) + target_sources(hsa_code_object_testapp PRIVATE hsa_code_object_app.cpp) +-target_compile_options(hsa_code_object_testapp PRIVATE -W -Wall -Wextra -Wshadow -Werror) + + find_package(Threads REQUIRED) + target_link_libraries(hsa_code_object_testapp PRIVATE stdc++fs Threads::Threads) +diff --git a/tests/bin/hsa-memory-allocation/CMakeLists.txt b/tests/bin/hsa-memory-allocation/CMakeLists.txt +index 485b866209..b0d12490b6 100644 +--- a/tests/bin/hsa-memory-allocation/CMakeLists.txt ++++ b/tests/bin/hsa-memory-allocation/CMakeLists.txt +@@ -35,8 +35,7 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(hsa-memory-allocation.cpp PROPERTIES LANGUAGE HIP) + add_executable(hsa-memory-allocation) + target_sources(hsa-memory-allocation PRIVATE hsa-memory-allocation.cpp) +-target_compile_options(hsa-memory-allocation PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow +- -Werror) ++target_compile_options(hsa-memory-allocation PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) + target_link_libraries(hsa-memory-allocation PRIVATE Threads::Threads hsa-runtime64 +diff --git a/tests/bin/hsa-queue-dependency/CMakeLists.txt b/tests/bin/hsa-queue-dependency/CMakeLists.txt +index 6753da98f2..e02b57f802 100644 +--- a/tests/bin/hsa-queue-dependency/CMakeLists.txt ++++ b/tests/bin/hsa-queue-dependency/CMakeLists.txt +@@ -49,7 +49,6 @@ add_custom_target(generate_hsaco_targets DEPENDS ${HSACO_TARGET_LIST}) + + add_executable(multiqueue_testapp) + target_sources(multiqueue_testapp PRIVATE multiqueue_app.cpp) +-target_compile_options(multiqueue_testapp PRIVATE -W -Wall -Wextra -Wshadow -Werror) + + find_package(Threads REQUIRED) + target_link_libraries(multiqueue_testapp PRIVATE stdc++fs Threads::Threads) +diff --git a/tests/bin/multistream/CMakeLists.txt b/tests/bin/multistream/CMakeLists.txt +index 13ef8dee31..37c837976d 100644 +--- a/tests/bin/multistream/CMakeLists.txt ++++ b/tests/bin/multistream/CMakeLists.txt +@@ -35,7 +35,8 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(multistream_app.cpp PROPERTIES LANGUAGE HIP) + add_executable(multistream) + target_sources(multistream PRIVATE multistream_app.cpp) +-target_compile_options(multistream PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror) ++target_compile_options(multistream PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) +-target_link_libraries(multistream PRIVATE Threads::Threads) ++target_link_libraries(multistream PRIVATE Threads::Threads ++ rocprofiler-sdk::tests-build-flags) +diff --git a/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt b/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt +index 1e84318f63..aa5d9c88a0 100644 +--- a/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt ++++ b/tests/bin/pc-sampling/exec-mask-manipulation/CMakeLists.txt +@@ -36,8 +36,8 @@ set_source_files_properties(exec_mask_manipulation.cpp PROPERTIES LANGUAGE HIP) + add_executable(exec-mask-manipulation) + target_sources(exec-mask-manipulation PRIVATE exec_mask_manipulation.cpp) + # debug symbols required for PC sampling decoding validation +-target_compile_options(exec-mask-manipulation PRIVATE -W -Wall -Wextra -Wpedantic +- -Wshadow -Werror -g) ++target_compile_options(exec-mask-manipulation PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) +-target_link_libraries(exec-mask-manipulation PRIVATE Threads::Threads) ++target_link_libraries(exec-mask-manipulation PRIVATE Threads::Threads ++ rocprofiler-sdk::tests-build-flags) +diff --git a/tests/bin/reproducible-dispatch-count/CMakeLists.txt b/tests/bin/reproducible-dispatch-count/CMakeLists.txt +index df10dd7e3f..40fd04cdfc 100644 +--- a/tests/bin/reproducible-dispatch-count/CMakeLists.txt ++++ b/tests/bin/reproducible-dispatch-count/CMakeLists.txt +@@ -42,15 +42,15 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(reproducible-dispatch-count.cpp PROPERTIES LANGUAGE HIP) + add_executable(reproducible-dispatch-count) + target_sources(reproducible-dispatch-count PRIVATE reproducible-dispatch-count.cpp) +-target_compile_options(reproducible-dispatch-count PRIVATE -W -Wall -Wextra -Wpedantic +- -Wshadow -Werror) ++target_compile_options(reproducible-dispatch-count PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) + target_link_libraries(reproducible-dispatch-count PRIVATE Threads::Threads) + + find_package(rocprofiler-sdk-roctx REQUIRED) +-target_link_libraries(reproducible-dispatch-count +- PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx) ++target_link_libraries( ++ reproducible-dispatch-count PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx ++ rocprofiler-sdk::tests-build-flags) + + if(REPRODUCIBLE_DISPATCH_COUNT_USE_MPI) + find_package(MPI REQUIRED) +diff --git a/tests/bin/reproducible-runtime/CMakeLists.txt b/tests/bin/reproducible-runtime/CMakeLists.txt +index 721b1e190b..4a65e9d60d 100644 +--- a/tests/bin/reproducible-runtime/CMakeLists.txt ++++ b/tests/bin/reproducible-runtime/CMakeLists.txt +@@ -41,15 +41,15 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(reproducible-runtime.cpp PROPERTIES LANGUAGE HIP) + add_executable(reproducible-runtime) + target_sources(reproducible-runtime PRIVATE reproducible-runtime.cpp) +-target_compile_options(reproducible-runtime PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow +- -Werror) ++target_compile_options(reproducible-runtime PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) + target_link_libraries(reproducible-runtime PRIVATE Threads::Threads) + + find_package(rocprofiler-sdk-roctx REQUIRED) +-target_link_libraries(reproducible-runtime +- PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx) ++target_link_libraries( ++ reproducible-runtime PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx ++ rocprofiler-sdk::tests-build-flags) + + if(REPRODUCIBLE_RUNTIME_USE_MPI) + find_package(MPI REQUIRED) +diff --git a/tests/bin/scratch-memory/CMakeLists.txt b/tests/bin/scratch-memory/CMakeLists.txt +index 06ba7ddadb..419830ec51 100644 +--- a/tests/bin/scratch-memory/CMakeLists.txt ++++ b/tests/bin/scratch-memory/CMakeLists.txt +@@ -35,8 +35,7 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(scratch-memory.cpp PROPERTIES LANGUAGE HIP) + add_executable(scratch-memory) + target_sources(scratch-memory PRIVATE scratch-memory.cpp) +-target_compile_options(scratch-memory PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow +- -Werror) ++target_compile_options(scratch-memory PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) + target_link_libraries(scratch-memory PRIVATE Threads::Threads hsa-runtime64 +diff --git a/tests/bin/simple-transpose/CMakeLists.txt b/tests/bin/simple-transpose/CMakeLists.txt +index 41f4954e79..6370289c4a 100644 +--- a/tests/bin/simple-transpose/CMakeLists.txt ++++ b/tests/bin/simple-transpose/CMakeLists.txt +@@ -35,12 +35,12 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(simple-transpose.cpp PROPERTIES LANGUAGE HIP) + add_executable(simple-transpose) + target_sources(simple-transpose PRIVATE simple-transpose.cpp) +-target_compile_options(simple-transpose PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow +- -Werror) ++target_compile_options(simple-transpose PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) + target_link_libraries(simple-transpose PRIVATE Threads::Threads) + + find_package(rocprofiler-sdk-roctx REQUIRED) +-target_link_libraries(simple-transpose +- PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx) ++target_link_libraries( ++ simple-transpose PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx ++ rocprofiler-sdk::tests-build-flags) +diff --git a/tests/bin/transpose/CMakeLists.txt b/tests/bin/transpose/CMakeLists.txt +index 7d85195a9a..8c98307329 100644 +--- a/tests/bin/transpose/CMakeLists.txt ++++ b/tests/bin/transpose/CMakeLists.txt +@@ -40,7 +40,7 @@ function(transpose_build_target _NAME _COMPILE_DEFS _LINK_TARGETS) + add_executable(${_NAME}) + target_sources(${_NAME} PRIVATE transpose.cpp) + target_compile_definitions(${_NAME} PRIVATE ${_COMPILE_DEFS}) +- target_compile_options(${_NAME} PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror) ++ target_compile_options(${_NAME} PRIVATE -Wpedantic) + target_link_libraries( + ${_NAME} PRIVATE Threads::Threads rocprofiler-sdk::tests-build-flags + ${_LINK_TARGETS}) +diff --git a/tests/bin/vector-operations/CMakeLists.txt b/tests/bin/vector-operations/CMakeLists.txt +index efd16ab04d..9fa1d8fb96 100644 +--- a/tests/bin/vector-operations/CMakeLists.txt ++++ b/tests/bin/vector-operations/CMakeLists.txt +@@ -35,7 +35,7 @@ set(CMAKE_HIP_STANDARD_REQUIRED ON) + set_source_files_properties(vector-ops.cpp PROPERTIES LANGUAGE HIP) + add_executable(vector-ops) + target_sources(vector-ops PRIVATE vector-ops.cpp) +-target_compile_options(vector-ops PRIVATE -W -Wall -Wextra -Wpedantic -Wshadow -Werror) ++target_compile_options(vector-ops PRIVATE -Wpedantic) + + find_package(Threads REQUIRED) + target_link_libraries(vector-ops PRIVATE Threads::Threads +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix b/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix new file mode 100644 index 000000000000..7e8cd74115f0 --- /dev/null +++ b/pkgs/development/rocm-modules/rocprofiler-sdk/default.nix @@ -0,0 +1,210 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + clr, + rocm-cmake, + rocm-runtime, + rocprofiler-register, + rocprof-trace-decoder, + aqlprofile, + rocm-comgr, + rccl, + python3, + python3Packages, + libdrm, + elfutils, + sqlite, + otf2, + zlib, + zstd, + xz, + numactl, + fmt, + glog, + gtest, + fetchpatch, + yaml-cpp, + elfio, + nlohmann_json, + makeWrapper, + gpuTargets ? (clr.localGpuTargets or clr.gpuTargets), + buildTests ? false, + buildSamples ? false, +}: + +# FIXME: devendor remaining git submodules: +# external/cereal -> https://github.com/jrmadsen/cereal +# external/gotcha -> https://github.com/jrmadsen/GOTCHA +# external/perfetto -> https://github.com/google/perfetto +# external/ptl -> https://github.com/jrmadsen/PTL + +# rocprofiler-sdk is the home of rocprofv3 +stdenv.mkDerivation (finalAttrs: { + pname = "rocprofiler-sdk"; + version = "7.2.1"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "ROCm"; + repo = "rocm-systems"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-P8c1/HtkdLlZRTMaOFhFF7a/0SlsOabnUwci1w1Svfc="; + fetchSubmodules = true; + sparseCheckout = [ + "projects/rocprofiler-sdk" + ]; + }; + sourceRoot = "${finalAttrs.src.name}/projects/rocprofiler-sdk"; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + clr + python3 + makeWrapper + ]; + + buildInputs = [ + clr + rocm-cmake + rocm-runtime + rocprofiler-register + aqlprofile + rocm-comgr + libdrm + elfutils + sqlite + otf2 + zlib + zstd + xz + numactl + fmt + glog + gtest + yaml-cpp + elfio + nlohmann_json + rccl + python3Packages.pybind11 + ]; + + patches = [ + (fetchpatch { + # [rocprofiler-sdk] Improve build with system libraries. + # https://github.com/ROCm/rocm-systems/pull/2319 + # Merged in develop branch, but not yet in ROCm 7.2.1. + url = "https://github.com/ROCm/rocm-systems/commit/86ee7b2eb2273adaf1181ef9a6b2091465c6f0c7.patch"; + hash = "sha256-PRmv8SI90jmO6MgJmk1DWf/WVmFy18nUTZClfOvI6a8="; + excludes = [ "external/fmt" ]; + relative = "projects/rocprofiler-sdk"; + }) + (fetchpatch { + # Users/mkuriche/rocprofiler sdk fmt build fix memory header + url = "https://github.com/ROCm/rocm-systems/commit/36d9d33d90879bfbd406498011070ebd929a56b1.patch"; + hash = "sha256-yRy5pmCX9hd4eeZIz/g3B5VFCL9idkEaGK+S5+2sOsk="; + relative = "projects/rocprofiler-sdk"; + }) + (fetchpatch { + # Fix missing amd_comgr linkage in pc-sampling integration test + url = "https://github.com/ROCm/rocm-systems/commit/94a4595a5d02bc066f7a32e1b2134a99a5231213.patch"; + hash = "sha256-86Fx0bKL0pvXTwVN8QJL+yzCbMYkmMaKzcU4PYcW6ig="; + relative = "projects/rocprofiler-sdk"; + }) + # See https://github.com/ROCm/rocm-systems/pull/4721 + # First change is separate and required to make the patches from that pull request + # apply cleanly. Its something that was changed on the develop branch, but requires + # more effort to backport. + ./0001-rocprofiler-sdk-rename-consumer-test-for-dependent-c.patch + ./0002-rocprofiler-sdk-add-missing-stl-headers.patch + ./0003-rocprofiler-sdk-add-missing-rocprofiler-sdk-rocprofi.patch + ./0004-rocprofiler-sdk-fix-find_package-dependency-scoping-.patch + ./0005-rocprofiler-sdk-allow-using-system-elfio-dependency.patch + ./0006-rocprofiler-sdk-allow-using-system-otf2-dependency.patch + ./0007-rocprofiler-sdk-Allow-using-system-json-dependency.patch + ./0008-rocprofiler-sdk-stop-manually-setting-warning-flags-.patch + ]; + + postPatch = '' + # NixOS' ROCm distribution does not support libomptarget yet + substituteInPlace samples/CMakeLists.txt \ + --replace-fail 'add_subdirectory(openmp_target)' '# add_subdirectory(openmp_target)' + substituteInPlace tests/CMakeLists.txt \ + --replace-fail 'add_subdirectory(openmp-tools)' '# add_subdirectory(openmp-tools)' + substituteInPlace tests/bin/CMakeLists.txt \ + --replace-fail 'add_subdirectory(openmp)' '# add_subdirectory(openmp)' + + # This requires building perfetto's trace-processor-shell via a weird external script + substituteInPlace tests/CMakeLists.txt \ + --replace-fail 'add_subdirectory(pytest-packages)' "" + + patchShebangs source/libexec/rocprofiler-sdk/rocprofiler-sdk-launch-compiler/rocprofiler-sdk-launch-compiler.sh + ''; + + cmakeFlags = [ + (lib.cmakeBool "ROCPROFILER_BUILD_GHC_FS" false) + (lib.cmakeBool "ROCPROFILER_BUILD_FMT" false) + (lib.cmakeBool "ROCPROFILER_BUILD_GLOG" false) + (lib.cmakeBool "ROCPROFILER_BUILD_GTEST" false) + (lib.cmakeBool "ROCPROFILER_BUILD_PYBIND11" false) + (lib.cmakeBool "ROCPROFILER_BUILD_YAML_CPP" false) + (lib.cmakeBool "ROCPROFILER_BUILD_ELFIO" false) + (lib.cmakeBool "ROCPROFILER_BUILD_OTF2" false) + (lib.cmakeBool "ROCPROFILER_BUILD_JSON" false) + (lib.cmakeBool "ROCPROFILER_BUILD_TESTS" buildTests) + (lib.cmakeBool "ROCPROFILER_BUILD_SAMPLES" buildSamples) + (lib.cmakeBool "ROCPROFILER_BUILD_BENCHMARK" false) + (lib.cmakeBool "ROCPROFILER_BUILD_WERROR" false) + # rocprofiler-sdk's CMake file doesn't add this dependency properly. + "-DCMAKE_HIP_FLAGS=-I${rocm-runtime}/include" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + # Required for rocprofiler-sdk-launch-compiler.sh + "-DCMAKE_INSTALL_LIBEXECDIR=libexec" + "--debug-find-pkg=amd_comgr" + "--trace-source=tests/pc_sampling/CMakeLists.txt" + "--trace-expand" + ] + ++ lib.optionals (buildTests || buildSamples) [ + # rocprofiler-sdk normally doesn't depend on which GPU is in the system, only when + # building tests or samples. + (lib.cmakeFeature "GPU_TARGETS" (lib.concatStringsSep ";" gpuTargets)) + ]; + + doCheck = false; # Requires GPU + + postFixup = '' + patchelf $out/lib/*.so \ + --add-rpath ${aqlprofile}/lib \ + --add-needed libhsa-amd-aqlprofile64.so + + wrapProgram $out/bin/rocprofv3 --add-flags "--att-library-path ${ + lib.makeLibraryPath [ rocprof-trace-decoder ] + }" + ''; + + postInstall = '' + mkdir -p $dev/lib $dev/share/rocprofiler-sdk + mv $out/lib/cmake $dev/lib/ + mv $out/share/rocprofiler-sdk/{samples,tests} $dev/share/rocprofiler-sdk/ + ''; + + meta = { + description = "ROCm GPU performance analysis SDK"; + homepage = "https://github.com/ROCm/rocprofiler-sdk"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix index bc4e71f62c3e..8d17ac71ae51 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix @@ -20,13 +20,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.15.0"; + version = "2.19.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_waste_collection_schedule"; - tag = version; - hash = "sha256-2uOeKB3ivvfsxiwUoGMlT2BFqIdTRKtr84G4QAX0uD0="; + tag = "v${version}"; + hash = "sha256-RkCgyjGetUbGa7F1AWVaXJ/lWAWA1m4SSxNV94EQyuY="; }; dependencies = [ @@ -49,7 +49,7 @@ buildHomeAssistantComponent rec { ]; meta = { - changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${version}"; + changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${src.tag}"; description = "Home Assistant integration framework for (garbage collection) schedules"; homepage = "https://github.com/mampfes/hacs_waste_collection_schedule"; maintainers = with lib.maintainers; [ jamiemagee ]; diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix index 9f2eb3166a9f..12a1053d3dae 100644 --- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "frser-sqlite-datasource"; - version = "4.0.1"; - zipHash = "sha256-hjjhNZlez8SXvpy91D/mtJHavH8oiLKgt/4a2vnI4fU="; + version = "4.0.2"; + zipHash = "sha256-soRmlYBhFhUoQmSGJC6mMP+UH7nqKzBTVItOk2WFggs="; meta = { description = "Use a SQLite database as a data source in Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 0ec1089779bc..2d3b5d87eb89 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "2.0.1"; - zipHash = "sha256-b4RhxdUFKi4VVHhEJKa09qwmIebGUK77p5aq+QG/Iqg="; + version = "2.0.3"; + zipHash = "sha256-K57ynUi6kRZIMaZD9rMa7aToue75fHAQBFPJLF1cy3o="; meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix index 1f66ac6ed142..ce5a4fda5677 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin { pname = "grafana-opensearch-datasource"; - version = "2.24.0"; + version = "2.33.0"; zipHash = { - x86_64-linux = "sha256-ZxlHl08pSqnVKZvVph5Bqjki7ukrV3UScJFRwW4y97o="; - aarch64-linux = "sha256-ZwPq3Xz4Rcm2JiAZnZ0D/Z6SamlCnj0/PgXeT6rrxcQ="; - x86_64-darwin = "sha256-HMifdRPl8RNb+m/eFaXATNRgDYLMG1UA6N/rWHMTR04="; - aarch64-darwin = "sha256-MLVyOeVZ42zJjLpOnGSa5ogGNa7rlcA4qjASCVeA3eU="; + x86_64-linux = "sha256-oxPw/cQ/AYTHB4Z/hdt3Jqn3XXnx+bo3uAq6qS7hd6g="; + aarch64-linux = "sha256-0bF2ebVF26iPIKs+oICeaBwm6K8TZGqTP6ONR+yDFvY="; + x86_64-darwin = "sha256-yGJLaNCAmdIN1uuzh/v+adda6IRmcCH+mpbxno8qK9k="; + aarch64-darwin = "sha256-Kxgq9HYXPW3+uEzJPy0kKDFCXrSFpCgZQ+whqx4XtJ8="; }; meta = { description = "Empowers you to seamlessly integrate JSON data into Grafana"; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index b8df247fa933..ffd593d22b7f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-form-panel"; - version = "6.3.1"; - zipHash = "sha256-HuzhTWey/6xLu6GPXGnN4/D3rs7yJ2sPGzO8PPuZmNA="; + version = "6.3.2"; + zipHash = "sha256-RuwZaAqSwMvWN15jz0+r7DuZyrE52zYD8EBffFTQNEg="; meta = { description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix index dabca7dd0e95..0b1dc3a3bb0e 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-variable-panel"; - version = "5.1.1"; - zipHash = "sha256-lLzOCgOh4a/Ee6QO5gJkJkHoPzylk9Y3vilXBtvn5G8="; + version = "5.1.2"; + zipHash = "sha256-cYDnrTSYjZV/2/q4/ztq8khaSkAeXu6fRasfT1bMzrw="; meta = { description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 6b1158e06aa0..fe21719eb84e 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -6,10 +6,8 @@ let stdenv, fetchFromGitHub, fetchurl, - fetchpatch2, lib, replaceVars, - writeShellScriptBin, # source specification hash, @@ -45,9 +43,7 @@ let buildPackages, newScope, nixosTests, - postgresqlTestHook, self, - stdenvNoCC, testers, # Block size diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix index 63f604d0d3bb..a19d9556bd42 100644 --- a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix +++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix @@ -6,13 +6,13 @@ }: buildFishPlugin { pname = "exercism-cli-fish-wrapper"; - version = "0-unstable-2026-02-23"; + version = "0-unstable-2026-04-06"; src = fetchFromGitHub { owner = "glennj"; repo = "exercism-cli-fish-wrapper"; - rev = "e81fe4cfd74864628e6244ef17d60ecfc1e5bcb0"; - hash = "sha256-bBAK3Ka0X1ilWIQjNkDA7fLht2jQfMWSIY/Fw4VVXbw="; + rev = "948357dbc5ed00054e9ec6aae48084ce56efa76e"; + hash = "sha256-bbOZmSz6UWSNk0R5TYcuJFNZq0JQlGGRBO8bUabN+zQ="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef56234f4bf9..0a5b07f5deb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1249,10 +1249,6 @@ with pkgs; gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { - protobuf = protobuf_21; - }; - image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; @@ -1568,8 +1564,6 @@ with pkgs; apprise = with python3Packages; toPythonApplication apprise; - asmrepl = callPackage ../development/interpreters/asmrepl { }; - avahi-compat = callPackage ../by-name/av/avahi/package.nix { withLibdnssdCompat = true; }; @@ -1792,10 +1786,6 @@ with pkgs; ghidra-bin = callPackage ../tools/security/ghidra { }; - gpg-tui = callPackage ../tools/security/gpg-tui { - inherit (darwin) libresolv; - }; - hocr-tools = with python3Packages; toPythonApplication hocr-tools; hopper = qt5.callPackage ../development/tools/analysis/hopper { }; @@ -2409,13 +2399,6 @@ with pkgs; }; gnupg = gnupg24; - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; - - gnuplot_qt = gnuplot.override { withQt = true; }; - - # must have AquaTerm installed separately - gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; - gnused = callPackage ../tools/text/gnused { }; gnutar = callPackage ../tools/archivers/gnutar { }; @@ -5721,8 +5704,6 @@ with pkgs; edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - license_finder = callPackage ../development/tools/license_finder { }; - # NOTE: Override and set useIcon = false to use Awk instead of Icon. fffuu = haskell.lib.compose.justStaticExecutables ( haskellPackages.callPackage ../tools/misc/fffuu { } @@ -8214,8 +8195,6 @@ with pkgs; nsdiff = perlPackages.nsdiff; - openafs = callPackage ../servers/openafs/1.8 { }; - openresty = callPackage ../servers/http/openresty { zlib-ng = zlib; withPerl = false; @@ -9508,12 +9487,6 @@ with pkgs; pname = "floorp-bin"; }; - formiko = - with python3Packages; - callPackage ../applications/editors/formiko { - inherit buildPythonApplication; - }; - inherit ({ freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; @@ -9595,15 +9568,9 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - gphoto2 = callPackage ../applications/misc/gphoto2 { }; - - gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; - graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; - q4wine = kdePackages.callPackage ../applications/misc/q4wine { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; gpsbabel-gui = gpsbabel.override { @@ -11420,12 +11387,6 @@ with pkgs; ### SCIENCE/CHEMISTY - avogadrolibs = callPackage ../development/libraries/science/chemistry/avogadrolibs { }; - - molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { }; - - avogadro2 = callPackage ../applications/science/chemistry/avogadro2 { }; - libxc_7 = pkgs.libxc.override { version = "7.0.0"; }; molbar = with python3Packages; toPythonApplication molbar; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index dd28c3df679b..42151b2f90bf 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -493,7 +493,7 @@ in rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null; - openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; + openafs_1_8 = callPackage ../by-name/op/openafs/module.nix { }; # Current stable release; don't backport release updates! openafs = openafs_1_8;