From 318abbe3827325fea970be239bf1d77b29c697b5 Mon Sep 17 00:00:00 2001 From: Providence Salumu Date: Sat, 15 Jul 2023 07:22:41 -0400 Subject: [PATCH 1/2] use versioned hackage libraries --- configuration-ghc-92.nix | 2 +- configuration-ghc-94.nix | 2 +- configuration-ghc-96.nix | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configuration-ghc-92.nix b/configuration-ghc-92.nix index e7dd2e384e..2e7ad2aed8 100644 --- a/configuration-ghc-92.nix +++ b/configuration-ghc-92.nix @@ -19,7 +19,7 @@ let doCheck = false; }); } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) { - apply-refact = hsuper.apply-refact_0_13_0_0; + apply-refact = hself.callHackage "apply-refact" "0.13.0.0" { }; # ptr-poker breaks on MacOS without SSE2 optimizations # https://github.com/nikita-volkov/ptr-poker/issues/11 diff --git a/configuration-ghc-94.nix b/configuration-ghc-94.nix index c53cc16ce7..d8e2c80864 100644 --- a/configuration-ghc-94.nix +++ b/configuration-ghc-94.nix @@ -13,7 +13,7 @@ let { hlsDisabledPlugins = disabledPlugins; } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) { - apply-refact = hsuper.apply-refact_0_13_0_0; + apply-refact = hself.callHackage "apply-refact" "0.13.0.0" { }; stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib"; diff --git a/configuration-ghc-96.nix b/configuration-ghc-96.nix index 7dad1a944c..1abb87e739 100644 --- a/configuration-ghc-96.nix +++ b/configuration-ghc-96.nix @@ -28,7 +28,8 @@ let broken = false; doCheck = false; }); - apply-refact = hsuper.apply-refact_0_13_0_0; + + apply-refact = hself.callHackage "apply-refact" "0.13.0.0" { }; tagged = hself.callHackage "tagged" "0.8.7" { }; primitive = hself.callHackage "primitive" "0.8.0.0" { }; unix-compat = hself.callCabal2nix "unix-compat" inputs.haskell-unix-compat { }; @@ -42,7 +43,7 @@ let # https://github.com/nikita-volkov/ptr-poker/issues/11 ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; - ormolu = hself.ormolu_0_5_3_0; + ormolu = hself.callHackage "ormolu" "0.5.3.0" { }; # TODO: smunix: nix fails to build fourmolu-0.13 from Hackage with these errors: # tar: */fourmolu/0.13.0.0/fourmolu.json: Not found in archive From f855afd42459a528ffd984e8d9d8352fecd6a96e Mon Sep 17 00:00:00 2001 From: Providence Salumu Date: Sat, 22 Jul 2023 17:53:37 -0400 Subject: [PATCH 2/2] bump ormolu : 0.5 -> 0.6 --- configuration-ghc-96.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration-ghc-96.nix b/configuration-ghc-96.nix index 1abb87e739..bdfb3d17ca 100644 --- a/configuration-ghc-96.nix +++ b/configuration-ghc-96.nix @@ -43,7 +43,7 @@ let # https://github.com/nikita-volkov/ptr-poker/issues/11 ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; - ormolu = hself.callHackage "ormolu" "0.5.3.0" { }; + ormolu = hself.callHackage "ormolu" "0.7.0.1" { }; # TODO: smunix: nix fails to build fourmolu-0.13 from Hackage with these errors: # tar: */fourmolu/0.13.0.0/fourmolu.json: Not found in archive