on master help sign in
fix nix docker build
00ae694A.M
project-m36.cabal+1−1
@@ -34,7 +34,7 @@ Flag haskell-scripting
34 Default: True
34 Default: True
35
35
36Library
36Library
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
38 if flag(haskell-scripting)
38 if flag(haskell-scripting)
39 Build-Depends: ghc >= 8.2 && < 8.11
39 Build-Depends: ghc >= 8.2 && < 8.11
40 CPP-Options: -DPM36_HASKELL_SCRIPTING
40 CPP-Options: -DPM36_HASKELL_SCRIPTING
release.nix+17−1
@@ -8,6 +8,13 @@ let
8 doJailbreak = pkgs.haskell.lib.doJailbreak;
8 doJailbreak = pkgs.haskell.lib.doJailbreak;
9 dontHaddock = pkgs.haskell.lib.dontHaddock;
9 dontHaddock = pkgs.haskell.lib.dontHaddock;
10 dontCheck = pkgs.haskell.lib.dontCheck;
10 dontCheck = pkgs.haskell.lib.dontCheck;
11+ streamly-master = pkgs.fetchFromGitHub {
12+ owner = "composewell";
13+ repo = "streamly";
14+ rev = "ac3af8749194f1788704dda8667d0b3807075cc2";
15+ sha256 = "04d8fk654vawdfs0dfidmq2awwgwi8x44iv8r7vqz70zkcsd5fij";
16+ };
17+
11 distProcessPkg = pkg : dontHaddock (doJailbreak (dontCheck pkg));
18 distProcessPkg = pkg : dontHaddock (doJailbreak (dontCheck pkg));
12 callHackageDirectWithOptions = {pkg,ver, sha256, options}:
19 callHackageDirectWithOptions = {pkg,ver, sha256, options}:
13 let pkgver = "${pkg}-${ver}";
20 let pkgver = "${pkg}-${ver}";
@@ -50,9 +57,18 @@ let
50 self.callHackageDirect {
57 self.callHackageDirect {
51 pkg = "curryer-rpc";
58 pkg = "curryer-rpc";
52 ver = "0.1";
59 ver = "0.1";
53− sha256 = "085j4yjr8wimxampxqdrg47p577whwg2mjxgfdl44yfck52fb6ac";
60+ sha256 = "0vb7q68g4zjm20simnqpjdpvcvh4g8cwlc5b6zjdjpg1rargri41";
54 }{};
61 }{};
55
62
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+
56 winery =
72 winery =
57 self.callHackageDirect {
73 self.callHackageDirect {
58 pkg = "winery";
74 pkg = "winery";