JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: fixups to staging merge

Browse Source 
None are large rebuilds; most are on staging already.
This commit is contained in:
Vladimír Čunát 2017-08-30 21:17:17 +02:00
commit 6b95cf646c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/profiles/installation-device.nix
View File

@ -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;

2
nixos/tests/installer.nix
View File

@ -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

12
pkgs/misc/themes/e17gtk/default.nix
View File

@ -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 = ''

8
pkgs/top-level/all-packages.nix
View File

@ -16072,7 +16072,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 { };
@ -17522,7 +17524,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 { };

4
pkgs/top-level/ocaml-packages.nix
View File

@ -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 { };