Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cabal2nix: Add graphviz and z3 to rest-rewrite test deps #605

Merged
merged 1 commit into from
Jul 10, 2023

Conversation

tbidne
Copy link
Contributor

@tbidne tbidne commented Jun 29, 2023

See NixOS/nixpkgs#240235.

This produces the derivation we want:

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5b3ee11495..4cc3ecfed70 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -250244,8 +250244,9 @@ self: {
      }) {};
 
   "rest-rewrite" = callPackage
-    ({ mkDerivation, base, containers, hashable, monad-loops, mtl
-     , parsec, process, QuickCheck, text, time, unordered-containers
+    ({ mkDerivation, base, containers, graphviz, hashable, monad-loops
+     , mtl, parsec, process, QuickCheck, text, time
+     , unordered-containers, z3
      }:
      mkDerivation {
        pname = "rest-rewrite";
@@ -250259,10 +250260,11 @@ self: {
          base containers hashable mtl QuickCheck text time
          unordered-containers
        ];
+       testSystemDepends = [ graphviz z3 ];
        doHaddock = false;
        description = "Rewriting library with online termination checking";
        license = lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) graphviz; inherit (pkgs) z3;};
 
   "rest-snap" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, case-insensitive

Thanks!

@cdepillabout
Copy link
Member

Seems reasonable to me, thanks!

Sorry for taking a while to get to this

@cdepillabout cdepillabout merged commit 6b3d10b into NixOS:master Jul 10, 2023
5 checks passed
@tbidne
Copy link
Contributor Author

tbidne commented Jul 10, 2023

No problem, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants