git.iko.soy/typeable/cabal2nix
on master help sign in
Use new OSX constructor for OS in Cabal 1.24.x.
commit1778c7906ed712dc9977ee47e38a7b9e63c48f17 authorPeter Simons <simons@cryp.to> dateMon 13 Jun 2016, 16:12 (10 years ago) parent2e4dabd
4 files changed+6−6
compare with master
unifiedsplit
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Platform.hs+1−1 distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+3−3 distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+1−1 distribution-nixpkgs/src/Distribution/Nixpkgs/Meta.hs+1−1
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Platform.hs+1−1
@@ -5,5 +5,5 @@ import Distribution.System
55fromCabalPlatform :: Platform -> String
66fromCabalPlatform (Platform I386 Linux) = "\"i686-linux\""
77fromCabalPlatform (Platform X86_64 Linux) = "\"x86_64-linux\""
8−fromCabalPlatform (Platform X86_64 (OtherOS "darwin")) = "\"x86_64-darwin\""
8+fromCabalPlatform (Platform X86_64 OSX) = "\"x86_64-darwin\""
99fromCabalPlatform p = error ("fromCabalPlatform: invalid Nix platform" ++ show p)
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+3−3
@@ -58,12 +58,12 @@ hooks =
5858 , ("git-annex", gitAnnexHook)
5959 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
6060 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
61− , ("goatee-gtk", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os /= OtherOS "darwin")))
61+ , ("goatee-gtk", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os /= OSX)))
6262 , ("gtk3", gtk3Hook)
6363 , ("haddock", haddockHook) -- https://github.com/haskell/haddock/issues/511
6464 , ("hakyll", set (testDepends . tool . contains (pkg "utillinux")) True) -- test suite depends on "rev"
6565 , ("haskell-src-exts == 1.17.1", set doCheck False) -- test suite fails with ghc 8.0.1
66− , ("hfsevents", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == OtherOS "darwin")))
66+ , ("hfsevents", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == OSX)))
6767 , ("HFuse", set phaseOverrides hfusePreConfigure)
6868 , ("hlibgit2 >= 0.18.0.14", set (testDepends . tool . contains (pkg "git")) True)
6969 , ("hmatrix", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'\";")
@@ -141,7 +141,7 @@ haddockHook = set doCheck False
141141gitAnnexHook :: Derivation -> Derivation
142142gitAnnexHook = set phaseOverrides gitAnnexOverrides
143143 . over (executableDepends . system) (Set.union buildInputs)
144− . over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os /= OtherOS "darwin"))
144+ . over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os /= OSX))
145145 where
146146 gitAnnexOverrides = unlines
147147 [ "preConfigure = \"export HOME=$TEMPDIR; patchShebangs .\";"
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+1−1
@@ -87,7 +87,7 @@ instance IsString CompilerId where
8787instance IsString Platform where
8888 fromString "i686-linux" = Platform I386 Linux
8989 fromString "x86_64-linux" = Platform X86_64 Linux
90− fromString "x86_64-darwin" = Platform X86_64 (OtherOS "darwin")
90+ fromString "x86_64-darwin" = Platform X86_64 OSX
9191 fromString s = error ("fromString: " ++ show s ++ " is not a valid platform")
9292
9393instance FromJSON Platform where
distribution-nixpkgs/src/Distribution/Nixpkgs/Meta.hs+1−1
@@ -91,5 +91,5 @@ nullMeta = Meta
9191
9292allKnownPlatforms :: Set Platform
9393allKnownPlatforms = Set.fromList [ Platform I386 Linux, Platform X86_64 Linux
94− , Platform X86_64 (OtherOS "darwin")
94+ , Platform X86_64 OSX
9595 ]