From 144f3f29662739cba4f4d27e0b1ab7fbdf1cbc8a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 29 Mar 2020 15:23:28 +0200
Subject: [PATCH] Move python and pandoc

---
 lib/default.nix  | 1 +
 pkgs/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 0950e9c0..610d48e2 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -39,6 +39,7 @@ rec {
     p.hledger-lib
     p.releaser
     p.megaparsec
+    p.pandoc
   ]);
   haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
   writeHaskellScript =
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b9c1edb3..37966817 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -62,8 +62,8 @@ in rec {
   core-system-pkgs = {
     inherit neovim;
     inherit (pkgs)
-      gitFull gnumake python3 mkpasswd file wget curl wireguard gnupg mutt bind
-      liboping psmisc unzip rename whois lsof parted;
+      gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
+      psmisc unzip rename whois lsof parted python3;
   };
 
   extra-system-pkgs = {
@@ -166,8 +166,8 @@ in rec {
       meld icedtea8_web octave filezilla
 
       # tools & office
-      feh gimp imagemagick libreoffice-fresh pandoc xournal musescore handbrake
-      evince abcde beets
+      feh gimp imagemagick libreoffice-fresh xournal musescore handbrake evince
+      abcde beets
 
       #    teamviewer