From fe6c5adecf373ea9847ddcc6a90420a44a5d8248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 29 Aug 2017 14:24:17 +0200 Subject: [PATCH 1/5] e17gtk: finish decoupling from gnome3 version --- pkgs/misc/themes/e17gtk/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index cdf2d958fe4..3fbb77816d3 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -1,18 +1,14 @@ -{ stdenv, fetchFromGitHub, gnome3 }: -let - gnome3 = { version = "3.22"; }; # FIXME -in +{ stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { name = "e17gtk-${version}"; - version = "${gnome3.version}.1"; + version = "3.22.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "E17gtk"; rev = "V${version}"; - sha256 = { - "3.22" = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8"; - }."${gnome3.version}"; + sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8"; }; installPhase = '' From cdb49582a64925c8f13c43eab51586c8593f17ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Aug 2017 15:09:23 +0200 Subject: [PATCH 2/5] rogue: fix build by using older ncurses --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57f68961ed..bb3b8b419ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17514,7 +17514,9 @@ with pkgs; rimshot = callPackage ../games/rimshot { love = love_0_7; }; - rogue = callPackage ../games/rogue { }; + rogue = callPackage ../games/rogue { + ncurses = ncurses5; + }; robotfindskitten = callPackage ../games/robotfindskitten { }; From dc9374427357a942a27e36fc8cc0674aa8cbc22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Aug 2017 16:15:15 +0200 Subject: [PATCH 3/5] rogue: omit from the installation media At least for now. It would increase the ISO size by ~10 MB, after the fixup in the parent commit. --- nixos/modules/profiles/installation-device.nix | 2 +- nixos/tests/installer.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a24fa75e01d..8e1482f5533 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -28,7 +28,7 @@ with lib; services.nixosManual.showManual = true; # Let the user play Rogue on TTY 8 during the installation. - services.rogue.enable = true; + #services.rogue.enable = true; # Disable some other stuff we don't need. security.sudo.enable = false; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a8090dc62ee..c1dae2a34fa 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -74,7 +74,7 @@ let # Make sure that we get a login prompt etc. $machine->succeed("echo hello"); #$machine->waitForUnit('getty@tty2'); - $machine->waitForUnit("rogue"); + #$machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); # Wait for hard disks to appear in /dev From 0f0bf06ac6f337bbb8ef31536e3c1a47d584f2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Aug 2017 22:06:07 +0200 Subject: [PATCH 4/5] wyrd: fixup by using older ncurses (cherry picked from commit 8f713e881e6f96bc99072e6a863b4069e705bbd6) --- pkgs/top-level/ocaml-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 64656990d0e..5bb79186d8c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -904,7 +904,9 @@ let # Apps / from all-packages - wyrd = callPackage ../tools/misc/wyrd { }; + wyrd = callPackage ../tools/misc/wyrd { + ncurses = pkgs.ncurses5; + }; haxe = callPackage ../development/compilers/haxe { }; From c07e9ba3e7441a66edd05adb1a755a994419dca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 30 Aug 2017 21:15:08 +0200 Subject: [PATCH 5/5] squishyball: fixup by using older ncurses --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb3b8b419ea..147223ce200 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16064,7 +16064,9 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - squishyball = callPackage ../applications/audio/squishyball { }; + squishyball = callPackage ../applications/audio/squishyball { + ncurses = ncurses5; + }; ssvnc = callPackage ../applications/networking/remote/ssvnc { };