alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

samba fix and xserver cleanup

Browse source 
svn path=/nixos/trunk/; revision=8791
This commit is contained in:
Wouter den Breejen 2007-05-28 15:39:25 +00:00
parent 2e50d9cd58
commit f8d77aa58e
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
upstart-jobs/default.nix
View file

@ -135,12 +135,6 @@ import ../upstart-jobs/gather.nix {
allowSFTP = config.get ["services" "sshd" "allowSFTP"]; allowSFTP = config.get ["services" "sshd" "allowSFTP"];
}) })
# Samba service.
++ optional ["services" "samba" "enable"]
(import ../upstart-jobs/samba.nix {
inherit (pkgs) samba glibc pwdutils;
})
# NTP daemon. # NTP daemon.
++ optional ["services" "ntp" "enable"] ++ optional ["services" "ntp" "enable"]
(import ../upstart-jobs/ntpd.nix { (import ../upstart-jobs/ntpd.nix {
@ -155,7 +149,9 @@ import ../upstart-jobs/gather.nix {
inherit config; inherit config;
inherit (pkgs) stdenv writeText lib xterm slim xorg mesa inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
gnome compiz feh kdebase kdelibs xkeyboard_config gnome compiz feh kdebase kdelibs xkeyboard_config
openssh x11_ssh_askpass; openssh x11_ssh_askpass nvidiaDrivers;
libX11 = pkgs.xlibs.libX11;
libXext = pkgs.xlibs.libXext;
fontDirectories = import ../system/fonts.nix {inherit pkgs;}; fontDirectories = import ../system/fonts.nix {inherit pkgs;};
}) })
@ -166,6 +162,13 @@ import ../upstart-jobs/gather.nix {
inherit (pkgs) glibc pwdutils; inherit (pkgs) glibc pwdutils;
}) })
# Samba service.
++ optional ["services" "samba" "enable"]
(import ../upstart-jobs/samba.nix {
inherit pkgs;
inherit (pkgs) glibc pwdutils samba;
})
# CUPS (printing) daemon. # CUPS (printing) daemon.
++ optional ["services" "printing" "enable"] ++ optional ["services" "printing" "enable"]
(import ../upstart-jobs/cupsd.nix { (import ../upstart-jobs/cupsd.nix {

4
upstart-jobs/samba.nix
View file

@ -1,9 +1,9 @@
{samba, glibc, pwdutils}: {pkgs, samba, glibc, pwdutils}:
let let
user="smbguest"; user="smbguest";
group="smbguest"; group="smbguest";
in in
{ {

12
upstart-jobs/xserver.nix
View file

@ -3,6 +3,7 @@
, kdelibs, kdebase , kdelibs, kdebase
, xkeyboard_config , xkeyboard_config
, openssh, x11_ssh_askpass , openssh, x11_ssh_askpass
, nvidiaDrivers, libX11, libXext
, config , config
@ -23,13 +24,10 @@ let
optional = condition: x: if condition then [x] else []; optional = condition: x: if condition then [x] else [];
#TODO, make these parameters #Beryl parameters
nvidiaDrivers = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).nvidiaDrivers; #berylcore
#berylcore = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylCore; #berylmanager
#berylmanager = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylManager; #berylemerald
#berylemerald = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylEmerald;
libX11 = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libX11;
libXext = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libXext;
# Get a bunch of user settings. # Get a bunch of user settings.
videoDriver = getCfg "videoDriver"; videoDriver = getCfg "videoDriver";