Fix rebase artifacts -1-

Author: ginnun

crates/testgen/src/tests.rs

@@ -1,8 +1,6 @@
 #[cfg(not(feature = "tarpaulin"))]
 use num_cpus;
 
-#[cfg(not(feature = "tarpaulin"))]
-use pallas_hardano::display::haskell_error::serialize_error;
 use serde::Deserialize;
 use std::process::Command;
 

nix/devshells.nix

@@ -30,10 +30,15 @@ in {
       name = "cardano-address";
       package = internal.cardano-address;
     }
-    {package = config.language.rust.packageSet.cargo;}
+    {package = internal.dolos;}
+    {package = internal.mithril-client;}
     {package = pkgs.cargo-nextest;}
     {package = pkgs.cargo-tarpaulin;}
-    {package = config.language.rust.packageSet.rust-analyzer;}
+    {
+      name = "cargo";
+      package = internal.rustPackages.cargo;
+    }
+    {package = internal.rustPackages.rust-analyzer;}
     {
       category = "handy";
       package = internal.runNode "preview";

nix/internal/unix.nix

@@ -166,15 +166,14 @@ in
     in
       (import inputs.flake-compat {
         src =
-          if targetSystem != "aarch64-darwin" && targetSystem != "aarch64-linux"
           if targetSystem != "aarch64-darwin" && targetSystem != "aarch64-linux"
           then unpatched
           else {
             outPath = toString (pkgs.runCommand "source" {} ''
               cp -r ${unpatched} $out
               chmod -R +w $out
               cd $out
-              echo ${lib.escapeShellArg (builtins.toJSON [targetSystem])} >>$out/nix/supported-systems.nix
+              echo ${lib.escapeShellArg (builtins.toJSON [targetSystem])} >$out/nix/supported-systems.nix
               ${lib.optionalString (targetSystem == "aarch64-linux") ''
                 sed -r 's/"-fexternal-interpreter"//g' -i $out/nix/haskell.nix
               ''}
@@ -187,7 +186,7 @@ in
     cardano-node-packages =
       {
         x86_64-linux = cardano-node-flake.hydraJobs.x86_64-linux.musl;
-        inherit (cardano-node-flake.packages) x86_64-darwin aarch64-darwin aarch64-linux aarch64-linux;
+        inherit (cardano-node-flake.packages) x86_64-darwin aarch64-darwin aarch64-linux;
       }
       .${
         targetSystem
@@ -224,24 +223,7 @@ in
       ln -s ${dolos-configs} $out/dolos-configs
     '';
 
-    testgen-hs-flake = let
-      unpatched = inputs.testgen-hs;
-    in
-      (import inputs.flake-compat {
-        src =
-          if targetSystem != "aarch64-linux"
-          then unpatched
-          else {
-            outPath = toString (pkgs.runCommand "source" {} ''
-              cp -r ${unpatched} $out
-              chmod -R +w $out
-              cd $out
-              patch -p1 -i ${./testgen-hs--enable-aarch64-linux.diff}
-            '');
-            inherit (unpatched) rev shortRev lastModified lastModifiedDate;
-          };
-      })
-      .defaultNix;
+    testgen-hs-flake = (import inputs.flake-compat {src = inputs.testgen-hs;}).defaultNix;
 
     testgen-hs = testgen-hs-flake.packages.${targetSystem}.default;
 

src/api/utils/txs/evaluate.rs

@@ -1,3 +1,2 @@
-pub mod model;
 pub mod root;
 pub mod utxos;