commit 6b95cf646c157fb23ebc742e5f6d1fce7ceafd21 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/profiles/installation-device.nix

···

       28
       28
        
           services.nixosManual.showManual = true;

     

       29
       29
        
       

     

       30
       30
        
           # Let the user play Rogue on TTY 8 during the installation.

     

       31
       31
       -
           services.rogue.enable = true;

     

       31
       31
       +
           #services.rogue.enable = true;

     

       32
       32
        
       

     

       33
       33
        
           # Disable some other stuff we don't need.

     

       34
       34
        
           security.sudo.enable = false;

+1 -1

nixos/tests/installer.nix

···

       74
       74
        
             # Make sure that we get a login prompt etc.

     

       75
       75
        
             $machine->succeed("echo hello");

     

       76
       76
        
             #$machine->waitForUnit('getty@tty2');

     

       77
       77
       -
             $machine->waitForUnit("rogue");

     

       77
       77
       +
             #$machine->waitForUnit("rogue");

     

       78
       78
        
             $machine->waitForUnit("nixos-manual");

     

       79
       79
        
       

     

       80
       80
        
             # Wait for hard disks to appear in /dev

+4 -8

pkgs/misc/themes/e17gtk/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gnome3 }:

     

       2
       2
       -
       let

     

       3
       3
       -
         gnome3 = { version = "3.22"; }; # FIXME

     

       4
       4
       -
       in

     

       1
       1
       +
       { stdenv, fetchFromGitHub }:

     

       2
       2
       +
       

     

       5
       3
        
       stdenv.mkDerivation rec {

     

       6
       4
        
         name = "e17gtk-${version}";

     

       7
       7
       -
         version = "${gnome3.version}.1";

     

       5
       5
       +
         version = "3.22.1";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchFromGitHub {

     

       10
       8
        
           owner = "tsujan";

     

       11
       9
        
           repo = "E17gtk";

     

       12
       10
        
           rev = "V${version}";

     

       13
       13
       -
           sha256 = {

     

       14
       14
       -
             "3.22" = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8";

     

       15
       15
       -
           }."${gnome3.version}";

     

       11
       11
       +
           sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8";

     

       16
       12
        
         };

     

       17
       13
        
       

     

       18
       14
        
         installPhase = ''

+6 -2

pkgs/top-level/all-packages.nix

···

       16072
       16072
        
       

     

       16073
       16073
        
         spideroak = callPackage ../applications/networking/spideroak { };

     

       16074
       16074
        
       

     

       16075
       16075
       -
         squishyball = callPackage ../applications/audio/squishyball { };

     

       16075
       16075
       +
         squishyball = callPackage ../applications/audio/squishyball {

     

       16076
       16076
       +
           ncurses = ncurses5;

     

       16077
       16077
       +
         };

     

       16076
       16078
        
       

     

       16077
       16079
        
         ssvnc = callPackage ../applications/networking/remote/ssvnc { };

     

       16078
       16080
        
       

     
···

       17522
       17524
        
       

     

       17523
       17525
        
         rimshot = callPackage ../games/rimshot { love = love_0_7; };

     

       17524
       17526
        
       

     

       17525
       17525
       -
         rogue = callPackage ../games/rogue { };

     

       17527
       17527
       +
         rogue = callPackage ../games/rogue {

     

       17528
       17528
       +
           ncurses = ncurses5;

     

       17529
       17529
       +
         };

     

       17526
       17530
        
       

     

       17527
       17531
        
         robotfindskitten = callPackage ../games/robotfindskitten { };

     

       17528
       17532

+3 -1

pkgs/top-level/ocaml-packages.nix

···

       904
       904
        
       

     

       905
       905
        
           # Apps / from all-packages

     

       906
       906
        
       

     

       907
       907
       -
           wyrd = callPackage ../tools/misc/wyrd { };

     

       907
       907
       +
           wyrd = callPackage ../tools/misc/wyrd {

     

       908
       908
       +
             ncurses = pkgs.ncurses5;

     

       909
       909
       +
           };

     

       908
       910
        
       

     

       909
       911
        
           haxe = callPackage ../development/compilers/haxe { };

     

       910
       912