summary refs log tree commit diff
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-09-22 09:39:34 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2021-09-22 11:20:30 +0200
commit88b3c29cf1ddb7582b11d89af16b750e44b5bc67 (patch)
tree765cb16de5521b5596b963277361e470307c8013
parent3f10924949681e88220394a4e3604b327f876e39 (diff)
downloadnixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.tar
nixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.tar.gz
nixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.tar.bz2
nixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.tar.lz
nixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.tar.xz
nixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.tar.zst
nixpkgs-88b3c29cf1ddb7582b11d89af16b750e44b5bc67.zip
nixos: heimdalFull -> heimdal
The package has been renamed in 2018-05-01.
-rw-r--r--nixos/modules/config/krb5/default.nix2
-rw-r--r--nixos/modules/services/system/kerberos/heimdal.nix2
-rw-r--r--nixos/tests/kerberos/heimdal.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index c2302451d70..6db2a7e4039 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -84,7 +84,7 @@ in {
         type = types.package;
         default = pkgs.krb5Full;
         defaultText = "pkgs.krb5Full";
-        example = literalExample "pkgs.heimdalFull";
+        example = literalExample "pkgs.heimdal";
         description = ''
           The Kerberos implementation that will be present in
           <literal>environment.systemPackages</literal> after enabling this
diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixos/modules/services/system/kerberos/heimdal.nix
index f0e56c7951a..837c59caa56 100644
--- a/nixos/modules/services/system/kerberos/heimdal.nix
+++ b/nixos/modules/services/system/kerberos/heimdal.nix
@@ -27,7 +27,7 @@ in
 {
   # No documentation about correct triggers, so guessing at them.
 
-  config = mkIf (cfg.enable && kerberos == pkgs.heimdalFull) {
+  config = mkIf (cfg.enable && kerberos == pkgs.heimdal) {
     systemd.services.kadmind = {
       description = "Kerberos Administration Daemon";
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix
index 8abae667d04..391a61cc9a9 100644
--- a/nixos/tests/kerberos/heimdal.nix
+++ b/nixos/tests/kerberos/heimdal.nix
@@ -9,7 +9,7 @@ import ../make-test-python.nix ({pkgs, ...}: {
     };
     krb5 = {
       enable = true;
-      kerberos = pkgs.heimdalFull;
+      kerberos = pkgs.heimdal;
       libdefaults = {
         default_realm = "FOO.BAR";
       };