* [PATCH] gnu: st: Mov to terminals.scm.
@ 2016-08-07 12:33 ng0
2016-08-07 12:38 ` ng0
2016-08-07 13:46 ` Mathieu Lirzin
0 siblings, 2 replies; 10+ messages in thread
From: ng0 @ 2016-08-07 12:33 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1.1: 0001-gnu-st-Move-to-terminals.scm.patch --]
[-- Type: text/x-patch, Size: 5634 bytes --]
From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sun, 7 Aug 2016 12:30:06 +0000
Subject: [PATCH] gnu: st: Move to terminals.scm.
* gnu/packages/suckless.scm (st): Move from here ...
* gnu/packages/terminals.scm (st): ... to here.
---
gnu/packages/suckless.scm | 50 +-------------------------------------------
gnu/packages/terminals.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 8732a84..16e9146 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -28,10 +28,8 @@
#:use-module (gnu packages)
#:use-module (gnu packages gnome)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages fonts)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages webkit)
- #:use-module (gnu packages fontutils))
+ #:use-module (gnu packages webkit))
(define-public dwm
(package
@@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
"Simple X session lock with trivial feedback on password entry.")
(license license:x11)))
-(define-public st
- (package
- (name "st")
- (version "0.6")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://dl.suckless.org/st/st-"
- version ".tar.gz"))
- (sha256
- (base32
- "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
- (build-system gnu-build-system)
- (arguments
- '(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'inhibit-terminfo-install
- (lambda _
- (substitute* "Makefile"
- (("\t@tic -s st.info") ""))
- #t)))))
- (inputs
- `(("libx11" ,libx11)
- ("libxft" ,libxft)
- ("libxcomposite" ,libxcomposite)
- ("compositeproto" ,compositeproto)
- ("libxext" ,libxext)
- ("xextproto" ,xextproto)
- ("libxrender" ,libxrender)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("font-liberation" ,font-liberation)))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (home-page "http://st.suckless.org/")
- (synopsis "Simple terminal emulator")
- (description
- "St implements a simple and lightweight terminal emulator. It
-implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
-antialiased fonts (using fontconfig), fallback fonts, resizing, and line
-drawing.")
- (license license:x11)))
-
(define-public surf
(package
(name "surf")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 98f0060..02cb9fa 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,7 +37,10 @@
#:use-module (gnu packages wm)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages gtk)
- #:use-module (gnu packages gnome))
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages fonts)
+ #:use-module (gnu packages fontutils))
(define-public tilda
(package
@@ -159,3 +163,49 @@ insert mode and command mode where keybindings have different functions.")
Forget screen recording apps and blurry video. Enjoy a lightweight, purely
text-based approach to terminal recording.")
(license license:gpl3)))
+
+(define-public st
+ (package
+ (name "st")
+ (version "0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://dl.suckless.org/st/st-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f ; no tests
+ #:make-flags (list "CC=gcc"
+ (string-append "PREFIX=" %output))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'inhibit-terminfo-install
+ (lambda _
+ (substitute* "Makefile"
+ (("\t@tic -s st.info") ""))
+ #t)))))
+ (inputs
+ `(("libx11" ,libx11)
+ ("libxft" ,libxft)
+ ("libxcomposite" ,libxcomposite)
+ ("compositeproto" ,compositeproto)
+ ("libxext" ,libxext)
+ ("xextproto" ,xextproto)
+ ("libxrender" ,libxrender)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("font-liberation" ,font-liberation)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (home-page "http://st.suckless.org/")
+ (synopsis "Simple terminal emulator")
+ (description
+ "St implements a simple and lightweight terminal emulator. It
+implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
+antialiased fonts (using fontconfig), fallback fonts, resizing, and line
+drawing.")
+ (license license:x11)))
--
2.9.2
[-- Attachment #1.2: Type: text/plain, Size: 134 bytes --]
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-07 12:33 [PATCH] gnu: st: Mov to terminals.scm ng0
@ 2016-08-07 12:38 ` ng0
2016-08-08 13:38 ` 宋文武
2016-08-07 13:46 ` Mathieu Lirzin
1 sibling, 1 reply; 10+ messages in thread
From: ng0 @ 2016-08-07 12:38 UTC (permalink / raw)
To: guix-devel
Hi,
I think it's pointless to have a suckless.scm which bundles all software
which just happens to follow suckless ideology/goals or be hosted
there.
That's why I did not commit ii to suckless but to irc.scm, no one will
look into suckless.scm when what they really are looking for is not
$suckless but application xy.
I try to unbundle and remove suckless.scm with the next patches.
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-07 12:38 ` ng0
@ 2016-08-08 13:38 ` 宋文武
2016-08-08 21:28 ` Mathieu Lirzin
0 siblings, 1 reply; 10+ messages in thread
From: 宋文武 @ 2016-08-08 13:38 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
ng0 <ng0@we.make.ritual.n0.is> writes:
> Hi,
>
> I think it's pointless to have a suckless.scm which bundles all software
> which just happens to follow suckless ideology/goals or be hosted
> there.
> That's why I did not commit ii to suckless but to irc.scm, no one will
> look into suckless.scm when what they really are looking for is not
> $suckless but application xy.
> I try to unbundle and remove suckless.scm with the next patches.
Well, it's difficult to choose the "right" category for packages.
For example, 'dmenu' shouldn't go to 'wm.scm', it has nothing to
do with window managers.
When a project makes multiple softwares, I think it's easier to
put all of them in one project file, eg: gnome and freedesktop.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-08 13:38 ` 宋文武
@ 2016-08-08 21:28 ` Mathieu Lirzin
2016-08-08 23:14 ` Mark H Weaver
0 siblings, 1 reply; 10+ messages in thread
From: Mathieu Lirzin @ 2016-08-08 21:28 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
iyzsong@member.fsf.org (宋文武) writes:
> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> Hi,
>>
>> I think it's pointless to have a suckless.scm which bundles all software
>> which just happens to follow suckless ideology/goals or be hosted
>> there.
>> That's why I did not commit ii to suckless but to irc.scm, no one will
>> look into suckless.scm when what they really are looking for is not
>> $suckless but application xy.
>> I try to unbundle and remove suckless.scm with the next patches.
>
> Well, it's difficult to choose the "right" category for packages.
> For example, 'dmenu' shouldn't go to 'wm.scm', it has nothing to
> do with window managers.
>
> When a project makes multiple softwares, I think it's easier to
> put all of them in one project file, eg: gnome and freedesktop.
So you are in favour of keeping (gnu packages suckless)?
--
Mathieu Lirzin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-08 21:28 ` Mathieu Lirzin
@ 2016-08-08 23:14 ` Mark H Weaver
2016-08-12 8:28 ` ng0
0 siblings, 1 reply; 10+ messages in thread
From: Mark H Weaver @ 2016-08-08 23:14 UTC (permalink / raw)
To: Mathieu Lirzin; +Cc: guix-devel
Mathieu Lirzin <mthl@gnu.org> writes:
> iyzsong@member.fsf.org (宋文武) writes:
>
>> ng0 <ng0@we.make.ritual.n0.is> writes:
>>
>>> Hi,
>>>
>>> I think it's pointless to have a suckless.scm which bundles all software
>>> which just happens to follow suckless ideology/goals or be hosted
>>> there.
>>> That's why I did not commit ii to suckless but to irc.scm, no one will
>>> look into suckless.scm when what they really are looking for is not
>>> $suckless but application xy.
>>> I try to unbundle and remove suckless.scm with the next patches.
>>
>> Well, it's difficult to choose the "right" category for packages.
>> For example, 'dmenu' shouldn't go to 'wm.scm', it has nothing to
>> do with window managers.
>>
>> When a project makes multiple softwares, I think it's easier to
>> put all of them in one project file, eg: gnome and freedesktop.
>
> So you are in favour of keeping (gnu packages suckless)?
Fwiw, I'm in favor of keeping suckless.scm, and rejecting these proposed
package moves.
Mark
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-08 23:14 ` Mark H Weaver
@ 2016-08-12 8:28 ` ng0
0 siblings, 0 replies; 10+ messages in thread
From: ng0 @ 2016-08-12 8:28 UTC (permalink / raw)
To: Mark H Weaver, Mathieu Lirzin; +Cc: guix-devel
Hi,
Mark H Weaver <mhw@netris.org> writes:
> Mathieu Lirzin <mthl@gnu.org> writes:
>
>> iyzsong@member.fsf.org (宋文武) writes:
>>
>>> ng0 <ng0@we.make.ritual.n0.is> writes:
>>>
>>>> Hi,
>>>>
>>>> I think it's pointless to have a suckless.scm which bundles all software
>>>> which just happens to follow suckless ideology/goals or be hosted
>>>> there.
>>>> That's why I did not commit ii to suckless but to irc.scm, no one will
>>>> look into suckless.scm when what they really are looking for is not
>>>> $suckless but application xy.
>>>> I try to unbundle and remove suckless.scm with the next patches.
>>>
>>> Well, it's difficult to choose the "right" category for packages.
>>> For example, 'dmenu' shouldn't go to 'wm.scm', it has nothing to
>>> do with window managers.
>>>
>>> When a project makes multiple softwares, I think it's easier to
>>> put all of them in one project file, eg: gnome and freedesktop.
>>
>> So you are in favour of keeping (gnu packages suckless)?
>
> Fwiw, I'm in favor of keeping suckless.scm, and rejecting these proposed
> package moves.
>
> Mark
>
Thanks for the comments, I did not see your replies until today.
Okay, I'd say with your replied that we do not move it.
The latest update of st I did in suckless.scm, so anyone who wants to
update that can aply the patch.
--
♥Ⓐ ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-07 12:33 [PATCH] gnu: st: Mov to terminals.scm ng0
2016-08-07 12:38 ` ng0
@ 2016-08-07 13:46 ` Mathieu Lirzin
2016-08-07 15:05 ` ng0
1 sibling, 1 reply; 10+ messages in thread
From: Mathieu Lirzin @ 2016-08-07 13:46 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
Hi,
I don't have an opinion on the move, however when moving packages across
modules your have to keep track of the copyrights.
In this case Amirouche Boubekki <amirouche@hypermove.net> copyright should be
moved from (gnu packages suckless) to (gnu packages terminals).
ng0 <ng0@we.make.ritual.n0.is> writes:
> From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sun, 7 Aug 2016 12:30:06 +0000
> Subject: [PATCH] gnu: st: Move to terminals.scm.
>
> * gnu/packages/suckless.scm (st): Move from here ...
> * gnu/packages/terminals.scm (st): ... to here.
nitpick:
--8<---------------cut here---------------start------------->8---
gnu: st: Move to (gnu packages terminals).
* gnu/packages/suckless.scm (st): Move to ...
* gnu/packages/terminals.scm (st): ... here.
--8<---------------cut here---------------end--------------->8---
> ---
> gnu/packages/suckless.scm | 50 +-------------------------------------------
> gnu/packages/terminals.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 52 insertions(+), 50 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index 8732a84..16e9146 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -28,10 +28,8 @@
> #:use-module (gnu packages)
> #:use-module (gnu packages gnome)
> #:use-module (gnu packages xorg)
> - #:use-module (gnu packages fonts)
> #:use-module (gnu packages pkg-config)
> - #:use-module (gnu packages webkit)
> - #:use-module (gnu packages fontutils))
> + #:use-module (gnu packages webkit))
>
> (define-public dwm
> (package
> @@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
> "Simple X session lock with trivial feedback on password entry.")
> (license license:x11)))
>
> -(define-public st
> - (package
> - (name "st")
> - (version "0.6")
> - (source
> - (origin
> - (method url-fetch)
> - (uri (string-append "http://dl.suckless.org/st/st-"
> - version ".tar.gz"))
> - (sha256
> - (base32
> - "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
> - (build-system gnu-build-system)
> - (arguments
> - '(#:tests? #f ; no tests
> - #:make-flags (list "CC=gcc"
> - (string-append "PREFIX=" %output))
> - #:phases
> - (modify-phases %standard-phases
> - (delete 'configure)
> - (add-after 'unpack 'inhibit-terminfo-install
> - (lambda _
> - (substitute* "Makefile"
> - (("\t@tic -s st.info") ""))
> - #t)))))
> - (inputs
> - `(("libx11" ,libx11)
> - ("libxft" ,libxft)
> - ("libxcomposite" ,libxcomposite)
> - ("compositeproto" ,compositeproto)
> - ("libxext" ,libxext)
> - ("xextproto" ,xextproto)
> - ("libxrender" ,libxrender)
> - ("fontconfig" ,fontconfig)
> - ("freetype" ,freetype)
> - ("font-liberation" ,font-liberation)))
> - (native-inputs `(("pkg-config" ,pkg-config)))
> - (home-page "http://st.suckless.org/")
> - (synopsis "Simple terminal emulator")
> - (description
> - "St implements a simple and lightweight terminal emulator. It
> -implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
> -antialiased fonts (using fontconfig), fallback fonts, resizing, and line
> -drawing.")
> - (license license:x11)))
> -
> (define-public surf
> (package
> (name "surf")
> diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
> index 98f0060..02cb9fa 100644
> --- a/gnu/packages/terminals.scm
> +++ b/gnu/packages/terminals.scm
> @@ -2,6 +2,7 @@
> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
> ;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -36,7 +37,10 @@
> #:use-module (gnu packages wm)
> #:use-module (gnu packages ncurses)
> #:use-module (gnu packages gtk)
> - #:use-module (gnu packages gnome))
> + #:use-module (gnu packages gnome)
> + #:use-module (gnu packages xorg)
> + #:use-module (gnu packages fonts)
> + #:use-module (gnu packages fontutils))
>
> (define-public tilda
> (package
> @@ -159,3 +163,49 @@ insert mode and command mode where keybindings have different functions.")
> Forget screen recording apps and blurry video. Enjoy a lightweight, purely
> text-based approach to terminal recording.")
> (license license:gpl3)))
> +
> +(define-public st
> + (package
> + (name "st")
> + (version "0.6")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append "http://dl.suckless.org/st/st-"
> + version ".tar.gz"))
> + (sha256
> + (base32
> + "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
> + (build-system gnu-build-system)
> + (arguments
> + '(#:tests? #f ; no tests
> + #:make-flags (list "CC=gcc"
> + (string-append "PREFIX=" %output))
> + #:phases
> + (modify-phases %standard-phases
> + (delete 'configure)
> + (add-after 'unpack 'inhibit-terminfo-install
> + (lambda _
> + (substitute* "Makefile"
> + (("\t@tic -s st.info") ""))
> + #t)))))
> + (inputs
> + `(("libx11" ,libx11)
> + ("libxft" ,libxft)
> + ("libxcomposite" ,libxcomposite)
> + ("compositeproto" ,compositeproto)
> + ("libxext" ,libxext)
> + ("xextproto" ,xextproto)
> + ("libxrender" ,libxrender)
> + ("fontconfig" ,fontconfig)
> + ("freetype" ,freetype)
> + ("font-liberation" ,font-liberation)))
> + (native-inputs `(("pkg-config" ,pkg-config)))
> + (home-page "http://st.suckless.org/")
> + (synopsis "Simple terminal emulator")
> + (description
> + "St implements a simple and lightweight terminal emulator. It
> +implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
> +antialiased fonts (using fontconfig), fallback fonts, resizing, and line
> +drawing.")
> + (license license:x11)))
> --
> 2.9.2
Can you send an updated patch?
If nobody objects I will push this in the following days.
Thanks.
--
Mathieu Lirzin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-07 13:46 ` Mathieu Lirzin
@ 2016-08-07 15:05 ` ng0
2016-08-07 15:52 ` Mathieu Lirzin
0 siblings, 1 reply; 10+ messages in thread
From: ng0 @ 2016-08-07 15:05 UTC (permalink / raw)
To: Mathieu Lirzin; +Cc: guix-devel
Mathieu Lirzin <mthl@gnu.org> writes:
> Hi,
>
> I don't have an opinion on the move, however when moving packages across
> modules your have to keep track of the copyrights.
Oh... Okay, I forgot about that, I never moved packages. Thanks for
pointing it out to me.
I know that my personal copyright was limited to the st copyright in
suckless.
I moved other packages, should I look at the git log of suckless.scm and
add the copyrights which apply?
> In this case Amirouche Boubekki <amirouche@hypermove.net> copyright should be
> moved from (gnu packages suckless) to (gnu packages terminals).
>
> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
>> From: ng0 <ng0@we.make.ritual.n0.is>
>> Date: Sun, 7 Aug 2016 12:30:06 +0000
>> Subject: [PATCH] gnu: st: Move to terminals.scm.
>>
>> * gnu/packages/suckless.scm (st): Move from here ...
>> * gnu/packages/terminals.scm (st): ... to here.
>
> nitpick:
>
> --8<---------------cut here---------------start------------->8---
> gnu: st: Move to (gnu packages terminals).
>
> * gnu/packages/suckless.scm (st): Move to ...
> * gnu/packages/terminals.scm (st): ... here.
> --8<---------------cut here---------------end--------------->8---
>
>> ---
>> gnu/packages/suckless.scm | 50 +-------------------------------------------
>> gnu/packages/terminals.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++-
>> 2 files changed, 52 insertions(+), 50 deletions(-)
>>
>> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
>> index 8732a84..16e9146 100644
>> --- a/gnu/packages/suckless.scm
>> +++ b/gnu/packages/suckless.scm
>> @@ -28,10 +28,8 @@
>> #:use-module (gnu packages)
>> #:use-module (gnu packages gnome)
>> #:use-module (gnu packages xorg)
>> - #:use-module (gnu packages fonts)
>> #:use-module (gnu packages pkg-config)
>> - #:use-module (gnu packages webkit)
>> - #:use-module (gnu packages fontutils))
>> + #:use-module (gnu packages webkit))
>>
>> (define-public dwm
>> (package
>> @@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
>> "Simple X session lock with trivial feedback on password entry.")
>> (license license:x11)))
>>
>> -(define-public st
>> - (package
>> - (name "st")
>> - (version "0.6")
>> - (source
>> - (origin
>> - (method url-fetch)
>> - (uri (string-append "http://dl.suckless.org/st/st-"
>> - version ".tar.gz"))
>> - (sha256
>> - (base32
>> - "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
>> - (build-system gnu-build-system)
>> - (arguments
>> - '(#:tests? #f ; no tests
>> - #:make-flags (list "CC=gcc"
>> - (string-append "PREFIX=" %output))
>> - #:phases
>> - (modify-phases %standard-phases
>> - (delete 'configure)
>> - (add-after 'unpack 'inhibit-terminfo-install
>> - (lambda _
>> - (substitute* "Makefile"
>> - (("\t@tic -s st.info") ""))
>> - #t)))))
>> - (inputs
>> - `(("libx11" ,libx11)
>> - ("libxft" ,libxft)
>> - ("libxcomposite" ,libxcomposite)
>> - ("compositeproto" ,compositeproto)
>> - ("libxext" ,libxext)
>> - ("xextproto" ,xextproto)
>> - ("libxrender" ,libxrender)
>> - ("fontconfig" ,fontconfig)
>> - ("freetype" ,freetype)
>> - ("font-liberation" ,font-liberation)))
>> - (native-inputs `(("pkg-config" ,pkg-config)))
>> - (home-page "http://st.suckless.org/")
>> - (synopsis "Simple terminal emulator")
>> - (description
>> - "St implements a simple and lightweight terminal emulator. It
>> -implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
>> -antialiased fonts (using fontconfig), fallback fonts, resizing, and line
>> -drawing.")
>> - (license license:x11)))
>> -
>> (define-public surf
>> (package
>> (name "surf")
>> diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
>> index 98f0060..02cb9fa 100644
>> --- a/gnu/packages/terminals.scm
>> +++ b/gnu/packages/terminals.scm
>> @@ -2,6 +2,7 @@
>> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
>> ;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
>> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
>> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>> ;;;
>> ;;; This file is part of GNU Guix.
>> ;;;
>> @@ -36,7 +37,10 @@
>> #:use-module (gnu packages wm)
>> #:use-module (gnu packages ncurses)
>> #:use-module (gnu packages gtk)
>> - #:use-module (gnu packages gnome))
>> + #:use-module (gnu packages gnome)
>> + #:use-module (gnu packages xorg)
>> + #:use-module (gnu packages fonts)
>> + #:use-module (gnu packages fontutils))
>>
>> (define-public tilda
>> (package
>> @@ -159,3 +163,49 @@ insert mode and command mode where keybindings have different functions.")
>> Forget screen recording apps and blurry video. Enjoy a lightweight, purely
>> text-based approach to terminal recording.")
>> (license license:gpl3)))
>> +
>> +(define-public st
>> + (package
>> + (name "st")
>> + (version "0.6")
>> + (source
>> + (origin
>> + (method url-fetch)
>> + (uri (string-append "http://dl.suckless.org/st/st-"
>> + version ".tar.gz"))
>> + (sha256
>> + (base32
>> + "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
>> + (build-system gnu-build-system)
>> + (arguments
>> + '(#:tests? #f ; no tests
>> + #:make-flags (list "CC=gcc"
>> + (string-append "PREFIX=" %output))
>> + #:phases
>> + (modify-phases %standard-phases
>> + (delete 'configure)
>> + (add-after 'unpack 'inhibit-terminfo-install
>> + (lambda _
>> + (substitute* "Makefile"
>> + (("\t@tic -s st.info") ""))
>> + #t)))))
>> + (inputs
>> + `(("libx11" ,libx11)
>> + ("libxft" ,libxft)
>> + ("libxcomposite" ,libxcomposite)
>> + ("compositeproto" ,compositeproto)
>> + ("libxext" ,libxext)
>> + ("xextproto" ,xextproto)
>> + ("libxrender" ,libxrender)
>> + ("fontconfig" ,fontconfig)
>> + ("freetype" ,freetype)
>> + ("font-liberation" ,font-liberation)))
>> + (native-inputs `(("pkg-config" ,pkg-config)))
>> + (home-page "http://st.suckless.org/")
>> + (synopsis "Simple terminal emulator")
>> + (description
>> + "St implements a simple and lightweight terminal emulator. It
>> +implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
>> +antialiased fonts (using fontconfig), fallback fonts, resizing, and line
>> +drawing.")
>> + (license license:x11)))
>> --
>> 2.9.2
>
> Can you send an updated patch?
>
> If nobody objects I will push this in the following days.
>
> Thanks.
>
> --
> Mathieu Lirzin
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-07 15:05 ` ng0
@ 2016-08-07 15:52 ` Mathieu Lirzin
2016-08-08 7:52 ` ng0
0 siblings, 1 reply; 10+ messages in thread
From: Mathieu Lirzin @ 2016-08-07 15:52 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
ng0 <ng0@we.make.ritual.n0.is> writes:
> Mathieu Lirzin <mthl@gnu.org> writes:
>
>> I don't have an opinion on the move, however when moving packages across
>> modules your have to keep track of the copyrights.
>
> Oh... Okay, I forgot about that, I never moved packages. Thanks for
> pointing it out to me.
> I know that my personal copyright was limited to the st copyright in
> suckless.
> I moved other packages, should I look at the git log of suckless.scm and
> add the copyrights which apply?
Yes, I think so.
Thank you.
--
Mathieu Lirzin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gnu: st: Mov to terminals.scm.
2016-08-07 15:52 ` Mathieu Lirzin
@ 2016-08-08 7:52 ` ng0
0 siblings, 0 replies; 10+ messages in thread
From: ng0 @ 2016-08-08 7:52 UTC (permalink / raw)
To: Mathieu Lirzin; +Cc: guix-devel
Hi,
Mathieu Lirzin <mthl@gnu.org> writes:
> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> Mathieu Lirzin <mthl@gnu.org> writes:
>>
>>> I don't have an opinion on the move, however when moving packages across
>>> modules your have to keep track of the copyrights.
>>
>> Oh... Okay, I forgot about that, I never moved packages. Thanks for
>> pointing it out to me.
>> I know that my personal copyright was limited to the st copyright in
>> suckless.
>> I moved other packages, should I look at the git log of suckless.scm and
>> add the copyrights which apply?
>
> Yes, I think so.
>
> Thank you.
the changes are addressed in a separate patch (Subject: "[PATCH]" as I
forgot to add more to the Subject) which also addresses copyrights which
were dropped when dwm.scm was moved to suckless.scm.
I have to assume that other people did same mistakes in the past, and
the sent patch should work as it does contain more than I moved.
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-08-12 15:35 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-07 12:33 [PATCH] gnu: st: Mov to terminals.scm ng0
2016-08-07 12:38 ` ng0
2016-08-08 13:38 ` 宋文武
2016-08-08 21:28 ` Mathieu Lirzin
2016-08-08 23:14 ` Mark H Weaver
2016-08-12 8:28 ` ng0
2016-08-07 13:46 ` Mathieu Lirzin
2016-08-07 15:05 ` ng0
2016-08-07 15:52 ` Mathieu Lirzin
2016-08-08 7:52 ` ng0
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).