From 1db77e58d0aa239df6208d6233685dda96dc2286 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 1 Jan 2020 17:11:53 +0100 Subject: [PATCH 1/8] wlroots: 0.8.1 -> 0.9.0 Changelog: https://github.com/swaywm/wlroots/releases/tag/0.9.0 --- pkgs/development/libraries/wlroots/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a567e66285cc..d1dcb5993ab0 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,24 +6,15 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm"; + sha256 = "0sifcrqs82kg9zxqnlr1pl4cw9v9qqakyg3rkysywc9svbikd1g3"; }; - patches = [ - # add missing header that changed in mesa-19.2.2 - # https://github.com/swaywm/wlroots/issues/1862 - (fetchpatch { - url = "https://github.com/swaywm/wlroots/commit/d113e48a2a32542fe6e12f1759f07888364609bf.diff"; - sha256 = "1h09j1gmnzlz4py92a92chgy8xzsd8h8xn5irq9s2hq4cla66h87"; - }) - ]; - # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; From ce6dd5eda2bc41956ba8c016f810788766e2ec62 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Jan 2020 12:33:51 +0100 Subject: [PATCH 2/8] wlroots: 0.9.0 -> 0.9.1 Changelog: https://github.com/swaywm/wlroots/releases/tag/0.9.1 --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d1dcb5993ab0..2e08ca6e90d3 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0sifcrqs82kg9zxqnlr1pl4cw9v9qqakyg3rkysywc9svbikd1g3"; + sha256 = "0lh0m5wmr5a73zgqnnrrcnrywy7wjsrs839agiq9hf1yrgav3m8z"; }; # $out for the library and $examples for the example programs (in examples): From 0c9428188c0b0c0fb319093eaabcf96f5cff7065 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Jan 2020 20:33:01 +0100 Subject: [PATCH 3/8] wlroots: 0.9.0 -> 0.10.0 Changelog: https://github.com/swaywm/wlroots/releases/tag/0.10.0 --- pkgs/development/libraries/wlroots/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 2e08ca6e90d3..9f9c4acb0d85 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4, freerdp +, libpng, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0lh0m5wmr5a73zgqnnrrcnrywy7wjsrs839agiq9hf1yrgav3m8z"; + sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; }; # $out for the library and $examples for the example programs (in examples): @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 freerdp + libpng ffmpeg_4 ]; mesonFlags = [ From beca0911f429d6182109c3bcd5f5917da5f21457 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 1 Jan 2020 17:33:31 +0100 Subject: [PATCH 4/8] sway: 1.2 -> 1.4 Changelog: https://github.com/swaywm/sway/releases/tag/1.4 --- pkgs/applications/window-managers/sway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index c9427fbf695c..a020c10a3485 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.2"; + version = "1.4"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd"; + sha256 = "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja"; }; patches = [ From e99b32d27f611ef8674437db8e9ba6654c161465 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Jan 2020 12:26:17 +0100 Subject: [PATCH 5/8] nixos/sway: Install the new default terminal emulator The default changed in Sway 1.3 from rxvt_unicode to alacritty. For backward compatibility we'll install both terminal emulators by default. --- nixos/modules/programs/sway.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 33e252be45f8..7e646f8737d6 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -87,7 +87,8 @@ in { type = with types; listOf package; default = with pkgs; [ swaylock swayidle - xwayland rxvt_unicode dmenu + xwayland alacritty dmenu + rxvt_unicode # For backward compatibility (old default terminal) ]; defaultText = literalExample '' with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ]; From 6288a57e3948576b2a98ea7a26ee97afc09be727 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Jan 2020 20:36:38 +0100 Subject: [PATCH 6/8] swaylock: 1.4 -> 1.5 Changelog: https://github.com/swaywm/swaylock/releases/tag/1.5 --- pkgs/applications/window-managers/sway/lock.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index fe445a6b7adf..dcff3a5c47f6 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,17 +5,18 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982"; + sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf"; }; postPatch = '' - sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build + substituteInPlace meson.build \ + --replace "version: '1.4'" "version: '${version}'" ''; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; From 2a2f4ff9387258334c08bf2eae777784b9ad21b6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Jan 2020 20:51:31 +0100 Subject: [PATCH 7/8] swayidle: 1.5 -> 1.6 Changelog: https://github.com/swaywm/swayidle/releases/tag/1.6 --- pkgs/applications/window-managers/sway/idle.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index bc917e76f974..486ab79598df 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -5,15 +5,20 @@ stdenv.mkDerivation rec { pname = "swayidle"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n"; + sha256 = "1nd3v8r9549lykdwh4krldfl59lzaspmmai5k1icy7dvi6kkr18r"; }; + postPatch = '' + substituteInPlace meson.build \ + --replace "version: '1.5'" "version: '${version}'" + ''; + nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; From 4eedf77818f48ff20f18dd14b2d9f719f1f6a573 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Jan 2020 21:15:24 +0100 Subject: [PATCH 8/8] cage: 0.1.1 -> 2020-01-18 --- .../window-managers/cage/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index ce4031b92f56..fe5e9c4e2e34 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, makeWrapper , wlroots, wayland, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11 @@ -6,14 +6,20 @@ }: stdenv.mkDerivation rec { - pname = "cage"; - version = "0.1.1"; + pname = "cage-unstable"; + version = "2020-01-18"; + # The last stable release (0.1.1) would require at least the following 3 patches: + # - https://github.com/Hjdskes/cage/commit/33bb3c818c5971777b6f09d8821e7f078d38d262.patch + # - https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d.patch + # - https://github.com/Hjdskes/cage/commit/84216ca2a417b237ad61c11e2f3ebbcb91681ece.patch + # Which need to be adapted due to other changes. At this point it seems + # better to use the current master version until the next stable release. src = fetchFromGitHub { owner = "Hjdskes"; - repo = pname; - rev = "v${version}"; - sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1"; + repo = "cage"; + rev = "cc1f975c442ebd691b70196d76aa120ead717810"; + sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g"; }; nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ];