me
/
guix
Archived
1
0
Fork 0

gnu: Upgrade to Stackage 20.26.

* guix/import/stackage.scm (%default-lts-version): Upgrade to Stackage
20.26.
* gnu/packages/patches/ghc-aeson-encodeDouble.patch: New file.
* gnu/packages/patches/ghc-clock-realfrag.patch: New file.
* gnu/local.mk: Register them.
* gnu/packages/haskell-check.scm (ghc-tasty-hedgehog): Update.
(ghc-tasty-hspec): Update.
(ghc-tasty-expected-failure): Update.
(ghc-quickcheck-instances): Update.
(ghc-quickcheck-io): Update.
(ghc-hspec-contrib): Update.
* gnu/packages/haskell-crypto.scm (ghc-curve25519): Update.
(ghc-tls): Update.
* gnu/packages/haskell-web.scm (ghc-tagsoup): Update.
(ghc-http2): Update.
(ghc-wai-websockets): Update.
(ghc-aeson): Update.
(ghc-clientsession): Update.
(ghc-yesod-core): Update.
(ghc-yesod-persistent): Update.
(ghc-wai-cors): Update.
* gnu/packages/haskell-xyz.scm (ghc-abstract-par): Update.
(ghc-adjunctions): Update.
(ghc-aeson-diff): Update.
(ghc-base16-bytestring): Update.
(ghc-base-compat): Update.
(ghc-base-compat-batteries): Update.
(ghc-basement): Update.
(ghc-bencode): Update.
(ghc-bytestring-handle): Update.
(ghc-c2hs): Update.
(ghc-cassava-megaparsec): Update.
(ghc-cborg): Update.
(ghc-charset): Update.
(ghc-chasingbottoms): Update.
(ghc-clock): Update.
(ghc-cmark-gfm): Update.
(ghc-concurrent-extra): Update.
(ghc-concurrent-output): Update.
(ghc-conduit-extra): Update.
(ghc-constraints): Update.
(ghc-convertible): Update.
(ghc-csv): Update.
(ghc-data-accessor): Update.
(ghc-data-ordlist): Update.
(ghc-dense-linear-algebra): Update.
(ghc-diagrams-core): Update.
(ghc-diff): Update.
(ghc-dual-tree): Update.
(ghc-either): Update.
(ghc-errors): Update.
(ghc-esqueleto): Update.
(ghc-exactprint): Update.
(ghc-extensible-exceptions): Update.
(ghc-fail): Update.
(ghc-filepath-bytestring): Update.
(ghc-fingertree): Update.
(ghc-fmlist): Update.
(ghc-foldl): Update.
(ghc-free): Update.
(ghc-fsnotify): Update.
(ghc-generic-random): Update.
(ghc-genvalidity-property): Update.
(ghc-groups): Update.
(ghc-hackage-security): Update.
(ghc-half): Update.
(ghc-hashtables): Update.
(ghc-haskell-src): Update.
(ghc-haskell-src-exts-util): Update.
(ghc-hourglass): Update.
(ghc-hpack): Update.
(ghc-hslua): Update.
(ghc-hslua-module-system): Update.
(ghc-http-api-data): Update.
(ghc-ini): Update.
(ghc-inline-c): Update.
(ghc-inline-c-cpp): Update.
(ghc-interpolate): Update.
(ghc-intervals): Update.
(ghc-invariant): Update.
(ghc-io-streams): Update.
(ghc-ipynb): Update.
(ghc-kan-extensions): Update.
(ghc-lens): Update.
(ghc-libmpd): Update.
(ghc-libyaml): Update.
(ghc-lifted-async): Update.
(ghc-linear): Update.
(ghc-listlike): Update.
(ghc-logict): Update.
(ghc-lucid): Update.
(ghc-lzma-conduit): Update.
(ghc-magic): Update.
(ghc-microlens-ghc): Update.
(ghc-microlens-mtl): Update.
(ghc-microlens-platform): Update.
(ghc-missingh): Update.
(ghc-mmorph): Update.
(ghc-monad-control): Update.
(ghc-monad-logger): Update.
(ghc-monoid-extras): Update.
(ghc-murmur-hash): Update.
(ghc-ncurses): Update.
(ghc-network-info): Update.
(ghc-newtype-generics): Update.
(ghc-openglraw): Update.
(ghc-text-conversions): Update.
(ghc-text-icu): Update.
(ghc-text-short): Update.
(ghc-text-zipper): Update.
(ghc-parsers): Update.
(ghc-path): Update.
(ghc-peano): Update.
(ghc-persistent): Update.
(ghc-persistent-sqlite): Update.
(ghc-process-extras): Update.
(ghc-indexed-profunctors): Update.
(ghc-project-template): Update.
(ghc-psqueues): Update.
(ghc-random): Update.
(ghc-reducers): Update.
(ghc-refact): Update.
(ghc-regex-posix): Update.
(ghc-resourcet): Update.
(ghc-sdl): Update.
(ghc-sdl2-image): Update.
(ghc-sdl2-mixer): Update.
(ghc-sdl2-ttf): Update.
(ghc-sdl2-gfx): Update.
(ghc-semigroupoids): Update.
(ghc-semigroups): Update.
(ghc-shakespeare): Update.
(ghc-shelly): Update.
(ghc-simple-reflect): Update.
(ghc-size-based): Update.
(ghc-skylighting-format-latex): Update.
(ghc-skylighting-format-ansi): Update.
(ghc-skylighting): Update.
(ghc-sop-core): Update.
(ghc-split): Update.
(ghc-splitmix): Update.
(ghc-statevar): Update.
(ghc-statistics): Update.
(ghc-stm-conduit): Update.
(ghc-storable-complex): Update.
(ghc-storablevector): Update.
(ghc-svg-builder): Update.
(ghc-temporary-rc): Update.
(ghc-terminal-size): Update.
(ghc-text-manipulate): Update.
(ghc-th-abstraction): Update.
(ghc-th-expand-syns): Update.
(ghc-th-lift-instances): Update.
(ghc-th-orphans): Update.
(ghc-timezone-series): Update.
(ghc-timezone-olson): Update.
(ghc-tldr): Update.
(ghc-transformers-compat): Update.
(ghc-exception-transformers): Update.
(ghc-trifecta): Update.
(ghc-turtle): Update.
(ghc-unagi-chan): Update.
(ghc-unexceptionalio): Update.
(ghc-unicode-transforms): Update.
(ghc-unix-compat): Update.
(ghc-unix-time): Update.
(ghc-unliftio): Update.
(ghc-commutative-semigroups): Update.
(ghc-utf8-string): Update.
(ghc-void): Update.
(ghc-wl-pprint-text): Update.
(ghc-x11-xft): Update.
(ghc-xml): Update.
(ghc-xml-hamlet): Update.
(ghc-yaml): Update.
(ghc-zip-archive): Update.
(ghc-zlib): Update.
(ghc-zstd): Update.
(ghc-keys): Update.
(ghc-pointed): Update.
(ghc-lift-type): Update.
(ghc-unicode-collation): Update.
(ghc-citeproc): Update.
(ghc-commonmark): Update.
(ghc-commonmark-extensions): Update.
(ghc-genvalidity-hspec): Update.
(ghc-netlink): Update.
(ghc-doctest-driver-gen): Update.
(ghc-mysql): Update.
(ghc-persistent-qq): Update.
(ghc-persistent-mysql): Update.
(ghc-string-conversions): Update.
(ghc-postgresql-simple): Update.
(ghc-persistent-postgresql): Update.
(ghc-filtrable): Update.
(ghc-hsyaml-aeson): Update.
(ghc-singleton-bool): Update.
(ghc-git-lfs): Update.
(ghc-nothunks): Update.
(ghc-onetuple): Update.
(ghc-doctest-parallel): Update.
(ghc-ordered-containers): Update.
(ghc-hslua-marshalling): Update.
(ghc-gridtables): Update.
(ghc-should-not-typecheck): Update.
(ghc-servant-server): Update.
(ghc-recv): Update.
(ghc-glib): Update.
(ghc-pango): Update.
(ghc-monoidal-containers): Update.
(ghc-newtype): Update.
(ghc-random-shuffle): Update.
(ghc-ref-tf): Update.
* gnu/packages/irc.scm (glirc): Update.
* gnu/packages/purescript.scm (purescript): Update.
* gnu/packages/wm.scm (icewm): Update.
(ghc-xmobar): Update.

Change-Id: I26ef7c2ef06e3075eba3da21947f16708c437f98
master
Lars-Dominik Braun 2024-06-08 08:30:21 +02:00
parent 55b5c7c9b1
commit 0bce74d458
No known key found for this signature in database
GPG Key ID: F663943E08D8092A
11 changed files with 1203 additions and 1183 deletions

View File

@ -1335,8 +1335,10 @@ dist_patch_DATA = \
%D%/packages/patches/ghc-9.2-grep-warnings.patch \ %D%/packages/patches/ghc-9.2-grep-warnings.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
%D%/packages/patches/ghc-testsuite-grep-compat.patch \ %D%/packages/patches/ghc-testsuite-grep-compat.patch \
%D%/packages/patches/ghc-aeson-encodeDouble.patch \
%D%/packages/patches/ghc-basement-fix-32bit.patch \ %D%/packages/patches/ghc-basement-fix-32bit.patch \
%D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \
%D%/packages/patches/ghc-clock-realfrag.patch \
%D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghc-memory-fix-32bit.patch \ %D%/packages/patches/ghc-memory-fix-32bit.patch \
%D%/packages/patches/ghc-persistent-fix-32bit.patch \ %D%/packages/patches/ghc-persistent-fix-32bit.patch \

View File

@ -190,13 +190,13 @@ framework}.")
(define-public ghc-tasty-hspec (define-public ghc-tasty-hspec
(package (package
(name "ghc-tasty-hspec") (name "ghc-tasty-hspec")
(version "1.2.0.1") (version "1.2.0.2")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "tasty-hspec" version)) (uri (hackage-uri "tasty-hspec" version))
(sha256 (sha256
(base32 (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"))))
"0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "tasty-hspec"))) (properties '((upstream-name . "tasty-hspec")))
(inputs (list ghc-hspec (inputs (list ghc-hspec
@ -206,9 +206,6 @@ framework}.")
ghc-tasty-smallcheck ghc-tasty-smallcheck
ghc-tasty-quickcheck ghc-tasty-quickcheck
ghc-tagged)) ghc-tagged))
(arguments
`(#:cabal-revision ("1"
"0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll")))
(home-page "https://github.com/mitchellwrosen/tasty-hspec") (home-page "https://github.com/mitchellwrosen/tasty-hspec")
(synopsis "Hspec support for the Tasty test framework") (synopsis "Hspec support for the Tasty test framework")
(description (description
@ -365,13 +362,13 @@ development.")
(define-public ghc-quickcheck-instances (define-public ghc-quickcheck-instances
(package (package
(name "ghc-quickcheck-instances") (name "ghc-quickcheck-instances")
(version "0.3.28") (version "0.3.29.1")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "quickcheck-instances" version)) (uri (hackage-uri "quickcheck-instances" version))
(sha256 (sha256
(base32 (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"))))
"1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "quickcheck-instances"))) (properties '((upstream-name . "quickcheck-instances")))
(inputs (list ghc-quickcheck (inputs (list ghc-quickcheck
@ -392,7 +389,11 @@ development.")
ghc-unordered-containers ghc-unordered-containers
ghc-uuid-types ghc-uuid-types
ghc-vector ghc-vector
ghc-data-array-byte
ghc-text-short)) ghc-text-short))
(arguments
`(#:cabal-revision ("2"
"118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip")))
(home-page "https://github.com/haskellari/qc-instances") (home-page "https://github.com/haskellari/qc-instances")
(synopsis "Common quickcheck instances") (synopsis "Common quickcheck instances")
(description "This package provides QuickCheck instances for types (description "This package provides QuickCheck instances for types
@ -445,14 +446,13 @@ use HUnit assertions as QuickCheck properties.")
(define-public ghc-quickcheck (define-public ghc-quickcheck
(package (package
(name "ghc-quickcheck") (name "ghc-quickcheck")
(version "2.14.2") (version "2.14.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "QuickCheck" version)) (uri (hackage-uri "QuickCheck" version))
(sha256 (sha256
(base32 (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"))))
"1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "QuickCheck"))) (properties '((upstream-name . "QuickCheck")))
(inputs (inputs
@ -755,18 +755,18 @@ Haskell, inspired by the Ruby library RSpec.")
(package (package
(name "ghc-hspec-contrib") (name "ghc-hspec-contrib")
(version "0.5.1.1") (version "0.5.1.1")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "hspec-contrib" version)) (uri (hackage-uri "hspec-contrib" version))
(sha256 (sha256
(base32 (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
"1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "hspec-contrib"))) (properties '((upstream-name . "hspec-contrib")))
(inputs (list ghc-hunit ghc-hspec-core)) (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core))
(native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover))
(arguments (list #:tests? #f)) ; Tests fail to compile. (arguments (list #:tests? #f)) ; Fail to build.
(home-page "http://hspec.github.io/") (home-page "https://hspec.github.io/")
(synopsis "Contributed functionality for Hspec") (synopsis "Contributed functionality for Hspec")
(description "This package provides contributed Hspec extensions.") (description "This package provides contributed Hspec extensions.")
(license license:expat))) (license license:expat)))

View File

@ -324,17 +324,19 @@ elsewhere.")
(define-public ghc-digest (define-public ghc-digest
(package (package
(name "ghc-digest") (name "ghc-digest")
(version "0.0.1.4") (version "0.0.1.7")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "digest" version)) (uri (hackage-uri "digest" version))
(sha256 (sha256
(base32 (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"))))
"05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "digest"))) (properties '((upstream-name . "digest")))
(arguments (arguments
`(#:extra-directories ("zlib"))) `(#:extra-directories ("zlib")
#:cabal-revision ("1"
"0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl")))
(inputs (list zlib)) (inputs (list zlib))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(home-page "http://hackage.haskell.org/package/digest") (home-page "http://hackage.haskell.org/package/digest")
@ -722,13 +724,13 @@ extensions.")
(define-public ghc-hsopenssl (define-public ghc-hsopenssl
(package (package
(name "ghc-hsopenssl") (name "ghc-hsopenssl")
(version "0.11.7.4") (version "0.11.7.5")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "HsOpenSSL" version)) (uri (hackage-uri "HsOpenSSL" version))
(sha256 (sha256
(base32 (base32 "0y0l5nb0jsc8lm12w66a2n7nwcrgjxy1q2xdy8a788695az5xy71"))))
"0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "HsOpenSSL"))) (properties '((upstream-name . "HsOpenSSL")))
(inputs (list ghc-network openssl)) (inputs (list ghc-network openssl))

View File

@ -72,29 +72,22 @@ for screen-scraping.")
(define-public ghc-cookie (define-public ghc-cookie
(package (package
(name "ghc-cookie") (name "ghc-cookie")
(version "0.4.5") (version "0.4.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "cookie" version)) (uri (hackage-uri "cookie" version))
(sha256 (sha256
(base32 (base32 "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc"))))
"10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "cookie"))) (properties '((upstream-name . "cookie")))
(inputs (inputs (list ghc-data-default-class))
(list ghc-old-locale (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit
ghc-blaze-builder
ghc-data-default-class
ghc-hunit
ghc-quickcheck
ghc-tasty
ghc-tasty-hunit
ghc-tasty-quickcheck)) ghc-tasty-quickcheck))
(home-page "https://github.com/snoyberg/cookie") (home-page "https://github.com/snoyberg/cookie")
(synopsis "HTTP cookie parsing and rendering") (synopsis "HTTP cookie parsing and rendering")
(description "HTTP cookie parsing and rendering library for Haskell.") (description "HTTP cookie parsing and rendering library for Haskell.")
(license license:bsd-3))) (license license:expat)))
(define-public ghc-curl (define-public ghc-curl
(package (package
@ -364,57 +357,53 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.")
(define-public ghc-http-conduit (define-public ghc-http-conduit
(package (package
(name "ghc-http-conduit") (name "ghc-http-conduit")
(version "2.3.8") (version "2.3.8.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "http-conduit" version)) (uri (hackage-uri "http-conduit" version))
(sha256 (sha256
(base32 (base32 "11zf4hyw8f1gpj0w1cmgc9g62xwy2v4hhzqazdsla4q49iqbzxgd"))))
"1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "http-conduit"))) (properties '((upstream-name . "http-conduit")))
;; FIXME: `httpLbs TLS` in test-suite `test` fails with (inputs (list ghc-attoparsec
;; ConnectionFailure getProtocolByName: does not exist (no such protocol
;; name: tcp)
(arguments `(#:tests? #f))
(inputs
(list ghc-aeson
ghc-resourcet ghc-resourcet
ghc-conduit ghc-conduit
ghc-conduit-extra ghc-conduit-extra
ghc-http-types ghc-http-types
ghc-lifted-base
ghc-http-client ghc-http-client
ghc-http-client-tls ghc-http-client-tls
ghc-monad-control ghc-unliftio-core
ghc-exceptions ghc-aeson))
ghc-unliftio)) (native-inputs (list ghc-hunit
(native-inputs
(list ghc-hunit
ghc-hspec ghc-hspec
ghc-data-default-class ghc-data-default-class
ghc-connection
ghc-warp-tls ghc-warp-tls
ghc-tls
ghc-blaze-builder ghc-blaze-builder
ghc-conduit
ghc-utf8-string ghc-utf8-string
ghc-case-insensitive ghc-case-insensitive
ghc-lifted-base ghc-unliftio
ghc-network
ghc-wai ghc-wai
ghc-warp ghc-warp
ghc-wai-conduit ghc-wai-conduit
ghc-http-types
ghc-cookie ghc-cookie
ghc-conduit-extra
ghc-streaming-commons ghc-streaming-commons
ghc-aeson
ghc-temporary ghc-temporary
ghc-resourcet)) ghc-network))
(home-page "https://hackage.haskell.org/package/http-conduit") (arguments
`(#:cabal-revision ("1"
"1wvr0v948s5fmlf47r4pqjan355x6v65rm7dz7y65ngj10xwk5f9")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'update-constraints
(lambda _
(substitute* "http-conduit.cabal"
((", network") ", network\n , connection\n")))))))
(home-page "https://github.com/snoyberg/http-client")
(synopsis "HTTP/HTTPS client with conduit interface") (synopsis "HTTP/HTTPS client with conduit interface")
(description "This library uses attoparsec for parsing the actual (description
"This library uses attoparsec for parsing the actual
contents of the HTTP connection. It also provides higher-level functions contents of the HTTP connection. It also provides higher-level functions
which allow you to avoid direct usage of conduits.") which allow you to avoid direct usage of conduits.")
(license license:bsd-3))) (license license:bsd-3)))
@ -781,18 +770,21 @@ See also:
(define-public ghc-xss-sanitize (define-public ghc-xss-sanitize
(package (package
(name "ghc-xss-sanitize") (name "ghc-xss-sanitize")
(version "0.3.7.1") (version "0.3.7.2")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "xss-sanitize" version)) (uri (hackage-uri "xss-sanitize" version))
(sha256 (sha256
(base32 (base32 "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv"))))
"1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "xss-sanitize"))) (properties '((upstream-name . "xss-sanitize")))
(inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup (inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup
ghc-utf8-string)) ghc-utf8-string))
(native-inputs (list ghc-hunit ghc-hspec)) (native-inputs (list ghc-hunit ghc-hspec))
(arguments
`(#:cabal-revision ("1"
"1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0")))
(home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme") (home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme")
(synopsis "Sanitize untrusted HTML to prevent XSS attacks") (synopsis "Sanitize untrusted HTML to prevent XSS attacks")
(description (description
@ -930,7 +922,8 @@ entity decoding bugfixes applied.")
(uri (hackage-uri "aeson" version)) (uri (hackage-uri "aeson" version))
(sha256 (sha256
(base32 (base32
"09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr")))) "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"))
(patches (search-patches "ghc-aeson-encodeDouble.patch"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "aeson"))) (properties '((upstream-name . "aeson")))
(inputs (list ghc-base-compat-batteries (inputs (list ghc-base-compat-batteries
@ -1196,13 +1189,13 @@ avoid any issues with characters.")
(define-public ghc-yesod-core (define-public ghc-yesod-core
(package (package
(name "ghc-yesod-core") (name "ghc-yesod-core")
(version "1.6.24.0") (version "1.6.24.2")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "yesod-core" version)) (uri (hackage-uri "yesod-core" version))
(sha256 (sha256
(base32 (base32 "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j"))))
"19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "yesod-core"))) (properties '((upstream-name . "yesod-core")))
(inputs (list ghc-aeson (inputs (list ghc-aeson
@ -1241,9 +1234,6 @@ avoid any issues with characters.")
ghc-hspec-expectations ghc-hspec-expectations
ghc-network ghc-network
ghc-streaming-commons)) ghc-streaming-commons))
(arguments
`(#:cabal-revision ("1"
"1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl")))
(home-page "http://www.yesodweb.com/") (home-page "http://www.yesodweb.com/")
(synopsis "Core package for the Yesod web framework") (synopsis "Core package for the Yesod web framework")
(description (description
@ -1282,13 +1272,13 @@ from Yesod.")
(define-public ghc-yesod-form (define-public ghc-yesod-form
(package (package
(name "ghc-yesod-form") (name "ghc-yesod-form")
(version "1.7.3") (version "1.7.4")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "yesod-form" version)) (uri (hackage-uri "yesod-form" version))
(sha256 (sha256
(base32 (base32 "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98"))))
"10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "yesod-form"))) (properties '((upstream-name . "yesod-form")))
(inputs (list ghc-aeson (inputs (list ghc-aeson
@ -2156,13 +2146,13 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.")
(define-public ghc-network-run (define-public ghc-network-run
(package (package
(name "ghc-network-run") (name "ghc-network-run")
(version "0.2.4") (version "0.2.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "network-run" version)) (uri (hackage-uri "network-run" version))
(sha256 (sha256
(base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl")))) (base32 "08662w7ja9w4a4fwikaawxnxcszkd0mdmaajmshas2dd25xyikwi"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "network-run"))) (properties '((upstream-name . "network-run")))
(inputs (list ghc-network)) (inputs (list ghc-network))

File diff suppressed because it is too large Load Diff

View File

@ -121,6 +121,10 @@
(list (list
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'update-constraints
(lambda _
(substitute* "glirc.cabal"
(("vty\\s+>=5.35\\s+&&\\s+<5.36") "vty"))))
(add-after 'install 'install-extra-documentation (add-after 'install 'install-extra-documentation
(lambda _ (lambda _
(install-file "glirc.1" (install-file "glirc.1"

View File

@ -0,0 +1,25 @@
From 58766a1916b4980792763bab74f0c86e2a7ebf20 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Thu, 1 Jun 2023 22:58:28 +0300
Subject: [PATCH] QC-2.14.3 Double generators generates infinite number too
---
tests/PropUtils.hs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/PropUtils.hs b/tests/PropUtils.hs
index 3c449029a..43de85d7f 100644
--- a/tests/PropUtils.hs
+++ b/tests/PropUtils.hs
@@ -51,8 +51,9 @@ import qualified Data.Aeson.Decoding as Dec
encodeDouble :: Double -> Double -> Property
encodeDouble num denom
- | isInfinite d || isNaN d = encode d === "null"
- | otherwise = (read . L.unpack . encode) d === d
+ | isNaN d = encode d === "null"
+ | isInfinite d = if d > 0 then encode d === "\"+inf\"" else encode d === "\"-inf\""
+ | otherwise = (read . L.unpack . encode) d === d
where d = num / denom
encodeInteger :: Integer -> Property

View File

@ -0,0 +1,22 @@
From 8372e801ef062223756db69818a7b60cfd9bb066 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Tue, 8 Aug 2023 23:36:45 +0200
Subject: [PATCH] Fix `RealFrac Seconds` instance
---
System/Clock/Seconds.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/System/Clock/Seconds.hs b/System/Clock/Seconds.hs
index a9a1c78..f7457cb 100644
--- a/System/Clock/Seconds.hs
+++ b/System/Clock/Seconds.hs
@@ -50,7 +50,7 @@ instance Fractional Seconds where
instance RealFrac Seconds where
properFraction (Seconds (TimeSpec s ns))
- | s >= 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns)
+ | s >= 0 || ns == 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns)
| otherwise = (fromIntegral (s+1), Seconds $ TimeSpec (-1) ns)
-- | The 'getTime' function shall return the current value for the

View File

@ -109,7 +109,8 @@
(lambda _ (lambda _
(substitute* "purescript.cabal" (substitute* "purescript.cabal"
(("\\b(language-javascript|process)\\s+[^,]+" all dep) (("\\b(language-javascript|process)\\s+[^,]+" all dep)
dep)))) dep)
(("happy:happy ==1.20.0") "happy:happy"))))
(add-after 'register 'remove-libraries (add-after 'register 'remove-libraries
(lambda _ (lambda _
(delete-file-recursively (delete-file-recursively

View File

@ -860,37 +860,17 @@ manager and a system tray.")
(define-public xmonad (define-public xmonad
(package (package
(name "xmonad") (name "xmonad")
(version "0.17.1") (version "0.17.2")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (hackage-uri "xmonad" version)) (uri (hackage-uri "xmonad" version))
(sha256 (sha256
(base32 (base32 "19qz9a23377nzc0qq8nca45s745mfncd4i2vwba14gi7ipipfcil"))))
"1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8"))
(patches (search-patches "xmonad-dynamic-linking.patch"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "xmonad"))) (properties '((upstream-name . "xmonad")))
(inputs (list ghc-x11 ghc-data-default-class ghc-setlocale)) (inputs (list ghc-x11 ghc-data-default-class ghc-setlocale))
(native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-xsession
(lambda _
(let ((xsessions (string-append #$output "/share/xsessions")))
(mkdir-p xsessions)
(call-with-output-file (string-append xsessions
"/xmonad.desktop")
(lambda (port)
(format port "~
[Desktop Entry]~@
Name=~a~@
Comment=xmonad window manager~@
Exec=~a/bin/xmonad~@
Type=Application~%" #$name #$output)))))))
#:cabal-revision '("2"
"1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3")))
(home-page "http://xmonad.org") (home-page "http://xmonad.org")
(synopsis "Tiling window manager") (synopsis "Tiling window manager")
(description (description
@ -950,7 +930,11 @@ tiled on several screens.")
(add-before 'build 'patch-test-shebang (add-before 'build 'patch-test-shebang
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs" (substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs"
(("/bin/bash") (which "bash")))))))) (("/bin/bash") (which "bash")))))
(add-before 'build 'patch-cairo-path
(lambda _
(substitute* "src/Xmobar/X11/CairoSurface.hsc"
(("cairo/cairo-xlib.h") "cairo-xlib.h")))))))
(home-page "https://xmobar.org") (home-page "https://xmobar.org")
(synopsis "Haskell library for minimalistic text based status bars") (synopsis "Haskell library for minimalistic text based status bars")
(description (description

View File

@ -50,7 +50,7 @@
(make-parameter "https://www.stackage.org")) (make-parameter "https://www.stackage.org"))
;; Latest LTS version compatible with current GHC. ;; Latest LTS version compatible with current GHC.
(define %default-lts-version "20.5") (define %default-lts-version "20.26")
(define-json-mapping <stackage-lts> make-stackage-lts (define-json-mapping <stackage-lts> make-stackage-lts
stackage-lts? stackage-lts?