diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-23 12:25:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 12:25:37 +0000 |
| commit | bb5bf5cd276bb8b8337fb832ff071a3863af6cdc (patch) | |
| tree | 593c1ffb498214259c3b2e8386be04bb2f799332 | |
| parent | c0412cfe92203ee961d8a7f898fb5393a371d336 (diff) | |
| parent | b67ba0bfcc714453cdeb8d713e35751eb8b4c8f4 (diff) | |
Merge master into staging-next
| -rw-r--r-- | pkgs/applications/misc/dasel/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/cling/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/umockdev/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index cd2bd5383f9a..073983fa3551 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -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"; diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 68819fa7ab06..c22ad3f4cb0f 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -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" ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 1c0b70f6896a..9911c3e68cd4 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e26811469a95..b9af74906b49 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -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"; |