Skip to content

Commit 302ba8d

Browse files
committed
Fix unification-fd on experimental devshell
1 parent ba82c96 commit 302ba8d

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

experimental/build.nix

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
11
_: {
22
perSystem = { pkgs, config, inputs', ... }:
3+
let
4+
hpkgs = pkgs.haskellPackages.override {
5+
overrides = hself: hsuper: {
6+
# Can add/override packages here
7+
logict_0_8_0_0 =
8+
pkgs.haskell.lib.overrideCabal hsuper.logict {
9+
version = "0.8.0.0";
10+
sha256 = "sha256-/pJt8pW8Q995Qkc2DnoKDf3HeLzphviq26mP5SIo+1Y=";
11+
};
12+
unification-fd = # pkgs.haskell.lib.unmarkBroken hsuper.unification-fd;
13+
pkgs.haskell.lib.overrideCabal hsuper.unification-fd (_: {
14+
libraryHaskellDepends = [
15+
hsuper.base
16+
hsuper.containers
17+
hself.logict_0_8_0_0
18+
hsuper.mtl
19+
];
20+
broken = false;
21+
});
22+
};
23+
};
24+
in
325
{
4-
526
devShells.dev-experimental = pkgs.mkShell {
627
name = "experimental-env";
728
buildInputs = [
@@ -10,14 +31,14 @@ _: {
1031
# pkgs.dhall-lsp-server
1132
pkgs.dhall-json
1233

13-
(pkgs.haskellPackages.ghcWithPackages (hsPkgs: [
34+
(hpkgs.ghcWithPackages (hsPkgs: [
1435
hsPkgs.text
1536
hsPkgs.unification-fd
1637
hsPkgs.HUnit
1738
]))
1839

1940
pkgs.protobuf
20-
pkgs.haskellPackages.haskell-language-server
41+
hpkgs.haskell-language-server
2142
]
2243
++ (pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.swiPrologWithGui ])
2344
++ config.settings.shell.tools;

0 commit comments

Comments
 (0)