Merge pull request #134317 from NixOS/haskell-updates
haskellPackages: ghc 8.10.4 -> 8.10.6
This commit is contained in:
maralorn
GitHub
commit
27d463c120
32 changed files with 1659 additions and 521 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "dfb0b040033334d2e676906786c7a90805310e7d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz",
|
||||
"sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg",
|
||||
"msg": "Update from Hackage at 2021-08-10T19:15:27Z"
|
||||
"commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz",
|
||||
"sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764",
|
||||
"msg": "Update from Hackage at 2021-08-17T22:21:14Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx, xattr
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
|
@ -135,12 +135,12 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.10.4";
|
||||
version = "8.10.6";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj";
|
||||
sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -155,9 +155,6 @@ 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
|
||||
# Fix documentation configuration which causes a syntax error with sphinx 4.*
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6.
|
||||
./sphinx-4-configuration.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
(fetchpatch {
|
||||
|
|
@ -192,6 +189,9 @@ stdenv.mkDerivation (rec {
|
|||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
|
||||
# GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
|
||||
export XATTR=${lib.getBin xattr}/bin/xattr
|
||||
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + lib.optionalString targetPlatform.isMusl ''
|
||||
|
|
@ -8,10 +8,10 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2021-07-29";
|
||||
version = "unstable-2021-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz";
|
||||
sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz";
|
||||
sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
|
|
|||
|
|
@ -1149,14 +1149,8 @@ self: super: {
|
|||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
# jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies.
|
||||
# can both be removed at the next release (current is 0.13.0.0)
|
||||
gitit = doJailbreak (appendPatch super.gitit
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch";
|
||||
sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1";
|
||||
includes = [ "src/**" ];
|
||||
}));
|
||||
# 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.
|
||||
gitit = doJailbreak super.gitit;
|
||||
|
||||
# Test suite requires database
|
||||
persistent-mysql = dontCheck super.persistent-mysql;
|
||||
|
|
@ -1293,23 +1287,39 @@ self: super: {
|
|||
# Fails with "supports custom headers"
|
||||
Spock-core = dontCheck super.Spock-core;
|
||||
|
||||
# Needed by Hasura 1.3.1
|
||||
dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override {
|
||||
dependent-sum = self.dependent-sum_0_4;
|
||||
};
|
||||
|
||||
# Hasura 1.3.1
|
||||
# Because of ghc-heap-view, profiling needs to be disabled.
|
||||
graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override {
|
||||
immortal = self.immortal_0_2_2_1;
|
||||
dependent-map = self.dependent-map_0_2_4_0;
|
||||
dependent-sum = self.dependent-sum_0_4;
|
||||
# hasura packages need some extra care
|
||||
graphql-engine = overrideCabal (super.graphql-engine.overrideScope (self: super: {
|
||||
immortal = self.immortal_0_2_2_1;
|
||||
resource-pool = self.hasura-resource-pool;
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
ekg-json = self.hasura-ekg-json;
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
tasty-hspec = self.tasty-hspec_1_2;
|
||||
})) (drv: {
|
||||
patches = [ ./patches/graphql-engine-mapkeys.patch ];
|
||||
doHaddock = false;
|
||||
version = "2.0.7";
|
||||
});
|
||||
hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
});
|
||||
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
});
|
||||
pg-client = overrideCabal (super.pg-client.override {
|
||||
resource-pool = self.hasura-resource-pool;
|
||||
}) (drv: {
|
||||
# version in cabal file is invalid
|
||||
version = "1.3.1-beta1";
|
||||
# hasura needs VERSION env exported during build
|
||||
preBuild = "export VERSION=1.3.1-beta1";
|
||||
}));
|
||||
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
|
||||
# wants a running DB to check against
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# https://github.com/bos/statistics/issues/170
|
||||
statistics = dontCheck super.statistics;
|
||||
|
|
@ -1889,10 +1899,6 @@ EOT
|
|||
# https://github.com/google/proto-lens/issues/413
|
||||
proto-lens = doJailbreak super.proto-lens;
|
||||
|
||||
# Too strict bounds on profunctors
|
||||
# https://github.com/jcranch/tophat/issues/1
|
||||
tophat = doJailbreak super.tophat;
|
||||
|
||||
# 2021-06-20: Outdated upper bounds
|
||||
# https://github.com/Porges/email-validate-hs/issues/58
|
||||
email-validate = doJailbreak super.email-validate;
|
||||
|
|
@ -1946,4 +1952,10 @@ EOT
|
|||
Cabal = self.Cabal_3_6_0_0;
|
||||
};
|
||||
|
||||
# ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
|
||||
ghc-api-compat = doJailbreak super.ghc-api-compat;
|
||||
|
||||
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
|
||||
streamly-posix = doJailbreak super.streamly-posix;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -194,6 +194,8 @@ self: super: {
|
|||
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
|
||||
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
|
||||
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
|
||||
|
||||
# We are lacking pure pgrep at the moment for tests to work
|
||||
tmp-postgres = dontCheck super.tmp-postgres;
|
||||
|
|
|
|||
|
|
@ -41,13 +41,6 @@ self: super: {
|
|||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Hasura 1.3.1
|
||||
# Because of ghc-heap-view, profiling needs to be disabled.
|
||||
graphql-engine = overrideCabal (super.graphql-engine) (drv: {
|
||||
# GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea
|
||||
patches = [ ./patches/hasura-884-compat.patch ];
|
||||
});
|
||||
|
||||
# GHC 8.8.x can build haddock version 2.23.*
|
||||
haddock = self.haddock_2_23_1;
|
||||
haddock-api = self.haddock-api_2_23_1;
|
||||
|
|
@ -136,4 +129,5 @@ self: super: {
|
|||
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
|
||||
vector = dontCheck super.vector;
|
||||
|
||||
ghc-api-compat = super.ghc-api-compat_8_6;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ broken-packages:
|
|||
- alto
|
||||
- alure
|
||||
- amazon-emailer
|
||||
- amazonka-contrib-rds-utils
|
||||
- amazonka-s3-streaming
|
||||
- amazon-products
|
||||
- amby
|
||||
|
|
@ -180,6 +181,7 @@ broken-packages:
|
|||
- argparser
|
||||
- arguedit
|
||||
- arion
|
||||
- arith-encode
|
||||
- armada
|
||||
- arpa
|
||||
- arpack
|
||||
|
|
@ -467,6 +469,7 @@ broken-packages:
|
|||
- butter
|
||||
- buttplug-hs-core
|
||||
- bv-sized
|
||||
- byline
|
||||
- bytable
|
||||
- bytearray-parsing
|
||||
- bytestring-arbitrary
|
||||
|
|
@ -793,12 +796,14 @@ broken-packages:
|
|||
- consul-haskell
|
||||
- Consumer
|
||||
- containers-benchmark
|
||||
- containers-unicode-symbols
|
||||
- containers-verified
|
||||
- ContArrow
|
||||
- content-store
|
||||
- ContextAlgebra
|
||||
- context-free-grammar
|
||||
- context-stack
|
||||
- contiguous
|
||||
- contiguous-checked
|
||||
- continue
|
||||
- Contract
|
||||
|
|
@ -2183,6 +2188,7 @@ broken-packages:
|
|||
- HOpenCV
|
||||
- hopfield
|
||||
- hops
|
||||
- hoq
|
||||
- ho-rewriting
|
||||
- horizon
|
||||
- horname
|
||||
|
|
@ -2276,6 +2282,7 @@ broken-packages:
|
|||
- hsmodetweaks
|
||||
- Hsmtlib
|
||||
- hsmtpclient
|
||||
- hsnock
|
||||
- hs-nombre-generator
|
||||
- hsns
|
||||
- hsnsq
|
||||
|
|
@ -2388,6 +2395,7 @@ broken-packages:
|
|||
- hunspell-hs
|
||||
- hup
|
||||
- hurriyet
|
||||
- husky
|
||||
- hutton
|
||||
- huttons-razor
|
||||
- hVOIDP
|
||||
|
|
@ -2654,6 +2662,7 @@ broken-packages:
|
|||
- lagrangian
|
||||
- lambda2js
|
||||
- lambdaBase
|
||||
- lambdabot-social-plugins
|
||||
- lambdabot-utils
|
||||
- lambda-bridge
|
||||
- lambda-canvas
|
||||
|
|
@ -3009,6 +3018,7 @@ broken-packages:
|
|||
- miku
|
||||
- milena
|
||||
- mime-directory
|
||||
- miniforth
|
||||
- minilens
|
||||
- minilight
|
||||
- minions
|
||||
|
|
@ -3025,6 +3035,7 @@ broken-packages:
|
|||
- mit-3qvpPyAi6mH
|
||||
- mix-arrows
|
||||
- mixpanel-client
|
||||
- mkcabal
|
||||
- mltool
|
||||
- ml-w
|
||||
- mm2
|
||||
|
|
@ -3324,14 +3335,12 @@ broken-packages:
|
|||
- oblivious-transfer
|
||||
- ocaml-export
|
||||
- Octree
|
||||
- odbc
|
||||
- OddWord
|
||||
- oden-go-packages
|
||||
- oeis2
|
||||
- OGL
|
||||
- ogmarkup
|
||||
- oi
|
||||
- oidc-client
|
||||
- om-actor
|
||||
- omaketex
|
||||
- ombra
|
||||
|
|
@ -3664,6 +3673,7 @@ broken-packages:
|
|||
- polysemy
|
||||
- polysemy-zoo
|
||||
- polytypeable
|
||||
- pomaps
|
||||
- pomohoro
|
||||
- ponder
|
||||
- pong-server
|
||||
|
|
@ -3832,6 +3842,7 @@ broken-packages:
|
|||
- quarantimer
|
||||
- qudb
|
||||
- quenya-verb
|
||||
- questioner
|
||||
- QuickAnnotate
|
||||
- quickbooks
|
||||
- quickcheck-property-comb
|
||||
|
|
@ -3900,6 +3911,7 @@ broken-packages:
|
|||
- read-bounded
|
||||
- read-ctags
|
||||
- read-io
|
||||
- readline-statevar
|
||||
- readme-lhs
|
||||
- readshp
|
||||
- really-simple-xml-parser
|
||||
|
|
@ -4249,6 +4261,7 @@ broken-packages:
|
|||
- shadower
|
||||
- shake-bindist
|
||||
- shakebook
|
||||
- shake-cabal
|
||||
- shake-cabal-build
|
||||
- shake-dhall
|
||||
- shake-extras
|
||||
|
|
@ -4606,6 +4619,7 @@ broken-packages:
|
|||
- svndump
|
||||
- swagger-petstore
|
||||
- swagger-test
|
||||
- swearjure
|
||||
- swf
|
||||
- swift-lda
|
||||
- swiss-ephemeris
|
||||
|
|
@ -4920,6 +4934,7 @@ broken-packages:
|
|||
- twilio
|
||||
- twine
|
||||
- twirp
|
||||
- twitter
|
||||
- twitter-feed
|
||||
- tx
|
||||
- txtblk
|
||||
|
|
@ -5378,6 +5393,7 @@ broken-packages:
|
|||
- yi-solarized
|
||||
- yi-spolsky
|
||||
- yoda
|
||||
- Yogurt
|
||||
- yst
|
||||
- yu-core
|
||||
- yu-tool
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ extra-packages:
|
|||
- sbv == 7.13 # required for pkgs.petrinizer
|
||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
|
||||
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
|
|
|||
|
|
@ -370,6 +370,7 @@ dont-distribute-packages:
|
|||
- XSaiga
|
||||
- YACPong
|
||||
- Yablog
|
||||
- Yogurt-Standalone
|
||||
- Z-Botan
|
||||
- Z-IO
|
||||
- Z-MessagePack
|
||||
|
|
@ -467,8 +468,10 @@ dont-distribute-packages:
|
|||
- atomic-primops-foreign
|
||||
- atp
|
||||
- attoparsec-enumerator
|
||||
- attoparsec-ip
|
||||
- attoparsec-iteratee
|
||||
- attoparsec-text-enumerator
|
||||
- attoparsec-uri
|
||||
- atuin
|
||||
- audiovisual
|
||||
- aura
|
||||
|
|
@ -626,6 +629,7 @@ dont-distribute-packages:
|
|||
- bv-sized-lens
|
||||
- bytehash
|
||||
- bytelog
|
||||
- bytesmith
|
||||
- bytestring-read
|
||||
- c0check
|
||||
- cabal-bounds
|
||||
|
|
@ -708,7 +712,9 @@ dont-distribute-packages:
|
|||
- claferwiki
|
||||
- clash
|
||||
- clash-ghc
|
||||
- clash-ghc_1_4_3
|
||||
- clash-lib
|
||||
- clash-lib_1_4_3
|
||||
- clash-multisignal
|
||||
- clash-prelude-quickcheck
|
||||
- clash-systemverilog
|
||||
|
|
@ -790,6 +796,7 @@ dont-distribute-packages:
|
|||
- consumers
|
||||
- container
|
||||
- containers-accelerate
|
||||
- contiguous-fft
|
||||
- continuum
|
||||
- continuum-client
|
||||
- control
|
||||
|
|
@ -1011,6 +1018,7 @@ dont-distribute-packages:
|
|||
- entangle
|
||||
- enumerate
|
||||
- enumerate-function
|
||||
- enumeration
|
||||
- enumerator-fd
|
||||
- enumerator-tf
|
||||
- ephemeral
|
||||
|
|
@ -1732,6 +1740,7 @@ dont-distribute-packages:
|
|||
- intset
|
||||
- invertible-hlist
|
||||
- ion
|
||||
- ip
|
||||
- ipatch
|
||||
- ipc
|
||||
- ipld-cid
|
||||
|
|
@ -1858,6 +1867,8 @@ dont-distribute-packages:
|
|||
- lambda-options
|
||||
- lambdaFeed
|
||||
- lambdaLit
|
||||
- lambdabot
|
||||
- lambdabot-xmpp
|
||||
- lambdabot-zulip
|
||||
- lambdacms-media
|
||||
- lambdacube
|
||||
|
|
@ -1885,6 +1896,7 @@ dont-distribute-packages:
|
|||
- lapack-carray
|
||||
- lapack-comfort-array
|
||||
- lapack-comfort-array_0_0_1
|
||||
- lapack-hmatrix
|
||||
- lapack_0_4
|
||||
- lat
|
||||
- latex-formulae-hakyll
|
||||
|
|
@ -2038,6 +2050,7 @@ dont-distribute-packages:
|
|||
- markdown-pap
|
||||
- markdown2svg
|
||||
- markov-processes
|
||||
- markup
|
||||
- marmalade-upload
|
||||
- marquise
|
||||
- marvin
|
||||
|
|
@ -2395,6 +2408,8 @@ dont-distribute-packages:
|
|||
- prednote-test
|
||||
- presto-hdbc
|
||||
- preview
|
||||
- primitive-containers
|
||||
- primitive-sort
|
||||
- primula-board
|
||||
- primula-bot
|
||||
- proc
|
||||
|
|
@ -2589,6 +2604,7 @@ dont-distribute-packages:
|
|||
- ribosome-root
|
||||
- ribosome-test
|
||||
- ridley-extras
|
||||
- ring-buffers
|
||||
- rio-process-pool
|
||||
- riot
|
||||
- ripple
|
||||
|
|
@ -2662,6 +2678,7 @@ dont-distribute-packages:
|
|||
- scholdoc
|
||||
- scholdoc-citeproc
|
||||
- scholdoc-texmath
|
||||
- scientific-notation
|
||||
- scion
|
||||
- scion-browser
|
||||
- scope
|
||||
|
|
@ -2722,6 +2739,7 @@ dont-distribute-packages:
|
|||
- sgf
|
||||
- sgrep
|
||||
- sha1
|
||||
- shake-ats
|
||||
- shake-minify-css
|
||||
- shaker
|
||||
- shapefile
|
||||
|
|
@ -2760,6 +2778,7 @@ dont-distribute-packages:
|
|||
- smallstring
|
||||
- smartword
|
||||
- smcdel
|
||||
- smith
|
||||
- smith-cli
|
||||
- smith-client
|
||||
- smtlib2-debug
|
||||
|
|
@ -3088,6 +3107,8 @@ dont-distribute-packages:
|
|||
- urembed
|
||||
- uri-enumerator
|
||||
- uri-enumerator-file
|
||||
- url-bytes
|
||||
- urlpath
|
||||
- usb
|
||||
- usb-enumerator
|
||||
- usb-hid
|
||||
|
|
@ -3099,6 +3120,7 @@ dont-distribute-packages:
|
|||
- uu-cco-examples
|
||||
- uu-cco-hut-parsing
|
||||
- uu-cco-uu-parsinglib
|
||||
- uuid-bytes
|
||||
- uuid-crypto
|
||||
- uvector-algorithms
|
||||
- v4l2
|
||||
|
|
@ -3146,6 +3168,7 @@ dont-distribute-packages:
|
|||
- wai-middleware-cache
|
||||
- wai-middleware-cache-redis
|
||||
- wai-middleware-consul
|
||||
- wai-middleware-content-type
|
||||
- wai-middleware-rollbar
|
||||
- wai-middleware-route
|
||||
- wai-session-tokyocabinet
|
||||
|
|
@ -3187,6 +3210,7 @@ dont-distribute-packages:
|
|||
- wrecker-ui
|
||||
- wright
|
||||
- writer-cps-full
|
||||
- ws
|
||||
- wss-client
|
||||
- wtk-gtk
|
||||
- wu-wei
|
||||
|
|
|
|||
|
|
@ -167,6 +167,7 @@ self: super: builtins.intersectAttrs super {
|
|||
mongoDB = dontCheck super.mongoDB;
|
||||
network-transport-tcp = dontCheck super.network-transport-tcp;
|
||||
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
|
||||
oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
|
||||
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
|
||||
pixiv = dontCheck super.pixiv;
|
||||
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
|
||||
|
|
@ -224,6 +225,9 @@ self: super: builtins.intersectAttrs super {
|
|||
# Test suite wants to connect to $DISPLAY.
|
||||
hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
|
||||
|
||||
# Wants to check against a real DB, Needs freetds
|
||||
odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]);
|
||||
|
||||
# Tests attempt to use NPM to install from the network into
|
||||
# /homeless-shelter. Disabled.
|
||||
purescript = dontCheck super.purescript;
|
||||
|
|
|
|||
1377
pkgs/development/haskell-modules/hackage-packages.nix
generated
1377
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -26,14 +26,15 @@ self: super: {
|
|||
|
||||
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
|
||||
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
|
||||
ci-info = self.callPackage ../misc/haskell/hasura/ci-info {};
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git
|
||||
pg-client = self.callPackage ../misc/haskell/hasura/pg-client {};
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/graphql-parser-hs.git
|
||||
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
|
||||
# cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
|
||||
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
|
||||
# hasura graphql-engine is not released to hackage.
|
||||
# https://github.com/hasura/graphql-engine/issues/7391
|
||||
ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {};
|
||||
pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {};
|
||||
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {};
|
||||
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {};
|
||||
hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
|
||||
hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {};
|
||||
hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {};
|
||||
|
||||
# Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
|
||||
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
index eaff0dfba..9902cadd0 100644
|
||||
--- a/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
+++ b/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended
|
||||
, groupOnNE
|
||||
, differenceOn
|
||||
, lpadZip
|
||||
- , mapKeys
|
||||
, unionsWith
|
||||
) where
|
||||
|
||||
@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case
|
||||
That b -> Just (Nothing, b)
|
||||
These a b -> Just (Just a, b)
|
||||
|
||||
--- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@.
|
||||
---
|
||||
--- The size of the result may be smaller if @f@ maps two or more distinct
|
||||
--- keys to the same new key. In this case the value at the greatest of the
|
||||
--- original keys is retained.
|
||||
---
|
||||
--- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")]
|
||||
--- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c"
|
||||
--- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c"
|
||||
---
|
||||
--- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys
|
||||
-mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a
|
||||
-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) []
|
||||
-
|
||||
-- | The union of a list of maps, with a combining operation:
|
||||
-- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@).
|
||||
--
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
index 6cb70cf0..0c3789cd 100644
|
||||
--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
+++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
@@ -45,7 +45,7 @@ import GHC.AssertNF
|
||||
import qualified ListT
|
||||
import qualified Network.WebSockets as WS
|
||||
import qualified StmContainers.Map as STMMap
|
||||
-import qualified System.IO.Error as E
|
||||
+--import qualified System.IO.Error as E
|
||||
|
||||
import qualified Hasura.Logging as L
|
||||
|
||||
@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p
|
||||
let rcv = forever $ do
|
||||
-- Process all messages serially (important!), in a separate thread:
|
||||
msg <- liftIO $
|
||||
- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" :
|
||||
- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112
|
||||
- -- as WS exception signaling cleanup below. It's not clear why exactly this gets
|
||||
- -- raised occasionally; I suspect an equivalent handler is missing from WS itself.
|
||||
- -- Regardless this should be safe:
|
||||
- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $
|
||||
WS.receiveData conn
|
||||
writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing
|
||||
_hOnMessage wsHandlers wsConn msg
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
|
||||
, hpack, lib, template-haskell, text, th-lift-instances
|
||||
, unordered-containers
|
||||
|
|
@ -7,8 +9,8 @@ mkDerivation {
|
|||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/ci-info-hs.git";
|
||||
sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc";
|
||||
rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab";
|
||||
sha256 = "018vfyg0y2sn497nigjrcs6b1v3i9bna06dsbvgr6wjikcl6dhh4";
|
||||
rev = "68247a83738ac4bb9f719f0e4213aeb7be9565cf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
|
|
@ -19,4 +21,5 @@ mkDerivation {
|
|||
prePatch = "hpack";
|
||||
homepage = "https://github.com/hasura/ci-info-hs#readme";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
34
pkgs/development/misc/haskell/hasura/ekg-core.nix
Normal file
34
pkgs/development/misc/haskell/hasura/ekg-core.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, async, atomic-primops, base, containers, criterion
|
||||
, fetchgit, generic-random, ghc-prim, hashable, hspec
|
||||
, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit
|
||||
, primitive, QuickCheck, smallcheck, text, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ekg-core";
|
||||
version = "0.1.1.7";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/ekg-core.git";
|
||||
sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys";
|
||||
rev = "9fc8f94685c149a909b66bad4167455d8ae1002c";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
atomic-primops base containers ghc-prim hashable inspection-testing
|
||||
primitive text unordered-containers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
async atomic-primops base containers generic-random ghc-prim
|
||||
hashable hspec hspec-smallcheck HUnit inspection-testing
|
||||
markdown-unlit primitive QuickCheck smallcheck text
|
||||
unordered-containers
|
||||
];
|
||||
testToolDepends = [ markdown-unlit ];
|
||||
benchmarkHaskellDepends = [ base criterion ];
|
||||
doHaddock = false;
|
||||
homepage = "https://github.com/tibbe/ekg-core";
|
||||
description = "Tracking of system metrics";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
22
pkgs/development/misc/haskell/hasura/ekg-json.nix
Normal file
22
pkgs/development/misc/haskell/hasura/ekg-json.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text
|
||||
, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ekg-json";
|
||||
version = "0.1.0.7";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/ekg-json.git";
|
||||
sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v";
|
||||
rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson base ekg-core text unordered-containers vector
|
||||
];
|
||||
homepage = "https://github.com/tibbe/ekg-json";
|
||||
description = "JSON encoding of ekg metrics";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
81
pkgs/development/misc/haskell/hasura/graphql-engine.nix
Normal file
81
pkgs/development/misc/haskell/hasura/graphql-engine.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
|
||||
, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
|
||||
, base, base16-bytestring, base64-bytestring, binary, byteorder
|
||||
, bytestring, case-insensitive, ci-info, containers, cron
|
||||
, cryptonite, data-has, deepseq, dependent-map, dependent-sum
|
||||
, directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit
|
||||
, file-embed, filepath, ghc-heap-view, graphql-parser, hashable
|
||||
, hashable-time, hspec, hspec-core, hspec-expectations
|
||||
, hspec-expectations-lifted, http-api-data, http-client
|
||||
, http-client-tls, http-conduit, http-types, immortal
|
||||
, insert-ordered-containers, jose, kan-extensions, lens, lens-aeson
|
||||
, lib, lifted-async, lifted-base, list-t, memory, mime-types
|
||||
, mmorph, monad-control, monad-loops, monad-validate, mtl, mustache
|
||||
, mysql, mysql-simple, natural-transformation, network, network-uri
|
||||
, odbc, optparse-applicative, pem, pg-client, postgresql-binary
|
||||
, postgresql-libpq, pretty-simple, process, profunctors, psqueues
|
||||
, QuickCheck, quickcheck-instances, random, regex-tdfa
|
||||
, resource-pool, retry, safe, safe-exceptions, scientific
|
||||
, semialign, semigroups, semver, shakespeare, some, split
|
||||
, Spock-core, stm, stm-containers, tagged, template-haskell, text
|
||||
, text-builder, text-conversions, these, time, transformers
|
||||
, transformers-base, unix, unordered-containers, uri-encode
|
||||
, utf8-string, uuid, validation, vector, vector-instances, wai
|
||||
, warp, websockets, wreq, x509, x509-store, yaml, zlib
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-engine";
|
||||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-engine.git";
|
||||
sha256 = "04s8rczvm0l5dbh14g2vav2wbqb4fg51471fncqf36s59img14b7";
|
||||
rev = "cf6f3edc1f6df7843dfb91be6dcb0fd7cc94d133";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
|
||||
attoparsec attoparsec-iso8601 auto-update base base16-bytestring
|
||||
base64-bytestring binary byteorder bytestring case-insensitive
|
||||
ci-info containers cron cryptonite data-has deepseq dependent-map
|
||||
dependent-sum directory ekg-core ekg-json exceptions fast-logger
|
||||
file-embed filepath ghc-heap-view graphql-parser hashable
|
||||
hashable-time http-api-data http-client http-client-tls
|
||||
http-conduit http-types immortal insert-ordered-containers jose
|
||||
kan-extensions lens lens-aeson lifted-async lifted-base list-t
|
||||
memory mime-types mmorph monad-control monad-loops monad-validate
|
||||
mtl mustache mysql mysql-simple network network-uri odbc
|
||||
optparse-applicative pem pg-client postgresql-binary
|
||||
postgresql-libpq pretty-simple process profunctors psqueues
|
||||
QuickCheck quickcheck-instances random regex-tdfa resource-pool
|
||||
retry safe-exceptions scientific semialign semigroups semver
|
||||
shakespeare some split Spock-core stm stm-containers tagged
|
||||
template-haskell text text-builder text-conversions these time
|
||||
transformers transformers-base unix unordered-containers uri-encode
|
||||
utf8-string uuid validation vector vector-instances wai warp
|
||||
websockets wreq x509 x509-store yaml zlib
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base bytestring ekg-core kan-extensions pg-client text
|
||||
text-conversions time unix
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers cron dependent-map dependent-sum
|
||||
graphql-parser hspec hspec-core hspec-expectations
|
||||
hspec-expectations-lifted http-client http-client-tls http-types
|
||||
insert-ordered-containers jose kan-extensions lens lifted-base
|
||||
mmorph monad-control mtl natural-transformation network-uri
|
||||
optparse-applicative pg-client process QuickCheck safe scientific
|
||||
split template-haskell text time transformers-base
|
||||
unordered-containers vector
|
||||
];
|
||||
doCheck = false;
|
||||
homepage = "https://www.hasura.io";
|
||||
description = "GraphQL API over Postgres";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
|
||||
, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
|
||||
, base, base64-bytestring, byteorder, bytestring, case-insensitive
|
||||
, ci-info, containers, criterion, cryptonite, data-has, deepseq
|
||||
, dependent-map, dependent-sum, directory, ekg-core, ekg-json
|
||||
, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary
|
||||
, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core
|
||||
, hspec-expectations-lifted, http-client, http-client-tls
|
||||
, http-types, immortal, insert-ordered-containers, jose, lens
|
||||
, lifted-async, lifted-base, list-t, mime-types, monad-control
|
||||
, monad-time, monad-validate, mtl, mustache, mwc-probability
|
||||
, mwc-random, natural-transformation, network, network-uri
|
||||
, optparse-applicative, pem, pg-client, postgresql-binary
|
||||
, postgresql-libpq, process, profunctors, psqueues, QuickCheck
|
||||
, regex-tdfa, safe, scientific, semver, shakespeare, split
|
||||
, Spock-core, lib, stm, stm-containers, template-haskell, text
|
||||
, text-builder, text-conversions, th-lift-instances, these, time
|
||||
, transformers, transformers-base, unix, unordered-containers
|
||||
, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
|
||||
, wreq, x509, yaml, zlib, witherable, semialign, validation, cron
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-engine";
|
||||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-engine.git";
|
||||
sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ=";
|
||||
rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
|
||||
attoparsec attoparsec-iso8601 auto-update base base64-bytestring
|
||||
byteorder bytestring case-insensitive ci-info containers cryptonite
|
||||
data-has deepseq dependent-map dependent-sum directory ekg-core
|
||||
ekg-json fast-logger file-embed filepath generic-arbitrary
|
||||
ghc-heap-view graphql-parser hashable http-client http-client-tls
|
||||
http-types immortal insert-ordered-containers jose lens
|
||||
lifted-async lifted-base list-t mime-types monad-control monad-time
|
||||
monad-validate mtl mustache network network-uri
|
||||
optparse-applicative pem pg-client postgresql-binary
|
||||
postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa
|
||||
scientific semver shakespeare split Spock-core stm stm-containers
|
||||
template-haskell text text-builder text-conversions
|
||||
th-lift-instances these time transformers transformers-base unix
|
||||
unordered-containers uri-encode uuid vector wai wai-websockets warp
|
||||
websockets wreq x509 yaml zlib
|
||||
witherable semialign validation
|
||||
cron
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base bytestring pg-client text text-conversions
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring hspec hspec-core hspec-expectations-lifted
|
||||
http-client http-client-tls lifted-base monad-control mtl
|
||||
natural-transformation optparse-applicative pg-client process
|
||||
QuickCheck safe split text time transformers-base
|
||||
unordered-containers
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
async base bytestring criterion deepseq mwc-probability mwc-random
|
||||
split text vector
|
||||
];
|
||||
doCheck = false;
|
||||
homepage = "https://www.hasura.io";
|
||||
description = "GraphQL API over Postgres";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
hydraPlatforms = [];
|
||||
broken = true;
|
||||
}
|
||||
33
pkgs/development/misc/haskell/hasura/graphql-parser.nix
Normal file
33
pkgs/development/misc/haskell/hasura/graphql-parser.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, attoparsec, base, bytestring, containers
|
||||
, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib
|
||||
, prettyprinter, scientific, template-haskell, text, text-builder
|
||||
, th-lift-instances, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-parser";
|
||||
version = "0.2.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-parser-hs.git";
|
||||
sha256 = "015b1h475k8wmhm9hkrvyxr985x7d8yc0xgcdqj7vmziixvfwwwj";
|
||||
rev = "79beb0e85e00422a8a15318c0bc573765fc7b246";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers deepseq filepath
|
||||
hashable hedgehog prettyprinter scientific template-haskell text
|
||||
text-builder th-lift-instances unordered-containers vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base bytestring hedgehog prettyprinter scientific text
|
||||
text-builder
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring criterion prettyprinter text text-builder
|
||||
];
|
||||
homepage = "https://github.com/hasura/graphql-parser-hs";
|
||||
description = "A native Haskell GraphQL parser";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
{ mkDerivation, aeson, attoparsec, base, bytestring, containers
|
||||
, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
|
||||
, protolude, regex-tdfa, scientific, lib, template-haskell, text
|
||||
, text-builder, th-lift-instances, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-parser";
|
||||
version = "0.1.0.1";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-parser-hs.git";
|
||||
sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk=";
|
||||
rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers filepath hedgehog
|
||||
prettyprinter protolude regex-tdfa scientific template-haskell text
|
||||
text-builder th-lift-instances unordered-containers vector
|
||||
];
|
||||
libraryToolDepends = [ hpack ];
|
||||
testHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers filepath hedgehog
|
||||
prettyprinter protolude regex-tdfa scientific template-haskell text
|
||||
text-builder th-lift-instances unordered-containers vector
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers criterion filepath
|
||||
hedgehog prettyprinter protolude regex-tdfa scientific
|
||||
template-haskell text text-builder th-lift-instances
|
||||
unordered-containers vector
|
||||
];
|
||||
doCheck = false;
|
||||
prePatch = "hpack";
|
||||
homepage = "https://github.com/hasura/graphql-parser-hs#readme";
|
||||
license = lib.licenses.bsd3;
|
||||
}
|
||||
36
pkgs/development/misc/haskell/hasura/pg-client.nix
Normal file
36
pkgs/development/misc/haskell/hasura/pg-client.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
|
||||
, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable
|
||||
, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib
|
||||
, mmorph, monad-control, mtl, postgresql, postgresql-binary
|
||||
, postgresql-libpq, resource-pool, retry, scientific
|
||||
, template-haskell, text, text-builder, time, transformers-base
|
||||
, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pg-client";
|
||||
version = "0.1.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/pg-client-hs.git";
|
||||
sha256 = "1y79s3ai4h82szpm1j5n5ygybqr7cza9l0raxf39vgn66jhy1jd2";
|
||||
rev = "92975d0f8f933c8d06913dc97af259253bf7fb5f";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
setupHaskellDepends = [ base Cabal ];
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing attoparsec base bytestring ekg-core hashable
|
||||
hashtables mmorph monad-control mtl postgresql-binary
|
||||
postgresql-libpq resource-pool retry scientific template-haskell
|
||||
text text-builder time transformers-base uuid vector
|
||||
];
|
||||
librarySystemDepends = [ postgresql ];
|
||||
testHaskellDepends = [ base bytestring hspec mtl ];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring criterion file-embed hashable hasql hasql-pool
|
||||
hasql-transaction mtl postgresql-libpq text text-builder
|
||||
];
|
||||
homepage = "https://github.com/hasura/platform";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
|
||||
, criterion, fetchgit, file-embed, hashable, hashtables, hasql
|
||||
, hasql-pool, hasql-transaction, monad-control, mtl
|
||||
, postgresql-binary, postgresql-libpq, resource-pool, retry
|
||||
, scientific, lib, template-haskell, text, text-builder, th-lift
|
||||
, th-lift-instances, time, transformers-base, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pg-client";
|
||||
version = "0.1.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/pg-client-hs.git";
|
||||
sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l";
|
||||
rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing attoparsec base bytestring hashable hashtables
|
||||
monad-control mtl postgresql-binary postgresql-libpq resource-pool
|
||||
retry scientific template-haskell text text-builder th-lift
|
||||
th-lift-instances time transformers-base uuid vector
|
||||
];
|
||||
testHaskellDepends = [ base ];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring criterion file-embed hashable hasql hasql-pool
|
||||
hasql-transaction mtl postgresql-libpq text text-builder
|
||||
];
|
||||
homepage = "https://github.com/hasura/platform";
|
||||
license = lib.licenses.bsd3;
|
||||
}
|
||||
24
pkgs/development/misc/haskell/hasura/pool.nix
Normal file
24
pkgs/development/misc/haskell/hasura/pool.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, base, fetchgit, hashable, hspec, lib, monad-control
|
||||
, stm, time, transformers, transformers-base, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "resource-pool";
|
||||
version = "0.2.3.2";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/pool.git";
|
||||
sha256 = "00q1fxh72fgjwl1pi3lnp4xg8f3kfm6q12gs9scinwbymfgzarms";
|
||||
rev = "bc4c3f739a8fb8ec4444336a34662895831c9acf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
base hashable monad-control stm time transformers transformers-base
|
||||
vector
|
||||
];
|
||||
testHaskellDepends = [ base hspec ];
|
||||
homepage = "http://github.com/bos/pool";
|
||||
description = "A high-performance striped resource pooling implementation";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
85
pkgs/development/misc/haskell/hasura/update.sh
Executable file
85
pkgs/development/misc/haskell/hasura/update.sh
Executable file
|
|
@ -0,0 +1,85 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p cabal2nix curl jq -I nixpkgs=.
|
||||
#
|
||||
# This script will update the hasura derivations to the latest version using
|
||||
# cabal2nix.
|
||||
#
|
||||
# Note that you should always try building hasura graphql-engine after updating it here, since
|
||||
# some of the overrides in pkgs/development/haskell/configuration-nix.nix may
|
||||
# need to be updated/changed.
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
# This is the directory of this update.sh script.
|
||||
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
# graphql-engine derivation created with cabal2nix.
|
||||
engine_derivation_file="${script_dir}/graphql-engine.nix"
|
||||
parser_derivation_file="${script_dir}/graphql-parser.nix"
|
||||
ciinfo_derivation_file="${script_dir}/ci-info.nix"
|
||||
pgclient_derivation_file="${script_dir}/pg-client.nix"
|
||||
pool_derivation_file="${script_dir}/pool.nix"
|
||||
ekgcore_derivation_file="${script_dir}/ekg-core.nix"
|
||||
ekgjson_derivation_file="${script_dir}/ekg-json.nix"
|
||||
|
||||
# TODO: get current revision of graphql-engine in Nixpkgs.
|
||||
# old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")"
|
||||
|
||||
# This is the latest release version of graphql-engine on GitHub.
|
||||
new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output)
|
||||
|
||||
echo "Running cabal2nix and outputting to ${engine_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$engine_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$engine_derivation_file"
|
||||
|
||||
cabal2nix --revision "$new_version" --subpath server --maintainer lassulus --no-check "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${parser_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$parser_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$parser_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${ciinfo_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$ciinfo_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$ciinfo_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${pgclient_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$pgclient_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$pgclient_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${pool_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$pool_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$pool_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/pool.git" >> "$pool_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${ekgcore_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$ekgcore_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$ekgcore_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${ekgjson_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$ekgjson_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file"
|
||||
|
||||
echo "###################"
|
||||
echo "please update pkgs/servers/hasura/cli.nix vendorSha256"
|
||||
echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version"
|
||||
echo "###################"
|
||||
|
||||
echo "Finished."
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages
|
||||
{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages
|
||||
, haskell }:
|
||||
#
|
||||
# The recommended way to override this package is
|
||||
|
|
|
|||
73
pkgs/os-specific/darwin/xattr/default.nix
Normal file
73
pkgs/os-specific/darwin/xattr/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, ed
|
||||
, unifdef
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xattr";
|
||||
version = "61.60.1";
|
||||
|
||||
src = fetchzip rec {
|
||||
url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz";
|
||||
sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/Modules/xattr-0.6.4";
|
||||
format = "other";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ed
|
||||
unifdef
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"OBJROOT=$(PWD)"
|
||||
"DSTROOT=${placeholder "out"}"
|
||||
"OSL=${placeholder "doc"}/share/xattr/OpenSourceLicenses"
|
||||
"OSV=${placeholder "doc"}/share/xattr/OpenSourceVersions"
|
||||
];
|
||||
|
||||
# need to use `out` instead of `bin` since buildPythonPackage ignores the latter
|
||||
outputs = [ "out" "doc" "python" ];
|
||||
|
||||
# We need to patch a reference to gnutar in an included Makefile
|
||||
postUnpack = ''
|
||||
chmod u+w $sourceRoot/..
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ../Makefile.inc --replace gnutar tar
|
||||
substituteInPlace Makefile --replace "/usr" ""
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# prevent setup.py from trying to download setuptools
|
||||
sed -i xattr-*/setup.py -e '/ez_setup/d'
|
||||
|
||||
# create our custom target dirs we patch in
|
||||
mkdir -p "$doc/share/xattr/"OpenSource{Licenses,Versions}
|
||||
mkdir -p "$python/lib/${python.libPrefix}"
|
||||
'';
|
||||
|
||||
# move python package to its own output to reduce clutter
|
||||
postInstall = ''
|
||||
mv "$out/lib/python" "$python/${python.sitePackages}"
|
||||
rmdir "$out/lib"
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Display and manipulate extended attributes";
|
||||
license = [ licenses.psfl licenses.mit ]; # see $doc/share/xattr/OpenSourceLicenses
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
homepage = "https://opensource.apple.com/source/python_modules/";
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "cmd/hasura" ];
|
||||
|
||||
vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU=";
|
||||
vendorSha256 = "1pkc9bh5s2vqnpkmnm91zaihh98b3drhiv4lcpi98rhln8r52b1k";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -11437,7 +11437,7 @@ with pkgs;
|
|||
|
||||
# Please update doc/languages-frameworks/haskell.section.md, “Our
|
||||
# current default compiler is”, if you bump this:
|
||||
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104;
|
||||
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106;
|
||||
|
||||
inherit (haskellPackages) ghc;
|
||||
|
||||
|
|
|
|||
|
|
@ -156,6 +156,8 @@ impure-cmds // appleSourcePackages // chooseLibs // {
|
|||
|
||||
usr-include = callPackage ../os-specific/darwin/usr-include { };
|
||||
|
||||
xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { };
|
||||
|
||||
inherit (pkgs.callPackages ../os-specific/darwin/xcode { })
|
||||
xcode_8_1 xcode_8_2
|
||||
xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ in {
|
|||
buildLlvmPackages = buildPackages.llvmPackages_7;
|
||||
llvmPackages = pkgs.llvmPackages_7;
|
||||
};
|
||||
ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix {
|
||||
ghc8106 = callPackage ../development/compilers/ghc/8.10.6.nix {
|
||||
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
|
||||
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
|
||||
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
|
||||
|
|
@ -76,6 +76,10 @@ in {
|
|||
else
|
||||
packages.ghc865Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
# Need to use apple's patched xattr until
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_9;
|
||||
llvmPackages = pkgs.llvmPackages_9;
|
||||
};
|
||||
|
|
@ -147,9 +151,9 @@ in {
|
|||
ghc = bh.compiler.ghc884;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
|
||||
};
|
||||
ghc8104 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc8104;
|
||||
ghc = bh.compiler.ghc8104;
|
||||
ghc8106 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc8106;
|
||||
ghc = bh.compiler.ghc8106;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
|
||||
};
|
||||
ghc901 = callPackage ../development/haskell-modules {
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ let
|
|||
# list of all compilers to test specific packages on
|
||||
all = with compilerNames; [
|
||||
ghc884
|
||||
ghc8104
|
||||
ghc8106
|
||||
ghc901
|
||||
];
|
||||
|
||||
|
|
@ -278,14 +278,14 @@ let
|
|||
# Test some statically linked packages to catch regressions
|
||||
# and get some cache going for static compilation with GHC.
|
||||
# Use integer-simple to avoid GMP linking problems (LGPL)
|
||||
pkgsStatic.haskell.packages.integer-simple.ghc8104 =
|
||||
pkgsStatic.haskell.packages.integer-simple.ghc8106 =
|
||||
removePlatforms
|
||||
[
|
||||
"aarch64-linux" # times out on Hydra
|
||||
"x86_64-darwin" # TODO: reenable when static libiconv works on darwin
|
||||
]
|
||||
{
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104)
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8106)
|
||||
hello
|
||||
lens
|
||||
random
|
||||
|
|
@ -300,12 +300,12 @@ let
|
|||
# package sets (like Cabal, jailbreak-cabal) are
|
||||
# working as expected.
|
||||
cabal-install = all;
|
||||
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ];
|
||||
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ];
|
||||
cabal2nix-unstable = all;
|
||||
funcmp = all;
|
||||
# Doesn't currently work on ghc-9.0:
|
||||
# https://github.com/haskell/haskell-language-server/issues/297
|
||||
haskell-language-server = with compilerNames; [ ghc884 ghc8104 ];
|
||||
haskell-language-server = with compilerNames; [ ghc884 ghc8106 ];
|
||||
hoogle = all;
|
||||
hsdns = all;
|
||||
jailbreak-cabal = all;
|
||||
|
|
@ -379,7 +379,7 @@ let
|
|||
constituents = accumulateDerivations [
|
||||
jobs.pkgsMusl.haskell.compiler.ghc8102Binary
|
||||
jobs.pkgsMusl.haskell.compiler.ghc884
|
||||
jobs.pkgsMusl.haskell.compiler.ghc8104
|
||||
jobs.pkgsMusl.haskell.compiler.ghc8106
|
||||
jobs.pkgsMusl.haskell.compiler.ghc901
|
||||
];
|
||||
};
|
||||
|
|
@ -394,9 +394,9 @@ let
|
|||
];
|
||||
};
|
||||
constituents = accumulateDerivations [
|
||||
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello
|
||||
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens
|
||||
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random
|
||||
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello
|
||||
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens
|
||||
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue