From 949ac55e09dbe6276bdefdf0d9ec417f1b548075 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 15 Dec 2019 15:55:42 +0100 Subject: [PATCH] stop accepting nixpkgs as an argument set the NIX_PATH to select the version of nixpkgs to use --- default.nix | 3 +-- release.nix | 2 +- shell.nix | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 50c85bc..f6a8f72 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,4 @@ -{ nixpkgs ? }: -import nixpkgs { +import { # docker images run on Linux system = "x86_64-linux"; config = {}; diff --git a/release.nix b/release.nix index bacbcd3..f1e77d7 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,4 @@ let - pkgs = import ./. {}; + pkgs = import ./.; in pkgs.docker-nixpkgs diff --git a/shell.nix b/shell.nix index 73b2e2c..dd22871 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,4 @@ -{ nixpkgs ? }@args: -with import ./. args; +with import ./.; mkShell { buildInputs = [ jq