unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Sedsed
@ 2017-01-31 18:03 contact.ng0
  2017-01-31 18:03 ` [PATCH] gnu: Add sedsed contact.ng0
  0 siblings, 1 reply; 8+ messages in thread
From: contact.ng0 @ 2017-01-31 18:03 UTC (permalink / raw)
  To: guix-devel

This adds a package from my 'packages' repository.
I have it in use for a while now, so the "it works" factor is covered.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] gnu: Add sedsed.
  2017-01-31 18:03 Sedsed contact.ng0
@ 2017-01-31 18:03 ` contact.ng0
  2017-01-31 18:30   ` ng0
  0 siblings, 1 reply; 8+ messages in thread
From: contact.ng0 @ 2017-01-31 18:03 UTC (permalink / raw)
  To: guix-devel

From: ng0 <contact.ng0@cryptolab.net>

* gnu/packages/admin.scm (sedsed): New variable.
---
 gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 96aececbb..bb69a9df1 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
-;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Coypright © 2016 John Darrington <jmd@gnu.org>
 ;;;
@@ -1926,3 +1926,66 @@ in order to be able to find it.
 @item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
 @end enumerate")
     (license license:gpl2+)))
+
+(define-public sedsed
+  (package
+    (name "sedsed")
+    (version "1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/aureliojargas/sedsed/"
+                           "archive/v" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; No tests.
+       #:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-sed-in
+           (lambda _
+             (substitute* "sedsed.py"
+               (("sedbin = 'sed'")
+                (string-append "sedbin = '" (which "sed") "'")))
+             #t))
+         (delete 'build)
+         (replace 'install
+           (lambda _
+             ;; Just one file to copy around
+             (install-file "sedsed.py" (string-append
+                                            (assoc-ref %outputs "out")
+                                            "/bin"))
+             #t))
+         (add-after 'install 'symlink
+           ;; Create 'sedsed' symlink to "sedsed.py".
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (sed (string-append bin "/sedsed"))
+                    (sedpy (string-append bin "/sedsed.py")))
+               (symlink  sedpy sed)
+               #t))))))
+    (home-page "http://aurelio.net/projects/sedsed")
+    (synopsis "Sed sed scripts")
+    (description
+     "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(1) scripts.
+
+In debug mode it reads your script and add extra commands to it.  When
+executed you can see the data flow between the commands, revealing all the
+magic sed does on its internal buffers.
+
+In indent mode your script is reformatted with standard spacing.
+
+In tokenize mode you can see the elements of every command you use.
+
+In HTMLize mode your script is converted to a beautiful colored HTML file,
+with all the commands and parameters identified for your viewing pleasure.
+
+With sedsed you can master any sed script.  No more secrets, no more hidden
+buffers.")
+    ;; Unspecified version of GPL.
+    (license license:gpl3)))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: Add sedsed.
  2017-01-31 18:03 ` [PATCH] gnu: Add sedsed contact.ng0
@ 2017-01-31 18:30   ` ng0
  2017-01-31 18:39     ` sedsed, v2 contact.ng0
  0 siblings, 1 reply; 8+ messages in thread
From: ng0 @ 2017-01-31 18:30 UTC (permalink / raw)
  To: guix-devel

contact.ng0@cryptolab.net writes:

> From: ng0 <contact.ng0@cryptolab.net>
>
> * gnu/packages/admin.scm (sedsed): New variable.
> ---
>  gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 64 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 96aececbb..bb69a9df1 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -12,7 +12,7 @@
>  ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
>  ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
> -;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Coypright © 2016 John Darrington <jmd@gnu.org>
>  ;;;
> @@ -1926,3 +1926,66 @@ in order to be able to find it.
>  @item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
>  @end enumerate")
>      (license license:gpl2+)))
> +
> +(define-public sedsed
> +  (package
> +    (name "sedsed")
> +    (version "1.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/aureliojargas/sedsed/"
> +                           "archive/v" version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f ; No tests.
> +       #:python ,python-2
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-sed-in
> +           (lambda _
> +             (substitute* "sedsed.py"
> +               (("sedbin = 'sed'")
> +                (string-append "sedbin = '" (which "sed") "'")))
> +             #t))
> +         (delete 'build)
> +         (replace 'install
> +           (lambda _
> +             ;; Just one file to copy around
> +             (install-file "sedsed.py" (string-append
> +                                            (assoc-ref %outputs "out")
> +                                            "/bin"))
> +             #t))

This looks wrong in indendation. I have to check the patch again,
I just copied this from repository to repository.

> +         (add-after 'install 'symlink
> +           ;; Create 'sedsed' symlink to "sedsed.py".
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (sed (string-append bin "/sedsed"))
> +                    (sedpy (string-append bin "/sedsed.py")))
> +               (symlink  sedpy sed)
> +               #t))))))
> +    (home-page "http://aurelio.net/projects/sedsed")
> +    (synopsis "Sed sed scripts")
> +    (description
> +     "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(1) scripts.
> +
> +In debug mode it reads your script and add extra commands to it.  When
> +executed you can see the data flow between the commands, revealing all the
> +magic sed does on its internal buffers.
> +
> +In indent mode your script is reformatted with standard spacing.
> +
> +In tokenize mode you can see the elements of every command you use.
> +
> +In HTMLize mode your script is converted to a beautiful colored HTML file,
> +with all the commands and parameters identified for your viewing pleasure.
> +
> +With sedsed you can master any sed script.  No more secrets, no more hidden
> +buffers.")
> +    ;; Unspecified version of GPL.
> +    (license license:gpl3)))
> -- 
> 2.11.0
>

-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

^ permalink raw reply	[flat|nested] 8+ messages in thread

* sedsed, v2
  2017-01-31 18:30   ` ng0
@ 2017-01-31 18:39     ` contact.ng0
  2017-01-31 18:39       ` [PATCH] gnu: Add sedsed contact.ng0
  0 siblings, 1 reply; 8+ messages in thread
From: contact.ng0 @ 2017-01-31 18:39 UTC (permalink / raw)
  To: guix-devel

Change: indendation fix.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] gnu: Add sedsed.
  2017-01-31 18:39     ` sedsed, v2 contact.ng0
@ 2017-01-31 18:39       ` contact.ng0
  2017-02-09 19:07         ` Kei Kebreau
  0 siblings, 1 reply; 8+ messages in thread
From: contact.ng0 @ 2017-01-31 18:39 UTC (permalink / raw)
  To: guix-devel

From: ng0 <contact.ng0@cryptolab.net>

* gnu/packages/admin.scm (sedsed): New variable.
---
 gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 96aececbb..e865b36db 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
-;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Coypright © 2016 John Darrington <jmd@gnu.org>
 ;;;
@@ -1926,3 +1926,66 @@ in order to be able to find it.
 @item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
 @end enumerate")
     (license license:gpl2+)))
+
+(define-public sedsed
+  (package
+    (name "sedsed")
+    (version "1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/aureliojargas/sedsed/"
+                           "archive/v" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; No tests.
+       #:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-sed-in
+           (lambda _
+             (substitute* "sedsed.py"
+               (("sedbin = 'sed'")
+                (string-append "sedbin = '" (which "sed") "'")))
+             #t))
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin")))
+               ;; Just one file to copy around
+               (install-file "sedsed.py" bin)
+               #t)))
+         (add-after 'install 'symlink
+           ;; Create 'sedsed' symlink to "sedsed.py".
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (sed (string-append bin "/sedsed"))
+                    (sedpy (string-append bin "/sedsed.py")))
+               (symlink  sedpy sed)
+               #t))))))
+    (home-page "http://aurelio.net/projects/sedsed")
+    (synopsis "Sed sed scripts")
+    (description
+     "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(1) scripts.
+
+In debug mode it reads your script and add extra commands to it.  When
+executed you can see the data flow between the commands, revealing all the
+magic sed does on its internal buffers.
+
+In indent mode your script is reformatted with standard spacing.
+
+In tokenize mode you can see the elements of every command you use.
+
+In HTMLize mode your script is converted to a beautiful colored HTML file,
+with all the commands and parameters identified for your viewing pleasure.
+
+With sedsed you can master any sed script.  No more secrets, no more hidden
+buffers.")
+    ;; Unspecified version of GPL.
+    (license license:gpl3)))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: Add sedsed.
  2017-01-31 18:39       ` [PATCH] gnu: Add sedsed contact.ng0
@ 2017-02-09 19:07         ` Kei Kebreau
  2017-02-10 21:35           ` ng0
  0 siblings, 1 reply; 8+ messages in thread
From: Kei Kebreau @ 2017-02-09 19:07 UTC (permalink / raw)
  To: contact.ng0; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 3998 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <contact.ng0@cryptolab.net>
>
> * gnu/packages/admin.scm (sedsed): New variable.
> ---
>  gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 64 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 96aececbb..e865b36db 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -12,7 +12,7 @@
>  ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
>  ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
> -;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Coypright © 2016 John Darrington <jmd@gnu.org>
>  ;;;
> @@ -1926,3 +1926,66 @@ in order to be able to find it.
>  @item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
>  @end enumerate")
>      (license license:gpl2+)))
> +
> +(define-public sedsed
> +  (package
> +    (name "sedsed")
> +    (version "1.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/aureliojargas/sedsed/"
> +                           "archive/v" version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f ; No tests.
> +       #:python ,python-2
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-sed-in
> +           (lambda _
> +             (substitute* "sedsed.py"
> +               (("sedbin = 'sed'")
> +                (string-append "sedbin = '" (which "sed") "'")))
> +             #t))
> +         (delete 'build)
> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin")))
> +               ;; Just one file to copy around
> +               (install-file "sedsed.py" bin)
> +               #t)))
> +         (add-after 'install 'symlink
> +           ;; Create 'sedsed' symlink to "sedsed.py".
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (sed (string-append bin "/sedsed"))
> +                    (sedpy (string-append bin "/sedsed.py")))
> +               (symlink  sedpy sed)
> +               #t))))))
> +    (home-page "http://aurelio.net/projects/sedsed")
> +    (synopsis "Sed sed scripts")
> +    (description
> +     "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(1) scripts.
> +
> +In debug mode it reads your script and add extra commands to it.  When
> +executed you can see the data flow between the commands, revealing all the
> +magic sed does on its internal buffers.
> +
> +In indent mode your script is reformatted with standard spacing.
> +
> +In tokenize mode you can see the elements of every command you use.
> +
> +In HTMLize mode your script is converted to a beautiful colored HTML file,
> +with all the commands and parameters identified for your viewing pleasure.
> +
> +With sedsed you can master any sed script.  No more secrets, no more hidden
> +buffers.")
> +    ;; Unspecified version of GPL.
> +    (license license:gpl3)))

There's only one blocking issue for this package.

The license specified on aurelio.net would be GPL3+ by our packaging
conventions. The only problem is that the LICENSE file from Github shows
an Expat license. I'm not sure which license takes precedence in this
situtation.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: Add sedsed.
  2017-02-09 19:07         ` Kei Kebreau
@ 2017-02-10 21:35           ` ng0
  2017-02-11  3:00             ` Kei Kebreau
  0 siblings, 1 reply; 8+ messages in thread
From: ng0 @ 2017-02-10 21:35 UTC (permalink / raw)
  To: Kei Kebreau; +Cc: guix-devel

On 17-02-09 14:07:11, Kei Kebreau wrote:
> contact.ng0@cryptolab.net writes:
> 
> > From: ng0 <contact.ng0@cryptolab.net>
> >
> > * gnu/packages/admin.scm (sedsed): New variable.
> > ---
> >  gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-
> >  1 file changed, 64 insertions(+), 1 deletion(-)
> >
> > diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> > index 96aececbb..e865b36db 100644
> > --- a/gnu/packages/admin.scm
> > +++ b/gnu/packages/admin.scm
> > @@ -12,7 +12,7 @@
> >  ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
> >  ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
> >  ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
> > -;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> > +;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
> >  ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
> >  ;;; Coypright © 2016 John Darrington <jmd@gnu.org>
> >  ;;;
> > @@ -1926,3 +1926,66 @@ in order to be able to find it.
> >  @item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
> >  @end enumerate")
> >      (license license:gpl2+)))
> > +
> > +(define-public sedsed
> > +  (package
> > +    (name "sedsed")
> > +    (version "1.0")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (string-append "https://github.com/aureliojargas/sedsed/"
> > +                           "archive/v" version ".tar.gz"))
> > +       (file-name (string-append name "-" version ".tar.gz"))
> > +       (sha256
> > +        (base32
> > +         "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh"))))
> > +    (build-system python-build-system)
> > +    (arguments
> > +     `(#:tests? #f ; No tests.
> > +       #:python ,python-2
> > +       #:phases
> > +       (modify-phases %standard-phases
> > +         (add-after 'unpack 'patch-sed-in
> > +           (lambda _
> > +             (substitute* "sedsed.py"
> > +               (("sedbin = 'sed'")
> > +                (string-append "sedbin = '" (which "sed") "'")))
> > +             #t))
> > +         (delete 'build)
> > +         (replace 'install
> > +           (lambda* (#:key outputs #:allow-other-keys)
> > +             (let* ((out (assoc-ref outputs "out"))
> > +                    (bin (string-append out "/bin")))
> > +               ;; Just one file to copy around
> > +               (install-file "sedsed.py" bin)
> > +               #t)))
> > +         (add-after 'install 'symlink
> > +           ;; Create 'sedsed' symlink to "sedsed.py".
> > +           (lambda* (#:key outputs #:allow-other-keys)
> > +             (let* ((out (assoc-ref outputs "out"))
> > +                    (bin (string-append out "/bin"))
> > +                    (sed (string-append bin "/sedsed"))
> > +                    (sedpy (string-append bin "/sedsed.py")))
> > +               (symlink  sedpy sed)
> > +               #t))))))
> > +    (home-page "http://aurelio.net/projects/sedsed")
> > +    (synopsis "Sed sed scripts")
> > +    (description
> > +     "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(1) scripts.
> > +
> > +In debug mode it reads your script and add extra commands to it.  When
> > +executed you can see the data flow between the commands, revealing all the
> > +magic sed does on its internal buffers.
> > +
> > +In indent mode your script is reformatted with standard spacing.
> > +
> > +In tokenize mode you can see the elements of every command you use.
> > +
> > +In HTMLize mode your script is converted to a beautiful colored HTML file,
> > +with all the commands and parameters identified for your viewing pleasure.
> > +
> > +With sedsed you can master any sed script.  No more secrets, no more hidden
> > +buffers.")
> > +    ;; Unspecified version of GPL.
> > +    (license license:gpl3)))
> 
> There's only one blocking issue for this package.
> 
> The license specified on aurelio.net would be GPL3+ by our packaging
> conventions. The only problem is that the LICENSE file from Github shows
> an Expat license. I'm not sure which license takes precedence in this
> situtation.

Ha. Thanks, I only relied on the source at aurelio.net at first. I think
when we take it from github, the included license (Expat) applies if no
other license is specificied in a file.

Is this enough that you can make the change, or should I sent an updated
patch?

-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: Add sedsed.
  2017-02-10 21:35           ` ng0
@ 2017-02-11  3:00             ` Kei Kebreau
  0 siblings, 0 replies; 8+ messages in thread
From: Kei Kebreau @ 2017-02-11  3:00 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 4708 bytes --]

ng0 <contact.ng0@cryptolab.net> writes:

> On 17-02-09 14:07:11, Kei Kebreau wrote:
>> contact.ng0@cryptolab.net writes:
>> 
>> > From: ng0 <contact.ng0@cryptolab.net>
>> >
>> > * gnu/packages/admin.scm (sedsed): New variable.
>> > ---
>> >  gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-
>> >  1 file changed, 64 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
>> > index 96aececbb..e865b36db 100644
>> > --- a/gnu/packages/admin.scm
>> > +++ b/gnu/packages/admin.scm
>> > @@ -12,7 +12,7 @@
>> >  ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
>> >  ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
>> >  ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
>> > -;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>> > +;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>> >  ;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>> >  ;;; Coypright © 2016 John Darrington <jmd@gnu.org>
>> >  ;;;
>> > @@ -1926,3 +1926,66 @@ in order to be able to find it.
>> >  @item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
>> >  @end enumerate")
>> >      (license license:gpl2+)))
>> > +
>> > +(define-public sedsed
>> > +  (package
>> > +    (name "sedsed")
>> > +    (version "1.0")
>> > +    (source
>> > +     (origin
>> > +       (method url-fetch)
>> > +       (uri (string-append "https://github.com/aureliojargas/sedsed/"
>> > +                           "archive/v" version ".tar.gz"))
>> > +       (file-name (string-append name "-" version ".tar.gz"))
>> > +       (sha256
>> > +        (base32
>> > +         "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh"))))
>> > +    (build-system python-build-system)
>> > +    (arguments
>> > +     `(#:tests? #f ; No tests.
>> > +       #:python ,python-2
>> > +       #:phases
>> > +       (modify-phases %standard-phases
>> > +         (add-after 'unpack 'patch-sed-in
>> > +           (lambda _
>> > +             (substitute* "sedsed.py"
>> > +               (("sedbin = 'sed'")
>> > +                (string-append "sedbin = '" (which "sed") "'")))
>> > +             #t))
>> > +         (delete 'build)
>> > +         (replace 'install
>> > +           (lambda* (#:key outputs #:allow-other-keys)
>> > +             (let* ((out (assoc-ref outputs "out"))
>> > +                    (bin (string-append out "/bin")))
>> > +               ;; Just one file to copy around
>> > +               (install-file "sedsed.py" bin)
>> > +               #t)))
>> > +         (add-after 'install 'symlink
>> > +           ;; Create 'sedsed' symlink to "sedsed.py".
>> > +           (lambda* (#:key outputs #:allow-other-keys)
>> > +             (let* ((out (assoc-ref outputs "out"))
>> > +                    (bin (string-append out "/bin"))
>> > +                    (sed (string-append bin "/sedsed"))
>> > +                    (sedpy (string-append bin "/sedsed.py")))
>> > +               (symlink  sedpy sed)
>> > +               #t))))))
>> > +    (home-page "http://aurelio.net/projects/sedsed")
>> > +    (synopsis "Sed sed scripts")
>> > +    (description
>> > +     "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(1) scripts.
>> > +
>> > +In debug mode it reads your script and add extra commands to it.  When
>> > +executed you can see the data flow between the commands, revealing all the
>> > +magic sed does on its internal buffers.
>> > +
>> > +In indent mode your script is reformatted with standard spacing.
>> > +
>> > +In tokenize mode you can see the elements of every command you use.
>> > +
>> > +In HTMLize mode your script is converted to a beautiful colored HTML file,
>> > +with all the commands and parameters identified for your viewing pleasure.
>> > +
>> > +With sedsed you can master any sed script.  No more secrets, no more hidden
>> > +buffers.")
>> > +    ;; Unspecified version of GPL.
>> > +    (license license:gpl3)))
>> 
>> There's only one blocking issue for this package.
>> 
>> The license specified on aurelio.net would be GPL3+ by our packaging
>> conventions. The only problem is that the LICENSE file from Github shows
>> an Expat license. I'm not sure which license takes precedence in this
>> situtation.
>
> Ha. Thanks, I only relied on the source at aurelio.net at first. I think
> when we take it from github, the included license (Expat) applies if no
> other license is specificied in a file.
>
> Is this enough that you can make the change, or should I sent an updated
> patch?

I've made the change and pushed it to master.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-02-11  3:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-31 18:03 Sedsed contact.ng0
2017-01-31 18:03 ` [PATCH] gnu: Add sedsed contact.ng0
2017-01-31 18:30   ` ng0
2017-01-31 18:39     ` sedsed, v2 contact.ng0
2017-01-31 18:39       ` [PATCH] gnu: Add sedsed contact.ng0
2017-02-09 19:07         ` Kei Kebreau
2017-02-10 21:35           ` ng0
2017-02-11  3:00             ` Kei Kebreau

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).