From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikita Karetnikov Subject: [PATCH] gnu-maintenance: Replace 'official-gnu-packages' with 'find-packages'. Date: Wed, 06 Mar 2013 22:54:34 +0400 Message-ID: <87sj48gxzp.fsf_-_@karetnikov.org> References: <87obfchq38.fsf@karetnikov.org> <87sj4ok6sc.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:41191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDJSb-0001uS-Dn for bug-guix@gnu.org; Wed, 06 Mar 2013 13:53:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDJSW-00043h-Mh for bug-guix@gnu.org; Wed, 06 Mar 2013 13:53:05 -0500 In-Reply-To: <87sj4ok6sc.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "(unknown date)") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: bug-guix@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > Also, I think it should process fields, and return an alist, or even > better, a =E2=80=98gnu-package-descriptor=E2=80=99 record (say). > > (define-record-type > gnu-package-descriptor? > (gnu-package-descriptor name logo-url doc-category ...) > ... > ) > > (official-gnu-packages) > =3D> (# ...) > > WDYT? Oh, I forgot about this when I was writing the attached patch. Is it fine? Should I rewrite it using records? I guess that it will work faster if I use 'cons' in 'loop' instead of 'append'. Is it worth it? Examples: scheme@(guile-user)> ,use (guix gnu-maintenance) scheme@(guile-user)> (find-packages "guix") $1 =3D (("package: guix" "logo: /software/guix/graphics/guix-logo.small.png= " "doc-category: Sysadmin" "doc-summary: Managing installed software packag= es and versions" "doc-url: none" "gplv3-status: should-be-ok" "activity-sta= tus: newpkg/20121117")) This one: (find-packages "guile") should return several packages. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-maintenance-Replace-official-gnu-packages-with-f.patch Content-Transfer-Encoding: quoted-printable From=2085f9588d0502a7dd4a1e2c30f8ba54fcb300cca8 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 6 Mar 2013 18:24:50 +0000 Subject: [PATCH] gnu-maintenance: Replace 'official-gnu-packages' with 'find-packages'. * guix/gnu-maintenance.scm (http-fetch): Use 'http-get*' and return a port. (official-gnu-packages): Replace with 'find-packages'. =2D-- guix/gnu-maintenance.scm | 56 +++++++++++++++++++++++++++++++-----------= --- 1 files changed, 38 insertions(+), 18 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index cde31aa..6344ebe 100644 =2D-- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU =2D;;; Copyright =C2=A9 2012 Nikita Karetnikov ;;; Copyright =C2=A9 2010, 2011, 2012, 2013 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2012, 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +23,7 @@ #:use-module (web response) #:use-module (ice-9 regex) #:use-module (ice-9 match) + #:use-module (ice-9 rdelim) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) @@ -30,7 +31,7 @@ #:use-module (guix ftp-client) #:use-module (guix utils) #:use-module (guix packages) =2D #:export (official-gnu-packages + #:export (find-packages gnu-package? releases latest-release @@ -49,16 +50,16 @@ ;;; =20 (define (http-fetch uri) =2D "Return a string containing the textual data at URI, a string." =2D (let*-values (((resp data) =2D (http-get (string->uri uri))) =2D ((code) =2D (response-code resp))) + "Return an input port with the textual data at URI, a string." + (let*-values (((resp port) + (http-get* (string->uri uri))) + ((code) + (response-code resp))) (case code ((200) =2D data) + port) (else =2D (error "download failed:" uri code + (error "download failed" uri code (response-reason-phrase resp)))))) =20 (define %package-list-url @@ -66,16 +67,35 @@ "viewvc/*checkout*/gnumaint/" "gnupackages.txt?root=3Dwomb")) =20 =2D(define (official-gnu-packages) =2D "Return a list of GNU packages." =2D (define %package-line-rx =2D (make-regexp "^package: (.+)$")) =2D =2D (let ((lst (string-split (http-fetch %package-list-url) #\nl))) =2D (filter-map (lambda (line) =2D (and=3D> (regexp-exec %package-line-rx line) =2D (cut match:substring <> 1))) =2D lst))) +(define (find-packages regexp) + "Find packages that match REGEXP." + (let ((package-line-rx + (make-regexp (string-append "^package: " regexp "(.?)")))) + + (define (group-packages port state) + ;; Return a list of packages. + (let ((line (read-line port))) + (define (loop str) + (match str + ('"" + (group-packages port (append state '(())))) + (str + (group-packages port (append (drop-right state 1) + (list (append (last state) + (list str)))))))) + + (if (eof-object? line) + (filter (lambda (lst) + (not (null-list? lst))) + state) + (loop line)))) + + (filter-map (lambda (sublst) + (and=3D> (regexp-exec package-line-rx (first sublst)) + (lambda _ + sublst))) + (group-packages (http-fetch %package-list-url) + '(()))))) =20 (define gnu-package? (memoize =2D-=20 1.7.5.4 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJRN5DwAAoJEM+IQzI9IQ38L1EQAIqYAovbditx8NakF/qkkTtM KXDPGmvey9xNTeHZupLvBZdovSaUEQiqcEbRzPpv35aB6IimMC2S17kqJa7sNbay IzQ9XPm/47jqsT18ycZs2QWmJE3U91tI1FRHrYUOh6RvcpqKfyEU6XQz8f36sHRn CNETCz5G1v5x2DDVIqkd8sjNXeUhM+1l8I4o1JMsW3duYSmBNwd5oiYFEvVpEIda QVd5T/ACoBL0UQrCbUAgEJYZQaGAKdl9o98aTFcPjnJQAHU88XkytYkP6Kf8ANyW bdZxDLYVoCtPvSpaAB1k6j15WdThkH1muHtXrZZTAXLJTRpIyX5MiAkzYv5OjxbQ HK30nfIel22sNrl/ERpMiUsyxX8nTzUi/8ZRMaipm4lqf48fASVS18Oh9q8tjZyG El08ECuB0lQ6Z/zgX5HxzaN1G7mVMd6pfpryQuLATtX24K+DkZvkgRs5GoPANmuq hCPeQUlXBDWmthLwmujvcIt1aNnz4b4MZj79DlO5gvAcD/cvTXlVg6IlxmZ3ZeHO wpkzYQh6B13XvEViDogF5XGtMfs5jgplU5WzfVFmFfzUNvS9v/yb1gQx+7ss2JmE 42t9FQzlCYmoWIz2wx8r2P9raDDZ7FCxt2+H/fs9NpVAsJJOWhD11oBMSpU7CVhw CUtJQ6GX5CSCXJU9l4ty =EMab -----END PGP SIGNATURE----- --==-=-=--