update ghc to 8.6.4, nixpkgs base to 20.09
- relaxes some version constraints as dirty update quickfix - removes hie integration as that project is abandoned, todo: switch to haskell-languageserver instead
This commit is contained in:
parent
9d8df6d3d8
commit
ea14ff9b09
|
@ -46,7 +46,7 @@ category: Network
|
||||||
extra-source-files: CHANGELOG.md
|
extra-source-files: CHANGELOG.md
|
||||||
|
|
||||||
common deps
|
common deps
|
||||||
build-depends: base ^>=4.12.0.0, containers ^>=0.6.0.1, bytestring, utf8-string ^>=1.0.1.1, network ^>=2.8.0.1, time ^>=1.8.0.2, cmdargs ^>= 0.10, cryptonite ^>= 0.25, memory, async, stm, asn1-encoding, asn1-types, asn1-parse, publicsuffix, network-byte-order, safe, iproute, mtl, random, servant, servant-server, servant-client, warp, text, unordered-containers, hashable, unicode-transforms, http-client, http-types, unbounded-delays, dlist, formatting
|
build-depends: base >=4, containers ^>=0.6.0.1, bytestring, utf8-string ^>=1.0.1.1, network ^>=3.1, time, cmdargs ^>= 0.10, cryptonite, memory, async, stm, asn1-encoding, asn1-types, asn1-parse, publicsuffix, network-byte-order, safe, iproute, mtl, random, servant, servant-server, servant-client, warp, text, unordered-containers, hashable, unicode-transforms, http-client, http-types, unbounded-delays, dlist, formatting
|
||||||
ghc-options: -Wall -Wpartial-fields -O2
|
ghc-options: -Wall -Wpartial-fields -O2
|
||||||
|
|
||||||
|
|
||||||
|
|
19
default.nix
19
default.nix
|
@ -1,26 +1,18 @@
|
||||||
{
|
{
|
||||||
compiler ? "ghc865",
|
compiler ? "ghc884"
|
||||||
withHIE ? false
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
# pin all-hies for getting the language server
|
|
||||||
all-hies = fetchTarball {
|
|
||||||
url = "https://github.com/infinisil/all-hies/tarball/b8fb659620b99b4a393922abaa03a1695e2ca64d";
|
|
||||||
sha256 = "sha256:0br6wsqpfk1lzz90f7zw439w1ir2p54268qilw9l2pk6yz7ganfx";
|
|
||||||
};
|
|
||||||
pkgs = import (
|
pkgs = import (
|
||||||
builtins.fetchGit {
|
builtins.fetchGit {
|
||||||
name = "nixpkgs-pinned";
|
name = "nixpkgs-pinned";
|
||||||
url = https://github.com/NixOS/nixpkgs/;
|
url = https://github.com/NixOS/nixpkgs/;
|
||||||
ref = "refs/heads/release-20.03";
|
ref = "refs/heads/release-20.09";
|
||||||
rev = "faf5bdea5d9f0f9de26deaa7e864cdcd3b15b4e8";
|
rev = "e065200fc90175a8f6e50e76ef10a48786126e1c";
|
||||||
}) {
|
}) {
|
||||||
# Pass no config for purity
|
# Pass no config for purity
|
||||||
config = {};
|
config = {};
|
||||||
overlays = if withHIE then [
|
overlays = [];
|
||||||
(import all-hies {}).overlay
|
|
||||||
] else [];
|
|
||||||
};
|
};
|
||||||
hp = pkgs.haskell.packages."${compiler}";
|
hp = pkgs.haskell.packages."${compiler}";
|
||||||
src = pkgs.nix-gitignore.gitignoreSource [] ./.;
|
src = pkgs.nix-gitignore.gitignoreSource [] ./.;
|
||||||
|
@ -38,7 +30,6 @@ in
|
||||||
hlint
|
hlint
|
||||||
stylish-haskell
|
stylish-haskell
|
||||||
pkgs.python3Packages.asn1ate
|
pkgs.python3Packages.asn1ate
|
||||||
]
|
];
|
||||||
++ (if withHIE then [ hie ] else []);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue