From b6824330da49a974c6ed3417d1d2f6b6be49eacb Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Tue, 12 Sep 2017 13:49:41 -0700 Subject: [PATCH] Change `shell.nix` to stay in sync with `release.nix` (#133) This simplifies the `shell.nix` to reuse the `dhall` derivation from `release.nix` and also ensures that they stay in sync with one another --- shell.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/shell.nix b/shell.nix index 2f8cc5c..2ac3386 100644 --- a/shell.nix +++ b/shell.nix @@ -1,15 +1 @@ -{ nixpkgs ? import {}, compiler ? "default" }: - -let - - inherit (nixpkgs) pkgs; - - haskellPackages = if compiler == "default" - then pkgs.haskellPackages - else pkgs.haskell.packages.${compiler}; - - drv = haskellPackages.callPackage ./. {}; - -in - - if pkgs.lib.inNixShell then drv.env else drv +(import ./release.nix).dhall.env