From b18a55f41af2cf67e93a1082a96f3e498b341240 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 5 Jun 2024 20:54:25 +0200 Subject: desktop-pager: init at 1.0.0 --- configs/gitrepos.nix | 5 +++-- pkgs/haskell/default.nix | 3 --- pkgs/haskell/desktop-pager.nix | 24 ++++++++++++++++++++++++ pkgs/haskell/xmonad-tv/default.nix | 9 +++++---- pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal | 2 +- 5 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 pkgs/haskell/desktop-pager.nix diff --git a/configs/gitrepos.nix b/configs/gitrepos.nix index c69ffa4..0e61989 100644 --- a/configs/gitrepos.nix +++ b/configs/gitrepos.nix @@ -67,6 +67,9 @@ crx = { cgit.desc = "utilities for working with Chrome extensions"; }; + desktop-pager = { + cgit.desc = "X11 pager"; + }; dic = { cgit.desc = "dict.leo.org command line interface"; }; @@ -98,8 +101,6 @@ nixpkgs = { cgit.desc = "Nix Packages collection"; }; - pager = { - }; populate = { cgit.desc = "source code installer"; }; diff --git a/pkgs/haskell/default.nix b/pkgs/haskell/default.nix index df90096..de6bd80 100644 --- a/pkgs/haskell/default.nix +++ b/pkgs/haskell/default.nix @@ -3,9 +3,6 @@ let mylib.mapNixDir (path: self.callPackage path {}) [ ./. ] // { - xmonad-tv = self.callPackage ./xmonad-tv { - pager = self.desktop-pager; - }; }; in self: super: let diff --git a/pkgs/haskell/desktop-pager.nix b/pkgs/haskell/desktop-pager.nix new file mode 100644 index 0000000..3b96159 --- /dev/null +++ b/pkgs/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/desktop-pager"; + sha256 = "11v4f2sz6p69fx2804w0akb8xqv56g89chjyx77jhwqcng2bn6pw"; + rev = "0894fbe50ee2f63b510d32ab8c524134e450f20d"; + 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/pkgs/haskell/xmonad-tv/default.nix b/pkgs/haskell/xmonad-tv/default.nix index f42f97c..c1a9f99 100644 --- a/pkgs/haskell/xmonad-tv/default.nix +++ b/pkgs/haskell/xmonad-tv/default.nix @@ -1,5 +1,6 @@ -{ mkDerivation, aeson, base, bytestring, containers, directory -, extra, filepath, lib, pager, unix, X11, xmonad, xmonad-contrib +{ mkDerivation, aeson, base, bytestring, containers, desktop-pager +, directory, extra, filepath, lib, unix, X11, xmonad +, xmonad-contrib }: mkDerivation { pname = "xmonad-tv"; @@ -8,8 +9,8 @@ mkDerivation { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring containers directory extra filepath pager - unix X11 xmonad xmonad-contrib + aeson base bytestring containers desktop-pager directory extra + filepath unix X11 xmonad xmonad-contrib ]; license = lib.licenses.mit; mainProgram = "xmonad"; diff --git a/pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal b/pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal index f211627..2fb909a 100644 --- a/pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal +++ b/pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal @@ -14,10 +14,10 @@ executable xmonad , aeson , bytestring , containers + , desktop-pager , directory , extra , filepath - , pager , unix , xmonad , xmonad-contrib -- cgit v1.2.3