diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 4ab7b25..370d1cc 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,3 +1,8 @@ +0.3.4 +===== + + * Provided `hSize` on Windows. (https://github.com/biegunka/terminal-size/pull/18) + 0.3.3 ===== diff --git a/default.nix b/default.nix deleted file mode 100644 index 343ba12..0000000 --- a/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ nixpkgs ? import {}, compiler ? "ghc801" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./package.nix {} diff --git a/package.nix b/package.nix deleted file mode 100644 index e9fbfc1..0000000 --- a/package.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ mkDerivation, base, stdenv }: -mkDerivation { - pname = "terminal-size"; - version = "0.3.2.1"; - src = ./.; - buildDepends = [ base ]; - description = "Get terminal window height and width"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/shell.nix b/shell.nix index 7424566..4320082 100644 --- a/shell.nix +++ b/shell.nix @@ -1,13 +1,13 @@ -{ nixpkgs ? import {}, compiler ? "ghc801" }: let - inherit (nixpkgs) pkgs; - 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; }); -in - pkgs.stdenv.mkDerivation rec { - name = pkg.pname; - buildInputs = [ ghc cabal-install ] ++ pkg.env.buildInputs; - shellHook = "${pkg.env.shellHook}\nexport IN_WHICH_NIX_SHELL=${name}"; - } +{ pkgs ? import {} +, ghc ? pkgs.haskell.compiler.ghc8107 +, stack ? pkgs.stack +}: +pkgs.mkShell { + buildInputs = with pkgs; [ + ghc + stack + ]; + + shellHook = '' + ''; +} diff --git a/terminal-size.cabal b/terminal-size.cabal index 7ea4bd1..20cf0ad 100644 --- a/terminal-size.cabal +++ b/terminal-size.cabal @@ -1,5 +1,5 @@ name: terminal-size -version: 0.3.3 +version: 0.3.4 synopsis: Get terminal window height and width description: Get terminal window height and width without ncurses dependency. @@ -21,7 +21,7 @@ source-repository head source-repository this type: git location: https://github.com/biegunka/terminal-size - tag: 0.3.3 + tag: 0.3.4 library default-language: