Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-23 12:25:37 +00:00 committed by GitHub
commit bb5bf5cd27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
sha256 = "1n2c6lcn4gad7w1zrh69rjdn5slnf6p7s5rkkkbpvs0jjwri11md";
sha256 = "1xyh41vb2rypajjzbysw6k8x39bna8j3fmxcqyjcrqs0dzx78nk3";
};
vendorSha256 = "1il1vnv0v97qh8f47md5i6qaac2k8par0pd0z7zqg67vxq6gim85";

View file

@ -73,7 +73,7 @@ let
flags = [
"-nostdinc"
"-nostdinc++"
"-isystem" "${glibc.dev}/include"
"-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
"-I" "${unwrapped}/include"
"-I" "${unwrapped}/lib/clang/5.0.2/include"
];

View file

@ -41,7 +41,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
# Test fail with libusb 1.0.24
doCheck = false;
meta = with stdenv.lib; {
description = "Mock hardware devices for creating unit tests";

View file

@ -39,10 +39,10 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "455.46.02";
version = "455.46.04";
persistencedVersion = "455.45.01";
settingsVersion = "455.45.01";
sha256_64bit = "05y4scg62mrhjnj2c8689m5hdyzqnx5p8vqvdqvv76zy970723l7";
sha256_64bit = "1iv42w3x1vc00bgn6y4w1hnfsvnh6bvj3vcrq8hw47760sqwa4xa";
settingsSha256 = "09v86y2c8xas9ql0bqr7vrjxx3if6javccwjzyly11dzffm02h7g";
persistencedSha256 = "13s4b73il0lq2hs81q03176n16mng737bfsp3bxnxgnrv3whrayz";
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";