Add stock coverage reports

cardano-foundation · Sep 23, 2020 · 6b28f6e · 6b28f6e
1 parent b3a1f47
commit 6b28f6e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -66,8 +66,6 @@ let
       (lib.optionalAttrs coverage {
         # Enable Haskell Program Coverage for all local libraries and test suites.
         packages.cardano-wallet.components.library.doCoverage = true;
-        packages.cardano-wallet.components.tests.unit.doCoverage = true;
-        packages.cardano-wallet.components.tests.integration.doCoverage = true;
         packages.cardano-wallet-cli.components.library.doCoverage = true;
         packages.cardano-wallet-core-integration.components.library.doCoverage = true;
         packages.cardano-wallet-core.components.library.doCoverage = true;
@@ -292,7 +290,9 @@ let
     };
 
 in
-  pkgSet.config.hsPkgs // {
-    _config = pkgSet.config;
-    _roots = haskell.roots pkgSet.config.ghc;
-  }
+haskell.addProjectAndPackageAttrs {
+  pkg-set = pkgSet;
+  inherit (pkgSet.config) hsPkgs;
+  _config = pkgSet.config;
+  _roots = haskell.roots pkgSet.config.ghc;
+}
diff --git a/nix/sources.json b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "ce74990b9b8bc6c6161625c361529931bfb0e155",
-        "sha256": "1124cmpzp6a08kjamsvqvmxq1pfbimzy4s3ywlmhbq7ssjfjl6hi",
+        "rev": "d12d2588284950beca6ceceeae4d0fdce2d86ba9",
+        "sha256": "0hgihcwy5w8df534dpjyglxz57n131mw7ivppzw8gk528ny7nnyh",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/ce74990b9b8bc6c6161625c361529931bfb0e155.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/d12d2588284950beca6ceceeae4d0fdce2d86ba9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {
@@ -35,19 +35,6 @@
         "url": "https://github.com/input-output-hk/iohk-nix/archive/b22d8da9dd38c971ad40d9ad2d1a60cce53995fb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "sphinxcontrib-haddock": {
-        "branch": "master",
-        "builtin": false,
-        "description": "Tools for using Haddock with Sphinx",
-        "homepage": null,
-        "owner": "michaelpj",
-        "repo": "sphinxcontrib-haddock",
-        "rev": "f3956b3256962b2d27d5a4e96edb7951acf5de34",
-        "sha256": "0mlxa5zzgdka0c6sj7pp4cfvc8rcrd8g2z2113vp614l43g17miv",
-        "type": "tarball",
-        "url": "https://github.com/michaelpj/sphinxcontrib-haddock/archive/f3956b3256962b2d27d5a4e96edb7951acf5de34.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",
@@ -71,5 +58,18 @@
         "type": "tarball",
         "url": "https://github.com/NixOS/nixpkgs/archive/a8f81dc037a5977414a356dd068f2621b3c89b60.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "sphinxcontrib-haddock": {
+        "branch": "master",
+        "builtin": false,
+        "description": "Tools for using Haddock with Sphinx",
+        "homepage": null,
+        "owner": "michaelpj",
+        "repo": "sphinxcontrib-haddock",
+        "rev": "f3956b3256962b2d27d5a4e96edb7951acf5de34",
+        "sha256": "0mlxa5zzgdka0c6sj7pp4cfvc8rcrd8g2z2113vp614l43g17miv",
+        "type": "tarball",
+        "url": "https://github.com/michaelpj/sphinxcontrib-haddock/archive/f3956b3256962b2d27d5a4e96edb7951acf5de34.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/nix/stack-shell.nix b/nix/stack-shell.nix
@@ -24,6 +24,7 @@ mkShell rec {
       openssl
       libsodium
       pkgconfig
+      stack
     ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
     (lib.optionals (!stdenv.isDarwin) [ git systemd.dev ]) ++
     (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa CoreServices libcxx libiconv ]));