diff options
| author | (cdep)illabout <cdep.illabout@gmail.com> | 2021-05-20 16:14:45 +0900 |
|---|---|---|
| committer | (cdep)illabout <cdep.illabout@gmail.com> | 2021-05-20 16:14:45 +0900 |
| commit | 8f9f70446e90e335ad49e03a72b43a44d447db31 (patch) | |
| tree | 12e2ebbd26b125a54741e42768b8dbe29a7b6da2 /pkgs/development/haskell-modules/patches | |
| parent | 408d7aabb477f3f9d3ed0441a00833e2c1b72ca8 (diff) | |
haskellPackages.dyre: fix build by removing out-dated patch and pulling from upstream
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
| -rw-r--r-- | pkgs/development/haskell-modules/patches/dyre-nix.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/development/haskell-modules/patches/dyre-nix.patch b/pkgs/development/haskell-modules/patches/dyre-nix.patch deleted file mode 100644 index 458e540e0c4ad..0000000000000 --- a/pkgs/development/haskell-modules/patches/dyre-nix.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dyre-0.8.12/Config/Dyre/Compile.hs 2015-04-13 11:00:20.794278350 +0100 -+++ dyre-0.8.12-patched/Config/Dyre/Compile.hs 2015-04-13 11:07:26.938893502 +0100 -@@ -10,11 +10,13 @@ - import System.FilePath ( (</>) ) - import System.Directory ( getCurrentDirectory, doesFileExist - , createDirectoryIfMissing ) -+import System.Environment ( lookupEnv ) -+import Control.Applicative ((<$>)) - import Control.Exception ( bracket ) --import GHC.Paths ( ghc ) - - import Config.Dyre.Paths ( getPaths ) - import Config.Dyre.Params ( Params(..) ) -+import Data.Maybe ( fromMaybe ) - - -- | Return the path to the error file. - getErrorPath :: Params cfgType -> IO FilePath -@@ -47,6 +49,7 @@ - errFile <- getErrorPath params - result <- bracket (openFile errFile WriteMode) hClose $ \errHandle -> do - ghcOpts <- makeFlags params configFile tempBinary cacheDir libsDir -+ ghc <- fromMaybe "ghc" <$> lookupEnv "NIX_GHC" - ghcProc <- runProcess ghc ghcOpts (Just cacheDir) Nothing - Nothing Nothing (Just errHandle) - waitForProcess ghcProc |