From 05c69c361fc2e658bd88ca97e0512257902a8e3e Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 5 Nov 2014 03:40:41 +0100 Subject: make nix-env -f . -i work --- default.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index c298fa6..234f3d5 100644 --- a/default.nix +++ b/default.nix @@ -1,22 +1,4 @@ -{ pkgs ? import {}, devel ? false }: +{ pkgs ? import {} +}: -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 {} -- cgit v1.2.3