diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b607a65fd89d..c42987d53644 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -18,13 +18,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-kG6yGmhP0v7HiGPs2/SsOqhm+33XKfNQAKFJbPwBJG4=", + "hash": "sha256-Gi8Lpyl/gWGhMbHE27vtTiluMvs9o7UlNsaYs6c1ecQ=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.35.1", + "rev": "v2.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-W/867Ag40aeUQry3UtZXyN9HxxmRxnlgViX9IgkYN20=" + "vendorHash": "sha256-88WR4NT1JhJ3JQHcRQXHxTUvD00vRj3dDNPXViSYSUs=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -126,13 +126,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-McrDfdkmV6pvzMGSqLgPopQk2o3Gg3I/0Qfr5jVR4uw=", + "hash": "sha256-k2lbdaDt/jpkoF5jKll7ZxU+3zkspGvGx/kToqYipAo=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.13.0", + "rev": "v6.14.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-eci9CC5Gf0Wgfci1Yof9X7pCPcJiITwYxEcCzBcYDU0=" + "vendorHash": "sha256-hG1XnJtN95+jW6AGnV4+EkKaVZwG0PPTMLyHFQ3nXtc=" }, "awscc": { "hash": "sha256-1O7domWvsZR5/i+B5XMBaT/gWbr+bjxi0y++CVaX+y0=", @@ -525,13 +525,13 @@ "vendorHash": "sha256-29uvPCepGHRPohGY7viaPD9VQPPj9XB/plragACC4e4=" }, "google": { - "hash": "sha256-BDMOYw/NPCBb5VuJZGNbACJ/dq2uh+wx/y0w6LGWgwE=", + "hash": "sha256-xQW0UxGIcxD0Y4zdCBnGJhUWfWdMIERk0lkot96ztzI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.2.0", + "rev": "v7.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HavrYEqMGuJnZBQlVwZfZiXTISqALjjOHB8z1EpNkOE=" + "vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc=" }, "google-beta": { "hash": "sha256-HDTjSxx3TE69B7DvJbn/b67IH/S4IXvXGVTFwrgAWZE=", @@ -1138,11 +1138,11 @@ "vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU=" }, "rootly": { - "hash": "sha256-EPEzAftXvnusDQc9JBUHCmtuAsNFarl9yQl/fGekQ3w=", + "hash": "sha256-SRE1T9C3qggCwjl/PdehkabdnuRV8ZW58dc8zhSwPXo=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v3.6.2", + "rev": "v4.1.0", "spdx": "MPL-2.0", "vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA=" }, @@ -1327,13 +1327,13 @@ "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50=" }, "tailscale": { - "hash": "sha256-p96Jv4sIxWHWcpxcAWXASf2m06M7lsIvCCygM9KEALY=", + "hash": "sha256-3sStrkhEZqtR+G5kTFSx++Yxa26h00Y2fa8DI6/8ftY=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.21.1", + "rev": "v0.22.0", "spdx": "MIT", - "vendorHash": "sha256-nTKqpoJKabvtMDdI++Luq41vB0X2NWS6gufJbru2ZPI=" + "vendorHash": "sha256-Di4Mc67GrGue0fN47APjJKiWSCw5MRuYF4tS9hP6HLw=" }, "talos": { "hash": "sha256-PPD4blyXt4/IalzwEn4+lvuD1Qx7VuUD/CUJILDRI5k=", @@ -1363,13 +1363,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-wKHlkU/MmLoLjl3LbzYWK10Xl8c5Sb5ItvzoeJ1R/d0=", + "hash": "sha256-VKRifnvUTtGCs9XEMeqTVvbtES7rvWBWoiSYLfMxIhQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.68.2", + "rev": "v0.70.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tf78FT9JD5IVswgDB3Yug1NZQvo8NDqjPEAfF3gg93w=" + "vendorHash": "sha256-JrdL91xO4EyAtWfDFsjr09oTfgx+tQQ965ex/AnBkGk=" }, "thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index 0f379aae9c51..e076bae05cdc 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -14,17 +14,30 @@ autoreconfHook, pkg-config, diffutils, + versionCheckHook, glibc ? !stdenv.hostPlatform.isDarwin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dpkg"; version = "1.22.21"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; - rev = "applied/${version}"; - hash = "sha256-UiXZfwvgsgyXR6olNzKelt/3Fgtp7KU8UbTRRkDl8wY="; + tag = "applied/${finalAttrs.version}"; + leaveDotGit = true; + # Fix filename conflict on case-insensitive filesystems + postFetch = '' + pushd $out + git checkout HEAD -- scripts/t/Dpkg_BuildTree.t + mv scripts/t/Dpkg_BuildTree.t scripts/t/Dpkg_BuildTreeC.t + substituteInPlace scripts/Makefile.am --replace-fail t/Dpkg_BuildTree.t t/Dpkg_BuildTreeC.t + substituteInPlace scripts/Makefile.in --replace-fail t/Dpkg_BuildTree.t t/Dpkg_BuildTreeC.t + git checkout HEAD -- scripts/t/dpkg_buildtree.t + rm -rf .git + popd + ''; + hash = "sha256-LK6nOPewjRyKyHdwJgmLILoZ6sEfJzRtC7pIeWz01lA="; }; configureFlags = [ @@ -48,7 +61,7 @@ stdenv.mkDerivation rec { PATH=$TMPDIR:$PATH for i in $(find . -name Makefile.in); do - substituteInPlace $i --replace "install-data-local:" "disabled:" ; + substituteInPlace $i --replace-quiet "install-data-local:" "disabled:" ; done # Skip check broken when cross-compiling. @@ -61,21 +74,26 @@ stdenv.mkDerivation rec { # Dpkg commands sometimes calls out to shell commands substituteInPlace lib/dpkg/dpkg.h \ - --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \ - --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \ - --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \ - --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \ - --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \ - --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \ - --replace '"dpkg"' \"$out/bin/dpkg\" \ - --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \ - --replace '"rm"' \"${coreutils}/bin/rm\" \ - --replace '"cat"' \"${coreutils}/bin/cat\" \ - --replace '"diff"' \"${diffutils}/bin/diff\" + --replace-fail '"dpkg-deb"' \"$out/bin/dpkg-deb\" \ + --replace-fail '"dpkg-split"' \"$out/bin/dpkg-split\" \ + --replace-fail '"dpkg-query"' \"$out/bin/dpkg-query\" \ + --replace-fail '"dpkg-divert"' \"$out/bin/dpkg-divert\" \ + --replace-fail '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \ + --replace-fail '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \ + --replace-fail '"dpkg"' \"$out/bin/dpkg\" \ + --replace-fail '"debsig-verify"' \"$out/bin/debsig-verify\" \ + --replace-fail '"rm"' \"${coreutils}/bin/rm\" \ + --replace-fail '"cat"' \"${coreutils}/bin/cat\" \ + --replace-fail '"diff"' \"${diffutils}/bin/diff\" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # realpath("/var/lib/dpkg", NULL) gives EPERM on sandboxed darwin instead of the expected ENOENT, + # which makes some tests fail. + sed -i '/opts normalize/a AT_SKIP_IF([true])' src/at/chdir.at '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace src/main/help.c \ - --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" + --replace-fail '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" ''; buildInputs = [ @@ -96,7 +114,7 @@ stdenv.mkDerivation rec { postInstall = '' for i in $out/bin/*; do if head -n 1 $i | grep -q perl; then - substituteInPlace $i --replace \ + substituteInPlace $i --replace-fail \ "${perl}/bin/perl" "${perl}/bin/perl -I $out/${perl.libPrefix}" fi done @@ -105,6 +123,10 @@ stdenv.mkDerivation rec { cp -r scripts/t/origins $out/etc/dpkg ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + setupHook = ./setup-hook.sh; meta = with lib; { @@ -112,7 +134,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.debian.org/Teams/Dpkg"; license = licenses.gpl2Plus; platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ siriobalmelli ]; + mainProgram = "dpkg"; }; -} +}) diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix index 06bb26e2eea5..b87ec3ec5154 100644 --- a/pkgs/by-name/op/openapv/package.nix +++ b/pkgs/by-name/op/openapv/package.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openapv"; - version = "0.2.0.3"; + version = "0.2.0.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openapv"; tag = "v${finalAttrs.version}"; - hash = "sha256-igirdZL8dWAbO7vbrsIMZLaO91vYqeDwgq9M4fm/RpU="; + hash = "sha256-IkzZnf2/JZJIwg9g/6SvWTAcUkAQ/C36xXC+t44VejU="; }; postPatch = '' diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index d9031a3a6c77..d9c6358bdc1d 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-xwUkTWK4K6OQoopj7GmuptauCav6xCZLv8ITeCQKv4M="; + hash = "sha256-ouSk+yi5DEeZEUNQsy2UpRi80lxlXnRFyjeP+vd/Yl0="; }; proxyVendor = true; diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 78b7a5d9c540..b7562ecba84e 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -21,16 +21,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2-nightly-2025-09-13"; + version = "0.2-nightly-2025-09-24"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2-" finalAttrs.version; - hash = "sha256-Mzb5Ki6RyQIpeHRGtfGVURmvVMNuBBIjp+31M0m7oGw="; + hash = "sha256-3QvkNmNeY+UnpUl1m2gWIatSJNpGdTstNMSh6gj+5oE="; }; - cargoHash = "sha256-y65rM5sfSN8OA13Dwrt1VhiiODzdF0UmAA1IJwycfL0="; + cargoHash = "sha256-cDECuJwBNzC0gzWGfoN+IApd52vtVq/NSJLxT9vLKNA="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index 4f548dca89f5..ba199f91f65b 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "slackdump"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; tag = "v${version}"; - hash = "sha256-MoC1uLyAyLrHLjokDfg9UPUKQZKl8MdNQpFAzaea2Gs="; + hash = "sha256-rVNXVkM4DpfNdqDGzaw23zOL/VSbzKsCyOc/Cq/mtZM="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -32,7 +32,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-+4/F3CKFRLHB9aPUFVnnPmwIxZ608qMhrMHXE3Gskx0="; + vendorHash = "sha256-XnEuxYxrkKTJcXrDFQB4tw3dCJFVwGkw8kKJm+y+ees="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 405afe47c6cd..19fef9d6bd44 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -12,14 +12,15 @@ let pname = "uucd"; webpage = "https://erratique.ch/software/${pname}"; + version = "17.0.0"; in -stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "16.0.0"; +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-VVGPG6ZjchUqo8xMCJRahqCCF5WheDBpK1stuts+orM="; + hash = "sha256-ifjEBUN+Lqw4W9FeoGX4XBjnxcJL15ukd+aSSDS8KC0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix index 4dcd1971d79c..b6b9cfb3e077 100644 --- a/pkgs/development/python-modules/flit-gettext/default.nix +++ b/pkgs/development/python-modules/flit-gettext/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "flit-gettext"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "codingjoe"; repo = "flit-gettext"; rev = version; - hash = "sha256-YsRfpciSrHmivEJKfzdp6UaPx2tSr3VdjU4ZIbYQX6c="; + hash = "sha256-rrGRkZ7GeFdDZ7m1oLq/7nEjx6NY2+YWvLrtfRr4+Jw="; }; patches = [ diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 15cf8b8bea00..b5143017f97a 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.25.1"; + version = "0.25.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zXYa0OTR/IiksbgIO64G1PlzrPb18pu/E+qWCcHeycE="; + hash = "sha256-/kPBWFVdpGcjsotS4FitREGVr9HbPKdyDFmiVFROnCA="; }; build-system = [ setuptools ]; diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 8288d23a6733..9009dffd577d 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -79,7 +79,11 @@ assert lib.assertMsg ( enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, enableStatic ? stdenv.hostPlatform.isStatic, enableStrictLLVMChecks ? true, - withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + withAWS ? + lib.meta.availableOn stdenv.hostPlatform aws-c-common + && !enableStatic + && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + aws-c-common, aws-sdk-cpp, # FIXME support Darwin once https://github.com/NixOS/nixpkgs/pull/392918 lands withDtrace ?