Updated nixpkgs used for IHP development to use the same as ihp apps

digitallyinduced · Oct 18, 2020 · c9a5ca7 · c9a5ca7
1 parent 49816c2
commit c9a5ca7
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/NixSupport/pkgs.nix b/NixSupport/pkgs.nix
@@ -1,24 +1,24 @@
 let
     dontCheckPackages = [
         "cabal-helper"
+        "generic-lens"
         "filesystem-conduit"
         "tz"
-        "http2-client"
         "typerep-map"
-        "hslogger"
+        "trifecta"
+        "hackage-security"
     ];
 
     doJailbreakPackages = [
         "filesystem-conduit"
-        "ihp"
         "http-media"
-        "countable-inflections"
-        "haskell-language-server"
-        "hslogger"
+        "aeson"
+        "wreq"
+        "ghcide"
+        "brittany"
     ];
 
-    dontHaddockPackages = [
-    ];
+    dontHaddockPackages = [];
 
     nixPkgsRev = "c985bf793e6ab7d54a9182381b4b610fe0ae6936";
     nixPkgsSha256 = "0zsj9imjbnhkb65r169xxqmjgqd5593insrvncvabg1iqdsrcxz1";
@@ -47,10 +47,15 @@ let
 
     composeExtensionsList = pkgs.lib.fold pkgs.lib.composeExtensions (_: _: {});
 
-    # More exotic overrides go here
     manualOverrides = haskellPackagesNew: haskellPackagesOld: {
-      ihp = pkgs.haskell.lib.doJailbreak (pkgs.haskell.lib.allowInconsistentDependencies haskellPackagesOld.ihp);
-      time_1_9_3 = pkgs.haskell.lib.dontCheck haskellPackagesOld.time_1_9_3;
+        haskell-language-server = haskellPackagesOld.haskell-language-server.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        hls-plugin-api = haskellPackagesOld.hls-plugin-api.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        yaml = haskellPackagesOld.yaml.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        lsp-test = haskellPackagesOld.lsp-test.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        haskell-lsp-types = haskellPackagesOld.haskell-lsp-types.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        haskell-lsp = haskellPackagesOld.haskell-lsp.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        aeson-pretty = haskellPackagesOld.aeson-pretty.overrideScope ( self: super: { aeson = pkgs.haskell.lib.dontCheck haskellPackagesNew.aeson_1_5_2_0; } );
+        aeson = pkgs.haskell.lib.dontCheck haskellPackagesOld.aeson_1_5_2_0;
     };
 
     #mkDerivation = args: super.mkDerivation (args // {