on master help sign in
Fix dependencies and package names

For bench-runner and test-runner

commite4418a5f0634c432fee774c0ebd96cd6e0484040 authorHarendra Kumar <harendra@composewell.com> dateFri 6 May 2022, 16:48 (4 years ago) parentc747309
2 files changed+14−7
benchmark/bench-runner/default.nix+3−3 test/test-runner/default.nix+11−4
benchmark/bench-runner/default.nix+3−3
@@ -42,7 +42,7 @@ let haskellPackages =
4242 overrides = self: super:
4343 with nixpkgs.haskell.lib;
4444 {
45− report = mkPackage super "report" ./. "" inShell;
45+ bench-runner = mkPackage super "bench-runner" ./. "" inShell;
4646 streamly-targets = mkPackage super "streamly-targets" ../../targets "" false;
4747
4848 bench-report =
@@ -148,7 +148,7 @@ let haskellPackages =
148148
149149 shell = drv.shellFor {
150150 packages = p:
151− [ p.report
151+ [ p.bench-runner
152152 ];
153153 # Use a better prompt
154154 shellHook = ''
@@ -161,4 +161,4 @@ let haskellPackages =
161161 };
162162in if nixpkgs.lib.inNixShell
163163 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 =
4242 overrides = self: super:
4343 with nixpkgs.haskell.lib;
4444 {
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;
4647
4748 bench-report =
4849 nixpkgs.haskell.lib.overrideCabal
4950 (let src = fetchGit {
5051 url = "git@github.com:composewell/bench-report.git";
51− rev = "c11f79b202d812efe4d1785e0537f1ad4d947bfe";
52+ rev = "991b33e3b7bee63bd83e6dd94df001eef207d9b8";
5253 }; in super.callCabal2nix "bench-report" src {})
5354 (old:
5455 { enableLibraryProfiling = false;
5556 doHaddock = false;
5657 });
5758
59+ bench-show = super.callHackageDirect {
60+ pkg = "bench-show";
61+ ver = "0.3.2";
62+ sha256 = "16b8vyzdp9b5bh34kqmbfwjsyv8wgnxxwl8kjcpgxjsh52xzyaa0";
63+ } { };
64+
5865# streamly-coreutils = let
5966# src = "git@github.com:composewell/streamly-coreutils.git";
6067# rev = "a12756efe24bbf303f2f6d66a95426c7657d297b";
@@ -141,7 +148,7 @@ let haskellPackages =
141148
142149 shell = drv.shellFor {
143150 packages = p:
144− [ p.report
151+ [ p.test-runner
145152 ];
146153 # Use a better prompt
147154 shellHook = ''
@@ -154,4 +161,4 @@ let haskellPackages =
154161 };
155162in if nixpkgs.lib.inNixShell
156163 then shell
157− else (mkHaskellPackages false).streamly-test-report
164+ else (mkHaskellPackages false).test-runner