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: 6738033727ca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea6fc49f0f02
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 13, 2018

  1. vulkan-loader: lock rev, update sha256 after bump 

    See: https://git.io/fxRIA
    @lukateras
    lukateras committed Oct 13, 2018
    Copy the full SHA
    4d93668 View commit details

  2. vulkan-headers: lock rev

    @lukateras
    lukateras committed Oct 13, 2018
    Copy the full SHA
    d21881c View commit details

  3. Merge pull request #48329 from transumption/201810/vulkan-loader-sha256 

    vulkan-{headers,loader}: lock revs, update sha256 after bump
    @lukateras
    lukateras authored Oct 13, 2018
    Copy the full SHA
    ea6fc49 View commit details
Showing with 10 additions and 6 deletions.
  1. +1 −1 pkgs/development/libraries/vulkan-headers/default.nix
  2. +9 −5 pkgs/development/libraries/vulkan-loader/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
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "sdk-${version}";
rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0";
sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
};

14 changes: 9 additions & 5 deletions pkgs/development/libraries/vulkan-loader/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
let version = "1.1.85"; in
{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:

let
version = "1.1.85";
in

assert version == vulkan-headers.version;
stdenv.mkDerivation rec {
name = "vulkan-loader-${version}";
@@ -9,8 +13,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "sdk-${version}";
sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d";
rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c";
sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj";
};

nativeBuildInputs = [ pkgconfig ];