summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2023-09-04 10:54:17 +0200
committertv <tv@krebsco.de>2023-09-04 10:54:17 +0200
commitda3c1f05f595ac6919f26e994094d5513936a06e (patch)
treefa1383cc23e2dbb8abc5f1162cc082b45328ea2f
parent363b381eeca12c54c83b4841198d189d470d345e (diff)
haskellPackages: pager -> desktop-pager
Rename pager to desktop-pager to prevent a name clash with https://hackage.haskell.org/package/pager, causing hledger-lib to not build.
-rw-r--r--krebs/5pkgs/haskell/desktop-pager.nix (renamed from krebs/5pkgs/haskell/pager.nix)2
-rw-r--r--krebs/5pkgs/simple/pager.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/krebs/5pkgs/haskell/pager.nix b/krebs/5pkgs/haskell/desktop-pager.nix
index 36709788c..1a4f94db3 100644
--- a/krebs/5pkgs/haskell/pager.nix
+++ b/krebs/5pkgs/haskell/desktop-pager.nix
@@ -4,7 +4,7 @@
, utf8-string, X11
}:
mkDerivation {
- pname = "pager";
+ pname = "desktop-pager";
version = "1.0.0";
src = fetchgit {
url = "https://cgit.krebsco.de/pager";
diff --git a/krebs/5pkgs/simple/pager.nix b/krebs/5pkgs/simple/pager.nix
index 952b5ee1e..adc2cc67b 100644
--- a/krebs/5pkgs/simple/pager.nix
+++ b/krebs/5pkgs/simple/pager.nix
@@ -33,7 +33,7 @@ pkgs.symlinkJoin {
-ti vt340 \
-xrm '*geometry: 32x10' \
-xrm '*internalBorder: 2' \
- -e ${pkgs.haskellPackages.pager}/bin/pager "$@"
+ -e ${pkgs.haskellPackages.desktop-pager}/bin/pager "$@"
'')
pkgs.haskellPackages.pager
];