Merge pull request #126484 from alyssais/cvs-fast-export

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

@@ -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.57";
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.56.tar.gz";
-    sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU=";
+    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz";
+    sha256 = "0y1fzsicga19nsarpmn2ms69sq26b2d3d8a1169qbqz1kzr0jji8";
   };
 
-  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;
+  };
 }

pkgs/top-level/aliases.nix

@@ -158,6 +158,7 @@ mapAliases ({
   cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
   cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15
   cv = progress; # added 2015-09-06
+  cvs_fast_export = cvs-fast-export; # added 2021-06-10
   d1x_rebirth = dxx-rebirth; # added 2018-04-25
   d2x_rebirth = dxx-rebirth; # added 2018-04-25
   dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15

pkgs/top-level/all-packages.nix

@@ -3939,7 +3939,7 @@ in
 
   cwebbin = callPackage ../development/tools/misc/cwebbin { };
 
-  cvs_fast_export = callPackage ../applications/version-management/cvs-fast-export { };
+  cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { };
 
   dadadodo = callPackage ../tools/text/dadadodo { };