Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 803457393476
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09340647918b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 31, 2019

  1. vulkan-headers, vulkan-tools: fix version 

    This fixes an assertion error in vulkan-loader on version == vulkan-headers.version:

assertion failed at /nix/store/ca66sbxzxlxlfpb579nxxnw97z2ql1gv-source/pkgs/development/libraries/vulkan-loader/default.nix:8:1

The sha256 for vulkan-headers and vulkan-tools are unchanged because
they were already set to the newer version. The correct version was
lost in the staging-next merge.
    @ivan
    ivan committed Aug 31, 2019
    Copy the full SHA
    e540073 View commit details

Commits on Sep 1, 2019

  1. Merge pull request #67841 from ivan/vulkan-loader-fix 

    vulkan-headers, vulkan-tools: fix version
    @flokli
    flokli authored Sep 1, 2019
    Copy the full SHA
    0934064 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/libraries/vulkan-headers/default.nix
  2. +1 −1 pkgs/tools/graphics/vulkan-tools/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/vulkan-headers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "vulkan-headers";
version = "1.1.106";
version = "1.1.114.0";

nativeBuildInputs = [ cmake ];

2 changes: 1 addition & 1 deletion pkgs/tools/graphics/vulkan-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

stdenv.mkDerivation rec {
pname = "vulkan-tools";
version = "1.1.106.0";
version = "1.1.114.0";

src = fetchFromGitHub {
owner = "KhronosGroup";