From b3344ac67a6ebe79bbbdb52933b435d05ee98813 Mon Sep 17 00:00:00 2001 From: Matvey Aksenov Date: Sun, 1 Nov 2015 14:56:08 +0000 Subject: [PATCH] Update Nix configuration. --- default.nix | 4 ++-- terminal-size.nix => package.nix | 0 shell.nix | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename terminal-size.nix => package.nix (100%) diff --git a/default.nix b/default.nix index 46875d6..b0ddb8f 100644 --- a/default.nix +++ b/default.nix @@ -1,2 +1,2 @@ -{ nixpkgs ? import {}, compiler ? "ghc7101" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./terminal-size.nix {} +{ nixpkgs ? import {}, compiler ? "ghc7102" }: +nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./package.nix {} diff --git a/terminal-size.nix b/package.nix similarity index 100% rename from terminal-size.nix rename to package.nix diff --git a/shell.nix b/shell.nix index 3a45c98..c63054b 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ -{ nixpkgs ? import {}, compiler ? "ghc7101" }: let +{ nixpkgs ? import {}, compiler ? "ghc7102" }: let inherit (nixpkgs) pkgs; - ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages( ps: with ps; [ - hdevtools doctest + ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages(ps: [ + ps.hdevtools ps.hlint ps.ghc-mod ]); cabal-install = pkgs.haskell.packages.${compiler}.cabal-install; pkg = (import ./default.nix { inherit nixpkgs compiler; });