nscd-fix: RIP

3 files changed, 0 insertions, 26 deletions

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index bb84b187..c0fa3828 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -12,7 +12,6 @@
     <stockholm/krebs/2configs/buildbot-stockholm.nix>
     <stockholm/krebs/2configs/binary-cache/nixos.nix>
     <stockholm/krebs/2configs/ircd.nix>
-    <stockholm/krebs/2configs/nscd-fix.nix>
     <stockholm/krebs/2configs/reaktor2.nix>
     <stockholm/krebs/2configs/wiki.nix>
   ];
diff --git a/krebs/2configs/nscd-fix.nix b/krebs/2configs/nscd-fix.nix
deleted file mode 100644
index 8e5909e7..00000000
--- a/krebs/2configs/nscd-fix.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-with import <stockholm/lib>;
-{ pkgs, ... }: let
-
-  enable = versionOlderThan "19.03";
-
-  versionOlderThan = v:
-    compareVersions
-      (versions.majorMinor version)
-      (versions.majorMinor v)
-      == -1;
-
-  warning = ''
-    Using custom services.nscd.config because
-    https://github.com/NixOS/nixpkgs/pull/50316
-  '';
-
-in
-  optionalAttrs enable (trace warning {
-    services.nscd.enable = mkForce true;
-    services.nscd.config = mkForce (readFile (pkgs.fetchurl {
-      url = https://raw.githubusercontent.com/arianvp/nixpkgs/1d5f4cb/nixos/modules/services/system/nscd.conf;
-      sha256 = "1jlddk38lyynjn51zx3xi1nc29ahajyh0qg48qbq6dqlsrn3wxqs";
-    }));
-  })
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index f59988b7..babcb51d 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -2,7 +2,6 @@ with import <stockholm/lib>;
 { config, pkgs, ... }:
 {
   imports = [
-    <stockholm/krebs/2configs/nscd-fix.nix>
     ./binary-cache/client.nix
     ./backup.nix
     ./gc.nix