Bump dependencies, nix shell cleanup

This commit is contained in:
Greg Hale 2020-02-17 20:26:38 -05:00
parent 817ced4910
commit 9d8be360e8
5 changed files with 13 additions and 12 deletions

View File

@ -1,7 +1,7 @@
let
rev = "a15d3a2411e7ca7d4ee4853b57c72fe83faee272";
rev = "733b07ca683f4929ef3fedfc10ee01ab792c44c6";
in import (builtins.fetchTarball
{
url = "https://github.com/reflex-frp/reflex-platform/archive/${rev}.tar.gz";
sha256 = "1dsvw0lah7761vndip1hqal4fjpjv84ravinnfhy83jgfav5ivna";
sha256 = "0w7jgwh9b8wdljjbb1rwc7aw9kfywfg26w0pahzd5lkshzrfix72";
}) {}

View File

@ -27,19 +27,19 @@ library
base >= 4.8 && < 5,
bytestring >= 0.10 && < 0.11,
case-insensitive >= 1.2.0.4 && < 1.3,
containers >= 0.5.6 && < 0.6,
containers >= 0.5.6 && < 0.7,
data-default >= 0.5 && < 0.8,
exceptions >= 0.8 && < 0.11,
ghcjs-dom >= 0.2 && < 0.10,
http-api-data >= 0.3.6 && < 0.4,
http-media >= 0.6 && < 0.8,
http-api-data >= 0.3.6 && < 0.5,
http-media >= 0.6 && < 0.10,
jsaddle >= 0.8 && < 0.10,
mtl >= 2.2.1 && < 2.3,
network-uri >= 2.6 && < 2.7,
reflex >= 0.5 && < 0.7,
reflex-dom-core >= 0.4 && < 0.6,
safe >= 0.3.9 && < 0.4,
servant >= 0.8 && < 0.15,
servant >= 0.8 && < 0.17,
servant-auth >= 0.2.1 && < 0.4,
string-conversions >= 0.4 && < 0.5,
text >= 1.2 && < 1.3,

View File

@ -1 +1,2 @@
(import ./travis.nix {nativeCompiler = "ghc";}).ghcPkgs.servant-reflex.env
{ nativeCompiler ? "ghc8_6" }:
(import ./travis.nix { inherit nativeCompiler; }).ghcPkgs.servant-reflex.env

View File

@ -19,13 +19,13 @@ executable back
main-is: Main.hs
-- other-modules:
-- other-extensions:
build-depends: aeson >= 0.9 && < 1.4
, base >=4.8 && <4.12
build-depends: aeson >= 0.9 && < 1.5
, base >=4.8 && < 5
, mtl
, snap >= 1.0 && < 1.2
, snap-server >= 1.0 && < 1.2
, snap-core >= 1.0 && < 1.1
, servant >= 0.8 && < 0.15
, snap-core >= 1.0 && < 1.2
, servant >= 0.8 && < 0.17
, servant-snap >= 0.8 && < 0.9
, text >= 1.0 && < 1.3
-- hs-source-dirs:

View File

@ -21,7 +21,6 @@ let
http-media = dontCheck super.http-media;
servant = dontCheck super.servant;
lens-aeson = dontCheck super.lens-aeson;
SHA = dontCheck super.SHA;
servant-reflex = lib.appendConfigureFlag
(self.callPackage ./default.nix {}) "-fExample";
};
@ -32,6 +31,7 @@ let
servant-snap = dontCheck ((import ./nix/servant-snap.nix {}) self super);
testdriver = self.callCabal2nix "testdriver" ./testdriver {};
testserver = import nix/testserver.nix ghcjsPkgs.servant-reflex self super;
servant-reflex = self.callPackage ./default.nix {};
};
};