nix: cleanup

diff --git a/default.nix b/default.nix
index 532e2927a53203996bc4c74fce377800734497ad..98636f8b9d445cbbc51d5e0905fa99401a5009f0 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -7,29 +7,13 @@ let
     if ghc == null
     then pkgs.haskellPackages
     else pkgs.haskell.packages.${ghc};
-  hs = haskellPackages.extend (with pkgs.haskell.lib;
-    hself: hsuper:
+  hs = haskellPackages.extend (with pkgs.haskell.lib; hself: hsuper:
     {
-      data-fix = doJailbreak hsuper.data-fix;
-      primitive = doJailbreak hsuper.primitive;
-      assoc = doJailbreak hsuper.assoc;
-      these = doJailbreak hsuper.these;
-      dump-core = dontCheck (unmarkBroken hsuper.dump-core);
-      #profunctors = doJailbreak (unmarkBroken hsuper.profunctors);
-      #th-expand-syns = doJailbreak (unmarkBroken hsuper.th-expand-syns);
-      profunctors = dontCheck (unmarkBroken (doJailbreak (hsuper.callHackageDirect
-        { pkg = "profunctors";
-          ver = "5.6.2";
-          sha256 = "sha256-Vrlp6lvMNi+Bk+AHBMbnQE9NVzdASrcrFaWbkJew9qU=";
-        } {})));
-      system-fileio = doJailbreak hsuper.system-fileio;
-      turtle = doJailbreak hsuper.turtle;
-
       #symantic-parser = enableExecutableProfiling (doCheck ( hself.callCabal2nix "symantic-parser" ./. {}));
-    } //
-    packageSourceOverrides {
-      symantic-parser = ./.;
-    } hself hsuper
+      # FIXME: this should not be necessary, but haskellPackages.ormolu is currently broken.
+      ormolu = pkgs.ormolu;
+      symantic-parser = buildFromSdist (hself.callCabal2nix "symantic-parser" ./. {});
+    }
   );
 in hs.symantic-parser // {
   shell = hs.shellFor {
@@ -45,6 +29,7 @@ in hs.symantic-parser // {
     buildInputs = [
       #hs.ghcid
       pkgs.ormolu
+      pkgs.cabal2nix
       #hs.hlint
       #pkgs.nixpkgs-fmt
     ];

diff --git a/symantic-parser.cabal b/symantic-parser.cabal
index b1fc2d5ced75bb3ea2fd3cf1c7bdb511e5310cb0..e6e37bc3036e8a52d17c1e9cb5bfdf3978bb4a84 100644 (file)
--- a/symantic-parser.cabal
+++ b/symantic-parser.cabal
@@ -153,11 +153,13 @@ test-suite symantic-parser-test
     text >= 1.2,
     -- time >= 1.9,
     transformers >= 0.4,
-    turtle >= 1.5,
     -- QuickCheck >= 2.0,
     -- tasty-quickcheck,
     unix >= 2.7,
     unordered-containers
+  -- FIXME: add when haskellPackages.ormolu has been unbroken
+  -- build-tool-depends:
+  --   ormolu:ormolu >= 1.5
   if flag(dump-core)
     build-depends: dump-core
     ghc-options: -fplugin=DumpCore