movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into staging

Browse source
This commit is contained in:
Eelco Dolstra 2014-10-24 12:24:13 +02:00
commit f4be4f5e54
55 changed files with 661 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/users-groups.nix
View file

@ -184,7 +184,7 @@ let
type = with types; uniq (nullOr string);
default = null;
description = ''
The path to a file that contains the user's password. The password
The full path to a file that contains the user's password. The password
file is read on each system activation. The file should contain
exactly one line, which should be the password in an encrypted form
that is suitable for the <literal>chpasswd -e</literal> command.

4
nixos/modules/services/networking/polipo.nix
View file

@ -103,12 +103,8 @@ in
description = "caching web proxy";
after = [ "network.target" "nss-lookup.target" ];
wantedBy = [ "multi-user.target"];
preStart = ''
${pkgs.coreutils}/bin/chown polipo:polipo /var/cache/polipo -R
'';
serviceConfig = {
ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}";
ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
User = "polipo";
};
};

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -82,7 +82,7 @@ in {
services.upower.enable = config.powerManagement.enable;
services.upower.package = gnome3.upower;
fonts.fonts = [ pkgs.dejavu_fonts ];
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
services.xserver.desktopManager.session = singleton
{ name = "gnome3";

2
nixos/modules/services/x11/desktop-managers/kde4.nix
View file

@ -148,7 +148,7 @@ in
]
++ lib.optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled
++ lib.optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil
++ lib.optional config.networking.networkmanager.enable pkgs.kde4.networkmanagement
++ lib.optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm
++ [ nepomukConfig ] ++ phononBackendPackages;
environment.pathsToLink = [ "/share" ];