about summary refs log tree commit diff
path: root/pkgs/applications/misc/gitit
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2024-06-06 11:43:49 +0200
committersternenseemann <sternenseemann@systemli.org>2024-06-07 11:18:28 +0200
commit1285457ad3fc30e601a6ad77a99731f115c638e7 (patch)
tree031be9a13678bf67a0e1f8180fc203c1998cc10c /pkgs/applications/misc/gitit
parenta5d1b908b4c7e30c9305b814ae9adea475e975ca (diff)
gitit: drop reference prevention code
All these references would (indirectly) incur a GHC requisite which is
prevented by #304352 via justStaticExecutables. Consequently, we can
stop setting disallowedReferences.

As it turns out the references we were removing aren't currently
created, so our life gets even easier.
Diffstat (limited to 'pkgs/applications/misc/gitit')
-rw-r--r--pkgs/applications/misc/gitit/default.nix37
1 files changed, 1 insertions, 36 deletions
diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/applications/misc/gitit/default.nix
index 365b3f6acd977..45723c07dc6df 100644
--- a/pkgs/applications/misc/gitit/default.nix
+++ b/pkgs/applications/misc/gitit/default.nix
@@ -18,42 +18,7 @@ let
   static = haskell.lib.compose.justStaticExecutables plugins;
 
 in
-  (haskell.lib.compose.overrideCabal (drv: {
-    buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
-  }) static).overrideAttrs (drv: {
-
-    # These libraries are still referenced, because they generate
-    # a `Paths_*` module for figuring out their version.
-    # The `Paths_*` module is generated by Cabal, and contains the
-    # version, but also paths to e.g. the data directories, which
-    # lead to a transitive runtime dependency on the whole GHC distribution.
-    # This should ideally be fixed in haskellPackages (or even Cabal),
-    # but a minimal gitit is important enough to patch it manually.
-    disallowedReferences = [
-      haskellPackages.pandoc-types
-      haskellPackages.HTTP
-      haskellPackages.pandoc
-      haskellPackages.happstack-server
-      haskellPackages.filestore
-    ];
-    postInstall = ''
-      remove-references-to \
-        -t ${haskellPackages.pandoc-types} \
-        $out/bin/gitit
-      remove-references-to \
-        -t ${haskellPackages.HTTP} \
-        $out/bin/gitit
-      remove-references-to \
-        -t ${haskellPackages.pandoc} \
-        $out/bin/gitit
-      remove-references-to \
-        -t ${haskellPackages.happstack-server} \
-        $out/bin/gitit
-      remove-references-to \
-        -t ${haskellPackages.filestore} \
-        $out/bin/gitit
-    '';
-
+  static.overrideAttrs (drv: {
     meta = drv.meta // {
       maintainers = drv.meta.maintainers or []
         ++ [ lib.maintainers.Profpatsch ];