Unverified Commit 98d00577 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c8c1423c a71e4596

nixos/modules/virtualisation/qemu-vm.nix

+2 −2
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ in 


        ${optionalString cfg.writableStore ''

          echo "mounting overlay filesystem on /nix/store..."

          mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store

          mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store

          mount -t overlay overlay $targetRoot/nix/store \

            -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail

        ''}
@@ -1099,7 +1099,7 @@ in 
        };

        serviceConfig = {

          Type = "oneshot";

          ExecStart = "/bin/mkdir -p 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store";

          ExecStart = "/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store";

        };

      };

    };

pkgs/applications/audio/reaper/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "reaper";

  version = "6.75";

  version = "6.77";



  src = fetchurl {

    url = url_for_platform version stdenv.hostPlatform.qemuArch;

    hash = {

      x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck=";

      aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ=";

      x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";

      aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";

    }.${stdenv.hostPlatform.system};

  };

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

+15 −15
Original line number Diff line number Diff line
@@ -219,13 +219,13 @@ 
    "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="

  },

  "cloudflare": {

    "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=",

    "hash": "sha256-LBMFszTXxiK1ZvqP6VjSCWk06/IVbJV9yEGkn6olM6k=",

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

    "owner": "cloudflare",

    "repo": "terraform-provider-cloudflare",

    "rev": "v4.0.0",

    "rev": "v4.1.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo="

    "vendorHash": "sha256-ofuLOrJSztgwtohDoZdgd9DMJSK77z93L2NlqO5bmCM="

  },

  "cloudfoundry": {

    "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=",
@@ -684,13 +684,13 @@ 
    "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw="

  },

  "local": {

    "hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=",

    "hash": "sha256-LN9mYtFNPPlG3Wdz0ggS57zYMO2chf6JipRmn+OKCnw=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/local",

    "owner": "hashicorp",

    "repo": "terraform-provider-local",

    "rev": "v2.3.0",

    "rev": "v2.4.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug="

    "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ="

  },

  "lxd": {

    "hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=",
@@ -811,11 +811,11 @@ 
    "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="

  },

  "oci": {

    "hash": "sha256-PsTlJY9Y4o7qmA2h+jbIARB9N7+Qku8CaOAYkQ2CKBU=",

    "hash": "sha256-ZERJIZ1nsvvMhZe9hjcZt5F1lFNFV4TP0ifNin+MC5M=",

    "homepage": "https://registry.terraform.io/providers/oracle/oci",

    "owner": "oracle",

    "repo": "terraform-provider-oci",

    "rev": "v4.110.0",

    "rev": "v4.111.0",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },
@@ -964,11 +964,11 @@ 
    "vendorHash": null

  },

  "scaleway": {

    "hash": "sha256-gscuuaohIOIdDAAUWKg82fm9iY51ZxoN4EeAxAzTvjI=",

    "hash": "sha256-4xHPQFmOAqEpqfJ6ng5z3wcuNZF8jNqu+4ZNJNxaBaI=",

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

    "owner": "scaleway",

    "repo": "terraform-provider-scaleway",

    "rev": "v2.12.1",

    "rev": "v2.13.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0="

  },
@@ -1045,13 +1045,13 @@ 
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="

  },

  "spotinst": {

    "hash": "sha256-bUFX6Ok7cYyaoYHElUIcEwl6DRGK8q+opKBCABo8CVM=",

    "hash": "sha256-OroABl6G5nCatoyPxHZkM9I7qidxwMlgFjWC9Ljshik=",

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

    "owner": "spotinst",

    "repo": "terraform-provider-spotinst",

    "rev": "v1.103.0",

    "rev": "v1.104.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-IlztpEAI/Z7DUQ5pMaGSQnXWPedAIJlS773nxsRMCYg="

    "vendorHash": "sha256-juso8uzTjqf/vxUmpiv/07WkqMJRS1CqHQhu6pHf7QY="

  },

  "stackpath": {

    "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@@ -1099,11 +1099,11 @@ 
    "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="

  },

  "tencentcloud": {

    "hash": "sha256-91efifPY9ErjqtNPzm3+XSy1Jy+eQs2znxYzez74J/0=",

    "hash": "sha256-+VzUyIDQcDyoMVH113cMd6jCUIsAIw/Ir1wM+/YIefM=",

    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",

    "owner": "tencentcloudstack",

    "repo": "terraform-provider-tencentcloud",

    "rev": "v1.79.13",

    "rev": "v1.79.14",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },

pkgs/applications/version-management/gh/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "gh";

  version = "2.24.0";

  version = "2.24.1";



  src = fetchFromGitHub {

    owner = "cli";

    repo = "cli";

    rev = "v${version}";

    hash = "sha256-5ccvdm0BQZ0+yccB+TjlVt5ZAPxKuEInOed2D9AzMjc=";

    hash = "sha256-W0wl9I5FblbUBi1kZ7X+lhnhDahrggm9ooTaTWqATLg=";

  };



  vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY=";

pkgs/data/icons/numix-icon-theme-circle/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenvNoCC.mkDerivation rec {

  pname = "numix-icon-theme-circle";

  version = "23.02.28";

  version = "23.03.04";



  src = fetchFromGitHub {

    owner = "numixproject";

    repo = pname;

    rev = version;

    sha256 = "sha256-dSD5mjWH7ho+1LiZgzVjDkAIbj4XubC3ZKamyMokkds=";

    sha256 = "sha256-2do/8NKO47zj3+V5+P79el41jy7q6aXdhYXVRRoVusI=";

  };



  nativeBuildInputs = [ gtk3 ];