Re: [PATCH] gnu: st: Mov to terminals.scm.

[ng0 <ng0@we.make.ritual.n0.is>]

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