public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100067 from NixOS/haskell-updates

Browse Source 
Update Haskell package set to LTS 16.17 (plus other fixes)
This commit is contained in:
Peter Simons 2020-10-09 21:41:17 +02:00 committed by GitHub
commit af919611ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1486 additions and 1077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -69,7 +69,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "19ipaalp9g25zhg44rialwhp2fv5n8q5fzqw72rfcjcca5iy6r72"; sha256 = "05yvl09ksyvzykibs95996rni9x6w03yfqyv2fadd73z1m6lq5bf";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -1211,7 +1211,7 @@ self: super: {
# we need an override because ghcide is tracking haskell-lsp closely. # we need an override because ghcide is tracking haskell-lsp closely.
ghcide = dontCheck (super.ghcide.overrideScope (self: super: { ghcide = dontCheck (super.ghcide.overrideScope (self: super: {
hie-bios = dontCheck super.hie-bios_0_7_1; hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck self.lsp-test_0_11_0_6; lsp-test = dontCheck self.lsp-test_0_11_0_7;
})); }));
# hasn‘t bumped upper bounds # hasn‘t bumped upper bounds
@ -1471,6 +1471,9 @@ self: super: {
url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch"; url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch";
sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f"; sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f";
}); });
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
domain-auth = dontCheck super.domain-auth;
# INSERT NEW OVERRIDES ABOVE THIS LINE # INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let } // (let
@ -1481,7 +1484,7 @@ self: super: {
ghcide = dontCheck hls-ghcide; ghcide = dontCheck hls-ghcide;
# we are faster than stack here # we are faster than stack here
hie-bios = dontCheck super.hie-bios_0_7_1; hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_6; lsp-test = dontCheck super.lsp-test_0_11_0_7;
# fourmolu can‘t compile with an older aeson # fourmolu can‘t compile with an older aeson
aeson = dontCheck super.aeson_1_5_2_0; aeson = dontCheck super.aeson_1_5_2_0;
# brittany has an aeson upper bound of 1.5 # brittany has an aeson upper bound of 1.5
@ -1490,8 +1493,7 @@ self: super: {
ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2;
}; };
in { in {
# jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride);
haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride));
hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride);
fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride); fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride);

344
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

File diff suppressed because it is too large Load Diff

2102
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

54
pkgs/development/tools/haskell/haskell-language-server/default.nix
View File

@ -1,45 +1,47 @@
{ mkDerivation, aeson, base, binary, blaze-markup, brittany { mkDerivation, aeson, base, binary, blaze-markup, brittany
, bytestring, containers, data-default, deepseq, Diff, directory , bytestring, containers, data-default, deepseq, directory, extra
, extra, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th , fetchgit, filepath, fingertree, floskell, fourmolu, ghc
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp , ghc-boot-th, ghc-exactprint, ghc-paths, ghc-source-gen, ghcide
, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core, lens , gitrev, hashable, haskell-lsp, hie-bios, hls-plugin-api, hslogger
, lsp-test, optparse-applicative, optparse-simple, ormolu, process , hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative
, regex-tdfa, retrie, safe-exceptions, shake, stdenv, stm , optparse-simple, ormolu, process, refinery, regex-tdfa, retrie
, stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure , safe-exceptions, shake, stdenv, stm, stylish-haskell, syb, tasty
, tasty-golden, tasty-hunit, tasty-rerun, temporary, text, time , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
, transformers, unix, unordered-containers, yaml , tasty-rerun, temporary, text, time, transformers
, unordered-containers, yaml
}: }:
mkDerivation { mkDerivation {
pname = "haskell-language-server"; pname = "haskell-language-server";
version = "0.4.0.0"; version = "0.5.0.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git"; url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "1fh9k9b3880m6ql4i10yn2yanskk9xhrakrrddqvainhcf2ik8hl"; sha256 = "1qi762fa72487i8fspxmr8xizm9n2s1shxsvnvsl67vj9if573r9";
rev = "c4576992f443a9abe48ffcfa0e2d2b9bce15d7ae"; rev = "3ca2a6cd267f373aae19f59e1cf9e04b6524eff3";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson base binary brittany bytestring containers data-default base containers data-default directory extra filepath ghc ghcide
deepseq Diff directory extra filepath floskell fourmolu ghc gitrev haskell-lsp hie-bios hls-plugin-api hslogger
ghc-boot-th ghcide gitrev hashable haskell-lsp hie-bios hslogger optparse-applicative optparse-simple process text
lens optparse-simple ormolu process regex-tdfa retrie unordered-containers
safe-exceptions shake stylish-haskell temporary text time
transformers unix unordered-containers
]; ];
executableHaskellDepends = [ executableHaskellDepends = [
base binary containers data-default directory extra filepath ghc aeson base binary brittany bytestring containers deepseq directory
ghc-paths ghcide gitrev hashable haskell-lsp hie-bios hslogger extra filepath fingertree floskell fourmolu ghc ghc-boot-th
optparse-applicative process safe-exceptions shake text time ghc-exactprint ghc-paths ghc-source-gen ghcide gitrev hashable
unordered-containers haskell-lsp hie-bios hls-plugin-api hslogger lens mtl
optparse-applicative optparse-simple ormolu process refinery
regex-tdfa retrie safe-exceptions shake stylish-haskell syb
temporary text time transformers unordered-containers
]; ];
testHaskellDepends = [ testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default aeson base blaze-markup bytestring containers data-default
directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger directory extra filepath haskell-lsp hie-bios hls-plugin-api
hspec hspec-core lens lsp-test process stm tasty tasty-ant-xml hslogger hspec hspec-core lens lsp-test process stm tasty
tasty-expected-failure tasty-golden tasty-hunit tasty-rerun tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit
temporary text transformers unordered-containers yaml tasty-rerun temporary text transformers unordered-containers yaml
]; ];
testToolDepends = [ ghcide ]; testToolDepends = [ ghcide ];
homepage = "https://github.com/haskell/haskell-language-server#readme"; homepage = "https://github.com/haskell/haskell-language-server#readme";

37
pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
View File

@ -1,12 +1,14 @@
{ mkDerivation, aeson, array, async, base, base16-bytestring { mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, Chart, Chart-diagrams, containers , binary, bytestring, Chart, Chart-diagrams, containers
, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg
, directory, extra, fetchgit, filepath, fuzzy, ghc, ghc-boot , directory, extra, fetchgit, filepath, fingertree, fuzzy, ghc
, ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , ghc-boot, ghc-boot-th, ghc-check, ghc-paths
, haddock-library, hashable, haskell-lsp, haskell-lsp-types , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
, hie-bios, hslogger, lens, lsp-test, mtl, network-uri , haskell-lsp, haskell-lsp-types, hie-bios, hslogger
, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
, process, QuickCheck, quickcheck-instances, regex-tdfa , process, QuickCheck, quickcheck-instances
, record-dot-preprocessor, record-hasfield, regex-tdfa
, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list , rope-utf16-splay, safe, safe-exceptions, shake, sorted-list
, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit , stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit
, tasty-quickcheck, tasty-rerun, text, time, transformers, unix , tasty-quickcheck, tasty-rerun, text, time, transformers, unix
@ -14,11 +16,11 @@
}: }:
mkDerivation { mkDerivation {
pname = "ghcide"; pname = "ghcide";
version = "0.3.0"; version = "0.4.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/haskell/ghcide"; url = "https://github.com/haskell/ghcide";
sha256 = "15v3g3i5v0xbq50lfvl4bv3rx01nixiqx02sddqi5lj2idgmg24g"; sha256 = "0zv14mvfhmwwkhyzkr38qpvyffa8ywzp41lr1k55pbrc5b10fjr6";
rev = "96cf8c53d0bdc16d3d2cd0559b74962593ce6dc5"; rev = "0bfce3114c28bd00f7bf5729c32ec0f23a8d8854";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -26,12 +28,12 @@ mkDerivation {
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson array async base base16-bytestring binary bytestring aeson array async base base16-bytestring binary bytestring
containers cryptohash-sha1 data-default deepseq directory extra containers cryptohash-sha1 data-default deepseq directory extra
filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check
haddock-library hashable haskell-lsp haskell-lsp-types hie-bios ghc-paths Glob haddock-library hashable haskell-lsp
hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal haskell-lsp-types hie-bios hslogger implicit-hie-cradle mtl
regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa
stm syb text time transformers unix unordered-containers rope-utf16-splay safe safe-exceptions shake sorted-list stm syb
utf8-string text time transformers unix unordered-containers utf8-string
]; ];
executableHaskellDepends = [ executableHaskellDepends = [
aeson base bytestring containers data-default directory extra aeson base bytestring containers data-default directory extra
@ -43,9 +45,10 @@ mkDerivation {
aeson base binary bytestring containers directory extra filepath aeson base binary bytestring containers directory extra filepath
ghc ghc-typelits-knownnat haddock-library haskell-lsp ghc ghc-typelits-knownnat haddock-library haskell-lsp
haskell-lsp-types lens lsp-test network-uri optparse-applicative haskell-lsp-types lens lsp-test network-uri optparse-applicative
process QuickCheck quickcheck-instances rope-utf16-splay safe process QuickCheck quickcheck-instances record-dot-preprocessor
safe-exceptions shake tasty tasty-expected-failure tasty-hunit record-hasfield rope-utf16-splay safe safe-exceptions shake tasty
tasty-quickcheck tasty-rerun text tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
text
]; ];
benchmarkHaskellDepends = [ benchmarkHaskellDepends = [
aeson base Chart Chart-diagrams diagrams diagrams-svg directory aeson base Chart Chart-diagrams diagrams diagrams-svg directory

4
pkgs/servers/http/couchdb/2.0.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 { stdenv, fetchurl, erlang, icu, openssl, spidermonkey
, coreutils, bash, makeWrapper, python3 }: , coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))];
patches = [ ./jsapi.patch ]; patches = [ ./jsapi.patch ];
postPatch = '' postPatch = ''

6
pkgs/servers/http/couchdb/3.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 { stdenv, fetchurl, erlang, icu, openssl, spidermonkey
, coreutils, bash, makeWrapper, python3 }: , coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8";
}; };
buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))];
postPatch = '' postPatch = ''
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey.dev}/include/mozjs-68"
patchShebangs bin/rebar patchShebangs bin/rebar
''; '';

4
pkgs/servers/http/couchdb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68, curl, help2man { stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man
, sphinx, which, file, pkgconfig, getopt }: , sphinx, which, file, pkgconfig, getopt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; nativeBuildInputs = [ help2man which file pkgconfig sphinx ];
buildInputs = [ erlang icu openssl spidermonkey_68 curl ]; buildInputs = [ erlang icu openssl spidermonkey curl ];
postInstall = '' postInstall = ''
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"