Merge pull request #666 from NixOS/kill-some-post-processing

FromCabal.PostProcess: remove some hooks no longer applicable to Nixpkgs

Author: sternenseemann

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs

@@ -146,11 +146,6 @@ hooks =
   , ("mysql", set (libraryDepends . system . contains (pkg "libmysqlclient")) True)
   , ("network-attoparsec", set doCheck False) -- test suite requires network access
   , ("numeric-qq", set doCheck False) -- test suite doesn't finish even after 1+ days
-  , ("opencv", opencvOverrides)
-  , ("pandoc >= 1.16.0.2 && < 2.5", set doCheck False) -- https://github.com/jgm/pandoc/issues/2709 and https://github.com/fpco/stackage/issues/1332
-  , ("pandoc < 2.6", pandocPre26Overrides)
-  , ("pandoc >= 2.6 && < 3.1.10", pandocPre3110Overrides) -- https://github.com/jgm/pandoc/commit/55227a20273267c236ec039c3e6559287a1dca45
-  , ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/369
   , ("purescript", set doCheck False) -- test suite doesn't cope with Nix build env
   , ("proto-lens-protobuf-types", set (libraryDepends . tool . contains (pkg "protobuf")) True)
   , ("proto-lens-protoc", set (libraryDepends . tool . contains (pkg "protobuf")) True)
@@ -321,10 +316,6 @@ hfseventsOverrides
   . set (metaSection . platforms) (Just $ Set.singleton (NixpkgsPlatformGroup (ident # "darwin")))
   . over (libraryDepends . haskell) (Set.union (Set.fromList (map bind ["self.base", "self.cereal", "self.mtl", "self.text", "self.bytestring"])))
 
-opencvOverrides :: Derivation -> Derivation
-opencvOverrides = set phaseOverrides "hardeningDisable = [ \"bindnow\" ];"
-                . over (libraryDepends . pkgconfig) (replace (pkg "opencv") (pkg "opencv3"))
-
 hspecCoreOverrides :: Derivation -> Derivation   -- https://github.com/hspec/hspec/issues/330
 hspecCoreOverrides = set testFlags [ "--skip", "'Test.Hspec.Core.Runner.hspecResult runs specs in parallel'" ]
 
@@ -348,24 +339,6 @@ gtkglextHook = over (libraryDepends . system) (Set.union (Set.fromList deps))
                     , "pkgs.xorg.libXmu"
                     ]
 
-pandocPre26Overrides :: Derivation -> Derivation
-pandocPre26Overrides = set phaseOverrides postInstall
-  where
-    postInstall = unlines [ "postInstall = ''"
-                          , "  mkdir -p $out/share"
-                          , "  mv $data/*/*/man $out/share/"
-                          , "'';"
-                          ]
-
-pandocPre3110Overrides :: Derivation -> Derivation
-pandocPre3110Overrides = set phaseOverrides postInstall
-  where
-    postInstall = unlines [ "postInstall = ''"
-                          , "  mkdir -p $out/share/man/man1"
-                          , "  mv \"man/\"*.1 $out/share/man/man1/"
-                          , "'';"
-                          ]
-
 bustleOverrides :: Derivation -> Derivation
 bustleOverrides = set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True
                 . set (executableDepends . pkgconfig . contains "gio-unix = null") False

cabal2nix/test/golden-test-cases/opencv.nix.golden

@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, base64-bytestring, bindings-DSL
 , bytestring, Cabal, containers, criterion, data-default, deepseq
 , directory, Glob, haskell-src-exts, inline-c, inline-c-cpp
-, JuicyPixels, lens, lib, linear, opencv3, primitive, QuickCheck
+, JuicyPixels, lens, lib, linear, opencv, primitive, QuickCheck
 , repa, tasty, tasty-hunit, tasty-quickcheck, template-haskell
 , text, transformers, vector
 }:
@@ -15,15 +15,14 @@ mkDerivation {
     data-default deepseq inline-c inline-c-cpp JuicyPixels linear
     primitive repa template-haskell text transformers vector
   ];
-  libraryPkgconfigDepends = [ opencv3 ];
+  libraryPkgconfigDepends = [ opencv ];
   testHaskellDepends = [
     base bytestring containers data-default directory Glob
     haskell-src-exts JuicyPixels lens linear primitive QuickCheck repa
     tasty tasty-hunit tasty-quickcheck template-haskell text
     transformers vector
   ];
   benchmarkHaskellDepends = [ base bytestring criterion repa ];
-  hardeningDisable = [ "bindnow" ];
   homepage = "https://github.com/LumiGuide/haskell-opencv";
   description = "Haskell binding to OpenCV-3.x";
   license = lib.licenses.bsd3;

cabal2nix/test/golden-test-cases/pandoc.nix.golden

@@ -47,10 +47,6 @@ mkDerivation {
   benchmarkHaskellDepends = [
     base bytestring deepseq mtl tasty-bench text
   ];
-  postInstall = ''
-    mkdir -p $out/share/man/man1
-    mv "man/"*.1 $out/share/man/man1/
-  '';
   homepage = "https://pandoc.org";
   description = "Conversion between markup formats";
   license = lib.licenses.gpl2Plus;