From e26c68f285ddaeafacd7eb0b78acd5693ab8de83 Mon Sep 17 00:00:00 2001
From: Denis Lehmann <denis@opaque.tech>
Date: Thu, 11 Mar 2021 09:37:54 +0100
Subject: [PATCH] move default.nix to shell.nix

---
 node_environment/{default.nix => shell.nix}   |  8 +++-----
 python_environment/{default.nix => shell.nix} | 10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)
 rename node_environment/{default.nix => shell.nix} (77%)
 rename python_environment/{default.nix => shell.nix} (74%)

diff --git a/node_environment/default.nix b/node_environment/shell.nix
similarity index 77%
rename from node_environment/default.nix
rename to node_environment/shell.nix
index 88581ef..8979379 100644
--- a/node_environment/default.nix
+++ b/node_environment/shell.nix
@@ -1,11 +1,9 @@
-with import <nixpkgs> {};
-
-stdenv.mkDerivation {
-  name = "myNodeEnv";
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  name = "node-environment";
   buildInputs = with pkgs; [
     nodejs
   ];
-  src = null;
   shellHook = ''
     mkdir -p .npm
     if [ -s global_packages.txt ]; then
diff --git a/python_environment/default.nix b/python_environment/shell.nix
similarity index 74%
rename from python_environment/default.nix
rename to python_environment/shell.nix
index a475d01..378fe0f 100644
--- a/python_environment/default.nix
+++ b/python_environment/shell.nix
@@ -1,12 +1,10 @@
-with import <nixpkgs> {};
-
-stdenv.mkDerivation {
-  name = "myPythonEnv";
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  name = "python-environment";
   buildInputs = with pkgs; [
-    python3Full
+    python3
     python3Packages.virtualenv
   ];
-  src = null;
   shellHook = ''
     if [ ! -d .venv ]; then
       python -m venv .venv