* Add svn-fetch method @ 2014-03-26 10:36 Sree Harsha Totakura 2014-03-26 10:36 ` [PATCH] Add (guix svn-download) Sree Harsha Totakura 0 siblings, 1 reply; 9+ messages in thread From: Sree Harsha Totakura @ 2014-03-26 10:36 UTC (permalink / raw) To: guix-devel The following patch adds a new origin method to fetch from SVN repositories. Note that the subversion command is used with --trust-server-cert option which causes it to trust any given SSL certificate if fetching from HTTPS repositories. The authenticity of the code should only be verified by the given hash. Sree ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Add (guix svn-download). 2014-03-26 10:36 Add svn-fetch method Sree Harsha Totakura @ 2014-03-26 10:36 ` Sree Harsha Totakura 2014-03-26 16:00 ` Ludovic Courtès 0 siblings, 1 reply; 9+ messages in thread From: Sree Harsha Totakura @ 2014-03-26 10:36 UTC (permalink / raw) To: guix-devel * guix/svn-download.scm, guix/build/svn.scm: New files. * Makefile.am (MODULES): Add them. --- Makefile.am | 2 ++ guix/build/svn.scm | 48 ++++++++++++++++++++++++++ guix/svn-download.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 guix/build/svn.scm create mode 100644 guix/svn-download.scm diff --git a/Makefile.am b/Makefile.am index 764332a..0eb9a83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,7 @@ MODULES = \ guix/http-client.scm \ guix/gnupg.scm \ guix/store.scm \ + guix/svn-download.scm \ guix/ui.scm \ guix/build/download.scm \ guix/build/cmake-build-system.scm \ @@ -66,6 +67,7 @@ MODULES = \ guix/build/union.scm \ guix/build/pull.scm \ guix/build/rpath.scm \ + guix/build/svn.scm \ guix/packages.scm \ guix/snix.scm \ guix/scripts/download.scm \ diff --git a/guix/build/svn.scm b/guix/build/svn.scm new file mode 100644 index 0000000..e3a8693 --- /dev/null +++ b/guix/build/svn.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> +;;; +;;; 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 (guix build svn) + #:use-module (guix build utils) + #:export (svn-fetch)) + +;;; Commentary: +;;; +;;; This is the build-side support code of (guix svn-download). It allows a +;;; Subversion repository to be cloned and checked out at a specific revision. +;;; +;;; Code: + +(define* (svn-fetch url revision directory + #:key (svn-command "svn")) + "Fetch REVISION from URL into DIRECTORY. REVISION must be a valid svn +revision. Return #t on success, #f otherwise." + (and (zero? (system* svn-command "checkout" "--non-interactive" + ;; Trust the server certificate. This is OK as we + ;; verify the checksum later. This can be removed when + ;; ca-certificates package is added. + "--trust-server-cert" "-r" revision url directory)) + (with-directory-excursion directory + (begin + ;; The contents of '.svn' vary as a function of the current status + ;; of the repo. Since we want a fixed output, this directory needs + ;; to be taken out. + (delete-file-recursively ".svn") + #t)))) + +;;; svn.scm ends here diff --git a/guix/svn-download.scm b/guix/svn-download.scm new file mode 100644 index 0000000..1d94430 --- /dev/null +++ b/guix/svn-download.scm @@ -0,0 +1,89 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> +;;; +;;; 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 (guix svn-download) + #:use-module (guix records) + #:use-module (guix derivations) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:export (svn-reference + svn-reference? + svn-reference-url + svn-reference-revision + svn-fetch)) + +;;; Commentary: +;;; +;;; An <origin> method that fetches a specific revision from a Subversion +;;; repository. The repository URL and revision are specified with a +;;; <svn-reference> object. +;;; +;;; Code: +(define-record-type* <svn-reference> + svn-reference make-svn-reference + svn-reference? + (url svn-reference-url) + (revision svn-reference-revision)) + +(define* (svn-fetch store ref hash-algo hash + #:optional name + #:key (system (%current-system)) guile svn) + "Return a fixed-output derivation in STORE that fetches REF, a +<svn-reference> object. The output is expected to have recursive hash HASH of +type HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if +#f." + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages base))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system))))) + + (define svn-for-build + (match svn + ((? package?) + (package-derivation store svn system)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages version-control))) + (svn (module-ref distro 'subversion))) + (package-derivation store svn system))))) + + (let* ((command (string-append (derivation->output-path svn-for-build) + "/bin/svn")) + (builder `(begin + (use-modules (guix build svn)) + (svn-fetch ',(svn-reference-url ref) + ',(svn-reference-revision ref) + %output + #:svn-command ',command)))) + (build-expression->derivation store (or name "svn-checkout") builder + #:system system + #:local-build? #t + #:inputs `(("svn" ,svn-for-build)) + #:hash-algo hash-algo + #:hash hash + #:recursive? #t + #:modules '((guix build svn) + (guix build utils)) + #:guile-for-build guile-for-build + #:local-build? #t))) + +;;; svn-download.scm ends here -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] Add (guix svn-download). 2014-03-26 10:36 ` [PATCH] Add (guix svn-download) Sree Harsha Totakura @ 2014-03-26 16:00 ` Ludovic Courtès 2014-03-26 16:59 ` Update patch: " Sree Harsha Totakura 0 siblings, 1 reply; 9+ messages in thread From: Ludovic Courtès @ 2014-03-26 16:00 UTC (permalink / raw) To: Sree Harsha Totakura; +Cc: guix-devel Sree Harsha Totakura <sreeharsha@totakura.in> skribis: > * guix/svn-download.scm, guix/build/svn.scm: New files. > * Makefile.am (MODULES): Add them. Looks good to me! Some comments: > +(define* (svn-fetch url revision directory > + #:key (svn-command "svn")) > + "Fetch REVISION from URL into DIRECTORY. REVISION must be a valid svn > +revision. Return #t on success, #f otherwise." ‘revision’ can/should be a number, no? Please augment the docstring to say that, and... > + (and (zero? (system* svn-command "checkout" "--non-interactive" > + ;; Trust the server certificate. This is OK as we > + ;; verify the checksum later. This can be removed when > + ;; ca-certificates package is added. > + "--trust-server-cert" "-r" revision url directory)) ... possibly use (number->string revision) here ↑. > +;;; Commentary: > +;;; > +;;; An <origin> method that fetches a specific revision from a Subversion > +;;; repository. The repository URL and revision are specified with a > +;;; <svn-reference> object. > +;;; > +;;; Code: > +(define-record-type* <svn-reference> > + svn-reference make-svn-reference > + svn-reference? > + (url svn-reference-url) > + (revision svn-reference-revision)) Please align things, add a comment saying whether ‘revision’ is a number or string, and add a newline before ‘define-record-type*’. Thanks! Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Update patch: Add (guix svn-download) 2014-03-26 16:00 ` Ludovic Courtès @ 2014-03-26 16:59 ` Sree Harsha Totakura 2014-03-26 16:59 ` [PATCH] " Sree Harsha Totakura 0 siblings, 1 reply; 9+ messages in thread From: Sree Harsha Totakura @ 2014-03-26 16:59 UTC (permalink / raw) To: guix-devel On 03/26/2014 05:00 PM, Ludovic Courtès wrote: > Sree Harsha Totakura <sreeharsha@totakura.in> skribis: > >> * guix/svn-download.scm, guix/build/svn.scm: New files. >> * Makefile.am (MODULES): Add them. > >> +(define* (svn-fetch url revision directory >> + #:key (svn-command "svn")) >> + "Fetch REVISION from URL into DIRECTORY. REVISION must be a valid svn >> +revision. Return #t on success, #f otherwise." > > ‘revision’ can/should be a number, no? Please augment the docstring to > say that, and... Yes, `revision' is a number. >> + (and (zero? (system* svn-command "checkout" "--non-interactive" >> + ;; Trust the server certificate. This is OK as we >> + ;; verify the checksum later. This can be removed when >> + ;; ca-certificates package is added. >> + "--trust-server-cert" "-r" revision url directory)) > > ... possibly use (number->string revision) here ↑. > >> +(define-record-type* <svn-reference> >> + svn-reference make-svn-reference >> + svn-reference? >> + (url svn-reference-url) >> + (revision svn-reference-revision)) > > Please align things, add a comment saying whether ‘revision’ is a number > or string, and add a newline before ‘define-record-type*’. OK, here's the updated patch. - Sree ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Add (guix svn-download). 2014-03-26 16:59 ` Update patch: " Sree Harsha Totakura @ 2014-03-26 16:59 ` Sree Harsha Totakura 2014-03-26 23:23 ` Ludovic Courtès 0 siblings, 1 reply; 9+ messages in thread From: Sree Harsha Totakura @ 2014-03-26 16:59 UTC (permalink / raw) To: guix-devel * guix/svn-download.scm, guix/build/svn.scm: New files. * Makefile.am (MODULES): Add them. --- Makefile.am | 2 ++ guix/build/svn.scm | 49 +++++++++++++++++++++++++++ guix/svn-download.scm | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 guix/build/svn.scm create mode 100644 guix/svn-download.scm diff --git a/Makefile.am b/Makefile.am index 764332a..0eb9a83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,7 @@ MODULES = \ guix/http-client.scm \ guix/gnupg.scm \ guix/store.scm \ + guix/svn-download.scm \ guix/ui.scm \ guix/build/download.scm \ guix/build/cmake-build-system.scm \ @@ -66,6 +67,7 @@ MODULES = \ guix/build/union.scm \ guix/build/pull.scm \ guix/build/rpath.scm \ + guix/build/svn.scm \ guix/packages.scm \ guix/snix.scm \ guix/scripts/download.scm \ diff --git a/guix/build/svn.scm b/guix/build/svn.scm new file mode 100644 index 0000000..aaf6cb8 --- /dev/null +++ b/guix/build/svn.scm @@ -0,0 +1,49 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> +;;; +;;; 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 (guix build svn) + #:use-module (guix build utils) + #:export (svn-fetch)) + +;;; Commentary: +;;; +;;; This is the build-side support code of (guix svn-download). It allows a +;;; Subversion repository to be cloned and checked out at a specific revision. +;;; +;;; Code: + +(define* (svn-fetch url revision directory + #:key (svn-command "svn")) + "Fetch REVISION from URL into DIRECTORY. REVISION must be a valid svn +revision. Return #t on success, #f otherwise." + (and (zero? (system* svn-command "checkout" "--non-interactive" + ;; Trust the server certificate. This is OK as we + ;; verify the checksum later. This can be removed when + ;; ca-certificates package is added. + "--trust-server-cert" "-r" (number->string revision) + url directory)) + (with-directory-excursion directory + (begin + ;; The contents of '.svn' vary as a function of the current status + ;; of the repo. Since we want a fixed output, this directory needs + ;; to be taken out. + (delete-file-recursively ".svn") + #t)))) + +;;; svn.scm ends here diff --git a/guix/svn-download.scm b/guix/svn-download.scm new file mode 100644 index 0000000..55ad614 --- /dev/null +++ b/guix/svn-download.scm @@ -0,0 +1,90 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> +;;; +;;; 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 (guix svn-download) + #:use-module (guix records) + #:use-module (guix derivations) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:export (svn-reference + svn-reference? + svn-reference-url + svn-reference-revision + svn-fetch)) + +;;; Commentary: +;;; +;;; An <origin> method that fetches a specific revision from a Subversion +;;; repository. The repository URL and REVISION are specified with a +;;; <svn-reference> object. REVISION should be specified as a number. +;;; +;;; Code: + +(define-record-type* <svn-reference> + svn-reference make-svn-reference + svn-reference? + (url svn-reference-url) + (revision svn-reference-revision)) + +(define* (svn-fetch store ref hash-algo hash + #:optional name + #:key (system (%current-system)) guile svn) + "Return a fixed-output derivation in STORE that fetches REF, a +<svn-reference> object. The output is expected to have recursive hash HASH of +type HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if +#f." + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages base))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system))))) + + (define svn-for-build + (match svn + ((? package?) + (package-derivation store svn system)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages version-control))) + (svn (module-ref distro 'subversion))) + (package-derivation store svn system))))) + + (let* ((command (string-append (derivation->output-path svn-for-build) + "/bin/svn")) + (builder `(begin + (use-modules (guix build svn)) + (svn-fetch ',(svn-reference-url ref) + ',(svn-reference-revision ref) + %output + #:svn-command ',command)))) + (build-expression->derivation store (or name "svn-checkout") builder + #:system system + #:local-build? #t + #:inputs `(("svn" ,svn-for-build)) + #:hash-algo hash-algo + #:hash hash + #:recursive? #t + #:modules '((guix build svn) + (guix build utils)) + #:guile-for-build guile-for-build + #:local-build? #t))) + +;;; svn-download.scm ends here -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] Add (guix svn-download). 2014-03-26 16:59 ` [PATCH] " Sree Harsha Totakura @ 2014-03-26 23:23 ` Ludovic Courtès 2014-03-27 9:30 ` Ludovic Courtès 0 siblings, 1 reply; 9+ messages in thread From: Ludovic Courtès @ 2014-03-26 23:23 UTC (permalink / raw) To: Sree Harsha Totakura; +Cc: guix-devel Sree Harsha Totakura <sreeharsha@totakura.in> skribis: > * guix/svn-download.scm, guix/build/svn.scm: New files. > * Makefile.am (MODULES): Add them. Pushed with “number” added in a couple of places. Thank you! Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Add (guix svn-download). 2014-03-26 23:23 ` Ludovic Courtès @ 2014-03-27 9:30 ` Ludovic Courtès 2014-03-27 9:57 ` Sree Harsha Totakura 0 siblings, 1 reply; 9+ messages in thread From: Ludovic Courtès @ 2014-03-27 9:30 UTC (permalink / raw) To: Sree Harsha Totakura; +Cc: guix-devel I realize you’re not in the ‘guix’ group on Savannah. I can add you, but I need to know what your Savannah account is (or you need to create one if you don’t have one already.) Thanks. :-) Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Add (guix svn-download). 2014-03-27 9:30 ` Ludovic Courtès @ 2014-03-27 9:57 ` Sree Harsha Totakura 2014-03-27 10:17 ` Ludovic Courtès 0 siblings, 1 reply; 9+ messages in thread From: Sree Harsha Totakura @ 2014-03-27 9:57 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel On 03/27/2014 10:30 AM, Ludovic Courtès wrote: > I realize you’re not in the ‘guix’ group on Savannah. I can add you, > but I need to know what your Savannah account is (or you need to create > one if you don’t have one already.) Thanks. :-) Yes, I did not have an account on Savannah. I just created it and sent you guys a request for inclusion. Sree ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Add (guix svn-download). 2014-03-27 9:57 ` Sree Harsha Totakura @ 2014-03-27 10:17 ` Ludovic Courtès 0 siblings, 0 replies; 9+ messages in thread From: Ludovic Courtès @ 2014-03-27 10:17 UTC (permalink / raw) To: Sree Harsha Totakura; +Cc: guix-devel Sree Harsha Totakura <sreeharsha@totakura.in> skribis: > On 03/27/2014 10:30 AM, Ludovic Courtès wrote: >> I realize you’re not in the ‘guix’ group on Savannah. I can add you, >> but I need to know what your Savannah account is (or you need to create >> one if you don’t have one already.) Thanks. :-) > > Yes, I did not have an account on Savannah. I just created it and sent you guys > a request for inclusion. Done, welcome! ;-) Please see the “Commit Access” section of HACKING. Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-03-27 10:17 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-03-26 10:36 Add svn-fetch method Sree Harsha Totakura 2014-03-26 10:36 ` [PATCH] Add (guix svn-download) Sree Harsha Totakura 2014-03-26 16:00 ` Ludovic Courtès 2014-03-26 16:59 ` Update patch: " Sree Harsha Totakura 2014-03-26 16:59 ` [PATCH] " Sree Harsha Totakura 2014-03-26 23:23 ` Ludovic Courtès 2014-03-27 9:30 ` Ludovic Courtès 2014-03-27 9:57 ` Sree Harsha Totakura 2014-03-27 10:17 ` 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).