From b2c6b6c2f9fe07ae20b4594daac4dc773e41ac35 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 26 Oct 2019 15:30:50 +0200
Subject: [PATCH] 19.09: fixing lektor

---
 modules/services/lektor.nix | 2 +-
 pkgs/default.nix            | 8 ++++----
 system/desktop/packages.nix | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/services/lektor.nix b/modules/services/lektor.nix
index e618840..6b00392 100644
--- a/modules/services/lektor.nix
+++ b/modules/services/lektor.nix
@@ -168,7 +168,7 @@ in {
         cd ~/${cfg.user} && \
         ${pkgs.git}/bin/git pull && \
         ${optionalString (cfg.additionalScript != null) "${cfg.additionalScript} &&"} \
-        ${pkgs.lektor}/bin/lektor server \
+        ${pkgs.python36Packages.lektor}/bin/lektor server \
           --host ${cfg.bind} \
           --port ${toString cfg.port}
       '';
diff --git a/pkgs/default.nix b/pkgs/default.nix
index a11057d..21153df 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -65,9 +65,9 @@ in
     sha256 = "04j6gcb6ayrcf7rxr0bkgd48zppiryhdyv7mvp0q12ngdkf2yagd";
   }) { };
 
-  lektor = let
-    python = import ./lektor-with-plugins/requirements.nix { pkgs = super.pkgs; };
-  in
-    python.packages.Lektor;
+  #lektor = let
+  #  python = import ./lektor-with-plugins/requirements.nix { pkgs = super.pkgs; };
+  #in
+  #  python.packages.Lektor;
 
 }
diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix
index e308d27..3014769 100644
--- a/system/desktop/packages.nix
+++ b/system/desktop/packages.nix
@@ -227,7 +227,6 @@ in {
     ncmpcpp
 
     nixos-generators
-    lektor
 
     shellcheck