diff options
-rw-r--r-- | pkgs/sternenseemann/default.nix | 6 | ||||
-rw-r--r-- | pkgs/sternenseemann/fetchcvs/builder.sh | 27 | ||||
-rw-r--r-- | pkgs/sternenseemann/fetchcvs/default.nix | 20 |
3 files changed, 1 insertions, 52 deletions
diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix index 984afa5b..23845195 100644 --- a/pkgs/sternenseemann/default.nix +++ b/pkgs/sternenseemann/default.nix @@ -33,10 +33,6 @@ let }; }; - # temporarily vendor the fixed fetchcvs builder - # from nixpkgs master - fetchcvs = callPackage ./fetchcvs { }; - in lib.fix (self: { @@ -47,7 +43,7 @@ lib.fix (self: { logbook = ocamlPackages.callPackage ./logbook { }; mandoc = pkgs.mandoc.overrideAttrs (old: rec { - src = fetchcvs { + src = pkgs.fetchcvs { sha256 = "19cqasw7fjsmhshs5khxrv8w3vdhf8xadls70l0gzqn7cyjmgsb9"; date = "2021-02-07"; cvsRoot = "anoncvs@mandoc.bsd.lv:/cvs"; diff --git a/pkgs/sternenseemann/fetchcvs/builder.sh b/pkgs/sternenseemann/fetchcvs/builder.sh deleted file mode 100644 index fe1019aa..00000000 --- a/pkgs/sternenseemann/fetchcvs/builder.sh +++ /dev/null @@ -1,27 +0,0 @@ -source $stdenv/setup - -(echo "#!$SHELL"; \ - echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh -chmod +x ssh -export CVS_RSH=$PWD/ssh - -# creating the export drictory and checking out there only to be able to -# move the content without the root directory into $out ... -# cvs -f -d "$url" export $tag -d "$out" "$module" -# should work (but didn't - got no response on #cvs) -# See als man Page for those options - -mkdir -p export -if [ -n "$tag" ]; then - tag="-r $tag" -else - if [ -n "$date" ]; then - tag="-D $date" - else - tag="-D NOW" - fi -fi -(cd export && cvs -f -z0 -d "$cvsRoot" export $tag "$module") -mv export/* $out - -stopNest diff --git a/pkgs/sternenseemann/fetchcvs/default.nix b/pkgs/sternenseemann/fetchcvs/default.nix deleted file mode 100644 index 1f7947d4..00000000 --- a/pkgs/sternenseemann/fetchcvs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# example tags: -# date="2007-20-10"; (get the last version before given date) -# tag="<tagname>" (get version by tag name) -# If you don't specify neither one date="NOW" will be used (get latest) - -{stdenvNoCC, cvs, openssh}: - -{cvsRoot, module, tag ? null, date ? null, sha256}: - -stdenvNoCC.mkDerivation { - name = "cvs-export"; - builder = ./builder.sh; - nativeBuildInputs = [cvs openssh]; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; - - inherit cvsRoot module sha256 tag date; -} |