diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-24 16:07:50 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-24 16:07:50 +0000 |
| commit | 5c6e1efa41be59acc7c36cecf610aa666eff986b (patch) | |
| tree | e02b22f97370acd69c306184e1ebab99a009494d /pkgs/system/all-packages-generic.nix | |
| parent | e473e8691c067b4aafd2f428c930d11922b4802a (diff) | |
| download | nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.tar nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.tar.gz nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.tar.bz2 nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.tar.lz nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.tar.xz nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.tar.zst nixpkgs-5c6e1efa41be59acc7c36cecf610aa666eff986b.zip | |
add pam (but first test it on NixOS too)
svn path=/nixpkgs/trunk/; revision=4124
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index aaaaad40bfc..7d90b933b40 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1283,6 +1283,10 @@ rec { inherit stdenv mingetty shadowutils; }; + pam = (import ../os-specific/linux/pam) { + inherit stdenv fetchurl; + }; + #nfsUtils = (import ../os-specific/linux/nfs-utils) { # inherit fetchurl stdenv; #}; @@ -1377,9 +1381,9 @@ rec { ### APPLICATIONS - #openoffice = (import ../applications/office/openoffice) { - # inherit fetchurl stdenv tcsh; - #}; + openoffice = (import ../applications/office/openoffice) { + inherit fetchurl stdenv tcsh cups; + }; cvs = (import ../applications/version-management/cvs) { inherit fetchurl stdenv vim; |