Merge pull request #27 from NixOS/grahamc-patch-1

Namespace channel pushes in nixpkgs
This commit is contained in:
Eelco Dolstra 2019-10-29 12:28:26 +01:00 committed by GitHub
commit 1856e2be31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -226,7 +226,7 @@ rename("$channelsDir/.htaccess.tmp", "$channelsDir/.htaccess") or die;
# Update the nixos-* branch in the nixpkgs repo. Also update the # Update the nixos-* branch in the nixpkgs repo. Also update the
# nixpkgs-channels repo for compatibility. # nixpkgs-channels repo for compatibility.
system("git remote update origin >&2") == 0 or die; system("git remote update origin >&2") == 0 or die;
system("git push origin $rev:refs/heads/$channelName >&2") == 0 or die; system("git push origin $rev:refs/heads/channels/$channelName >&2") == 0 or die;
system("git push channels $rev:refs/heads/$channelName >&2") == 0 or die; system("git push channels $rev:refs/heads/$channelName >&2") == 0 or die;
flock($lockfile, LOCK_UN) or die "cannot release channels lock\n"; flock($lockfile, LOCK_UN) or die "cannot release channels lock\n";