Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-channel-scripts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1856e2be31b6
Choose a base ref
...
head repository: NixOS/nixos-channel-scripts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fac8ec969e03
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 29, 2019

  1. Revert "Namespace channel pushes in nixpkgs" 

    This reverts commit 38d2339.
    @edolstra
    edolstra committed Oct 29, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fac8ec9 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 mirror-nixos-branch.pl
2 changes: 1 addition & 1 deletion mirror-nixos-branch.pl
View file
Original file line number Diff line number Diff line change
@@ -226,7 +226,7 @@ sub fetch {
# 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/channels/$channelName >&2") == 0 or die;
system("git push origin $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";