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

Merge master into staging-next

parents 238b952e 91071a2b

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
, libglvnd

, libjack2

, libjpeg

, libnghttp2

, libxkbcommon

, makeWrapper

, pango
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec { 
    libjack2

    # libjpeg8 is required for converting jpeg's to colour palettes

    libjpeg

    libnghttp2

    libxcb

    libXcursor

    libX11

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

+14 −14
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ 
    "vendorHash": "sha256-UM4EjL1qXOn2TMOupVxSyJVLarHIGTySXNJtWPrseSE="

  },

  "akamai": {

    "hash": "sha256-KnX+PAhT7TPp9SRkGwYPvxgk/ExaJPr7vKj9hTbJGhg=",

    "hash": "sha256-v1Y34+SoxVyBqO6QOCrfHFf+ng8ER3ngw8+0HDrB4Hc=",

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

    "owner": "akamai",

    "repo": "terraform-provider-akamai",

    "rev": "v6.5.0",

    "rev": "v6.6.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-qLJnhwMz9Lz47Iih7tvFORng8j3IKjBkksLeK9o6TQE="

    "vendorHash": "sha256-PUKSCQwVUkEfvGpk18joVnHGdacsiOB/Xk5yE4Y6Nbg="

  },

  "alicloud": {

    "hash": "sha256-CWXA7Ljd9wx0c5toLszQFfGqAGPNVpm3pSvzbVnCrtI=",
@@ -408,13 +408,13 @@ 
    "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="

  },

  "equinix": {

    "hash": "sha256-RlJsM5gZPHQxE7Lab2J1MVFL1YaSz2kC/1F68Nep1jc=",

    "hash": "sha256-UCgxXvUD7nqfAAQv4Hfu3PNfyV6lw09j+uh5YqlxCuo=",

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

    "owner": "equinix",

    "repo": "terraform-provider-equinix",

    "rev": "v2.9.0",

    "rev": "v2.11.0",

    "spdx": "MIT",

    "vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY="

    "vendorHash": "sha256-E77/PwZiMEbxv+UkG9tSUHdD1AbzXpZ28KeP9zyadN0="

  },

  "exoscale": {

    "hash": "sha256-5hhq+ecaTR4kz+23xObDGjyreJ3UuHYBRMoBl7bxnJw=",
@@ -435,11 +435,11 @@ 
    "vendorHash": "sha256-xlcOCdgRTQbJCsL39hs3dUVjssGpyNij0ickjSn8EX0="

  },

  "fastly": {

    "hash": "sha256-Kpb5TiWDGOvIZLhzxG27wY+h1B9fgYN1WYGrmLps28c=",

    "hash": "sha256-PtmJISWgOXM2og0LaxLqBq9gB0AVegNaIFGbdckDcKc=",

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

    "owner": "fastly",

    "repo": "terraform-provider-fastly",

    "rev": "v5.14.0",

    "rev": "v5.15.0",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },
@@ -705,13 +705,13 @@ 
    "vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="

  },

  "kubectl": {

    "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",

    "hash": "sha256-/tlwr6fh7/8FQew0MVaftvZQVuR/FGWVcEyHXTTCIUo=",

    "homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl",

    "owner": "gavinbunney",

    "repo": "terraform-provider-kubectl",

    "rev": "v1.14.0",

    "rev": "v1.16.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="

    "vendorHash": "sha256-K4Ro2q1dn5EdjZOGKfIuirx3kaFmRj9a1iPhgvjiFkQ="

  },

  "kubernetes": {

    "hash": "sha256-xznolig6OYs6igpz3CoB5Vu3UHlfDi4zmfbTHWFJacI=",
@@ -1183,13 +1183,13 @@ 
    "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U="

  },

  "spotinst": {

    "hash": "sha256-BQL8ZwLAOaNO42Hhmq0XvgcLe7STAIN9xLXaHMM1x6Y=",

    "hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=",

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

    "owner": "spotinst",

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

    "rev": "v1.195.0",

    "rev": "v1.199.2",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-/2t6Yv0ceSweRGPNOUOHj/fv6/VQNZEP8et++rxmfiE="

    "vendorHash": "sha256-DWFPqjFLDJSfxQHXUSog2Cyn6RD1BdOz1zRIXXZVjkY="

  },

  "ssh": {

    "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ let 
    ln -s /usr/lib32 $out/lib32

    ln -s /usr/lib64 $out/lib64

    ln -s /usr/lib64 $out/usr/lib

    ln -s /usr/libexec $out/libexec



    # symlink 32-bit ld-linux so it's visible in /lib

    if [ -e $out/usr/lib32/ld-linux.so.2 ]; then

pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ fn collect_candidate_paths( 
}



fn remap_native_path(root: &Path, p: &Path) -> Option<PathBuf> {

    if p.starts_with("bin/") || p.starts_with("sbin/") {

    if p.starts_with("bin/") || p.starts_with("sbin/") || p.starts_with("libexec/") {

        return Some(PathBuf::from("usr/").join(p));

    }

pkgs/by-name/bt/btrfs-progs/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 


stdenv.mkDerivation rec {

  pname = "btrfs-progs";

  version = "6.11";

  version = "6.12";



  src = fetchurl {

    url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";

    hash = "sha256-/5rpFSEwOpDYfhxL4jDwEh85xE3b5Swq6uJjxv7PoJk=";

    hash = "sha256-mn2WUf/VL75SEqjkhSo82weePSI/xVBOalCwupbNIKE=";

  };



  nativeBuildInputs = [