diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-haskell/cabal-install/files | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-haskell/cabal-install/files')
| -rw-r--r-- | dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch | 20 | ||||
| -rw-r--r-- | dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch | 15 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch new file mode 100644 index 000000000000..c36582680a56 --- /dev/null +++ b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch @@ -0,0 +1,20 @@ +diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs +index 48d8d49..3a38ee1 100644 +--- a/Distribution/Client/IndexUtils.hs ++++ b/Distribution/Client/IndexUtils.hs +@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of + + extractPrefs :: Tar.Entry -> Maybe [Dependency] + extractPrefs entry = case Tar.entryContent entry of ++{- ++ -- get rid of hackage's preferred-versions ++ -- I'd like to have bleeding-edge packages in system and I don't fear of ++ -- broken packages with improper depends + Tar.NormalFile content _ + | takeFileName (Tar.entryPath entry) == "preferred-versions" + -> Just . parsePreferredVersions + . BS.Char8.unpack $ content ++-} + _ -> Nothing + + parsePreferredVersions :: String -> [Dependency] diff --git a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch new file mode 100644 index 000000000000..40b281073c0e --- /dev/null +++ b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch @@ -0,0 +1,15 @@ +diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs +index 95545fc..a9c8417 100644 +--- a/Distribution/Client/IndexUtils.hs ++++ b/Distribution/Client/IndexUtils.hs +@@ -345,2 +345,6 @@ extractPrefs :: Tar.Entry -> Maybe [Dependency] + extractPrefs entry = case Tar.entryContent entry of ++{- ++ -- get rid of hackage's preferred-versions ++ -- I'd like to have bleeding-edge packages in system and I don't fear of ++ -- broken packages with improper depends + Tar.NormalFile content _ +@@ -351,2 +355,3 @@ extractPrefs entry = case Tar.entryContent entry of + prefs = parsePreferredVersions content ++-} + _ -> Nothing |