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: 6165ae664dde
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: 1856e2be31b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 29, 2019

  1. 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.
    @grahamc
    grahamc authored Oct 29, 2019
    Copy the full SHA
    38d2339 View commit details

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

    Namespace channel pushes in nixpkgs
    @edolstra
    edolstra authored Oct 29, 2019
    Copy the full SHA
    1856e2b 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/$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";