make nix-env -f . -i work

3 files changed, 24 insertions, 22 deletions

diff --git a/cgserver.nix b/cgserver.nix
new file mode 100644
index 0000000..840531c
--- /dev/null
+++ b/cgserver.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoparsec, filepath, httpTypes, ioStreams, safe
+, text, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cgserver";
+  version = "0.1.0.0";
+  src = ./.;
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec filepath httpTypes ioStreams safe text wai warp
+  ];
+  meta = {
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/default.nix b/default.nix
index c298fa6..234f3d5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,22 +1,4 @@
-{ pkgs ? import <nixpkgs> {}, devel ? false }:
+{ pkgs ? import <nixpkgs> {}
+}:
 
-with pkgs.haskellPackages;
-
-cabal.mkDerivation (self: {
-  pname = "cgserver";
-  version = "0.1.0.0";
-  src = if devel then ./. else pkgs.fetchgit {
-    url = http://viljetic.de/~tv/git/cgserver;
-    sha256 = "e48d52730d5c6eb190c9dd38b853c81441e3aae87b3ffbfeaa97cca28b94d8ce";
-    rev = "d0129ff4d13cedbc6d1b85cadddc724783c8002a";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec filepath httpTypes ioStreams safe text wai warp
-  ];
-  meta = {
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
+pkgs.haskellPackages.callPackage ./cgserver.nix {}
diff --git a/env.nix b/env.nix
index da5df4d..55d735c 100644
--- a/env.nix
+++ b/env.nix
@@ -16,7 +16,7 @@ let
 
   hsEnv = pkgs.haskellPackages_ghc783_profiling.ghcWithPackages
     (self : with self;
-      (callPackage ./. {}).nativeBuildInputs ++
+      (callPackage ./cgserver.nix {}).nativeBuildInputs ++
       [
         cabalInstall
       ]