colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvs-fast-export: clean up; fix cross

Browse Source 
Style was unidiomatic for modern Nixpkgs, there was no
nativeBuildInputs/buildInputs separation, and some dependencies were
unused.

I've removed doCheck here, because the default Nixpkgs checkPhase
wasn't actually running the tests (need to cd into tests first), and
when I did write a checkPhase to run the tests, they didn't work and I
couldn't make them work.

A note on RCS:  There is code in cvsconvert that calls RCS, but I
analyzed it quite carefully, and came to the conclusion that all such
code is unreachable, so I removed the RCS dependency.
This commit is contained in:
Alyssa Ross 2021-06-10 12:50:44 +00:00
parent d5564db46a
commit db733deeed
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
pkgs/applications/version-management/cvs-fast-export/default.nix
View File

@ -1,31 +1,23 @@
{lib, stdenv, fetchurl, makeWrapper, flex, bison,
asciidoc, docbook_xml_dtd_45, docbook_xsl,
libxml2, libxslt,
python3, rcs, cvs, git,
coreutils, rsync}:
with stdenv; with lib;
mkDerivation rec {
name = "cvs-fast-export-${meta.version}";
meta = {
version = "1.56";
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
homepage = "http://www.catb.org/esr/cvs-fast-export/";
platforms = platforms.all;
};
{ lib, stdenv, fetchurl, makeWrapper, asciidoc, docbook_xml_dtd_45, docbook_xsl
, coreutils, cvs, diffutils, findutils, git, python3, rsync
}:
stdenv.mkDerivation rec {
pname = "cvs-fast-export";
version = "1.56";
src = fetchurl {
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.56.tar.gz";
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz";
sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU=";
};
buildInputs = [
flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
python3 rcs cvs git makeWrapper
];
strictDeps = true;
nativeBuildInputs = [ makeWrapper asciidoc ];
buildInputs = [ python3 ];
postPatch = "patchShebangs .";
postPatch = ''
patchShebangs .
'';
preBuild = ''
makeFlagsArray=(
@ -35,16 +27,18 @@ mkDerivation rec {
)
'';
doCheck = true;
postInstall = ''
wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]}
wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [
coreutils cvs diffutils findutils git
]}
'';
postInstall =
let
binpath = makeBinPath [ out rcs cvs git coreutils rsync ];
in ''
for prog in cvs-fast-export cvsconvert cvssync; do
wrapProgram $out/bin/$prog \
--prefix PATH : ${binpath}
done
''
;
meta = with lib; {
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
homepage = "http://www.catb.org/esr/cvs-fast-export/";
platforms = platforms.unix;
};
}