From 643169bbb48126a3b6ec3c4a32bbbe7a815d11c8 Mon Sep 17 00:00:00 2001
From: Cheng Shao <cheng.shao@tweag.io>
Date: Mon, 25 Jan 2021 09:41:25 +0000
Subject: [PATCH 01/15] Fix ar command path in GHC.
Previously, the "ar command" in the global config of GHC in nixpkgs is
simply "ar" instead of a proper absolute path in the nix store. This
will result in an "ar: command not found" error when using GHC and cabal
in a pure nix shell. This commit adds the patch and applies to all
pre-9.0 versions.
See output of ghc --info for "ar command" value.
---
pkgs/development/compilers/ghc/8.10.1.nix | 10 ++++++++
pkgs/development/compilers/ghc/8.10.2.nix | 10 +++++++-
pkgs/development/compilers/ghc/8.10.3.nix | 10 +++++++-
pkgs/development/compilers/ghc/8.6.5.nix | 8 ++++++
pkgs/development/compilers/ghc/8.8.2.nix | 10 ++++++++
pkgs/development/compilers/ghc/8.8.3.nix | 10 ++++++++
pkgs/development/compilers/ghc/8.8.4.nix | 10 ++++++++
.../compilers/ghc/respect-ar-path.patch | 25 +++++++++++++++++++
8 files changed, 91 insertions(+), 2 deletions(-)
create mode 100644 pkgs/development/compilers/ghc/respect-ar-path.patch
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index 661dd5cb0026..83604630545e 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -116,6 +116,16 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
+ patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+ ];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix
index 6e194b68faa2..a42dfce6468a 100644
--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/pkgs/development/compilers/ghc/8.10.2.nix
@@ -107,8 +107,16 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
- # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
./issue-18549.patch
] ++ lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix
index 582817cca070..f1b225b12c80 100644
--- a/pkgs/development/compilers/ghc/8.10.3.nix
+++ b/pkgs/development/compilers/ghc/8.10.3.nix
@@ -107,7 +107,15 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
- patches = lib.optionals stdenv.isDarwin [
+ patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
(fetchpatch {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index 219ace5a9164..8237f27241e7 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -110,6 +110,14 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+
(fetchpatch { # https://phabricator.haskell.org/D5123
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff";
name = "D5123.diff";
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
index 94553e56a811..144e46459759 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -111,6 +111,16 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
+ patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+ ];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
index ca4dc35ccdc4..9e99207d9aaa 100644
--- a/pkgs/development/compilers/ghc/8.8.3.nix
+++ b/pkgs/development/compilers/ghc/8.8.3.nix
@@ -116,6 +116,16 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
+ patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+ ];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index ab5f2c12e230..9bef190ad1c3 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -116,6 +116,16 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
+ patches = [
+ # See upstream patch at
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+ # from source distributions, the auto-generated configure script needs to be
+ # patched as well, therefore we use an in-tree patch instead of pulling the
+ # upstream patch. Don't forget to check backport status of the upstream patch
+ # when adding new GHC releases in nixpkgs.
+ ./respect-ar-path.patch
+ ];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
diff --git a/pkgs/development/compilers/ghc/respect-ar-path.patch b/pkgs/development/compilers/ghc/respect-ar-path.patch
new file mode 100644
index 000000000000..a08a802c18a0
--- /dev/null
+++ b/pkgs/development/compilers/ghc/respect-ar-path.patch
@@ -0,0 +1,25 @@
+diff -urd a/aclocal.m4 b/aclocal.m4
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1199,7 +1199,8 @@
+ # thinks that target == host so it never checks the unqualified
+ # tools for Windows. See #14274.
+ AC_DEFUN([FP_PROG_AR],
+-[if test -z "$fp_prog_ar"; then
++[AC_SUBST(fp_prog_ar,$AR)
++if test -z "$fp_prog_ar"; then
+ if test "$HostOS" = "mingw32"
+ then
+ AC_PATH_PROG([fp_prog_ar], [ar])
+diff -urd a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -10744,6 +10744,8 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
++fp_prog_ar=$AR
++
+ if test -z "$fp_prog_ar"; then
+ if test "$HostOS" = "mingw32"
+ then
From 103c5f4d9ff07f467ed675a08bcb4ea5028697e2 Mon Sep 17 00:00:00 2001
From: danielstaleiny <danielstaleiny@tutanota.com>
Date: Mon, 1 Feb 2021 09:00:58 +0100
Subject: [PATCH 02/15] haskellPackages.postgrest: broken -> unbroken Tested on
NixOS
---
pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index fa18d7507db1..a19b005d52c6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8963,7 +8963,6 @@ broken-packages:
- postgresql-tx-squeal
- postgresql-tx-squeal-compat-simple
- postgresql-typed-lifted
- - postgrest
- postgrest-ws
- postie
- postmark
From f076ff3503c9ebe408bfb48c34db139b3b051ee8 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 2 Feb 2021 17:42:20 +0900
Subject: [PATCH 03/15] spago: fix build by specifying older version of dhall
---
.../haskell-modules/configuration-hackage2nix.yaml | 3 ++-
pkgs/development/haskell-modules/configuration-nix.nix | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a19b005d52c6..2a48989ab15a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2694,7 +2694,8 @@ default-package-overrides:
extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- - dhall == 1.29.0 # required for spago 0.14.0.
+ - dhall == 1.29.0 # required for ats-pkg
+ - dhall == 1.37.1 # required for spago 0.19.0.
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
- ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- haddock == 2.23.* # required on GHC < 8.10.x
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 06578f565350..657c04b0d817 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -659,7 +659,9 @@ self: super: builtins.intersectAttrs super {
let
# spago requires an older version of megaparsec, but it appears to work
# fine with newer versions.
- spagoWithOverrides = doJailbreak super.spago;
+ spagoWithOverrides = doJailbreak (super.spago.override {
+ dhall = self.dhall_1_37_1;
+ });
# This defines the version of the purescript-docs-search release we are using.
# This is defined in the src/Spago/Prelude.hs file in the spago source.
From ed6eaac6f1101f7d85a14cc8042412aa6eff741c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Feb 2021 21:02:08 +0100
Subject: [PATCH 04/15] Stackage Nightly 2021-02-02
---
.../configuration-hackage2nix.yaml | 317 +++++++++---------
1 file changed, 159 insertions(+), 158 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2a48989ab15a..6f889577af03 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
# haskell-language-server 0.5.0.0 doesn't accept newer versions
- fourmolu ==0.2.*
- refinery ==0.2.*
- # Stackage Nightly 2021-01-29
+ # Stackage Nightly 2021-02-02
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -215,19 +215,19 @@ default-package-overrides:
- ansi-terminal ==0.10.3
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- - ap-normalize ==0.1.0.0
- apecs ==0.9.2
- apecs-gloss ==0.2.4
- apecs-physics ==0.4.5
- api-field-json-th ==0.1.0.2
- api-maker ==0.1.0.0
- - app-settings ==0.2.0.12
+ - ap-normalize ==0.1.0.0
- appar ==0.1.8
- appendmap ==0.1.5
- apply-refact ==0.9.0.0
- apportionment ==0.0.0.3
- approximate ==0.3.2
- approximate-equality ==1.1.0.2
+ - app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.1
- arbor-postgres ==0.0.5
- arithmoi ==0.11.0.1
@@ -236,12 +236,12 @@ default-package-overrides:
- ascii ==1.0.1.0
- ascii-case ==1.0.0.2
- ascii-char ==1.0.0.6
+ - asciidiagram ==1.3.3.3
- ascii-group ==1.0.0.2
- ascii-predicates ==1.0.0.2
- ascii-progress ==0.3.3.0
- ascii-superset ==1.0.1.0
- ascii-th ==1.0.0.2
- - asciidiagram ==1.3.3.3
- asif ==6.0.4
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
@@ -269,8 +269,8 @@ default-package-overrides:
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- - auto-update ==0.1.6
- autoexporter ==1.1.19
+ - auto-update ==0.1.6
- avers ==0.0.17.1
- avro ==0.5.2.0
- aws-cloudfront-signed-cookies ==0.2.0.6
@@ -278,11 +278,6 @@ default-package-overrides:
- backtracking ==0.1.0
- bank-holidays-england ==0.2.0.6
- barbies ==2.0.2.0
- - base-compat ==0.11.2
- - base-compat-batteries ==0.11.2
- - base-orphans ==0.8.4
- - base-prelude ==1.4
- - base-unicode-symbols ==0.2.4.2
- base16 ==0.3.0.1
- base16-bytestring ==0.1.1.7
- base16-lens ==0.1.3.0
@@ -296,7 +291,12 @@ default-package-overrides:
- base64-bytestring-type ==1.0.1
- base64-lens ==0.3.0
- base64-string ==0.2
+ - base-compat ==0.11.2
+ - base-compat-batteries ==0.11.2
- basement ==0.0.11
+ - base-orphans ==0.8.4
+ - base-prelude ==1.4
+ - base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
- bazel-runfiles ==0.12
- bbdb ==0.8
@@ -309,8 +309,8 @@ default-package-overrides:
- bibtex ==0.1.0.6
- bifunctors ==5.5.10
- bimap ==0.4.0
- - bimap-server ==0.1.0.1
- bimaps ==0.1.0.2
+ - bimap-server ==0.1.0.1
- bin ==0.1
- binary-conduit ==1.3.1
- binary-ext ==2.0.4
@@ -330,8 +330,8 @@ default-package-overrides:
- bins ==0.1.2.0
- bitarray ==0.0.1.1
- bits ==0.5.2
- - bits-extra ==0.0.2.0
- bitset-word8 ==0.1.1.2
+ - bits-extra ==0.0.2.0
- bitvec ==1.0.3.0
- bitwise-enum ==1.0.0.3
- blake2 ==0.3.0
@@ -357,8 +357,8 @@ default-package-overrides:
- boring ==0.1.3
- both ==0.1.1.1
- bound ==2.0.2
- - bounded-queue ==1.0.0
- BoundedChan ==1.0.3.0
+ - bounded-queue ==1.0.0
- boundingboxes ==0.2.3
- bower-json ==1.0.0.1
- boxes ==0.1.5
@@ -376,10 +376,10 @@ default-package-overrides:
- butcher ==1.3.3.2
- bv ==0.5
- bv-little ==1.1.1
- - byte-count-reader ==0.10.1.2
- - byte-order ==0.1.2.0
- byteable ==0.1.1
+ - byte-count-reader ==0.10.1.2
- bytedump ==1.0
+ - byte-order ==0.1.2.0
- byteorder ==1.0.4
- bytes ==0.17
- byteset ==0.1.1.0
@@ -395,7 +395,6 @@ default-package-overrides:
- bzlib-conduit ==0.3.0.2
- c14n ==0.1.0.1
- c2hs ==0.28.7
- - ca-province-codes ==1.0.0.0
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
- cabal-file ==0.1.1
@@ -407,12 +406,13 @@ default-package-overrides:
- calendar-recycling ==0.0.0.1
- call-stack ==0.2.0
- can-i-haz ==0.3.1.0
+ - ca-province-codes ==1.0.0.0
- cardano-coin-selection ==1.0.1
- carray ==0.1.6.8
- casa-client ==0.0.1
- casa-types ==0.0.1
- - case-insensitive ==1.2.1.0
- cased ==0.1.0.0
+ - case-insensitive ==1.2.1.0
- cases ==0.1.4
- casing ==0.1.4.1
- cassava ==0.5.2.0
@@ -473,12 +473,12 @@ default-package-overrides:
- cmark-gfm ==0.2.2
- cmark-lucid ==0.1.0.0
- cmdargs ==0.10.20
+ - codec-beam ==0.2.0
+ - codec-rpm ==0.2.2
+ - code-page ==0.2
- co-log ==0.4.0.1
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
- - code-page ==0.2
- - codec-beam ==0.2.0
- - codec-rpm ==0.2.2
- Color ==0.3.0
- colorful-monoids ==0.2.1.3
- colorize-haskell ==1.0.1
@@ -524,8 +524,8 @@ default-package-overrides:
- conferer-aeson ==1.0.0.0
- conferer-hspec ==1.0.0.0
- conferer-warp ==1.0.0.0
- - config-ini ==0.2.4.0
- ConfigFile ==1.1.4
+ - config-ini ==0.2.4.0
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
- configurator-pg ==0.2.5
@@ -533,8 +533,8 @@ default-package-overrides:
- connection-pool ==0.2.2
- console-style ==0.0.2.1
- constraint ==0.1.4.0
- - constraint-tuples ==0.1.2
- constraints ==0.12
+ - constraint-tuples ==0.1.2
- construct ==0.3
- contravariant ==1.5.3
- contravariant-extras ==0.3.5.2
@@ -562,13 +562,8 @@ default-package-overrides:
- cron ==0.7.0
- crypto-api ==0.13.3
- crypto-cipher-types ==0.0.9
- - crypto-enigma ==0.1.1.6
- - crypto-numbers ==0.2.7
- - crypto-pubkey ==0.2.8
- - crypto-pubkey-types ==0.4.3
- - crypto-random ==0.0.9
- - crypto-random-api ==0.2.0
- cryptocompare ==0.1.2
+ - crypto-enigma ==0.1.1.6
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
@@ -577,6 +572,11 @@ default-package-overrides:
- cryptonite ==0.27
- cryptonite-conduit ==0.2.2
- cryptonite-openssl ==0.7
+ - crypto-numbers ==0.2.7
+ - crypto-pubkey ==0.2.8
+ - crypto-pubkey-types ==0.4.3
+ - crypto-random ==0.0.9
+ - crypto-random-api ==0.2.0
- csp ==1.4.0
- css-syntax ==0.1.0.0
- css-text ==0.1.3.0
@@ -613,6 +613,7 @@ default-package-overrides:
- data-default-instances-dlist ==0.0.1
- data-default-instances-old-locale ==0.0.1
- data-diverse ==4.7.0.0
+ - datadog ==0.2.5.0
- data-dword ==0.3.2
- data-endian ==0.1.1
- data-fix ==0.3.0
@@ -631,7 +632,6 @@ default-package-overrides:
- data-reify ==0.6.3
- data-serializer ==0.3.4.1
- data-textual ==0.3.0.3
- - datadog ==0.2.5.0
- dataurl ==0.1.0.0
- DAV ==1.3.4
- DBFunctor ==0.1.1.1
@@ -650,8 +650,8 @@ default-package-overrides:
- dense-linear-algebra ==0.1.0.0
- depq ==0.4.1.0
- deque ==0.4.3
- - derive-topdown ==0.0.2.2
- deriveJsonNoPrefix ==0.1.0.1
+ - derive-topdown ==0.0.2.2
- deriving-aeson ==0.2.6
- deriving-compat ==0.5.10
- derulo ==1.0.9
@@ -660,17 +660,17 @@ default-package-overrides:
- dhall-json ==1.7.5
- dhall-lsp-server ==1.0.13
- dhall-yaml ==1.2.5
- - di-core ==1.0.4
- - di-monad ==1.3.1
- diagrams-solve ==0.1.2
- dialogflow-fulfillment ==0.1.1.3
+ - di-core ==1.0.4
- dictionary-sharing ==0.1.0.0
- Diff ==0.4.0
- digest ==0.0.1.2
- digits ==0.3.1
- dimensional ==1.3
- - direct-sqlite ==2.3.26
+ - di-monad ==1.3.1
- directory-tree ==0.12.1
+ - direct-sqlite ==2.3.26
- dirichlet ==0.1.0.2
- discount ==0.1.1
- disk-free-space ==0.1.0.1
@@ -682,8 +682,6 @@ default-package-overrides:
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dns ==4.0.1
- - do-list ==1.0.1
- - do-notation ==0.1.0.2
- dockerfile ==0.2.0
- doclayout ==0.3
- doctemplates ==0.9
@@ -692,6 +690,8 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doldol ==0.4.1.2
+ - do-list ==1.0.1
+ - do-notation ==0.1.0.2
- dot ==0.3
- dotenv ==0.8.0.7
- dotgen ==0.4.3
@@ -731,10 +731,10 @@ default-package-overrides:
- elerea ==2.9.0
- elf ==0.30
- eliminators ==0.7
+ - elm2nix ==0.2.1
- elm-bridge ==0.6.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- - elm2nix ==0.2.1
- elynx ==0.5.0.1
- elynx-markov ==0.5.0.1
- elynx-nexus ==0.5.0.1
@@ -746,9 +746,9 @@ default-package-overrides:
- enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0
- entropy ==0.4.1.6
- - enum-subset-generate ==0.1.0.0
- enummapset ==0.6.0.3
- enumset ==0.0.5
+ - enum-subset-generate ==0.1.0.0
- envelope ==0.2.2.0
- envparse ==0.4.1
- envy ==2.1.0.0
@@ -770,25 +770,25 @@ default-package-overrides:
- essence-of-live-coding-quickcheck ==0.2.4
- etc ==0.4.1.0
- eve ==0.1.9.0
- - event-list ==0.1.2
- eventful-core ==0.2.0
- eventful-test-helpers ==0.2.0
+ - event-list ==0.1.2
- eventstore ==1.4.1
- every ==0.0.1
- exact-combinatorics ==0.2.0.9
- exact-pi ==0.5.0.1
- exception-hierarchy ==0.1.0.4
- exception-mtl ==0.4.0.1
+ - exceptions ==0.10.4
- exception-transformers ==0.4.0.9
- exception-via ==0.1.0.0
- - exceptions ==0.10.4
- executable-path ==0.0.3.1
- exit-codes ==1.0.0
- exomizer ==1.0.0
- - exp-pairs ==0.2.1.0
- experimenter ==0.1.0.4
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.10
+ - exp-pairs ==0.2.1.0
- express ==0.1.3
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
@@ -815,10 +815,10 @@ default-package-overrides:
- fgl ==5.7.0.3
- file-embed ==0.0.13.0
- file-embed-lzma ==0
- - file-modules ==0.1.2.4
- - file-path-th ==0.1.0.0
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
+ - file-modules ==0.1.2.4
+ - file-path-th ==0.1.0.0
- filepattern ==0.1.2
- fileplow ==0.1.0.0
- filtrable ==0.1.4.0
@@ -848,9 +848,9 @@ default-package-overrides:
- fn ==0.3.0.2
- focus ==1.0.2
- focuslist ==0.1.0.2
+ - foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9
- fold-debounce-conduit ==0.2.0.5
- - foldable1 ==0.1.0.0
- foldl ==1.4.10
- folds ==0.7.5
- follow-file ==0.0.3
@@ -864,10 +864,10 @@ default-package-overrides:
- foundation ==0.0.25
- free ==5.1.5
- free-categories ==0.2.0.2
- - free-vl ==0.1.4
- freenect ==1.2.1
- freer-simple ==1.2.1.1
- freetype2 ==0.2.0
+ - free-vl ==0.1.4
- friendly-time ==0.4.1
- from-sum ==0.2.3.0
- frontmatter ==0.1.0.2
@@ -883,8 +883,8 @@ default-package-overrides:
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.0
- fuzzy-dates ==0.1.1.2
- - fuzzy-time ==0.1.0.0
- fuzzyset ==0.2.0
+ - fuzzy-time ==0.1.0.0
- gauge ==0.2.5
- gd ==3000.7.3
- gdp ==0.0.3.0
@@ -899,8 +899,8 @@ default-package-overrides:
- generic-lens-core ==2.0.0.0
- generic-monoid ==0.1.0.1
- generic-optics ==2.0.0.0
- - generic-random ==1.3.0.1
- GenericPretty ==1.2.2
+ - generic-random ==1.3.0.1
- generics-sop ==0.5.1.0
- generics-sop-lens ==0.2.0.1
- geniplate-mirror ==0.7.7
@@ -933,7 +933,10 @@ default-package-overrides:
- ghc-check ==0.5.0.3
- ghc-core ==0.5.6
- ghc-events ==0.15.1
- - ghc-exactprint ==0.6.3.3
+ - ghc-exactprint ==0.6.3.4
+ - ghcid ==0.8.7
+ - ghci-hexcalc ==0.1.1.0
+ - ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.3.20201220
- ghc-lib-parser ==8.10.3.20201220
- ghc-lib-parser-ex ==8.10.0.17
@@ -948,9 +951,6 @@ default-package-overrides:
- ghc-typelits-knownnat ==0.7.4
- ghc-typelits-natnormalise ==0.7.3
- ghc-typelits-presburger ==0.5.2.0
- - ghci-hexcalc ==0.1.1.0
- - ghcid ==0.8.7
- - ghcjs-codemirror ==0.0.0.2
- ghost-buster ==0.1.1.0
- gi-atk ==2.0.22
- gi-cairo ==1.0.24
@@ -968,10 +968,9 @@ default-package-overrides:
- gi-gtk ==3.0.36
- gi-gtk-hs ==0.3.9
- gi-harfbuzz ==0.0.3
- - gi-pango ==1.0.23
- - gi-xlib ==2.0.9
- ginger ==0.10.1.0
- gingersnap ==0.3.1.0
+ - gi-pango ==1.0.23
- githash ==0.1.5.0
- github ==0.26
- github-release ==1.3.5
@@ -980,6 +979,7 @@ default-package-overrides:
- github-webhooks ==0.15.0
- gitlab-haskell ==0.2.5
- gitrev ==1.3.1
+ - gi-xlib ==2.0.9
- gl ==0.9
- glabrous ==2.0.2
- GLFW-b ==3.3.0.0
@@ -994,11 +994,11 @@ default-package-overrides:
- gothic ==0.1.5
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
- - graph-wrapper ==0.2.6.0
- graphite ==0.10.0.1
- graphql-client ==1.1.0
- graphs ==0.7.1
- graphviz ==2999.20.1.0
+ - graph-wrapper ==0.2.6.0
- gravatar ==0.8.0
- greskell ==1.2.0.0
- greskell-core ==0.1.3.5
@@ -1013,7 +1013,7 @@ default-package-overrides:
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.9.0
- - hadolint ==1.20.0
+ - hadolint ==1.21.0
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.3
- half ==0.3.1
@@ -1068,7 +1068,7 @@ default-package-overrides:
- hedgehog-fakedata ==0.0.1.3
- hedgehog-fn ==1.0
- hedgehog-quickcheck ==0.1.1
- - hedis ==0.14.1
+ - hedis ==0.14.2
- hedn ==0.3.0.2
- here ==1.2.13
- heredoc ==0.2.0.0
@@ -1082,9 +1082,9 @@ default-package-overrides:
- hgeometry ==0.11.0.0
- hgeometry-combinatorial ==0.11.0.0
- hgrev ==0.2.6
- - hi-file-parser ==0.1.0.0
- hidapi ==0.1.5
- hie-bios ==0.7.2
+ - hi-file-parser ==0.1.0.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
- hinfo ==0.0.3.0
@@ -1123,16 +1123,15 @@ default-package-overrides:
- hpc-lcov ==1.0.1
- hprotoc ==2.4.17
- hruby ==0.3.8
- - hs-bibutils ==6.10.0.0
- - hs-functors ==0.1.7.1
- - hs-GeoIP ==0.3
- - hs-php-session ==0.0.9.3
- hsass ==0.8.0
+ - hs-bibutils ==6.10.0.0
- hsc2hs ==0.68.7
- hscolour ==1.24.4
- hsdns ==1.8
- hsebaysdk ==0.4.1.0
- hsemail ==2.2.1
+ - hs-functors ==0.1.7.1
+ - hs-GeoIP ==0.3
- hsini ==0.5.1.2
- hsinstall ==2.6
- HSlippyMap ==3.0.1
@@ -1166,6 +1165,7 @@ default-package-overrides:
- hspec-tables ==0.0.1
- hspec-wai ==0.10.1
- hspec-wai-json ==0.10.1
+ - hs-php-session ==0.0.9.3
- hsshellscript ==3.4.5
- HStringTemplate ==0.8.7
- HSvm ==0.1.1.3.22
@@ -1179,6 +1179,7 @@ default-package-overrides:
- html-entities ==1.1.4.3
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
+ - http2 ==2.0.5
- HTTP ==4000.3.15
- http-api-data ==0.4.1.1
- http-client ==0.6.4.1
@@ -1190,14 +1191,13 @@ default-package-overrides:
- http-date ==0.0.10
- http-directory ==0.1.8
- http-download ==0.2.0.0
+ - httpd-shed ==0.4.1.1
- http-link-header ==1.0.3.1
- http-media ==0.8.0.0
- http-query ==0.1.0
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.7.2
- http-types ==0.12.3
- - http2 ==2.0.5
- - httpd-shed ==0.4.1.1
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.1.0
- HUnit-approx ==1.1.1.1
@@ -1210,6 +1210,7 @@ default-package-overrides:
- hw-conduit-merges ==0.2.1.0
- hw-diagnostics ==0.0.1.0
- hw-dsv ==0.4.1.0
+ - hweblib ==0.6.3
- hw-eliasfano ==0.1.2.0
- hw-excess ==0.2.3.0
- hw-fingertree ==0.1.2.0
@@ -1222,7 +1223,7 @@ default-package-overrides:
- hw-json-simd ==0.1.1.0
- hw-json-simple-cursor ==0.1.1.0
- hw-json-standard-cursor ==0.2.3.1
- - hw-kafka-client ==4.0.2
+ - hw-kafka-client ==4.0.3
- hw-mquery ==0.2.1.0
- hw-packed-vector ==0.2.1.0
- hw-parser ==0.1.1.0
@@ -1234,7 +1235,6 @@ default-package-overrides:
- hw-string-parse ==0.0.0.4
- hw-succinct ==0.1.0.1
- hw-xml ==0.5.1.0
- - hweblib ==0.6.3
- hxt ==9.3.1.18
- hxt-charproperties ==9.4.0.0
- hxt-css ==0.1.0.3
@@ -1318,13 +1318,13 @@ default-package-overrides:
- iso3166-country-codes ==0.20140203.8
- iso639 ==0.1.0.3
- iso8601-time ==0.1.5
- - it-has ==0.2.0.0
- iterable ==3.0
- - ix-shapable ==0.1.0
+ - it-has ==0.2.0.0
- ixset-typed ==0.5
- ixset-typed-binary-instance ==0.1.0.2
- ixset-typed-conversions ==0.1.2.0
- ixset-typed-hashable-instance ==0.1.0.2
+ - ix-shapable ==0.1.0
- jack ==0.7.1.4
- jalaali ==1.0.0.0
- jira-wiki-markup ==1.3.2
@@ -1335,9 +1335,9 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json-feed ==1.0.11
+ - jsonpath ==0.2.0.0
- json-rpc ==1.0.3
- json-rpc-generic ==0.2.1.5
- - jsonpath ==0.2.0.0
- JuicyPixels ==3.3.5
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.4.1
@@ -1416,22 +1416,22 @@ default-package-overrides:
- libyaml ==0.1.2
- LibZip ==1.0.1
- life-sync ==1.1.1.0
- - lift-generics ==0.2
- lifted-async ==0.10.1.2
- lifted-base ==0.2.3.12
+ - lift-generics ==0.2
- line ==4.0.1
- - linear ==1.21.3
+ - linear ==1.21.4
- linear-circuit ==0.1.0.2
- linenoise ==0.3.2
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- liquid-fixpoint ==0.8.10.2
- List ==0.6.2
+ - ListLike ==4.7.4
- list-predicate ==0.1.0.1
+ - listsafe ==0.1.0.1
- list-singleton ==1.0.0.4
- list-t ==1.0.4
- - ListLike ==4.7.4
- - listsafe ==0.1.0.1
- ListTree ==0.2.3
- little-logger ==0.3.1
- little-rio ==0.2.2
@@ -1464,8 +1464,8 @@ default-package-overrides:
- machines ==0.7.1
- magic ==1.1
- magico ==0.0.2.1
- - main-tester ==0.2.0.1
- mainland-pretty ==0.7.0.1
+ - main-tester ==0.2.0.1
- makefile ==1.1.0.0
- managed ==1.0.8
- MapWith ==0.2.0.0
@@ -1477,9 +1477,9 @@ default-package-overrides:
- massiv-persist ==0.1.0.0
- massiv-serialise ==0.1.0.0
- massiv-test ==0.1.6.1
+ - mathexpr ==0.3.0.0
- math-extras ==0.1.1.0
- math-functions ==0.3.4.1
- - mathexpr ==0.3.0.0
- matplotlib ==0.7.5
- matrices ==0.5.0
- matrix ==0.3.6.1
@@ -1491,9 +1491,9 @@ default-package-overrides:
- mbox-utility ==0.0.3.1
- mcmc ==0.4.0.0
- mcmc-types ==1.0.3
- - med-module ==0.1.2.1
- medea ==1.2.0
- median-stream ==0.7.0.0
+ - med-module ==0.1.2.1
- megaparsec ==9.0.1
- megaparsec-tests ==9.0.1
- membrain ==0.0.0.2
@@ -1522,12 +1522,12 @@ default-package-overrides:
- mime-mail ==0.5.0
- mime-mail-ses ==0.4.3
- mime-types ==0.1.0.9
- - min-max-pqueue ==0.1.0.2
- mini-egison ==1.0.0
- minimal-configuration ==0.1.4
- minimorph ==0.3.0.0
- minio-hs ==1.5.3
- miniutter ==0.5.1.1
+ - min-max-pqueue ==0.1.0.2
- mintty ==0.1.2
- missing-foreign ==0.1.1
- MissingH ==1.4.3.0
@@ -1537,10 +1537,10 @@ default-package-overrides:
- mmark ==0.0.7.2
- mmark-cli ==0.0.5.0
- mmark-ext ==0.2.1.2
- - mmorph ==1.1.3
+ - mmorph ==1.1.4
- mnist-idx ==0.1.2.8
- - mock-time ==0.1.0
- mockery ==0.3.5
+ - mock-time ==0.1.0
- mod ==0.1.2.1
- model ==0.5
- modern-uri ==0.3.3.0
@@ -1550,7 +1550,9 @@ default-package-overrides:
- monad-control-aligned ==0.0.1.1
- monad-coroutine ==0.9.0.4
- monad-extras ==0.6.0
+ - monadic-arrays ==0.2.2
- monad-journal ==0.8.1
+ - monadlist ==0.0.2
- monad-logger ==0.3.36
- monad-logger-json ==0.1.0.0
- monad-logger-logstash ==0.1.0.0
@@ -1559,28 +1561,26 @@ default-package-overrides:
- monad-memo ==0.5.3
- monad-metrics ==0.2.2.0
- monad-par ==0.3.5
- - monad-par-extras ==0.3.3
- monad-parallel ==0.7.2.3
+ - monad-par-extras ==0.3.3
- monad-peel ==0.2.1.2
- monad-primitive ==0.1
- monad-products ==4.0.1
+ - MonadPrompt ==1.0.0.5
+ - MonadRandom ==0.5.2
- monad-resumption ==0.1.4.0
- monad-skeleton ==0.1.5
- monad-st ==0.2.4.1
+ - monads-tf ==0.1.0.3
- monad-time ==0.3.1.0
- monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1
- - monadic-arrays ==0.2.2
- - monadlist ==0.0.2
- - MonadPrompt ==1.0.0.5
- - MonadRandom ==0.5.2
- - monads-tf ==0.1.0.3
- mongoDB ==2.7.0.0
+ - monoid-subclasses ==1.0.1
+ - monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.1.0
- - monoid-subclasses ==1.0.1
- - monoid-transformer ==0.0.4
- more-containers ==0.2.2.0
- morpheus-graphql ==0.16.0
- morpheus-graphql-client ==0.16.0
@@ -1593,14 +1593,14 @@ default-package-overrides:
- mpi-hs-cereal ==0.1.0.0
- mtl-compat ==0.2.2
- mtl-prelude ==2.0.3.1
- - multi-containers ==0.1.1
- multiarg ==0.30.0.10
+ - multi-containers ==0.1.1
- multimap ==1.2.1
- multipart ==0.2.1
- multiset ==0.3.4.3
- multistate ==0.8.0.3
- - murmur-hash ==0.1.0.9
- murmur3 ==1.0.4
+ - murmur-hash ==0.1.0.9
- MusicBrainz ==0.4.1
- mustache ==2.3.1
- mutable-containers ==0.3.4
@@ -1648,16 +1648,16 @@ default-package-overrides:
- nicify-lib ==1.0.1
- NineP ==0.0.2.1
- nix-paths ==1.0.1
- - no-value ==1.0.0.0
- - non-empty ==0.3.2
- - non-empty-sequence ==0.2.0.4
- - non-negative ==0.1.2
- nonce ==1.0.7
- nondeterminism ==1.4
+ - non-empty ==0.3.2
- nonempty-containers ==0.3.4.1
- - nonempty-vector ==0.2.1.0
- nonemptymap ==0.0.6.0
+ - non-empty-sequence ==0.2.0.4
+ - nonempty-vector ==0.2.1.0
+ - non-negative ==0.1.2
- not-gloss ==0.7.7.0
+ - no-value ==1.0.0.0
- nowdoc ==0.1.1.0
- nqe ==0.6.3
- nri-env-parser ==0.1.0.3
@@ -1673,9 +1673,9 @@ default-package-overrides:
- nvim-hs ==2.1.0.4
- nvim-hs-contrib ==2.0.0.0
- nvim-hs-ghcid ==2.0.0.0
- - o-clock ==1.2.0.1
- oauthenticated ==0.2.1.0
- ObjectName ==1.1.0.1
+ - o-clock ==1.2.0.1
- odbc ==0.2.2
- oeis2 ==1.0.4
- ofx ==0.4.4.0
@@ -1688,9 +1688,9 @@ default-package-overrides:
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.1.0
- - open-browser ==0.2.1.0
- OpenAL ==1.7.0.5
- openapi3 ==3.0.1.0
+ - open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
- OpenGLRaw ==3.3.4.0
@@ -1754,10 +1754,10 @@ default-package-overrides:
- pattern-arrows ==0.0.2
- pava ==0.1.1.0
- pcg-random ==0.1.3.7
+ - pcre2 ==1.1.4
- pcre-heavy ==1.0.0.2
- pcre-light ==0.4.1.0
- pcre-utils ==0.1.8.1.1
- - pcre2 ==1.1.4
- pdfinfo ==1.5.4
- peano ==0.1.0.1
- pem ==0.2.4
@@ -1779,8 +1779,8 @@ default-package-overrides:
- persistent-test ==2.0.3.5
- persistent-typed-db ==0.1.0.2
- pg-harness-client ==0.6.0
- - pg-transact ==0.3.1.1
- pgp-wordlist ==0.1.0.3
+ - pg-transact ==0.3.1.1
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.2.0
@@ -1819,7 +1819,6 @@ default-package-overrides:
- port-utils ==0.2.1.0
- posix-paths ==0.2.1.6
- possibly ==1.0.0.0
- - post-mess-age ==0.2.1.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.3.3
- postgresql-libpq ==0.9.4.3
@@ -1828,27 +1827,28 @@ default-package-overrides:
- postgresql-simple ==0.6.4
- postgresql-typed ==0.6.1.2
- postgrest ==7.0.1
+ - post-mess-age ==0.2.1.0
- pptable ==0.3.0.0
- pqueue ==1.4.1.3
- prairie ==0.0.1.0
- prefix-units ==0.2.0
- prelude-compat ==0.0.0.2
- prelude-safeenum ==0.1.1.2
+ - prettyclass ==1.0.0.0
- pretty-class ==1.0.1.1
- pretty-diff ==0.2.0.3
- pretty-hex ==1.1
- - pretty-relative-time ==0.2.0.0
- - pretty-show ==1.10
- - pretty-simple ==4.0.0.0
- - pretty-sop ==0.2.0.3
- - pretty-terminal ==0.1.0.0
- - prettyclass ==1.0.0.0
- prettyprinter ==1.7.0
- prettyprinter-ansi-terminal ==1.1.2
- prettyprinter-compat-annotated-wl-pprint ==1.1
- prettyprinter-compat-ansi-wl-pprint ==1.0.1
- prettyprinter-compat-wl-pprint ==1.0.0.1
- prettyprinter-convert-ansi-wl-pprint ==1.1.1
+ - pretty-relative-time ==0.2.0.0
+ - pretty-show ==1.10
+ - pretty-simple ==4.0.0.0
+ - pretty-sop ==0.2.0.3
+ - pretty-terminal ==0.1.0.0
- primes ==0.2.1.0
- primitive ==0.7.1.0
- primitive-addr ==0.1.0.2
@@ -1862,20 +1862,14 @@ default-package-overrides:
- product-profunctors ==0.11.0.1
- profiterole ==0.1
- profunctors ==5.5.2
- - project-template ==0.2.1.0
- projectroot ==0.2.0.1
+ - project-template ==0.2.1.0
- prometheus ==2.2.2
- prometheus-client ==1.0.1
- prometheus-wai-middleware ==1.0.1.0
- promises ==0.3
- prompt ==0.1.1.2
- prospect ==0.1.0.0
- - proto-lens ==0.7.0.0
- - proto-lens-optparse ==0.1.1.7
- - proto-lens-protobuf-types ==0.7.0.0
- - proto-lens-protoc ==0.7.0.0
- - proto-lens-runtime ==0.7.0.0
- - proto-lens-setup ==0.4.0.4
- proto3-wire ==1.1.0
- protobuf ==0.2.1.3
- protobuf-simple ==0.1.1.0
@@ -1883,6 +1877,12 @@ default-package-overrides:
- protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
+ - proto-lens ==0.7.0.0
+ - proto-lens-optparse ==0.1.1.7
+ - proto-lens-protobuf-types ==0.7.0.0
+ - proto-lens-protoc ==0.7.0.0
+ - proto-lens-runtime ==0.7.0.0
+ - proto-lens-setup ==0.4.0.4
- protolude ==0.3.0
- proxied ==0.3.1
- psqueues ==0.2.7.2
@@ -1929,45 +1929,45 @@ default-package-overrides:
- random-source ==0.3.0.8
- random-tree ==0.6.0.5
- range ==0.3.0.2
- - range-set-list ==0.1.3.1
- Ranged-sets ==0.4.0
+ - range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1
- rank2classes ==1.4.1
- Rasterific ==0.7.5.3
- rasterific-svg ==0.3.3.2
- - rate-limit ==1.4.2
- ratel ==1.0.12
+ - rate-limit ==1.4.2
- ratel-wai ==1.1.3
- rattle ==0.2
- - raw-strings-qq ==1.1
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
+ - raw-strings-qq ==1.1
- rcu ==0.2.4
- rdf ==0.1.0.4
- rdtsc ==1.3.0.1
- re2 ==0.3
+ - readable ==0.3.1
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- - readable ==0.3.1
- reanimate ==1.1.3.2
- reanimate-svg ==0.13.0.0
- rebase ==1.6.1
- record-dot-preprocessor ==0.2.7
- record-hasfield ==1.0
- - record-wrangler ==0.1.1.0
- records-sop ==0.1.0.3
+ - record-wrangler ==0.1.1.0
- recursion-schemes ==5.2.1
- reducers ==3.12.3
- - ref-fd ==0.4.0.2
- - ref-tf ==0.4.0.2
- refact ==0.3.0.2
- - refined ==0.6.1
+ - ref-fd ==0.4.0.2
+ - refined ==0.6.2
- reflection ==2.1.6
- reform ==0.2.7.4
- reform-blaze ==0.2.4.3
- reform-hamlet ==0.0.5.3
- reform-happstack ==0.2.5.4
- RefSerialize ==0.4.0
+ - ref-tf ==0.4.0.2
- regex ==1.1.0.0
- regex-applicative ==0.3.4
- regex-applicative-text ==0.1.0.1
@@ -2025,15 +2025,15 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
- safe ==0.3.19
+ - safecopy ==0.10.3.1
- safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.1
- safe-foldable ==0.1.0.0
+ - safeio ==0.0.5.0
- safe-json ==1.1.1.1
- safe-money ==0.9
- - safe-tensor ==0.2.1.0
- - safecopy ==0.10.3.1
- - safeio ==0.0.5.0
- SafeSemaphore ==0.10.1
+ - safe-tensor ==0.2.1.0
- salak ==0.3.6
- salak-yaml ==0.3.5.3
- saltine ==0.1.1.1
@@ -2071,8 +2071,8 @@ default-package-overrides:
- semigroupoid-extras ==5
- semigroupoids ==5.3.5
- semigroups ==0.19.1
- - semiring-simple ==1.0.0.1
- semirings ==0.6
+ - semiring-simple ==1.0.0.1
- semver ==0.4.0.1
- sendfile ==0.7.11.1
- seqalign ==0.2.0.4
@@ -2118,9 +2118,9 @@ default-package-overrides:
- shared-memory ==0.2.0.0
- shell-conduit ==5.0.0
- shell-escape ==0.2.0
- - shell-utility ==0.1
- shellmet ==0.0.3.1
- shelltestrunner ==1.9
+ - shell-utility ==0.1
- shelly ==1.9.0
- shikensu ==0.3.11
- shortcut-links ==0.5.1.1
@@ -2191,16 +2191,16 @@ default-package-overrides:
- splitmix ==0.1.0.3
- spoon ==0.3.1
- spreadsheet ==0.1.3.8
- - sql-words ==0.1.6.4
- sqlcli ==0.2.2.0
- sqlcli-odbc ==0.2.0.1
- sqlite-simple ==0.4.18.0
+ - sql-words ==0.1.6.4
- squeal-postgresql ==0.7.0.1
- squeather ==0.6.0.0
- srcloc ==0.5.1.2
- stache ==2.2.0
- - stack-templatizer ==0.1.0.2
- stackcollapse-ghc ==0.0.1.3
+ - stack-templatizer ==0.1.0.2
- stateref ==0.3
- StateVar ==1.2.1
- static-text ==0.2.0.6
@@ -2215,8 +2215,8 @@ default-package-overrides:
- stm-extras ==0.1.0.3
- stm-hamt ==1.2.0.4
- stm-lifted ==2.5.0.0
- - stm-split ==0.0.2.1
- STMonadTrans ==0.4.5
+ - stm-split ==0.0.2.1
- stopwatch ==0.1.0.6
- storable-complex ==0.2.3.0
- storable-endian ==0.2.6
@@ -2237,6 +2237,7 @@ default-package-overrides:
- strict-list ==0.1.5
- strict-tuple ==0.1.4
- strict-tuple-lens ==0.1.0.1
+ - stringbuilder ==0.5.1
- string-class ==0.1.7.0
- string-combinators ==0.6.0.5
- string-conv ==0.1.2
@@ -2244,9 +2245,8 @@ default-package-overrides:
- string-interpolate ==0.3.0.2
- string-qq ==0.0.4
- string-random ==0.1.4.0
- - string-transform ==1.1.1
- - stringbuilder ==0.5.1
- stringsearch ==0.3.6.6
+ - string-transform ==1.1.1
- stripe-concepts ==1.0.2.4
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
@@ -2271,10 +2271,10 @@ default-package-overrides:
- symmetry-operations-symbols ==0.0.2.1
- sysinfo ==0.1.1
- system-argv0 ==0.1.1
+ - systemd ==2.3.0
- system-fileio ==0.3.16.4
- system-filepath ==0.4.14
- system-info ==0.5.1
- - systemd ==2.3.0
- tabular ==0.2.2.8
- taffybar ==3.2.3
- tagchup ==0.4.1.1
@@ -2291,6 +2291,7 @@ default-package-overrides:
- tardis ==0.4.1.0
- tasty ==1.2.3
- tasty-ant-xml ==1.1.7
+ - tasty-bench ==0.1
- tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.2
@@ -2340,6 +2341,7 @@ default-package-overrides:
- text-icu ==0.7.0.1
- text-latin1 ==0.3.1
- text-ldap ==0.1.1.13
+ - textlocal ==0.1.0.5
- text-manipulate ==0.2.0.1
- text-metrics ==0.3.0
- text-postgresql ==0.0.3.1
@@ -2350,9 +2352,8 @@ default-package-overrides:
- text-show ==3.9
- text-show-instances ==3.8.4
- text-zipper ==0.11
- - textlocal ==0.1.0.5
- - tf-random ==0.5
- tfp ==1.0.1.1
+ - tf-random ==0.5
- th-abstraction ==0.4.2.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1
@@ -2360,6 +2361,10 @@ default-package-overrides:
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
- th-env ==0.1.0.2
+ - these ==1.1.1.1
+ - these-lens ==1.0.1.1
+ - these-optics ==1.0.1.1
+ - these-skinny ==0.7.4
- th-expand-syns ==0.4.6.0
- th-extras ==0.0.0.4
- th-lift ==0.8.2
@@ -2367,37 +2372,33 @@ default-package-overrides:
- th-nowq ==0.1.0.5
- th-orphans ==0.13.11
- th-printf ==0.7
- - th-reify-compat ==0.0.1.5
- - th-reify-many ==0.1.9
- - th-strict-compat ==0.1.0.1
- - th-test-utils ==1.1.0
- - th-utilities ==0.2.4.1
- - these ==1.1.1.1
- - these-lens ==1.0.1.1
- - these-optics ==1.0.1.1
- - these-skinny ==0.7.4
- thread-hierarchy ==0.3.0.2
- thread-local-storage ==0.2
- - thread-supervisor ==0.2.0.0
- threads ==0.5.1.6
+ - thread-supervisor ==0.2.0.0
- threepenny-gui ==0.9.0.0
+ - th-reify-compat ==0.0.1.5
+ - th-reify-many ==0.1.9
- throttle-io-stream ==0.2.0.1
- through-text ==0.1.0.0
- throwable-exceptions ==0.1.0.9
+ - th-strict-compat ==0.1.0.1
+ - th-test-utils ==1.1.0
+ - th-utilities ==0.2.4.1
- thyme ==0.3.5.5
- tidal ==1.6.1
- tile ==0.3.0.0
- time-compat ==1.9.5
+ - timeit ==2.0
+ - timelens ==0.2.0.2
- time-lens ==0.4.0.2
- time-locale-compat ==0.1.1.5
- time-locale-vietnamese ==1.0.0.0
- time-manager ==0.0.0
- time-parsers ==0.1.2.1
- - time-units ==1.0.0
- - timeit ==2.0
- - timelens ==0.2.0.2
- - timer-wheel ==0.3.0
- timerep ==2.0.1.0
+ - timer-wheel ==0.3.0
+ - time-units ==1.0.0
- timezone-olson ==0.2.0
- timezone-series ==0.1.9
- tinylog ==0.15.0
@@ -2432,10 +2433,14 @@ default-package-overrides:
- ttl-hashtables ==1.4.1.0
- ttrie ==0.1.2.1
- tuple ==0.3.0.2
+ - tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- - tuples-homogenous-h98 ==0.1.1.0
- turtle ==1.5.20
+ - typecheck-plugin-nat-simple ==0.1.0.2
+ - TypeCompose ==0.9.14
+ - typed-process ==0.2.6.0
+ - typed-uuid ==0.0.0.2
- type-equality ==1
- type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.1
@@ -2449,12 +2454,8 @@ default-package-overrides:
- type-of-html ==1.6.1.2
- type-of-html-static ==0.1.0.2
- type-operators ==0.2.0.0
- - type-spec ==0.4.0.0
- - typecheck-plugin-nat-simple ==0.1.0.2
- - TypeCompose ==0.9.14
- - typed-process ==0.2.6.0
- - typed-uuid ==0.0.0.2
- typerep-map ==0.3.3.0
+ - type-spec ==0.4.0.0
- tzdata ==0.2.20201021.0
- ua-parser ==0.7.5.1
- uglymemo ==0.1.0.1
@@ -2593,18 +2594,18 @@ default-package-overrides:
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.0.0.4
- - with-location ==0.1.0
- - with-utf8 ==1.0.2.1
- witherable-class ==0
- within ==0.2.0.1
+ - with-location ==0.1.0
+ - with-utf8 ==1.0.2.1
- wizards ==1.0.3
- wl-pprint-annotated ==0.1.0.1
- wl-pprint-console ==0.1.0.2
- wl-pprint-text ==1.2.0.1
- - word-trie ==0.3.0
- - word-wrap ==0.4.1
- word24 ==2.0.1
- word8 ==0.1.3
+ - word-trie ==0.3.0
+ - word-wrap ==0.4.1
- world-peace ==1.0.2.0
- wrap ==0.0.0
- wreq ==0.5.3.2
@@ -2631,6 +2632,7 @@ default-package-overrides:
- xml-basic ==0.1.3.1
- xml-conduit ==1.9.0.0
- xml-conduit-writer ==0.1.1.2
+ - xmlgen ==0.6.2.2
- xml-hamlet ==0.5.0.1
- xml-helpers ==1.0.0
- xml-html-qq ==0.1.0.1
@@ -2640,7 +2642,6 @@ default-package-overrides:
- xml-to-json ==2.0.1
- xml-to-json-fast ==2.0.0
- xml-types ==0.3.8
- - xmlgen ==0.6.2.2
- xmonad ==0.15
- xmonad-contrib ==0.16
- xmonad-extras ==0.15.3
@@ -2648,7 +2649,6 @@ default-package-overrides:
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- yamlparse-applicative ==0.1.0.2
- - yes-precure5-command ==5.5.3
- yesod ==1.6.1.0
- yesod-auth ==1.6.10.1
- yesod-auth-hashdb ==1.7.1.5
@@ -2666,6 +2666,7 @@ default-package-overrides:
- yesod-static ==1.6.1.0
- yesod-test ==1.6.12
- yesod-websockets ==0.3.0.2
+ - yes-precure5-command ==5.5.3
- yi-rope ==0.11
- yjsvg ==0.2.0.1
- yjtools ==0.9.18
@@ -2680,9 +2681,9 @@ default-package-overrides:
- zio ==0.1.0.2
- zip ==1.7.0
- zip-archive ==0.4.1
- - zip-stream ==0.2.0.1
- zipper-extra ==0.1.3.2
- zippers ==0.3
+ - zip-stream ==0.2.0.1
- zlib ==0.6.2.2
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
From 512f670bc5a3ce92ce4f097f9cf5e6d3de8df4b0 Mon Sep 17 00:00:00 2001
From: "Itai Y. Efrat" <itai3397@gmail.com>
Date: Mon, 1 Feb 2021 11:32:19 +0200
Subject: [PATCH 05/15] haskellPackages.hum: broken -> unbroken
---
pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 6f889577af03..bbf0485e88b8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6856,7 +6856,6 @@ broken-packages:
- hugs2yc
- hulk
- HulkImport
- - hum
- human-parse
- human-text
- humble-prelude
From 401a3d598993b53404cf5cbdeb284345e9312d79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Feb 2021 02:30:45 +0100
Subject: [PATCH 06/15] hackage-packages.nix: automatic Haskell package set
update
This update was generated by hackage2nix v2.16.0-10-gabc66d1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d5c9f894f31fba43db8123a6776a4819b04ef3c4.
---
.../haskell-modules/hackage-packages.nix | 1009 ++++++++++-------
1 file changed, 625 insertions(+), 384 deletions(-)
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cfd4a5eac642..1e2f3427dfb5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8012,8 +8012,8 @@ self: {
}:
mkDerivation {
pname = "HDBC-postgresql";
- version = "2.4.0.0";
- sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3";
+ version = "2.5.0.0";
+ sha256 = "1awwrq7hivk1hp709iz624hm2wjbk18hspld91pixv5x34fcn7s9";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal ];
@@ -21931,8 +21931,8 @@ self: {
}:
mkDerivation {
pname = "Z-Data";
- version = "0.5.0.0";
- sha256 = "07yx0mh1h0p5qsw0sn20mcz542h5dh3p6l3nbzqrjvdpp22s27h0";
+ version = "0.6.0.0";
+ sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq ghc-prim
@@ -21959,8 +21959,8 @@ self: {
}:
mkDerivation {
pname = "Z-IO";
- version = "0.4.0.0";
- sha256 = "0jyx2mghm40llcvilg6m9120wfngvpmsggy7xy6zdf29lz3v9bd5";
+ version = "0.6.0.0";
+ sha256 = "1s7vdmp2i89c2rvcifn6znwl167ji8x3yrvk19rrkqpamdy9m3m3";
libraryHaskellDepends = [
base containers exceptions primitive stm time unix-time
unordered-containers Z-Data
@@ -30182,24 +30182,23 @@ self: {
"ansi-terminal-game" = callPackage
({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
, clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck
- , random, split, terminal-size, timers-tick
+ , random, split, terminal-size, timers-tick, unidecode
}:
mkDerivation {
pname = "ansi-terminal-game";
- version = "1.0.0.0";
- sha256 = "0h33ih7sxzyp1a6r6ivk73lrfx6haxxzmgh56n75sa7p8vhr8f1i";
- revision = "1";
- editedCabalFile = "1x601p97ragf9k56qy1ndmn7g3brs8fvvmf1wcrxz1ynhndqqpjw";
+ version = "1.1.0.0";
+ sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal array base bytestring cereal clock exceptions
linebreak mintty mtl QuickCheck random split terminal-size
- timers-tick
+ timers-tick unidecode
];
testHaskellDepends = [
ansi-terminal array base bytestring cereal clock exceptions hspec
linebreak mtl QuickCheck random split terminal-size timers-tick
+ unidecode
];
description = "sdl-like functions for terminal applications, based on ansi-terminal";
license = lib.licenses.gpl3;
@@ -36491,6 +36490,8 @@ self: {
pname = "aws-larpi";
version = "0.1.0.0";
sha256 = "04z5wcvkcvq961zc9pg79k6340vgm6rdws6lfjysl5jrwr5sfxg9";
+ revision = "1";
+ editedCabalFile = "00singwkjvv2g92i16bsaqdq2rwg2l4v39vmy1vdi6dbpalkka4n";
libraryHaskellDepends = [
aeson base bytestring modern-uri req text
];
@@ -42955,6 +42956,8 @@ self: {
pname = "bitwise-enum";
version = "1.0.0.3";
sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis";
+ revision = "3";
+ editedCabalFile = "19d5xwigd482z47s8gpbd2jmm4pmx5bxg2fxkzjl8dias4yb431x";
libraryHaskellDepends = [
aeson array base deepseq mono-traversable vector
];
@@ -45421,6 +45424,33 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "brick_0_60_1" = callPackage
+ ({ mkDerivation, base, bytestring, config-ini, containers
+ , contravariant, data-clist, deepseq, directory, dlist, exceptions
+ , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
+ , template-haskell, text, text-zipper, transformers, unix, vector
+ , vty, word-wrap
+ }:
+ mkDerivation {
+ pname = "brick";
+ version = "0.60.1";
+ sha256 = "017zhf5frk1dx5brjnz101pr9hyz4m03sw54gvlx7qv58r4prvjx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring config-ini containers contravariant data-clist
+ deepseq directory dlist exceptions filepath microlens microlens-mtl
+ microlens-th stm template-haskell text text-zipper transformers
+ unix vector vty word-wrap
+ ];
+ testHaskellDepends = [
+ base containers microlens QuickCheck vector
+ ];
+ description = "A declarative terminal user interface library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"brick-dropdownmenu" = callPackage
({ mkDerivation, base, brick, containers, microlens, microlens-ghc
, microlens-th, pointedlist, vector, vty
@@ -48092,8 +48122,8 @@ self: {
({ mkDerivation, base, Cabal, filepath }:
mkDerivation {
pname = "cabal-appimage";
- version = "0.3.0.0";
- sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi";
+ version = "0.3.0.1";
+ sha256 = "0cl588kqsmq8vpnd96knqp6bllbc1kznfgs786vccvq7s4zxna6v";
libraryHaskellDepends = [ base Cabal filepath ];
description = "Cabal support for creating AppImage applications";
license = lib.licenses.agpl3;
@@ -49880,8 +49910,8 @@ self: {
}:
mkDerivation {
pname = "calamity";
- version = "0.1.24.1";
- sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2";
+ version = "0.1.24.2";
+ sha256 = "03z9wkvb75vib5m15ml2mrkdq2jgdnjnjp77wdb494xj50g3wgqn";
libraryHaskellDepends = [
aeson async base bytestring colour concurrent-extra connection
containers data-default-class data-flags deepseq deque df1 di-core
@@ -54705,8 +54735,8 @@ self: {
}:
mkDerivation {
pname = "citeproc";
- version = "0.3.0.5";
- sha256 = "18ybi21fmw9rkd4m74dgy1cf3i9l79bpalm79427kass8mv4wpia";
+ version = "0.3.0.7";
+ sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -59192,8 +59222,8 @@ self: {
}:
mkDerivation {
pname = "compdata";
- version = "0.12";
- sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v";
+ version = "0.12.1";
+ sha256 = "0ksa3bgqjvshkrpd74420z9kkb3asq4flszzwrqswd4qw1yn9f05";
libraryHaskellDepends = [
base containers deepseq mtl QuickCheck template-haskell
th-expand-syns transformers tree-view
@@ -62851,6 +62881,8 @@ self: {
pname = "contra-tracer";
version = "0.1.0.0";
sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br";
+ revision = "1";
+ editedCabalFile = "1r3rnxlbvfirj4n2vwysh7zkfdwlx3x4p9yjd32hpr3vdikgpvds";
libraryHaskellDepends = [ base ];
description = "Arrow and contravariant tracers";
license = lib.licenses.bsd3;
@@ -64860,8 +64892,8 @@ self: {
}:
mkDerivation {
pname = "crdt";
- version = "10.6";
- sha256 = "0c86gf70iv59dwmm0yv8isyyd6zy497vqgf6ml9s6rz4hhg1rwl0";
+ version = "10.7";
+ sha256 = "0745aa7zs5niwi55kdkfnyii9vdg9jfqr2872w068r8p33njcbdk";
libraryHaskellDepends = [
base binary bytestring containers Diff hashable mtl network-info
safe stm time vector
@@ -71688,16 +71720,14 @@ self: {
broken = true;
}) {};
- "deepseq_1_4_4_0" = callPackage
+ "deepseq_1_4_5_0" = callPackage
({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
, test-framework-hunit
}:
mkDerivation {
pname = "deepseq";
- version = "1.4.4.0";
- sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc";
- revision = "1";
- editedCabalFile = "0mbby1hig605jyiyy4m2y2nnjjf5i2adzc6x269hbz4pxscjp43n";
+ version = "1.4.5.0";
+ sha256 = "0d3yw95xkyx7wwx3anfj1fqb10080xykqic483xpl7rvi1mik6js";
libraryHaskellDepends = [ array base ];
testHaskellDepends = [
array base ghc-prim HUnit test-framework test-framework-hunit
@@ -72261,35 +72291,39 @@ self: {
}) {};
"dep-t" = callPackage
- ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit
- , template-haskell, transformers, unliftio-core
+ ({ mkDerivation, base, doctest, mtl, rank2classes, sop-core, tasty
+ , tasty-hunit, template-haskell, transformers, unliftio-core
}:
mkDerivation {
pname = "dep-t";
- version = "0.1.3.0";
- sha256 = "1bzf2czbml949an6gffc7jh898ba2axfh87phnrla0595x7nrx21";
+ version = "0.4.0.1";
+ sha256 = "1smziiydnyzs144wzcvjd4slmkip6g4195mcvjskkydyrpcq1g18";
libraryHaskellDepends = [ base mtl transformers unliftio-core ];
testHaskellDepends = [
- base mtl rank2classes tasty tasty-hunit template-haskell
- transformers unliftio-core
+ base doctest mtl rank2classes sop-core tasty tasty-hunit
+ template-haskell transformers unliftio-core
];
description = "Reader-like monad transformer for dependency injection";
license = lib.licenses.bsd3;
}) {};
"dep-t-advice" = callPackage
- ({ mkDerivation, base, dep-t, doctest, mtl, rank2classes, sop-core
- , tasty, tasty-hunit, template-haskell, transformers
+ ({ mkDerivation, base, criterion, dep-t, doctest, mtl, rank2classes
+ , sop-core, tasty, tasty-hunit, template-haskell, transformers
}:
mkDerivation {
pname = "dep-t-advice";
- version = "0.3.0.0";
- sha256 = "00nqf37x877s5arkwv55cki068gpgq64yns4qhp039az2mfr4g9q";
- libraryHaskellDepends = [ base dep-t sop-core ];
+ version = "0.4.0.1";
+ sha256 = "11qjlidmjn2z1gnngrssdzm8hqiq9a54jksp9al8wzflf31jgh0i";
+ libraryHaskellDepends = [ base dep-t sop-core transformers ];
testHaskellDepends = [
base dep-t doctest mtl rank2classes sop-core tasty tasty-hunit
template-haskell transformers
];
+ benchmarkHaskellDepends = [
+ base criterion dep-t mtl rank2classes sop-core template-haskell
+ transformers
+ ];
description = "Giving good advice to functions in a DepT environment";
license = lib.licenses.bsd3;
}) {};
@@ -73336,6 +73370,63 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "dhall_1_37_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
+ , base, bytestring, case-insensitive, cborg, cborg-json, containers
+ , contravariant, cryptonite, data-fix, deepseq, Diff, directory
+ , doctest, dotgen, either, exceptions, filepath, foldl, gauge
+ , generic-random, half, hashable, haskeline, http-client
+ , http-client-tls, http-types, lens-family-core, megaparsec, memory
+ , mmorph, mockery, mtl, network-uri, optparse-applicative
+ , parser-combinators, parsers, pretty-simple, prettyprinter
+ , prettyprinter-ansi-terminal, profunctors, QuickCheck
+ , quickcheck-instances, repline, scientific, serialise
+ , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
+ , tasty-quickcheck, tasty-silver, template-haskell, text
+ , text-manipulate, th-lift-instances, transformers
+ , transformers-compat, turtle, unordered-containers, uri-encode
+ , vector
+ }:
+ mkDerivation {
+ pname = "dhall";
+ version = "1.37.1";
+ sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d";
+ revision = "1";
+ editedCabalFile = "11sjra0k7sdy0xcbhlxvjjpd4h7ki9dcrndcpaq71qlgdql32w24";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty ansi-terminal atomic-write base bytestring
+ case-insensitive cborg cborg-json containers contravariant
+ cryptonite data-fix deepseq Diff directory dotgen either exceptions
+ filepath half hashable haskeline http-client http-client-tls
+ http-types lens-family-core megaparsec memory mmorph mtl
+ network-uri optparse-applicative parser-combinators parsers
+ pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
+ repline scientific serialise template-haskell text text-manipulate
+ th-lift-instances transformers transformers-compat
+ unordered-containers uri-encode vector
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base bytestring cborg containers data-fix deepseq directory doctest
+ either filepath foldl generic-random http-client http-client-tls
+ lens-family-core megaparsec mockery prettyprinter QuickCheck
+ quickcheck-instances scientific serialise special-values spoon
+ tasty tasty-expected-failure tasty-hunit tasty-quickcheck
+ tasty-silver template-haskell text transformers turtle
+ unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers directory gauge text
+ ];
+ doCheck = false;
+ description = "A configuration language guaranteed to terminate";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"dhall" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
, base, bytestring, case-insensitive, cborg, cborg-json, containers
@@ -75828,8 +75919,8 @@ self: {
}:
mkDerivation {
pname = "discord-haskell";
- version = "1.8.1";
- sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3";
+ version = "1.8.2";
+ sha256 = "0gw2c5fb4i6j5prmbj20fsnmci34kbzx3gk8pv93i33jndbs6g6h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -81642,8 +81733,8 @@ self: {
({ mkDerivation, base, containers, doctest }:
mkDerivation {
pname = "either-list-functions";
- version = "0.0.4.2";
- sha256 = "1cagf93vaz41hl5vm1xqvzdds82h2cck294apr5b082nscv6r9bc";
+ version = "0.0.4.4";
+ sha256 = "1kh10iykk6gqzl78smrwv1zl8dcy0ns2raisx5qchcvrdgshzdiy";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base doctest ];
description = "Functions involving lists of Either";
@@ -88048,8 +88139,8 @@ self: {
}:
mkDerivation {
pname = "faktory";
- version = "1.0.1.4";
- sha256 = "151jlcrp80f8riyf8rxzvggyxq3k2mg2fi81r7wnc4in6gzsc0qj";
+ version = "1.0.1.5";
+ sha256 = "0v7hd609315lvkkvk00f0q6jkp87hi0zy9zf18b5rkbwalx12avp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -88879,8 +88970,8 @@ self: {
({ mkDerivation, base, doctest, first-class-families, Glob }:
mkDerivation {
pname = "fcf-containers";
- version = "0.5.0";
- sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2";
+ version = "0.6.0";
+ sha256 = "09sr1xqdjzfk5gysd7hi66xadwcfrjq4q3vakmdilc14lw833wgp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base first-class-families ];
@@ -93787,8 +93878,8 @@ self: {
}:
mkDerivation {
pname = "forsyde-shallow";
- version = "3.4.0.0";
- sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn";
+ version = "3.4.0.1";
+ sha256 = "0im5xf8dcalsjk85fyvih042apv3wl54k3jlmdjg7fnm3mgxj1yj";
libraryHaskellDepends = [ base directory old-time process random ];
testHaskellDepends = [
base directory doctest hspec old-time process QuickCheck random
@@ -95614,8 +95705,8 @@ self: {
}:
mkDerivation {
pname = "fswatcher";
- version = "0.2.2";
- sha256 = "0rdvh9310qbnp6vh3janr60nla33kyfy23yfzbzsca8ridr7ab7w";
+ version = "0.3.0";
+ sha256 = "0bn3pnk7jra4p20hm4ydvnqibfh3h9kc5lswvs8s02wlzf5z5a9f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -99635,8 +99726,8 @@ self: {
}:
mkDerivation {
pname = "geoip2";
- version = "0.4.0.1";
- sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7";
+ version = "0.4.1.0";
+ sha256 = "06sbiyqy63ymqafdw14yz6aww412v3g6vsqq0v99vph3yzhn8xxp";
libraryHaskellDepends = [
base bytestring cereal containers iproute lens mmap
reinterpret-cast text
@@ -100243,8 +100334,8 @@ self: {
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.6.3.3";
- sha256 = "1psrr6iaa7k5f3zz7j82crg052n3x1h2dljyb16qzbv98bqny6nb";
+ version = "0.6.3.4";
+ sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -101110,8 +101201,8 @@ self: {
}:
mkDerivation {
pname = "ghc-vis";
- version = "0.9";
- sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw";
+ version = "0.9.1";
+ sha256 = "1sqs6hkc2yf7nlbawadzychni8hbl6h9qclf7k11dfrfaqj10f4z";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl
@@ -101154,24 +101245,25 @@ self: {
"ghci-dap" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
- , directory, filepath, ghc, ghc-boot, ghc-paths, ghc-prim, ghci
- , haskeline, haskell-dap, process, text, time, transformers, unix
+ , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths
+ , ghc-prim, ghci, haskeline, haskell-dap, process, text, time
+ , transformers, unix
}:
mkDerivation {
pname = "ghci-dap";
- version = "0.0.14.0";
- sha256 = "0gnawjk1bzrcinazygwal4kfnqq780v7q4lm0xrvjb50cvixkjpf";
+ version = "0.0.15.0";
+ sha256 = "1m4ypd2d9bjdkdqrnqijc1na5g14mmjrcr5msgr7spsnskhzi4yg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base bytestring containers deepseq directory filepath ghc
- ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text
- time transformers
+ array base bytestring containers deepseq directory exceptions
+ filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap
+ process text time transformers
];
executableHaskellDepends = [
- array base bytestring containers deepseq directory filepath ghc
- ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text
- time transformers unix
+ array base bytestring containers deepseq directory exceptions
+ filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap
+ process text time transformers unix
];
description = "ghci-dap is a GHCi having DAP interface";
license = lib.licenses.bsd3;
@@ -101395,8 +101487,8 @@ self: {
, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
, ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
, haddock-library, hashable, haskell-lsp, haskell-lsp-types
- , heapsize, hie-bios, hie-compat, hls-plugin-api, hslogger
- , implicit-hie-cradle, lens, lsp-test, mtl, network-uri
+ , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty
+ , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
, opentelemetry, optparse-applicative, parallel, prettyprinter
, prettyprinter-ansi-terminal, process, QuickCheck
, quickcheck-instances, record-dot-preprocessor, record-hasfield
@@ -101408,8 +101500,8 @@ self: {
}:
mkDerivation {
pname = "ghcide";
- version = "0.7.2.0";
- sha256 = "1d35vfwg906djfr2klrql7crgcyabfad12akalx25jc6c7pacv1d";
+ version = "0.7.3.0";
+ sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -101443,6 +101535,7 @@ self: {
benchmarkHaskellDepends = [
aeson base directory filepath shake shake-bench text yaml
];
+ benchmarkToolDepends = [ hp2pretty ];
description = "The core of an IDE";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
@@ -101984,7 +102077,7 @@ self: {
description = "Gdk bindings";
license = lib.licenses.lgpl21;
hydraPlatforms = lib.platforms.none;
- }) {gtk4 = null;};
+ }) {inherit (pkgs) gtk4;};
"gi-gdkpixbuf" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
@@ -102194,7 +102287,7 @@ self: {
license = lib.licenses.lgpl21;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {gtk4 = null;};
+ }) {inherit (pkgs) gtk4;};
"gi-gst" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -102376,7 +102469,7 @@ self: {
description = "Gtk bindings";
license = lib.licenses.lgpl21;
hydraPlatforms = lib.platforms.none;
- }) {gtk4 = null;};
+ }) {inherit (pkgs) gtk4;};
"gi-gtk-declarative" = callPackage
({ mkDerivation, async, base, containers, data-default-class
@@ -113329,19 +113422,20 @@ self: {
"hadolint" = callPackage
({ mkDerivation, aeson, async, base, bytestring, containers
- , directory, filepath, gitrev, hspec, HsYAML, HUnit
+ , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit
, language-docker, megaparsec, mtl, optparse-applicative, parallel
, ShellCheck, split, text, void
}:
mkDerivation {
pname = "hadolint";
- version = "1.20.0";
- sha256 = "1wb2q26najfmmgvj35wvinvip4l1d3k5mazrang4cr3ch8v1nv6w";
+ version = "1.21.0";
+ sha256 = "1hxp8wl0jh30njd2z5g339qi3zlszy3br21d1pzarziwdabi9vcg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson async base bytestring containers directory filepath HsYAML
- language-docker megaparsec mtl parallel ShellCheck split text void
+ aeson async base bytestring containers cryptonite directory
+ filepath HsYAML language-docker megaparsec mtl parallel ShellCheck
+ split text void
];
executableHaskellDepends = [
base containers gitrev language-docker megaparsec
@@ -114791,8 +114885,8 @@ self: {
({ mkDerivation, base, containers, random }:
mkDerivation {
pname = "hanabi-dealer";
- version = "0.11.0.1";
- sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9";
+ version = "0.11.0.2";
+ sha256 = "1ndg8zmcc5a9z9qcc5z5nwssywxighnqxa4pzc5iy7kw4x9bm3kn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers random ];
@@ -117437,15 +117531,12 @@ self: {
}) {};
"haskell-dap" = callPackage
- ({ mkDerivation, base, containers, unix }:
+ ({ mkDerivation, base, containers }:
mkDerivation {
pname = "haskell-dap";
- version = "0.0.14.0";
- sha256 = "1n4w7kvsy7dri07840i6rm6b7fl425f8r3fglbcss42g674k35di";
- isLibrary = true;
- isExecutable = true;
+ version = "0.0.15.0";
+ sha256 = "1wk6813pwwnph7w1waci9q6r0glsjpayk27kr43zddwd2v0abcld";
libraryHaskellDepends = [ base containers ];
- executableHaskellDepends = [ base unix ];
description = "Haskell implementation of the DAP interface data";
license = lib.licenses.bsd3;
}) {};
@@ -117459,8 +117550,8 @@ self: {
}:
mkDerivation {
pname = "haskell-debug-adapter";
- version = "0.0.33.0";
- sha256 = "1v4dzjv1w0jdp5dyq3qrbdw34433b5xg6wk5hg87agzc3mllbkqa";
+ version = "0.0.34.0";
+ sha256 = "00z9yhs2c34rdki404gcwf938a2lshr0a7mrvzpknk70n1a0gall";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -119992,8 +120083,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.18.0";
- sha256 = "13j8hsyj7x30s6rl8pigvkcwn9ahrwd85y4i8z6728rsjj2ygih3";
+ version = "0.19.0";
+ sha256 = "0yyrka8hr6jsl7w59j3xmnvzq4gnwz4gybjar2zq1g096shdpk7c";
libraryHaskellDepends = [
aeson array base base16-bytestring bytestring cereal conduit
containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -120126,41 +120217,41 @@ self: {
({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring
, cereal, conduit, containers, data-default, deepseq, filepath
, hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis
- , hspec, hspec-discover, http-types, monad-logger, mtl, network
- , nqe, optparse-applicative, QuickCheck, random
+ , hspec, hspec-discover, http-types, lens, monad-logger, mtl
+ , network, nqe, optparse-applicative, QuickCheck, random
, rocksdb-haskell-jprupp, rocksdb-query, scotty, string-conversions
, text, time, transformers, unliftio, unordered-containers, wai
- , warp
+ , warp, wreq
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.39.0";
- sha256 = "1a1bhsjxb1nj49b5xjv78h89xsc5ffrf9qq1n12ak54ckvw0rgmv";
+ version = "0.40.17";
+ sha256 = "1bklypyzxchbwcyzmnkc8dg8dq9i1n8xhcli3cb0v0bzfx8xfha1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty base bytestring cereal conduit containers
data-default deepseq hashable haskoin-core haskoin-node
- haskoin-store-data hedis http-types monad-logger mtl network nqe
- random rocksdb-haskell-jprupp rocksdb-query scotty
+ haskoin-store-data hedis http-types lens monad-logger mtl network
+ nqe random rocksdb-haskell-jprupp rocksdb-query scotty
string-conversions text time transformers unliftio
- unordered-containers wai warp
+ unordered-containers wai warp wreq
];
executableHaskellDepends = [
aeson aeson-pretty base bytestring cereal conduit containers
data-default deepseq filepath hashable haskoin-core haskoin-node
- haskoin-store-data hedis http-types monad-logger mtl network nqe
- optparse-applicative random rocksdb-haskell-jprupp rocksdb-query
- scotty string-conversions text time transformers unliftio
- unordered-containers wai warp
+ haskoin-store-data hedis http-types lens monad-logger mtl network
+ nqe optparse-applicative random rocksdb-haskell-jprupp
+ rocksdb-query scotty string-conversions text time transformers
+ unliftio unordered-containers wai warp wreq
];
testHaskellDepends = [
aeson aeson-pretty base base64 bytestring cereal conduit containers
data-default deepseq hashable haskoin-core haskoin-node
- haskoin-store-data hedis hspec http-types monad-logger mtl network
- nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty
- string-conversions text time transformers unliftio
- unordered-containers wai warp
+ haskoin-store-data hedis hspec http-types lens monad-logger mtl
+ network nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query
+ scotty string-conversions text time transformers unliftio
+ unordered-containers wai warp wreq
];
testToolDepends = [ hspec-discover ];
description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -120173,21 +120264,22 @@ self: {
({ mkDerivation, aeson, base, bytestring, cereal, containers
, data-default, deepseq, hashable, haskoin-core, hspec
, hspec-discover, http-client, http-types, lens, mtl, network
- , QuickCheck, scotty, string-conversions, text, wreq
+ , QuickCheck, scotty, string-conversions, text
+ , unordered-containers, wreq
}:
mkDerivation {
pname = "haskoin-store-data";
- version = "0.38.1";
- sha256 = "0x3p0fylfc8llv94nmjaz9537qp2jwm5zlbs8mw7b4lh9z69f3ba";
+ version = "0.40.2";
+ sha256 = "08c2ga6j5himcprsyyd2jw3mygsj7if6i9h4mrg4m4v8x31vhg3f";
libraryHaskellDepends = [
aeson base bytestring cereal containers data-default deepseq
hashable haskoin-core http-client http-types lens mtl network
- scotty string-conversions text wreq
+ scotty string-conversions text unordered-containers wreq
];
testHaskellDepends = [
aeson base bytestring cereal containers data-default deepseq
hashable haskoin-core hspec http-client http-types lens mtl network
- QuickCheck scotty string-conversions text wreq
+ QuickCheck scotty string-conversions text unordered-containers wreq
];
testToolDepends = [ hspec-discover ];
description = "Data for Haskoin Store";
@@ -120860,10 +120952,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "haskus-utils-types";
- version = "1.5";
- sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy";
- revision = "1";
- editedCabalFile = "1mjwmk5prbrb91dbhxg9pp47zf5cfnnm07h3f2m902af3l0yjiih";
+ version = "1.5.1";
+ sha256 = "1nm5nn45r2c9f20j7v0v3abkbglyi45wmyrigy1v65c5lk4g57r5";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Haskus types utility modules";
@@ -123404,8 +123494,8 @@ self: {
({ mkDerivation, async, base, io-streams, time }:
mkDerivation {
pname = "heartbeat-streams";
- version = "0.1.0.2";
- sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d";
+ version = "0.1.0.3";
+ sha256 = "004dkld0friilhb9j1fhibzndchkljxzqm6k99zli4h83q787wlf";
libraryHaskellDepends = [ async base io-streams time ];
description = "Heartbeats for io-streams";
license = lib.licenses.bsd3;
@@ -123859,8 +123949,8 @@ self: {
}:
mkDerivation {
pname = "hedis";
- version = "0.14.1";
- sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd";
+ version = "0.14.2";
+ sha256 = "1zm8llpbbvr5f5s0i4qsn025734s1mamfvm1dgxw4p87m9zhprlm";
libraryHaskellDepends = [
async base bytestring bytestring-lexing containers deepseq errors
exceptions HTTP mtl network network-uri resource-pool scanner stm
@@ -125106,31 +125196,31 @@ self: {
"hevm" = callPackage
({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
, base16-bytestring, binary, brick, bytestring, cereal, containers
- , cryptonite, data-dword, deepseq, directory, fgl, filepath, free
- , haskeline, here, HUnit, lens, lens-aeson, libff, megaparsec
- , memory, monad-par, mtl, multiset, operational, optparse-generic
- , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git
- , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range
- , tasty, tasty-hunit, tasty-quickcheck, temporary, text
- , text-format, time, transformers, tree-view, unordered-containers
- , vector, vty, witherable, wreq
+ , cryptonite, data-dword, Decimal, deepseq, directory, fgl
+ , filepath, free, haskeline, here, HUnit, lens, lens-aeson, libff
+ , megaparsec, memory, monad-par, mtl, multiset, operational
+ , optparse-generic, process, QuickCheck, quickcheck-text
+ , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific
+ , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck
+ , temporary, text, text-format, time, transformers, tree-view
+ , unordered-containers, vector, vty, witherable, wreq
}:
mkDerivation {
pname = "hevm";
- version = "0.42.0";
- sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz";
+ version = "0.44.1";
+ sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
abstract-par aeson ansi-wl-pprint base base16-bytestring binary
- brick bytestring cereal containers cryptonite data-dword deepseq
- directory fgl filepath free haskeline lens lens-aeson megaparsec
- memory monad-par mtl multiset operational optparse-generic process
- QuickCheck quickcheck-text regex-tdfa restless-git rosezipper
- s-cargot sbv scientific semver-range temporary text text-format
- time transformers tree-view unordered-containers vector vty
- witherable wreq
+ brick bytestring cereal containers cryptonite data-dword Decimal
+ deepseq directory fgl filepath free haskeline lens lens-aeson
+ megaparsec memory monad-par mtl multiset operational
+ optparse-generic process QuickCheck quickcheck-text regex-tdfa
+ restless-git rosezipper s-cargot sbv scientific semver-range
+ temporary text text-format time transformers tree-view
+ unordered-containers vector vty witherable wreq
];
librarySystemDepends = [ libff secp256k1 ];
executableHaskellDepends = [
@@ -125398,8 +125488,8 @@ self: {
}:
mkDerivation {
pname = "hexpat-streamparser";
- version = "0.0.1";
- sha256 = "09klv9if55rlhjrh7cw68kk9z3mrwm1p2agb7a23j8a68iga5gvi";
+ version = "0.0.2";
+ sha256 = "11g78dkr9dp4kgz8zmckgq66587qahdhxyhcn03ajr0b07ab27z3";
libraryHaskellDepends = [
base bytestring hexpat List mtl parser-combinators text
transformers
@@ -127071,8 +127161,8 @@ self: {
}:
mkDerivation {
pname = "hindent";
- version = "5.3.1";
- sha256 = "008s8zm9qs972b7v5kkmr8l3i9kc6zm7yj33mkw6dv69b7h3c01l";
+ version = "5.3.2";
+ sha256 = "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -128266,8 +128356,8 @@ self: {
}:
mkDerivation {
pname = "hledger";
- version = "1.20.3";
- sha256 = "1wy45ppcakml2wk021yr8kqv0q0x85vms8kx0npjawzbs498qqx9";
+ version = "1.20.4";
+ sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128467,8 +128557,8 @@ self: {
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.20.3";
- sha256 = "0pm6ckim1krkg4x7azspsnc1alwynqnjdhxrda764xyrz9s0r8cp";
+ version = "1.20.4";
+ sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
@@ -128544,8 +128634,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.20.3";
- sha256 = "02g6xdxif67fjj6rjskw69cxhx2irwv7sk0b1slr20nch122pzl1";
+ version = "1.20.4";
+ sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -128591,8 +128681,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.20.3";
- sha256 = "1dz3lwp86dlmdrnj5hda12219x03xw8csxk0bjysn43rjzxag4q4";
+ version = "1.20.4";
+ sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128879,21 +128969,22 @@ self: {
"hls-eval-plugin" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
- , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable
- , haskell-lsp, haskell-lsp-types, hls-plugin-api
- , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
- , shake, temporary, text, time, transformers, unordered-containers
+ , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
+ , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens
+ , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck
+ , safe-exceptions, shake, temporary, text, time, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "hls-eval-plugin";
- version = "0.1.0.5";
- sha256 = "1vfsvhn7b5w537hsri6bz36c547pxv13jyjvj1a5934jzyzvv9qn";
+ version = "0.2.0.0";
+ sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5";
libraryHaskellDepends = [
- aeson base containers deepseq Diff directory extra filepath ghc
- ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
- hls-plugin-api parser-combinators pretty-simple QuickCheck
- safe-exceptions shake temporary text time transformers
- unordered-containers
+ aeson base containers deepseq Diff directory dlist extra filepath
+ ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp
+ haskell-lsp-types hls-plugin-api lens megaparsec mtl
+ parser-combinators pretty-simple QuickCheck safe-exceptions shake
+ temporary text time transformers unordered-containers
];
description = "Eval plugin for Haskell Language Server";
license = lib.licenses.asl20;
@@ -128941,10 +129032,8 @@ self: {
}:
mkDerivation {
pname = "hls-haddock-comments-plugin";
- version = "0.1.0.0";
- sha256 = "12zs6yq39jpg3x6w9y5a5jri5rfh8qpxawdhmhiqm067zjnj9xi4";
- revision = "1";
- editedCabalFile = "0kddmrlmcsa1d22mqzw1wsh82x4nn0ff4xbwci7585i9z61mzhg2";
+ version = "0.1.1.0";
+ sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn";
libraryHaskellDepends = [
base containers ghc ghc-exactprint ghcide haskell-lsp-types
hls-plugin-api text unordered-containers
@@ -128956,21 +129045,19 @@ self: {
"hls-hlint-plugin" = callPackage
({ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
- , filepath, ghc, ghcide, hashable, haskell-lsp, hlint
- , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary
- , text, transformers, unordered-containers
+ , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp
+ , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake
+ , temporary, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-hlint-plugin";
- version = "0.1.0.0";
- sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq";
- revision = "1";
- editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s";
+ version = "0.2.0.0";
+ sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d";
libraryHaskellDepends = [
aeson apply-refact base binary bytestring containers data-default
- deepseq Diff directory extra filepath ghc ghcide hashable
- haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake
- temporary text transformers unordered-containers
+ deepseq Diff directory extra filepath ghc ghc-exactprint ghcide
+ hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa
+ shake temporary text transformers unordered-containers
];
description = "Hlint integration plugin with Haskell Language Server";
license = lib.licenses.asl20;
@@ -128985,10 +129072,8 @@ self: {
}:
mkDerivation {
pname = "hls-plugin-api";
- version = "0.6.0.0";
- sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi";
- revision = "2";
- editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji";
+ version = "0.7.0.0";
+ sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55";
libraryHaskellDepends = [
aeson base containers data-default Diff hashable haskell-lsp
hslogger lens process regex-tdfa shake text unix
@@ -129021,18 +129106,17 @@ self: {
"hls-splice-plugin" = callPackage
({ mkDerivation, aeson, base, containers, dlist, foldl, ghc
- , ghc-exactprint, ghcide, haskell-lsp, hls-exactprint-utils
- , hls-plugin-api, lens, retrie, shake, syb, text, transformers
- , unordered-containers
+ , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie
+ , shake, syb, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-splice-plugin";
- version = "0.1.0.0";
- sha256 = "10zqgczp1mx81ac8fh59dp1hipfh09w4hnxylqjhj6c6wzgwa4cj";
+ version = "0.2.0.0";
+ sha256 = "1synsdvw9ks4yg6a269inn06p1apdf6khcyb98v1hzvz93bivndf";
libraryHaskellDepends = [
aeson base containers dlist foldl ghc ghc-exactprint ghcide
- haskell-lsp hls-exactprint-utils hls-plugin-api lens retrie shake
- syb text transformers unordered-containers
+ haskell-lsp hls-plugin-api lens retrie shake syb text transformers
+ unordered-containers
];
description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
license = lib.licenses.asl20;
@@ -132371,25 +132455,25 @@ self: {
"hpqtypes-extras" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, containers
- , cryptohash, exceptions, fields-json, hpqtypes, lifted-base
- , log-base, monad-control, mtl, safe, semigroups, tasty
- , tasty-hunit, text, text-show, transformers, uuid-types
+ , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes
+ , lifted-base, log-base, monad-control, mtl, QuickCheck, safe
+ , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show
+ , time, transformers, uuid-types
}:
mkDerivation {
pname = "hpqtypes-extras";
- version = "1.10.3.0";
- sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs";
- revision = "1";
- editedCabalFile = "0pa13k78w0xm59pvlsd9rmg9ddi3jkc918j5i0hb4vlxcaivq34y";
+ version = "1.10.4.0";
+ sha256 = "0qlxhq4vkr0qq1ckazb0lng9mbnljh32xsmcpbp5qm01bngadz56";
libraryHaskellDepends = [
base base16-bytestring bytestring containers cryptohash exceptions
- fields-json hpqtypes lifted-base log-base monad-control mtl safe
- semigroups text text-show
+ extra fields-json hpqtypes lifted-base log-base monad-control mtl
+ safe semigroups text text-show
];
testHaskellDepends = [
- base exceptions hpqtypes lifted-base log-base monad-control tasty
- tasty-hunit text transformers uuid-types
+ base exceptions hpqtypes lifted-base log-base monad-control
+ QuickCheck tasty tasty-hunit text time transformers uuid-types
];
+ benchmarkHaskellDepends = [ base deepseq tasty-bench ];
description = "Extra utilities for hpqtypes library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -135568,6 +135652,22 @@ self: {
license = lib.licenses.mit;
}) {};
+ "hslua-module-path" = callPackage
+ ({ mkDerivation, base, filepath, hslua, tasty, tasty-hunit
+ , tasty-lua, text
+ }:
+ mkDerivation {
+ pname = "hslua-module-path";
+ version = "0.1.0";
+ sha256 = "18z6k9nlba0a1f0fdfw0cr0y5daa381dfmrinfp70c8r3dh7w7ny";
+ libraryHaskellDepends = [ base filepath hslua text ];
+ testHaskellDepends = [
+ base filepath hslua tasty tasty-hunit tasty-lua text
+ ];
+ description = "Lua module to work with file paths";
+ license = lib.licenses.mit;
+ }) {};
+
"hslua-module-system" = callPackage
({ mkDerivation, base, containers, directory, exceptions, hslua
, tasty, tasty-hunit, tasty-lua, temporary, text
@@ -138430,7 +138530,7 @@ self: {
license = lib.licenses.mit;
}) {};
- "http-client_0_7_4" = callPackage
+ "http-client_0_7_5" = callPackage
({ mkDerivation, array, async, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, containers, cookie
, deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -138439,8 +138539,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.7.4";
- sha256 = "1a4vhhn8y5qcqd4i2q7pl9jqfrsh65nkv32qcsc80cjy2bcqivjs";
+ version = "0.7.5";
+ sha256 = "11p4szyrdl0ck2iixdrq2dcjz9dlv4pd36ymkipmq7c28l1cvy7k";
libraryHaskellDepends = [
array base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie deepseq exceptions filepath
@@ -139924,8 +140024,8 @@ self: {
pname = "hum";
version = "0.2.0.0";
sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b";
- revision = "1";
- editedCabalFile = "07d19lqi5djdsda976qr1w8ps535dxxjsp0lr43b62cinw2ssnki";
+ revision = "2";
+ editedCabalFile = "03hh7nyqchskkp4iqcq335mnpdsvgdw8d1pf3dp7p4wmsk20kwmk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -139945,8 +140045,6 @@ self: {
];
description = "A TUI MPD client, inspired by ncmpcpp";
license = lib.licenses.gpl2Plus;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"human-parse" = callPackage
@@ -140323,8 +140421,8 @@ self: {
}:
mkDerivation {
pname = "husk-scheme";
- version = "3.19.3";
- sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084";
+ version = "3.20";
+ sha256 = "11pghca4msm5nw1zdw3qlxzhmcwl9xg5hyvjd9z7869a3qahid5q";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -141135,8 +141233,8 @@ self: {
}:
mkDerivation {
pname = "hw-kafka-client";
- version = "4.0.2";
- sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9";
+ version = "4.0.3";
+ sha256 = "1s3wj5ih9mc7vp0w9rymw22w1yxp8z3qi7qmza9qw00aail8c5dg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -144600,8 +144698,8 @@ self: {
}:
mkDerivation {
pname = "imperative-edsl";
- version = "0.8";
- sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar";
+ version = "0.8.1";
+ sha256 = "1z1a7b7m69m9xagvfa6xx3l1j0s7lrlvp4n09lra1x3q7lpfgnra";
libraryHaskellDepends = [
array base BoundedChan containers data-default-class deepseq
directory exception-transformers ghc-prim language-c-quote
@@ -144915,8 +145013,8 @@ self: {
}:
mkDerivation {
pname = "in-other-words";
- version = "0.1.1.0";
- sha256 = "0f11si2bnxw2bm5mfnnqh9cfwhlzdcqkw5dfjql1y618db808am9";
+ version = "0.2.0.0";
+ sha256 = "0adl539jilc3rnwx9ir39y97f6h60xavzhhc8pa9vc6gqp1v4g20";
libraryHaskellDepends = [
async base exceptions monad-control mtl stm transformers
transformers-base
@@ -144930,6 +145028,27 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "in-other-words-plugin" = callPackage
+ ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec
+ , hspec-discover, in-other-words, syb, transformers
+ }:
+ mkDerivation {
+ pname = "in-other-words-plugin";
+ version = "0.1.0.0";
+ sha256 = "02c6qprny0x1qs5zpcma07vr3ikrksr18gqxpvf9hx55w3pnni0w";
+ libraryHaskellDepends = [
+ base containers ghc ghc-tcplugins-extra in-other-words syb
+ transformers
+ ];
+ testHaskellDepends = [
+ base containers ghc ghc-tcplugins-extra hspec in-other-words syb
+ transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Disambiguate obvious uses of effects when using in-other-words";
+ license = lib.licenses.bsd3;
+ }) {};
+
"inbox" = callPackage
({ mkDerivation, async, base, error-or, text, time }:
mkDerivation {
@@ -147408,6 +147527,8 @@ self: {
pname = "io-streams";
version = "1.5.2.0";
sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3";
+ revision = "1";
+ editedCabalFile = "1dcadj5gv1m2yy97zsbq5x67vsblp8gy58a0kl5di9vkbgrcw46n";
configureFlags = [ "-fnointeractivetests" ];
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder network primitive
@@ -149364,12 +149485,13 @@ self: {
"j" = callPackage
({ mkDerivation, base, bytestring, repa, tasty, tasty-hunit, unix
+ , vector
}:
mkDerivation {
pname = "j";
- version = "0.2.1.1";
- sha256 = "14mmqdkh73idqsxsvgvz5nfv7n0ashj35amawzy63zs80hfmqcf2";
- libraryHaskellDepends = [ base bytestring repa unix ];
+ version = "0.2.2.0";
+ sha256 = "1lmk6zw5w51d6aglykiyp9qpa656qs9imf99nalzn7qldsz81aqd";
+ libraryHaskellDepends = [ base bytestring repa unix vector ];
testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
description = "J in Haskell";
license = lib.licenses.bsd3;
@@ -151648,8 +151770,8 @@ self: {
}:
mkDerivation {
pname = "jsonifier";
- version = "0.1.0.6";
- sha256 = "0yhczdq3m79xbg04hcahl2c75kipm5szahr7bmj8xjml4zxzd3bk";
+ version = "0.1.1";
+ sha256 = "09w92adnjskx7cxyki415nqxdzqfz78rcqisk1g862r92907ibwf";
libraryHaskellDepends = [
base bytestring ptr-poker scientific text
];
@@ -157810,8 +157932,8 @@ self: {
}:
mkDerivation {
pname = "launchdarkly-server-sdk";
- version = "2.0.2";
- sha256 = "01c42wyjvnd1wp665p2khjsm1apc9kw3gw6mnlwbdgsimhj8v4z0";
+ version = "2.1.0";
+ sha256 = "1nj6jcmara4x8y292q5qacli6hmfhahw856a0nyngca2c8m5mwr1";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring bytestring
bytestring-conversion clock containers cryptohash exceptions extra
@@ -158887,8 +159009,8 @@ self: {
pname = "lens";
version = "4.19.2";
sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j";
- revision = "3";
- editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45";
+ revision = "4";
+ editedCabalFile = "013cfgb5q2zq02pb8dlyzmb6sfp8k82af609srmqda26kccbyci2";
setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
libraryHaskellDepends = [
array base base-orphans bifunctors bytestring call-stack comonad
@@ -159170,6 +159292,22 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "lens-process_0_4_0_0" = callPackage
+ ({ mkDerivation, base, filepath, lens, process, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "lens-process";
+ version = "0.4.0.0";
+ sha256 = "1gms2bxa1sygpid09cg3nk1kyhkg4s38dqs0gd77ia2aln6zd7qg";
+ libraryHaskellDepends = [ base filepath lens process ];
+ testHaskellDepends = [
+ base filepath lens process tasty tasty-hunit
+ ];
+ description = "Optics for system processes";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"lens-properties" = callPackage
({ mkDerivation, base, lens, QuickCheck, transformers }:
mkDerivation {
@@ -159812,14 +159950,14 @@ self: {
}) {};
"libBF" = callPackage
- ({ mkDerivation, base, deepseq }:
+ ({ mkDerivation, base, deepseq, hashable }:
mkDerivation {
pname = "libBF";
- version = "0.5.1";
- sha256 = "0iwbkfbp26z1zmnk28mnkvyh8k0i0bx56wl2jwygdnqvl5lmfv6i";
+ version = "0.6";
+ sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base deepseq ];
+ libraryHaskellDepends = [ base deepseq hashable ];
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A binding to the libBF library";
@@ -160858,8 +160996,8 @@ self: {
}:
mkDerivation {
pname = "licensor";
- version = "0.4.1";
- sha256 = "0p1wnyff2v23405v42ks5m3lyxhcahmcs3vh2qc5kz4q7ybnks7b";
+ version = "0.4.2";
+ sha256 = "1knmd13plijk4f1pzk8h3br69agjqzajgr9n3d180w6ask1iaz4z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161461,36 +161599,6 @@ self: {
}) {};
"linear" = callPackage
- ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
- , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
- , distributive, doctest, ghc-prim, hashable, HUnit, lens, random
- , reflection, semigroupoids, semigroups, simple-reflect, tagged
- , template-haskell, test-framework, test-framework-hunit
- , transformers, transformers-compat, unordered-containers, vector
- , void
- }:
- mkDerivation {
- pname = "linear";
- version = "1.21.3";
- sha256 = "12gn571cfchrj9zir30c86vib3ppjia5908di21pnsfy6dmw6994";
- revision = "1";
- editedCabalFile = "17cbb44yyfcxz9fybv05yxli8gdfka415dwrp7vh804q7qxs5vna";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- adjunctions base base-orphans binary bytes cereal containers
- deepseq distributive ghc-prim hashable lens random reflection
- semigroupoids semigroups tagged template-haskell transformers
- transformers-compat unordered-containers vector void
- ];
- testHaskellDepends = [
- base binary bytestring deepseq doctest HUnit lens reflection
- simple-reflect test-framework test-framework-hunit vector
- ];
- description = "Linear Algebra";
- license = lib.licenses.bsd3;
- }) {};
-
- "linear_1_21_4" = callPackage
({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
, bytestring, cereal, containers, deepseq, distributive, ghc-prim
, hashable, HUnit, lens, random, reflection, semigroupoids
@@ -161514,7 +161622,6 @@ self: {
];
description = "Linear Algebra";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"linear-accelerate" = callPackage
@@ -169488,36 +169595,37 @@ self: {
"matterhorn" = callPackage
({ mkDerivation, aeson, aspell-pipe, async, base, base-compat
- , brick, brick-skylighting, bytestring, cheapskate, checkers
- , config-ini, connection, containers, data-clist, directory
- , filepath, gitrev, hashable, Hclip, mattermost-api
- , mattermost-api-qc, microlens-platform, mtl, network-uri, process
- , random, semigroups, skylighting-core, split, stm, stm-delay
- , strict, tasty, tasty-hunit, tasty-quickcheck, temporary, text
- , text-zipper, time, timezone-olson, timezone-series, transformers
- , Unique, unix, unordered-containers, utf8-string, uuid, vector
- , vty, word-wrap, xdg-basedir
+ , brick, brick-skylighting, bytestring, checkers, commonmark
+ , commonmark-extensions, config-ini, connection, containers
+ , data-clist, directory, filepath, gitrev, hashable, Hclip
+ , mattermost-api, mattermost-api-qc, microlens-platform, mtl
+ , network-uri, parsec, process, random, semigroups
+ , skylighting-core, split, stm, stm-delay, strict, tasty
+ , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time
+ , timezone-olson, timezone-series, transformers, Unique, unix
+ , unordered-containers, utf8-string, uuid, vector, vty, word-wrap
+ , xdg-basedir
}:
mkDerivation {
pname = "matterhorn";
- version = "50200.11.0";
- sha256 = "0wvw3wbv2sii1bjc8nmwyb1k0hzixfkfvpkmlkwa2my564vvmgz8";
+ version = "50200.12.0";
+ sha256 = "0rsxgc4igcjhddfil01la1sbnglvr08mf7gfi9fr6pf7sb9w6qbq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson aspell-pipe async base base-compat brick brick-skylighting
- bytestring cheapskate config-ini connection containers data-clist
- directory filepath gitrev hashable Hclip mattermost-api
- microlens-platform mtl network-uri process random semigroups
- skylighting-core split stm stm-delay strict temporary text
- text-zipper time timezone-olson timezone-series transformers unix
- unordered-containers utf8-string uuid vector vty word-wrap
- xdg-basedir
+ bytestring commonmark commonmark-extensions config-ini connection
+ containers data-clist directory filepath gitrev hashable Hclip
+ mattermost-api microlens-platform mtl network-uri parsec process
+ random semigroups skylighting-core split stm stm-delay strict
+ temporary text text-zipper time timezone-olson timezone-series
+ transformers unix unordered-containers utf8-string uuid vector vty
+ word-wrap xdg-basedir
];
executableHaskellDepends = [ base text ];
testHaskellDepends = [
- base bytestring cheapskate checkers containers mattermost-api
+ base bytestring checkers commonmark containers mattermost-api
mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time
Unique uuid
];
@@ -169536,8 +169644,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api";
- version = "50200.9.0";
- sha256 = "08whhlkr3ayimn66lwinvv0ci8zbhk5i7sz1fk5r1dp7mg2jzgig";
+ version = "50200.10.0";
+ sha256 = "0pbp4f0gwhap8d9chn6c2zf22ic3r32302zir4a5r6cmgg4vscgd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -169561,8 +169669,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api-qc";
- version = "50200.9.0";
- sha256 = "0rcbsf5hrp2fd9jqmcr07gg2y0xg4ksasrqfxrc7n4mgw0a409i6";
+ version = "50200.10.0";
+ sha256 = "0cv7l5g63ar7ii704j8q3y5hsvbmljm8cmgdw6p2shqigv8slzci";
libraryHaskellDepends = [
base containers mattermost-api QuickCheck text time
];
@@ -173760,8 +173868,10 @@ self: {
({ mkDerivation, base, mtl, transformers, transformers-compat }:
mkDerivation {
pname = "mmorph";
- version = "1.1.3";
- sha256 = "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr";
+ version = "1.1.4";
+ sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz";
+ revision = "1";
+ editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl";
libraryHaskellDepends = [
base mtl transformers transformers-compat
];
@@ -174219,6 +174329,33 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "modern-uri_0_3_3_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, contravariant
+ , criterion, deepseq, exceptions, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+ , reflection, tagged, template-haskell, text, weigh
+ }:
+ mkDerivation {
+ pname = "modern-uri";
+ version = "0.3.3.1";
+ sha256 = "0h4ssb4wy4ac6vd5jcbvp0r2fr1jmyc60hg56s7ym50bbymj5wp3";
+ libraryHaskellDepends = [
+ base bytestring containers contravariant deepseq exceptions
+ megaparsec mtl profunctors QuickCheck reflection tagged
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq megaparsec text weigh
+ ];
+ description = "Modern library for working with URIs";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"modify-fasta" = callPackage
({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
, pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -175268,19 +175405,19 @@ self: {
"monad-metrics-extensible" = callPackage
({ mkDerivation, base, dependent-map, dependent-sum, ekg, ekg-core
- , exceptions, hspec, mtl, stm, text
+ , exceptions, hspec, mtl, stm, text, time
}:
mkDerivation {
pname = "monad-metrics-extensible";
- version = "0.1.0.1";
- sha256 = "044hvhnf7wsgd18cac2j3bfw2vbxfnra736l6qndfx07mkv1nz5n";
+ version = "0.1.1.0";
+ sha256 = "14ahi50c6pd30zywjbsffn3p090ib57h6as2ad8jqxywjalxd8dm";
libraryHaskellDepends = [
base dependent-map dependent-sum ekg ekg-core exceptions mtl stm
- text
+ text time
];
testHaskellDepends = [
base dependent-map dependent-sum ekg ekg-core exceptions hspec mtl
- stm text
+ stm text time
];
description = "An extensible and type-safe wrapper around EKG metrics";
license = lib.licenses.bsd3;
@@ -178443,6 +178580,8 @@ self: {
pname = "mu-protobuf";
version = "0.4.2.0";
sha256 = "07mgld1cmpynhdih7ppki8xw85zpknv0ipn7fvn79bj53s0nx6vg";
+ revision = "1";
+ editedCabalFile = "12zp8g0v8f924dsc3c0ynzqcv2j4c4xl6dh72mz11nmxi9la51s7";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -178485,8 +178624,8 @@ self: {
}:
mkDerivation {
pname = "mu-schema";
- version = "0.3.1.1";
- sha256 = "0n30xn2z1dl4n28mbfnif8csvz0namll0hab1r7mhnamp0yc3gs8";
+ version = "0.3.1.2";
+ sha256 = "0q4a1anqrx6d5n0br26lb4x8gw10gasv8ggiw4fgcaly2sd09rs1";
libraryHaskellDepends = [
aeson base bytestring containers first-class-families sop-core
template-haskell text th-abstraction unordered-containers uuid
@@ -180476,6 +180615,22 @@ self: {
license = lib.licenses.bsd3;
}) {inherit (pkgs) mysql;};
+ "mysql_0_1_7_3" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+ }:
+ mkDerivation {
+ pname = "mysql";
+ version = "0.1.7.3";
+ sha256 = "1yf9ni64q19ci6ripcjh0pvpklxyi0fzigb33ss05wswlal385rc";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base bytestring containers ];
+ librarySystemDepends = [ mysql ];
+ testHaskellDepends = [ base bytestring hspec ];
+ description = "A low-level MySQL client library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {inherit (pkgs) mysql;};
+
"mysql-effect" = callPackage
({ mkDerivation, base, bytestring, extensible-effects, mysql
, mysql-simple
@@ -180979,10 +181134,8 @@ self: {
({ mkDerivation, base, named, servant }:
mkDerivation {
pname = "named-servant";
- version = "0.3.0";
- sha256 = "14a55ww538c39wmacazdchrinc098yw9kbv44z4dw1739zhsghb6";
- revision = "1";
- editedCabalFile = "1xrbz9vhb61wkjb1amswvpb9sfslg1258vqlm880angc18i3dyi7";
+ version = "0.3.1";
+ sha256 = "01wy971gf178i866wly5fs86ll2rwkjp3n99ni0rdxw6p1hnq447";
libraryHaskellDepends = [ base named servant ];
description = "support records and named (from the named package) parameters in servant";
license = lib.licenses.bsd3;
@@ -180996,10 +181149,8 @@ self: {
}:
mkDerivation {
pname = "named-servant-client";
- version = "0.3.0";
- sha256 = "1ilzhvdvspd8wddv6yypvl6whbzsa3pzqz2a8ikmk0l3vkskv60d";
- revision = "1";
- editedCabalFile = "19frg1vj2zzibdrbmxdmjfas31z5hwhy7kjkk28vm20y51h4lir3";
+ version = "0.3.1";
+ sha256 = "1q6xzg5sgjy52jp378jm9dq2wl283mnnpslc8fq0pdly2v6d7z6i";
libraryHaskellDepends = [
base named named-servant servant servant-client-core
];
@@ -181015,10 +181166,8 @@ self: {
}:
mkDerivation {
pname = "named-servant-server";
- version = "0.3.0";
- sha256 = "14v1sgfz6agsbiy2938chy0vi4j4jd1swdhwb9g2yg068m3262k3";
- revision = "1";
- editedCabalFile = "0880w18l18hjnrpf0j4z0rd98waai3431gzakqm53zh8zs75lcll";
+ version = "0.3.1";
+ sha256 = "168xvsdkln5pgf6iqs1qzy07b9ichzpqhx95j79hrba941jzd19y";
libraryHaskellDepends = [
base named named-servant servant servant-server text
];
@@ -184283,6 +184432,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "newtype-generics_0_6" = callPackage
+ ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups
+ , transformers
+ }:
+ mkDerivation {
+ pname = "newtype-generics";
+ version = "0.6";
+ sha256 = "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa";
+ libraryHaskellDepends = [ base transformers ];
+ testHaskellDepends = [ base hspec ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base gauge semigroups ];
+ description = "A typeclass and set of functions for working with newtypes";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"newtype-th" = callPackage
({ mkDerivation, base, haskell-src-meta, newtype, syb
, template-haskell
@@ -184448,8 +184614,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools";
- version = "0.4.9.1";
- sha256 = "0ib0xzs815q29a2v1m550g7cm5cr7l6lkslmi0lpcxpfgpi08ccv";
+ version = "0.4.9.2";
+ sha256 = "064zbwamkkd5cx0wjisa019pprb4pg2mmm5n6a948f3dn0zpmlwx";
libraryHaskellDepends = [
aeson base binary bytestring ngx-export safe template-haskell
];
@@ -188504,8 +188670,8 @@ self: {
}:
mkDerivation {
pname = "opaleye-sqlite";
- version = "0.0.1.0";
- sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq";
+ version = "0.0.1.1";
+ sha256 = "02wpy2q3j6z91kjrwl9qyka74rqhbs7dlgfrc6nvpnl1ssp9vps0";
libraryHaskellDepends = [
base base16-bytestring bytestring case-insensitive contravariant
direct-sqlite pretty product-profunctors profunctors semigroups
@@ -188527,8 +188693,8 @@ self: {
}:
mkDerivation {
pname = "opaleye-trans";
- version = "0.5.1";
- sha256 = "11vfp8rb46fvrhryyw9k66cbfnd920n5r4mcasdcnxhn1n8hc7i4";
+ version = "0.5.2";
+ sha256 = "0vszkxbgk4cqiaz4q8vgsc56yzh37dg7np2315h6bpvp1hy8fcs0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -190236,6 +190402,8 @@ self: {
pname = "optparse-generic";
version = "1.4.4";
sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74";
+ revision = "1";
+ editedCabalFile = "14vbfbl2va3s2pa4qjyyny1i15s2iw9993ld5b0qsqdv1z6nfjz1";
libraryHaskellDepends = [
base bytestring Only optparse-applicative system-filepath text time
transformers void
@@ -191885,8 +192053,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.9.0";
- sha256 = "18hxvzrl4b9y3343nissbcxrl4g8x82yrinyir9ifgmpz5ikg248";
+ version = "0.3.9.1";
+ sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -192179,21 +192347,21 @@ self: {
"pandoc-plantuml-diagrams" = callPackage
({ mkDerivation, base, bytestring, directory, hspec, hspec-discover
- , mtl, pandoc-types, process, SHA, utf8-string
+ , mtl, pandoc-types, process, SHA, text, utf8-string
}:
mkDerivation {
pname = "pandoc-plantuml-diagrams";
- version = "0.1.0.4";
- sha256 = "1fshgv5wl56z3w0yimwv5dbi7dal600anb5wkxd5n3jlpmp8fwky";
+ version = "0.1.1.0";
+ sha256 = "19wd13vwf7v2v57wiv4s2y68zrvk6rcy1w2wxxad4cv5bb65wnfn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring directory pandoc-types process SHA utf8-string
+ base bytestring directory pandoc-types process SHA text utf8-string
];
executableHaskellDepends = [ base pandoc-types ];
testHaskellDepends = [
base bytestring directory hspec hspec-discover mtl pandoc-types
- process SHA utf8-string
+ process SHA text utf8-string
];
testToolDepends = [ hspec-discover ];
description = "Render and insert PlantUML diagrams with Pandoc";
@@ -196017,8 +196185,8 @@ self: {
}:
mkDerivation {
pname = "peregrin";
- version = "0.3.0";
- sha256 = "0jhvd69avl5wy2fcsx93ng2yll97gagylwd264dv7qjaa4m6hqs2";
+ version = "0.3.1";
+ sha256 = "1hiv9rzpjmjywwc4j6bqkqvqwv2gr6d512hv0l6m5c6idsyk2v12";
libraryHaskellDepends = [ base bytestring postgresql-simple text ];
testHaskellDepends = [
base hspec pg-harness-client postgresql-simple resource-pool text
@@ -197837,8 +198005,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-examples";
- version = "0.6.2.1";
- sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm";
+ version = "0.7.0.0";
+ sha256 = "1dwqkl9223rmz503gclzs0l00mi9gkk542fwpvw71hd121hl4qvg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -197934,8 +198102,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-properties";
- version = "0.3.0.1";
- sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf";
+ version = "0.4.0.0";
+ sha256 = "194sg4crm5z4lqqzr8apjgnbcl5h6ddkqk8crja41c5q3d5mpih5";
libraryHaskellDepends = [
base phonetic-languages-common phonetic-languages-rhythmicity
phonetic-languages-vector ukrainian-phonetics-basic vector
@@ -197948,10 +198116,10 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "phonetic-languages-rhythmicity";
- version = "0.1.2.0";
- sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3";
+ version = "0.2.0.0";
+ sha256 = "0cvn2l0ds5nyz4inx354l8r9m4bkqjic7plpjgvhih8f4b53j6ln";
libraryHaskellDepends = [ base ];
- description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)";
+ description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)";
license = lib.licenses.mit;
}) {};
@@ -197998,8 +198166,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-examples-array";
- version = "0.3.0.0";
- sha256 = "17akng54rj8mn4ic9h1a806b03nqsigkyjggfskf4k1z9x84hdf4";
+ version = "0.4.0.0";
+ sha256 = "03vin7gng1sqifyy0s83igmd41bxxwrp7ck9j7bxhnqq0qmg5d7n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -198059,8 +198227,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-lists-examples";
- version = "0.6.0.0";
- sha256 = "0y843gymz9wf7hmp8asxmd90rdlgxz2b1pgi27mpglr7xmhpfr34";
+ version = "0.7.0.0";
+ sha256 = "1y3ad4lxapd9nblijn09i36f3xl6g9hxqmn8adcza74f4cq8pgyb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -198088,8 +198256,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-properties-array";
- version = "0.1.2.0";
- sha256 = "1vxjq0ki7slmgp1sq481srnqzcy8sazl0c2vqdkyz0hsx5hi8lyv";
+ version = "0.2.0.0";
+ sha256 = "1y7cki8c07q9423b54cjvy9k6a9byarpww3px50bc91ivirda6zr";
libraryHaskellDepends = [
base phonetic-languages-rhythmicity
phonetic-languages-simplified-base ukrainian-phonetics-basic-array
@@ -198105,8 +198273,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-properties-lists";
- version = "0.3.0.0";
- sha256 = "094fyljkvfi2snj41j00xqflhabnsp5hn50xp6dvmpcr12k6nvs0";
+ version = "0.4.0.0";
+ sha256 = "01awd747w67m4rnm9zgsb8j28756fpvyml1j613kz33fp5s91ml2";
libraryHaskellDepends = [
base phonetic-languages-rhythmicity
phonetic-languages-simplified-common ukrainian-phonetics-basic
@@ -198123,8 +198291,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-properties-lists-double";
- version = "0.1.0.0";
- sha256 = "1mx282gq9b2m718zrjjqxk1a17qdw5mdipmb818jr5ccrb81yhsl";
+ version = "0.2.0.0";
+ sha256 = "1ci63bhlk8xzf111njg97xs1ibamiv04k19wsfnhvxs3zzyzgrj0";
libraryHaskellDepends = [
base phonetic-languages-rhythmicity
phonetic-languages-simplified-common ukrainian-phonetics-basic
@@ -200202,6 +200370,31 @@ self: {
broken = true;
}) {};
+ "pixiv" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , cryptohash-md5, directory, exceptions, filepath, http-client
+ , http-client-tls, lens, monad-control, mtl, process, servant
+ , servant-client, servant-client-core, template-haskell, temporary
+ , text, time, transformers, transformers-base, zip-archive
+ }:
+ mkDerivation {
+ pname = "pixiv";
+ version = "0.1.0";
+ sha256 = "001pfzijh7ibcyinmw0l8yvw0kxsvmniw993qx9b6zlzf689cpp6";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring cryptohash-md5 directory
+ exceptions filepath http-client http-client-tls lens monad-control
+ mtl process servant servant-client servant-client-core
+ template-haskell temporary text time transformers transformers-base
+ zip-archive
+ ];
+ testHaskellDepends = [
+ aeson base bytestring http-client http-client-tls
+ ];
+ description = "Pixiv API binding based on servant-client";
+ license = lib.licenses.bsd3;
+ }) {};
+
"piyo" = callPackage
({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image
, sdl2-mixer, sdl2-ttf, text
@@ -203997,8 +204190,6 @@ self: {
];
description = "REST API for any Postgres database";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"postgrest-ws" = callPackage
@@ -206410,6 +206601,8 @@ self: {
pname = "process";
version = "1.6.11.0";
sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd";
+ revision = "1";
+ editedCabalFile = "136mp45m1jh27yayb0gx4giybp6imh7hbr774fsb2m9vj2l52b27";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
@@ -213606,8 +213799,8 @@ self: {
}:
mkDerivation {
pname = "raw-feldspar";
- version = "0.3";
- sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w";
+ version = "0.3.1";
+ sha256 = "1kn86izm2wpqj59nnpxw34n37bh1w5y7h9rd59c1pcymhp29n6qd";
libraryHaskellDepends = [
array base constraints containers data-default-class data-hash
imperative-edsl language-c-quote mtl operational-alacarte
@@ -215622,8 +215815,8 @@ self: {
}:
mkDerivation {
pname = "refined";
- version = "0.6.1";
- sha256 = "124sqpcii62jh2n2vfskg9jc8ic4hhlwmwim40f6a0dmhdnsh8lx";
+ version = "0.6.2";
+ sha256 = "1xfy6sl6kl9k7vvlvwg8fb3kdpqd0fl1c9wcfwgdqb874a4xn6dz";
libraryHaskellDepends = [
aeson base bytestring deepseq exceptions mtl QuickCheck
template-haskell text these-skinny
@@ -218269,8 +218462,8 @@ self: {
pname = "repa";
version = "3.4.1.4";
sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
- revision = "7";
- editedCabalFile = "0j0nqp6xvwis83h1hwm9910xjfxh13nddy61dlli0wdzzddpb8ah";
+ revision = "8";
+ editedCabalFile = "0bhkiav26m61lzjkxjldals136viixyg88xf1bbihsp9kzkbv6as";
libraryHaskellDepends = [
base bytestring ghc-prim QuickCheck template-haskell vector
];
@@ -222983,8 +223176,8 @@ self: {
}:
mkDerivation {
pname = "runhs";
- version = "1.0.0.8";
- sha256 = "177xak0p91xn827cnpa374l94lmmym2yrrcsxzjd9752hdzyw7k3";
+ version = "1.0.0.9";
+ sha256 = "1i2g706997wkqj081pqxj8nq6nhj94x4kf5q0fnj39fp35fmak6q";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -228629,10 +228822,8 @@ self: {
}:
mkDerivation {
pname = "servant-cassava";
- version = "0.10";
- sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
- revision = "7";
- editedCabalFile = "0n4nbm0axa9qd805jb3gja2p2fiwvhjpvdi5rhlwh4shm9crppcy";
+ version = "0.10.1";
+ sha256 = "0hf7v35yyfqxc20hgq755laba7lziz2vsy7y8cj8nhczcc67smq0";
libraryHaskellDepends = [
base base-compat bytestring cassava http-media servant vector
];
@@ -229381,8 +229572,8 @@ self: {
pname = "servant-iCalendar";
version = "0.1.0.1";
sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
- revision = "7";
- editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68";
+ revision = "8";
+ editedCabalFile = "10ka19ga7slcv4cb2f0ncfbkz52bbrm8jkxma8qksz6hm48wxjya";
libraryHaskellDepends = [
base data-default http-media iCalendar servant
];
@@ -235840,23 +236031,26 @@ self: {
}) {};
"slack-web" = callPackage
- ({ mkDerivation, aeson, base, containers, errors, hspec
- , http-api-data, http-client, http-client-tls, megaparsec, mtl
+ ({ mkDerivation, aeson, base, containers, deepseq, errors, fakepull
+ , hashable, hspec, http-api-data, http-client, http-client-tls
+ , megaparsec, mtl, QuickCheck, quickcheck-instances, scientific
, servant, servant-client, servant-client-core, text, time
- , transformers
+ , transformers, unordered-containers
}:
mkDerivation {
pname = "slack-web";
- version = "0.2.0.11";
- sha256 = "14ngln71sn5i26041m4v614vq4qhr44pzlgyxliyqw08dxn25la7";
+ version = "0.2.1.0";
+ sha256 = "01bwiq3b97bznn3sc51vi7q8xkjdslvqqh250fk7arcaq6hkkiw1";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- aeson base containers errors http-api-data http-client
- http-client-tls megaparsec mtl servant servant-client
- servant-client-core text time transformers
+ aeson base containers deepseq errors hashable http-api-data
+ http-client http-client-tls megaparsec mtl scientific servant
+ servant-client servant-client-core text time transformers
+ unordered-containers
];
testHaskellDepends = [
- aeson base containers errors hspec http-api-data megaparsec text
- time
+ aeson base fakepull hspec QuickCheck quickcheck-instances text time
];
description = "Bindings for the Slack web API";
license = lib.licenses.mit;
@@ -248624,8 +248818,8 @@ self: {
}:
mkDerivation {
pname = "symantic-parser";
- version = "0.0.0.20210102";
- sha256 = "00gmcbn1amdr9nx54wia898gc7437563g9gpvlkhsg9r7197acid";
+ version = "0.1.0.20210201";
+ sha256 = "0c7vqxd0dagn7l3k4khbqvwg51y6a40m0f5qf587vj4rpjalc473";
libraryHaskellDepends = [
array base bytestring containers ghc-prim hashable template-haskell
text transformers unordered-containers
@@ -248945,8 +249139,8 @@ self: {
}:
mkDerivation {
pname = "syntactic";
- version = "3.8.1";
- sha256 = "0560h3k360316q05wwylpbcvadp9dxzywbp206xm2wslpl1d9m8v";
+ version = "3.8.2";
+ sha256 = "04lv8v42bs4qjjcia39grfxmabiv41dipgg5b58xgiv4ay884nfm";
libraryHaskellDepends = [
base constraints containers data-hash deepseq mtl syb
template-haskell tree-view
@@ -251212,6 +251406,17 @@ self: {
broken = true;
}) {};
+ "tasty-bench" = callPackage
+ ({ mkDerivation, base, deepseq, tasty }:
+ mkDerivation {
+ pname = "tasty-bench";
+ version = "0.1";
+ sha256 = "0dc1fbsxxbdj90dihx8nv587pfds3s9si81i2qx438gkh3pyinmi";
+ libraryHaskellDepends = [ base deepseq tasty ];
+ description = "Featherlight benchmark framework";
+ license = lib.licenses.mit;
+ }) {};
+
"tasty-dejafu" = callPackage
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
@@ -251806,8 +252011,8 @@ self: {
}:
mkDerivation {
pname = "tasty-sugar";
- version = "1.0.1.1";
- sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68";
+ version = "1.1.0.0";
+ sha256 = "1v1ikl4jy02c0jlvm4di8ndm7fbyr8235ydppp953d7qb8yilsyp";
libraryHaskellDepends = [
base directory filemanip filepath logict optparse-applicative
prettyprinter tagged tasty
@@ -259229,10 +259434,10 @@ self: {
}:
mkDerivation {
pname = "tokyocabinet-haskell";
- version = "0.0.6";
- sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk";
+ version = "0.0.7";
+ sha256 = "1fmj46wvl6ayx30r5r538vnygz32s1877m2f9zf7nb2zyiz5vmcb";
revision = "1";
- editedCabalFile = "1mk2nwi51zm0b2081db26xipwa0yd53ikhxa5vd8fp8x2w52wliw";
+ editedCabalFile = "07kx002x3yh1klhxn9fq0bi2pfy4mdqacg3caqklmdl22dkh74lq";
libraryHaskellDepends = [ base bytestring mtl ];
librarySystemDepends = [ tokyocabinet ];
testHaskellDepends = [ base bytestring directory HUnit mtl ];
@@ -260197,18 +260402,18 @@ self: {
}) {};
"trackit" = callPackage
- ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic
- , process, process-extras, stm, text, time, vty
+ ({ mkDerivation, base, brick, fsnotify, microlens-platform, mtl
+ , optparse-generic, process, process-extras, stm, text, time, vty
}:
mkDerivation {
pname = "trackit";
- version = "0.6.3";
- sha256 = "0bjsvz1kc6i2zpzdcjrrncqs3rpl7rfp961njhihymazffhsx3l2";
+ version = "0.7";
+ sha256 = "0v0f1a4p1602jgz5iik7mxxnld61ai7saan0brqry2sd6a8cjw43";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base brick fsnotify mtl optparse-generic process process-extras stm
- text time vty
+ base brick fsnotify microlens-platform mtl optparse-generic process
+ process-extras stm text time vty
];
description = "A command-line tool for live monitoring";
license = lib.licenses.bsd3;
@@ -266358,8 +266563,8 @@ self: {
}:
mkDerivation {
pname = "uniqueness-periods-vector-examples";
- version = "0.14.5.0";
- sha256 = "0c30dd5x1bgk40gzfa5wdrnlam0j41z0cpd1dhmcj6fzwd1l2nra";
+ version = "0.15.0.0";
+ sha256 = "0cgl2xnmp0m73iizmhbl33vgc6mf1wzj49nf9xm1c1d70ak21g1l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -266412,8 +266617,8 @@ self: {
}:
mkDerivation {
pname = "uniqueness-periods-vector-properties";
- version = "0.5.5.0";
- sha256 = "08pzazvgg0nldybbj1558xvipn3wafqm9491fk2xcrf4na5pc42l";
+ version = "0.6.0.0";
+ sha256 = "08c97g221xcbsrwzyv36gikilim2yz2v2kkrhqvaj102v7ygh6ih";
libraryHaskellDepends = [
base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity
phonetic-languages-ukrainian uniqueness-periods-vector
@@ -267096,8 +267301,8 @@ self: {
}:
mkDerivation {
pname = "unliftio-streams";
- version = "0.1.1.0";
- sha256 = "0qp78c610anqpgpd13pz24x68kcpc69z2wjrz6a3qixvqjvp72bw";
+ version = "0.1.1.1";
+ sha256 = "1r9yn710nwx4h2ky2pmlhmap5ydx4fhcaq119dq7cysnygzi5q2n";
libraryHaskellDepends = [
base bytestring io-streams text unliftio-core
];
@@ -267868,6 +268073,8 @@ self: {
pname = "uri-encode";
version = "1.5.0.7";
sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767";
+ revision = "1";
+ editedCabalFile = "172mgdd8dgy8wphgl9vbvp26lrzp01prr5jshbng4rlhpyd340p1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -274216,6 +274423,40 @@ self: {
license = lib.licenses.mit;
}) {};
+ "warp_3_3_14" = callPackage
+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+ , bytestring, case-insensitive, containers, directory, gauge
+ , ghc-prim, hashable, hspec, http-client, http-date, http-types
+ , http2, HUnit, iproute, lifted-base, network, process, QuickCheck
+ , simple-sendfile, stm, streaming-commons, text, time, time-manager
+ , unix, unix-compat, vault, wai, word8, x509
+ }:
+ mkDerivation {
+ pname = "warp";
+ version = "3.3.14";
+ sha256 = "0whmh6dbl7321a2kg6ypngw5kgvvxqdk161li0l4hr3wqqddlc93";
+ libraryHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers ghc-prim hashable http-date http-types
+ http2 iproute network simple-sendfile stm streaming-commons text
+ time-manager unix unix-compat vault wai word8 x509
+ ];
+ testHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers directory ghc-prim hashable hspec
+ http-client http-date http-types http2 HUnit iproute lifted-base
+ network process QuickCheck simple-sendfile stm streaming-commons
+ text time time-manager unix unix-compat vault wai word8 x509
+ ];
+ benchmarkHaskellDepends = [
+ auto-update base bytestring containers gauge hashable http-date
+ http-types network time-manager unix unix-compat x509
+ ];
+ description = "A fast, light-weight web server for WAI applications";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"warp-dynamic" = callPackage
({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
mkDerivation {
@@ -278885,8 +279126,8 @@ self: {
}:
mkDerivation {
pname = "xdot";
- version = "0.3.0.2";
- sha256 = "0k3lklghlj51nslv8pi8anj78hls2srmdr6hz5yibfhvycpib0c2";
+ version = "0.3.0.3";
+ sha256 = "06pgs74b3llyhhp2rr9a3rvgycnvg395q5ib9vwdiv9pqgq31kia";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -282680,7 +282921,7 @@ self: {
broken = true;
}) {};
- "yesod-auth-oauth2_0_6_2_1" = callPackage
+ "yesod-auth-oauth2_0_6_2_2" = callPackage
({ mkDerivation, aeson, base, bytestring, cryptonite, errors
, hoauth2, hspec, http-client, http-conduit, http-types, memory
, microlens, safe-exceptions, text, uri-bytestring, yesod-auth
@@ -282688,8 +282929,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-oauth2";
- version = "0.6.2.1";
- sha256 = "1kzz271y69l47wikfmfix5v9csh6xy7cv8b36gxzlwr6vil59bmy";
+ version = "0.6.2.2";
+ sha256 = "176iz5mg9jhrp8kp61f12j1jw3icnqp10dxln7046p1nqam0nv3d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
From b1d2e3b10ff5a4e1a43f884be07bc1844ac66b4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 14:38:13 +0100
Subject: [PATCH 07/15] ghc-8.10.3: don't use obsolete stdenv.lib
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
pkgs/development/compilers/ghc/8.10.3.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix
index f1b225b12c80..fe160259f2b3 100644
--- a/pkgs/development/compilers/ghc/8.10.3.nix
+++ b/pkgs/development/compilers/ghc/8.10.3.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation (rec {
# upstream patch. Don't forget to check backport status of the upstream patch
# when adding new GHC releases in nixpkgs.
./respect-ar-path.patch
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ ] ++ lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
(fetchpatch {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
From bac09b76582a513dadeb20f17d3bcc791462cbfd Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 5 Feb 2021 19:27:09 +0100
Subject: [PATCH 08/15] haskell-language-server: Use hackage version and
cleanup
---
.../haskell-modules/configuration-common.nix | 16 +--
.../configuration-hackage2nix.yaml | 13 +-
.../haskell-modules/configuration-nix.nix | 4 +-
.../haskell-modules/hackage-packages.nix | 124 ++++++++++--------
.../haskell-modules/non-hackage-packages.nix | 10 --
.../haskell-language-server/default.nix | 53 --------
.../hls-class-plugin.nix | 21 ---
.../hls-eval-plugin.nix | 27 ----
.../hls-explicit-imports-plugin.nix | 21 ---
.../hls-hlint-plugin.nix | 26 ----
.../hls-retrie-plugin.nix | 23 ----
.../hls-tactics-plugin.nix | 32 -----
.../haskell/haskell-language-server/update.sh | 50 -------
13 files changed, 80 insertions(+), 340 deletions(-)
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/default.nix
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
delete mode 100755 pkgs/development/tools/haskell/haskell-language-server/update.sh
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1144ee0f8234..bd7692721e8c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1405,28 +1405,20 @@ self: super: {
# quickcheck-instances is only used in the tests of binary-instances.
binary-instances = dontCheck super.binary-instances;
- # tons of overrides for bleeding edge versions for ghcide and hls
- # overriding aeson on all of them to prevent double compilations
- # this shouldn‘t break anything because nearly all their reverse deps are
- # in this list or marked as broken anyways
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
- haskell-language-server = dontCheck (super.haskell-language-server.override {
- lsp-test = dontCheck self.lsp-test;
- fourmolu = self.fourmolu_0_3_0_0;
- });
+ haskell-language-server = dontCheck super.haskell-language-server;
+
# 2021-01-20
# apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
# https://github.com/haskell/haskell-language-server/issues/1240
apply-refact = super.apply-refact_0_8_2_1;
- fourmolu = dontCheck super.fourmolu;
-
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
- ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; })));
- refinery = doDistribute super.refinery_0_3_0_0;
+ ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
+
data-tree-print = doJailbreak super.data-tree-print;
# 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index bbf0485e88b8..2a340dd7f923 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -73,9 +73,11 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- # haskell-language-server 0.5.0.0 doesn't accept newer versions
- - fourmolu ==0.2.*
- - refinery ==0.2.*
+ - hls-plugin-api == 0.6.0.0 # Needed for hls 0.8.0
+ - hls-eval-plugin == 0.1.0.0 # Needed for hls 0.8.0
+ - hls-hlint-plugin == 0.1.0.0 # Needed for hls 0.8.0
+ - ghcide == 0.7.0.0 # Needed for hls 0.8.0
+
# Stackage Nightly 2021-02-02
- abstract-deque ==0.3
- abstract-par ==0.3.3
@@ -2709,7 +2711,6 @@ extra-packages:
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- - ghcide == 0.7.0.0 # Needed for hls 0.8.0
- apply-refact == 0.8.2.1 # Needed for hls 0.8.0
package-maintainers:
@@ -6038,7 +6039,6 @@ broken-packages:
- haskell-igraph
- haskell-in-space
- haskell-kubernetes
- - haskell-language-server
- haskell-lsp-client
- haskell-ml
- haskell-mpfr
@@ -6468,9 +6468,6 @@ broken-packages:
- hlrdb
- hlrdb-core
- hls
- - hls-explicit-imports-plugin
- - hls-hlint-plugin
- - hls-retrie-plugin
- hlwm
- hly
- hmark
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 657c04b0d817..4e23ab80c1b6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -787,7 +787,7 @@ self: super: builtins.intersectAttrs super {
testTarget = "unit-tests";
};
- haskell-language-server = overrideCabal super.haskell-language-server (drv: {
+ haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: {
postInstall = let
inherit (pkgs.lib) concatStringsSep take splitString;
ghc_version = self.ghc.version;
@@ -802,7 +802,7 @@ self: super: builtins.intersectAttrs super {
export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper
export HOME=$TMPDIR
'';
- });
+ })) "all-plugins") "all-formatters";
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1e2f3427dfb5..fd2a6646564f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -94066,34 +94066,6 @@ self: {
}) {};
"fourmolu" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, directory
- , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
- , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative
- , path, path-io, syb, text
- }:
- mkDerivation {
- pname = "fourmolu";
- version = "0.2.0.0";
- sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base bytestring containers directory dlist exceptions
- filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text
- ];
- executableHaskellDepends = [
- base directory ghc-lib-parser gitrev optparse-applicative text
- ];
- testHaskellDepends = [
- base containers filepath hspec path path-io text
- ];
- testToolDepends = [ hspec-discover ];
- description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
- }) {};
-
- "fourmolu_0_3_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
, hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative
@@ -94119,7 +94091,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"fp-ieee" = callPackage
@@ -101421,7 +101392,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "ghcide_0_7_0_0" = callPackage
+ "ghcide" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, case-insensitive, containers, cryptohash-sha1
, data-default, deepseq, directory, extra, filepath, fingertree
@@ -101480,7 +101451,7 @@ self: {
broken = true;
}) {shake-bench = null;};
- "ghcide" = callPackage
+ "ghcide_0_7_3_0" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, case-insensitive, containers, cryptohash-sha1
, data-default, deepseq, directory, dlist, extra, filepath
@@ -117971,8 +117942,6 @@ self: {
testToolDepends = [ ghcide ];
description = "LSP server for GHC";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"haskell-lexer" = callPackage
@@ -128968,6 +128937,28 @@ self: {
}) {};
"hls-eval-plugin" = callPackage
+ ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
+ , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable
+ , haskell-lsp, haskell-lsp-types, hls-plugin-api
+ , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
+ , shake, temporary, text, time, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hls-eval-plugin";
+ version = "0.1.0.0";
+ sha256 = "1rghn0p8qqh9vh0x1ib2w00vv74y8j9qj2ydhwc68viii03wpjan";
+ libraryHaskellDepends = [
+ aeson base containers deepseq Diff directory extra filepath ghc
+ ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
+ hls-plugin-api parser-combinators pretty-simple QuickCheck
+ safe-exceptions shake temporary text time transformers
+ unordered-containers
+ ];
+ description = "Eval plugin for Haskell Language Server";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "hls-eval-plugin_0_2_0_0" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
, dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens
@@ -128988,6 +128979,7 @@ self: {
];
description = "Eval plugin for Haskell Language Server";
license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
}) {};
"hls-exactprint-utils" = callPackage
@@ -129022,8 +129014,6 @@ self: {
];
description = "Explicit imports plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"hls-haddock-comments-plugin" = callPackage
@@ -129043,6 +129033,29 @@ self: {
}) {};
"hls-hlint-plugin" = callPackage
+ ({ mkDerivation, aeson, apply-refact, base, binary, bytestring
+ , containers, data-default, deepseq, Diff, directory, extra
+ , filepath, ghc, ghcide, hashable, haskell-lsp, hlint
+ , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary
+ , text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hls-hlint-plugin";
+ version = "0.1.0.0";
+ sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq";
+ revision = "1";
+ editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s";
+ libraryHaskellDepends = [
+ aeson apply-refact base binary bytestring containers data-default
+ deepseq Diff directory extra filepath ghc ghcide hashable
+ haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake
+ temporary text transformers unordered-containers
+ ];
+ description = "Hlint integration plugin with Haskell Language Server";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "hls-hlint-plugin_0_2_0_0" = callPackage
({ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
, filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp
@@ -129062,10 +129075,29 @@ self: {
description = "Hlint integration plugin with Haskell Language Server";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"hls-plugin-api" = callPackage
+ ({ mkDerivation, aeson, base, containers, data-default, Diff
+ , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
+ , text, unix, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hls-plugin-api";
+ version = "0.6.0.0";
+ sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi";
+ revision = "2";
+ editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji";
+ libraryHaskellDepends = [
+ aeson base containers data-default Diff hashable haskell-lsp
+ hslogger lens process regex-tdfa shake text unix
+ unordered-containers
+ ];
+ description = "Haskell Language Server API for plugin communication";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "hls-plugin-api_0_7_0_0" = callPackage
({ mkDerivation, aeson, base, containers, data-default, Diff
, hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
, text, unix, unordered-containers
@@ -129081,6 +129113,7 @@ self: {
];
description = "Haskell Language Server API for plugin communication";
license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
}) {};
"hls-retrie-plugin" = callPackage
@@ -129100,8 +129133,6 @@ self: {
];
description = "Retrie integration plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"hls-splice-plugin" = callPackage
@@ -215840,22 +215871,6 @@ self: {
}) {};
"refinery" = callPackage
- ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph
- , mtl, QuickCheck
- }:
- mkDerivation {
- pname = "refinery";
- version = "0.2.0.0";
- sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq";
- libraryHaskellDepends = [ base exceptions logict mmorph mtl ];
- testHaskellDepends = [
- base checkers exceptions hspec logict mmorph mtl QuickCheck
- ];
- description = "Toolkit for building proof automation systems";
- license = lib.licenses.bsd3;
- }) {};
-
- "refinery_0_3_0_0" = callPackage
({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph
, mtl, QuickCheck
}:
@@ -215869,7 +215884,6 @@ self: {
];
description = "Toolkit for building proof automation systems";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"reflection" = callPackage
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index af317c92a5ab..4d66478f338d 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -18,16 +18,6 @@ self: super: {
# https://github.com/spacchetti/spago/issues/512
spago = self.callPackage ../tools/purescript/spago/spago.nix { };
- # HLS and its fork of ghcide that it uses
- # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
- haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
- hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { };
- hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
- hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
- hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
- hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { };
- hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { };
-
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
deleted file mode 100644
index 71b6355db58d..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ mkDerivation, aeson, base, binary, blaze-markup, brittany
-, bytestring, containers, data-default, deepseq, directory, extra
-, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
-, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
-, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin
-, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
-, hls-tactics-plugin, hslogger, hspec, hspec-core
-, hspec-expectations, lens, lsp-test, mtl, optparse-applicative
-, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
-, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml
-, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
-, temporary, text, transformers, unordered-containers, with-utf8
-, yaml
-}:
-mkDerivation {
- pname = "haskell-language-server";
- version = "0.8.0.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base containers data-default directory extra filepath ghc ghcide
- gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
- optparse-simple process shake text unordered-containers
- ];
- executableHaskellDepends = [
- aeson base binary brittany bytestring containers deepseq directory
- extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
- gitrev hashable haskell-lsp hie-bios hls-class-plugin
- hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin
- hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens
- mtl optparse-applicative optparse-simple ormolu process regex-tdfa
- safe-exceptions shake stylish-haskell temporary text transformers
- unordered-containers with-utf8
- ];
- testHaskellDepends = [
- aeson base blaze-markup bytestring containers data-default
- directory extra filepath haskell-lsp hie-bios hls-plugin-api
- hslogger hspec hspec-core hspec-expectations lens lsp-test process
- stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
- tasty-hunit tasty-rerun temporary text transformers
- unordered-containers yaml
- ];
- testToolDepends = [ ghcide ];
- homepage = "https://github.com/haskell/haskell-language-server#readme";
- description = "LSP server for GHC";
- license = lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
deleted file mode 100644
index b757dc8c9e86..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, aeson, base, containers, fetchgit, ghc
-, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
-, lib, text, transformers, unordered-containers
-}:
-mkDerivation {
- pname = "hls-class-plugin";
- version = "0.1.0.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot";
- libraryHaskellDepends = [
- aeson base containers ghc ghc-exactprint ghcide haskell-lsp
- hls-plugin-api lens shake text transformers unordered-containers
- ];
- description = "Explicit imports plugin for Haskell Language Server";
- license = lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
deleted file mode 100644
index 2677b45a591d..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, aeson, base, containers, deepseq, Diff, directory
-, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
-, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
-, parser-combinators, pretty-simple, QuickCheck, safe-exceptions
-, shake, lib, temporary, text, time, transformers
-, unordered-containers
-}:
-mkDerivation {
- pname = "hls-eval-plugin";
- version = "0.1.0.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot";
- libraryHaskellDepends = [
- aeson base containers deepseq Diff directory extra filepath ghc
- ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
- hls-plugin-api parser-combinators pretty-simple QuickCheck
- safe-exceptions shake temporary text time transformers
- unordered-containers
- ];
- description = "Eval plugin for Haskell Language Server";
- license = lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
deleted file mode 100644
index 8207b5181ba1..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
-, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text
-, unordered-containers
-}:
-mkDerivation {
- pname = "hls-explicit-imports-plugin";
- version = "0.1.0.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";
- libraryHaskellDepends = [
- aeson base containers deepseq ghc ghcide haskell-lsp-types
- hls-plugin-api shake text unordered-containers
- ];
- description = "Explicit imports plugin for Haskell Language Server";
- license = lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
deleted file mode 100644
index 02e314cba3a1..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, apply-refact, base, binary, bytestring
-, containers, data-default, deepseq, Diff, directory, extra
-, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
-, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
-, regex-tdfa, shake, lib, temporary, text, transformers
-, unordered-containers
-}:
-mkDerivation {
- pname = "hls-hlint-plugin";
- version = "0.1.0.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
- libraryHaskellDepends = [
- aeson apply-refact base binary bytestring containers data-default
- deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex
- ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens
- regex-tdfa shake temporary text transformers unordered-containers
- ];
- description = "Hlint integration plugin with Haskell Language Server";
- license = lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
deleted file mode 100644
index cca8acb8819e..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, aeson, base, containers, deepseq, directory, extra
-, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
-, hls-plugin-api, retrie, safe-exceptions, shake, lib, text
-, transformers, unordered-containers
-}:
-mkDerivation {
- pname = "hls-retrie-plugin";
- version = "0.1.0.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";
- libraryHaskellDepends = [
- aeson base containers deepseq directory extra ghc ghcide hashable
- haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
- shake text transformers unordered-containers
- ];
- description = "Retrie integration plugin for Haskell Language Server";
- license = lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
deleted file mode 100644
index 369ce0e27b86..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, aeson, base, checkers, containers, deepseq
-, directory, extra, fetchgit, filepath, fingertree, generic-lens
-, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
-, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
-, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text
-, transformers
-}:
-mkDerivation {
- pname = "hls-tactics-plugin";
- version = "0.5.1.0";
- src = fetchgit {
- url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
- rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
- libraryHaskellDepends = [
- aeson base containers deepseq directory extra filepath fingertree
- generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
- haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
- transformers
- ];
- testHaskellDepends = [
- base checkers containers ghc hie-bios hls-plugin-api hspec mtl
- QuickCheck
- ];
- testToolDepends = [ hspec-discover ];
- description = "Tactics plugin for Haskell Language Server";
- license = "unknown";
- hydraPlatforms = lib.platforms.none;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh
deleted file mode 100755
index aaccf8b9b9fe..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/update.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p cabal2nix jq curl
-#
-# This script will update the haskell-language-server derivation to the latest version using
-# cabal2nix.
-#
-# Note that you should always try building haskell-language-server after updating it here, since
-# some of the overrides in pkgs/development/haskell/configuration-nix.nix may
-# need to be updated/changed.
-#
-# Remember to split out different updates into multiple commits
-
-set -eo pipefail
-
-# This is the directory of this update.sh script.
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-# ===========================
-# HLS
-# ===========================
-
-# hls derivation created with cabal2nix.
-hls_derivation_file="${script_dir}/default.nix"
-
-# This is the current revision of hls in Nixpkgs.
-hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")"
-
-# This is the latest release version of hls on GitHub.
-# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'),
-# sort for the latest one and select just that
-hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags |
- jq --raw-output 'map(.name) | .[]' |
- grep '^[0-9]' |
- sort --version-sort |
- tail -n1)
-
-# Use this value instead for the very latest revision
-# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
-
-hls_new_version=$hls_latest_release
-
-echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
-echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
-cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
-cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
-for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do
- cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix"
-done
-
-echo "Finished."
From d85818b2af66a0b56a6dd9acc090f9d8b8684656 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 20:15:04 +0100
Subject: [PATCH 09/15] hackage-packages.nix: automatic Haskell package set
update
This update was generated by hackage2nix v2.16.0-10-gabc66d1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/5ad244e7f59d62ef878c4ca33dc18dc126d4a202.
---
.../haskell-modules/hackage-packages.nix | 212 +++++++++++++++++-
1 file changed, 200 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fd2a6646564f..3a675707c43d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -44981,6 +44981,8 @@ self: {
pname = "bound";
version = "2.0.2";
sha256 = "14kl0aak48m1sbvi0g772hfmn6w984yc4j9p4ljxq6bfb2q4gqax";
+ revision = "1";
+ editedCabalFile = "1349bq2vrmhr63r1iqwfcb1sxm7yyf0641wsqmzd332g3aad159w";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -44995,6 +44997,30 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "bound_2_0_3" = callPackage
+ ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad
+ , deepseq, deriving-compat, functor-classes-compat, hashable
+ , mmorph, profunctors, template-haskell, th-abstraction
+ , transformers, transformers-compat, vector, void
+ }:
+ mkDerivation {
+ pname = "bound";
+ version = "2.0.3";
+ sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg";
+ libraryHaskellDepends = [
+ base bifunctors binary bytes cereal comonad deepseq hashable mmorph
+ profunctors template-haskell th-abstraction transformers
+ transformers-compat
+ ];
+ testHaskellDepends = [
+ base deriving-compat functor-classes-compat transformers
+ transformers-compat vector void
+ ];
+ description = "Making de Bruijn Succ Less";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"bound-extras" = callPackage
({ mkDerivation, base, bound, containers, deepseq, filepath
, hashable, pretty, tasty, tasty-golden, text-short, transformers
@@ -69073,6 +69099,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "data-fix_0_3_1" = callPackage
+ ({ mkDerivation, base, deepseq, hashable }:
+ mkDerivation {
+ pname = "data-fix";
+ version = "0.3.1";
+ sha256 = "0yfciggx8l82nfpv40w2673glnl9nnbh269kpfbw28i98x0c0icv";
+ libraryHaskellDepends = [ base deepseq hashable ];
+ description = "Fixpoint data types";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"data-fix-cse" = callPackage
({ mkDerivation, base, containers, data-fix, transformers }:
mkDerivation {
@@ -72296,8 +72334,8 @@ self: {
}:
mkDerivation {
pname = "dep-t";
- version = "0.4.0.1";
- sha256 = "1smziiydnyzs144wzcvjd4slmkip6g4195mcvjskkydyrpcq1g18";
+ version = "0.4.0.2";
+ sha256 = "0jnby6k89ink5dh12y5cc4ws8nn2cwhchnqqxyxwd29pwrx0vmx6";
libraryHaskellDepends = [ base mtl transformers unliftio-core ];
testHaskellDepends = [
base doctest mtl rank2classes sop-core tasty tasty-hunit
@@ -100472,6 +100510,27 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "ghc-lib_9_0_1_20210205" = callPackage
+ ({ mkDerivation, alex, array, base, binary, bytestring, containers
+ , deepseq, directory, exceptions, filepath, ghc-lib-parser
+ , ghc-prim, happy, hpc, pretty, process, time, transformers, unix
+ }:
+ mkDerivation {
+ pname = "ghc-lib";
+ version = "9.0.1.20210205";
+ sha256 = "1kj69qbz7yv943ybbnmk2xvrba9220ky4cmx3d1vxzjg951x1ici";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory
+ exceptions filepath ghc-lib-parser ghc-prim hpc pretty process time
+ transformers unix
+ ];
+ libraryToolDepends = [ alex happy ];
+ description = "The GHC API, decoupled from GHC versions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-lib-parser" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
@@ -100491,6 +100550,27 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "ghc-lib-parser_9_0_1_20210205" = callPackage
+ ({ mkDerivation, alex, array, base, binary, bytestring, containers
+ , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc
+ , pretty, process, time, transformers, unix
+ }:
+ mkDerivation {
+ pname = "ghc-lib-parser";
+ version = "9.0.1.20210205";
+ sha256 = "1lzqbm1nrnw1bydjd9py82rlzznxnnbplzjx80sn966kyyxmlr8v";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory
+ exceptions filepath ghc-prim hpc pretty process time transformers
+ unix
+ ];
+ libraryToolDepends = [ alex happy ];
+ description = "The GHC API, decoupled from GHC versions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-lib-parser-ex" = callPackage
({ mkDerivation, base, bytestring, containers, directory, extra
, filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
@@ -100511,6 +100591,27 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "ghc-lib-parser-ex_9_0_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, extra
+ , filepath, ghc, ghc-boot, ghc-boot-th, ghc-lib-parser, tasty
+ , tasty-hunit, uniplate
+ }:
+ mkDerivation {
+ pname = "ghc-lib-parser-ex";
+ version = "9.0.0.1";
+ sha256 = "03a98bn50bhqvfrchd5fx0w2x4ddb3ap78wikbb3hfhcgq4843nl";
+ libraryHaskellDepends = [
+ base bytestring containers ghc-lib-parser uniplate
+ ];
+ testHaskellDepends = [
+ base directory extra filepath ghc ghc-boot ghc-boot-th tasty
+ tasty-hunit uniplate
+ ];
+ description = "Algorithms on GHC parse trees";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-make" = callPackage
({ mkDerivation, base, process, shake, unordered-containers }:
mkDerivation {
@@ -120194,8 +120295,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.40.17";
- sha256 = "1bklypyzxchbwcyzmnkc8dg8dq9i1n8xhcli3cb0v0bzfx8xfha1";
+ version = "0.40.18";
+ sha256 = "13zpl2kkirq0nl0sjblllm6gzfj82ghm3i18rh7ak9dxzavjnphy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123785,6 +123886,20 @@ self: {
broken = true;
}) {};
+ "hedgehog-fakedata_0_0_1_4" = callPackage
+ ({ mkDerivation, base, containers, fakedata, hedgehog, random }:
+ mkDerivation {
+ pname = "hedgehog-fakedata";
+ version = "0.0.1.4";
+ sha256 = "1pa8kf6pxsvmfy8r29xk486cdi38881blqj1lcnjya98ilb6ldx3";
+ libraryHaskellDepends = [ base fakedata hedgehog random ];
+ testHaskellDepends = [ base containers fakedata hedgehog ];
+ description = "Use 'fakedata' with 'hedgehog'";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"hedgehog-fn" = callPackage
({ mkDerivation, base, contravariant, hedgehog, transformers }:
mkDerivation {
@@ -127822,6 +127937,17 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "histogram-simple" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "histogram-simple";
+ version = "1.0";
+ sha256 = "11x8v0svvsc0impf59vixbsaxh5nwvyc9wmw9xkshd4k4a30bdb8";
+ libraryHaskellDepends = [ base containers ];
+ description = "Simple Data.Map-based histogram";
+ license = lib.licenses.bsd3;
+ }) {};
+
"historian" = callPackage
({ mkDerivation, base, containers, directory, filepath, process
, regex-compat, regex-posix
@@ -129142,8 +129268,8 @@ self: {
}:
mkDerivation {
pname = "hls-splice-plugin";
- version = "0.2.0.0";
- sha256 = "1synsdvw9ks4yg6a269inn06p1apdf6khcyb98v1hzvz93bivndf";
+ version = "0.3.0.0";
+ sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv";
libraryHaskellDepends = [
aeson base containers dlist foldl ghc ghc-exactprint ghcide
haskell-lsp hls-plugin-api lens retrie shake syb text transformers
@@ -154717,6 +154843,22 @@ self: {
broken = true;
}) {};
+ "kparams" = callPackage
+ ({ mkDerivation, base, HUnit }:
+ mkDerivation {
+ pname = "kparams";
+ version = "0.1.0.0";
+ sha256 = "0q1ma3qm2anpr6w4xa78wh97b7pzy85ggjiiwbd0gb7b0vwbglx0";
+ isLibrary = false;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base HUnit ];
+ doHaddock = false;
+ description = "Extracts values from /proc/cmdline";
+ license = lib.licenses.mit;
+ }) {};
+
"kqueue" = callPackage
({ mkDerivation, base, c2hs, directory, filepath, mtl, time, unix
}:
@@ -158260,8 +158402,8 @@ self: {
pname = "lazy-io-streams";
version = "0.1.0.0";
sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy";
- revision = "1";
- editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm";
+ revision = "2";
+ editedCabalFile = "01r6i81rxm6rng50yhfj84z3dvhcbap10sfqigg01mfmy4zn9pnl";
libraryHaskellDepends = [ base bytestring io-streams ];
description = "Get lazy with your io-streams";
license = lib.licenses.bsd3;
@@ -161097,6 +161239,27 @@ self: {
license = lib.licenses.mpl20;
}) {};
+ "lifetimes" = callPackage
+ ({ mkDerivation, base, containers, hspec, monad-stm
+ , safe-exceptions, stm, transformers, zenhack-prelude
+ }:
+ mkDerivation {
+ pname = "lifetimes";
+ version = "0.1.0.0";
+ sha256 = "192bzz4nqqi2kdk9x4nxlwmx0mf0sshqdcnx1dgyjh5z9k29rww5";
+ libraryHaskellDepends = [
+ base containers monad-stm stm transformers zenhack-prelude
+ ];
+ testHaskellDepends = [
+ base containers hspec monad-stm safe-exceptions stm transformers
+ zenhack-prelude
+ ];
+ description = "Flexible manual resource management";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"lift-generics" = callPackage
({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
, hspec, hspec-discover, mtl, template-haskell, th-compat
@@ -206031,8 +206194,8 @@ self: {
pname = "primitive";
version = "0.7.1.0";
sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb";
- revision = "1";
- editedCabalFile = "0nllkqvfrplhslfgbqgpn0r5k4mj5wlfixjxrpjz6vb73xwi5977";
+ revision = "2";
+ editedCabalFile = "1m08slj8m596z4pqsw3ag25ijhzlv9ki809ydh4nbin141bpsdgn";
libraryHaskellDepends = [ base deepseq transformers ];
testHaskellDepends = [
base base-orphans ghc-prim QuickCheck quickcheck-classes-base
@@ -222675,6 +222838,31 @@ self: {
broken = true;
}) {};
+ "rpmbuild-order_0_4_3_2" = callPackage
+ ({ mkDerivation, base, case-insensitive, containers, directory
+ , extra, fgl, filepath, hspec, optparse-applicative, process
+ , simple-cmd, simple-cmd-args, unix
+ }:
+ mkDerivation {
+ pname = "rpmbuild-order";
+ version = "0.4.3.2";
+ sha256 = "1510v4gbylzpdh7l23r4z6xhqmjalay3crxg2216lz8j0mb4sbq9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base case-insensitive containers directory extra fgl filepath
+ process
+ ];
+ executableHaskellDepends = [
+ base directory extra fgl optparse-applicative simple-cmd-args
+ ];
+ testHaskellDepends = [ base extra hspec simple-cmd unix ];
+ description = "Order RPM packages by dependencies";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"rrule" = callPackage
({ mkDerivation, base, hspec, megaparsec, parser-combinators, text
, time
@@ -241941,8 +242129,8 @@ self: {
}:
mkDerivation {
pname = "stack-all";
- version = "0.1.1";
- sha256 = "0b81f6v18dyd5zia6drqn3jqncj3sp8cscrhlrcwvbljs1j8fd0j";
+ version = "0.1.2";
+ sha256 = "1iqm96f9c6csv4dzr6l7cyiv99nmbc9739xhycg2gvpm9sncmxrb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
From 86743871dacc5cdef086c52679e1d17545b26a1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 20:24:01 +0100
Subject: [PATCH 10/15] hackage2nix: disable failing builds to fix evaluation
on Hydra
---
pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2a340dd7f923..96ca00e0a45a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7561,6 +7561,7 @@ broken-packages:
- libxml-enumerator
- libxslt
- lie
+ - lifetimes
- lifted-base-tf
- lifted-protolude
- lifter
From f159654fb1d72471f064ea0a8e8f9ebbb9040f8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 20:26:50 +0100
Subject: [PATCH 11/15] essence-of-live-coding-warp: update overrides for the
new version of http-client
---
pkgs/development/haskell-modules/configuration-common.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bd7692721e8c..7c57153b2a47 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1519,7 +1519,7 @@ self: super: {
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
- http-client = self.http-client_0_7_4;
+ http-client = self.http-client_0_7_5;
};
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
From 160d44972610a023e14ca4b06427f8b7075ea4a2 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 5 Feb 2021 22:15:54 +0100
Subject: [PATCH 12/15] haskell.ghc865.mmorph: Fix build
---
.../haskell-modules/configuration-ghc-8.6.x.nix | 2 ++
.../haskell-modules/configuration-hackage2nix.yaml | 1 +
.../haskell-modules/hackage-packages.nix | 14 ++++++++++++++
3 files changed, 17 insertions(+)
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 2a0a7810f72a..8e87134f617c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -94,4 +94,6 @@ self: super: {
# This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
exceptions = super.exceptions_0_10_4;
+
+ mmorph = super.mmorph_1_1_3;
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 96ca00e0a45a..3dcadefccc3c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2712,6 +2712,7 @@ extra-packages:
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- apply-refact == 0.8.2.1 # Needed for hls 0.8.0
+ - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
package-maintainers:
peti:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3a675707c43d..b1a2837ec6d0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -174058,6 +174058,20 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "mmorph_1_1_3" = callPackage
+ ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+ mkDerivation {
+ pname = "mmorph";
+ version = "1.1.3";
+ sha256 = "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr";
+ libraryHaskellDepends = [
+ base mtl transformers transformers-compat
+ ];
+ description = "Monad morphisms";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"mmorph" = callPackage
({ mkDerivation, base, mtl, transformers, transformers-compat }:
mkDerivation {
From 48104ded6457f19c44fa6af7a8c97bb3bb9fc4f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 22:37:50 +0100
Subject: [PATCH 13/15] hls-hlint-plugin: add new ghc-lib dependency when
building with older compilers
---
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++
3 files changed, 8 insertions(+)
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 27bf04b914e7..6831c7c327d7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -88,5 +88,6 @@ self: super: {
# ghc versions prior to 8.8.x needs additional dependency to compile successfully.
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
+ hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 8e87134f617c..ad6c17cbd103 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -95,5 +95,8 @@ self: super: {
# This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
exceptions = super.exceptions_0_10_4;
+ # Older compilers need the latest ghc-lib to build this package.
+ hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
+
mmorph = super.mmorph_1_1_3;
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index d1099c56b2c8..c23d875dea38 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -123,4 +123,8 @@ self: super: {
# ghc versions which don‘t match the ghc-lib-parser-ex version need the
# additional dependency to compile successfully.
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
+
+ # Older compilers need the latest ghc-lib to build this package.
+ hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
+
}
From 536bf86b42c3e6b27aa6a4cb1ae7604dd2e69532 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 22:45:22 +0100
Subject: [PATCH 14/15] haskell-syb: drop obsolete overrides to fix the
ghc-9.0.x build
---
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index d9efb1ab9c32..7e8546c7c7e6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -100,10 +100,6 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";
});
- syb = appendPatch (dontCheck super.syb) (pkgs.fetchpatch {
- url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/syb-0.7.1.patch";
- sha256 = "1407r8xv6bfnmpbw7glfh4smi76a2fc9pkq300c3d9f575708zqr";
- });
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
From 0b626654adb3c24067846012c58651587e551df1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Feb 2021 22:46:01 +0100
Subject: [PATCH 15/15] ghc: update the 9.0.1 version to the official release
tarball
---
pkgs/development/compilers/ghc/9.0.1.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix
index 39abe9c760e3..83f3534d3e4a 100644
--- a/pkgs/development/compilers/ghc/9.0.1.nix
+++ b/pkgs/development/compilers/ghc/9.0.1.nix
@@ -96,12 +96,12 @@ let
in
stdenv.mkDerivation (rec {
- version = "9.0.0.20201227";
+ version = "9.0.1";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
- url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz";
- sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy";
+ url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5";
};
enableParallelBuilding = true;