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

nixos-checkout: add support for git svn. Patch by Florian Friesdorf.

Browse Source 
svn path=/nixos/trunk/; revision=25349
This commit is contained in:
Evgeny Egorochkin 2011-01-02 22:13:56 +00:00
parent 23f98ee250
commit d8ad975a1f
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/installer/tools/nixos-checkout.nix
View File

@ -55,6 +55,7 @@ let
default = { default = {
svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; }; svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /* FIXME: use full path to sed in nix-pull */ ]; }; git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /* FIXME: use full path to sed in nix-pull */ ]; };
gitsvn = { valid = "[ -d .git/svn ]"; env = [ pkgs.coreutils pkgs.gitFull pkgs.gnused ]; };
}; };
description = '' description = ''
Defines, for each supported version control system Defines, for each supported version control system
@ -111,6 +112,28 @@ let
[ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; } [ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; }
${update}''; ${update}'';
} }
else if attrs.type == "gitsvn" then # sanity check for existing attrs
let
a = {
# add gitsvn defaults
url = "https://svn.nixos.org/repos/nix/${repo}";
# XXX: same default target as svn: good/bad?
target = "/etc/nixos/${repo}";
initialize = "git svn clone -s ${a.url} ${a.target}";
# splitting this in fetch and rebase -l helps to recover partly cloned repo
update = "git svn fetch && git svn rebase -l";
} // attrs;
t = escapeShellArg a.target;
in
rec {
inherit (a) type target;
default = if a ? default then a.default else false;
update = "cd ${t} && ${a.update}";
initialize = ''
cd $(dirname ${t}) && ${a.initialize}
[ -d ${t} ] || { echo "gitsvn initialize failed to create target directory ${t}"; exit 1; }
${update}'';
}
else throw "unkown repo type ${attrs.type}"; else throw "unkown repo type ${attrs.type}";
# apply prepareRepoAttrs on each repo definition # apply prepareRepoAttrs on each repo definition