Re: [PATCH] gnu: Add polipo.

[Mark H Weaver]

address@hidden ("Taylan Ulrich "Bayırlı/Kammer\"") writes:

> From 5178c21a46062b328677cfa2015419c270c6536b Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <address@hidden>
> Date: Sun, 1 Feb 2015 00:03:19 +0100
> Subject: [PATCH] gnu: Add polipo.
>
> * gnu-system.am (GNU_SYSTEM_MODULES): Add polipo.scm.
> * gnu/packages/polipo.scm: New file.
> ---
>  gnu-system.am           |  1 +
>  gnu/packages/polipo.scm | 60 
> +++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 61 insertions(+)
>  create mode 100644 gnu/packages/polipo.scm
>
> diff --git a/gnu-system.am b/gnu-system.am
> index 706ad57..03f148d 100644
> --- a/gnu-system.am
> +++ b/gnu-system.am
> @@ -222,6 +222,7 @@ GNU_SYSTEM_MODULES =                              \
>    gnu/packages/photo.scm                     \
>    gnu/packages/pkg-config.scm                        \
>    gnu/packages/plotutils.scm                 \
> +  gnu/packages/polipo.scm                    \
>    gnu/packages/polkit.scm                    \
>    gnu/packages/popt.scm                              \
>    gnu/packages/pth.scm                               \

Instead of making a new module for this, how about adding it to web.scm?

> diff --git a/gnu/packages/polipo.scm b/gnu/packages/polipo.scm
> new file mode 100644
> index 0000000..9d01995
> --- /dev/null
> +++ b/gnu/packages/polipo.scm
> @@ -0,0 +1,60 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <address@hidden>

It's 2015 :)

> +;;;
> +;;; 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 polipo)
> +  #:use-module (guix licenses)
> +  #:use-module (guix packages)
> +  #:use-module (guix download)
> +  #:use-module (guix build-system gnu)
> +  #:use-module (gnu packages texinfo))
> +
> +(define-public polipo
> +  (package
> +    (name "polipo")
> +    (version "1.1.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             
> "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/polipo-";
> +             version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2"))))
> +    (inputs `(("texinfo" ,texinfo)))

Please change 'inputs' to 'native-inputs', because when cross-compiling,
texinfo is needed on the build machine, not on the target.

> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:phases
> +       (alist-replace
> +        'configure
> +        (lambda* (#:key inputs outputs #:allow-other-keys)
> +          (let ((out (assoc-ref outputs "out")))
> +            (substitute* "Makefile"
> +              (("/usr/local") out)
> +              (("/usr/share") (string-append out "/share"))))
> +          (setenv "CC" "gcc"))
> +        %standard-phases)
> +       ;; No test suite.
> +       #:tests? #f))

How about this instead?

    (arguments
     `(#:make-flags (let ((out (assoc-ref %outputs "out")))
                      (list (string-append "PREFIX=" out)
                            (string-append "LOCAL_ROOT="
                                           out "/share/polipo/www")
                            "CC=gcc"))
       #:phases (alist-delete 'configure %standard-phases)
       #:tests? #f))  ; No test suite.

> +    (home-page "http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/";)
> +    (synopsis "Small caching web proxy")
> +    (description
> +     "Polipo is a small caching web proxy (web cache, HTTP proxy, and proxy
> +server).  It was primarily designed to be used by one person or a small group
> +of people.")
> +    (license (bsd-style "file://COPYING"))))

This is the expat license, so just write (license expat).

Can you send an updated patch?

     Thanks!
       Mark