git.iko.soy/streamly
on master help sign in
Fix dependencies and package names
e4418a5Harendra Kumar
benchmark/bench-runner/default.nix+3−3
compare with master
unifiedsplit
@@ -42,7 +42,7 @@ let haskellPackages =
42 overrides = self: super:
42 overrides = self: super:
43 with nixpkgs.haskell.lib;
43 with nixpkgs.haskell.lib;
44 {
44 {
45− report = mkPackage super "report" ./. "" inShell;
45+ bench-runner = mkPackage super "bench-runner" ./. "" inShell;
46 streamly-targets = mkPackage super "streamly-targets" ../../targets "" false;
46 streamly-targets = mkPackage super "streamly-targets" ../../targets "" false;
47
47
48 bench-report =
48 bench-report =
@@ -148,7 +148,7 @@ let haskellPackages =
148
148
149 shell = drv.shellFor {
149 shell = drv.shellFor {
150 packages = p:
150 packages = p:
151− [ p.report
151+ [ p.bench-runner
152 ];
152 ];
153 # Use a better prompt
153 # Use a better prompt
154 shellHook = ''
154 shellHook = ''
@@ -161,4 +161,4 @@ let haskellPackages =
161 };
161 };
162in if nixpkgs.lib.inNixShell
162in if nixpkgs.lib.inNixShell
163 then shell
163 then shell
164− else (mkHaskellPackages false).report
164+ else (mkHaskellPackages false).bench-runner
test/test-runner/default.nix+11−4
@@ -42,19 +42,26 @@ let haskellPackages =
42 overrides = self: super:
42 overrides = self: super:
43 with nixpkgs.haskell.lib;
43 with nixpkgs.haskell.lib;
44 {
44 {
45− report = mkPackage super "streamly-test-report" ./. "" inShell;
45+ test-runner = mkPackage super "test-runner" ./. "" inShell;
46+ streamly-targets = mkPackage super "streamly-targets" ../../targets "" false;
46
47
47 bench-report =
48 bench-report =
48 nixpkgs.haskell.lib.overrideCabal
49 nixpkgs.haskell.lib.overrideCabal
49 (let src = fetchGit {
50 (let src = fetchGit {
50 url = "git@github.com:composewell/bench-report.git";
51 url = "git@github.com:composewell/bench-report.git";
51− rev = "c11f79b202d812efe4d1785e0537f1ad4d947bfe";
52+ rev = "991b33e3b7bee63bd83e6dd94df001eef207d9b8";
52 }; in super.callCabal2nix "bench-report" src {})
53 }; in super.callCabal2nix "bench-report" src {})
53 (old:
54 (old:
54 { enableLibraryProfiling = false;
55 { enableLibraryProfiling = false;
55 doHaddock = false;
56 doHaddock = false;
56 });
57 });
57
58
59+ bench-show = super.callHackageDirect {
60+ pkg = "bench-show";
61+ ver = "0.3.2";
62+ sha256 = "16b8vyzdp9b5bh34kqmbfwjsyv8wgnxxwl8kjcpgxjsh52xzyaa0";
63+ } { };
64+
58# streamly-coreutils = let
65# streamly-coreutils = let
59# src = "git@github.com:composewell/streamly-coreutils.git";
66# src = "git@github.com:composewell/streamly-coreutils.git";
60# rev = "a12756efe24bbf303f2f6d66a95426c7657d297b";
67# rev = "a12756efe24bbf303f2f6d66a95426c7657d297b";
@@ -141,7 +148,7 @@ let haskellPackages =
141
148
142 shell = drv.shellFor {
149 shell = drv.shellFor {
143 packages = p:
150 packages = p:
144− [ p.report
151+ [ p.test-runner
145 ];
152 ];
146 # Use a better prompt
153 # Use a better prompt
147 shellHook = ''
154 shellHook = ''
@@ -154,4 +161,4 @@ let haskellPackages =
154 };
161 };
155in if nixpkgs.lib.inNixShell
162in if nixpkgs.lib.inNixShell
156 then shell
163 then shell
157− else (mkHaskellPackages false).streamly-test-report
164+ else (mkHaskellPackages false).test-runner