From de2782117a76584d7a5437c7e406112b95687302 Mon Sep 17 00:00:00 2001
From: Denis Lehmann <denis@opaque.tech>
Date: Thu, 11 Mar 2021 18:52:46 +0100
Subject: [PATCH] update Nix file

---
 default.nix | 21 ---------------------
 shell.nix   | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 21 deletions(-)
 delete mode 100644 default.nix
 create mode 100644 shell.nix

diff --git a/default.nix b/default.nix
deleted file mode 100644
index 1c000b4..0000000
--- a/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-with import <nixpkgs> {};
-
-stdenv.mkDerivation {
-  name = "myPythonEnv";
-  buildInputs = with pkgs; [
-    python37Full
-    python37Packages.virtualenv
-    pandoc
-  ];
-  src = null;
-  shellHook = ''
-    if [ ! -d .venv ]; then
-      python -m venv .venv
-    fi
-    source .venv/bin/activate
-    pip install --upgrade pip
-    if [ -s requirements.txt ]; then
-      pip install -r requirements.txt
-    fi
-  '';
-}
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..eb0e5d6
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,38 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  name = "python-environment";
+  buildInputs = with pkgs; [
+    pandoc
+    python3
+    python3Packages.virtualenv
+  ];
+  shellHook = ''
+    function log_header {
+      echo -ne "==> \e[32m\e[1m$1\e[0m\n\n"
+    }
+    function log_subheader {
+      echo -ne "--> \e[33m\e[1m$1\e[0m\n\n"
+    }
+    function log {
+      echo -ne "    $1\n"
+    }
+
+    echo ""
+    log_header "python_environment"
+    if [ ! -d .venv ]; then
+      python -m venv .venv
+    fi
+    source .venv/bin/activate
+    log_subheader "upgrading pip"
+    pip install --upgrade pip
+    echo ""
+    if [ -s requirements.txt ]; then
+      log_subheader "found requirements.txt, installing packages"
+      pip install -r requirements.txt
+      echo ""
+    fi
+    log_header "package versions"
+    log "$(python --version)"
+    log "$(pip --version)"
+  '';
+}