git.iko.soy/project-m36
on master help sign in
add http-conduit dependencies via nix and update pinned nix release
commit2140de9ba23aab1fdd6c2fb3e6a7d604bdadfc4f authorA.M <agentm@themactionfaction.com> dateSat 3 Apr 2021, 19:45 (6 years ago) parent3004be0
3 files changed+60−28
compare with master
unifiedsplit
pkgs.nix+3−3 project-m36.cabal+2−2 release.nix+55−23
pkgs.nix+3−3
@@ -1,7 +1,7 @@
11let
2−nixpkgs = builtins.fetchGit {
3− url = "https://github.com/NixOS/nixpkgs";
4− rev = "f58482658eabf7d695f45904ecbc5f49c19fef98";
2+nixpkgs = builtins.fetchTarball {
3+ url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/20.09.tar.gz";
4+ sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
55};
66in
77import nixpkgs { config.allowBroken = true; }
project-m36.cabal+2−2
@@ -424,7 +424,7 @@ Test-Suite test-scripts
424424
425425Executable project-m36-websocket-server
426426 Default-Language: Haskell2010
427− Build-Depends: base, aeson, path-pieces, either, conduit, http-api-data, template-haskell, websockets, aeson, optparse-applicative, project-m36, containers, bytestring, text, vector, uuid, megaparsec, haskeline, mtl, directory, base64-bytestring, random, MonadRandom, time, semigroups, attoparsec, parser-combinators, prettyprinter, network
427+ Build-Depends: base, aeson, path-pieces, either, conduit, http-api-data, template-haskell, websockets, aeson, optparse-applicative, project-m36, containers, bytestring, text, vector, uuid, megaparsec, haskeline, mtl, directory, base64-bytestring, random, MonadRandom, time, semigroups, attoparsec, parser-combinators, prettyprinter, network, modern-uri, http-conduit, base16-bytestring, http-types, cryptohash-sha256
428428 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs
429429 Other-Modules: ProjectM36.Client.Json, ProjectM36.Server.RemoteCallTypes.Json, ProjectM36.Server.WebSocket, TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator, TutorialD.Printer
430430 GHC-Options: -Wall -threaded
@@ -473,7 +473,7 @@ Test-Suite test-client-simple
473473Executable handles
474474 Default-Language: Haskell2010
475475 Default-Extensions: OverloadedStrings
476− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t, ghc, ghc-paths, transformers, project-m36, random, MonadRandom, semigroups, parser-combinators, prettyprinter
476+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t, ghc, ghc-paths, transformers, project-m36, random, MonadRandom, semigroups, parser-combinators, prettyprinter, modern-uri, http-types, http-conduit, base16-bytestring, cryptohash-sha256
477477 main-is: benchmark/Handles.hs
478478 Other-Modules: TutorialD.Interpreter,
479479 TutorialD.Interpreter.Base,
release.nix+55−23
@@ -1,5 +1,5 @@
11{ compiler ? "ghc865"
2−, pkgs ? import ./pkgs.nix
2+, pkgs ? import <nixpkgs> {}
33}:
44
55let
@@ -33,77 +33,109 @@ let
3333 sha256 = "1x6p9z53s7xwp93jp4n1lq6m5xspcn6w62p461v8vqnp9600328b";
3434}{});
3535 stm-hamt =
36− self.callHackageDirect {
36+ distProcessPkg(self.callHackageDirect {
3737 pkg = "stm-hamt";
3838 ver = "1.2.0.3";
3939 sha256 = "1i8j7q8nhx3l7gydrjlsyhkvllr6bppgrjf0hp38zpm7p6xcv2bb";
40− }{};
40+ }{});
4141
4242 stm-containers =
43− self.callHackageDirect {
43+ distProcessPkg(self.callHackageDirect {
4444 pkg = "stm-containers";
4545 ver = "1.1.0.4";
4646 sha256 = "0h9z6lawdm44minx9spvdb7sp645l36ri5cnxvhrcxwzr64s7qb5";
47− }{};
47+ }{});
4848
4949 data-interval =
50− self.callHackageDirect {
50+ distProcessPkg(self.callHackageDirect {
5151 pkg = "data-interval";
5252 ver = "2.0.1";
5353 sha256 = "085j4yjr8wimxampxqdrg47p577whwg2mjxgfdl44yfck52fb6an";
54− }{};
54+ }{});
5555
56+ rset = distProcessPkg super.rset;
57+
5658 curryer-rpc =
57− self.callHackageDirect {
59+ distProcessPkg(self.callHackageDirect {
5860 pkg = "curryer-rpc";
5961 ver = "0.1";
6062 sha256 = "0vb7q68g4zjm20simnqpjdpvcvh4g8cwlc5b6zjdjpg1rargri41";
61− }{};
63+ }{});
6264
63− streamly = self.callCabal2nix "streamly" streamly-master {};
65+ streamly = distProcessPkg(self.callCabal2nix "streamly" streamly-master {});
6466
6567 fusion-plugin-types =
66− self.callHackageDirect {
68+ distProcessPkg(self.callHackageDirect {
6769 pkg = "fusion-plugin-types";
6870 ver = "0.1.0";
6971 sha256 = "17211b80p4zqisghs2j8flm4dj788f9glx2id6nh8f223q4cigc9";
70− }{};
72+ }{});
7173
7274 winery =
73− self.callHackageDirect {
75+ distProcessPkg(self.callHackageDirect {
7476 pkg = "winery";
7577 ver = "1.3.2";
7678 sha256 = "1jc7q8m0zd8bziwa3mra44j518ckc566akk7r5hqpf8x5ng0n4vv";
77− }{};
79+ }{});
7880
7981 barbies-th =
80− self.callHackageDirect {
82+ distProcessPkg(self.callHackageDirect {
8183 pkg = "barbies-th";
8284 ver = "0.1.7";
8385 sha256 = "0gf39kcn6lwqhz888qm3iypma76yrp3zwmif1niry647qq27xp4j";
84− }{};
86+ }{});
8587
8688 barbies =
87− self.callHackageDirect {
89+ distProcessPkg(self.callHackageDirect {
8890 pkg = "barbies";
8991 ver = "2.0.2.0";
9092 sha256 = "0753rd8pw0x1cgasz8a6633kg83jngwzncp9khbimllvcdqzardh";
91− }{};
93+ }{});
9294
9395 prettyprinter =
94− self.callHackageDirect {
96+ distProcessPkg(self.callHackageDirect {
9597 pkg = "prettyprinter";
9698 ver = "1.7.0";
9799 sha256 = "17byy08brwcsl5rqdhibq3pcpgx085shizb2ap6s4xy3izdia3cc";
98− }{};
100+ }{});
99101
100102 prettyprinter-ansi-terminal =
101− self.callHackageDirect {
103+ distProcessPkg(self.callHackageDirect {
102104 pkg = "prettyprinter-ansi-terminal";
103105 ver = "1.1.2";
104106 sha256 = "0lwcqndppw3jc55rlnn6sp76zmjx2yzl21g9jhg27k2rdnjwd7md";
105− }{};
106−
107+ }{});
108+
109+ http2 = distProcessPkg super.http2;
110+
111+ cryptohash-sha256 =
112+ distProcessPkg(self.callHackageDirect {
113+ pkg = "cryptohash-sha256";
114+ ver = "0.11.101.0";
115+ sha256 = "02n4s1fm4kivi5cjzbwkzjs31h5sw8zrv0vv2qyz3413zp3g6010";
116+ }{});
117+
118+ cryptohash-md5 =
119+ distProcessPkg(self.callHackageDirect {
120+ pkg = "cryptohash-md5";
121+ ver = "0.11.100.1";
122+ sha256 = "0sl41rfai346j45475hldzp857s6h28ryxyn6xgrkm8js9yzfkd7";
123+ }{});
124+
125+ cryptohash-sha1 =
126+ distProcessPkg(self.callHackageDirect {
127+ pkg = "cryptohash-sha1";
128+ ver = "0.11.100.1";
129+ sha256 = "0k3q9sraq7s5y8i01p5a2b3cvbdvslz9kv494vh83jrvsamj7dcx";
130+ }{});
131+
132+ base16-bytestring =
133+ distProcessPkg(self.callHackageDirect {
134+ pkg = "base16-bytestring";
135+ ver = "1.0.1.0";
136+ sha256 = "0wvsjhg301qxikarvnvrbhdadrs892z4v8w9bq4na4gwdlf4aw6z";
137+ }{});
138+
107139 project-m36 = dontCheck (self.callCabal2nixWithOptions "project-m36" ./. "-f-haskell-scripting" { });
108140
109141 };