Merge staging-next-24.05 into staging-24.05

2026-07-22 00:20:58 +00:00 · 2024-10-22 00:17:04 +00:00
parent ee546d4fb2 a4d696eac7
commit 2dd8a5446e
20 changed files with 112 additions and 45 deletions
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -256,7 +256,7 @@ rec {
  iphone64 = {
    config = "aarch64-apple-ios";
    # config = "aarch64-apple-darwin14";
-    sdkVer = "14.3";
+    darwinSdkVersion = "14.3";
    xcodeVer = "12.3";
    xcodePlatform = "iPhoneOS";
    useiOSPrebuilt = true;
@@ -265,7 +265,7 @@ rec {
  iphone32 = {
    config = "armv7a-apple-ios";
    # config = "arm-apple-darwin10";
-    sdkVer = "14.3";
+    darwinSdkVersion = "14.3";
    xcodeVer = "12.3";
    xcodePlatform = "iPhoneOS";
    useiOSPrebuilt = true;
@@ -274,7 +274,7 @@ rec {
  iphone64-simulator = {
    config = "x86_64-apple-ios";
    # config = "x86_64-apple-darwin14";
-    sdkVer = "14.3";
+    darwinSdkVersion = "14.3";
    xcodeVer = "12.3";
    xcodePlatform = "iPhoneSimulator";
    darwinPlatform = "ios-simulator";
@@ -284,7 +284,7 @@ rec {
  iphone32-simulator = {
    config = "i686-apple-ios";
    # config = "i386-apple-darwin11";
-    sdkVer = "14.3";
+    darwinSdkVersion = "14.3";
    xcodeVer = "12.3";
    xcodePlatform = "iPhoneSimulator";
    darwinPlatform = "ios-simulator";
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16458,6 +16458,12 @@
    githubId = 145816;
    name = "David McKay";
  };
+  rayhem = {
+    email = "glosser1@gmail.com";
+    github = "rayhem";
+    githubId = 49202382;
+    name = "Connor Glosser";
+  };
  raylas = {
    email = "r@raymond.sh";
    github = "raylas";
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -283,7 +283,7 @@ let
    ] ++ lib.optionals (chromiumVersionAtLeast "129") [
      # Rebased variant of patch right above to build M129+ with our rust and our clang.
      ./patches/chromium-129-rust.patch
-    ] ++ lib.optionals (chromiumVersionAtLeast "130") [
+    ] ++ lib.optionals (chromiumVersionAtLeast "130" && !ungoogled) [
      # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
      # and std::hardware_constructive_interference_size.
      # So let's revert the change for now and hope that our rustc.llvmPackages and
@@ -293,6 +293,7 @@ let
      # Note: We exclude the changes made to the partition_allocator (PA), as the revert
      # would otherwise not apply because upstream reverted those changes to PA already
      # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144
+      # Note: ungoogled-chromium already reverts this as part of its patchset.
      (githubPatch {
        commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";
        hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -21,17 +21,17 @@
  ungoogled-chromium = {
    deps = {
      gn = {
-        hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA=";
-        rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad";
+        hash = "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU=";
+        rev = "20806f79c6b4ba295274e3a589d85db41a02fdaa";
        url = "https://gn.googlesource.com/gn";
-        version = "2024-08-19";
+        version = "2024-09-09";
      };
      ungoogled-patches = {
-        hash = "sha256-kvpLE6SbXFur5xi1C8Ukvm4OoU5YB8PQCJdiakhFSAM=";
-        rev = "129.0.6668.100-1";
+        hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM=";
+        rev = "130.0.6723.58-1";
      };
    };
-    hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA=";
-    version = "129.0.6668.100";
+    hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
+    version = "130.0.6723.58";
  };
 }
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop-beta";
  dir = "Signal Beta";
-  version = "7.30.0-beta.1";
+  version = "7.30.0-beta.2";
  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E=";
+  hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0=";
 }
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "17.2.8",
-  "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag",
+  "version": "17.2.9",
+  "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw",
  "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v17.2.8-ee",
+  "rev": "v17.2.9-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "17.2.8",
-    "GITLAB_PAGES_VERSION": "17.2.8",
+    "GITALY_SERVER_VERSION": "17.2.9",
+    "GITLAB_PAGES_VERSION": "17.2.9",
    "GITLAB_SHELL_VERSION": "14.37.0",
    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0",
-    "GITLAB_WORKHORSE_VERSION": "17.2.8"
+    "GITLAB_WORKHORSE_VERSION": "17.2.9"
  }
 }
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -7,7 +7,7 @@
 }:

 let
-  version = "17.2.8";
+  version = "17.2.9";
  package_version = "v${lib.versions.major version}";
  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

@@ -21,7 +21,7 @@ let
      owner = "gitlab-org";
      repo = "gitaly";
      rev = "v${version}";
-      hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE=";
+      hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY=";
    };

    vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4=";
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,14 +2,14 @@

 buildGoModule rec {
  pname = "gitlab-pages";
-  version = "17.2.8";
+  version = "17.2.9";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-pages";
    rev = "v${version}";
-    hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc=";
+    hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0=";
  };

  vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c=";
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
 buildGoModule rec {
  pname = "gitlab-workhorse";

-  version = "17.2.8";
+  version = "17.2.9";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -330,15 +330,15 @@ rec {
  };

  docker_27 = callPackage dockerGen rec {
-    version = "27.1.1";
+    version = "27.3.1";
    cliRev = "v${version}";
-    cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0=";
+    cliHash = "sha256-Iurud1BwswGZCFgJ04/wl1U9AKcsXDmzFXLFCrjfc0Y=";
    mobyRev = "v${version}";
-    mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g=";
-    runcRev = "v1.1.13";
-    runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
-    containerdRev = "v1.7.20";
-    containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
+    mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE=";
+    runcRev = "v1.1.14";
+    runcHash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc=";
+    containerdRev = "v1.7.22";
+    containerdHash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk=";
    tiniRev = "v0.19.0";
    tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
  };
--- a/pkgs/by-name/sk/skypeforlinux/package.nix
+++ b/pkgs/by-name/sk/skypeforlinux/package.nix
@@ -42,8 +42,8 @@ let

  # Please keep the version x.y.0.z and do not update to x.y.76.z because the
  # source of the latter disappears much faster.
-  version = "8.129.0.202";
-  revision = "365";
+  version = "8.130.0.205";
+  revision = "368";

  rpath =
    lib.makeLibraryPath [
@@ -103,7 +103,7 @@ let
      fetchurl {
        name = "skypeforlinux-${version}-${revision}.snap";
        url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
-        hash = "sha512-pxLh/dU/RK1H5gjFLB0V4mVddgQkO8ZcJowpNNihECsLaELgoeXmWXflhYFs2G7fdEzNMeujuc4/ZoGCFSZCvw==";
+        hash = "sha512-eDSJQndUDxSsRg9bSevWUih1iXDp3n1kU0RdRAu3GsHeRC/JJx3m4vKxP0F/Rcf2Toxd3MPG2r6Oa1Wa7upcGg==";
      }
    else
      throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "stats";
-  version = "2.11.7";
+  version = "2.11.14";

  src = fetchurl {
    url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-UppO7Cky+9xYg292t/78GPJ822kJ0RMG9yvetxRMVsU=";
+    hash = "sha256-JljFHlMcc8kfjGTdGAOP4ot+FqVy0yAJ1kxVO0TawHU=";
  };

  sourceRoot = ".";
@@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/Applications
-    cp -r *.app $out/Applications
+    mkdir -p "$out/Applications"
+    cp -r *.app "$out/Applications"

    runHook postInstall
  '';
@@ -37,7 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      donteatoreo
      emilytrau
-      Enzime
    ];
    platforms = lib.platforms.darwin;
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
--- a/pkgs/development/python-modules/biothings-client/default.nix
+++ b/pkgs/development/python-modules/biothings-client/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  requests,
+}:
+buildPythonPackage rec {
+  pname = "biothings-client";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "biothings";
+    repo = "biothings_client.py";
+    rev = "v${version}";
+    hash = "sha256-rCpzBX2H+7R8ulnJgtVlBA45ASa4DaY5jQ1bO2+bAC8=";
+  };
+
+  build-system = [ setuptools ];
+  dependencies = [ requests ];
+  pythonImportsCheck = [ "biothings_client" ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [
+    # All other tests make network requests to exercise the API
+    "tests/gene.py::TestGeneClient::test_http"
+    "tests/test.py::TestBiothingsClient::test_generate_settings_from_url"
+    "tests/variant.py::TestVariantClient::test_format_hgvs"
+  ];
+
+  meta = {
+    changelog = "https://github.com/biothings/biothings_client.py/blob/v${version}/CHANGES.txt";
+    description = "Wrapper to access Biothings.api-based backend services";
+    homepage = "https://github.com/biothings/biothings_client.py";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ rayhem ];
+  };
+}
--- a/pkgs/development/python-modules/dbf/darwin.patch
+++ b/pkgs/development/python-modules/dbf/darwin.patch
@@ -0,0 +1,12 @@
+diff --git a/dbf/test.py b/dbf/test.py
+index 117f611..34a9507 100755
+--- a/dbf/test.py
+++ b/dbf/test.py
+@@ -4814,6 +4814,7 @@ def test_index_search(self):
+         self.assertEqual(sorted.index_search('jul', partial=True), 9)
+         self.assertTrue(sorted.index_search('jul', partial=True))
+ 
+    @unittest.skipIf(sys.platform == 'darwin', 'fails on case-insensitive filesystems')
+     def test_mismatched_extensions(self):
+         old_memo_name = self.dbf_table._meta.memoname
+         new_memo_name = old_memo_name[:-3] + 'Dbt'
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -19,10 +19,15 @@ buildPythonPackage rec {
    hash = "sha256-MFEi1U0RNvrfDtV4HpvPgKTCibAh76z7Gnmj32IubYw=";
  };

+  # Workaround for https://github.com/ethanfurman/dbf/issues/48
+  patches = lib.optional python.stdenv.isDarwin ./darwin.patch;
+
  propagatedBuildInputs = [ aenum ];

  checkPhase = ''
+    runHook preCheck
    ${python.interpreter} -m dbf.test
+    runHook postCheck
  '';

  pythonImportsCheck = [ "dbf" ];
--- a/pkgs/games/katawa-shoujo/default.nix
+++ b/pkgs/games/katawa-shoujo/default.nix
@@ -31,11 +31,13 @@ let
  stdenv = stdenvNoCC;
  srcDetails = rec {
    x86_64-linux = {
+      archiveDate = "20240825224413";
      urlSuffix = "%5blinux-x86%5d%5b18161880%5d.tar.bz2";
      hash = "sha256-7FoFz88dWYHs2/pxkEwnmiFeeb3+slayrWknEJoAB9o=";
    };
    i686-linux = x86_64-linux;
    x86_64-darwin = {
+      archiveDate = "20240825224411";
      urlSuffix = "%5bmac%5d%5b1DFC84A6%5d.dmg";
      hash = "sha256-Sc5BAlpJsffjcNrZ8+VU3n7G10DoqDKQn/leHDW32Y8=";
    };
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
  version = "1.3.1";

  src = fetchurl {
-    url = "https://cdn.fhs.sh/ks/bin/gold_${version}/%5b4ls%5d_katawa_shoujo_${version}-${srcDetails.urlSuffix}";
+    url = "https://web.archive.org/web/${srcDetails.archiveDate}/https://cdn.fhs.sh/ks/bin/gold_${version}/%5b4ls%5d_katawa_shoujo_${version}-${srcDetails.urlSuffix}";
    inherit (srcDetails) hash;
  };

--- a/pkgs/servers/sql/patroni/default.nix
+++ b/pkgs/servers/sql/patroni/default.nix
@@ -6,13 +6,13 @@

 pythonPackages.buildPythonApplication rec {
  pname = "patroni";
-  version = "3.3.3";
+  version = "3.3.4";

  src = fetchFromGitHub {
    owner = "zalando";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-LIdW62LLEmsQZJMbInb1vbKaKgEEBBU1HGyLLNitjjg=";
+    sha256 = "sha256-ETPHpWXWjdHCRbWW+z6/mVJ42uHvwCwsFKskbkj76wg=";
  };

  propagatedBuildInputs = with pythonPackages; [
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
    connector-c = finalAttrs.finalPackage;
    server = finalAttrs.finalPackage;
    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests = nixosTests.mysql.percona-server_lts;
+    tests.percona-server = nixosTests.mysql.percona-server_8_0;
  };

  meta = with lib; {
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -204,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: {
    connector-c = finalAttrs.finalPackage;
    server = finalAttrs.finalPackage;
    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests = nixosTests.mysql.percona-server_innovation;
+    tests.percona-server = nixosTests.mysql.percona-server_8_4;
  };

  meta = with lib; {
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1551,6 +1551,8 @@ self: super: with self; {

  biopython = callPackage ../development/python-modules/biopython { };

+  biothings-client = callPackage ../development/python-modules/biothings-client { };
+
  biplist = callPackage ../development/python-modules/biplist { };

  bip-utils = callPackage ../development/python-modules/bip-utils { };