From c2c0e150da6596b3e4a58b62a2094a553fcebb2b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 11 Mar 2022 17:09:25 +0100 Subject: [PATCH] arion: Fix name-setting patch "Cabal"'s pname must be original for edited cabal file fetching to work. --- pkgs/applications/virtualization/arion/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index 33b2b000cbf..efe13868524 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -16,11 +16,16 @@ let - make it self-contained by including docker-compose */ arion = - justStaticExecutables ( + (justStaticExecutables ( overrideCabal cabalOverrides arion-compose - ); + ) + ).overrideAttrs (o: { + # Patch away the arion-compose name. Unlike the Haskell library, the program + # is called arion (arion was already taken on hackage). + pname = "arion"; + }); inherit (haskell.lib.compose) justStaticExecutables overrideCabal; @@ -31,9 +36,6 @@ let passthru = (o.passthru or {}) // { inherit eval build; }; - # Patch away the arion-compose name. Unlike the Haskell library, the program - # is called arion (arion was already taken on hackage). - pname = "arion"; src = arion-compose.src; # PYTHONPATH