From fe4907c9d0e89c22b709695c282246c5e5a9a7b7 Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 7 Nov 2017 23:16:50 +0200 Subject: [PATCH 1/2] sway: 0.14.0 -> 0.15.0 --- pkgs/applications/window-managers/sway/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6227ccd2c9fa..1e1072e49604 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { - owner = "Sircmpwn"; + owner = "swaywm"; repo = "sway"; - rev = "${version}"; - sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2"; + rev = version; + sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh"; }; nativeBuildInputs = [ From ffa60968a33437b70db9b39230d2b58eb5b7ef8e Mon Sep 17 00:00:00 2001 From: dywedir Date: Wed, 8 Nov 2017 10:40:00 +0200 Subject: [PATCH 2/2] wlc: 0.0.10 -> 0.0.11 --- pkgs/development/libraries/wlc/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 7fcf4fbbe5f6..02066253d0f9 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -5,28 +5,18 @@ , withOptionalPackages ? true, zlib, valgrind, doxygen }: -let - # for 0.0.10 - xwaylandPatch = fetchpatch { - url = "https://github.com/Cloudef/wlc/commit/a130f6006560fb8ac02fb59a90ced1659563f9ca.diff"; - sha256 = "0kzcbqklcyg8bganm65di8cif6dpc8bkrsvkjia09kr92lymxm2c"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; + sha256 = "1qnak907gjd35hq4b0rrhgb7kz5iwnirh8yk372yzxpgk7dq0gz9"; }; - patches = [ - xwaylandPatch - ]; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [