From b8c5076a55617afa69abaee532948666b0c849b8 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 8 Jul 2017 19:14:44 +0200 Subject: Nix: Use nixos-unstable for nodejs on Linux My Laptop uses the stable channel for the system by default, but also has the unstable channel available for when I need it. NodeJS 8 isn't available on the stable channel, so manually import nixos-unstable. Other machines shouldn't be affected, as they're using nixpkgs unstable on other OSes. --- nix/.config/nixpkgs/config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nix') diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix index dc4e40a2..11d704a9 100644 --- a/nix/.config/nixpkgs/config.nix +++ b/nix/.config/nixpkgs/config.nix @@ -1,11 +1,15 @@ { pkgs }: { packageOverrides = super: let self = super.pkgs; + pkgsUnstable = if super.pkgs.stdenv.isLinux + then import {} + else super.pkgs; + in with self; rec { myEmacs = super.callPackage ./emacs.nix { emacs = if stdenv.isDarwin then emacs25Macport else emacs; }; - nodejs = pkgs.nodejs-8_x; + nodejs = pkgsUnstable.nodejs-8_x; }; allowUnfree = true; -- cgit 1.4.1