00ae694 · project-m36 · git.iko.soy

git.iko.soy/project-m36

fix nix docker build

commit00ae694b97fccbcd7b5df161486cdee4fa1ca3a5 authorA.M <agentm@themactionfaction.com> dateMon 28 Dec 2020, 00:29 (6 years ago) parente5bb4e5

2 files changed+18−2

compare with master

unifiedsplit

project-m36.cabal+1−1 release.nix+17−1

project-m36.cabal+1−1

@@ -34,7 +34,7 @@ Flag haskell-scripting

3434 Default: True

3535

3636Library

37− Build-Depends: base>=4.8 && < 4.15, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, filepath, zlib, directory, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256, text-manipulate >= 0.2.0.1 && < 0.3, winery, curryer, network, async, vector-instances

37+ Build-Depends: base>=4.8 && < 4.15, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, filepath, zlib, directory, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256, text-manipulate >= 0.2.0.1 && < 0.3, winery, curryer-rpc, network, async, vector-instances

3838 if flag(haskell-scripting)

3939 Build-Depends: ghc >= 8.2 && < 8.11

4040 CPP-Options: -DPM36_HASKELL_SCRIPTING

release.nix+17−1

@@ -8,6 +8,13 @@ let

88 doJailbreak = pkgs.haskell.lib.doJailbreak;

99 dontHaddock = pkgs.haskell.lib.dontHaddock;

1010 dontCheck = pkgs.haskell.lib.dontCheck;

11+ streamly-master = pkgs.fetchFromGitHub {

12+ owner = "composewell";

13+ repo = "streamly";

14+ rev = "ac3af8749194f1788704dda8667d0b3807075cc2";

15+ sha256 = "04d8fk654vawdfs0dfidmq2awwgwi8x44iv8r7vqz70zkcsd5fij";

16+ };

17+

1118 distProcessPkg = pkg : dontHaddock (doJailbreak (dontCheck pkg));

1219 callHackageDirectWithOptions = {pkg,ver, sha256, options}:

1320 let pkgver = "${pkg}-${ver}";

@@ -50,9 +57,18 @@ let

5057 self.callHackageDirect {

5158 pkg = "curryer-rpc";

5259 ver = "0.1";

53− sha256 = "085j4yjr8wimxampxqdrg47p577whwg2mjxgfdl44yfck52fb6ac";

60+ sha256 = "0vb7q68g4zjm20simnqpjdpvcvh4g8cwlc5b6zjdjpg1rargri41";

5461 }{};

5562

63+ streamly = self.callCabal2nix "streamly" streamly-master {};

64+

65+ fusion-plugin-types =

66+ self.callHackageDirect {

67+ pkg = "fusion-plugin-types";

68+ ver = "0.1.0";

69+ sha256 = "17211b80p4zqisghs2j8flm4dj788f9glx2id6nh8f223q4cigc9";

70+ }{};

71+

5672 winery =

5773 self.callHackageDirect {

5874 pkg = "winery";