NixOS / cabal2nix

Generate Nix build instructions from a Cabal file
https://haskell4nix.readthedocs.io
Other
362 stars 156 forks source link

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

Closed tbidne closed 1 year ago

tbidne commented 1 year ago

See https://github.com/NixOS/nixpkgs/pull/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 commented 1 year ago

Seems reasonable to me, thanks!

Sorry for taking a while to get to this

tbidne commented 1 year ago

No problem, thanks!