From 16959f6ca07d4d982777b90eecede7d51c1d6fb5 Mon Sep 17 00:00:00 2001 From: vi Date: Thu, 25 Dec 2014 19:54:21 +0000 Subject: [PATCH] Bumped dependencies, added a Nix derivation. --- default.nix | 15 +++++++++++++++ https-everywhere-rules.cabal | 20 +++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..cdd29fd --- /dev/null +++ b/default.nix @@ -0,0 +1,15 @@ +let nixpkgs = (import {}).fetchgit { + url = "git://github.com/nixos/nixpkgs.git"; + rev = "ef5c48326a7fd7f6d2dc944634afc6b55381dd6d"; + sha256 = "17kbhjgrpza61a2y8v1h21p8cmrdpvdajd0zrcb8vh18hw5pqa3i"; +}; in { pkgs ? import nixpkgs {} }: let + httpsEverywhereRulesRaw = import (pkgs.fetchgit { + url = "git://github.com/fmap/https-everywhere-rules.git"; + rev = "c90400b0d366caef5946995a3db6c16bfe3ef33d"; + sha256 = "fe6c4ff4e731110c8cb13b81000773fee97acdf05becea1bd4ce851beb303a3e"; + fetchSubmodules = true; + }) {}; +in pkgs.haskellPackages.buildLocalCabalWithArgs { + name = "https-everywhere-rules"; src = ./.; + args = { inherit httpsEverywhereRulesRaw; }; +} diff --git a/https-everywhere-rules.cabal b/https-everywhere-rules.cabal index fe68fc9..459e92d 100644 --- a/https-everywhere-rules.cabal +++ b/https-everywhere-rules.cabal @@ -36,13 +36,14 @@ library attoparsec >= 0.12 && < 0.13, errors >= 1.4 && < 1.5, functor-infix >= 0.0 && < 0.1, - http-client >= 0.3 && < 0.4, - lens >= 4.3 && < 4.4, - network >= 2.5 && < 2.6, + http-client >= 0.3 && < 0.5, + lens >= 4.3 && < 4.6, + network >= 2.6 && < 2.7, + network-uri >= 2.6 && < 2.7, pipes >= 4.1 && < 4.2, string-conversions >= 0.3 && < 0.4, taggy-lens >= 0.1 && < 0.2, - text >= 1.1 && < 1.2, + text >= 1.1 && < 1.3, text-icu >= 0.6 && < 0.8, https-everywhere-rules-raw hs-source-dirs: @@ -60,14 +61,15 @@ test-suite spec attoparsec >= 0.12 && < 0.13, errors >= 1.4 && < 1.5, functor-infix >= 0.0 && < 0.1, - hspec >= 1.10 && < 1.12, - http-client >= 0.3 && < 0.4, - lens >= 4.3 && < 4.4, - network >= 2.5 && < 2.6, + hspec >= 2.0 && < 2.1, + http-client >= 0.3 && < 0.5, + lens >= 4.3 && < 4.6, + network >= 2.6 && < 2.7, + network-uri >= 2.6 && < 2.7, pipes >= 4.1 && < 4.2, string-conversions >= 0.3 && < 0.4, taggy-lens >= 0.1 && < 0.2, - text >= 1.1 && < 1.2, + text >= 1.1 && < 1.3, text-icu >= 0.6 && < 0.8, https-everywhere-rules-raw main-is: