Skip to content

Commit

Permalink
FromCabal.PostProcess: remove gitAnnexHook
Browse files Browse the repository at this point in the history
These can more easily be maintained in configuration-nix.nix in nixpkgs.
The git-annex build system is not quite for eternity and has changed in
the last year, requiring extra fiddling around to install man pages, for
example.
  • Loading branch information
sternenseemann committed Apr 21, 2024
1 parent 4945d01 commit 6260a55
Showing 1 changed file with 0 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 = ''"
Expand Down

0 comments on commit 6260a55

Please sign in to comment.