tmp: remove iohk-nix-utils dependency

cardano-foundation · Nov 21, 2022 · a091136 · a091136
1 parent 98766d2
commit a091136
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -63,11 +63,10 @@ CHaP: haskell-nix: haskell-nix.cabalProject' [
       # version info. It uses the "gitrev" option.
       setGitRevPostInstall = setGitRevPostInstall' config.gitrev;
       setGitRevPostInstall' = gitrev: ''
-        ${pkgs.buildPackages.iohk-nix-utils}/bin/set-git-rev "${gitrev}" $out/bin/*
       '';
 
       rewriteLibsPostInstall = lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) ''
-        export PATH=$PATH:${lib.makeBinPath (with pkgs.buildPackages; [ iohk-nix-utils binutils nix ])}
+        export PATH=$PATH:${lib.makeBinPath (with pkgs.buildPackages; [ binutils nix ])}
         rewrite-libs $out/bin $out/bin/*
       '';
 

diff --git a/nix/overlays/build-tools.nix b/nix/overlays/build-tools.nix
@@ -178,28 +178,4 @@ in {
   # These overrides are picked up by cabalWrapped in iohk-nix
   cabal = pkgs.haskell-build-tools.cabal-install;
   cabal-install = pkgs.haskell-build-tools.cabal-install;
-
-  # Override this package set from iohk-nix with local materializations.
-  # This is a little bit messy, unfortunately.
-  iohk-nix-utils = let
-    name = "iohk-nix-utils";
-    project = super.haskellBuildUtils.mkProject ({
-      inherit compiler-nix-name index-state;
-    } // pkgs.lib.optionalAttrs enableMaterialization {
-      checkMaterialization = false;
-      materialized = ../materialized + "/${name}";
-    });
-  in pkgs.symlinkJoin {
-    inherit name;
-    paths = pkgs.lib.attrValues project.iohk-nix-utils.components.exes;
-    passthru = {
-      inherit project;
-      inherit (project) roots;
-      regenerateMaterialized = pkgs.writeShellScriptBin "regenerate-materialized-nix"
-        (pkgs.lib.optionalString enableMaterialization ''
-          echo 'Updating materialized nix for ${name}'
-          ${mkMaterialize project.iohk-nix-utils} nix/materialized/${name}
-        '');
-    };
-  };
 }