Merge pull request #96339 from danieldk/fossil-improvements

fossil: install man page and bash shell completions, use system sqlite
This commit is contained in:
Daniël de Kok 2020-09-01 08:53:10 +02:00 committed by GitHub
commit 8ec5187cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,16 @@
{ stdenv
, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
, tcllib, withJson ? true
, installShellFiles
, tcl
, libiconv
, fetchurl
, zlib
, openssl
, readline
, sqlite
, ed
, which
, tcllib
, withJson ? true
}:
stdenv.mkDerivation rec {
@ -16,26 +26,33 @@ stdenv.mkDerivation rec {
sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2";
};
nativeBuildInputs = [ installShellFiles tcl ];
buildInputs = [ zlib openssl readline sqlite which ed ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = [ tcl ];
++ stdenv.lib.optional stdenv.isDarwin libiconv;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
configureFlags = [ "--disable-internal-sqlite" ]
++ stdenv.lib.optional withJson "--json";
preCheck = ''
export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
'';
configureFlags = stdenv.lib.optional withJson "--json";
preBuild=''
preBuild = ''
export USER=nonexistent-but-specified-user
'';
installPhase = ''
mkdir -p $out/bin
INSTALLDIR=$out/bin make install
installManPage fossil.1
installShellCompletion --name fossil.bash tools/fossil-autocomplete.bash
'';
meta = {
meta = with stdenv.lib; {
description = "Simple, high-reliability, distributed software configuration management";
longDescription = ''
Fossil is a software configuration management system. Fossil is
@ -45,11 +62,7 @@ stdenv.mkDerivation rec {
from the others by being extremely simple to setup and operate.
'';
homepage = "http://www.fossil-scm.org/";
license = stdenv.lib.licenses.bsd2;
platforms = with stdenv.lib.platforms; all;
maintainers = [ #Add your name here!
stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.viric
];
license = licenses.bsd2;
maintainers = with maintainers; [ maggesi viric ];
};
}