diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:29:08 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:37:11 +0200 |
commit | 2cd7c1f19888ae73bf7ef0f41a45680cfb86334a (patch) | |
tree | 1d153e8744e4fb693b78f5a7c1ac445201b610a2 /nixos/lib/make-channel.nix | |
parent | 91e71725d49c185401f459f58062b02bcbf1651e (diff) |
Unify NixOS and Nixpkgs channel structure
This is primarily to ensure that -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz and -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz and -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz behave consistently. It also allows installing packages via "nix-env -iA nixos.<pkg>" rather than "nixos.pkgs.<pkg>". It would be even better to allow "nixpkgs.<pkg>", but that requires a change to nix-channel. Fixes #7659.
Diffstat (limited to 'nixos/lib/make-channel.nix')
-rw-r--r-- | nixos/lib/make-channel.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 1c6bf0897f491..fd805f7f943f2 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -10,19 +10,15 @@ pkgs.releaseTools.makeSourceTarball { buildInputs = [ pkgs.nix ]; - expr = builtins.readFile ./channel-expr.nix; - distPhase = '' rm -rf .git echo -n $VERSION_SUFFIX > .version-suffix echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision releaseName=nixos-$VERSION$VERSION_SUFFIX mkdir -p $out/tarballs - mkdir ../$releaseName - cp -prd . ../$releaseName/nixpkgs + cp -prd . ../$releaseName chmod -R u+w ../$releaseName - ln -s nixpkgs/nixos ../$releaseName/nixos - echo "$expr" > ../$releaseName/default.nix + ln -s . ../$releaseName/nixpkgs # hack to make ‘<nixpkgs>’ work NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null cd .. chmod -R u+w $releaseName |