From 022f427afe9bab50ece321442f6a62899771bbbc Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Tue, 29 Oct 2019 21:07:35 +0100
Subject: Merge shell environments

---
 ldc_2d/cpp/shell.nix    | 42 ------------------------------------------
 ldc_2d/opencl/shell.nix | 45 ---------------------------------------------
 shell.nix               | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 87 deletions(-)
 delete mode 100644 ldc_2d/cpp/shell.nix
 delete mode 100644 ldc_2d/opencl/shell.nix
 create mode 100644 shell.nix

diff --git a/ldc_2d/cpp/shell.nix b/ldc_2d/cpp/shell.nix
deleted file mode 100644
index 0b9db9f..0000000
--- a/ldc_2d/cpp/shell.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ pkgs ? import <nixpkgs> { }, ... }:
-
-pkgs.stdenvNoCC.mkDerivation rec {
-  name = "boltzgen-env";
-  env = pkgs.buildEnv { name = name; paths = buildInputs; };
-
-  buildInputs = let
-    boltzgen = pkgs.python3.pkgs.buildPythonPackage rec {
-      pname = "boltzgen";
-      version = "0.1";
-
-      src = pkgs.fetchFromGitHub {
-        owner  = "KnairdA";
-        repo   = "boltzgen";
-        rev    = "v0.1.1";
-        sha256 = "03fv7krhgc43gfjill8wb4aafr8xi69i2yh9zr68knnmrkrb8vpi";
-      };
-
-      propagatedBuildInputs = with pkgs.python37Packages; [
-        sympy
-        numpy
-        Mako
-      ];
-
-      doCheck = false;
-    };
-
-    local-python = pkgs.python3.withPackages (python-packages: with python-packages; [
-      boltzgen
-    ]);
-
-  in [
-    local-python
-    pkgs.gcc9
-    pkgs.cmake
-  ];
-
-  shellHook = ''
-    export NIX_SHELL_NAME="${name}"
-    export PYTHONPATH="$PWD:$PYTHONPATH"
-  '';
-}
diff --git a/ldc_2d/opencl/shell.nix b/ldc_2d/opencl/shell.nix
deleted file mode 100644
index 462394e..0000000
--- a/ldc_2d/opencl/shell.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs ? import <nixpkgs> { }, ... }:
-
-pkgs.stdenvNoCC.mkDerivation rec {
-  name = "pycl-env";
-  env = pkgs.buildEnv { name = name; paths = buildInputs; };
-
-  buildInputs = let
-    boltzgen = pkgs.python3.pkgs.buildPythonPackage rec {
-      pname = "boltzgen";
-      version = "0.1";
-
-      src = pkgs.fetchFromGitHub {
-        owner  = "KnairdA";
-        repo   = "boltzgen";
-        rev    = "v0.1.1";
-        sha256 = "03fv7krhgc43gfjill8wb4aafr8xi69i2yh9zr68knnmrkrb8vpi";
-      };
-
-      propagatedBuildInputs = with pkgs.python37Packages; [
-        sympy
-        numpy
-        Mako
-      ];
-
-      doCheck = false;
-    };
-
-    local-python = pkgs.python3.withPackages (python-packages: with python-packages; [
-      boltzgen
-      numpy
-      pyopencl setuptools
-      matplotlib
-    ]);
-
-  in [
-    local-python
-    pkgs.opencl-info
-  ];
-
-  shellHook = ''
-    export NIX_SHELL_NAME="${name}"
-    export PYOPENCL_COMPILER_OUTPUT=1
-    export PYTHONPATH="$PWD:$PYTHONPATH"
-  '';
-}
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..0ccedfa
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,47 @@
+{ pkgs ? import <nixpkgs> { }, ... }:
+
+pkgs.stdenvNoCC.mkDerivation rec {
+  name = "boltzgen-env";
+  env = pkgs.buildEnv { name = name; paths = buildInputs; };
+
+  buildInputs = let
+    boltzgen = pkgs.python3.pkgs.buildPythonPackage rec {
+      pname = "boltzgen";
+      version = "0.1";
+
+      src = pkgs.fetchFromGitHub {
+        owner  = "KnairdA";
+        repo   = "boltzgen";
+        rev    = "v0.1.1";
+        sha256 = "03fv7krhgc43gfjill8wb4aafr8xi69i2yh9zr68knnmrkrb8vpi";
+      };
+
+      propagatedBuildInputs = with pkgs.python37Packages; [
+        sympy
+        numpy
+        Mako
+      ];
+
+      doCheck = false;
+    };
+
+    local-python = pkgs.python3.withPackages (python-packages: with python-packages; [
+      boltzgen
+      numpy
+      pyopencl setuptools
+      matplotlib
+    ]);
+
+  in with pkgs; [
+    local-python
+    opencl-info
+    gcc9
+    cmake
+  ];
+
+  shellHook = ''
+    export NIX_SHELL_NAME="${name}"
+    export PYOPENCL_COMPILER_OUTPUT=1
+    export PYTHONPATH="$PWD:$PYTHONPATH"
+  '';
+}
-- 
cgit v1.2.3