From da3c1f05f595ac6919f26e994094d5513936a06e Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 4 Sep 2023 10:54:17 +0200 Subject: 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. --- krebs/5pkgs/haskell/desktop-pager.nix | 24 ++++++++++++++++++++++++ krebs/5pkgs/haskell/pager.nix | 24 ------------------------ krebs/5pkgs/simple/pager.nix | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 krebs/5pkgs/haskell/desktop-pager.nix delete mode 100644 krebs/5pkgs/haskell/pager.nix diff --git a/krebs/5pkgs/haskell/desktop-pager.nix b/krebs/5pkgs/haskell/desktop-pager.nix new file mode 100644 index 000000000..1a4f94db3 --- /dev/null +++ b/krebs/5pkgs/haskell/desktop-pager.nix @@ -0,0 +1,24 @@ +{ mkDerivation, aeson, base, blessings, bytestring, containers +, data-default, extra, fetchgit, hack, lib, optparse-applicative +, probability, scanner, speculate, split, terminal-size, text, unix +, utf8-string, X11 +}: +mkDerivation { + pname = "desktop-pager"; + version = "1.0.0"; + src = fetchgit { + url = "https://cgit.krebsco.de/pager"; + sha256 = "07wjlhnb27vfhkqq5vhi768mlrcpwl4b2yfk04v3lw047q6pmby0"; + rev = "dfa3ff346d22d332ffbadd46963f1cc5cb2a4939"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra utf8-string X11 ]; + executableHaskellDepends = [ + aeson base blessings bytestring containers data-default hack + optparse-applicative probability scanner speculate split + terminal-size text unix X11 + ]; + license = lib.licenses.mit; +} diff --git a/krebs/5pkgs/haskell/pager.nix b/krebs/5pkgs/haskell/pager.nix deleted file mode 100644 index 36709788c..000000000 --- a/krebs/5pkgs/haskell/pager.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, aeson, base, blessings, bytestring, containers -, data-default, extra, fetchgit, hack, lib, optparse-applicative -, probability, scanner, speculate, split, terminal-size, text, unix -, utf8-string, X11 -}: -mkDerivation { - pname = "pager"; - version = "1.0.0"; - src = fetchgit { - url = "https://cgit.krebsco.de/pager"; - sha256 = "07wjlhnb27vfhkqq5vhi768mlrcpwl4b2yfk04v3lw047q6pmby0"; - rev = "dfa3ff346d22d332ffbadd46963f1cc5cb2a4939"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra utf8-string X11 ]; - executableHaskellDepends = [ - aeson base blessings bytestring containers data-default hack - optparse-applicative probability scanner speculate split - terminal-size text unix X11 - ]; - license = lib.licenses.mit; -} 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 ]; -- cgit v1.2.3