From 8c02d755cc947a27d1f2f035cf5b05cb63baba0d Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Mon, 7 Oct 2019 09:59:47 +0100 Subject: Clean up default.nix file --- default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 1a135c0..9093557 100644 --- a/default.nix +++ b/default.nix @@ -1,15 +1,13 @@ { nixpkgs ? null, compiler ? "ghc865", doBenchmark ? false } : let - sysPkg = import { }; pinnedPkg = builtins.fetchGit { name = "nixos-unstable-2019-10-06"; url = https://github.com/nixos/nixpkgs/; rev = "271fef8a4eb03cd9de0c1fe2f0b7f4a16c2de49a"; }; - npkgs = if nixpkgs == null then - import pinnedPkg {} - else - import nixpkgs {}; + npkgs = if nixpkgs == null + then import pinnedPkg {} + else import nixpkgs {}; variant = if doBenchmark then npkgs.pkgs.haskell.lib.doBenchmark else npkgs.pkgs.lib.id; verismith = npkgs.pkgs.haskellPackages.callCabal2nix "verismith" (./.) {}; in -- cgit