diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:03:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:53:38 +0200 |
| commit | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (patch) | |
| tree | ef852f77f02c1636e2ee215623d6a20e87174b9e /nixos/modules/config | |
| parent | 81df0354290389128077e00edfd2368eeeea0c24 (diff) | |
| parent | 3d932ba135f9fe7eb649269543276dffa7aa563a (diff) | |
| download | nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.gz nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.bz2 nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.lz nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.xz nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.zst nixlib-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/krb5.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/system-path.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/config/unix-odbc-drivers.nix | 17 |
3 files changed, 13 insertions, 7 deletions
diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix index b845ef69a753..d318b7207429 100644 --- a/nixos/modules/config/krb5.nix +++ b/nixos/modules/config/krb5.nix @@ -173,6 +173,8 @@ in ${cfg.domainRealm} = ${cfg.defaultRealm} .mit.edu = ATHENA.MIT.EDU mit.edu = ATHENA.MIT.EDU + .exchange.mit.edu = EXCHANGE.MIT.EDU + exchange.mit.edu = EXCHANGE.MIT.EDU .media.mit.edu = MEDIA-LAB.MIT.EDU media.mit.edu = MEDIA-LAB.MIT.EDU .csail.mit.edu = CSAIL.MIT.EDU diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 8c4170597826..3054439da655 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -40,6 +40,7 @@ let pkgs.time pkgs.texinfoInteractive pkgs.utillinux + pkgs.which # 88K size ]; in diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index eea6477fff23..9565a09b3a1e 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -5,14 +5,21 @@ with lib; # unixODBC drivers (this solution is not perfect.. Because the user has to # ask the admin to add a driver.. but it's simple and works -{ +let + iniDescription = pkg: '' + [${pkg.fancyName}] + Description = ${pkg.meta.description} + Driver = ${pkg}/${pkg.driver} + ''; + +in { ###### interface options = { environment.unixODBCDrivers = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs.unixODBCDrivers; [ mysql psql psqlng ]"; + example = literalExample "with pkgs.unixODBCDrivers; [ sqlite psql ]"; description = '' Specifies Unix ODBC drivers to be registered in <filename>/etc/odbcinst.ini</filename>. You may also want to @@ -25,11 +32,7 @@ with lib; ###### implementation config = mkIf (config.environment.unixODBCDrivers != []) { - - environment.etc."odbcinst.ini".text = - let inis = map (x : x.ini) config.environment.unixODBCDrivers; - in lib.concatStringsSep "\n" inis; - + environment.etc."odbcinst.ini".text = concatMapStringsSep "\n" iniDescription config.environment.unixODBCDrivers; }; } |