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

Commits on Nov 20, 2017

  1. wayland: 1.12.0 -> 1.14.0

    @Mic92
    Mic92 committed Nov 20, 2017
    Copy the full SHA
    c30d535 View commit details

  2. wayland-protocols: 1.10 -> 1.11

    @Mic92
    Mic92 committed Nov 20, 2017
    Copy the full SHA
    2ac6343 View commit details

  3. weston: 1.12.0 -> 3.0.0

    @Mic92
    Mic92 committed Nov 20, 2017
    Copy the full SHA
    fc39418 View commit details

Commits on Nov 21, 2017

  1. Merge pull request #31868 from Mic92/weston/wayland-update 

    Weston: 1.12.0 -> 3.0.0; wayland: 1.12.0 -> 1.14.0
    @Mic92
    Mic92 authored Nov 21, 2017
    Copy the full SHA
    72cf3e8 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/window-managers/weston/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@

stdenv.mkDerivation rec {
name = "weston-${version}";
version = "1.12.0";
version = "3.0.0";

src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033";
sha256 = "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wayland/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ assert expat != null;

stdenv.mkDerivation rec {
name = "wayland-${version}";
version = "1.12.0";
version = "1.14.0";

src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1";
sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d";
};

configureFlags = [ "--with-scanner" "--disable-documentation" ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wayland/protocols.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "wayland-protocols-${version}";
version = "1.10";
version = "1.11";

src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a";
sha256 = "0138psvx6fv8z5x2p6xi4iij6m5k62c0qyfsb45xgcf5a4fyxz1s";
};

nativeBuildInputs = [ pkgconfig ];