From a34c1c9c189be0610c7304a2348bfc504e7d2271 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: Remove duplicate module import from (gnu packages irc). * gnu/packages/irc.scm: Remove duplicate #:use-module (guix utils). --- gnu/packages/irc.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/irc.scm') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 865b831d5c..262709f88a 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -34,7 +34,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system cmake) -- cgit v1.2.3 From fdc07212539eb2471cd5c67e42067b6fb4851db4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: glirc: Install man page and README.md. * gnu/packages/irc.scm (glirc)[arguments]: Add a new 'install-extra-documentation phase. --- gnu/packages/irc.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/irc.scm') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 262709f88a..7c6f33889d 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -107,6 +107,19 @@ (sha256 (base32 "0jaywb43jfv6kzyz540k02mxdgw1shc6hn7kia21alssszkilh4r")))) (build-system haskell-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-extra-documentation + (lambda _ + (install-file "glirc.1" + (string-append #$output "/share/man/man1")) + ;; The man page is very terse and punts to the GitHub wiki for real + ;; information. Some of that is also in the README, so install it. + (install-file "README.md" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) (native-inputs (list ghc-hunit)) (inputs -- cgit v1.2.3 From 844a98ed52ce60aa28bf23aa337218a4b54f83d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: glirc: Extend description. * gnu/packages/irc.scm (glirc)[description]: Extend. --- gnu/packages/irc.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/irc.scm') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 7c6f33889d..cbe80f5e45 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -148,9 +148,11 @@ (home-page "https://github.com/glguy/irc-core") (synopsis "Console IRC client") (description - "Glirc is a console IRC client with an emphasis on providing dynamic views -into the model of your IRC connections. All views and transformation are -dynamic and don't change the underlying model.") + "Glirc is a console IRC client that focuses on providing both high-detail +and concise views of an IRC connection. All views and transformation are +dynamic and don't change the underlying model. It also provides advanced +line-editing features including syntax-highlighting, multi-line buffering, +and argument placeholders.") (license license:isc))) (define-public quassel -- cgit v1.2.3 From e09275f300efcb9f2f4d805833c2f86ebc599ddd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: catgirl: Don't use snapshot tarball. * gnu/packages/irc.scm (catgirl)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/irc.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/irc.scm') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index cbe80f5e45..8ffe3882db 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -410,13 +410,15 @@ for the IRCv3 protocol.") (package (name "catgirl") (version "2.1") - (source (origin - (method url-fetch) - (uri (string-append "https://git.causal.agency/catgirl/snapshot/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "13pfphcfkdzqfb4x7w21xp6rnmg3ix9f39mpqmxxzg15ys1gp2x6")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.causal.agency/catgirl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gxxblv3bwv1rl2ajjy791333r6qwgzb6qmk3iviw71mzi6ckxba")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 8e3ac218b6b80bdc6d1ca5be57c88291a256b9f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: catgirl: Update to 2.2. * gnu/packages/irc.scm (catgirl): Update to 2.2. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/irc.scm') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 8ffe3882db..a3a5c69e21 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -409,7 +409,7 @@ for the IRCv3 protocol.") (define-public catgirl (package (name "catgirl") - (version "2.1") + (version "2.2") (source (origin (method git-fetch) @@ -418,7 +418,7 @@ for the IRCv3 protocol.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gxxblv3bwv1rl2ajjy791333r6qwgzb6qmk3iviw71mzi6ckxba")))) + (base32 "0r1h10qdhhgy3359ndbjh269daivm126qc0c23db7bffv0xs4bff")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 4ded034a57ffacdd6c7afa73bb58893afd614644 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: catgirl: Use G-expressions. * gnu/packages/irc.scm (catgirl)[arguments]: Rewrite as G-expressions. --- gnu/packages/irc.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/irc.scm') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index a3a5c69e21..f966724022 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -421,9 +421,11 @@ for the IRCv3 protocol.") (base32 "0r1h10qdhhgy3359ndbjh269daivm126qc0c23db7bffv0xs4bff")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests - #:make-flags (list (string-append "PREFIX=" %output) - ,(string-append "CC=" (cc-for-target))))) + (list + #:tests? #f ; no tests + #:make-flags + #~(list (string-append "prefix=" #$output) + (string-append "CC=" #$(cc-for-target))))) (native-inputs (list universal-ctags pkg-config)) (inputs -- cgit v1.2.3