diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | stack.patch | 250 |
3 files changed, 266 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = cardano-sl pkgdesc = Cryptographic currency implementing Ouroboros PoS protocol - pkgver = 3.0.1 + pkgver = 3.1.0 pkgrel = 1 url = https://github.com/input-output-hk/cardano-sl/ arch = x86_64 @@ -10,8 +10,10 @@ pkgbase = cardano-sl depends = gmp depends = openssl depends = rocksdb - source = git+https://github.com/input-output-hk/cardano-sl.git#commit=57a0d236eed59c48214ee70128549d6cfdbc73db + source = git+https://github.com/input-output-hk/cardano-sl.git#commit=1a792d7cd0f0c93a0f0c28f66372bce3c3808dbd + source = stack.patch sha256sums = SKIP + sha256sums = 5a3930f42dc369cfcd993537bde79cf69e80e48a5aeaf599fd38371af614f2fa pkgname = cardano-sl @@ -1,8 +1,8 @@ # Maintainer: Nicola Squartini <tensor5@gmail.com> pkgname=cardano-sl -pkgver=3.0.1 -_commit=57a0d236eed59c48214ee70128549d6cfdbc73db +pkgver=3.1.0 +_commit=1a792d7cd0f0c93a0f0c28f66372bce3c3808dbd pkgrel=1 pkgdesc='Cryptographic currency implementing Ouroboros PoS protocol' arch=('x86_64') @@ -10,8 +10,16 @@ url='https://github.com/input-output-hk/cardano-sl/' license=('MIT') depends=('gmp' 'openssl' 'rocksdb') makedepends=('git' 'stack') -source=("git+https://github.com/input-output-hk/cardano-sl.git#commit=${_commit}") -sha256sums=('SKIP') +source=("git+https://github.com/input-output-hk/cardano-sl.git#commit=${_commit}" + 'stack.patch') +sha256sums=('SKIP' + '5a3930f42dc369cfcd993537bde79cf69e80e48a5aeaf599fd38371af614f2fa') + +prepare() { + cd ${pkgname} + + patch -Np1 -i ../stack.patch +} build() { cd ${pkgname} diff --git a/stack.patch b/stack.patch new file mode 100644 index 000000000000..4622ef75dfaf --- /dev/null +++ b/stack.patch @@ -0,0 +1,250 @@ +--- a/stack.yaml ++++ b/stack.yaml +@@ -46,17 +46,56 @@ + - mnemonic + - yaml-validation + ++nix: ++ shell-file: nix/stack-shell.nix ++ ++extra-deps: ++# Serokell-specific utilities not on stackage ++- fmt-0.6 ++ ++# Servant stuff not found on stackage ++- servant-multipart-0.11.2 ++ ++# Needed for coin selection in the wallet ++- normaldistribution-1.1.0.3 ++ ++# This used to be Serokell.Aeson.Options ++- aeson-options-0.1.0 ++- servant-swagger-ui-redoc-0.3.0.1.21.2 ++ ++# Needed to LTS-12.16 compatibility ++- wai-middleware-throttle-0.3.0.0 ++- ether-0.5.1.0 ++- servant-quickcheck-0.0.7.2 ++- o-clock-0.1.1 ++- beam-sqlite-0.3.2.3 ++- katip-0.6.3.0 ++- Chart-1.9 ++- Chart-diagrams-1.9 ++- SVGFonts-1.6.0.3 ++- pvss-0.2.0 ++- systemd-1.1.2 ++- base58-bytestring-0.1.0 ++- pipes-interleave-1.1.3 ++- tabl-1.0.3 ++- loc-0.1.3.3 ++- hspec-2.5.5 ++- micro-recursion-schemes-5.0.2.2 ++- token-bucket-0.1.0.1 ++- lzma-clib-5.2.2 ++- megaparsec-7.0.4 ++- neat-interpolation-0.3.2.4 ++- config-ini-0.2.4.0 ++- stylish-haskell-0.9.2.2 ++- hedgehog-1.0 ++ + # IOHK projects: + +-- location: +- git: https://github.com/input-output-hk/cardano-crypto +- commit: 4590efa638397e952a51a8994b5543e4ea3c1ecd +- extra-dep: true ++- git: https://github.com/input-output-hk/cardano-crypto ++ commit: 4590efa638397e952a51a8994b5543e4ea3c1ecd + # to be removed when haskell-ip is in the current stackage version +-- location: +- git: https://github.com/andrewthad/haskell-ip +- commit: 9bb453139aa82cc973125091800422a523e1eb8f +- extra-dep: true ++- git: https://github.com/andrewthad/haskell-ip ++ commit: 9bb453139aa82cc973125091800422a523e1eb8f + + ## Vendored/Forked dependencies + # +@@ -69,154 +108,83 @@ + # this extra-dep is to avoid printing microseconds with unicode + # no PR upstream was made + # TODO(parsonsmatt): why was this change done? +-- location: +- git: https://github.com/serokell/time-units.git +- commit: 6c3747c1ac794f952de996dd7ba8a2f6d63bf132 +- extra-dep: true ++- git: https://github.com/serokell/time-units.git ++ commit: 6c3747c1ac794f952de996dd7ba8a2f6d63bf132 + + # not reviewing this too deeply as we're dumping kademlia +-- location: +- git: https://github.com/serokell/kademlia.git +- commit: 7120bb4d28e708acd52dfd61d3dca7914fac7d7f # master +- extra-dep: true ++- git: https://github.com/serokell/kademlia.git ++ commit: 7120bb4d28e708acd52dfd61d3dca7914fac7d7f # master + + # These three are needed for cardano-sl-networking + # + # This defines a bundle type and attribute: + # https://github.com/haskell-distributed/network-transport/compare/master...serokell:018a50b9042c2115c3ec9c9fd5ca5f28737dd29c?expand=1 + # Seems relatively straightforward to PR. +-- location: +- git: https://github.com/serokell/network-transport +- commit: 018a50b9042c2115c3ec9c9fd5ca5f28737dd29c +- extra-dep: true ++- git: https://github.com/serokell/network-transport ++ commit: 018a50b9042c2115c3ec9c9fd5ca5f28737dd29c + + # This doesn't have much difference at all with the upstream master: + # https://github.com/haskell-distributed/network-transport-tcp/compare/master...serokell:3d56652123bd296dc759cd31947eb2a17924e68a?expand=1 + # As above, seems relatively straightforward to PR. +-- location: +- git: https://github.com/avieth/network-transport-tcp +- commit: 2634e5e32178bb0456d800d133f8664321daa2ef # csl-0.6.0 +- extra-dep: true ++- git: https://github.com/avieth/network-transport-tcp ++ commit: 2634e5e32178bb0456d800d133f8664321daa2ef # csl-0.6.0 + + # This one has more changes: + # https://github.com/haskell-distributed/network-transport-inmemory/compare/master...avieth:5d8ff2b07b9df35cf61329a3d975e2c8cf95c12a?expand=1 + # Do we have an issue that documents why we made these changes, so we can make a PR upstream? +-- location: +- git: https://github.com/avieth/network-transport-inmemory +- commit: 5d8ff2b07b9df35cf61329a3d975e2c8cf95c12a +- extra-dep: true ++- git: https://github.com/avieth/network-transport-inmemory ++ commit: 5d8ff2b07b9df35cf61329a3d975e2c8cf95c12a + + # Waiting on the space leak bug fix PR to be merged: + # https://github.com/acid-state/acid-state/pull/104 +-- location: +- git: https://github.com/parsonsmatt/acid-state +- commit: a1b23e2056f134e53f705a694ab85deeecabec5c +- extra-dep: true ++- git: https://github.com/parsonsmatt/acid-state ++ commit: a1b23e2056f134e53f705a694ab85deeecabec5c + + # Required for explorer. + # We forked it because it has some unacceptable version bounds. We didn't + # add any features nor fix any bugs. +-- location: +- git: https://github.com/input-output-hk/engine.io +- commit: d3c55f51bb81cee7d0d551de930ce65fe7d76756 +- extra-dep: true ++- git: https://github.com/input-output-hk/engine.io ++ commit: d3c55f51bb81cee7d0d551de930ce65fe7d76756 + subdirs: + - socket-io + - engine-io + - engine-io-wai + + # Library has never been released on Hackage yet +-- location: +- git: https://github.com/well-typed/canonical-json.git +- commit: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f +- extra-dep: true ++- git: https://github.com/well-typed/canonical-json.git ++ commit: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f + + + # The latest release of clock on hackage is *way* too old (0.7.2) + # and can not be cross compiled. As + # https://github.com/corsis/clock/commit/f7fe4fb5691d56c342e6fbf5a99c121ab24a6b41 + # hasn't made it into any release yet. +-- location: +- git: https://github.com/corsis/clock.git +- commit: ef60bd51a3587a173adf565c33bf2886df6e3842 +- extra-dep: true ++- git: https://github.com/corsis/clock.git ++ commit: ef60bd51a3587a173adf565c33bf2886df6e3842 + + # Library has never been released on Hackage yet +-- location: +- git: https://github.com/input-output-hk/rocksdb-haskell-ng.git +- commit: 49f501a082d745f3b880677220a29cafaa181452 +- extra-dep: true ++- git: https://github.com/input-output-hk/rocksdb-haskell-ng.git ++ commit: 49f501a082d745f3b880677220a29cafaa181452 + + # Because log-warper mainline depends on a lifted-async which depends upon a + # buggy async +-- location: +- git: https://github.com/input-output-hk/log-warper +- commit: 5271ab6c33541b8155ca203e714875974ec116be +- extra-dep: true ++- git: https://github.com/input-output-hk/log-warper ++ commit: 5271ab6c33541b8155ca203e714875974ec116be + + # Custom Universum prelude, that brings back some of the + # formatting logic, as well as `pretty`. +-- location: +- git: https://github.com/input-output-hk/universum +- commit: 15f7db758ff5a24b874de2247f6f7a4576562da5 +- extra-dep: true ++- git: https://github.com/input-output-hk/universum ++ commit: 15f7db758ff5a24b874de2247f6f7a4576562da5 + + + # Need to adjust version bounds on serokell-util. + # serokell-util has an upper bound preventing 6.3 for some reason +-- location: +- git: https://github.com/input-output-hk/serokell-util +- commit: 457f1d149c6e238841f283a1faf7bc8fb021b27d +- extra-dep: true ++- git: https://github.com/input-output-hk/serokell-util ++ commit: 457f1d149c6e238841f283a1faf7bc8fb021b27d + + # Inspector, as used in cardano-crypto +-- location: +- git: https://github.com/primetype/inspector.git +- commit: c975f4329365f0379c04358138e616fb96fb0b79 +- extra-dep: true +- +-nix: +- shell-file: nix/stack-shell.nix +- +-extra-deps: +-# Serokell-specific utilities not on stackage +-- fmt-0.6 +- +-# Servant stuff not found on stackage +-- servant-multipart-0.11.2 +- +-# Needed for coin selection in the wallet +-- normaldistribution-1.1.0.3 +- +-# This used to be Serokell.Aeson.Options +-- aeson-options-0.1.0 +-- servant-swagger-ui-redoc-0.3.0.1.21.2 +- +-# Needed to LTS-12.16 compatibility +-- wai-middleware-throttle-0.3.0.0 +-- ether-0.5.1.0 +-- servant-quickcheck-0.0.7.2 +-- o-clock-0.1.1 +-- beam-sqlite-0.3.2.3 +-- katip-0.6.3.0 +-- Chart-1.9 +-- Chart-diagrams-1.9 +-- SVGFonts-1.6.0.3 +-- pvss-0.2.0 +-- systemd-1.1.2 +-- base58-bytestring-0.1.0 +-- pipes-interleave-1.1.3 +-- tabl-1.0.3 +-- loc-0.1.3.3 +-- hspec-2.5.5 +-- micro-recursion-schemes-5.0.2.2 +-- token-bucket-0.1.0.1 +-- lzma-clib-5.2.2 +-- megaparsec-7.0.4 +-- neat-interpolation-0.3.2.4 +-- config-ini-0.2.4.0 +-- stylish-haskell-0.9.2.2 +-- hedgehog-1.0 ++- git: https://github.com/primetype/inspector.git ++ commit: c975f4329365f0379c04358138e616fb96fb0b79 + + # katip-0.6.3.0 conflicts with Win32-2.6.1.0 + allow-newer: true |