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

Merge master into staging-next

parents 3e2e6f33 e4cb59df

.github/workflows/teams.yml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ defaults: 


jobs:

  sync:

    if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'

    runs-on: ubuntu-24.04-arm

    steps:

      # Use a GitHub App to create the PR so that CI gets triggered and to

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

+2 −2
Original line number Diff line number Diff line
@@ -1489,11 +1489,11 @@ 
    "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8="

  },

  "wgebis_mailgun": {

    "hash": "sha256-/AYzQgMWo2cPjEMlrOSZLn4IVq4At09KFXkIpc7L5p0=",

    "hash": "sha256-W+cvYNwsa5T6ZIPeEVbO9ogdZurwDPOKUwJfPXNKSqg=",

    "homepage": "https://registry.terraform.io/providers/wgebis/mailgun",

    "owner": "wgebis",

    "repo": "terraform-provider-mailgun",

    "rev": "v0.8.0",

    "rev": "v0.8.1",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="

  },

pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 68ce1294..5c2924f6 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -350,7 +350,7 @@ message("Binary dir: ${CMAKE_CURRENT_BINARY_DIR}")



 # TODO: linux .desktop/.xml files



-if(COMMAND qt_generate_deploy_app_script)

+if(FALSE)

     qt_generate_deploy_app_script(

         TARGET CEmu

         FILENAME_VARIABLE deploy_script

pkgs/applications/science/math/cemu-ti/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { 
    # This is resolved upstream, but I can't apply the patch because the

    # sourceRoot isn't set to the base of the Git repo.

    ./resolve-ambiguous-constexpr.patch

    # Disable the deploy_script generation. It's broken with Qt 6.10 and not used by this package.

    ./cmake-no-deploy.patch

  ];



  nativeBuildInputs = [

pkgs/by-name/aw/aws-vault/package.nix

+3 −7
Original line number Diff line number Diff line
@@ -9,25 +9,21 @@ 
}:

buildGoModule rec {

  pname = "aws-vault";

  version = "7.7.5";

  version = "7.6.5";



  src = fetchFromGitHub {

    owner = "ByteNess";

    repo = "aws-vault";

    rev = "v${version}";

    hash = "sha256-K91GNyvtjDO6UMU9cC+TbUdMWdXrPlKLU8u5cbEMdRA=";

    hash = "sha256-2Z3gh4F29v04pV5hz4XEn1GZFLjXMBnbBghGKczoCBk=";

  };



  proxyVendor = true;

  vendorHash = "sha256-3AL3vjKqzjrzgPrLLwIgWpn1hRB6soTMbaRly/fvziA=";



  vendorHash = "sha256-nzeNwiNiDXBO9fwMVlc09Ulj/SPzxV+vrMb70PB5N+8=";

  nativeBuildInputs = [

    installShellFiles

    makeWrapper

  ];



  env.CGO_ENABLED = "0";



  postInstall = ''

    # make xdg-open overrideable at runtime

    # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links