* [PATCH] gnu: Add polipo.
@ 2015-01-31 23:39 "Taylan Ulrich Bayırlı/Kammer"
2015-02-01 6:40 ` Mark H Weaver
0 siblings, 1 reply; 6+ messages in thread
From: "Taylan Ulrich Bayırlı/Kammer" @ 2015-01-31 23:39 UTC (permalink / raw)
To: guix-devel
===File /home/tub/media/src/guix/0001-gnu-Add-polipo.patch===
From 5178c21a46062b328677cfa2015419c270c6536b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
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 \
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 <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 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)))
+ (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))
+ (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"))))
--
2.2.1
============================================================
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add polipo.
2015-01-31 23:39 [PATCH] gnu: Add polipo "Taylan Ulrich Bayırlı/Kammer"
@ 2015-02-01 6:40 ` Mark H Weaver
2015-02-01 13:39 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 6+ messages in thread
From: Mark H Weaver @ 2015-02-01 6:40 UTC (permalink / raw)
To: Taylan Ulrich Bayırlı/Kammer; +Cc: guix-devel
taylanbayirli@gmail.com ("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?=
> <taylanbayirli@gmail.com>
> 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 <taylanbayirli@gmail.com>
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add polipo.
2015-02-01 6:40 ` Mark H Weaver
@ 2015-02-01 13:39 ` Taylan Ulrich Bayırlı/Kammer
2015-02-01 21:26 ` Mark H Weaver
0 siblings, 1 reply; 6+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-02-01 13:39 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 43 bytes --]
Thanks for the feedback. :-)
Is this OK?
[-- Attachment #2: gnu: Add polipo. --]
[-- Type: text/x-diff, Size: 3066 bytes --]
From 34a01e8bf1977c722ae06cf0e4238ec2a27796dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sun, 1 Feb 2015 00:03:19 +0100
Subject: [PATCH] gnu: Add polipo.
* gnu/packages/web.scm: Add polipo.
---
gnu-system.am | 1 +
gnu/packages/web.scm | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
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 \
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7abed9d..123fece 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,7 +42,8 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages xml)
#:use-module (gnu packages curl)
- #:use-module (gnu packages perl))
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages texinfo))
(define-public httpd
(package
@@ -727,3 +729,36 @@ SSL-aware without much effort, at least if you do blocking I/O and don't use
select or poll.")
(license (package-license perl))
(home-page "https://github.com/noxxi/p5-io-socket-ssl")))
+
+(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"))))
+ (native-inputs `(("texinfo" ,texinfo)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (alist-delete 'configure %standard-phases)
+ #:make-flags (let ((out (assoc-ref %outputs "out")))
+ (list (string-append "PREFIX=" out)
+ (string-append "LOCAL_ROOT="
+ out "/share/polipo/www")
+ "CC=gcc"))
+ ;; No 'check' target.
+ #:tests? #f))
+ (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 l:expat)))
--
2.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add polipo.
2015-02-01 13:39 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-02-01 21:26 ` Mark H Weaver
2015-02-01 23:26 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 6+ messages in thread
From: Mark H Weaver @ 2015-02-01 21:26 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:
> From 34a01e8bf1977c722ae06cf0e4238ec2a27796dc Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sun, 1 Feb 2015 00:03:19 +0100
> Subject: [PATCH] gnu: Add polipo.
>
> * gnu/packages/web.scm: Add polipo.
For better or worse, our convention is to write this as:
* gnu/packages/web.scm (polipo): New variable.
> ---
> gnu-system.am | 1 +
> gnu/packages/web.scm | 37 ++++++++++++++++++++++++++++++++++++-
> 2 files changed, 37 insertions(+), 1 deletion(-)
>
>
> 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 \
This change is no longer appropriate, since polipo.scm doesn't exist.
Otherwise it looks good. Can you send an updated patch?
Thanks,
Mark
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add polipo.
2015-02-01 21:26 ` Mark H Weaver
@ 2015-02-01 23:26 ` Taylan Ulrich Bayırlı/Kammer
2015-02-02 1:51 ` Mark H Weaver
0 siblings, 1 reply; 6+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-02-01 23:26 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
Mark H Weaver <mhw@netris.org> writes:
>> ---
>> gnu-system.am | 1 +
>> gnu/packages/web.scm | 37 ++++++++++++++++++++++++++++++++++++-
>> 2 files changed, 37 insertions(+), 1 deletion(-)
>>
>>
>> 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 \
>
> This change is no longer appropriate, since polipo.scm doesn't exist.
> Otherwise it looks good. Can you send an updated patch?
Ah, thanks for catching that. :-)
Fixed the commit message too.
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2655 bytes --]
From 142284db6dfbba4bffa5e5a2cd8e61f35dde8629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sun, 1 Feb 2015 00:03:19 +0100
Subject: [PATCH] gnu: Add polipo.
* gnu/packages/web.scm (polipo): New variable.
---
gnu/packages/web.scm | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7abed9d..123fece 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,7 +42,8 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages xml)
#:use-module (gnu packages curl)
- #:use-module (gnu packages perl))
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages texinfo))
(define-public httpd
(package
@@ -727,3 +729,36 @@ SSL-aware without much effort, at least if you do blocking I/O and don't use
select or poll.")
(license (package-license perl))
(home-page "https://github.com/noxxi/p5-io-socket-ssl")))
+
+(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"))))
+ (native-inputs `(("texinfo" ,texinfo)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (alist-delete 'configure %standard-phases)
+ #:make-flags (let ((out (assoc-ref %outputs "out")))
+ (list (string-append "PREFIX=" out)
+ (string-append "LOCAL_ROOT="
+ out "/share/polipo/www")
+ "CC=gcc"))
+ ;; No 'check' target.
+ #:tests? #f))
+ (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 l:expat)))
--
2.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add polipo.
2015-02-01 23:26 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-02-02 1:51 ` Mark H Weaver
0 siblings, 0 replies; 6+ messages in thread
From: Mark H Weaver @ 2015-02-02 1:51 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
Pushed, thanks!
Mark
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-02-02 1:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-31 23:39 [PATCH] gnu: Add polipo "Taylan Ulrich Bayırlı/Kammer"
2015-02-01 6:40 ` Mark H Weaver
2015-02-01 13:39 ` Taylan Ulrich Bayırlı/Kammer
2015-02-01 21:26 ` Mark H Weaver
2015-02-01 23:26 ` Taylan Ulrich Bayırlı/Kammer
2015-02-02 1:51 ` Mark H Weaver
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).