From e3a81049a70b7f7316f90878e5031b63dc2acf23 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 3 Nov 2020 17:39:53 +0800 Subject: [PATCH] Use pinned nixpkgs in release.nix too --- default.nix | 6 +----- nixpkgs.nix | 9 +++++++++ release.nix | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 nixpkgs.nix diff --git a/default.nix b/default.nix index e556b69..51953df 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,4 @@ -{ nixpkgsSrc ? builtins.fetchTarball { - url = - "https://github.com/NixOS/nixpkgs/archive/50a8d606f3527b88fbd9f68048944470c1b900cd.tar.gz"; # haskell-updates - sha256 = "07xlglmlhf3q6h8cdi3rfg4b0jk70h42kwpgwdh5b1vz149njins"; -}, pkgs ? import nixpkgsSrc { }, compiler ? null, hoogle ? true +{ pkgs ? import ./nixpkgs.nix, compiler ? null, hoogle ? true , forShell ? pkgs.lib.inNixShell }: let diff --git a/nixpkgs.nix b/nixpkgs.nix new file mode 100644 index 0000000..c7e5cbd --- /dev/null +++ b/nixpkgs.nix @@ -0,0 +1,9 @@ +let + nixpkgsSrc = builtins.fetchTarball { + url = + "https://github.com/NixOS/nixpkgs/archive/50a8d606f3527b88fbd9f68048944470c1b900cd.tar.gz"; # haskell-updates + sha256 = "07xlglmlhf3q6h8cdi3rfg4b0jk70h42kwpgwdh5b1vz149njins"; + }; + +in import nixpkgsSrc { } + diff --git a/release.nix b/release.nix index 4aa29b4..b2a24ad 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,4 @@ -{ pkgs ? import { }, compiler ? "ghc884" }: +{ pkgs ? import ./nixpkgs.nix, compiler ? "ghc884" }: with pkgs.haskell.lib;