Skip to content

Commit

Permalink
Lots of updates for Leap 15.6.
Browse files Browse the repository at this point in the history
  • Loading branch information
@peti
peti committed Feb 25, 2024
1 parent dbff085 commit 6abe7f2
Show file tree
Hide file tree
Showing 7 changed files with 141 additions and 62 deletions.
13 changes: 13 additions & 0 deletions patches/common/dbus/relax-over-specified-constraints-on-vector-and-lens.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: ghc-dbus.spec
===================================================================
--- ghc-dbus.spec (revision 77445b0f46d392b5d2720a041fedbe84)
+++ ghc-dbus.spec (working copy)
@@ -103,6 +103,8 @@

%prep
%autosetup -n %{pkg_name}-%{version}
+cabal-tweak-dep-ver lens "<5.2" "< 6"
+cabal-tweak-dep-ver vector "<0.13" "< 1"

%build
%ghc_lib_build
12 changes: 12 additions & 0 deletions patches/common/feed/relax-over-specified-constraint-on-base-compat.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: ghc-feed.spec
===================================================================
--- ghc-feed.spec (revision 6)
+++ ghc-feed.spec (working copy)
@@ -111,6 +111,7 @@
%prep
%autosetup -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
+cabal-tweak-dep-ver base-compat '< 0.13' '< 1'

%build
%ghc_lib_build
7 changes: 3 additions & 4 deletions ...rspecified-constraint-on-semigroups.patch → ...ver-specified-constraints-on-vector.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Index: ghc-libsystemd-journal.spec
===================================================================
--- ghc-libsystemd-journal.spec (revision 10)
--- ghc-libsystemd-journal.spec (revision 532d900672ade22a7e6f6dd4cdc794dc)
+++ ghc-libsystemd-journal.spec (working copy)
@@ -61,7 +61,8 @@

@@ -63,6 +63,7 @@
%prep
%autosetup -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
+cabal-tweak-dep-ver semigroups '< 0.20' '< 1'
+cabal-tweak-dep-ver vector "< 0.13" "< 1"

%build
%ghc_lib_build
23 changes: 23 additions & 0 deletions patches/common/persistent/drop-dependency-on-empty-attoparsec-aeson-library.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Index: ghc-persistent.spec
===================================================================
--- ghc-persistent.spec (revision 1)
+++ ghc-persistent.spec (working copy)
@@ -26,8 +26,8 @@
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Patch1: drop-dependency-on-empty-attoparsec-aeson-library.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-aeson-devel
-BuildRequires: ghc-attoparsec-aeson-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-base-devel
@@ -131,7 +130,7 @@
This package provides the Haskell %{pkg_name} profiling library.

%prep
-%autosetup -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version} -p1

%build
%ghc_lib_build
12 changes: 12 additions & 0 deletions patches/common/text-metrics/relax-over-specified-constraints-on-vector.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: ghc-text-metrics.spec
===================================================================
--- ghc-text-metrics.spec (revision e0390055b567671f9df02290d9969c64)
+++ ghc-text-metrics.spec (working copy)
@@ -51,6 +51,7 @@

%prep
%autosetup -n %{pkg_name}-%{version}
+cabal-tweak-dep-ver vector "<0.13" "< 1"

%build
%ghc_lib_build
12 changes: 12 additions & 0 deletions patches/common/turtle/relax-over-specified-constraints-on-optparse-applicative.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: ghc-turtle.spec
===================================================================
--- ghc-turtle.spec (revision 2e5f49b37f9b4f3b194640d65ceb497e)
+++ ghc-turtle.spec (working copy)
@@ -100,6 +100,7 @@
%prep
%autosetup -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
+cabal-tweak-dep-ver optparse-applicative "< 0.18" "< 1"

%build
%ghc_lib_build
124 changes: 66 additions & 58 deletions src/cabal2obs/Config/Ghc810x.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,71 +46,74 @@ ghc810x = do
constraintList :: ConstraintSet
constraintList = [ "adjunctions ^>= 4.4"
, "aeson-yaml ^>= 1.1.0.1"
, "ansi-wl-pprint ^>= 0.6.9"
, "ansi-wl-pprint"
, "ascii-progress ^>= 0.3.3.0"
, "attoparsec-iso8601 ^>= 1.0.2.1"
, "aws ^>= 0.22"
, "attoparsec-iso8601 ^>= 1.1.0.1"
, "aws ^>= 0.24.2"
, "base64-bytestring-type ^>= 1.0.1"
, "bech32 ^>= 1.1.2"
, "binary-orphans ^>= 1.0.2"
, "brick ^>= 0.67"
, "brick"
, "cassava-megaparsec ^>= 2.0.4"
, "cborg ^>= 0.2.6.0"
, "cborg-json ^>= 0.2.3.0"
, "concurrent-output ^>= 1.10.15"
, "criterion ^>= 1.5.13.0"
, "criterion ^>= 1.6"
, "criterion-measurement ^>= 0.2"
, "cryptohash ^>= 0.11.9"
, "cryptohash-conduit ^>= 0.1.1"
, "cryptonite-conduit ^>= 0.2.2"
, "DAV ^>= 1.3.4"
, "dbus ^>= 1.2.22"
, "dbus < 1.2.23" -- newer versions need template-haskell >= 2.18
, "dense-linear-algebra ^>= 0.1.0.0"
, "dhall ^>= 1.40.2"
, "dhall ^>= 1.42.1"
, "distribution-opensuse ^>= 1.1.3"
, "dns ^>= 4.0.1"
, "either ^>= 5.0.1.1"
, "ekg ^>= 0.4.0.15"
, "ekg-json ^>= 0.1.0.6"
, "extra ^>= 1.7.9"
, "fdo-notify ^>= 0.3.1"
, "feed ^>= 1.3.2.0"
, "foldl ^>= 1.4.12"
, "foundation ^>= 0.0.28"
, "free ^>= 5.1.7"
, "fsnotify ^>= 0.3.0.1"
, "fsnotify"
, "generic-deriving ^>= 1.14.1"
, "generic-lens ^>= 2.2.1.0"
, "ghcid ^>= 0.8.7"
, "ghcid"
, "git-annex"
, "git-lfs ^>= 1.2.0"
, "hashtables ^>= 1.2.4.2"
, "hedgehog ^>= 1.1.1"
, "hedgehog-quickcheck ^>= 0.1.1"
, "hledger ^>= 1.26.1"
, "hledger-lib ^>= 1.26.1"
, "HsYAML-aeson ^>= 0.2.0.1"
, "http-client-restricted ^>= 0.0.5"
, "hashtables ^>= 1.3.1"
, "hedgehog" -- ^>= 1.1.1"
, "hedgehog-quickcheck" -- ^>= 0.1.1"
, "hledger"
, "hledger-lib"
, "http-client-restricted ^>= 0.1"
, "infer-license ^>= 0.2.0"
, "invariant ^>= 0.5.5"
, "invariant ^>= 0.6.2"
, "io-streams ^>= 1.5.2.1"
, "io-streams-haproxy ^>= 1.0.1.0"
, "kan-extensions ^>= 5.2.3"
, "katip ^>= 0.8.7.0"
, "lens ^>= 5.1"
, "lens-aeson ^>= 1.1.3"
, "libsystemd-journal ^>= 1.4.5"
, "lens ^>= 5.2"
, "lens-aeson" -- ^>= 1.1.3"
, "libsystemd-journal < 1.4.5.1" -- newer versions need bytestring >= 0.11.1
, "lifted-async ^>= 0.10.2.2"
, "ListLike ^>= 4.7.6"
, "microlens-platform ^>= 0.4.2.1"
, "microlens-th ^>= 0.4.3.10"
, "microlens" -- 0.4.12.0"
, "microlens-ghc" -- 0.4.13.1"
, "microlens-mtl" -- 0.2.0.1"
, "microlens-platform" -- ^>= 0.4.2.1"
, "microlens-th" -- ^>= 0.4.3.10"
, "microstache ^>= 1.0.2"
, "monad-logger ^>= 0.3.36"
, "MonadRandom ^>= 0.5.3"
, "MonadRandom" -- ^>= 0.5.3"
, "moo ^>= 1.2"
, "optics ^>= 0.4"
, "optics-extra ^>= 0.4"
, "optics-th ^>= 0.4"
, "optparse-generic ^>= 1.4.7"
, "persistent ^>= 2.13.3.0"
, "optics"
, "optics-core"
, "optics-extra"
, "optics-th"
, "optparse-generic" -- ^>= 1.4.7"
, "persistent ^>= 2.14"
, "persistent-sqlite ^>= 2.13.1.0"
, "pipes-safe ^>= 2.3.3"
, "postgresql-simple ^>= 0.6.4"
Expand All @@ -123,36 +126,34 @@ constraintList = [ "adjunctions ^>= 4.4"
, "reducers ^>= 3.12.4"
, "rio-orphans ^>= 0.1.2.0"
, "serialise ^>= 0.2.4.0"
, "servant-client ^>= 0.19"
, "servant-client-core ^>= 0.19"
, "shelltestrunner ^>= 1.9"
, "shelly ^>= 1.10.0"
, "smtp-mail ^>= 0.3.0.0"
, "servant-client"
, "servant-client-core"
, "shelltestrunner"
, "shelly ^>= 1.12.1"
, "snap-core ^>= 1.0.4.2"
, "snap-server ^>= 1.1.2.0"
, "statistics ^>= 0.16.0.1"
, "statistics-linreg ^>= 0.3"
, "tasty-hedgehog ^>= 1.1.0.0"
, "tdigest ^>= 0.2.1.1"
, "tasty-hedgehog"
, "tdigest"
, "test-framework ^>= 0.8.2.0"
, "test-framework-hunit ^>= 0.3.0.2"
, "text-metrics ^>= 0.3.2"
, "text-metrics < 0.3.2" -- newer versions need base 4.15
, "th-expand-syns ^>= 0.4.9.0"
, "th-orphans ^>= 0.13.12"
, "th-reify-many ^>= 0.1.10"
, "th-utilities ^>= 0.2.4.3"
, "threepenny-gui ^>= 0.9.1.0"
, "topograph ^>= 1.0.0.1"
, "tree-diff ^>= 0.2.1.1"
, "turtle ^>= 1.5.24"
, "tree-diff" -- ^>= 0.2.1.1"
, "turtle"
, "Unique ^>= 0.4.7.9"
, "vector-binary-instances ^>= 0.2.5.2"
, "vector-builder ^>= 0.3.8.3"
, "vector-th-unbox ^>= 0.2.2"
, "vty ^>= 5.33"
, "warp-tls ^>= 3.3.2"
, "vty"
, "warp-tls"
, "websockets-snap ^>= 0.10.3.1"
, "weeder ^>= 2.2.0"
, "wl-pprint-text ^>= 1.2.0.2"
, "wreq ^>= 0.5.3.3"
, "yesod ^>= 1.6.2"
Expand All @@ -161,15 +162,30 @@ constraintList = [ "adjunctions ^>= 4.4"
, "yesod-persistent ^>= 1.6.0.7"
, "yesod-static ^>= 1.6.1.0"
, "zip ^>= 1.7.2"
, "bimap"
, "text-zipper"

-- new dependencies
, "connection >= 0.2.5"
, "x509 >=1.5"
, "x509-store >=1.5"
, "x509-system >=1.5"
, "x509-validation >=1.5"
, "cryptonite"
, "HsYAML ^>=0.2.0"
, "pager >=0.1.1.0"
, "text-ansi < 0.3"
, "text-builder < 0.6.7.1"
, "text-builder-dev < 0.3.4"
, "deferred-folds >=0.9.10.1 && <0.10"
, "isomorphism-class >=0.1.0.1 && <0.2"
, "quote-quot >=0.2.1 && <0.3"
, "toml-reader < 0.2.1.0"
, "vty-crossplatform"
, "vty-unix"
, "hspec-contrib >=0.5.1.1"
, "prettyprinter-compat-ansi-wl-pprint >=1.0.2 && <1.0.3"

-- DELETED: weeder
-- DELETED: ekg
-- DELETED: ekg-json
-- DELETED: ghc-HsYAML
-- DELETED: ghc-HsYAML-aeson
-- DELETED: smtp-mail
]

flagList :: [(String,String)]
Expand Down Expand Up @@ -544,7 +560,6 @@ ghcCorePackages = [ "array-0.5.4.0"
, "bech32-th-1.1.1"
, "bencode-0.6.1.1"
, "bento-0.1.0"
, "bimap-0.4.0"
, "bindings-DSL-1.0.25"
, "bindings-uname-0.1"
, "bitarray-0.0.1.1"
Expand Down Expand Up @@ -574,7 +589,6 @@ ghcCorePackages = [ "array-0.5.4.0"
, "control-monad-free-0.6.2"
, "converge-0.1.0.1"
, "cprng-aes-0.6.1"
, "criterion-measurement-0.1.3.0"
, "crypto-api-0.13.3"
, "crypto-cipher-types-0.0.9"
, "crypto-pubkey-types-0.4.3"
Expand All @@ -594,14 +608,13 @@ ghcCorePackages = [ "array-0.5.4.0"
, "echo-0.1.4"
, "ed25519-0.0.5.0"
, "edit-distance-0.2.2.1"
, "ekg-core-0.1.1.7"
-- DELETED: "ekg-core-0.1.1.7"
, "email-validate-2.3.2.15"
, "enclosed-exceptions-1.0.3"
, "entropy-0.4.1.7"
, "erf-2.0.0.0"
, "errors-2.3.0"
, "extensible-exceptions-0.1.1.4"
, "extra-1.7.9"
, "fail-4.9.0.0"
, "fgl-5.7.0.3"
, "filelock-0.1.1.5"
Expand Down Expand Up @@ -676,9 +689,6 @@ ghcCorePackages = [ "array-0.5.4.0"
, "math-functions-0.3.4.2"
, "megaparsec-9.2.0"
, "mersenne-random-pure64-0.2.2.0"
, "microlens-0.4.12.0"
, "microlens-ghc-0.4.13.1"
, "microlens-mtl-0.2.0.1"
, "mime-mail-0.5.1"
, "mintty-0.1.3"
, "monad-loops-0.4.3"
Expand All @@ -697,7 +707,6 @@ ghcCorePackages = [ "array-0.5.4.0"
, "nothunks-0.1.3"
, "OddWord-1.0.2.0"
, "open-browser-0.2.1.0"
, "optics-core-0.4"
, "optional-args-1.0.2"
, "optparse-simple-0.1.1.4"
, "parallel-3.2.2.0"
Expand Down Expand Up @@ -778,7 +787,6 @@ ghcCorePackages = [ "array-0.5.4.0"
, "text-format-0.3.2"
, "text-icu-0.8.0.1"
, "text-manipulate-0.3.0.0"
, "text-zipper-0.11"
, "tf-random-0.5"
, "th-extras-0.0.0.4"
, "time-locale-compat-0.1.1.5"
Expand Down

0 comments on commit 6abe7f2

Please sign in to comment.