diff --git a/default.nix b/default.nix deleted file mode 100644 index bfa85ab7c..000000000 --- a/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ mkDerivation, alex, array, base, bytestring, Cabal, cgi -, containers, directory, exceptions, filepath, happy, haskeline -, HTF, httpd-shed, HUnit, json, mtl, network, network-uri -, old-locale, parallel, pretty, process, random, stdenv, terminfo -, time, time-compat, unix, utf8-string -}: -mkDerivation { - pname = "gf"; - version = "3.9"; - src = ./.; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring cgi containers directory exceptions filepath - haskeline httpd-shed json mtl network network-uri old-locale - parallel pretty process random terminfo time time-compat unix - utf8-string - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base Cabal directory filepath HTF HUnit process - ]; - doCheck = false; - postPatch = '' - sed -i "s|\"-s\"|\"\"|" ./Setup.hs - sed -i "s|numJobs (bf bi)++||" ./Setup.hs - ''; - preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH''; - homepage = "http://www.grammaticalframework.org/"; - description = "Grammatical Framework"; - license = "unknown"; -} diff --git a/gf.nix b/gf.nix deleted file mode 100644 index 2926651f3..000000000 --- a/gf.nix +++ /dev/null @@ -1,19 +0,0 @@ -let - # We import the package hierarchy from the NIX_PATH. - pkgs = import {}; - - # - # The `cgi` package has some out-of-date upper bounds. - # Instead of fixing that upstream, we can use the "jailbreak" - # function in Nix, which patches away the upper bounds. - # - # This isn't ideal, but it lets us build the dependency. - # - jailbreak = pkgs.haskell.lib.doJailbreak; - haskellPackages = pkgs.haskellPackages.extend (self: super: { - cgi = jailbreak super.cgi; - }); - -in { - gf = haskellPackages.callPackage (import ./default.nix) {}; -}