Unverified Commit c156b12c authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents e0a0ee6d 17eefbfd

pkgs/applications/networking/cluster/terraform-providers/providers.json

+6 −6
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 
    "vendorHash": null

  },

  "aiven_aiven": {

    "hash": "sha256-Aih7prC6CKv414bxiJnV3PFXZfH0MxsmS2g9c4eVWOk=",

    "hash": "sha256-lNDorhkIngyZ8S51lyuI3LRtnFtzVG01Nzo1vRPytbQ=",

    "homepage": "https://registry.terraform.io/providers/aiven/aiven",

    "owner": "aiven",

    "repo": "terraform-provider-aiven",

    "rev": "v4.50.0",

    "rev": "v4.51.0",

    "spdx": "MIT",

    "vendorHash": "sha256-S2QbhaK7GlfUnggLE9wNNJCrNnk5ReD7kY8yeRKPi7Q="

    "vendorHash": "sha256-c4eCY/iQ8v/gBX55j22TRxWIeoevi5EJs4TtN9xXfKA="

  },

  "akamai_akamai": {

    "hash": "sha256-WXIx2/1EiamjolyPy+d3Gwp4hOguJrmxKwgLZqzQqDg=",
@@ -580,13 +580,13 @@ 
    "vendorHash": "sha256-lhTdDrTwTbRuWngQ+NGuh+x5Z5HZfVTtNi+mZqIENbg="

  },

  "hashicorp_google-beta": {

    "hash": "sha256-NRTnx5nqdCtjz0mGZjuA96jEzW1rKR+M0AY2//TAYk4=",

    "hash": "sha256-frRtwDdgNNux875U9rgSbZict8//X/WzxM7EBSxRqW4=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",

    "owner": "hashicorp",

    "repo": "terraform-provider-google-beta",

    "rev": "v7.18.0",

    "rev": "v7.20.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-/wClcz8fwl9Of2JSKcfETs7VR6c5KrYnnF+yW5iUoSU="

    "vendorHash": "sha256-KnB6R5yrEeaf4Z+LzQjCeQJjAgHK0kJEJzT1rb3pimY="

  },

  "hashicorp_helm": {

    "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",

pkgs/data/themes/adwaita-qt/default.nix→pkgs/by-name/ad/adwaita-qt/package.nix

+10 −8
Original line number Diff line number Diff line
@@ -5,14 +5,16 @@ 
  nix-update-script,

  cmake,

  ninja,

  qtbase,

  qtwayland,

  qt5,

  qt6,

  libxcb,

  useQt6 ? false,

}:

let

  qt = if useQt6 then qt6 else qt5;

in



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "adwaita-qt";

  version = "1.4.2";
@@ -24,8 +26,8 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "FedoraQt";

    repo = "adwaita-qt";

    rev = version;

    sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";

    tag = finalAttrs.version;

    hash = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";

  };



  nativeBuildInputs = [
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    qtbase

    qt.qtbase

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

    libxcb
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec { 
    qt5.qtx11extras

  ]

  ++ lib.optionals useQt6 [

    qtwayland

    qt6.qtwayland

  ];



  # Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
@@ -70,4 +72,4 @@ stdenv.mkDerivation rec { 
    maintainers = [ ];

    platforms = lib.platforms.all;

  };

}
 
})

pkgs/servers/dcnnt/default.nix→pkgs/by-name/dc/dcnnt/package.nix

+6 −7
Original line number Diff line number Diff line 
{

  buildPythonApplication,

  fetchPypi,

  lib,

  pycryptodome,

  python3Packages,

  fetchPypi,

}:



buildPythonApplication rec {

python3Packages.buildPythonApplication (finalAttrs: {

  pname = "dcnnt";

  version = "0.10.0";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    inherit (finalAttrs) pname version;

    hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE=";

  };



  propagatedBuildInputs = [

  propagatedBuildInputs = with python3Packages; [

    pycryptodome

  ];
@@ -30,4 +29,4 @@ buildPythonApplication rec { 
    maintainers = with lib.maintainers; [ arnoutkroeze ];

    mainProgram = "dcnnt";

  };

}
 
})

pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
From cdbf3ba41ddce41d8ae375464e514f72d158ec0b Mon Sep 17 00:00:00 2001

From: Marcin Serwin <marcin@serwin.dev>

Date: Sat, 5 Jul 2025 22:26:49 +0200

Subject: [PATCH] CMakeLists: update mcl version to 0.1.13



The mcl in externals is already at this version, but it wasn't bumped

here which makes it impossible to use prebuilt mcl.



Signed-off-by: Marcin Serwin <marcin@serwin.dev>

---

 CMakeLists.txt | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/CMakeLists.txt b/CMakeLists.txt

index e95050da..edd153d0 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -145,7 +145,7 @@ set(TSL_ROBIN_MAP_ENABLE_INSTALL ON)

 

 find_package(Boost 1.57 REQUIRED)

 find_package(fmt 9 CONFIG)

-find_package(mcl 0.1.12 EXACT CONFIG)

+find_package(mcl 0.1.13 EXACT CONFIG)

 find_package(tsl-robin-map CONFIG)

 

 if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS)

-- 

2.49.0

pkgs/by-name/dy/dynarmic/package.nix

+6 −56
Original line number Diff line number Diff line
@@ -13,69 +13,21 @@ 
  nix-update-script,

  azahar,

  darwin,

  oaknut,

  mcl-cpp-utility-lib,

}:

let

  oaknut = stdenv.mkDerivation {

    pname = "oaknut";

    version = "1.2.2-unstable-2024-03-01";



    src = fetchFromGitHub {

      owner = "merryhime";

      repo = "oaknut";

      rev = "94c726ce0338b054eb8cb5ea91de8fe6c19f4392";

      hash = "sha256-IhP/110NGN42/FvpGIEm9MgsSiPYdtD8kNxL0cAWbqM=";

    };



    nativeBuildInputs = [

      cmake

      ninja

    ];

  };



  mcl = stdenv.mkDerivation {

    pname = "mcl";

    version = "0.1.13-unstable-2025-03-16";



    src = fetchFromGitHub {

      owner = "azahar-emu";

      repo = "mcl";

      rev = "7b08d83418f628b800dfac1c9a16c3f59036fbad";

      hash = "sha256-uTOiOlMzKbZSjKjtVSqFU+9m8v8horoCq3wL0O2E8sI=";

    };



    nativeBuildInputs = [

      cmake

      ninja

    ];



    buildInputs = [

      fmt

    ];



    checkInputs = [

      catch2_3

    ];



    doCheck = true;

    checkPhase = ''

      tests/mcl-tests

    '';

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "dynarmic";

  version = "6.7.0-unstable-2025-03-16";

  version = "6.7.0-unstable-2026-01-04";



  src = fetchFromGitHub {

    owner = "azahar-emu";

    repo = "dynarmic";

    rev = "278405bd71999ed3f3c77c5f78344a06fef798b9";

    hash = "sha256-D7nXn5y0h8FV0V8Tc8uBlRoeEU+gcpt44afujZvG+1A=";

    rev = "526227eebe1efff3fb14dbf494b9c5b44c2e9c1f";

    hash = "sha256-WG9mUFUnhEEF0+qsQzslTAj1nox3jaz6rVKs245EtV4=";

  };



  patches = [

    # https://github.com/azahar-emu/dynarmic/pull/2

    ./0001-CMakeLists-update-mcl-version-to-0.1.13.patch

    # https://github.com/azahar-emu/dynarmic/pull/3

    ./0001-xbyak-Fix-tests-when-using-newer-versions.patch

  ];
@@ -94,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    boost

    robin-map

    mcl

    mcl-cpp-utility-lib

    fmt

  ]

  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
@@ -123,8 +75,6 @@ stdenv.mkDerivation (finalAttrs: { 
  doCheck = true;



  passthru = {

    inherit mcl oaknut;



    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

    tests = { inherit azahar; };

  };