From 5d996e2a53d2f4099dff4de9eae04f386bdb945a Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 10 Sep 2019 15:30:59 -0400
Subject: [PATCH] Try specifying the nixpkgs we want like this, instead.
---
.circleci/config.yml | 4 ++++
shell.nix | 12 +++---------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 276e0c5..2fda09c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,10 @@ jobs:
test:
docker:
- image: "nixos/nix:2.2.1"
+
+ environment:
+ NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c83ad6ac13b67101cc3e2e07781963a010c1624.tar.gz"
+
steps:
- run:
name: "Install Git"
diff --git a/shell.nix b/shell.nix
index 5963efc..b474e00 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,12 +1,6 @@
-let
- pinnedPkgs = import (builtins.fetchTarball {
- url = "https://github.com/NixOS/nixpkgs/archive/3c83ad6ac13b67101cc3e2e07781963a010c1624.tar.gz";
- sha256 = "0cdq342wrkvkyccygpp1gvwp7hhqg68hljjwld4vjixm901ayy14";
- }) {};
-in
-{ ... }:
-pinnedPkgs.mkShell {
+{ pkgs ? import <nixpkgs> { } }:
+pkgs.mkShell {
buildInputs = [
- pinnedPkgs.stack
+ pkgs.stack
];
}
--
GitLab