Merge: fixups to staging merge

None are large rebuilds; most are on staging already.

Changed files
+15 -13
nixos
modules
tests
pkgs
misc
themes
e17gtk
top-level
+1 -1
nixos/modules/profiles/installation-device.nix
···
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;
+1 -1
nixos/tests/installer.nix
···
# 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
+4 -8
pkgs/misc/themes/e17gtk/default.nix
···
-
{ 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 = ''
+6 -2
pkgs/top-level/all-packages.nix
···
spideroak = callPackage ../applications/networking/spideroak { };
-
squishyball = callPackage ../applications/audio/squishyball { };
+
squishyball = callPackage ../applications/audio/squishyball {
+
ncurses = ncurses5;
+
};
ssvnc = callPackage ../applications/networking/remote/ssvnc { };
···
rimshot = callPackage ../games/rimshot { love = love_0_7; };
-
rogue = callPackage ../games/rogue { };
+
rogue = callPackage ../games/rogue {
+
ncurses = ncurses5;
+
};
robotfindskitten = callPackage ../games/robotfindskitten { };
+3 -1
pkgs/top-level/ocaml-packages.nix
···
# Apps / from all-packages
-
wyrd = callPackage ../tools/misc/wyrd { };
+
wyrd = callPackage ../tools/misc/wyrd {
+
ncurses = pkgs.ncurses5;
+
};
haxe = callPackage ../development/compilers/haxe { };