Merge pull request #618 from NixOS/git-annex-post-process

FromCabal.PostProcess: remove gitAnnexHook
NixOS · Apr 21, 2024 · f8e6bf7 · f8e6bf7
2 parents 173e8a5 + 6260a55
commit f8e6bf7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs
@@ -24,18 +24,17 @@ configureCabalFlags' (PackageIdentifier name version)
  | name == "diagrams-builder"   = [enable "cairo", enable "svg", enable "ps", enable "rasterific"]
  | name == "fltkhs"             = [enable "opengl"]
  | name == "folds"              = [disable "test-hlint"]
- | name == "git-annex"          = [ enable "assistant"
+ | name == "git-annex"          = [ -- default
+                                    enable "assistant"
+                                  , disable "debuglocks"
+                                    -- custom
                                   , disable "benchmark"
+                                  , enable "crypton"
                                   , enable "dbus"
-                                  , disable "debuglocks"
                                   , enable "magicmime"
-                                  , enable "networkbsd"
                                   , enable "pairing"
                                   , enable "production"
-                                  , enable "s3"
                                   , enable "torrentparser"
-                                  , enable "webapp"
-                                  , enable "webdav"
                                   ]
  | name == "haskeline"          = [enable "terminfo"]
  | name == "haste-compiler"     = [enable "portable"]

diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
@@ -110,7 +110,6 @@ hooks =
   , ("gio", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
   , ("git", set doCheck False)          -- https://github.com/vincenthz/hit/issues/33
   , ("git-annex >= 6.20170925 && < 6.20171214", set doCheck False)      -- some versions of git-annex require their test suite to be run inside of a git checkout
-  , ("git-annex", gitAnnexHook)
   , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
   , ("GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))
   , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
@@ -224,22 +223,6 @@ haddockHook = set doCheck False
             . over (dependencies . haskell) (Set.filter (\b -> view localName b /= "haddock-test"))
             . set (metaSection . broken) False
 
-gitAnnexHook :: Derivation -> Derivation
-gitAnnexHook = set phaseOverrides gitAnnexOverrides
-             . over (executableDepends . system) (Set.union buildInputs)
-  where
-    gitAnnexOverrides = unlines
-      [ "preConfigure = \"export HOME=$TEMPDIR; patchShebangs .\";"
-      , "postBuild = ''"
-      , "  ln -sf dist/build/git-annex/git-annex git-annex"
-      , "  ln -sf git-annex git-annex-shell"
-      , "'';"
-      , "installPhase = \"make PREFIX=$out BUILDER=: install install-completions\";"
-      , "checkPhase = ''PATH+=\":$PWD\" git-annex test'';"
-      , "enableSharedExecutables = false;"
-      ]
-    buildInputs = pkgs ["git","rsync","gnupg","curl","wget","lsof","openssh","which","bup","perl"]
-
 hfusePreConfigure :: String
 hfusePreConfigure = unlines
   [ "preConfigure = ''"