diff options
Diffstat (limited to 'pkgs/development')
28 files changed, 0 insertions, 807 deletions
diff --git a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch deleted file mode 100644 index ed9b7adbef21..000000000000 --- a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old 2015-01-11 06:46:39.000000000 +0000 -+++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj 2015-05-25 21:29:40.546808622 +0100 -@@ -52,6 +52,8 @@ - <Reference Include="System.Data.Linq" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Numerics" /> -+ <Reference Include="System.Collections" /> -+ <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.Web" /> - <Reference Include="System.Web.Extensions" /> diff --git a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch b/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch deleted file mode 100644 index 712bd53092f9..000000000000 --- a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Setup.hs b/Setup.hs -index ddf5a02..7ad1f26 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -1,4 +1,4 @@ -- -+{-# LANGUAGE CPP #-} - import Control.Monad (when) - import Language.Haskell.TH - import Distribution.Simple (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args) -@@ -6,14 +6,25 @@ import Distribution.Simple.Utils (cabalVersion) - import Distribution.Simple.LocalBuildInfo - import Distribution.Simple.Setup (ConfigFlags) - import Distribution.Version (Version(..)) -+#if MIN_VERSION_Cabal(1,25,0) -+import Distribution.Version (mkVersion) -+#endif - import Distribution.PackageDescription (PackageDescription) - import Debug.Trace - -+#if MIN_VERSION_Cabal(1,25,0) -+versionBranch :: Version -> Version -+versionBranch = id -+#else -+mkVersion :: [Int] -> Version -+mkVersion vs = Version vs [] -+#endif -+ - -- I couldn't figure out a way to do this check from the cabal file, so we drop down - -- here to do it instead: - checkGoodVersion :: IO () - checkGoodVersion = -- if cabalVersion >= Version [1,17,0] [] -+ if cabalVersion >= mkVersion [1,17,0] - then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion) - else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++ - show (versionBranch cabalVersion)++" < 1.17.0\n"++ diff --git a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch deleted file mode 100644 index e72bb793da73..000000000000 --- a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs ---- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300 -+++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300 -@@ -38,6 +38,7 @@ - import Data.GraphViz.Types.Canonical - import Data.GraphViz.Types.Internal.Common - -+import Prelude hiding (traverse) - import Control.Arrow (first, second, (***)) - import Control.Monad (unless) - import Control.Monad.Trans.State diff --git a/pkgs/development/haskell-modules/patches/hie-testsuite.patch b/pkgs/development/haskell-modules/patches/hie-testsuite.patch deleted file mode 100644 index 86cac15c2464..000000000000 --- a/pkgs/development/haskell-modules/patches/hie-testsuite.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs -index 039c094..d0d1fa4 100644 ---- a/test/HaRePluginSpec.hs -+++ b/test/HaRePluginSpec.hs -@@ -326,35 +326,6 @@ hareSpec = do - $ List [TextEdit (Range (Position 4 0) (Position 8 12)) - "parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"]) - Nothing) -- it "finds definition across components" $ do -- let u = filePathToUri "./app/Main.hs" -- let lreq = setTypecheckedModule u -- let req = findDef u (toPos (7,8)) -- r <- dispatchRequestPGoto $ lreq >> req -- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib.hs") -- (Range (toPos (6,1)) (toPos (6,9)))] -- let req2 = findDef u (toPos (7,20)) -- r2 <- dispatchRequestPGoto $ lreq >> req2 -- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs") -- (Range (toPos (5,1)) (toPos (5,2)))] -- it "finds definition in the same component" $ do -- let u = filePathToUri "./src/Lib2.hs" -- let lreq = setTypecheckedModule u -- let req = findDef u (toPos (6,5)) -- r <- dispatchRequestPGoto $ lreq >> req -- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib.hs") -- (Range (toPos (6,1)) (toPos (6,9)))] -- it "finds local definitions" $ do -- let u = filePathToUri "./src/Lib2.hs" -- let lreq = setTypecheckedModule u -- let req = findDef u (toPos (7,11)) -- r <- dispatchRequestPGoto $ lreq >> req -- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs") -- (Range (toPos (10,9)) (toPos (10,10)))] -- let req2 = findDef u (toPos (10,13)) -- r2 <- dispatchRequestPGoto $ lreq >> req2 -- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs") -- (Range (toPos (9,9)) (toPos (9,10)))] - - - -- --------------------------------- diff --git a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch deleted file mode 100644 index 9b7b7cfb8f96..000000000000 --- a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -index 60e134c..246d8ca 100644 ---- lambdabot-core/src/Lambdabot/Config.hs -+++ lambdabot-core/src/Lambdabot/Config.hs -@@ -29,9 +29,9 @@ import Data.Typeable - import Data.Generics (everywhere, mkT) - import Language.Haskell.TH - --data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t -+data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t - --cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a) -+cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a) - cast1 = fmap runIdentity . gcast1 . Identity - - instance GEq Config where diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch deleted file mode 100644 index 3917c2f0afd7..000000000000 --- a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001 -From: Michiel Derhaeg <derhaeg.michiel@gmail.com> -Date: Tue, 20 Mar 2018 22:06:18 +0100 -Subject: [PATCH] update to work with GHC 8.4.1 - ---- - XMonad/Hooks/FadeWindows.hs | 6 +++++- - XMonad/Hooks/WallpaperSetter.hs | 6 +++++- - XMonad/Layout/Mosaic.hs | 6 +++++- - xmonad-contrib.cabal | 5 +++-- - 5 files changed, 33 insertions(+), 5 deletions(-) - -diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs -index 4b8e62b6..01d06792 100644 ---- a/XMonad/Hooks/FadeWindows.hs -+++ b/XMonad/Hooks/FadeWindows.hs -@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask - ,asks) - import Control.Monad.State (gets) - import qualified Data.Map as M --import Data.Monoid -+import Data.Monoid hiding ((<>)) -+import Data.Semigroup - - import Graphics.X11.Xlib.Extras (Event(..)) - -@@ -134,6 +135,9 @@ instance Monoid Opacity where - r `mappend` OEmpty = r - _ `mappend` r = r - -+instance Semigroup Opacity where -+ (<>) = mappend -+ - -- | A FadeHook is similar to a ManageHook, but records window opacity. - type FadeHook = Query Opacity - -diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs -index 00a3b1c3..d4f5ccb2 100644 ---- a/XMonad/Hooks/WallpaperSetter.hs -+++ b/XMonad/Hooks/WallpaperSetter.hs -@@ -41,7 +41,8 @@ import Data.Ord (comparing) - import Control.Monad - import Control.Applicative - import Data.Maybe --import Data.Monoid -+import Data.Monoid hiding ((<>)) -+import Data.Semigroup - - -- $usage - -- This module requires imagemagick and feh to be installed, as these are utilized -@@ -86,6 +87,9 @@ instance Monoid WallpaperList where - mappend (WallpaperList w1) (WallpaperList w2) = - WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) - -+instance Semigroup WallpaperList where -+ (<>) = mappend -+ - -- | Complete wallpaper configuration passed to the hook - data WallpaperConf = WallpaperConf { - wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) -diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs -index 05655d4c..da44fc50 100644 ---- a/XMonad/Layout/Mosaic.hs -+++ b/XMonad/Layout/Mosaic.hs -@@ -38,7 +38,8 @@ import Control.Monad(mplus) - import Data.Foldable(Foldable,foldMap, sum) - import Data.Function(on) - import Data.List(sortBy) --import Data.Monoid(Monoid,mempty, mappend) -+import Data.Monoid(Monoid,mempty, mappend, (<>)) -+import Data.Semigroup - - - -- $usage -@@ -202,6 +203,9 @@ instance Monoid (Tree a) where - mappend x Empty = x - mappend x y = Branch x y - -+instance Semigroup (Tree a) where -+ (<>) = mappend -+ - makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a - makeTree _ [] = Empty - makeTree _ [x] = Leaf x -diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal -index dde3ccda..c401c6e6 100644 ---- a/xmonad-contrib.cabal -+++ b/xmonad-contrib.cabal -@@ -36,7 +36,7 @@ cabal-version: >= 1.6 - build-type: Simple - bug-reports: https://github.com/xmonad/xmonad-contrib/issues - --tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 -+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 - - source-repository head - type: git -@@ -66,7 +66,8 @@ library - unix, - X11>=1.6.1 && < 1.9, - xmonad>=0.13 && < 0.14, -- utf8-string -+ utf8-string, -+ semigroups - - if flag(use_xft) - build-depends: X11-xft >= 0.2 diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch b/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch deleted file mode 100644 index 8258a46b1748..000000000000 --- a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch +++ /dev/null @@ -1,106 +0,0 @@ -From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 -From: Zheng Xu <zheng.xu@linaro.org> -Date: Fri, 02 Sep 2016 17:40:05 +0800 -Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen - -There might be 48-bit VA on arm64 depending on kernel configuration. -Manually mmap heap memory to align with the assumption made by JS engine. - -Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146 ---- - -diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..38101cf 100644 ---- a/js/src/gc/Memory.cpp -+++ b/js/src/gc/Memory.cpp -@@ -309,6 +309,75 @@ - #endif - } - -+static inline void * -+MapMemory(size_t length, int prot, int flags, int fd, off_t offset) -+{ -+#if defined(__ia64__) -+ /* -+ * The JS engine assumes that all allocated pointers have their high 17 bits clear, -+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing -+ * mmap an "addr" parameter with those bits clear. The mmap will return that address, -+ * or the nearest available memory above that address, providing a near-guarantee -+ * that those bits are clear. If they are not, we return NULL below to indicate -+ * out-of-memory. -+ * -+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual -+ * address space. -+ * -+ * See Bug 589735 for more information. -+ */ -+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset); -+ if (region == MAP_FAILED) -+ return MAP_FAILED; -+ /* -+ * If the allocated memory doesn't have its upper 17 bits clear, consider it -+ * as out of memory. -+ */ -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ JS_ALWAYS_TRUE(0 == munmap(region, length)); -+ return MAP_FAILED; -+ } -+ return region; -+#elif defined(__aarch64__) -+ /* -+ * There might be similar virtual address issue on arm64 which depends on -+ * hardware and kernel configurations. But the work around is slightly -+ * different due to the different mmap behavior. -+ * -+ * TODO: Merge with the above code block if this implementation works for -+ * ia64 and sparc64. -+ */ -+ const uintptr_t start = (uintptr_t)(0x0000070000000000UL); -+ const uintptr_t end = (uintptr_t)(0x0000800000000000UL); -+ const uintptr_t step = ChunkSize; -+ /* -+ * Optimization options if there are too many retries in practice: -+ * 1. Examine /proc/self/maps to find an available address. This file is -+ * not always available, however. In addition, even if we examine -+ * /proc/self/maps, we may still need to retry several times due to -+ * racing with other threads. -+ * 2. Use a global/static variable with lock to track the addresses we have -+ * allocated or tried. -+ */ -+ uintptr_t hint; -+ void* region = MAP_FAILED; -+ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) { -+ region = mmap((void*)hint, length, prot, flags, fd, offset); -+ if (region != MAP_FAILED) { -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ if (munmap(region, length)) { -+ MOZ_ASSERT(errno == ENOMEM); -+ } -+ region = MAP_FAILED; -+ } -+ } -+ } -+ return region == MAP_FAILED ? NULL : region; -+#else -+ return mmap(NULL, length, prot, flags, fd, offset); -+#endif -+} -+ - void * - MapAlignedPages(size_t size, size_t alignment) - { -@@ -322,12 +391,12 @@ - - /* Special case: If we want page alignment, no further work is needed. */ - if (alignment == PageSize) { -- return mmap(NULL, size, prot, flags, -1, 0); -+ return MapMemory(size, prot, flags, -1, 0); - } - - /* Overallocate and unmap the region's edges. */ - size_t reqSize = Min(size + 2 * alignment, 2 * size); -- void *region = mmap(NULL, reqSize, prot, flags, -1, 0); -+ void *region = MapMemory(reqSize, prot, flags, -1, 0); - if (region == MAP_FAILED) - return NULL; - diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch deleted file mode 100644 index bf41ce0a8a21..000000000000 --- a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru mozjs17.0.0-orig/mfbt/double-conversion/utils.h mozjs17.0.0/mfbt/double-conversion/utils.h ---- mozjs17.0.0-orig/mfbt/double-conversion/utils.h 2013-02-11 17:33:28.000000000 -0500 -+++ mozjs17.0.0/mfbt/double-conversion/utils.h 2016-12-03 20:39:07.915042988 -0500 -@@ -58,7 +58,8 @@ - defined(__mips__) || defined(__powerpc__) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ -- defined(_MIPS_ARCH_MIPS32R2) -+ defined(_MIPS_ARCH_MIPS32R2) || \ -+ defined(__AARCH64EL__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) diff --git a/pkgs/development/libraries/c-ares/release.patch b/pkgs/development/libraries/c-ares/release.patch deleted file mode 100644 index e745648062a5..000000000000 --- a/pkgs/development/libraries/c-ares/release.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -aur c-ares-cares-1_13_0/ares_version.h c-ares-1.13.0/ares_version.h ---- c-ares-cares-1_13_0/ares_version.h 2017-06-20 02:00:21.000000000 -0400 -+++ c-ares-1.13.0/ares_version.h 2017-06-20 02:03:54.000000000 -0400 -@@ -6,12 +6,12 @@ - #define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, <daniel@haxx.se>." - - #define ARES_VERSION_MAJOR 1 --#define ARES_VERSION_MINOR 12 --#define ARES_VERSION_PATCH 1 -+#define ARES_VERSION_MINOR 13 -+#define ARES_VERSION_PATCH 0 - #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\ - (ARES_VERSION_MINOR<<8)|\ - (ARES_VERSION_PATCH)) --#define ARES_VERSION_STR "1.12.1-DEV" -+#define ARES_VERSION_STR "1.13.0" - - #if (ARES_VERSION >= 0x010700) - # define CARES_HAVE_ARES_LIBRARY_INIT 1 diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch deleted file mode 100644 index 740bb746aade..000000000000 --- a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 1d33ce9..dface51 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch deleted file mode 100644 index 7f1ec1df6c76..000000000000 --- a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 4f1adb8..1791952 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch deleted file mode 100644 index e3dfe4aabd60..000000000000 --- a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 5676074..37a0d00 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -856,7 +856,7 @@ FT_BEGIN_HEADER - /* If this option is activated, it can be controlled with the */ - /* `no-long-family-names' property of the pcf driver module. */ - /* */ --#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ - - - /*************************************************************************/ --- -cgit v1.0-41-gc330 \ No newline at end of file diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch deleted file mode 100644 index 9896e25acda1..000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -186,13 +186,8 @@ - gmodule_dep = dependency('gmodule-no-export-2.0') - gio_dep = dependency('gio-2.0') - --# On non-Windows/macOS systems we always required shared-mime-info and GIO --if host_system != 'windows' and host_system != 'darwin' -- shared_mime_dep = dependency('shared-mime-info') -- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) --else -- shared_mime_dep = [] --endif -+# No MIME sniffing for now -+shared_mime_dep = [] - - gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] - diff --git a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch deleted file mode 100644 index db010e62366b..000000000000 --- a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/nscd/nscd_stat.c -+++ b/nscd/nscd_stat.c -@@ -37,7 +37,7 @@ - - - /* We use this to make sure the receiver is the same. */ --static const char compilation[21] = __DATE__ " " __TIME__; -+static const char compilation[] = "@out@"; - - /* Statistic data for one database. */ - struct dbstat diff --git a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch deleted file mode 100644 index 4abc2757cf6f..000000000000 --- a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 928d19f..cbe9713 100644 (file) ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" - ) diff --git a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch deleted file mode 100644 index 646b829496fa..000000000000 --- a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001 -From: Franz Pletz <fpletz@fnordicwalking.de> -Date: Thu, 14 Jan 2016 14:58:23 +0100 -Subject: [PATCH] Disable SSLv3 - ---- - src/idevice.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/idevice.c b/src/idevice.c -index ce27495..8f03094 100644 ---- a/src/idevice.c -+++ b/src/idevice.c -@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne - } - BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE); - -- SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method()); -+ SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method()); - if (ssl_ctx == NULL) { - debug_info("ERROR: Could not create SSL context."); - BIO_free(ssl_bio); --- -2.7.0 - diff --git a/pkgs/development/libraries/physics/rivet/key_val.patch b/pkgs/development/libraries/physics/rivet/key_val.patch deleted file mode 100644 index 0b24d703dac8..000000000000 --- a/pkgs/development/libraries/physics/rivet/key_val.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bin/rivet-cmphistos b/bin/rivet-cmphistos ---- a/bin/rivet-cmphistos -+++ b/bin/rivet-cmphistos -@@ -371,7 +371,7 @@ if __name__ == '__main__': - # plot[key] = val - if plotoptions.has_key("PLOT"): - for key_val in plotoptions["PLOT"]: -- key, val = [s.strip() for s in key_val.split("=")] -+ key, val = [s.strip() for s in key_val.split("=", 1)] - plot[key] = val - if opts.LINEAR: - plot['LogY'] = '0' diff --git a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch deleted file mode 100644 index c255db565e6c..000000000000 --- a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/bin/make-plots b/bin/make-plots -index abb024d..f59293d 100755 ---- a/bin/make-plots -+++ b/bin/make-plots -@@ -1152,8 +1152,8 @@ class ColorScale(Described): - - zcustommajortickmarks = int(self.description.get('ZMajorTickMarks', -1)) - zcustomminortickmarks = int(self.description.get('ZMinorTickMarks', -1)) -- zcustommajorticks=[] -- zcustomminorticks=[] -+ zcustommajorticks=None -+ zcustomminorticks=None - if self.description.has_key('ZCustomMajorTicks') and self.description['ZCustomMajorTicks']!='': - # TODO: Would be nice to have less invisible separation of the custom ticks than split on tabs - ticks = self.description['ZCustomMajorTicks'].strip().split('\t') -@@ -2214,7 +2214,7 @@ class Ticks(object): - - class XTicks(Ticks): - -- def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True): -+ def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True): - twosided = bool(int(self.description.get('XTwosidedTicks', '0'))) - out = "" - out += ('\n%\n% X-Ticks\n%\n') -@@ -2265,7 +2265,7 @@ class XTicks(Ticks): - - class YTicks(Ticks): - -- def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True): -+ def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True): - twosided = bool(int(self.description.get('YTwosidedTicks', '0'))) - out = "" - out += ('\n%\n% Y-Ticks\n%\n') -@@ -2320,7 +2320,7 @@ class ZTicks(Ticks): - self.description = description - self.coors = coors - -- def draw(self, custommajorticks=[], customminorticks=[], -+ def draw(self, custommajorticks=None, customminorticks=None, - custommajortickmarks=-1, customminortickmarks=-1, - drawlabels=True): - out = "" diff --git a/pkgs/development/libraries/v8/build-standalone-static-library.patch b/pkgs/development/libraries/v8/build-standalone-static-library.patch deleted file mode 100644 index 994c322429d1..000000000000 --- a/pkgs/development/libraries/v8/build-standalone-static-library.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/build/standalone.gypi b/build/standalone.gypi -index b6519c4..ef9e7c5 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -373,6 +373,9 @@ - }], - ], - 'target_conditions': [ -+ ['_type=="static_library"', { -+ 'standalone_static_library': 1, -+ }], - ['v8_code == 0', { - 'defines!': [ - 'DEBUG', diff --git a/pkgs/development/libraries/v8/disable-building-tests.patch b/pkgs/development/libraries/v8/disable-building-tests.patch deleted file mode 100644 index 1854a9b7e567..000000000000 --- a/pkgs/development/libraries/v8/disable-building-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile b/Makefile -index 9761265..80169b2 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,8 +248,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64 - GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ - build/shim_headers.gypi build/features.gypi build/standalone.gypi \ - build/toolchain.gypi build/all.gyp build/mac/asan.gyp \ -- test/cctest/cctest.gyp \ -- test/unittests/unittests.gyp tools/gyp/v8.gyp \ - tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ - buildtools/third_party/libc++abi/libc++abi.gyp \ - buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ -diff --git a/build/all.gyp b/build/all.gyp -index 4aeb507..1ff2c7a 100644 ---- a/build/all.gyp -+++ b/build/all.gyp -@@ -10,8 +10,6 @@ - 'dependencies': [ - '../samples/samples.gyp:*', - '../src/d8.gyp:d8', -- '../test/cctest/cctest.gyp:*', -- '../test/unittests/unittests.gyp:*', - ], - 'conditions': [ - ['component!="shared_library"', { - diff --git a/pkgs/development/libraries/v8/fPIC-for-static.patch b/pkgs/development/libraries/v8/fPIC-for-static.patch deleted file mode 100644 index 39564772af86..000000000000 --- a/pkgs/development/libraries/v8/fPIC-for-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 7670e5b..230518c 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -205,7 +205,7 @@ - [ 'visibility=="hidden" and v8_enable_backtrace==0', { - 'cflags': [ '-fvisibility=hidden' ], - }], -- [ 'component=="shared_library"', { -+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64")', { - 'cflags': [ '-fPIC', ], - }], - ], diff --git a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch deleted file mode 100644 index 7b513f21a29f..000000000000 --- a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- File-Slurp-9999.19.orig/lib/File/Slurp.pm 2011-05-30 21:58:53.000000000 +0200 -+++ File-Slurp-9999.19/lib/File/Slurp.pm 2017-04-28 10:05:59.047681755 +0200 -@@ -4,6 +4,7 @@ - - use strict; - use warnings ; -+no warnings 'deprecated'; - - use Carp ; - use Exporter ; diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch deleted file mode 100644 index a46ffaa7bd9e..000000000000 --- a/pkgs/development/perl-modules/dbiclassx-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson <ribasushi@cpan.org> -Date: Tue, 13 Sep 2016 17:15:48 +0200 -Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) - libsqlite version - ---- - Changes | 2 ++ - t/prefetch/grouped.t | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t -index 4aad6b1..c0d2224 100644 ---- a/t/prefetch/grouped.t -+++ b/t/prefetch/grouped.t -@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; - - # add an extra track to one of the cds, and then make sure we can get it on top - # (check if limit works) -- my $top_cd = $cd_rs->slice (1,1)->next; -+ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; - $top_cd->create_related ('tracks', { - title => 'over the top', - }); diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch deleted file mode 100644 index 65e9d58a0ae4..000000000000 --- a/pkgs/development/python-modules/cgkit/scons-env.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/supportlib/SConstruct b/supportlib/SConstruct -index 7f797b9..07907e9 100644 ---- a/supportlib/SConstruct -+++ b/supportlib/SConstruct -@@ -5,7 +5,7 @@ - # library. - ###################################################################### - --import sys, glob, os.path -+import sys, glob, os.path, os - - # Read the options - vars = Variables("cpp_config.cfg") -@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", []) - vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio") - - # Create the construction environment --env = Environment(variables = vars) -+env = Environment(variables = vars, ENV = os.environ) - - # Build the files in "obj" - env.VariantDir("obj", "src", duplicate=0) diff --git a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch deleted file mode 100644 index 05dbf4677182..000000000000 --- a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Tue, 14 Mar 2017 15:00:33 +0100 -Subject: [PATCH] namespace fix - -configparser broke other namespace packages -https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428 -This patch seems to solve that issue. ---- - setup.py | 1 - - src/backports/__init__.py | 6 ------ - 2 files changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 3b07823..63ed25d 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,7 +42,6 @@ setup( - py_modules=modules, - package_dir={'': 'src'}, - packages=find_packages('src'), -- namespace_packages=['backports'], - include_package_data=True, - zip_safe=False, - install_requires=requirements, -diff --git a/src/backports/__init__.py b/src/backports/__init__.py -index f84d25c..febdb2f 100644 ---- a/src/backports/__init__.py -+++ b/src/backports/__init__.py -@@ -3,9 +3,3 @@ - - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) -- --try: -- import pkg_resources -- pkg_resources.declare_namespace(__name__) --except ImportError: -- pass --- -2.11.1 - diff --git a/pkgs/development/python-modules/pygame/pygame-v4l.patch b/pkgs/development/python-modules/pygame/pygame-v4l.patch deleted file mode 100644 index 3b5a2b9d2bf9..000000000000 --- a/pkgs/development/python-modules/pygame/pygame-v4l.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in -*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009 ---- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011 -*************** -*** 34,40 **** - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c ---- 34,40 ---- - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c -diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c -*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009 ---- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011 -*************** -*** 160,179 **** - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! if (v4l_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } else { -! self->camera_type = CAM_V4L; -! if (v4l_init_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! if (v4l_start_capturing(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! } - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { ---- 160,167 ---- - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { -diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h -*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008 ---- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011 -*************** -*** 39,45 **** - - #include <asm/types.h> /* for videodev2.h */ - -- #include <linux/videodev.h> - #include <linux/videodev2.h> - #endif - ---- 39,44 ---- -*************** -*** 51,57 **** - #define RGB_OUT 1 - #define YUV_OUT 2 - #define HSV_OUT 4 -- #define CAM_V4L 1 - #define CAM_V4L2 2 - - struct buffer ---- 50,55 ---- -*************** -*** 111,118 **** - int v4l2_close_device (PyCameraObject* self); - int v4l2_open_device (PyCameraObject* self); - -- /* internal functions specific to v4l */ -- int v4l_open_device (PyCameraObject* self); -- int v4l_init_device(PyCameraObject* self); -- int v4l_start_capturing(PyCameraObject* self); - #endif ---- 109,112 ---- diff --git a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch deleted file mode 100644 index c4d14319a8b6..000000000000 --- a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -18,7 +18,7 @@ from version import VERSION # NOQA - install_requires = [ - 'pandas >= 0.14', - 'numpy >= 1.8', -- 'requests >= 2.7.0, < 2.18', # Version 2.18 appears to break pulling data. -+ 'requests >= 2.7.0', # Works fine - 'inflection >= 0.3.1', - 'python-dateutil', - 'six', diff --git a/pkgs/development/r-modules/patches/RMySQL.patch b/pkgs/development/r-modules/patches/RMySQL.patch deleted file mode 100644 index dc93b902cd5c..000000000000 --- a/pkgs/development/r-modules/patches/RMySQL.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru3 RMySQL_orig/configure RMySQL/configure ---- RMySQL_orig/configure 2015-02-19 22:49:15.812455730 +0300 -+++ RMySQL/configure 2015-02-19 22:49:42.066407256 +0300 -@@ -1,7 +1,7 @@ - # If $MYSQL_DIR is specified, use that - if [ "$MYSQL_DIR" ]; then -- echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include" > src/Makevars -- echo "PKG_LIBS= -L$MYSQL_DIR/lib -lmysqlclient -lz" >> src/Makevars -+ echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include/mysql" > src/Makevars -+ echo "PKG_LIBS= -L$MYSQL_DIR/lib/mysql -lmysqlclient -lz" >> src/Makevars - exit 0 - fi - |