Skip to content

Commit

Permalink
Kill the temporary darwin-specific channel
Browse files Browse the repository at this point in the history
The issues have been resolved upstream in the main nixpkgs channel now
(cherry picked from commit c89783b)
  • Loading branch information
copumpkin authored and edolstra committed Sep 6, 2016
1 parent 7ead75c commit f249521
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions release.nix
Expand Up @@ -77,8 +77,7 @@ let

build = pkgs.lib.genAttrs systems (system:

# FIXME: temporarily use a different branch for the Darwin build.
with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; };
with import <nixpkgs> { inherit system; };

releaseTools.nixBuild {
name = "nix";
Expand Down Expand Up @@ -113,7 +112,7 @@ let
binaryTarball = pkgs.lib.genAttrs systems (system:

# FIXME: temporarily use a different branch for the Darwin build.
with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; };
with import <nixpkgs> { inherit system; };

let
toplevel = builtins.getAttr system jobs.build;
Expand Down

0 comments on commit f249521

Please sign in to comment.