From 5606a1fd63a501a2eefba60b48395c24fc285b6b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 4 Jan 2024 20:23:56 +0100 Subject: haskellPackages.hledger: remove unnecessary comment --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cecd27e023da..bef073299056 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -228,10 +228,6 @@ self: super: builtins.intersectAttrs super { # hledger* overrides inherit ( let - # Copy hledger man pages from the source tarball into the proper place. - # It always contains the relevant man page(s) at the top level. For - # hledger it additionally has all the other man pages in embeddedfiles/ - # which we ignore. installHledgerManPages = overrideCabal (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.buildPackages.installShellFiles -- cgit 1.4.1 From 0528b99d21ede9e6e8398c685e0058aa30184e1d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 4 Jan 2024 20:25:57 +0100 Subject: haskellPackages.hledger: rename utility function The function installs more than just man pages. --- pkgs/development/haskell-modules/configuration-nix.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bef073299056..17aa92471e22 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -228,7 +228,7 @@ self: super: builtins.intersectAttrs super { # hledger* overrides inherit ( let - installHledgerManPages = overrideCabal (drv: { + installHledgerExtraFiles = overrideCabal (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.buildPackages.installShellFiles ]; @@ -249,15 +249,15 @@ self: super: builtins.intersectAttrs super { }); in { - hledger = installHledgerManPages super.hledger; - hledger-web = installHledgerManPages (hledgerWebTestFix super.hledger-web); - hledger-ui = installHledgerManPages super.hledger-ui; + hledger = installHledgerExtraFiles super.hledger; + hledger-web = installHledgerExtraFiles (hledgerWebTestFix super.hledger-web); + hledger-ui = installHledgerExtraFiles super.hledger-ui; - hledger_1_30_1 = installHledgerManPages + hledger_1_30_1 = installHledgerExtraFiles (doDistribute (super.hledger_1_30_1.override { hledger-lib = self.hledger-lib_1_30; })); - hledger-web_1_30 = installHledgerManPages (hledgerWebTestFix + hledger-web_1_30 = installHledgerExtraFiles (hledgerWebTestFix (doDistribute (super.hledger-web_1_30.override { hledger = self.hledger_1_30_1; hledger-lib = self.hledger-lib_1_30; -- cgit 1.4.1 From adb7face9af957e208db7e75b3a7b6e80f8d1771 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 4 Jan 2024 20:26:43 +0100 Subject: haskellPackages.hledger: add bash completion files --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 17aa92471e22..64bb51f1ac31 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -238,6 +238,10 @@ self: super: builtins.intersectAttrs super { done install -v -Dm644 *.info* -t "$out/share/info/" + + if [ -e shell-completion/hledger-completion.bash ]; then + installShellCompletion --name hledger shell-completion/hledger-completion.bash + fi ''; }); -- cgit 1.4.1