From f1ee14bfaf3f0e3de03226e915ab7961b9034b58 Mon Sep 17 00:00:00 2001 From: LluĂ­s Batlle i Rossell Date: Sun, 8 Nov 2009 01:51:20 +0000 Subject: Removing fetchgit --depth and its usage. It does not provide much advantages... I think it takes the recent N commits into the repository, which says very little, even for wanting master/HEAD. svn path=/nixpkgs/trunk/; revision=18277 --- pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix | 3 --- .../networking/browsers/uzbl/src-info-for-experimental.nix | 2 -- pkgs/build-support/builder-defs/builder-defs.nix | 4 ++-- pkgs/build-support/fetchgit/builder.sh | 2 +- pkgs/build-support/fetchgit/default.nix | 2 +- pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix | 1 - pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix | 2 -- pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix | 2 -- 8 files changed, 4 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix index fadbd7d98b9c..237a56aaa75c 100644 --- a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix +++ b/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix @@ -4,7 +4,4 @@ rec { hash="b5dfae5245b1b3934ca918831fbe9fa0bb7ae790c682b69f5ecc042cccf58894"; rev="1461ac760f79b8f153c8317c4534cb047a48331a"; url="git://github.com/Dieterbe/uzbl.git"; - - depth="50"; - } diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix index f2004980d599..60750f7b90be 100644 --- a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix +++ b/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix @@ -3,6 +3,4 @@ baseName = "uzbl-experimental"; method = "fetchgit"; rev = "origin/experimental"; - extraVars = "depth"; - eval_depth = "depth=50"; } diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index fe4b16374a3d..814ce460794c 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -546,11 +546,11 @@ let inherit (builtins) head tail trace; in sha256 = srcInfo.hash; }; - fetchGitFromSrcInfo = srcInfo: fetchgit ({ + fetchGitFromSrcInfo = srcInfo: fetchgit { url = srcInfo.url; rev = srcInfo.rev; sha256 = srcInfo.hash; - } // (if srcInfo ? depth then {inherit (srcInfo) depth;} else {})); + }; }) // args # [1]: rewrite using '' instead of " so that indentation gets stripped. It's diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 83a3157b498f..08a1cc5d3419 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -2,7 +2,7 @@ source $stdenv/setup header "exporting $url (rev $rev) into $out" -git clone --depth "$depth" "$url" $out +git clone "$url" $out if test -n "$rev"; then cd $out git checkout $rev diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index b8517245d28b..270125f5bd74 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,5 +1,5 @@ {stdenv, git}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", depth ? 1}: +{url, rev ? "HEAD", md5 ? "", sha256 ? ""}: stdenv.mkDerivation { name = "git-export"; diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix index 2d06b7298076..fed3b4555add 100644 --- a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix +++ b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix @@ -4,5 +4,4 @@ rec { hash="86e254d1aab17a66d7f5a83d93430b11dbeb95be1ee06f1d6a4c36219e4dfaf4"; rev="cd9caea74b8f90e8dded45a93a173f0f5c5aef25"; url="git://zen-kernel.org/kernel/zen-stable.git"; - depth = "500"; } diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix b/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix index 9db52a590496..a3d781375533 100644 --- a/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix +++ b/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix @@ -4,6 +4,4 @@ rec { hash="f5c86214424c8a7202c2dd9bbbd800561940af00800edb8afab080a73c185bca"; rev="66a44aa93959818bdb8153fea27b0992197ebc54"; url="git://zen-kernel.org/kernel/zen-stable.git"; - depth = "500"; - } diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix index f19e47e35054..e71297b146db 100644 --- a/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix +++ b/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix @@ -3,6 +3,4 @@ rev = "origin/master"; baseName = "zen-linux"; method = "fetchgit"; - extraVars = "depth"; - eval_depth = "depth=500"; } -- cgit 1.4.1