mirror of
https://github.com/unclechu/gRPC-haskell.git
synced 2024-11-14 15:19:43 +01:00
nixpkgs upgrade
This commit is contained in:
parent
75cf21839b
commit
68ce43f183
11 changed files with 29 additions and 185 deletions
|
@ -1,32 +0,0 @@
|
|||
{ mkDerivation, attoparsec, base, base-compat, base-orphans
|
||||
, base16-bytestring, bytestring, containers, deepseq, directory
|
||||
, dlist, filepath, generic-deriving, ghc-prim, hashable
|
||||
, hashable-time, HUnit, integer-logarithms, QuickCheck
|
||||
, quickcheck-instances, scientific, stdenv, tagged
|
||||
, template-haskell, test-framework, test-framework-hunit
|
||||
, test-framework-quickcheck2, text, time, time-locale-compat
|
||||
, unordered-containers, uuid-types, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "aeson";
|
||||
version = "1.1.1.0";
|
||||
sha256 = "1mkj4a09x9psmgq9sg5nz9va76756zfm97ds2gk2qpgxc7nr2dq8";
|
||||
revision = "2";
|
||||
editedCabalFile = "10bc20f8807990e71f5db74a1b7029f81f888c6f9d1c03e93883555fd1291e84";
|
||||
libraryHaskellDepends = [
|
||||
attoparsec base base-compat bytestring containers deepseq dlist
|
||||
ghc-prim hashable scientific tagged template-haskell text time
|
||||
time-locale-compat unordered-containers uuid-types vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base base-compat base-orphans base16-bytestring
|
||||
bytestring containers directory dlist filepath generic-deriving
|
||||
ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
|
||||
quickcheck-instances scientific tagged template-haskell
|
||||
test-framework test-framework-hunit test-framework-quickcheck2 text
|
||||
time time-locale-compat unordered-containers uuid-types vector
|
||||
];
|
||||
homepage = "https://github.com/bos/aeson";
|
||||
description = "Fast JSON parsing and encoding";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -1,10 +0,0 @@
|
|||
{ mkDerivation, base, Cabal, directory, filepath, stdenv }:
|
||||
mkDerivation {
|
||||
pname = "cabal-doctest";
|
||||
version = "1.0.2";
|
||||
sha256 = "0h3wsjf2mg8kw1zvxc0f9nzchj5kzvza9z0arcyixkd9rkgqq6sa";
|
||||
libraryHaskellDepends = [ base Cabal directory filepath ];
|
||||
homepage = "https://github.com/phadej/cabal-doctest";
|
||||
description = "A Setup.hs helper for doctests running";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -1,23 +0,0 @@
|
|||
{ mkDerivation, aeson, base, base-compat, hashable, lens
|
||||
, QuickCheck, semigroupoids, semigroups, stdenv, tasty
|
||||
, tasty-quickcheck, text, transformers, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "insert-ordered-containers";
|
||||
version = "0.2.1.0";
|
||||
sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
|
||||
revision = "3";
|
||||
editedCabalFile = "6fdce987672b006226243aa17522b57ec7a9e1cab247802eddbdaa9dc5b06446";
|
||||
libraryHaskellDepends = [
|
||||
aeson base base-compat hashable lens semigroupoids semigroups text
|
||||
transformers unordered-containers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base base-compat hashable lens QuickCheck semigroupoids
|
||||
semigroups tasty tasty-quickcheck text transformers
|
||||
unordered-containers
|
||||
];
|
||||
homepage = "https://github.com/phadej/insert-ordered-containers#readme";
|
||||
description = "Associative containers retating insertion order for traversals";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -1,15 +0,0 @@
|
|||
{ mkDerivation, ansi-wl-pprint, base, bytestring, process
|
||||
, QuickCheck, stdenv, transformers, transformers-compat
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "optparse-applicative";
|
||||
version = "0.14.0.0";
|
||||
sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm";
|
||||
libraryHaskellDepends = [
|
||||
ansi-wl-pprint base process transformers transformers-compat
|
||||
];
|
||||
testHaskellDepends = [ base bytestring QuickCheck ];
|
||||
homepage = "https://github.com/pcapriotti/optparse-applicative";
|
||||
description = "Utilities and combinators for parsing command line options";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
{ mkDerivation, base, bytestring, optparse-applicative, semigroups
|
||||
, stdenv, system-filepath, text, time, transformers, void
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "optparse-generic";
|
||||
version = "1.2.1";
|
||||
sha256 = "1dk945dp98mwk1v4y0cky3z0ngmd29nbg6fbaaxnigcrgpbvkjml";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring optparse-applicative semigroups system-filepath
|
||||
text time transformers void
|
||||
];
|
||||
description = "Auto-generate a command-line parser for your datatype";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -1,38 +1,42 @@
|
|||
{ mkDerivation, aeson, aeson-pretty, attoparsec, base
|
||||
, base64-bytestring, binary, bytestring, cereal, containers
|
||||
, deepseq, doctest, fetchgit, foldl, hashable, haskell-src
|
||||
, insert-ordered-containers, lens, mtl, neat-interpolation
|
||||
, optparse-generic, parsec, parsers, pretty, pretty-show
|
||||
, proto3-wire, QuickCheck, range-set-list, safe, semigroups, stdenv
|
||||
, swagger2, system-filepath, tasty, tasty-hunit, tasty-quickcheck
|
||||
, text, transformers, turtle, vector
|
||||
, contravariant, deepseq, doctest, fetchgit, filepath, foldl
|
||||
, hashable, haskell-src, insert-ordered-containers, lens, mtl
|
||||
, neat-interpolation, optparse-generic, parsec, parsers, pretty
|
||||
, pretty-show, proto3-wire, QuickCheck, quickcheck-instances
|
||||
, range-set-list, safe, semigroups, stdenv, swagger2
|
||||
, system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
|
||||
, transformers, turtle, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "proto3-suite";
|
||||
version = "0.2.0.0";
|
||||
version = "0.3.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/awakesecurity/proto3-suite.git";
|
||||
sha256 = "1khix03a4hwaqc192s523rjlsk1iq923ndmrj5myh61fr1fpcbaq";
|
||||
rev = "c103a8c6d3c16515fe2e9ea7f932d54729db2f5f";
|
||||
sha256 = "0b4akw6m6d1vyihv3vwbjlj2wczmjy0q9avfbv9p099aav3g9b4i";
|
||||
rev = "a05d6a35d514f047daf71c75ef990004792892bd";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-pretty attoparsec base base64-bytestring binary
|
||||
bytestring cereal containers deepseq foldl hashable haskell-src
|
||||
insert-ordered-containers lens mtl neat-interpolation parsec
|
||||
parsers pretty pretty-show proto3-wire QuickCheck safe semigroups
|
||||
swagger2 system-filepath text transformers turtle vector
|
||||
bytestring cereal containers contravariant deepseq filepath foldl
|
||||
hashable haskell-src insert-ordered-containers lens mtl
|
||||
neat-interpolation parsec parsers pretty pretty-show proto3-wire
|
||||
QuickCheck quickcheck-instances safe semigroups swagger2
|
||||
system-filepath text transformers turtle vector
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base containers optparse-generic proto3-wire range-set-list
|
||||
system-filepath text turtle
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson attoparsec base base64-bytestring bytestring cereal doctest
|
||||
pretty-show proto3-wire QuickCheck semigroups swagger2 tasty
|
||||
tasty-hunit tasty-quickcheck text transformers turtle vector
|
||||
aeson attoparsec base base64-bytestring bytestring cereal
|
||||
containers doctest pretty-show proto3-wire QuickCheck semigroups
|
||||
swagger2 tasty tasty-hunit tasty-quickcheck text transformers
|
||||
turtle vector
|
||||
];
|
||||
description = "A low level library for writing out data in the Protocol Buffers wire format";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
|
|
|
@ -7,8 +7,9 @@ mkDerivation {
|
|||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/awakenetworks/proto3-wire.git";
|
||||
sha256 = "14n0d16an782ayipirm5v2mvp58jgf65xvffqzp08p50sksil3gi";
|
||||
rev = "a938330bf794cf3fa05591d03906915df98d157c";
|
||||
sha256 = "0ddza0s9ms51nb5qk97h8wj2p1bqpwwrfdv9fzdc5xf48khzmxki";
|
||||
rev = "43d8220dbc64ef7cc7681887741833a47b61070f";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cereal containers deepseq hashable QuickCheck safe
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
{ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
|
||||
, Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
|
||||
, hashable, hspec, http-media, HUnit, insert-ordered-containers
|
||||
, lens, mtl, network, QuickCheck, scientific, stdenv
|
||||
, template-haskell, text, time, transformers, transformers-compat
|
||||
, unordered-containers, uuid-types, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "swagger2";
|
||||
version = "2.1.6";
|
||||
sha256 = "01a29h56vfyw0ilij1pn6qwy50ca90kyj884vs1q52vvh572758j";
|
||||
setupHaskellDepends = [ base Cabal cabal-doctest ];
|
||||
libraryHaskellDepends = [
|
||||
aeson base base-compat bytestring containers generics-sop hashable
|
||||
http-media insert-ordered-containers lens mtl network scientific
|
||||
template-haskell text time transformers transformers-compat
|
||||
unordered-containers uuid-types vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson aeson-qq base base-compat bytestring containers doctest Glob
|
||||
hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
|
||||
text time unordered-containers vector
|
||||
];
|
||||
homepage = "https://github.com/GetShopTV/swagger2";
|
||||
description = "Swagger 2.0 data model";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -1,20 +0,0 @@
|
|||
{ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
|
||||
, directory, doctest, foldl, hostname, managed, optional-args
|
||||
, optparse-applicative, process, semigroups, stdenv, stm
|
||||
, system-fileio, system-filepath, temporary, text, time
|
||||
, transformers, unix, unix-compat
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "turtle";
|
||||
version = "1.3.6";
|
||||
sha256 = "0fr8p6rnk2lrsgbfh60jlqcjr0nxrh3ywxsj5d4psck0kgyhvg1m";
|
||||
libraryHaskellDepends = [
|
||||
ansi-wl-pprint async base bytestring clock directory foldl hostname
|
||||
managed optional-args optparse-applicative process semigroups stm
|
||||
system-fileio system-filepath temporary text time transformers unix
|
||||
unix-compat
|
||||
];
|
||||
testHaskellDepends = [ base doctest system-filepath temporary ];
|
||||
description = "Shell programming, Haskell-style";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
# The SHA256 will be printed as the last line of stdout.
|
||||
|
||||
import ./fetch-nixpkgs.nix {
|
||||
rev = "74286ec9e76be7cd00c4247b9acb430c4bd9f1ce";
|
||||
sha256 = "0njb3qd2wxj7gil8y61lwh7zacmvr6zklv67w5zmvifi1fvalvdg";
|
||||
outputSha256 = "13ydgpzl5nix4gc358iy9zjd5nrrpbpwpxmfhis4aai2zmkja3ak";
|
||||
rev = "bedbba61380a4da0318de41fcb790c176e1f26d1";
|
||||
sha256 = "0z4fgh15nz86kxib9ildmh49v6jim6vgbjyla7jbmgdcl0vd9qsg";
|
||||
outputSha256 = "0dxxw2ipa9403nk8lggjsypbr1a9jpb3q4hkjsg89gr5wz26p217";
|
||||
}
|
||||
|
|
26
release.nix
26
release.nix
|
@ -64,7 +64,7 @@ let
|
|||
packageOverrides = pkgs: rec {
|
||||
protobuf3_2NoCheck =
|
||||
pkgs.stdenv.lib.overrideDerivation
|
||||
pkgs.pythonPackages.protobuf3_2
|
||||
pkgs.pythonPackages.protobuf
|
||||
(oldAttrs : {doCheck = false; doInstallCheck = false;});
|
||||
|
||||
cython = pkgs.pythonPackages.buildPythonPackage rec {
|
||||
|
@ -103,6 +103,7 @@ let
|
|||
};
|
||||
|
||||
grpc = pkgs.callPackage ./nix/grpc.nix { };
|
||||
|
||||
|
||||
grpcio = pkgs.pythonPackages.buildPythonPackage rec {
|
||||
name = "grpc-${version}";
|
||||
|
@ -189,22 +190,7 @@ let
|
|||
|
||||
haskellPackages = pkgs.haskellPackages.override {
|
||||
overrides = haskellPackagesNew: haskellPackagesOld: rec {
|
||||
aeson =
|
||||
pkgs.haskell.lib.dontCheck
|
||||
(haskellPackagesNew.callPackage ./nix/aeson.nix {});
|
||||
|
||||
cabal-doctest =
|
||||
haskellPackagesNew.callPackage ./nix/cabal-doctest.nix { };
|
||||
|
||||
insert-ordered-containers =
|
||||
haskellPackagesNew.callPackage ./nix/insert-ordered-containers.nix { };
|
||||
|
||||
optparse-applicative =
|
||||
haskellPackagesNew.callPackage ./nix/optparse-applicative.nix { };
|
||||
|
||||
optparse-generic =
|
||||
haskellPackagesNew.callPackage ./nix/optparse-generic.nix { };
|
||||
|
||||
|
||||
proto3-wire =
|
||||
haskellPackagesNew.callPackage ./nix/proto3-wire.nix { };
|
||||
|
||||
|
@ -288,12 +274,6 @@ let
|
|||
})
|
||||
);
|
||||
|
||||
swagger2 =
|
||||
pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.dontHaddock (haskellPackagesNew.callPackage ./nix/swagger2.nix { }));
|
||||
|
||||
turtle =
|
||||
haskellPackagesNew.callPackage ./nix/turtle.nix { };
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue