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

Merge pull request #119465 from alyssais/fetchcvs

Browse Source 
fetch{cvs,svn}: Hack around splicing annoyance
This commit is contained in:
John Ericson 2021-04-14 17:47:27 -04:00 committed by GitHub
commit 6802c2e2ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, stdenvNoCC, lib, groff, mandoc, zlib, bison, flex
{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex
, writeText, buildPackages, splicePackages, symlinkJoin }:
let
fetchNetBSD = path: version: sha256: buildPackages.fetchcvs {
fetchNetBSD = path: version: sha256: fetchcvs {
cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot";
module = "src/${path}";
inherit sha256;

10
pkgs/top-level/all-packages.nix
View File

@ -375,7 +375,10 @@ in
fetchbzr = callPackage ../build-support/fetchbzr { };
fetchcvs = callPackage ../build-support/fetchcvs { };
fetchcvs = if stdenv.buildPlatform != stdenv.hostPlatform
# hack around splicing being crummy with things that (correctly) don't eval.
then buildPackages.fetchcvs
else callPackage ../build-support/fetchcvs { };
fetchdarcs = callPackage ../build-support/fetchdarcs { };
@ -427,7 +430,10 @@ in
fetchs3 = callPackage ../build-support/fetchs3 { };
fetchsvn = callPackage ../build-support/fetchsvn { };
fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform
# hack around splicing being crummy with things that (correctly) don't eval.
then buildPackages.fetchsvn
else callPackage ../build-support/fetchsvn { };
fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;