git-annex: manually install man pages

Setup.hs no longer installs the man pages via unix-compat. Instead, this
has to be done manually-ish via the Makefile.

Move passthru to configuration-nix.nix.
This commit is contained in:
sternenseemann
2024-01-16 23:57:45 +01:00
parent 31858b7516
commit 4ab4021420
4 changed files with 15 additions and 34 deletions
@@ -365,16 +365,7 @@ self: super: {
rm -r $out/doc/?ndroid*
'';
};
# Git annex provides a restricted login shell. Setting
# passthru.shellPath here allows a user's login shell to be set to
# `git-annex-shell` by making `shell = haskellPackages.git-annex`.
# https://git-annex.branchable.com/git-annex-shell/
passthru.shellPath = "/bin/git-annex-shell";
}) (super.git-annex.overrideScope (self: _: {
# https://github.com/haskell-pkg-janitors/unix-compat/issues/3
unix-compat = self.unix-compat_0_6;
}));
}) super.git-annex;
# Too strict bounds on servant
# Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555
@@ -139,7 +139,6 @@ extra-packages:
- ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.*
- ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.*
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
- unix-compat < 0.7 # 2023-07-04: Need System.PosixCompat.User for git-annex
- algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0
- fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10
@@ -795,6 +795,7 @@ self: super: builtins.intersectAttrs super {
substituteInPlace Test.hs \
--replace ', testCase "crypto" test_crypto' ""
'' + (drv.postPatch or "");
# Ensure git-annex uses the exact same coreutils it saw at build-time.
# This is especially important on Darwin but also in Linux environments
# where non-GNU coreutils are used by default.
@@ -805,6 +806,19 @@ self: super: builtins.intersectAttrs super {
buildTools = [
pkgs.buildPackages.makeWrapper
] ++ (drv.buildTools or []);
# Git annex provides a restricted login shell. Setting
# passthru.shellPath here allows a user's login shell to be set to
# `git-annex-shell` by making `shell = haskellPackages.git-annex`.
# https://git-annex.branchable.com/git-annex-shell/
passthru.shellPath = "/bin/git-annex-shell";
# Install man pages which is no longer done by Setup.hs
# TODO(@sternenseemann): figure out why install-desktops wants to create /usr
# and run that, too.
postInstall = drv.postInstall or "" + ''
make install-mans "DESTDIR=$out" PREFIX=
'';
}) (super.git-annex.override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
-23
View File
@@ -138843,9 +138843,7 @@ self: {
executableHaskellDepends = [ base ];
description = "Haskell Evaluation inside of LaTeX code";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "haskintex";
broken = true;
}) {};
"hasklepias" = callPackage
@@ -241254,9 +241252,7 @@ self: {
executableHaskellDepends = [ base ];
description = "Treemap visualiser for GHC prof files";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "profiteur";
broken = true;
}) {};
"profunctor-arrows" = callPackage
@@ -310950,25 +310946,6 @@ self: {
license = lib.licenses.bsd3;
}) {};
"unix-compat_0_6" = callPackage
({ mkDerivation, base, directory, extra, hspec, HUnit
, monad-parallel, temporary, unix
}:
mkDerivation {
pname = "unix-compat";
version = "0.6";
sha256 = "1y6m8ix8np6vambabdaj2h7ydgda8igwy3kliv53mba3clx85kdl";
revision = "1";
editedCabalFile = "0g5mi6rh977idajgxnnlsd7dp28vf4xwiiwpsc4pj1rqv0lhjp8g";
libraryHaskellDepends = [ base unix ];
testHaskellDepends = [
base directory extra hspec HUnit monad-parallel temporary
];
description = "Portable POSIX-compatibility layer";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"unix-compat" = callPackage
({ mkDerivation, base, directory, extra, hspec, HUnit
, monad-parallel, temporary, unix