From 38d2339ca2b3ddbda5ef34a18864c9b18474852d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 29 Oct 2019 12:17:25 +0100 Subject: [PATCH] Namespace channel pushes in nixpkgs PRs to NixOS are a bit confused about if they should PR to release-* or nixos-* or nixpkgs-*. I think namespacing the refs will go a long way in making it more obvious. --- mirror-nixos-branch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirror-nixos-branch.pl b/mirror-nixos-branch.pl index cfcd88b..1147916 100755 --- a/mirror-nixos-branch.pl +++ b/mirror-nixos-branch.pl @@ -226,7 +226,7 @@ rename("$channelsDir/.htaccess.tmp", "$channelsDir/.htaccess") or die; # Update the nixos-* branch in the nixpkgs repo. Also update the # nixpkgs-channels repo for compatibility. 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; flock($lockfile, LOCK_UN) or die "cannot release channels lock\n";