diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-12 09:55:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-12 09:55:54 +0100 |
| commit | efac8279c21a5df236826ceed3bf18d867226c1e (patch) | |
| tree | 2c9c5bfb6c1244196f456877181ec35273d58580 /pkgs/development/tools | |
| parent | f00bda0148b7ec338ecd5021b3f91321ca4d255e (diff) | |
| parent | 424697d51222211c33d37b5925d56731362f8e86 (diff) | |
| download | nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.tar nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.tar.gz nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.tar.bz2 nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.tar.lz nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.tar.xz nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.tar.zst nixlib-efac8279c21a5df236826ceed3bf18d867226c1e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/grabserial/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/vulkan-validation-layers/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index 5e06e9f771d9..ce336241b65d 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "grabserial"; - version = "1.9.9"; + version = "2.0.2"; src = fetchFromGitHub { owner = "tbird20d"; repo = "grabserial"; rev = "v${version}"; - sha256 = "0cwrajkh605gfhshrlpbc32gmx86a8kv3pq7cv713k60sgqrgpqx"; + sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3"; }; propagatedBuildInputs = [ pythonPackages.pyserial ]; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 36d018682df9..5d807d13a9ea 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang -, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }: +, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.1.114.0"; + version = "1.2.131.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4"; + sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; |