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

Merge pull request #196169 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2022-10-27 21:37:05 +02:00 committed by GitHub
commit 86e5f363bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1071 additions and 923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/window-managers/taffybar/default.nix
View File

@ -6,7 +6,7 @@ let
] ++ packages self);
in stdenv.mkDerivation {
pname = "taffybar-with-packages";
inherit (taffybarEnv) version;
inherit (taffybar) version;
nativeBuildInputs = [ makeWrapper ];

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"commit": "d9b306138608746f6f686e7f3af6f35e635eacc8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d9b306138608746f6f686e7f3af6f35e635eacc8.tar.gz",
"sha256": "11c7x0b1ivcx8z96yr7rwnsby5bmjrwsjbak2pa4kknsklxd1iba",
"msg": "Update from Hackage at 2022-10-05T14:24:18Z"
"commit": "2c8100e0ec017b1ab20fcf4679176087b10fbd45",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c8100e0ec017b1ab20fcf4679176087b10fbd45.tar.gz",
"sha256": "16jvcyn4cxc2f0p92f71yk1n2p6jmblnhqm8is5ipn0j4xz6l0bl",
"msg": "Update from Hackage at 2022-10-11T19:16:50Z"
}

6
pkgs/development/haskell-modules/cabal2nix-unstable.nix
View File

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2022-10-10";
version = "unstable-2022-10-22";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc.tar.gz";
sha256 = "0ym6lyp4br57442b6a9cg9bczbjqz8nz984rxwiacldqzndk8jbr";
url = "https://github.com/NixOS/cabal2nix/archive/bf7cc8f202e332953f7fbfc1d90490e4c197d287.tar.gz";
sha256 = "0fmpfl2nl215aids9yxdmdik77w7cppk900rnx23m07rmwg4xa4f";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;

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

@ -2431,10 +2431,6 @@ self: super: {
# 2022-02-25: Unmaintained and to strict upper bounds
paths = doJailbreak super.paths;
# Too strict bounds on hspec, fixed on main branch, but unreleased
colourista = assert super.colourista.version == "0.1.0.1";
doJailbreak super.colourista;
# 2022-02-26: https://github.com/emilypi/base64/issues/39
base64 = dontCheck super.base64;
@ -2548,32 +2544,9 @@ self: super: {
# Remove once version 1.* is released
monad-bayes = doJailbreak super.monad-bayes;
crypt-sha512 = overrideCabal (drv: {
librarySystemDepends = [
pkgs.libxcrypt
];
# Test failure after libxcrypt migration, reported upstrem at
# https://github.com/phadej/crypt-sha512/issues/13
doCheck = false;
}) super.crypt-sha512;
nano-cryptr = overrideCabal (drv: {
librarySystemDepends = [
pkgs.libxcrypt
];
}) super.nano-cryptr;
Unixutils = overrideCabal (drv: {
librarySystemDepends = [
pkgs.libxcrypt
];
}) super.Unixutils;
xmonad-utils = overrideCabal (drv: {
librarySystemDepends = [
pkgs.libxcrypt
];
}) super.xmonad-utils;
# Test failure after libxcrypt migration, reported upstrem at
# https://github.com/phadej/crypt-sha512/issues/13
crypt-sha512 = dontCheck super.crypt-sha512;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse

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

@ -387,7 +387,6 @@ broken-packages:
- bind-marshal
- binembed
- bins
- binsm
- bio
- BiobaseBlast
- BiobaseNewick
@ -459,6 +458,7 @@ broken-packages:
- Bravo
- brians-brain
- brick-dropdownmenu
- brick-panes
- bricks-internal
- brillig
- broccoli
@ -860,7 +860,6 @@ broken-packages:
- control-monad-failure-mtl
- Control-Monad-ST2
- contstuff
- copilot-c99
- copilot-sbv
- copr
- coquina
@ -878,6 +877,7 @@ broken-packages:
- couchdb-conduit
- couch-hs
- counter
- country
- courier
- court
- coverage
@ -972,7 +972,6 @@ broken-packages:
- database-study
- data-check
- data-combinator-gen
- data-compat
- data-concurrent-queue
- data-construction
- data-constructors
@ -2283,6 +2282,7 @@ broken-packages:
- hnn
- hnop
- hoauth
- hoauth2-providers
- hoauth2-tutorial
- hobbes
- hobbits
@ -2421,6 +2421,7 @@ broken-packages:
- hslogger-reader
- hslogger-template
- hs-logo
- hslua-list
- hsluv-haskell
- hsmagick
- HSmarty
@ -2508,7 +2509,6 @@ broken-packages:
- http-client-request-modifiers
- http-client-session
- http-client-streams
- http-client-websockets
- http-conduit-browser
- http-conduit-downloader
- http-directory
@ -2560,6 +2560,7 @@ broken-packages:
- hw-playground-linear
- hwsl2
- hx
- hxmppc
- HXQ
- hxt-cache
- hxt-pickle-utils
@ -2630,6 +2631,7 @@ broken-packages:
- imports
- impossible
- imprint
- incipit
- indentation-core
- index-core
- indexed-containers
@ -3418,6 +3420,7 @@ broken-packages:
- mzv
- n2o-protocols
- nagios-plugin-ekg
- named-binary-tag
- named-lock
- named-servant
- named-sop
@ -3588,6 +3591,7 @@ broken-packages:
- Omega
- om-elm
- om-fail
- om-http
- om-http-logging
- omnifmt
- on-a-horse
@ -4145,6 +4149,7 @@ broken-packages:
- quibble-core
- QuickAnnotate
- quickcheck-arbitrary-template
- quickcheck-lockstep
- quickcheck-property-comb
- quickcheck-property-monad
- quickcheck-rematch
@ -4453,7 +4458,6 @@ broken-packages:
- scottish
- scotty-binding-play
- scotty-blaze
- scotty-form
- scotty-format
- scotty-params-parser
- scotty-resource
@ -4702,7 +4706,6 @@ broken-packages:
- smiles
- smoothie
- smsaero
- smt2-parser
- smt-lib
- SmtLib
- smtlib2
@ -4957,6 +4960,7 @@ broken-packages:
- swagger
- swagger-petstore
- swagger-test
- swarm
- swearjure
- swf
- swift-lda
@ -5083,6 +5087,7 @@ broken-packages:
- test-framework-skip
- test-framework-testing-feat
- test-framework-th-prime
- test-lib
- testloop
- testpack
- testpattern
@ -5363,6 +5368,7 @@ broken-packages:
- unicode-prelude
- unicode-symbols
- unicode-tricks
- union
- union-map
- uniprot-kb
- uniqueid
@ -5430,12 +5436,10 @@ broken-packages:
- uuagc-diagrams
- uu-cco
- uuid-aeson
- uuid-bytes
- uvector
- uxadt
- vabal-lib
- vacuum
- vado
- validated-types
- Validation
- validations

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

@ -1,4 +1,4 @@
# Stackage LTS 19.27
# Stackage LTS 19.28
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -79,15 +79,15 @@ default-package-overrides:
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
- ascii ==1.1.3.0
- ascii-case ==1.0.0.10
- ascii-char ==1.0.0.14
- ascii-case ==1.0.0.11
- ascii-char ==1.0.0.15
- asciidiagram ==1.3.3.3
- ascii-group ==1.0.0.12
- ascii-group ==1.0.0.13
- ascii-numbers ==1.0.0.0
- ascii-predicates ==1.0.0.10
- ascii-progress ==0.3.3.0
- ascii-superset ==1.0.1.13
- ascii-th ==1.0.0.10
- ascii-th ==1.0.0.11
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
- asn1-types ==0.3.4
@ -299,8 +299,8 @@ default-package-overrides:
- cast ==0.1.0.2
- caster ==0.0.3.0
- cayley-client ==0.4.17
- cborg ==0.2.7.0
- cborg-json ==0.2.4.0
- cborg ==0.2.8.0
- cborg-json ==0.2.5.0
- cdar-mBound ==0.1.0.4
- c-enum ==0.1.1.3
- cereal ==0.5.8.3
@ -352,7 +352,7 @@ default-package-overrides:
- clumpiness ==0.17.0.2
- ClustalParser ==1.3.0
- cmark ==0.6
- cmark-gfm ==0.2.4
- cmark-gfm ==0.2.5
- cmark-lucid ==0.1.0.0
- cmdargs ==0.10.21
- codec-beam ==0.2.0
@ -373,7 +373,7 @@ default-package-overrides:
- comfort-fftw ==0.0
- comfort-graph ==0.0.3.2
- commonmark ==0.2.2
- commonmark-extensions ==0.2.3.2
- commonmark-extensions ==0.2.3.3
- commonmark-pandoc ==0.2.1.2
- commutative ==0.0.2
- comonad ==5.0.8
@ -395,7 +395,7 @@ default-package-overrides:
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduino ==0.2.2.0
- conduit ==1.3.4.2
- conduit ==1.3.4.3
- conduit-aeson ==0.1.0.1
- conduit-algorithms ==0.0.13.0
- conduit-combinators ==1.3.0
@ -418,7 +418,7 @@ default-package-overrides:
- constraints ==0.13.4
- constraints-extras ==0.3.2.1
- constraint-tuples ==0.1.2
- construct ==0.3.1
- construct ==0.3.1.1
- containers-unicode-symbols ==0.3.1.3
- contravariant ==1.5.5
- contravariant-extras ==0.3.5.3
@ -429,7 +429,7 @@ default-package-overrides:
- convertible ==1.1.1.1
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.6.0
- core-data ==0.3.8.0
- core-program ==0.4.6.4
- core-text ==0.3.8.0
- countable ==1.0
@ -813,14 +813,14 @@ default-package-overrides:
- function-builder ==0.3.0.1
- functor-classes-compat ==2.0.0.2
- functor-combinators ==0.4.1.0
- fused-effects ==1.1.2.0
- fused-effects ==1.1.2.1
- fusion-plugin ==0.2.5
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.1
- fuzzy-dates ==0.1.1.2
- fuzzyset ==0.2.3
- fuzzy-time ==0.2.0.1
- fuzzy-time ==0.2.0.3
- gauge ==0.2.5
- gd ==3000.7.3
- gdp ==0.0.3.0
@ -1149,7 +1149,7 @@ default-package-overrides:
- hspec-leancheck ==0.0.6
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8
- hspec-need-env ==0.1.0.9
- hspec-need-env ==0.1.0.10
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tmp-proc ==0.5.1.2
@ -1257,7 +1257,7 @@ default-package-overrides:
- immortal-queue ==0.1.0.1
- inbox ==0.2.0
- include-file ==0.1.0.4
- incremental-parser ==0.5.0.3
- incremental-parser ==0.5.0.4
- indents ==0.5.0.1
- indexed ==0.1.3
- indexed-containers ==0.1.0.2
@ -1292,7 +1292,7 @@ default-package-overrides:
- invariant ==0.5.6
- invert ==1.0.0.2
- invertible ==0.2.0.7
- invertible-grammar ==0.1.3.2
- invertible-grammar ==0.1.3.3
- io-machine ==0.2.0.0
- io-manager ==0.1.0.3
- io-memoize ==1.1.1.0
@ -1605,7 +1605,7 @@ default-package-overrides:
- murmur3 ==1.0.5
- murmur-hash ==0.1.0.10
- MusicBrainz ==0.4.1
- mutable-containers ==0.3.4
- mutable-containers ==0.3.4.1
- mwc-probability ==2.3.1
- mwc-random ==0.15.0.2
- mwc-random-monad ==0.7.3.1
@ -2115,9 +2115,9 @@ default-package-overrides:
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
- sandwich ==0.1.0.11
- sandwich ==0.1.1.2
- sandwich-quickcheck ==0.1.0.6
- sandwich-slack ==0.1.0.6
- sandwich-slack ==0.1.1.0
- say ==0.1.0.1
- sbp ==4.1.6
- sbv ==8.17
@ -2155,7 +2155,7 @@ default-package-overrides:
- sequence-formats ==1.6.6.1
- sequenceTools ==1.5.2
- serf ==0.1.1.0
- serialise ==0.2.5.0
- serialise ==0.2.6.0
- servant ==0.19
- servant-auth ==0.4.1.0
- servant-auth-client ==0.4.1.0
@ -2202,7 +2202,7 @@ default-package-overrides:
- setlocale ==1.0.0.10
- set-monad ==0.3.0.0
- sets ==0.0.6.2
- sexp-grammar ==2.3.3.1
- sexp-grammar ==2.3.4.0
- sexpr-parser ==0.2.2.0
- SHA ==1.6.4.4
- shake ==0.19.7
@ -2252,7 +2252,7 @@ default-package-overrides:
- skylighting-core ==0.12.3.1
- slack-progressbar ==0.1.0.1
- slave-thread ==1.1.0.1
- slist ==0.2.0.0
- slist ==0.2.0.1
- slynx ==0.6.1.1
- smallcheck ==1.2.1
- smash ==0.1.3
@ -2277,7 +2277,7 @@ default-package-overrides:
- sourcemap ==0.1.7
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- spacecookie ==1.0.0.1
- spacecookie ==1.0.0.2
- sparse-linear-algebra ==0.3.1
- spatial-math ==0.5.0.1
- special-values ==0.1.0.0
@ -2350,7 +2350,7 @@ default-package-overrides:
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.7
- strict-tuple ==0.1.5.1
- strict-tuple ==0.1.5.2
- strict-tuple-lens ==0.2
- strict-wrapper ==0.0.0.0
- stringbuilder ==0.5.1
@ -2595,7 +2595,7 @@ default-package-overrides:
- type-spec ==0.4.0.0
- typography-geometry ==1.0.1.0
- tz ==0.1.3.6
- tzdata ==0.2.20220815.0
- tzdata ==0.2.20220923.0
- ua-parser ==0.7.7.0
- uglymemo ==0.1.0.1
- unagi-chan ==0.4.1.4
@ -2608,8 +2608,8 @@ default-package-overrides:
- unexceptionalio ==0.5.1
- unexceptionalio-trans ==0.5.1
- unicode ==0.0.1.1
- unicode-collation ==0.1.3.2
- unicode-data ==0.3.0
- unicode-collation ==0.1.3.3
- unicode-data ==0.3.1
- unicode-show ==0.1.1.1
- unicode-transforms ==0.4.0.1
- unidecode ==0.1.0.4
@ -2764,7 +2764,7 @@ default-package-overrides:
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- wire-streams ==0.1.1.0
- witch ==1.0.0.4
- witch ==1.0.2.0
with-compiler: ghc-9.0.2
- withdependencies ==0.3.0
- witherable ==0.4.2
@ -2841,7 +2841,7 @@ with-compiler: ghc-9.0.2
- yesod-bin ==1.6.2.2
- yesod-core ==1.6.24.0
- yesod-eventsource ==1.6.0.1
- yesod-form ==1.7.2
- yesod-form ==1.7.3
- yesod-form-bootstrap4 ==3.0.1
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.2
@ -2870,7 +2870,7 @@ with-compiler: ghc-9.0.2
- zim-parser ==0.2.1.0
- zio ==0.1.0.2
- zip ==1.7.2
- zip-archive ==0.4.2.1
- zip-archive ==0.4.2.2
- zipper-extra ==0.1.3.2
- zippers ==0.3.2
- zip-stream ==0.2.1.0

8
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -739,6 +739,8 @@ dont-distribute-packages:
- battleships
- bayes-stack
- bbi
- bcp47
- bcp47-orphans
- bdcs
- bdcs-api
- beam-automigrate
@ -1100,6 +1102,7 @@ dont-distribute-packages:
- cursedcsv
- cv-combinators
- cypher
- dahdit
- dapi
- darcs-benchmark
- darcs-beta
@ -2103,6 +2106,7 @@ dont-distribute-packages:
- hmt-diagrams
- hnormalise
- ho-rewriting
- hoauth2-providers-tutorial
- hob
- hogre
- hogre-examples
@ -2780,6 +2784,7 @@ dont-distribute-packages:
- mysql-haskell-nem
- mysql-haskell-openssl
- mysql-simple-typed
- mywork
- n2o-web
- nakadi-client
- named-servant-client
@ -2865,6 +2870,8 @@ dont-distribute-packages:
- ohloh-hs
- ois-input-manager
- olwrapper
- om-kubernetes
- om-legion
- online
- online-csv
- opc-xml-da-client
@ -3903,6 +3910,7 @@ dont-distribute-packages:
- vector-text
- venzone
- verdict-json
- verifiable-expressions
- vessel
- vflow-types
- vfr-waypoints

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

File diff suppressed because it is too large Load Diff

9
pkgs/development/tools/haskell/ihaskell/wrapper.nix
View File

@ -3,7 +3,9 @@ let
ihaskellEnv = ghcWithPackages (self: [
self.ihaskell
self.ihaskell-blaze
self.ihaskell-diagrams
# Doesn't work with latest ihaskell versions missing an unrelated change
# https://github.com/IHaskell/IHaskell/issues/1378
# self.ihaskell-diagrams
] ++ packages self);
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}
@ -24,9 +26,4 @@ buildEnv {
fi
done
'';
meta = {
# ihaskell has an indirect dependency on the Python package mistune, which
# is marked insecure.
hydraPlatforms = lib.platforms.none;
};
}