* [PATCH] envstore-2.1 @ 2016-05-14 15:10 Matthew Jordan 2016-05-15 0:14 ` Mark H Weaver 0 siblings, 1 reply; 9+ messages in thread From: Matthew Jordan @ 2016-05-14 15:10 UTC (permalink / raw) To: Guix-devel [-- Attachment #1: Type: text/plain, Size: 95 bytes --] Good day all, Submitting patch for envstore-2.1. Let me know if I need to make any changes. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: envstore-2.1 package --] [-- Type: text/x-patch, Size: 2063 bytes --] From 8de06b6e26d9e1eb7bb7ef6df163f54a46db3d89 Mon Sep 17 00:00:00 2001 From: Matthew Jordan <matthewjordandevops@yandex.com> Date: Thu, 12 May 2016 14:57:34 -0400 Subject: [PATCH] gnu: Added envstore package. * gnu/package/enstore.scm: New file. --- gnu/packages/envstore.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 gnu/packages/envstore.scm diff --git a/gnu/packages/envstore.scm b/gnu/packages/envstore.scm new file mode 100644 index 0000000..e3ec99d --- /dev/null +++ b/gnu/packages/envstore.scm @@ -0,0 +1,42 @@ +(define-module (gnu packages envstore) + #:use-module (guix) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix licenses)) + +(define-public envstore + (package + (name "envstore") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/derf/" name "/archive/" + version ".tar.gz")) + (sha256 + (base32 "097yd6w0fql8a3xh0gmz8bf40w61j4893rp8c28rngrrk80bk9a8")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (setenv "CC" (which "gcc")) + (system* "make"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "PREFIX" "/") + (setenv "DESTDIR" out) + (system* "make" "install"))))))) + (home-page "https://finalrewind.org/projects/envstore/") + (synopsis "Save and restore environment variables") + (description "Envstore is a program for sharing environment variables +between various shells or commands.") + (license + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) -- 2.7.4 [-- Attachment #3: Type: text/plain, Size: 50 bytes --] Sincerely, -- Matthew Jordan Sent with my mu4e ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-14 15:10 [PATCH] envstore-2.1 Matthew Jordan @ 2016-05-15 0:14 ` Mark H Weaver 2016-05-15 11:16 ` Matthew Jordan 0 siblings, 1 reply; 9+ messages in thread From: Mark H Weaver @ 2016-05-15 0:14 UTC (permalink / raw) To: Matthew Jordan; +Cc: Guix-devel Hi, Matthew Jordan <matthewjordandevops@yandex.com> writes: > From 8de06b6e26d9e1eb7bb7ef6df163f54a46db3d89 Mon Sep 17 00:00:00 2001 > From: Matthew Jordan <matthewjordandevops@yandex.com> > Date: Thu, 12 May 2016 14:57:34 -0400 > Subject: [PATCH] gnu: Added envstore package. The summary line should be "gnu: Add envstore." > > * gnu/package/enstore.scm: New file. You misspelled "envstore.scm", but it would be better to find an existing file in gnu/package/*.scm that would be appropriate for this. > diff --git a/gnu/packages/envstore.scm b/gnu/packages/envstore.scm > new file mode 100644 > index 0000000..e3ec99d > --- /dev/null > +++ b/gnu/packages/envstore.scm > @@ -0,0 +1,42 @@ > +(define-module (gnu packages envstore) When adding a new *.scm file, it needs to contain a copyright notice and header at the top, as with our other source files. > + #:use-module (guix) > + #:use-module (guix packages) > + #:use-module (guix build-system gnu) > + #:use-module (gnu packages) > + #:use-module (guix download) > + #:use-module (guix utils) > + #:use-module (guix licenses)) > + > +(define-public envstore > + (package > + (name "envstore") > + (version "2.1") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://github.com/derf/" name "/archive/" > + version ".tar.gz")) How about using https://finalrewind.org/projects/envstore/envstore-2.1.tar.bz2 instead? That's the tarball linked from the project's home page, and unlike the github tarball, it's digitally signed. > + (sha256 > + (base32 "097yd6w0fql8a3xh0gmz8bf40w61j4893rp8c28rngrrk80bk9a8")))) > + (build-system gnu-build-system) > + (arguments > + `(#:test-target "test" > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (replace 'build > + (lambda _ > + (setenv "CC" (which "gcc")) > + (system* "make"))) Instead of replacing the 'build' phase, it would be better to add this to the 'arguments': #:make-flags (list "CC=gcc") See 'dvtm' in dvtm.scm for an example. > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (setenv "PREFIX" "/") > + (setenv "DESTDIR" out) > + (system* "make" "install"))))))) These are incorrect settings for PREFIX and DESTDIR. In general, PREFIX tells where the installed files will be located when the program is run, and DESTDIR names a temporary staging directory where "make install" will put the files, on the assumption that they will later be moved to PREFIX before they are run. So, PREFIX should be set to (assoc-ref outputs "out"), and DESTDIR should be left alone. Also, as with the 'build' phase, it would be better to simply add these to make-flags, like this: #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) > + (home-page "https://finalrewind.org/projects/envstore/") > + (synopsis "Save and restore environment variables") > + (description "Envstore is a program for sharing environment variables > +between various shells or commands.") > + (license > + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) Can you send an updated patch? Thanks, Mark ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-15 0:14 ` Mark H Weaver @ 2016-05-15 11:16 ` Matthew Jordan 2016-05-15 17:14 ` Efraim Flashner 0 siblings, 1 reply; 9+ messages in thread From: Matthew Jordan @ 2016-05-15 11:16 UTC (permalink / raw) To: Mark H Weaver; +Cc: Guix-devel [-- Attachment #1: Type: text/plain, Size: 401 bytes --] Good day Mark H Weaver, I have updated the patch in accordance with your suggestions. And thank you for the feed back you provided in your previous email. This only the second package I have submitted so far. Also I renamed to the source file to shellutils.scm, let me know if this is acceptable. As I didn't find any other files with general names implying a reference to command line utilities. [-- Attachment #2: Patch file for envstore-2.1 --] [-- Type: text/x-patch, Size: 2676 bytes --] From 7c85692c7e844d84c568fc779846b5492a98bc2b Mon Sep 17 00:00:00 2001 From: Matthew Jordan <matthewjordandevops@yandex.com> Date: Thu, 12 May 2016 14:57:34 -0400 Subject: [PATCH] gnu: Add shellutils. * gnu/package/shellutils.scm: New file. --- gnu/packages/shellutils.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 gnu/packages/shellutils.scm diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm new file mode 100644 index 0000000..2c60607 --- /dev/null +++ b/gnu/packages/shellutils.scm @@ -0,0 +1,50 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages shellutils) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) + +(define-public envstore + (package + (name "envstore") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://finalrewind.org/projects/" + name "/" name "-" version ".tar.bz2")) + (sha256 + (base32 "1x97lxad80m5blhdfanl5v2qzjwcgbij2i23701bn8mpyxsrqszi")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://finalrewind.org/projects/envstore/") + (synopsis "Save and restore environment variables") + (description "Envstore is a program for sharing environment variables +between various shells or commands.") + (license + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) -- 2.7.4 [-- Attachment #3: Type: text/plain, Size: 3624 bytes --] Sincerely, -- Matthew Jordan Sent with my mu4e Mark H Weaver writes: > Hi, > > Matthew Jordan <matthewjordandevops@yandex.com> writes: > >> From 8de06b6e26d9e1eb7bb7ef6df163f54a46db3d89 Mon Sep 17 00:00:00 2001 >> From: Matthew Jordan <matthewjordandevops@yandex.com> >> Date: Thu, 12 May 2016 14:57:34 -0400 >> Subject: [PATCH] gnu: Added envstore package. > > The summary line should be "gnu: Add envstore." > >> >> * gnu/package/enstore.scm: New file. > > You misspelled "envstore.scm", but it would be better to find an > existing file in gnu/package/*.scm that would be appropriate for this. > >> diff --git a/gnu/packages/envstore.scm b/gnu/packages/envstore.scm >> new file mode 100644 >> index 0000000..e3ec99d >> --- /dev/null >> +++ b/gnu/packages/envstore.scm >> @@ -0,0 +1,42 @@ >> +(define-module (gnu packages envstore) > > When adding a new *.scm file, it needs to contain a copyright notice and > header at the top, as with our other source files. > >> + #:use-module (guix) >> + #:use-module (guix packages) >> + #:use-module (guix build-system gnu) >> + #:use-module (gnu packages) >> + #:use-module (guix download) >> + #:use-module (guix utils) >> + #:use-module (guix licenses)) >> + >> +(define-public envstore >> + (package >> + (name "envstore") >> + (version "2.1") >> + (source >> + (origin >> + (method url-fetch) >> + (uri (string-append "https://github.com/derf/" name "/archive/" >> + version ".tar.gz")) > > How about using > > https://finalrewind.org/projects/envstore/envstore-2.1.tar.bz2 > > instead? That's the tarball linked from the project's home page, and > unlike the github tarball, it's digitally signed. > >> + (sha256 >> + (base32 "097yd6w0fql8a3xh0gmz8bf40w61j4893rp8c28rngrrk80bk9a8")))) >> + (build-system gnu-build-system) >> + (arguments >> + `(#:test-target "test" >> + #:phases >> + (modify-phases %standard-phases >> + (delete 'configure) >> + (replace 'build >> + (lambda _ >> + (setenv "CC" (which "gcc")) >> + (system* "make"))) > > Instead of replacing the 'build' phase, it would be better to add this > to the 'arguments': > > #:make-flags (list "CC=gcc") > > See 'dvtm' in dvtm.scm for an example. > >> + (replace 'install >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let ((out (assoc-ref outputs "out"))) >> + (setenv "PREFIX" "/") >> + (setenv "DESTDIR" out) >> + (system* "make" "install"))))))) > > These are incorrect settings for PREFIX and DESTDIR. In general, PREFIX > tells where the installed files will be located when the program is run, > and DESTDIR names a temporary staging directory where "make install" > will put the files, on the assumption that they will later be moved to > PREFIX before they are run. > > So, PREFIX should be set to (assoc-ref outputs "out"), and DESTDIR > should be left alone. > > Also, as with the 'build' phase, it would be better to simply add these > to make-flags, like this: > > #:make-flags (list "CC=gcc" > (string-append "PREFIX=" (assoc-ref %outputs "out"))) > >> + (home-page "https://finalrewind.org/projects/envstore/") >> + (synopsis "Save and restore environment variables") >> + (description "Envstore is a program for sharing environment variables >> +between various shells or commands.") >> + (license >> + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) > > Can you send an updated patch? > > Thanks, > Mark ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-15 11:16 ` Matthew Jordan @ 2016-05-15 17:14 ` Efraim Flashner 2016-05-16 0:01 ` Matthew Jordan 2016-05-18 17:34 ` Matthew Jordan 0 siblings, 2 replies; 9+ messages in thread From: Efraim Flashner @ 2016-05-15 17:14 UTC (permalink / raw) To: Matthew Jordan; +Cc: Guix-devel [-- Attachment #1: Type: text/plain, Size: 7707 bytes --] On Sun, May 15, 2016 at 07:16:33AM -0400, Matthew Jordan wrote: > > Good day Mark H Weaver, > > I have updated the patch in accordance with your suggestions. And thank > you for the feed back you provided in your previous email. This only the > second package I have submitted so far. > > Also I renamed to the source file to shellutils.scm, let me know if this > is acceptable. As I didn't find any other files with general names > implying a reference to command line utilities. > > From 7c85692c7e844d84c568fc779846b5492a98bc2b Mon Sep 17 00:00:00 2001 > From: Matthew Jordan <matthewjordandevops@yandex.com> > Date: Thu, 12 May 2016 14:57:34 -0400 > Subject: [PATCH] gnu: Add shellutils. > > * gnu/package/shellutils.scm: New file. Don't forget to register the file in gnu/local.mk > --- > gnu/packages/shellutils.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 gnu/packages/shellutils.scm > > diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm > new file mode 100644 > index 0000000..2c60607 > --- /dev/null > +++ b/gnu/packages/shellutils.scm > @@ -0,0 +1,50 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ^^^ One of the fun bits of getting your patches into guix is putting _your_ name (and the current year) in the header ;) > +;;; > +;;; This file is part of GNU Guix. > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify it > +;;; under the terms of the GNU General Public License as published by > +;;; the Free Software Foundation; either version 3 of the License, or (at > +;;; your option) any later version. > +;;; > +;;; GNU Guix is distributed in the hope that it will be useful, but > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +;;; GNU General Public License for more details. > +;;; > +;;; You should have received a copy of the GNU General Public License > +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. > + > +(define-module (gnu packages shellutils) > + #:use-module (guix licenses) > + #:use-module (guix packages) > + #:use-module (guix download) > + #:use-module (guix utils) > + #:use-module (guix build-system gnu)) > + > +(define-public envstore > + (package > + (name "envstore") > + (version "2.1") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://finalrewind.org/projects/" > + name "/" name "-" version ".tar.bz2")) > + (sha256 > + (base32 "1x97lxad80m5blhdfanl5v2qzjwcgbij2i23701bn8mpyxsrqszi")))) > + (build-system gnu-build-system) > + (arguments > + `(#:test-target "test" > + #:make-flags (list "CC=gcc" > + (string-append "PREFIX=" (assoc-ref %outputs "out"))) > + #:phases > + (modify-phases %standard-phases > + (delete 'configure)))) > + (home-page "https://finalrewind.org/projects/envstore/") > + (synopsis "Save and restore environment variables") > + (description "Envstore is a program for sharing environment variables > +between various shells or commands.") > + (license > + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) > -- > 2.7.4 > > > Sincerely, > > -- > Matthew Jordan > Sent with my mu4e > > > Mark H Weaver writes: > > > Hi, > > > > Matthew Jordan <matthewjordandevops@yandex.com> writes: > > > >> From 8de06b6e26d9e1eb7bb7ef6df163f54a46db3d89 Mon Sep 17 00:00:00 2001 > >> From: Matthew Jordan <matthewjordandevops@yandex.com> > >> Date: Thu, 12 May 2016 14:57:34 -0400 > >> Subject: [PATCH] gnu: Added envstore package. > > > > The summary line should be "gnu: Add envstore." > > > >> > >> * gnu/package/enstore.scm: New file. > > > > You misspelled "envstore.scm", but it would be better to find an > > existing file in gnu/package/*.scm that would be appropriate for this. > > > >> diff --git a/gnu/packages/envstore.scm b/gnu/packages/envstore.scm > >> new file mode 100644 > >> index 0000000..e3ec99d > >> --- /dev/null > >> +++ b/gnu/packages/envstore.scm > >> @@ -0,0 +1,42 @@ > >> +(define-module (gnu packages envstore) > > > > When adding a new *.scm file, it needs to contain a copyright notice and > > header at the top, as with our other source files. > > > >> + #:use-module (guix) > >> + #:use-module (guix packages) > >> + #:use-module (guix build-system gnu) > >> + #:use-module (gnu packages) > >> + #:use-module (guix download) > >> + #:use-module (guix utils) > >> + #:use-module (guix licenses)) > >> + > >> +(define-public envstore > >> + (package > >> + (name "envstore") > >> + (version "2.1") > >> + (source > >> + (origin > >> + (method url-fetch) > >> + (uri (string-append "https://github.com/derf/" name "/archive/" > >> + version ".tar.gz")) > > > > How about using > > > > https://finalrewind.org/projects/envstore/envstore-2.1.tar.bz2 > > > > instead? That's the tarball linked from the project's home page, and > > unlike the github tarball, it's digitally signed. > > > >> + (sha256 > >> + (base32 "097yd6w0fql8a3xh0gmz8bf40w61j4893rp8c28rngrrk80bk9a8")))) > >> + (build-system gnu-build-system) > >> + (arguments > >> + `(#:test-target "test" > >> + #:phases > >> + (modify-phases %standard-phases > >> + (delete 'configure) > >> + (replace 'build > >> + (lambda _ > >> + (setenv "CC" (which "gcc")) > >> + (system* "make"))) > > > > Instead of replacing the 'build' phase, it would be better to add this > > to the 'arguments': > > > > #:make-flags (list "CC=gcc") > > > > See 'dvtm' in dvtm.scm for an example. > > > >> + (replace 'install > >> + (lambda* (#:key outputs #:allow-other-keys) > >> + (let ((out (assoc-ref outputs "out"))) > >> + (setenv "PREFIX" "/") > >> + (setenv "DESTDIR" out) > >> + (system* "make" "install"))))))) > > > > These are incorrect settings for PREFIX and DESTDIR. In general, PREFIX > > tells where the installed files will be located when the program is run, > > and DESTDIR names a temporary staging directory where "make install" > > will put the files, on the assumption that they will later be moved to > > PREFIX before they are run. > > > > So, PREFIX should be set to (assoc-ref outputs "out"), and DESTDIR > > should be left alone. > > > > Also, as with the 'build' phase, it would be better to simply add these > > to make-flags, like this: > > > > #:make-flags (list "CC=gcc" > > (string-append "PREFIX=" (assoc-ref %outputs "out"))) > > > >> + (home-page "https://finalrewind.org/projects/envstore/") > >> + (synopsis "Save and restore environment variables") > >> + (description "Envstore is a program for sharing environment variables > >> +between various shells or commands.") > >> + (license > >> + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) > > > > Can you send an updated patch? > > > > Thanks, > > Mark -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-15 17:14 ` Efraim Flashner @ 2016-05-16 0:01 ` Matthew Jordan 2016-05-18 17:34 ` Matthew Jordan 1 sibling, 0 replies; 9+ messages in thread From: Matthew Jordan @ 2016-05-16 0:01 UTC (permalink / raw) To: Efraim Flashner; +Cc: Guix-devel [-- Attachment #1: Type: text/plain, Size: 69 bytes --] Good Day, I updated the copyright info, and the gnu/local.mk file. [-- Attachment #2: envstore-2.1 updated patch --] [-- Type: text/x-patch, Size: 3103 bytes --] From 718df1481b058de1f9c04b5c75504a73d5cd7067 Mon Sep 17 00:00:00 2001 From: Matthew Jordan <matthewjordandevops@yandex.com> Date: Thu, 12 May 2016 14:57:34 -0400 Subject: [PATCH] gnu: Add shellutils. * gnu/package/shellutils.scm: New file. --- gnu/local.mk | 1 + gnu/packages/shellutils.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 gnu/packages/shellutils.scm diff --git a/gnu/local.mk b/gnu/local.mk index 871174b..53a95f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -304,6 +304,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/search.scm \ gnu/packages/serialization.scm \ gnu/packages/serveez.scm \ + gnu/packages/shellutils.scm \ gnu/packages/shishi.scm \ gnu/packages/skarnet.scm \ gnu/packages/skribilo.scm \ diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm new file mode 100644 index 0000000..8108b04 --- /dev/null +++ b/gnu/packages/shellutils.scm @@ -0,0 +1,50 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages shellutils) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) + +(define-public envstore + (package + (name "envstore") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://finalrewind.org/projects/" + name "/" name "-" version ".tar.bz2")) + (sha256 + (base32 "1x97lxad80m5blhdfanl5v2qzjwcgbij2i23701bn8mpyxsrqszi")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://finalrewind.org/projects/envstore/") + (synopsis "Save and restore environment variables") + (description "Envstore is a program for sharing environment variables +between various shells or commands.") + (license + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) -- 2.7.4 [-- Attachment #3: Type: text/plain, Size: 894 bytes --] Sincerely, -- Matthew Jordan Sent with my mu4e Efraim Flashner writes: > On Sun, May 15, 2016 at 07:16:33AM -0400, Matthew Jordan wrote: >> >> Good day Mark H Weaver, >> >> I have updated the patch in accordance with your suggestions. And thank >> you for the feed back you provided in your previous email. This only the >> second package I have submitted so far. >> >> Also I renamed to the source file to shellutils.scm, let me know if this >> is acceptable. As I didn't find any other files with general names >> implying a reference to command line utilities. >> > >> From 7c85692c7e844d84c568fc779846b5492a98bc2b Mon Sep 17 00:00:00 2001 >> From: Matthew Jordan <matthewjordandevops@yandex.com> >> Date: Thu, 12 May 2016 14:57:34 -0400 >> Subject: [PATCH] gnu: Add shellutils. >> >> * gnu/package/shellutils.scm: New file. > > Don't forget to register the file in gnu/local.mk > ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-15 17:14 ` Efraim Flashner 2016-05-16 0:01 ` Matthew Jordan @ 2016-05-18 17:34 ` Matthew Jordan 2016-05-19 3:35 ` Mark H Weaver 1 sibling, 1 reply; 9+ messages in thread From: Matthew Jordan @ 2016-05-18 17:34 UTC (permalink / raw) To: Guix-devel Good Day, I haven't heard/received any updates about this patch. Was the last update acceptable? Respectfully, -- Matthew Jordan Sent with my mu4e Efraim Flashner writes: > On Sun, May 15, 2016 at 07:16:33AM -0400, Matthew Jordan wrote: >> >> Good day Mark H Weaver, >> >> I have updated the patch in accordance with your suggestions. And thank >> you for the feed back you provided in your previous email. This only the >> second package I have submitted so far. >> >> Also I renamed to the source file to shellutils.scm, let me know if this >> is acceptable. As I didn't find any other files with general names >> implying a reference to command line utilities. >> > >> From 7c85692c7e844d84c568fc779846b5492a98bc2b Mon Sep 17 00:00:00 2001 >> From: Matthew Jordan <matthewjordandevops@yandex.com> >> Date: Thu, 12 May 2016 14:57:34 -0400 >> Subject: [PATCH] gnu: Add shellutils. >> >> * gnu/package/shellutils.scm: New file. > > Don't forget to register the file in gnu/local.mk > >> --- >> gnu/packages/shellutils.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 50 insertions(+) >> create mode 100644 gnu/packages/shellutils.scm >> >> diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm >> new file mode 100644 >> index 0000000..2c60607 >> --- /dev/null >> +++ b/gnu/packages/shellutils.scm >> @@ -0,0 +1,50 @@ >> +;;; GNU Guix --- Functional package management for GNU >> +;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> > ^^^ > One of the fun bits of getting your patches into guix is putting _your_ > name (and the current year) in the header ;) > >> +;;; >> +;;; This file is part of GNU Guix. >> +;;; >> +;;; GNU Guix is free software; you can redistribute it and/or modify it >> +;;; under the terms of the GNU General Public License as published by >> +;;; the Free Software Foundation; either version 3 of the License, or (at >> +;;; your option) any later version. >> +;;; >> +;;; GNU Guix is distributed in the hope that it will be useful, but >> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of >> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> +;;; GNU General Public License for more details. >> +;;; >> +;;; You should have received a copy of the GNU General Public License >> +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. >> + >> +(define-module (gnu packages shellutils) >> + #:use-module (guix licenses) >> + #:use-module (guix packages) >> + #:use-module (guix download) >> + #:use-module (guix utils) >> + #:use-module (guix build-system gnu)) >> + >> +(define-public envstore >> + (package >> + (name "envstore") >> + (version "2.1") >> + (source >> + (origin >> + (method url-fetch) >> + (uri (string-append "https://finalrewind.org/projects/" >> + name "/" name "-" version ".tar.bz2")) >> + (sha256 >> + (base32 "1x97lxad80m5blhdfanl5v2qzjwcgbij2i23701bn8mpyxsrqszi")))) >> + (build-system gnu-build-system) >> + (arguments >> + `(#:test-target "test" >> + #:make-flags (list "CC=gcc" >> + (string-append "PREFIX=" (assoc-ref %outputs "out"))) >> + #:phases >> + (modify-phases %standard-phases >> + (delete 'configure)))) >> + (home-page "https://finalrewind.org/projects/envstore/") >> + (synopsis "Save and restore environment variables") >> + (description "Envstore is a program for sharing environment variables >> +between various shells or commands.") >> + (license >> + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) >> -- >> 2.7.4 >> > >> >> Sincerely, >> >> -- >> Matthew Jordan >> Sent with my mu4e >> >> >> Mark H Weaver writes: >> >> > Hi, >> > >> > Matthew Jordan <matthewjordandevops@yandex.com> writes: >> > >> >> From 8de06b6e26d9e1eb7bb7ef6df163f54a46db3d89 Mon Sep 17 00:00:00 2001 >> >> From: Matthew Jordan <matthewjordandevops@yandex.com> >> >> Date: Thu, 12 May 2016 14:57:34 -0400 >> >> Subject: [PATCH] gnu: Added envstore package. >> > >> > The summary line should be "gnu: Add envstore." >> > >> >> >> >> * gnu/package/enstore.scm: New file. >> > >> > You misspelled "envstore.scm", but it would be better to find an >> > existing file in gnu/package/*.scm that would be appropriate for this. >> > >> >> diff --git a/gnu/packages/envstore.scm b/gnu/packages/envstore.scm >> >> new file mode 100644 >> >> index 0000000..e3ec99d >> >> --- /dev/null >> >> +++ b/gnu/packages/envstore.scm >> >> @@ -0,0 +1,42 @@ >> >> +(define-module (gnu packages envstore) >> > >> > When adding a new *.scm file, it needs to contain a copyright notice and >> > header at the top, as with our other source files. >> > >> >> + #:use-module (guix) >> >> + #:use-module (guix packages) >> >> + #:use-module (guix build-system gnu) >> >> + #:use-module (gnu packages) >> >> + #:use-module (guix download) >> >> + #:use-module (guix utils) >> >> + #:use-module (guix licenses)) >> >> + >> >> +(define-public envstore >> >> + (package >> >> + (name "envstore") >> >> + (version "2.1") >> >> + (source >> >> + (origin >> >> + (method url-fetch) >> >> + (uri (string-append "https://github.com/derf/" name "/archive/" >> >> + version ".tar.gz")) >> > >> > How about using >> > >> > https://finalrewind.org/projects/envstore/envstore-2.1.tar.bz2 >> > >> > instead? That's the tarball linked from the project's home page, and >> > unlike the github tarball, it's digitally signed. >> > >> >> + (sha256 >> >> + (base32 "097yd6w0fql8a3xh0gmz8bf40w61j4893rp8c28rngrrk80bk9a8")))) >> >> + (build-system gnu-build-system) >> >> + (arguments >> >> + `(#:test-target "test" >> >> + #:phases >> >> + (modify-phases %standard-phases >> >> + (delete 'configure) >> >> + (replace 'build >> >> + (lambda _ >> >> + (setenv "CC" (which "gcc")) >> >> + (system* "make"))) >> > >> > Instead of replacing the 'build' phase, it would be better to add this >> > to the 'arguments': >> > >> > #:make-flags (list "CC=gcc") >> > >> > See 'dvtm' in dvtm.scm for an example. >> > >> >> + (replace 'install >> >> + (lambda* (#:key outputs #:allow-other-keys) >> >> + (let ((out (assoc-ref outputs "out"))) >> >> + (setenv "PREFIX" "/") >> >> + (setenv "DESTDIR" out) >> >> + (system* "make" "install"))))))) >> > >> > These are incorrect settings for PREFIX and DESTDIR. In general, PREFIX >> > tells where the installed files will be located when the program is run, >> > and DESTDIR names a temporary staging directory where "make install" >> > will put the files, on the assumption that they will later be moved to >> > PREFIX before they are run. >> > >> > So, PREFIX should be set to (assoc-ref outputs "out"), and DESTDIR >> > should be left alone. >> > >> > Also, as with the 'build' phase, it would be better to simply add these >> > to make-flags, like this: >> > >> > #:make-flags (list "CC=gcc" >> > (string-append "PREFIX=" (assoc-ref %outputs "out"))) >> > >> >> + (home-page "https://finalrewind.org/projects/envstore/") >> >> + (synopsis "Save and restore environment variables") >> >> + (description "Envstore is a program for sharing environment variables >> >> +between various shells or commands.") >> >> + (license >> >> + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) >> > >> > Can you send an updated patch? >> > >> > Thanks, >> > Mark ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-18 17:34 ` Matthew Jordan @ 2016-05-19 3:35 ` Mark H Weaver 2016-05-19 18:10 ` Matthew Jordan 0 siblings, 1 reply; 9+ messages in thread From: Mark H Weaver @ 2016-05-19 3:35 UTC (permalink / raw) To: Matthew Jordan; +Cc: Guix-devel Matthew Jordan <matthewjordandevops@yandex.com> writes: > I haven't heard/received any updates about this patch. Was the last > update acceptable? It looks good except for one thing: the summary line should read "gnu: Add envstore." instead of "gnu: Add shellutils.". Thanks! Mark ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-19 3:35 ` Mark H Weaver @ 2016-05-19 18:10 ` Matthew Jordan 2016-05-21 21:24 ` Ludovic Courtès 0 siblings, 1 reply; 9+ messages in thread From: Matthew Jordan @ 2016-05-19 18:10 UTC (permalink / raw) To: Mark H Weaver; +Cc: Guix-devel [-- Attachment #1: Type: text/plain, Size: 55 bytes --] Hi, I have updated the commit message as requested. [-- Attachment #2: Patch for envstore 2.1 --] [-- Type: text/x-patch, Size: 3101 bytes --] From c68208457fa6dc410e5048a88c3e5374f812d02a Mon Sep 17 00:00:00 2001 From: Matthew Jordan <matthewjordandevops@yandex.com> Date: Thu, 12 May 2016 14:57:34 -0400 Subject: [PATCH] gnu: Add envstore. * gnu/package/shellutils.scm: New file. --- gnu/local.mk | 1 + gnu/packages/shellutils.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 gnu/packages/shellutils.scm diff --git a/gnu/local.mk b/gnu/local.mk index 5655a05..c130901 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -304,6 +304,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/search.scm \ gnu/packages/serialization.scm \ gnu/packages/serveez.scm \ + gnu/packages/shellutils.scm \ gnu/packages/shishi.scm \ gnu/packages/skarnet.scm \ gnu/packages/skribilo.scm \ diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm new file mode 100644 index 0000000..8108b04 --- /dev/null +++ b/gnu/packages/shellutils.scm @@ -0,0 +1,50 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages shellutils) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) + +(define-public envstore + (package + (name "envstore") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://finalrewind.org/projects/" + name "/" name "-" version ".tar.bz2")) + (sha256 + (base32 "1x97lxad80m5blhdfanl5v2qzjwcgbij2i23701bn8mpyxsrqszi")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://finalrewind.org/projects/envstore/") + (synopsis "Save and restore environment variables") + (description "Envstore is a program for sharing environment variables +between various shells or commands.") + (license + (non-copyleft "http://www.wtfpl.net/txt/copying/")))) -- 2.7.4 [-- Attachment #3: Type: text/plain, Size: 372 bytes --] -- Matthew Jordan Sent with my mu4e Mark H Weaver writes: > Matthew Jordan <matthewjordandevops@yandex.com> writes: >> I haven't heard/received any updates about this patch. Was the last >> update acceptable? > > It looks good except for one thing: the summary line should read > "gnu: Add envstore." instead of "gnu: Add shellutils.". > > Thanks! > Mark ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] envstore-2.1 2016-05-19 18:10 ` Matthew Jordan @ 2016-05-21 21:24 ` Ludovic Courtès 0 siblings, 0 replies; 9+ messages in thread From: Ludovic Courtès @ 2016-05-21 21:24 UTC (permalink / raw) To: Matthew Jordan; +Cc: Guix-devel Matthew Jordan <matthewjordandevops@yandex.com> skribis: > From c68208457fa6dc410e5048a88c3e5374f812d02a Mon Sep 17 00:00:00 2001 > From: Matthew Jordan <matthewjordandevops@yandex.com> > Date: Thu, 12 May 2016 14:57:34 -0400 > Subject: [PATCH] gnu: Add envstore. > > * gnu/package/shellutils.scm: New file. Applied, thanks! Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-05-21 21:25 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-05-14 15:10 [PATCH] envstore-2.1 Matthew Jordan 2016-05-15 0:14 ` Mark H Weaver 2016-05-15 11:16 ` Matthew Jordan 2016-05-15 17:14 ` Efraim Flashner 2016-05-16 0:01 ` Matthew Jordan 2016-05-18 17:34 ` Matthew Jordan 2016-05-19 3:35 ` Mark H Weaver 2016-05-19 18:10 ` Matthew Jordan 2016-05-21 21:24 ` Ludovic Courtès
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).