[PATCH 1/6] gnu: %static-inputs: Use 'grep' without custom phase.
This reverts commit 1063d325ea76aa2b00dfcd3d436b16e412103df1 for during
creation of the bootstrap-binaries.
* gnu/packages/make-bootstrap.scm (%static-inputs): Use a custom 'grep'
without the absolute path name in fgrep/egrep.
---
gnu/packages/make-bootstrap.scm | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index d2a559c08..c529e03c9 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <l...@gnu.org>
+;;; Copyright © 2017 Efraim Flashner <efr...@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -206,7 +207,16 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
("patch" ,patch)
("coreutils" ,coreutils)
("sed" ,sed)
- ("grep" ,grep)
+ ;; We don't want to retain a reference to /gnu/store in the
+ ;; bootstrap versions of egrep/fgrep, so we remove the custom
+ ;; phase added since grep@2.25.
+ ("grep" ,(package
+ (inherit grep)
+ (arguments
+(substitute-keyword-arguments (package-arguments
grep)
+ ((#:phases phases)
+ `(delete 'fix-egrep-and-fgrep
+,phases))
("gawk" ,gawk)))
("bash" ,static-bash
--
2.11.1
[PATCH 5/6] gnu: gcc: Force Aarch64 to use /lib.
* gnu/packages/gcc.scm (gcc)[arguments]: On aarch64 replace force libdir
to be lib and not lib64.
---
gnu/packages/gcc.scm | 4
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 075642ebd..2bd630d5d 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -263,6 +263,10 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
(("static char const sed_cmd_z\\[\\] =.*;")
"static char const sed_cmd_z[] = \"sed\";"))
+ ;; Force Aarch64 libdir to be /lib and not /lib64
+ (substitute* "gcc/config/aarch64/t-aarch64-linux"
+(("lib64") "lib"))
+
(when (file-exists? "libbacktrace")
;; GCC 4.8+ comes with libbacktrace. By default it builds
;; with -Werror, which fails with a -Wcast-qual error in glibc
--
2.11.1
[PATCH 4/6] gnu: Add bootstrap-binaries for 'aarch64-linux'.
* gnu/packages/bootstrap/aarch64-linux/bash,
gnu/packages/bootstrap/aarch64-linux/mkdir,
gnu/packages/bootstrap/aarch64-linux/xz,
gnu/packages/bootstrap/aarch64-linux/tar: New files.
* gnu/local.mk (bootstrap_aarch64_linuxdir)
(dist_bootstrap_aarch64_linux_DATA)
(nodist_bootstrap_aarch64_linux_DATA): New variables.
(DISTCLEANFILES): Add $(nodist_bootstrap_aarch64_linux_DATA).
(gnu/packages/bootstrap/aarch64-linux/guile-2.0.13.tar.xz): New target.
* build-aux/download.scm (filename->uri): Add aarch64-linux entry.
* gnu/packages/bootstrap.scm (raw-build): Use guile-2.0.13.tar.xz on
aarch64-linux.
(glibc-dynamic-linker, %bootstrap-coreutils, %boostrap-binutils)
(%bootstrap-glibc, %bootstrap-gcc): Add aarch64-linux cases.
* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add aarch64 case.
(GUIX_ASSERT_SUPPORTED_SYSTEM): Add aarch64-linux to supported list.
* doc/guix.texi (GNU Distribution): Add aarch64-linux to the list of
supported systems.
* tests/packages.scm (package-search-derivation, snippet): Add aarch64
case.
---
build-aux/download.scm | 20 +---
doc/guix.texi | 3 +++
gnu/local.mk | 15 +++
gnu/packages/bootstrap.scm | 26 +-
gnu/packages/bootstrap/aarch64-linux/bash | Bin 0 -> 1162056 bytes
gnu/packages/bootstrap/aarch64-linux/mkdir | Bin 0 -> 558216 bytes
gnu/packages/bootstrap/aarch64-linux/tar | Bin 0 -> 1085128 bytes
gnu/packages/bootstrap/aarch64-linux/xz| Bin 0 -> 738576 bytes
m4/guix.m4 | 3 ++-
tests/packages.scm | 2 ++
10 files changed, 60 insertions(+), 9 deletions(-)
create mode 100755 gnu/packages/bootstrap/aarch64-linux/bash
create mode 100755 gnu/packages/bootstrap/aarch64-linux/mkdir
create mode 100755 gnu/packages/bootstrap/aarch64-linux/tar
create mode 100755 gnu/packages/bootstrap/aarch64-linux/xz
diff --git a/build-aux/download.scm b/build-aux/download.scm
index 1e91e4b87..383cdf880 100644
--- a/build-aux/download.scm
+++ b/build-aux/download.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <m...@netris.org>
+;;; Copyright © 2017 Efraim Flashner <efr...@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,13 +46,18 @@
"Return the URI for FILE."
(match (string-tokenize file (char-set-complement (char-set #\/)))
((_ ... system basename)
- (string->uri (string-append %url-base "/" system
- (match system
- ("armhf-linux"
-"/20150101/")
- (_
-"/20131110/"))
- basename)
+ (string->uri
+ (match system
+("aarch64-linux"
+ (string-append "http://flashner.co.il/guix/bootstrap/aarch64-linux;
+"/20170209/" basename))
+(_ (string-append %url-base "/" system
+ (match system
+ ("armhf-linux"
+ "/20150101/")
+ (_
+ "/20131110/"))
+ basename)))
(match (command-line)
((_ file expected-hash)
diff --git a/doc/guix.texi b/doc/guix.texi
index 6acde6621..5242b1fc4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -6669,6 +6669,9 @@ ARMv7-A architecture with hard float, Thumb-2 and NEON,
using the EABI hard-float application binary interface (ABI),
and Linux-Libre kernel.
+@item aarch64-linux
+little-endian 64-bit ARMv8 processors.
+
@item mips64el-linux
little-endian 64-bit MIPS processors, specifically the Loongson series,
n32 ABI, and Linux-Libre kernel.
diff --git a/gnu/local.mk b/gnu/local.mk
index ad3be4b13..5a6fbb08e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -9,6 +9,7 @@
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <adf...@openmailbox.org>
# Copyright © 2016, 2017 Ricardo Wurmus <rek...@elephly.net>
# Copyright © 2016 Ben Woodcroft <donttrust...@gmail.com>
+# Copyright © 2017 Efraim Flashner <efr...@flashner.co.il>
#
# This file is part of GNU Guix.
#
@@ -970,6 +971,7 @@ bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
+bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux
bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
dist_bootst
[PATCH 0/6] WIP aarch64 support
Here's my current aarch64 patch set. As attached I don't know if the patches will apply, I stripped bootstrap bash/mkdir/tar/xz out of the set so the email won't be too big. grep without custom phase: The main purpose of this patch is so that it can be reapplied in the next patch. Without the patch, fgrep is: #! /gnu/store/eee...-bootstrap-binaries/bin/sh exec /gnu/store/eee...-grep-2.28/bin/grep -F ... and there's no simple way to fix that This patch should work against master. patch egrep/fgrep: I don't believe this actually patches egrep/fgrep, just the version in /tmp so that it passes the test. Regardless, it passes the test at unpack time, and it works later on. This patch breaks all the current architectures, since egrep/fgrep are binaries pre grep-2.25. daemon patch: The if statement should be easy to write, but I'm having a really hard time with it. Interestingly, when I used the armhf binary install tarball the daemon there worked. add bootstrap-binaries: This one (still) isn't final, the ones currently hosted at the time of this email were built without the first patch, so building failed. Even with the patch to the test, not all the tests passed at last check. gcc patch: I don't know if this is necessary, but we try not to use lib64. There was supposed to be another aarch64 gcc patch, to add aarch64 specific flags, but all of the flags caused the bootstrapping GCCs to fail, so I had to take them out. We'll have to figure something out, at the very least to make sure we're targeting ARMv8-a and not 8.1 or 8.2 as more devices come out. aarch64-linux-gnu target: This one I tossed in. Efraim Flashner (6): gnu: %static-inputs: Use 'grep' without custom phase. gnu: %bootstrap-coreutils: Patch egrep/fgrep to work regardless of $PATH. daemon: On aarch64, use increments of 16 on the stack. gnu: Add bootstrap-binaries for 'aarch64-linux'. gnu: gcc: Force Aarch64 to use /lib. hydra: Add "aarch64-linux-gnu" as a cross-compilation target. build-aux/download.scm | 20 --- build-aux/hydra/gnu-system.scm | 1 + doc/guix.texi | 3 +++ gnu/local.mk | 15 +++ gnu/packages/bootstrap.scm | 30 - gnu/packages/bootstrap/aarch64-linux/bash | Bin 0 -> 1162056 bytes gnu/packages/bootstrap/aarch64-linux/mkdir | Bin 0 -> 558216 bytes gnu/packages/bootstrap/aarch64-linux/tar | Bin 0 -> 1085128 bytes gnu/packages/bootstrap/aarch64-linux/xz| Bin 0 -> 738576 bytes gnu/packages/gcc.scm | 4 gnu/packages/make-bootstrap.scm| 12 +++- m4/guix.m4 | 3 ++- nix/libstore/build.cc | 7 ++- tests/packages.scm | 2 ++ 14 files changed, 86 insertions(+), 11 deletions(-) create mode 100755 gnu/packages/bootstrap/aarch64-linux/bash create mode 100755 gnu/packages/bootstrap/aarch64-linux/mkdir create mode 100755 gnu/packages/bootstrap/aarch64-linux/tar create mode 100755 gnu/packages/bootstrap/aarch64-linux/xz -- 2.11.1
[PATCH 3/6] daemon: On aarch64, use increments of 16 on the stack.
man2 clone: EINVAL: ... on aarch64, child_stack must be a multiple of 16.
* nix/libstore/build.cc (DerivationGoal::startBuilder): When on aarch64,
when calling clone(), increment the stack by 16.
---
nix/libstore/build.cc | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index cebc404d1..362b2d91d 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2008,7 +2008,12 @@ void DerivationGoal::startBuilder()
char stack[32 * 1024];
int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS |
SIGCHLD;
if (!fixedOutput) flags |= CLONE_NEWNET;
- pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
+// if statements are hard, fix this
+//#if __AARCH64__
+ pid = clone(childEntry, stack + sizeof(stack) - 16, flags, this);
+//#else
+// pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
+//#endif
if (pid == -1)
throw SysError("cloning builder process");
} else
--
2.11.1
[PATCH 2/6] gnu: %bootstrap-coreutils: Patch egrep/fgrep to work regardless of $PATH.
This is the bootstrap version of 1063d325ea76aa2b00dfcd3d436b16e412103df1
* gnu/packages/bootstrap.scm (%bootstrap-coreutils)[source]: Patch
the absolute location of 'grep' when called from 'egrep' or 'fgrep'.
---
gnu/packages/bootstrap.scm | 4
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 3be6e1246..1dd853260 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -325,6 +325,10 @@ $out/bin/guile --version~%"
(chmod "bin" #o755)
(patch-shebang "bin/egrep" path)
(patch-shebang "bin/fgrep" path)
+ ;; Patch 'egrep' and 'fgrep' to execute 'grep' via
its
+ ;; absolute file name instead of searching for it
in $PATH.
+ (substitute* '("bin/egrep" "bin/fgrep")
+ (("grep") (string-append (getcwd) "/bin/grep")))
(chmod "bin" #o555)
#t)))
--
2.11.1
[PATCH 6/6] hydra: Add "aarch64-linux-gnu" as a cross-compilation target.
* build-aux/hydra/gnu-system.scm (%cross-targets): Add
"aarch64-linux-gnu".
---
build-aux/hydra/gnu-system.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 17c224ea4..53fa637f1 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -123,6 +123,7 @@ SYSTEM."
'("mips64el-linux-gnu"
"mips64el-linux-gnuabi64"
"arm-linux-gnueabihf"
+"aarch64-linux-gnu"
"powerpc-linux-gnu"
"i586-pc-gnu" ;aka. GNU/Hurd
"i686-w64-mingw32"))
--
2.11.1
Re: [PATCH] gnu: tcsh: Update to 6.20.00.
On Mon, Jan 09, 2017 at 12:25:01AM +, ng0 wrote: > * gnu/packages/shells.scm (tcsh): Update to 6.20.00. > [native-inputs]: Add perl. > * gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Remove it. > --- > gnu/packages/patches/tcsh-fix-autotest.patch | 151 > ++- > gnu/packages/shells.scm | 10 +- > 2 files changed, 15 insertions(+), 146 deletions(-) > tcsh-do-not-define-BSDWAIT.patch was removed from the tcsh source, but not from the repo or from gnu/local.mk. Is it used somewhere else? -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: Encrypted root partition
On Wed, Jan 18, 2017 at 03:38:57AM -0800, Chris Marusich wrote:
> Chris Marusich <cmmarus...@gmail.com> writes:
>
> As a bonus, I realized that one could use this feature to encrypt swap,
> also. You can encrypt your swap area by using a swap file in the root
> file system. Specifically, if you do something like this...
>
> # Make the file readable/writable only by root.
> sudo dd if=/dev/zero of=/swapfile bs=1MiB count=10240
> sudo chmod 600 /swapfile
> sudo mkswap --label swap /swapfile
>
> and then you add a single line to your operating system configuration
> file like this...
>
> (swap-devices '("/swapfile"))
>
> then your swap file will be automatically mounted during boot. You
> don't even have to enter your LUKS passphrase an additional time. I was
> pleasantly surprised to find out that encrypted swap was this easy!
>
This seems like something that would be nice to add to the manual :)
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH v2 3/6] gnu: Add python-dulwich.
On Wed, Jan 18, 2017 at 06:48:46PM +0100, Marius Bakke wrote:
> Danny Milosavljevic <dan...@scratchpost.org> writes:
>
> > * gnu/packages/python.scm (python-dulwich, python2-dulwich): New variables.
> > ---
> > gnu/packages/python.scm | 44
> > 1 file changed, 44 insertions(+)
> >
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index 6c7a6353d..b064c9f47 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -12740,3 +12740,47 @@ Features:
> > @item Compiles templates into optimized, yet readable, Python code.
> > @end enumerate")
> > (license (license:x11-style "file://LICENSE"
> > +
> > +(define-public python-dulwich
> > + (package
> > +(name "python-dulwich")
> > +(version "0.16.3")
> > +(source
> > + (origin
> > +(method url-fetch)
> > +(uri (pypi-uri "dulwich" version))
>
> Upstream provides the same releaases on their home page. I would add
>
> (uri (list (string-append "https://www.dulwich.io/releases/dulwich-;
> version ".tar.gz")
> (pypi-uri "cram" version)))
>
> > +(sha256
> > + (base32
> > "0fl47vzfgc3w3rmhn8naii905cjqcp0vc68iyvymxp7567hh6als"
> > +(build-system python-build-system)
> > +(arguments
> > + `(#:phases
> > + (modify-phases %standard-phases
> > + (add-before 'check 'fix-tests
> > + (lambda* (#:key inputs #:allow-other-keys)
> > + (substitute* "dulwich/tests/compat/utils.py"
> > + (("'git'") (string-append "'"
> > + (assoc-ref inputs "git")
> > + "/bin/git'")))
>
> Why is this necessary? Git is available in PATH, no?
or alternatively, would (which "git") work?
>
> > + (substitute* '("dulwich/tests/test_repository.py"
> > +"dulwich/tests/test_hooks.py")
> > + (("#!/bin/sh") (string-append "#!" (which "sh"
> > + (setenv "TEST_RUNNER" "unittest")
> > + (setenv "PYTHONHASHSEED" "random")
> > + #t)
> > +(propagated-inputs
> > + `(("python-fastimport" ,python-fastimport)))
> > +(native-inputs
> > + `(("python-mock" ,python-mock)
> > + ("python-geventhttpclient" ,python-geventhttpclient)
> > + ("git" ,git)))
> > +(home-page "https://www.dulwich.io/;)
> > +(synopsis "Git implementation in Python")
> > +(description "Dulwich is an implementation of the Git file formats and
> > +protocols written in pure Python.")
> > +;; dual-licensed
> > +(license (list license:asl2.0 license:gpl2+
>
> Please clarify whether it's both, or either. Otherwise LGTM, thanks!
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: Ada compiler
On Thu, Jan 19, 2017 at 03:23:47PM +0100, Danny Milosavljevic wrote:
> Hi,
>
> would it be possible to provide the GCC Ada compiler?
>
> I would do it myself - however, it seems that GNAT requires GNAT which is a
> bootstrapping problem.
>
> diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
> index cfd33f85a..ef4136fa4 100644
> --- a/gnu/packages/gcc.scm
> +++ b/gnu/packages/gcc.scm
> @@ -861,3 +861,18 @@ to be a tutorial of the language. Rather, it outlines
> all of the constructs
> of the language. Library functions are not included.")
> (home-page "http://www.gnu.org/software/gnu-c-manual;)
> (license fdl1.3+)))
> +
> +(define-public gnat-4.9
> + (custom-gcc gcc-4.9 "gnat" '("gnat")
> + %generic-search-paths))
> +
> +(define-public gnat-6
> + (custom-gcc gcc-6 "gnat" '("gnat")
> + %generic-search-paths))
> +
> +(define-public gnat
> + ;; Note: Update this when GCC changes! We cannot use
> + ;; (custom-gcc gcc "gnat" …) because that would lead to a package object
> + ;; that is not 'eq?' with gnat-4.9, and thus 'fold-packages' would
> + ;; report two gnat@4.9 that are in fact identical.
> + gnat-4.9)
>
Sometimes I have to wonder, to me that just sounds like a fun
bootstrapping problem that involves diving into the annals of computing
history.
I found https://people.debian.org/~lbrenta/debian-ada-policy.html this,
not sure if it helps any.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: 01/01: gnu: shotwell: Update to 0.23.4.
On Fri, Aug 19, 2016 at 03:48:53PM +0200, Tobias Geerinckx-Rice wrote: > Efraim, > > On 19/08/16 12:35, Efraim Flashner wrote: > > efraim pushed a commit to branch master > > in repository guix. > > > > commit f819c21dd5ea08ef063f68999710b6b25432df1c > > Author: Efraim Flashner <efr...@flashner.co.il> > > Date: Fri Aug 19 13:35:14 2016 +0300 > > > > gnu: shotwell: Update to 0.23.4. > > I submitted an update to Shotwell 0.23.5 a day or two ago, which changes > a few more things. I've been using it without problems since, so I went > ahead and pushed it. > > Kind regards, > > T G-R > sorry, I didn't mean to jump in like that. I'm still a bit behind in my emails and I was just looking to fix some of the packages that failed to build. I meant to send this out earlier but my mail client has been acting up -- Efraim Flashner <efr...@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 -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH] gnu: Move gtkglext from gnome to gtk.
On Wed, Aug 17, 2016 at 08:53:14AM +0200, Ricardo Wurmus wrote: > > Leo Famulari <l...@famulari.name> writes: > > > On Wed, Aug 17, 2016 at 01:12:07AM +0200, Danny Milosavljevic wrote: > >> I'll send a patch. We can think of what we want to do with it - but at > >> least we can see the extent then. > > > > Oh, I see you already sent it. You'd also need to be sure to move the > > copyright authorship lines around properly. I don't think it's worth all > > the noise, to be honest. > > I agree that this seems like a lot of noise for little gain (and in some > cases I think the new location isn’t actually an improvement). > > ~~ Ricardo > I like the freedesktop, glib and linux ones, not as sure about the gnome/gtk switchings. -- Efraim Flashner <efr...@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 -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: Guix on other distros: Gentoo. [You run Gentoo? Please help testing.]
On Fri, Aug 05, 2016 at 07:02:14PM +, ng0 wrote: > > The disfunctional thing currently is: > > guixbuilder01 ... guixbuilder10 get created and added to guixbuild > group. > > Post-setup I let root authorize hydra's pubkey, then I run > `rc-service start guix' which sadly makes the terminal unusable if you > don't append "&". > > running guix pull then as root downloads happen, but as soon as builder > should start, it fails: > > shikahr ~ # guix pull > > Starting download of /tmp/guix-file.RpedfI > From http://git.savannah.gnu.org/cgit/guix.git/snapshot/master.tar.gz... > ….tar.gz 1.1MiB/s 00:10 | 10.3MiB > transferred > unpacking > '/gnu/store/h33fva5hvrw7z99vrn3ivnh07mgg55qc-guix-latest.tar.gz'... > substitute: updating list of substitutes from > 'https://mirror.hydra.gnu.org'... 100.0% > The following derivations will be built: > /gnu/store/yw3dzq3nlngki5bd8z5yp1aslvzsjh1n-guix-latest.drv > /gnu/store/2gyrssyswj0p2z6yr7938kln20piy4w6-module-import.drv > /gnu/store/jb6ir2q5j8lwmdcqlhs7c4vdkgllcjga-module-import-compiled.drv > building path(s) >`/gnu/store/35xw5kccyq76v8zgkdrnx1z9w8s6ll7m-module-import' > guix pull: error: build failed: the build users group > `guixbuild' has no members > shikahr ~ # id -nG guixbuilder01 > guixbuild > shikahr ~ # id -nG guixbuilder1 > id: guixbuilder1: no such user > > > I know the openrc service is total crap because if you don't kill every > instance of guix-daemon before shutdown/reboot, you have almost 30 > minutes delay. > OpenRC services are not my favorit thing to write, but it should just > work. > > Also strange enough a sequence from 1 - 10 in ebuild creates users 01 - > 10. > > -- > ♥Ⓐ ng0 > Current Keys: https://we.make.ritual.n0.is/ng0.txt > For non-prism friendly talk find me on http://www.psyced.org > one thing you could try as a work around is to only make 9 builders, or to number the builders from 10 to 19. -- Efraim Flashner <efr...@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 -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH] Add Emacs Org mode
On Sat, Aug 20, 2016 at 10:53:48AM +0200, Ricardo Wurmus wrote: > > Hi Nicolas, > > > The following patch adds Org mode to the list of Emacs packages. > > Thank you for the patch. Org mode is already part of Emacs; is a > separate package for Org mode still needed in this case? > > ~~ Ricardo > I'm not an emacs user, so ignore me if I'm way off on my assumptions :) I notice the release date is about 2 weeks ago, so development seems to be continuing, not just as part of emacs. How recently was orgmode added to emacs? If it was quite recently then could this still be useful to people using Guix on a foreign distro? -- Efraim Flashner <efr...@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 -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH 24/24] gnu: qt: Update qt to 5.7.0.
On Sat, Aug 20, 2016 at 09:50:51PM +0200, David Craven wrote: > I fixed all regression except vlc and avidemux (locally). I'll have to > do some more debugging tomorrow. Forcing --std=gnu++11 worked in all > other cases. With the release of vlc 3 eminent, would it be acceptable > to use qt-4 with vlc 2.2.4 (if I don't manage to fix it)? That's what > arch linux is doing currently - and forcing --std=gnu++98, since > they're on gcc6. > you could also try using regular qt, that's still on 5.6.1-1 -- Efraim Flashner <efr...@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 -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: Building for Android and F-Droid
On Thu, Sep 01, 2016 at 03:57:13PM +0200, Ricardo Wurmus wrote:
>
> Thompson, David <dthomps...@worcester.edu> writes:
>
> > Does anyone know what we are missing to be able to package android
> > tools?
>
> Given the current state of our support for Java I’d say we mostly need
> more Java packages in Guix. A first big step would be to package enough
> to be able to build Maven from source (no cheating).
>
> ~~ Ricardo
>
>
If anyone wants to play around with f-droid, I have it packaged in my
GUIX_PACKAGE_PATH, waiting to be tested more before breaking it down
into patches and submitting it. Of course currently building apks
doesn't work, and I haven't really tested much of the functionality yet.
--
Efraim Flashner <efr...@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
;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il>
;;;
;;; This file is an addendum to 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 (wip fdroid)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix build-system python)
#:use-module (gnu packages python))
(define-public fdroidserver
(package
(name "fdroidserver")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "fdroidserver" version))
(sha256
(base32
"1fi4kkgi59gd9nssy9zc86b8rki3m47pd29vc821jgsa89lgjqf5"
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; this prevents the examples from being installed
;; we want to fix this later
(add-before 'install 'patch-install-locations
(lambda _
(substitute* "setup.py"
(("\\(data_prefix\\ \\+\\
'/share/doc/fdroidserver/examples',") "")
(("\\['buildserver") "'buildserver")
(("'\\]\\)") "'")
)
#t)))
#:python ,python-2)) ; after 0.6.0 it switches to python3
(inputs
`(("python2-apache-libcloud" ,python2-apache-libcloud)
("python2-mwclient" ,python2-mwclient)
("python2-paramiko" ,python2-paramiko)
("python2-pillow" ,python2-pillow)
("python2-pyasn1" ,python2-pyasn1)
("python2-pyasn1-modules" ,python2-pyasn1-modules)
("python2-pyyaml" ,python2-pyyaml)
("python2-requests" ,python2-requests)))
(propagated-inputs
`(("python2-crypto" ,python2-crypto))) ; not sure this is the right one
(home-page "https://f-droid.org;)
(synopsis "F-Droid Server Tools")
(description "F-Droid Server Tools")
(license license:agpl3+)))
(define-public python-mwclient
(package
(name "python-mwclient")
(version "0.8.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mwclient" version))
(sha256
(base32
"1r322v6i6xps9xh861rbr4ggshydcgp8cycbdlmgy8qbrh8jg2az"
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(zero? (system* "py.test")))
(native-inputs
`(("python-pytest-cache" ,python-pytest-cache)
("python-pytest-cov" ,python-pytest-cov)
("python-pytest-pep8" ,python-pytest-pep8)))
(inputs
`(("python-funcsigs" ,python-funcsigs)
("python-mock" ,python-mock)
("python-requests" ,python-requests)
("python-responses" ,python-responses)
("python-six" ,python-six)))
(home-page "https://github.com/mwclient/mwclient;)
(synopsis "MediaWiki API client")
(description "MediaWiki API client")
(license license:expat)
(properties `((python2-varia
Re: [PATCH] gnu: Add Infernal.
On Fri, Sep 02, 2016 at 04:12:21PM +0200, Ricardo Wurmus wrote:
>
> Thompson, David <dthomps...@worcester.edu> writes:
>
> > On Fri, Sep 2, 2016 at 9:35 AM, Ricardo Wurmus
> > <ricardo.wur...@mdc-berlin.de> wrote:
> >> * gnu/packages/bioinformatics.scm (infernal): New variable.
> >> ---
> >> gnu/packages/bioinformatics.scm | 27 +++
> >> 1 file changed, 27 insertions(+)
> >>
> >> diff --git a/gnu/packages/bioinformatics.scm
> >> b/gnu/packages/bioinformatics.scm
> >> index 08c2545..1652f71 100644
> >> --- a/gnu/packages/bioinformatics.scm
> >> +++ b/gnu/packages/bioinformatics.scm
> >> @@ -4835,6 +4835,33 @@ data in the form of VCF files.")
> >> ;; at https://vcftools.github.io/license.html
> >> (license license:lgpl3)))
> >>
> >> +(define-public infernal
> >> + (package
> >> +(name "infernal")
> >> +(version "1.1.2")
> >> +(source (origin
> >> + (method url-fetch)
> >> + ;; There are no versioned tarballs
> >
> > But the version appears in the URL?
>
> Sorry, this comment was supposed to be removed before sending out the
> patch. Noticed it too late.
>
> >> + (uri (string-append "http://eddylab.org/software/infernal/;
> >> + "infernal-" version ".tar.gz"))
> >> + (sha256
> >> + (base32
> >> +"0sr2hiz3qxfwqpz3whxr6n82p3x27336v3f34iqznp10hks2935c"
> >> +(build-system gnu-build-system)
> >> +(native-inputs
> >> + `(("perl" ,perl))) ; for tests
> >> +(home-page "http://eddylab.org/infernal/;)
> >> +(synopsis "Inference of RNA alignments")
> >> +(description "Infernal (\"INFERence of RNA ALignment\") is a tool for
> >> +searching DNA sequence databases for RNA structure and sequence
> >> similarities.
> >> +It is an implementation of a special case of profile stochastic
> >> context-free
> >> +grammars called @dfn{covariance models} (CMs). A CM is like a sequence
> >> +profile, but it scores a combination of sequence consensus and RNA
> >> secondary
> >> +structure consensus, so in many cases, it is more capable of identifying
> >> RNA
> >> +homologs that conserve their secondary structure more than their primary
> >> +sequence.")
> >> +(license license:bsd-3)))
> >> +
> >> (define-public r-vegan
> >>(package
> >> (name "r-vegan")
> >> --
> >> 2.9.3
> >>
> >>
> >
> > LGTM overall.
>
> Okay, will push in a moment (after removing the wrong comment).
> Thanks for taking a look!
>
> ~~ Ricardo
>
After checking the hydra logs I removed support for armhf and mips,
since they lack the necessary hardware features to build the package.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: Removing the attic package
On Mon, Sep 05, 2016 at 10:20:36AM +0200, Ludovic Courtès wrote: > Hi! > > Leo Famulari <l...@famulari.name> skribis: > > > > > Do we have any guidelines about "retiring" packages? > > Not yet! > > Of course there’s a fine line here: we cannot systematically retire > packages “just” because they have bugs (all of them do ;-)). So we have > to be cautious. In this case, it can be considered a serious bug in the > package’s core functionality, *and* there’s a fix provided by a fork, so > I see no obstacle in removing it. > > What do people think? > > Thanks, > Ludo’. > I think it makes sense to change the description that this package is slated for eventual removal. Another example is pinentry. We now have 4 pinentry packages, and the original pinentry package just points to pinentry-gtk. I think it would make sense in that case to change the description to something like `the pinentry package in guix is depreciated, please remove it and install pinentry-gtk to retain the same functinality' or something along those lines. In this case something about attic having serious unpatched flaws, is unmaintained, and that borg is a fork & continuation of it, would be a good change. That might keep new people from installing it, but how would we get people who have already installed it to uninstall it? Or to see the message? -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: QEMU update (security)
On Sun, Sep 04, 2016 at 04:20:44PM -0400, Leo Famulari wrote:
> This updates QEMU to the latest release, 2.7.0.
>
> It fixes at least one security bug (I think that every new QEMU release
> fixes security bugs):
> http://seclists.org/oss-sec/2016/q3/394
>
> Tested on x86-64.
> From a46d80d697e2ed93596a69b9f170b645f8b608a0 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <l...@famulari.name>
> Date: Sun, 4 Sep 2016 02:53:37 -0400
> Subject: [PATCH] gnu: qemu: Update to 2.7.0 [fixes CVE-2016-7116].
>
> * gnu/packages/qemu.scm (qemu): Update to 2.7.0.
> [arguments]: Adjust path in 'disable-test-qga' phase.
> ---
> gnu/packages/qemu.scm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
> index 1b9f0ad..aee6a75 100644
> --- a/gnu/packages/qemu.scm
> +++ b/gnu/packages/qemu.scm
> @@ -69,14 +69,14 @@
> (define-public qemu
>(package
> (name "qemu")
> -(version "2.6.1")
> +(version "2.7.0")
> (source (origin
> (method url-fetch)
> (uri (string-append
> "http://wiki.qemu-project.org/download/qemu-;
> version ".tar.bz2"))
> (sha256
>(base32
> - "1l88iqk0swqccrnjwczgl9arqsvy77bis862zxajy7z3dqdzshj9"
> + "0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij"
> (build-system gnu-build-system)
> (arguments
> '(;; Running tests in parallel can occasionally lead to failures, like:
> @@ -125,7 +125,7 @@
> (setenv "V" "1")))
> (add-before 'check 'disable-test-qga
> (lambda _
> - (substitute* "tests/Makefile"
> + (substitute* "tests/Makefile.include"
> ;; Comment out the test-qga test, which needs /sys and
> ;; fails within the build environment.
> (("check-unit-.* tests/test-qga" all)
> --
> 2.10.0
>
I haven't tested it but it looks good.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add python-pypump
On Fri, Aug 19, 2016 at 06:17:47PM -0400, Leo Famulari wrote:
> On Mon, Aug 15, 2016 at 03:17:57PM -0700, Dylan Jeffers wrote:
> > On Mon, 15 Aug 2016 14:41:28 -0400
> > Leo Famulari <l...@famulari.name> wrote:
> >
> > > On Sun, Aug 14, 2016 at 04:07:11PM -0700, Dylan Jeffers wrote:
> > > > > The latest upstream version 0.7. Is there a reason not to use the
> > > > > latest version in this case?
> > > >
> > > > For my immediate purposes, I need pypump 0.6, since thats the
> > > > version used in my projects. Since the versions are quite
> > > > different, maybe we include both of them?
> > >
> > > I think we should package the latest version, at least.
> > >
> > > Maybe we could also package 0.6 with a package 'python-pypump-0.6'
> > > that inherits from python-pypump. Or, you could keep that inherited
> > > python-pypump-0.6 in a private package repo, and use
> > > GUIX_PACKAGE_PATH.
> > >
> > > I'd prefer the latter option. I don't think we have a precedent of
> > > adding old releases, although we do sometimes keep them around for
> > > compatibility. But I could be mistaken.
> > >
> > > What do people think we should do?
> >
> > Yes I agree with the second alternative as well.
>
> Okay, will you send a patch for it?
>
I tried to apply the original patch but it failed. Can you send an
updated patch set? I've also included the pypump-0.7 patch that I wrote.
I have no real way to test it, but maybe you do.
--
Efraim Flashner <efr...@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
From 584228d422f8b3ddfda6f04486e1360d7b4820aa Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efr...@flashner.co.il>
Date: Sun, 24 Jul 2016 18:00:25 +0300
Subject: [PATCH 2/2] gnu: Add python-pypump.
* gnu/packages/pumpio.scm (python-pypump): New variable.
---
gnu/packages/pumpio.scm | 39 +++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm
index a74d474..f834884 100644
--- a/gnu/packages/pumpio.scm
+++ b/gnu/packages/pumpio.scm
@@ -23,7 +23,9 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (gnu packages aspell)
+ #:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages web))
@@ -66,3 +68,40 @@
(description "Pumpa is a simple pump.io client written in C++ and Qt.")
(home-page "https://pumpa.branchable.com/;)
(license gpl3+)))
+
+(define-public python-pypump
+ (package
+(name "python-pypump")
+(version "0.7")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "PyPump" version))
+(sha256
+ (base32
+ "0100b8r76hwh4lbiwb2dji6jccpi4hgi2ns7qdgb3lwfidnya3ha"
+(build-system python-build-system)
+(arguments `(#:tests? #f)) ; FIXME: can't find test directory.
+(inputs
+ `(("python-dateutil-2" ,python-dateutil-2)
+ ("python-requests" ,python-requests)
+ ("python-requests-oauthlib" ,python-requests-oauthlib)))
+(home-page "https://github.com/xray7224/PyPump;)
+(synopsis "Python Pump.io library")
+(description "Python Pump.io library")
+(license gpl3+)
+(properties `((python2-variant . ,(delay python2-pypump))
+
+(define-public python2-pypump
+ (let ((pypump (package-with-python2
+ (strip-python2-variant python-pypump
+(package (inherit pypump)
+ (inputs
+ `(("python2-ndg-httpsclient" ,python2-ndg-httpsclient)
+ ("python2-pyasn1" ,python2-pyasn1)
+ ("python2-pyopenssl" ,python2-pyopenssl)
+ ,@(package-inputs pypump)))
+ (native-inputs
+ `(("python2-mock" ,python2-mock)
+ ("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs pypump))
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH] Patchseries: perl-www-opensearch and dependencies.
On Thu, Aug 18, 2016 at 11:09:23AM +, ng0 wrote: > Hi, > > Eric Bavier <ericbav...@openmailbox.org> writes: > > > On Sun, 14 Aug 2016 17:19:10 + > > ng0 <n...@we.make.ritual.n0.is> wrote: > > > >> This patch series adds perl-www-opensearch and the 13 patches leading to > >> it (the dependencies). > > > > Thanks for all the patches! Comments dispersed throughtout: > > > >> > [...] > > > > Otherwise LGTM! > > > > `~Eric > > Thanks for reviewing. All the problems are addressed, and some > additional changes to move comments when no test can be run are moved to > save lines. > > > -- > ng0 > For non-prism friendly talk find me on http://www.psyced.org Patches pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: vlc: Add inputs.
On Sat, Sep 03, 2016 at 06:15:48PM +0200, David Craven wrote: > Hi Alex, > > I'm not sure we need all those dependencies =) Can you explain what > they are for? If you are adding dependencies to vlc why did you leave > libinput-minimal off the list? ;) > > > 3. Our vlc was built with fast-math disabled as explained in the > > comment. However, this is actually not necessary, vlc would built with > > '-ffast-math -fno-finite-math-only'. > > This should probably be a separate patch, and will probably have a > easier path to master... > > Thanks! > also check the closure size with and without samba. A long time ago we removed samba from mpv and it drastically slimmed down the size of the closure. IIRC it meant we could no longer do `mpv smb://...' -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: lua-5.1: install pkg-config file.
quot;
> ++@echo "TO_PC = $(TO_PC)"
> + @echo "TO_MAN = $(TO_MAN)"
> +
> + # echo config parameters as Lua code
> +@@ -122,7 +133,29 @@
> + @$(MAKE) echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/'
> + @echo "-- EOF"
> +
> ++pc:
> ++@echo 'prefix=$(INSTALL_TOP)'
> ++@echo 'libdir=$(INSTALL_LIB)'
> ++@echo 'includedir=$(INSTALL_INC)'
> ++@echo 'bindir=$(INSTALL_BIN)'
> ++@echo
> ++@echo 'INSTALL_LMOD=$(INSTALL_LMOD)'
> ++@echo 'INSTALL_CMOD=$(INSTALL_CMOD)'
> ++@echo 'INTERPRETER=$${bindir}/$(INTERPRETER)'
> ++@echo 'COMPILER=$${bindir}/$(COMPILER)'
> ++@echo
> ++ @echo 'Name: Lua'
> ++@echo 'Description: A powerful, fast, lightweight, embeddable scripting
> language'
> ++@echo 'Version: $(R)'
> ++@echo
> ++@echo 'Libs: -L$${libdir} -llua -lm'
> ++@echo 'Cflags: -I$${includedir}'
> ++
> ++pkg-config: $(TO_PC)
> ++$(TO_PC):
> ++@$(MAKE) -s pc > $@
> ++
> + # list targets that do not create files (but not all makes understand
> .PHONY)
> +-.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
> ++.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
> pkg-config
> +
> + # (end of Makefile)
I don't want this patch to get lost. What is the status of this patch?
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] scripts: hash: Add --exclude-.git option.
On Mon, Sep 05, 2016 at 01:36:43PM +0200, Jan Nieuwenhuizen wrote: > Vincent Legoll writes: > > >> Added an -g/--exclude-.git option for guix hash. It is very specific: > >> it skips toplevel .git directory. WDYT? > > > > I'd rather name it "--exclude-git" or something less strange than > > --exclude-.git, > > even --exclude-dot-git... > > >> What about make i the default? > > > > OK with defaulting > > Drop the option altogether, or make it --include-git? > > Greetings, > Jan > Can this be generalized? `grep \\-download\) gnu/packages/*scm' shows also svn-download, cvs-download and a lone hg-download. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: 01/01: gnu: qemu: Update to 2.7.0 [fixes CVE-2016-7116].
= wiggle): (382597824 <= 2)
> ;; Simply disable the tests.
> (arguments `(#:tests? #f
> - ,@(package-arguments qemu-minimal)))
> + ,@(substitute-keyword-arguments (package-arguments
> qemu-minimal)
> + ((#:phases phases)
> + `(modify-phases ,phases
> + ;; The filename changed in qemu@2.7.0.
> + (replace 'disable-test-qga
> + (lambda _
> + (substitute* "tests/Makefile"
> + (("check-unit-.* tests/test-qga" all)
> +(string-append "# " all)))
> + #t)))
>
> ;; The manual fails to build with Texinfo 5.x.
> (native-inputs (alist-delete "texinfo" (package-native-inputs qemu)
> --
> 2.10.0
>
I pushed a fix to remove the 'disable-test-qga phase, since in all these
cases we already had #:tests? #f.
At the same time I pushed an update to orc, which caused
gst-plugins-good on i686-linux to be rebuilt, which FTBFS
non-deterministically, and should account for some of the i686 packages
not seeming to be fixed.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH][v2] gnu: Add perl-curses
On Fri, Aug 19, 2016 at 01:36:27PM +, ng0 wrote:
> Okay, when I build this without "FORMS" it succeeds. Works for me.
>
> From a72020974650298e89b82abda8e07f722f7cf32c Mon Sep 17 00:00:00 2001
> From: ng0 <n...@we.make.ritual.n0.is>
> Date: Fri, 19 Aug 2016 13:13:42 +
> Subject: [PATCH 1/2] gnu: Add perl-curses.
>
> * gnu/packages/perl.scm (perl-curses): New variable.
> ---
> gnu/packages/perl.scm | 52
> +++
> 1 file changed, 52 insertions(+)
>
> diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
> index aef92f4..170eacd 100644
> --- a/gnu/packages/perl.scm
> +++ b/gnu/packages/perl.scm
> @@ -30,6 +30,7 @@
> (define-module (gnu packages perl)
>#:use-module (guix licenses)
>#:use-module (gnu packages)
> + #:use-module (gnu packages ncurses)
>#:use-module (guix packages)
>#:use-module (guix download)
>#:use-module (guix build-system gnu)
> @@ -1138,6 +1139,57 @@ contained in Appendix A of FIPS Publication 181,
> \"Standard for Automated
> Password Generator\".")
> (license (package-license perl
>
> +(define-public perl-curses
> + (package
> +(name "perl-curses")
> +(version "1.36")
> +(source (origin
> + (method url-fetch)
> + (uri (string-append "mirror://cpan/authors/id/G/GI/GIRAFFED/"
> + "Curses-" version ".tar.gz"))
> + (sha256
> + (base32
> +"0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"
> +(build-system perl-build-system)
> +(inputs
> + `(("ncurses" ,ncurses)))
> +(arguments
> + `(#:make-maker-flags (list "PANELS" "MENUS") ; FORMS seems faulty.
> + #:phases
> + (modify-phases %standard-phases
> + (add-before 'configure 'set-curses-ldflags
> + (lambda* (#:key inputs #:allow-other-keys)
you'd do well with a (let ... here for all of your (assoc-ref inputs "ncurses").
> + (setenv "CURSES_LIBTYPE" "ncurses")
> + (setenv "CURSES_CFLAGS"
> + (string-append "-I" (assoc-ref inputs "ncurses")
> +"/include"))
> + (setenv "CURSES_PANEL_CFLAGS"
> + (string-append "-I" (assoc-ref inputs "ncurses")
> +"/include"))
> + (setenv "CURSES_MENU_CFLAGS"
> + (string-append "-I" (assoc-ref inputs "ncurses")
> +"/include"))
> + (setenv "CURSES_FORM_CFLAGS"
> + (string-append "-I" (assoc-ref inputs "ncurses")
> +"/include"))
> + (setenv "CURSES_LDFLAGS"
> + (string-append "-L" (assoc-ref inputs "ncurses")
> +"/lib -lncurses"))
> + (setenv "CURSES_PANEL_LDFLAGS"
> + (string-append "-L" (assoc-ref inputs "ncurses")
> +"/lib -lpanel"))
> + (setenv "CURSES_MENU_LDFLAGS"
> + (string-append "-L" (assoc-ref inputs "ncurses")
> +"/lib -lmenu"))
> + (setenv "CURSES_FORM_LDFLAGS"
> + (string-append "-L" (assoc-ref inputs "ncurses")
> +"/lib -lform")))
> +(home-page "http://search.cpan.org/dist/Curses;)
> +(synopsis "Terminal screen handling and optimization")
> +(description
> + "@code{Curses} is the interface between Perl and the curses library of
> your system.")
> +(license (package-license perl
> +
> (define-public perl-czplib
>(package
> (name "perl-czplib")
> --
> 2.9.3
>
I think this would go better in ncurses.scm than in perl. Can you send
an updated patch? Thanks.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] gnu: lua-5.1: install pkg-config file.
On Tue, Sep 06, 2016 at 02:40:46PM +0200, Danny Milosavljevic wrote: > Hi, > > it works for me (and has been adapted from the newer lua's patch where it > also worked) and it's necessary for celestia. > > No idea why it's still pending... Patch pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH 1/1] Go: Update to 1.7
On Sat, Aug 20, 2016 at 12:20:30PM +0200, Petter wrote: > On 2016-08-20 02:07, Leo Famulari wrote: > > On Wed, Aug 17, 2016 at 10:54:36AM -0500, Alex Griffin wrote: > > > Thanks for contributing! Your changes work for me, but it looks like > > > your mail client mangled the formatting of your patch. So I produced a > > > good patch with your changes, and added a copyright line and commit > > > message for you. Hopefully that will make it easier for someone with > > > commit access to look it over. > > > > > > -- > > > Alex Griffin > > > > > From f2f28e088f2a3f833251c2b31de7e6f531bcdf9a Mon Sep 17 00:00:00 2001 > > > From: Petter <pet...@mykolab.ch> > > > Date: Wed, 17 Aug 2016 10:27:04 -0500 > > > Subject: [PATCH] gnu: go: Update to 1.7. > > > > > > * gnu/packages/golang.scm (go-1.6): Update to 1.7, with corresponding > > > minor changes to prebuild phase, and rename variable to... > > > (go-1.7): ...this new variable. > > > (go): Inherit from new "go-1.7". > > > > I have a working Syncthing [0] on x86_64 with this patch. > > > > Good, my testing on a couple of small programs have been successful as well. > > > I noticed this during the test suite: > > > > # ../misc/cgo/testsanitizers > > skipping msan tests: -fsanitize=memory not supported > > gcc: error: -fsanitize=thread linking must be done with -pie or -shared > > skipping tsan tests: -fsanitizer=thread build failed > > > > I don't know whether or not that's a problem. > > > > Good catch, I did not notice this. > > It could be an error by the Go team, ref: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703230 > > I don't know though if it would be correct for us in that case to add -fPIC > to this call if that would solve it. > > > [0] WIP branch: > > https://github.com/lfam/guix/commits/contrib-syncthing > > > > > ;;; Copyright ?? 2016 Matthew Jordan <matthewjordandev...@yandex.com> > > > ;;; Copyright ?? 2016 Andy Wingo <wi...@igalia.com> > > > ;;; Copyright ?? 2016 Ludovic Court??s <l...@gnu.org> > > > +;;; Copyright ?? 2016 Petter <pet...@mykolab.ch> > > > > Petter, I noticed your original patch did not add a line like this. > > Please confirm the name and email address you'd prefer to use. > > Pseudoynms are fine. > > Alex got it right, this is the name and e-mail address I want to use. > Patch pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: "move-phase-after"?
On Tue, Sep 06, 2016 at 10:03:34AM +0200, Hartmut Goebel wrote: > Hi, > > for some package I need to switch the install and check phase. Could > please someone point me to a function like "move-phase-after"? Thanks. > Check out python-cysignals in python.scm for mixing build systems. I know I've seen something else for moving 'check after 'install. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: scribus: Update to 1.5.2.
On Tue, Sep 06, 2016 at 05:09:07PM +0200, Hartmut Goebel wrote: > * gnu/packages/scribus.scm (scribus): Update to 1.5.2. > --- > gnu/packages/scribus.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm > index 72f3c57..d48051e 100644 > --- a/gnu/packages/scribus.scm > +++ b/gnu/packages/scribus.scm > @@ -40,14 +40,14 @@ > (define-public scribus >(package > (name "scribus") > -(version "1.5.1") > +(version "1.5.2") > (source (origin >(method url-fetch) >(uri (string-append > "mirror://sourceforge/scribus/scribus-devel/" >version "/scribus-" version ".tar.xz")) >(sha256 > (base32 > -"0f2adwg58w37sdi3xrk8xqw486p3pcfjaypcsswjl76r2f3yd0hq" > +"1xbl7h4x32y2nfhn57ivjziyvlnwadcbizqwfqx5srfsmqiyqppc")))) > (build-system cmake-build-system) > (arguments > `(#:tests? #f ; no test target > -- > 2.7.4 > Patch pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add gzstream.
On Wed, Aug 31, 2016 at 01:53:59PM +0100, Marius Bakke wrote:
> Eric Bavier <ericbav...@openmailbox.org> writes:
>
> > Thanks for the patch! Comments below:
> >
> > On Tue, 30 Aug 2016 19:17:14 +0100
> > Marius Bakke <mba...@fastmail.com> wrote:
> >
> >> From 5e96b895c1ed77a6bfdcbe5c6dbd68220fd5a8dc Mon Sep 17 00:00:00 2001
> >> From: Marius Bakke <m.ba...@warwick.ac.uk>
> >> Date: Fri, 12 Aug 2016 02:29:51 +0100
> >> Subject: [PATCH 1/1] gnu: Add gzstream.
> >>
> >> * gnu/packages/compression.scm (gzstream): New variable.
> >> ---
> >> [...]
> >> +(source (origin
> >> + (method url-fetch)
> >> + (uri
> >> + ;; No versioned URL, but last release was in 2003.
> >> +
> >> "http://www.cs.unc.edu/Research/compgeom/gzstream/gzstream.tgz;)
> >> + (file-name (string-append name "-" version ".tar.gz"))
> >> + (sha256
> >> + (base32
> >> +"00y19pqjsdj5zcrx4p9j56pl73vayfwnb7y2hvp423nx0cwv5b4r"
> >
> > There's a gzstream.o file in the tarball. Could you remove it an origin
> > snippet?
> >
> >> [...]
> >> +(home-page "http://www.cs.unc.edu/Research/compgeom/gzstream/;)
> >> +(synopsis "C++ library that provides the functionality of zlib in a
> >> C++ iostream")
> >
> > Maybe: "Compressed C++ iostream"
> >
> >> +(description "gzstream is a small library for providing zlib
> >> functionality in a C++
> >> +iostream. It is basically just a wrapper.")
> >
> > The second sentence may be left off, IMO.
> >
> >> +(license license:lgpl2.1)))
> > ^
> > This should be lgpl2.1+ because of the "or later" in the file headers.
> >
> > Could you send an updated patch?
>
> Hi Eric,
>
> Thanks for the quick feedback! Correct on all accounts.
>
> Updated patch below.
>
> From a8aae7f44289c75f67f2bea1046206f79acbdbdb Mon Sep 17 00:00:00 2001
> From: Marius Bakke <m.ba...@warwick.ac.uk>
> Date: Fri, 12 Aug 2016 02:29:51 +0100
> Subject: [PATCH] gnu: Add gzstream.
>
> * gnu/packages/compression.scm (gzstream): New variable.
> ---
> gnu/packages/compression.scm | 39 +++
> 1 file changed, 39 insertions(+)
>
> diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
> index c239d16..3f60c5b 100644
> --- a/gnu/packages/compression.scm
> +++ b/gnu/packages/compression.scm
> @@ -12,6 +12,7 @@
> ;;; Copyright © 2016 Danny Milosavljevic <dan...@scratchpost.org>
> ;;; Copyright © 2016 Tobias Geerinckx-Rice <m...@tobias.gr>
> ;;; Copyright © 2016 David Craven <da...@craven.ch>
> +;;; Copyright © 2016 Marius Bakke <mba...@fastmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -895,3 +896,41 @@ compared to the fastest mode of zlib, Snappy is an order
> of magnitude faster
> for most inputs, but the resulting compressed files are anywhere from 20% to
> 100% bigger.")
> (license license:asl2.0)))
> +
> +(define-public gzstream
> + (package
> +(name "gzstream")
> +(version "1.5")
> +(source (origin
> + (method url-fetch)
> + (uri
> + ;; No versioned URL, but last release was in 2003.
> +
> "http://www.cs.unc.edu/Research/compgeom/gzstream/gzstream.tgz;)
> + (file-name (string-append name "-" version ".tar.gz"))
> + (sha256
> + (base32
> +"00y19pqjsdj5zcrx4p9j56pl73vayfwnb7y2hvp423nx0cwv5b4r"))
> + (modules '((guix build utils)))
> + (snippet
> + ;; Remove pre-compiled object.
> + '(delete-file "gzstream.o"
> +(build-system gnu-build-system)
> +(arguments
> + `(#:test-target "test"
> + #:phases
> + (modify-phases %standard-phases
> + (delete 'configure)
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> +(lib (string-append out "/lib"))
> +(include (string-append out "/include")))
> + (install-file "libgzstream.a" lib)
> + (install-file "gzstream.h" include)
> + #t))
> +(propagated-inputs `(("zlib" ,zlib)))
> +(home-page "http://www.cs.unc.edu/Research/compgeom/gzstream/;)
> +(synopsis "Compressed C++ iostream")
> +(description "gzstream is a small library for providing zlib
> +functionality in a C++ iostream.")
> +(license license:lgpl2.1+)))
> --
> 2.9.3
>
Patch pushed!
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 1/7] gnu: lua: Build with support for dynamic libraries.
On Tue, Aug 30, 2016 at 10:44:24AM +0200, gno wrote: > > (damn, i keep forgetting adding guix devel to CC) > I just hit 'reply-all' and hope it works. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] import: hackage: default to https urls.
On Tue, Aug 30, 2016 at 01:17:37PM +, ng0 wrote: > ng0 <n...@we.make.ritual.n0.is> writes: > > > This patch updates the hackage importer so that `guix import hackage > > name' writes out a package definition which includes > > https://hackage.haskell.org by default. The home-page field was not > > fixed, but this is less important than the download. > > I know that tls/ssl itself has a problem, but some people can't just use > > tor, so the default should be to use tls when available at the source. > > > > From 07809dea5ea3b2bddad67c8f14f512ab40e42817 Mon Sep 17 00:00:00 2001 > > From: ng0 <n...@we.make.ritual.n0.is> > > Date: Tue, 30 Aug 2016 12:08:21 + > > Subject: [PATCH 1/2] import: hackage: default to https urls. > > For the commiter, could you be so kind and change "default" to > "Default"? thanks. > > ng0 > For non-prism friendly talk find me on http://www.psyced.org > Patch pushed -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add p7zip.
On Thu, Sep 01, 2016 at 03:05:34PM -0400, Kei Kebreau wrote: > Ricardo Wurmus <rek...@elephly.net> writes: > > > Kei Kebreau <k...@openmailbox.org> writes: > > > >> Ricardo Wurmus <rek...@elephly.net> writes: > >> > >>> Kei Kebreau <k...@openmailbox.org> writes: > >>> > >>>> Whoops, last patch was a bit messy and stacked on the previous one. This > >>>> patch should be better! > >>> > >>> I just wanted to push a slightly modified version of this (attached) but > >>> I cannot actually build the package. The patch to remove unused code > >>> does not apply due to different line endings. > >>> > >>> Could you please take a look at this again and make sure that the patch > >>> to the sources applies? > >>> > >>> ~~ Ricardo > >>> > >> I just tried it on my machine, and everything applied and built > >> correctly from a clean Guix tree. I don't exactly know how to proceed > >> From here. Perhaps a third party can try to build from the patch? > > > > The problem might be with the inline patch in the email. Don’t know. > > > > ~~ Ricardo > > I'll try sending it again, for lack of a better plan. If all else fails > I can post it on paste.lisp.org. patching file C/Sha1.c patching file C/Sha1.h patching file CPP/7zip/Archive/7z/7zUpdate.cpp patching file CPP/7zip/Bundles/Format7zFree/makefile.list patching file CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt patching file CPP/7zip/Crypto/Sha1Cls.h patching file CPP/7zip/Guid.txt patching file CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro patching file CPP/7zip/QMAKE/all.pro patching file CPP/7zip/UI/Client7z/Client7z.cpp patching file CPP/7zip/UI/Common/LoadCodecs.h patching file CPP/7zip/UI/Common/OpenArchive.cpp patching file CPP/7zip/UI/FileManager/FM_rc.cpp patching file CPP/ANDROID/Format7zFree/jni/Android.mk patching file ChangeLog patching file DOC/License.txt patching file DOC/MANUAL/cmdline/switches/update.htm Hunk #1 FAILED at 139 (different line endings). 1 out of 1 hunk FAILED -- saving rejects to file DOC/MANUAL/cmdline/switches/update.htm.rej patching file DOC/MANUAL/general/formats.htm Hunk #1 FAILED at 47 (different line endings). 1 out of 1 hunk FAILED -- saving rejects to file DOC/MANUAL/general/formats.htm.rej patching file DOC/Methods.txt patching file DOC/readme.txt patching file DOC/src-history.txt patching file GUI/Contents/Info.plist patching file README patching file Utils/bin_to_sources.py patching file Utils/file_7z_so.py patching file Utils/generate.py patching file contrib/qnx630sp3/qnx630sp3-shared patching file makefile patching file makefile.oldmake patching file makefile.qnx_shared.so source is under 'p7zip_16.02' applying '/gnu/store/ypyc1ar3iajzslgn9zbx1vjm7b1ljfq9-p7zip-remove-unused-code.patch'... builder for `/gnu/store/hbijqwhsvzaknxkrv7pgylnj0a3qsdjw-p7zip_16.02_src_all.tar.xz.drv' failed to produce output path `/gnu/store/c704yy8fn1sb7ikn7q74nd0hkjfj12bx-p7zip_16.02_src_all.tar.xz' -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: 02/02: gnu: gsl: Update to 2.2.
That's what we found on irc also when we tried it On September 2, 2016 10:16:59 AM GMT+03:00, Alex Sassmannshausen <alex.sassmannshau...@gmail.com> wrote: > >Mark H Weaver writes: > >> efr...@flashner.co.il (Efraim Flashner) writes: >> >>> efraim pushed a commit to branch master >>> in repository guix. >>> >>> commit b16b16e6c2ba9780ebdf936c325e06ebcc0a950b >>> Author: Efraim Flashner <efr...@flashner.co.il> >>> Date: Tue Aug 30 00:33:17 2016 +0300 >>> >>> gnu: gsl: Update to 2.2. >>> >>> * gnu/packages/maths.scm (gsl): Update to 2.2. >> >> FYI, I reverted this, because its test suite consistently fails on >i686 >> with errors that appear to indicate a genuine problem. Gsl is an >> important package that many other packages depend on, e.g. inkscape, >> which is needed to convert our grub background, and therefore we have >> been unable to build i686 systems since this update. > >Fwiw, GSL have released a new version 2.2.1, which aimed to revert >changes to cholesky_decomp for backward compatibility (if I understand >correctly). I tested the updated version locally on i686, >unfortunately >the problem for i686 persists. > >Alex -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH] gnu: Add p7zip.
On September 2, 2016 2:51:03 PM GMT+03:00, Ricardo Wurmus <ricardo.wur...@mdc-berlin.de> wrote: > >Efraim Flashner <efr...@flashner.co.il> writes: > >> On Thu, Sep 01, 2016 at 03:05:34PM -0400, Kei Kebreau wrote: >>> Ricardo Wurmus <rek...@elephly.net> writes: >>> >>> > Kei Kebreau <k...@openmailbox.org> writes: >>> > >>> >> Ricardo Wurmus <rek...@elephly.net> writes: >>> >> >>> >>> Kei Kebreau <k...@openmailbox.org> writes: >>> >>> >>> >>>> Whoops, last patch was a bit messy and stacked on the previous >one. This >>> >>>> patch should be better! >>> >>> >>> >>> I just wanted to push a slightly modified version of this >(attached) but >>> >>> I cannot actually build the package. The patch to remove unused >code >>> >>> does not apply due to different line endings. >>> >>> >>> >>> Could you please take a look at this again and make sure that >the patch >>> >>> to the sources applies? >>> >>> >>> >>> ~~ Ricardo >>> >>> >>> >> I just tried it on my machine, and everything applied and built >>> >> correctly from a clean Guix tree. I don't exactly know how to >proceed >>> >> From here. Perhaps a third party can try to build from the patch? >>> > >>> > The problem might be with the inline patch in the email. Don’t >know. >>> > >>> > ~~ Ricardo >>> >>> I'll try sending it again, for lack of a better plan. If all else >fails >>> I can post it on paste.lisp.org. > >> Hunk #1 FAILED at 139 (different line endings). >[...] >> Hunk #1 FAILED at 47 (different line endings). > >These are the exact same errors I got. Maybe the line endings were >converted automatically when you saved the patch with your editor? > >~~ Ricardo I opened the mail with mutt, passed the patch to "cd workspace/guix; git am", which is my normal workflow -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH 1/2] gnu: man-db: Use modify-phases syntax.
On Wed, Sep 07, 2016 at 10:47:06AM +0200, Ricardo Wurmus wrote:
> * gnu/packages/man.scm (man-db)[arguments]: Use modify-phases syntax.
> ---
> gnu/packages/man.scm | 25 -
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
> index 9ffbba9..a5ee2d3 100644
> --- a/gnu/packages/man.scm
> +++ b/gnu/packages/man.scm
> @@ -1,7 +1,7 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright © 2012, 2014, 2015 Ludovic Courtès <l...@gnu.org>
> ;;; Copyright © 2014 David Thompson <dthomps...@worcester.edu>
> -;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net>
> +;;; Copyright © 2015, 2016 Ricardo Wurmus <rek...@elephly.net>
> ;;; Copyright © 2015 Alex Kost <alez...@gmail.com>
> ;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
> ;;;
> @@ -69,18 +69,17 @@ a flexible and convenient way.")
> (build-system gnu-build-system)
> (arguments
> '(#:phases
> - (alist-cons-after
> -'patch-source-shebangs 'patch-test-shebangs
> -(lambda* (#:key outputs #:allow-other-keys)
> - ;; Patch shebangs in test scripts.
> - (let ((out (assoc-ref outputs "out")))
> -(for-each (lambda (file)
> -(substitute* file
> - (("#! /bin/sh")
> - (string-append "#!" (which "sh")
> - (remove file-is-directory?
> - (find-files "src/tests" ".*")
> -%standard-phases)
> + (modify-phases %standard-phases
> + (add-after 'patch-source-shebangs 'patch-test-shebangs
> + (lambda* (#:key outputs #:allow-other-keys)
> + ;; Patch shebangs in test scripts.
> + (let ((out (assoc-ref outputs "out")))
> + (for-each (lambda (file)
> + (substitute* file
> + (("#! /bin/sh")
> + (string-append "#!" (which "sh")
> + (remove file-is-directory?
> + (find-files "src/tests" ".*")))
> #:configure-flags
> (let ((groff (assoc-ref %build-inputs "groff"))
> (less (assoc-ref %build-inputs "less"))
> --
> 2.9.2
>
The patches look good to me. Also my quick test didn't show it causing
mass rebuilds.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCHv2 2/2] gnu: Add sway.
On Sat, Aug 27, 2016 at 08:17:10PM +0200, Tomáš Čech wrote:
> * gnu/packages/freedesktop.scm(sway): New variable.
> ---
> gnu/packages/freedesktop.scm | 44
>
> 1 file changed, 44 insertions(+)
here you're missing the patch and registering it in gnu/local.mk
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index 0bb87e7..fec7cf5 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -35,6 +35,7 @@
>#:use-module (gnu packages gnome)
>#:use-module (gnu packages python)
>#:use-module (gnu packages pth)
> + #:use-module (gnu packages pcre)
>#:use-module (gnu packages linux)
>#:use-module (gnu packages pkg-config)
>#:use-module (gnu packages autotools)
> @@ -56,6 +57,7 @@
>#:use-module (gnu packages admin)
>#:use-module (gnu packages polkit)
>#:use-module (gnu packages databases)
> + #:use-module (gnu packages web)
>#:use-module (gnu packages xdisorg))
>
> (define-public xdg-utils
> @@ -686,3 +688,45 @@ wish to perform colour calibration.")
> "This is wayland compositor library used by several projects like sway,
> orbment or Gram.")
> (license license:x11)))
> +
> +(define-public sway
> + (package
> +(name "sway")
> +(version "0.9")
> +(source (origin
> + (method url-fetch)
> + (uri (string-append
> +"https://github.com/SirCmpwn/; name "/archive/"
> +version ".tar.gz"))
> + (sha256
> + (base32
> +"0bgli7scjlvbgas09dx5fnncgda41ssba6fzkw2vyk88pmdgx66w"))
here you need a (file-name
> + (patches (list (search-patch "sway-debug.patch")
> +(build-system cmake-build-system)
> +(arguments
> + '(#:configure-flags '("-DVERBOSE=1")
I don't think it takes this configure flag.
> + #:tests? #f)) ; no 'check' target
> +(native-inputs
> + `(("gdk-pixbuf" ,gdk-pixbuf)
> + ("libxslt" ,libxslt)
> + ("pkg-config" ,pkg-config)
> + ("wayland" ,wayland)))
> +(inputs
> + `(("asciidoc" ,asciidoc)
> + ("cairo" ,cairo)
> + ("docbook-xml" ,docbook-xml)
> + ("docbook-xsl" ,docbook-xsl)
> + ("gdk-pixbuf" ,gdk-pixbuf)
> + ("json-c" ,json-c)
> + ("libinput" ,libinput)
> + ("libxkbcommon" ,libxkbcommon)
> + ("linux-pam" ,linux-pam)
> + ("pango" ,pango)
> + ("pcre" ,pcre)
> + ("wlc" ,wlc)))
asciidoc. docbook-* can be native-inputs
> +(synopsis "Window manager for Wayland, compatible with i3")
> +(home-page "https://github.com/SirCmpwn/sway;)
> +(description
> + "SirCmpwn's WAYland window manager is work-in-progress i3-compatible
> +tiling window manager.")
> +(license license:x11)))
> --
> 2.9.2
>
>
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add pybitmessage, [PATCH] gnu: Add python2-pyqt-4, [PATCH] gnu: gnu: messaging: Use license: prefix.
On Thu, Aug 25, 2016 at 09:52:22AM +, ng0 wrote:
> ng0 <n...@we.make.ritual.n0.is> writes:
>
> > These 3 patches enable us to have a functional pybitmessage version
> > 0.6.1, released 2 days ago.
> >
> > For tests you can use either the test channel which can be found on
> > bitmessage.org (or in the application itself? I don't know, I'm no
> > newcomer to this application) or the channel I did setup a while ago
> > (blame my window manager if there's a typo, the copy & paste is
> > sometimes stuck):
> > BM-2cTPsDEX29yRnrAmyfwZhC3RySsK4wnQUA
> > [chan] gnuguixchan
> >
>
> Just a thought to change the description a tiny bit when someone
> packages another bitmessage client: This is the implementation as found
> on bitmessage.org, but it is not the only implementation.
> --
> ng0
> For non-prism friendly talk find me on http://www.psyced.org
>
I've rebased the patches and applied some '#t' to some of the phases. If
anyone else would like to test them out or comment, they look ready to
me to be pushed.
--
Efraim Flashner <efr...@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
From 2a34dccb32340772b91b4e6b6340dcbddad3175b Mon Sep 17 00:00:00 2001
From: ng0 <n...@we.make.ritual.n0.is>
Date: Tue, 23 Aug 2016 10:13:59 +
Subject: [PATCH 1/3] gnu: Add python2-pyqt-4.
* gnu/packages/qt.scm (python2-pyqt-4): New variable.
Signed-off-by: Efraim Flashner <efr...@flashner.co.il>
---
gnu/packages/qt.scm | 10 ++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 95690fa..a482d75 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzs...@gmail.com>
;;; Copyright © 2015 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
+;;; Copyright © 2016 ng0 <n...@we.make.ritual.n0.is>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1069,6 +1070,15 @@ contain over 620 classes.")
%standard-phases)))
(license (list license:gpl2 license:gpl3 ; choice of either license
+(define-public python2-pyqt-4
+ (package (inherit python-pyqt-4)
+ (name "python2-pyqt-4")
+ (native-inputs
+`(("python-sip" ,python2-sip)
+ ("qt" ,qt-4)))
+ (inputs
+`(("python" ,python-2)
+
(define-public qtkeychain
(package
(name "qtkeychain")
--
2.10.0
From c528659cd5291d7d154ce40e2d9125cf2b1d747f Mon Sep 17 00:00:00 2001
From: ng0 <n...@we.make.ritual.n0.is>
Date: Tue, 23 Aug 2016 11:07:17 +
Subject: [PATCH 2/3] gnu: messaging: Use license: prefix.
* gnu/packages/disk.scm (define-module): Import guix licenses with a prefix.
(libotr): Use the license prefix.
(bitlbee): Likewise.
(hexchat): Likewise.
(ngircd): Likewise.
(pidgin): Likewise.
(pidgin-otr): Likewise.
(znc): Likewise.
(python-nbxmpp): Likewise.
(gajim): Likewise.
(prosody): Likewise.
(libtoxcore): Likewise.
Signed-off-by: Efraim Flashner <efr...@flashner.co.il>
---
gnu/packages/messaging.scm | 34 --
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b95239a..c584eaf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -23,9 +23,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages messaging)
- #:use-module ((guix licenses)
-#:select (gpl3+ gpl2+ gpl2 lgpl2.1 lgpl2.0+ bsd-2 non-copyleft
- asl2.0 x11))
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
@@ -95,7 +93,7 @@ correspondent is assured the messages he sees are authentic
and
unmodified. (4) Perfect forward secrecy: If you lose control of your private
keys, no previous conversation is compromised.")
(home-page "https://otr.cypherpunks.ca/;)
-(license (list lgpl2.1 gpl2
+(license (list license:lgpl2.1 license:gpl2
;; These patches together fix https://github.com/bitlbee/bitlbee/pull/55, are
;; already upstream, and should be unnecessary when the next bitlbee comes
@@ -159,7 +157,7 @@ Google Talk), MSN Messenger, Yahoo! Messenger, AIM and
ICQ, and the Twitter
microblogging network (plus all other Twitter API compatible services like
identi.ca and status.net).")
(home-page "http://www.bitlbee.org/;)
-(license (list gpl2+ bsd-2
+(license (list license:gpl2+ license:bsd-2
(define-public hexchat
(package
@@ -193,7 +191,7 @@ conver
Re: [PATCHv2 1/2] gnu: Add wlc.
On Sat, Aug 27, 2016 at 08:17:09PM +0200, Tomáš Čech wrote:
> * gnu/packages/freedesktop.scm(wlc): New variable.
> * gnu/packages/patches/wlc-implement-wlc_view_get_pid.patch: Add it
> * gnu/local.mk: Add entry for patch above.
there's no patch attached
> ---
> gnu/packages/freedesktop.scm | 41 -
> 1 file changed, 40 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index 67f1e1a..0bb87e7 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -27,10 +27,14 @@
>#:use-module (guix packages)
>#:use-module (guix download)
>#:use-module (guix git-download)
> + #:use-module (guix build-system cmake)
>#:use-module (guix build-system gnu)
>#:use-module (guix build-system python)
> + #:use-module (gnu packages)
> + #:use-module (gnu packages gl)
>#:use-module (gnu packages gnome)
>#:use-module (gnu packages python)
> + #:use-module (gnu packages pth)
>#:use-module (gnu packages linux)
>#:use-module (gnu packages pkg-config)
>#:use-module (gnu packages autotools)
> @@ -51,7 +55,8 @@
>#:use-module (gnu packages acl)
>#:use-module (gnu packages admin)
>#:use-module (gnu packages polkit)
> - #:use-module (gnu packages databases))
> + #:use-module (gnu packages databases)
> + #:use-module (gnu packages xdisorg))
>
> (define-public xdg-utils
>(package
> @@ -647,3 +652,37 @@ different sorts of messages in different formats.")
> useful for both applications which need colour management and applications
> that
> wish to perform colour calibration.")
> (license license:lgpl2.1+)))
> +
> +(define-public wlc
> + (package
> +(name "wlc")
> +(version "0.0.5")
> +(source (origin
> + (method url-fetch)
> + (uri (string-append
> +"https://github.com/Cloudef/; name "/releases/download/v"
> +version "/" name "-" version ".tar.bz2"))
> + (sha256
> + (base32
> +"0dmiklis820qzin74f16bmbz1jkjy93r5mix8cqbcqpb9f7qxahp"
> +(build-system cmake-build-system)
> +(native-inputs
> + `(("pkg-config" ,pkg-config)))
> +(inputs
> + `(("libinput" ,libinput)
> + ("libx11" ,libx11)
> + ("libxkbcommon" ,libxkbcommon)
> + ("mesa" ,mesa)
> + ("pixman" ,pixman)
> + ("pth" ,pth)
> + ("wayland" ,wayland)
> + ("xcb-util-image" ,xcb-util-image)
> + ("xcb-util-wm" ,xcb-util-wm)
> + ("xproto" ,xproto)
> + ("zlib" ,zlib)))
> +(synopsis "Wayland Compositor Library")
> +(home-page "https://github.com/Cloudef/wlc;)
> +(description
> + "This is wayland compositor library used by several projects like sway,
> +orbment or Gram.")
> +(license license:x11)))
> --
> 2.9.2
>
>
The package doesn't seem to be able to find all of the wayland libraries
it wants.
-- Found WAYLAND_CLIENT:
/gnu/store/9jfrsgr6jw9hzqj81p3vn632m79x5gla-wayland-1.11.0/lib/libwayland-client.so
-- Found WAYLAND_SERVER:
/gnu/store/9jfrsgr6jw9hzqj81p3vn632m79x5gla-wayland-1.11.0/lib/libwayland-server.so
-- Could NOT find WAYLAND_EGL (missing: WAYLAND_EGL_LIBRARIES)
-- Could NOT find WAYLAND (missing: WAYLAND_LIBRARIES)
This results in it saying it can't find wayland. Also, why not also
include wayland-protocols and dbus?
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 1/1] gnu: curl: Update replacement to 7.50.2 [fixes CVE-2016-7141].
On Wed, Sep 07, 2016 at 06:04:23PM -0400, Leo Famulari wrote: > * gnu/packages/curl.scm (curl)[replacement]: Update to 7.50.2 > (curl-7.50.1): Replace with ... > (curl-7.50.2): ... this. > --- > gnu/packages/curl.scm | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm > index a250bb1..f3c0ade 100644 > --- a/gnu/packages/curl.scm > +++ b/gnu/packages/curl.scm > @@ -40,7 +40,7 @@ > (define-public curl >(package > (name "curl") > - (replacement curl-7.50.1) > + (replacement curl-7.50.2) > (version "7.47.0") > (source (origin > (method url-fetch) > @@ -125,15 +125,15 @@ tunneling, and so on.") >"See COPYING in the distribution.")) > (home-page "http://curl.haxx.se/;))) > > -(define curl-7.50.1 > +(define curl-7.50.2 >(package > (inherit curl) > (source > - (let ((version "7.50.1")) > + (let ((version "7.50.2")) > (origin >(method url-fetch) >(uri (string-append "https://curl.haxx.se/download/curl-; >version ".tar.lzma")) >(sha256 > (base32 > - "0qc3qp3h18v24irzw7dgg1jf39v4hnz8irv83v9lbn9rxzrpdcdj"))) > +"0d5ly1xms0hh5zkv0m77d50c1816ywmbvmi1m158jyl70ndi9gby"))) > -- > 2.10.0 > Looks good! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH 3/3] gnu: Add utox.
On Wed, Sep 07, 2016 at 09:00:02PM -0400, Erik Edrosa wrote:
> * gnu/packages/messaging.scm (utox): New variable.
> ---
> gnu/packages/messaging.scm | 44 +++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index b95239a..27086c8 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -64,7 +64,9 @@
>#:use-module (gnu packages tls)
>#:use-module (gnu packages icu4c)
>#:use-module (gnu packages video)
> - #:use-module (gnu packages xiph))
> + #:use-module (gnu packages xiph)
> + #:use-module (gnu packages audio)
> + #:use-module (gnu packages fontutils))
>
> (define-public libotr
>(package
> @@ -612,4 +614,44 @@ protocols.")
>(license gpl3+)
>(home-page "https://tox.chat;
>
> +(define-public utox
> + (package
> + (name "utox")
> + (version "0.9.8")
> + (source
> +(origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/GrayHatter/uTox/archive/v;
> + version ".tar.gz"))
This one also needs a 'file-name' field, otherwise it'll save the source
as 'hash-v0.9.8.tar.gz' and we'll have no idea what it is.
> + (sha256
> + (base32
> + "13hfqbwzcgvfbvf9yjm62aqsvxnpqppb50c88sys43m7022yqcsy"
> + (build-system gnu-build-system)
> + (arguments
> +'(#:make-flags (list (string-append "PREFIX=" %output)
> + "CC=gcc")
> + #:tests? #f
> + #:phases (alist-delete 'configure %standard-phases)))
Same as the last one, why no tests? Also, 'modify-phases'
> + (inputs
> +`(("libtoxcore" ,libtoxcore)
> + ("filteraudio" ,filteraudio)
> + ("dbus" ,dbus)
> + ("openal" ,openal)
> + ("libvpx" ,libvpx)
> + ("libsodium" ,libsodium)
> + ("freetype" ,freetype)
> + ("fontconfig" ,fontconfig)
> + ("v4l-utils" ,v4l-utils)
> + ("libx11" ,libx11)
> + ("libxext" ,libxext)
> + ("libxrender" ,libxrender)))
more of an aesthetic thing, can you make the inputs alphabetized?
> + (native-inputs
> +`(("pkg-config" ,pkg-config)))
> + (synopsis "Lightweight Tox client")
> + (description "The lightest and fluffiest Tox client. Tox is a
> +distributed and secure instant messenger with audio and video chat
> +capabilities.")
> + (home-page "http://utox.org/;)
> + (license gpl3+)))
I believe it is just gpl3
> +
> ;;; messaging.scm ends here
> --
> 2.10.0
>
This one also looks really good. Can you send an updated patch?
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 2/3] gnu: Add filteraudio.
On Wed, Sep 07, 2016 at 09:00:01PM -0400, Erik Edrosa wrote:
> * gnu/packages/audio.scm (filteraudio): New variable.
> ---
> gnu/packages/audio.scm | 31 +++
> 1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
> index 40cc029..4a6f400 100644
> --- a/gnu/packages/audio.scm
> +++ b/gnu/packages/audio.scm
> @@ -2483,3 +2483,34 @@ with support for HD extensions.")
> flavors EBU R128, ATSC A/85, and ReplayGain 2.0. It helps normalizing the
> loudness of audio and video files to the same level.")
> (license license:gpl2+)))
> +
> +(define-public filteraudio
> + (let ((revision "1")
> +(commit "2fc669581e2a0ff87fba8de85861b49133306094"))
> +(package
> + (name "filteraudio")
> + (version (string-append "0.0.0-" revision "."
> + (string-take commit 7)))
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/irungentoo/filter_audio.git;)
> + (commit commit)))
here you also need to declare (file-name
> + (sha256
> + (base32
> + "0hbb290n3wb23f2k692a6bhc23nnqmxqi9sc9j15pnya8wifw64g"
> + (build-system gnu-build-system)
> + (arguments
> + '(#:make-flags (list (string-append "PREFIX=" %output)
> +"CC=gcc")
> + #:tests? #f
Please add a comment explaining why no tests, even if it is just 'no
test target'
> + #:phases
> + (alist-delete
> + 'configure
> + %standard-phases)))
It may be shorter in this case, but we've still switched to 'modify-phases'
> + (synopsis "Lightweight audio filtering library")
> + (description "An easy to use audio filtering library made from webrtc
> code, used
> +in @code{libtoxcore}.")
> + (home-page "https://github.com/irungentoo/filter_audio;)
> + (license license:bsd-3
> --
> 2.10.0
>
>
Looks good! Can you send a revised patch with the changes listed?
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 1/3] gnu: openal: Update to 1.17.2.
On Wed, Sep 07, 2016 at 09:00:00PM -0400, Erik Edrosa wrote: > * gnu/packages/audio.scm (openal): Update to 1.17.2. > --- > gnu/packages/audio.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm > index 9f03368..40cc029 100644 > --- a/gnu/packages/audio.scm > +++ b/gnu/packages/audio.scm > @@ -1468,7 +1468,7 @@ lv2-c++-tools.") > (define-public openal >(package > (name "openal") > -(version "1.15.1") > +(version "1.17.2") > (source (origin >(method url-fetch) >(uri (string-append > @@ -1476,7 +1476,7 @@ lv2-c++-tools.") > version ".tar.bz2")) >(sha256 > (base32 > -"0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f" > +"051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3" > (build-system cmake-build-system) > (arguments > `(#:tests? #f ; no check target > -- > 2.10.0 > This looks good. I'm going to test it with ffmpeg and then push it. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add git-review.
On Thu, Sep 08, 2016 at 09:06:30AM +0200, Clément Lassieur wrote:
> * gnu/packages/openstack.scm (git-review): New variable.
> ---
> gnu/packages/openstack.scm | 29 +
> 1 file changed, 29 insertions(+)
>
> diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
> index 8474904..2a54a20 100644
> --- a/gnu/packages/openstack.scm
> +++ b/gnu/packages/openstack.scm
> @@ -1,6 +1,7 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright © 2015 Cyril Roelandt <tipec...@gmail.com>
> ;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
> +;;; Copyright © 2016 Clément Lassieur <clem...@lassieur.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -20,6 +21,7 @@
> (define-module (gnu packages openstack)
>#:use-module (gnu packages python)
>#:use-module (gnu packages tls)
> + #:use-module (gnu packages version-control)
>#:use-module (guix build-system python)
>#:use-module (guix download)
>#:use-module ((guix licenses)
> @@ -781,3 +783,30 @@ permanence.")
> ("python2-oslosphinx" ,python2-oslosphinx)
> ,@(fold alist-delete (package-native-inputs swiftclient)
> '("python-keystoneclient" "python-oslosphinx")))
> +
> +(define-public git-review
> + (package
> +(name "git-review")
> +(version "1.25.0")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> +
> "https://pypi.python.org/packages/source/g/git-review/git-review-;
> + version ".tar.gz"))
This should be (uri (pypi-uri "git-review" version))
> + (sha256
> +(base32
> + "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"
> +(build-system python-build-system)
> +(arguments `(#:tests? #f)) ; tests require a running Gerrit server
> +(native-inputs
> + `(("python-pbr" ,python-pbr)))
> +(inputs
> + `(("python-requests" ,python-requests)
> + ("git" ,git)))
> +(home-page "http://docs.openstack.org/infra/git-review/;)
> +(synopsis "Command-line tool for Gerrit")
> +(description
> + "Git-review is a command-line tool that helps submitting Git branches to
> +Gerrit for review, or fetching existing ones.")
> +(license asl2.0)))
> --
> 2.10.0
>
>
Does this also build for python-2?
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
[PATCH 0/2] two more packages
Going through my GUIX_PACKAGE_PATH, I've pulled out two packages that should be ready to send upstream. More to follow, hopefully very soon. Efraim Flashner (2): gnu: Add edi. gnu: Add libhdate. gnu/packages/calendar.scm | 21 + gnu/packages/enlightenment.scm | 26 ++ 2 files changed, 47 insertions(+) -- 2.10.0
[PATCH 2/2] gnu: Add libhdate.
* gnu/packages/calendar.scm (libhdate): New variable.
---
gnu/packages/calendar.scm | 21 +
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index cf85899..0c37caa 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -166,3 +166,24 @@ program to be executed. It also features: sophisticated
date calculation,
moon phases, sunrise/sunset, Hebrew calendar, alarms, PostScript output and
proper handling of holidays.")
(license gpl2)))
+
+(define-public libhdate
+ (package
+(name "libhdate")
+(version "1.6.02")
+(source
+ (origin
+(method url-fetch)
+(uri (string-append "mirror://sourceforge/libhdate/libhdate/libhdate-"
+version "/" name "-" version ".tar.bz2"))
+(sha256
+ (base32
+ "0qkpq412p78znw8gckwcx3l0wcss9s0dgw1pvjb1ih2pxf6hm4rw"
+(build-system gnu-build-system)
+(home-page "http://libhdate.sourceforge.net/;)
+(synopsis "Library to use Hebrew dates")
+(description "LibHdate is a small library for the Hebrew calendar and times
+of day, written in C, and including bindings for C++, pascal, perl, php,
python,
+and ruby. It includes two illustrative command-line programs, @code{hcal} and
+@code{hdate}, and some snippets and scripts written in the binding languages.")
+(license gpl3+)))
--
2.10.0
Re: [PATCH] gnu: emacs-neotree: Fix downloaded source file
On Mon, Aug 29, 2016 at 12:33:57PM +, ng0 wrote: > From 41ffa4aa523921f0b8b722badee44dc34e570433 Mon Sep 17 00:00:00 2001 > From: ng0 <n...@we.make.ritual.n0.is> > Date: Sun, 28 Aug 2016 23:29:19 + > Subject: [PATCH 2/4] gnu: emacs-neotree: Keep downloaded source file format. > > * gnu/packages/emacs.scm (emacs-neotree)[source]: Keep downloaded file format. > --- > gnu/packages/emacs.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index 885a1ca..6485bee 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -2977,7 +2977,7 @@ passive voice.") >(sha256 > (base32 > "0cr37pdkwjgfijfws5bjskfh1rq9rfngxblcj6v5383vpmn83q7s")) > - (file-name (string-append name "-" version > + (file-name (string-append name "-" version ".tar.gz" > (build-system emacs-build-system) > (synopsis "Folder tree view for Emacs") > (description "This Emacs package provides a folder tree view.") > -- > 2.9.3 > pushed to master -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] Update entr to 3.6
On Sun, Aug 21, 2016 at 12:18:15PM -0400, Matthew Jordan wrote: > Good Day, > > This patch moves entr to the shellutils file. And updates the version. > This looks good, but it should be two patches, one to update entr and a second to move it to shellutils.scm. Can you send an updated patch? Thanks. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] Update entr to 3.6
On Thu, Sep 08, 2016 at 05:28:06AM -0400, Matthew Jordan wrote: > Good Day, > > Sorry for late reply been a bit busy with work. About this package, do > I still need to send seperate patches for the move and the update or has > this patch already been applied? > > Thanks, > Matthew. > > The update to 3.6 has been applied separately, moving it to shells.scm has not. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH 1/2] gnu: add python-django.
taken from tests/requirements/py3.txt
> + ("python-docutils" ,python-docutils)
> + ; optional for tests: ("python-geoip2" ,python-geoip2)
> + ("python-jinja2" ,python-jinja2) ; >= 2.7
> + ; optional for tests: ("python-memcached" ,python-memcached)
> + ("python-numpy" ,python-numpy)
> + ("python-pillow" ,python-pillow)
> + ("python-pyyaml" ,python-pyyaml)
> + ("python-pytz" ,python-pytz)
> + ; optional for tests: ("python-selenium" ,python-selenium)
> + ("python-sqlparse" ,python-sqlparse)
> + ("python-tblib" ,python-tblib)))
> +(home-page "http://www.djangoproject.com/;)
> +(synopsis "High-level Python Web framework")
> +(description
> + "Django is a high-level Python Web framework that encourages rapid
> +development and clean, pragmatic design.
> +
> +Developed and used over the past two years by a fast-moving online-news
> +operation, Django was designed from scratch to handle two challenges: the
> +intensive deadlines of a newsroom and the stringent requirements of
> +experienced Web developers. It has convenient niceties for developing
> +content-management systems, but it's an excellent tool for building any Web
> +site.
> +
> +Django focuses on automating as much as possible and adhering to the
> +DRY principle.")
> +(license license:bsd-3)
> +(properties `((python2-variant . ,(delay python2-django))
> +
> +(define-public python2-django
> + (let ((base (package-with-python2 (strip-python2-variant python-django
> +(package
> + (inherit base)
> + (native-inputs
> + `(; required for Python 2: enum34 and mock
> + ("python2-enum34" ,python2-enum34)
> + ("python2-mock" ,python2-mock)
> + ; when adding memcached mind: for Python 2 memcached <= 1.53 is
> required
> + ,@(package-native-inputs base))
> diff --git a/gnu/packages/patches/python-django-fix-testcase.patch
> b/gnu/packages/patches/python-django-fix-testcase.patch
> new file mode 100644
> index 000..4c1f980
> --- /dev/null
> +++ b/gnu/packages/patches/python-django-fix-testcase.patch
> @@ -0,0 +1,42 @@
> +From 24123c31362b5f3783d84d133c160e9fe16805fe Mon Sep 17 00:00:00 2001
> +From: Tim Graham <timogra...@gmail.com>
> +Date: Mon, 1 Aug 2016 15:40:46 -0400
> +Subject: [PATCH] Fixed admin_utils test failures due to translation updates.
> +
> +https://github.com/django/django/commit/24123c31362b5f3783d84d133c160e9fe16805fe
> +
> +---
> + tests/admin_utils/test_logentry.py | 7 ---
> + 1 file changed, 4 insertions(+), 3 deletions(-)
> +
> +diff --git a/tests/admin_utils/test_logentry.py
> b/tests/admin_utils/test_logentry.py
> +index 7798373..8259bf0 100644
> +--- a/tests/admin_utils/test_logentry.py
> b/tests/admin_utils/test_logentry.py
> +@@ -59,7 +59,7 @@ class LogEntryTests(TestCase):
> + logentry =
> LogEntry.objects.filter(content_type__model__iexact='article').latest('id')
> + self.assertEqual(logentry.get_change_message(), 'Changed title and
> hist.')
> + with translation.override('fr'):
> +-self.assertEqual(logentry.get_change_message(), 'Modification
> de title et hist.')
> ++self.assertEqual(logentry.get_change_message(), 'Title et hist
> modifié(s).')
> +
> + add_url = reverse('admin:admin_utils_article_add')
> + post_data['title'] = 'New'
> +@@ -117,11 +117,12 @@ class LogEntryTests(TestCase):
> + 'Changed domain. Added article "Article object". '
> + 'Changed title for article "Article object". Deleted article
> "Article object".'
> + )
> ++
> + with translation.override('fr'):
> + self.assertEqual(
> + logentry.get_change_message(),
> +-'Modification de domain. Article « Article object » ajouté.
> '
> +-'Modification de title pour l\'objet article « Article
> object ». Article « Article object » supprimé.'
> ++"Domain modifié(s). Article « Article object » ajouté. "
> ++"Title modifié(s) pour l'objet article « Article object ».
> Article « Article object » supprimé."
> + )
> +
> + def test_logentry_get_edited_object(self):
> +--
> +2.7.4
> +
> --
> 2.7.4
>
I can't get this patch to apply
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
[PATCH 1/2] gnu: Add edi.
* gnu/packages/enlightenment.scm (edi): New variable.
---
gnu/packages/enlightenment.scm | 26 ++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 7cd11b5..a0c5a83 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -275,3 +275,29 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb
and elementary).")
(define-public python2-efl
(package-with-python2 python-efl))
+
+(define-public edi
+ (package
+(name "edi")
+(version "0.4.0")
+(source
+ (origin
+(method url-fetch)
+(uri (list
+ (string-append "https://download.enlightenment.org/rel/apps/edi;
+ "/edi-" version ".tar.bz2")
+ (string-append "https://github.com/ajwillia-ms/edi/releases/;
+ "download/v" version "/edi-" version
".tar.bz2")))
+(sha256
+ (base32
+ "02d8hplcviayri8fxws56n362k6zqsf62v8pbn5sbgwrmkqwybhc"
+(build-system gnu-build-system)
+(native-inputs `(("pkg-config" ,pkg-config)))
+(inputs `(("efl" ,efl)))
+(home-page "https://www.enlightenment.org/about-edi;)
+(synopsis "Development environment using the EFL")
+(description "EDI is a development environment designed for and built using
+the EFL. It's aim is to create a new, native development environment for Linux
+that trys to lower the barrier to getting involved in Enlightenment development
+and in creating apps based on the EFL suite.")
+(license license:gpl2)))
--
2.10.0
Re: [PATCH] gnu: Add surfraw.
On Tue, Sep 06, 2016 at 12:38:49PM +, ng0 wrote: > ng0 <n...@we.make.ritual.n0.is> writes: > > > Problem(?): > > > > ng0@shadowwalker > > /gnu/store/fvx31h4z9pf910f3ycdqlpv5z6ii7lx5-surfraw-2.2.9/bin$ ./surfraw > > surfraw ERROR: couldn't find global config in > > /gnu/store/fvx31h4z9pf910f3ycdqlpv5z6ii7lx5-surfraw-2.2.9/etc/xdg/surfraw/conf > > or $XDG_CONFIG_DIRS > > > > ng0@shadowwalker > > /gnu/store/fvx31h4z9pf910f3ycdqlpv5z6ii7lx5-surfraw-2.2.9/etc/xdg/surfraw$ > > ls -al > > total 16 > > dr-xr-xr-x 2 root root 4096 Jan 1 1970 ./ > > dr-xr-xr-x 3 root root 4096 Jan 1 1970 ../ > > -r--r--r-- 4 root root 143 Jan 1 1970 bookmarks > > -r--r--r-- 2 root root 2518 Jan 1 1970 conf > > This is fixed when the package is in $PATH and no longer in store. > > ng0@shadowwalker ~$ echo $XDG_CONFIG_DIRS > /home/ng0/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg > > ng0@shadowwalker ~$ sr > Usage: sr [-help] [-elvi] elvis [elvioptions] [search terms] >sr [options] bookmark [search terms] > If you wish to run the elvi directly, run "surfraw-update-path" to append > /gnu/store/fvx31h4z9pf910f3ycdqlpv5z6ii7lx5-surfraw-2.2.9/lib/surfraw > to your $PATH in your shell's config files. > See surfraw-update-path(1) for details > Options: >-elvi List elvi >-help This help > sr is an alias for surfraw > Global options: > > > etc etc... > > > I was able to search duckduckgo for "pong" with w3m. > > There have been some commits since this release, but the response time > is slow. > > I have no clue which web searches are a9 based so I can not test this. > This package is good to go from my side, just needs a review. > ./pre-inst-env guix environment --ad-hoc surfraw surfraw wikipedia -browser=links RMS ... didn't bring up RMS. Apparently they've hidden him behind a disambiguation page. patch pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
[PATCH 05/16] gnu: Add python-graphql-core.
* gnu/packages/python.scm (python-graphql-core): New variable.
---
gnu/packages/python.scm | 45 +
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0886c4f..a4493c5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10425,3 +10425,48 @@ Python to manipulate OpenDocument 1.2 files.")
(native-inputs
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))
+
+(define-public python-graphql-core
+ (package
+(name "python-graphql-core")
+(version "0.5.3")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "graphql-core" version))
+(sha256
+ (base32
+ "0rsaarx2sj4xnw9966rhh4haiqaapm4lm2mfqm48ywd51j5vh1a0"
+(build-system python-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-hardcoded-version
+ (lambda _ (substitute*
+ "setup.py"
+ (("'gevent==1.1rc1'") "'gevent'"))
+ #t)
+(native-inputs
+ `(("python-gevent" ,python-gevent)
+ ("python-mock" ,python-mock)
+ ("python-pytest-mock" ,python-pytest-mock)))
+(inputs
+ `(("python-promise" ,python-promise)
+ ("python-six" ,python-six)))
+(home-page "https://github.com/graphql-python/graphql-core;)
+(synopsis "GraphQL implementation for Python")
+(description
+ "GraphQL implementation for Python. GraphQL is a data query language and
+runtime designed and used to request and deliver data to mobile and web apps.
+This library is a port of
@url{https://github.com/graphql/graphql-js,graphql-js}
+to Python.")
+(properties `((python2-variant . ,(delay python2-graphql-core
+(license license:expat)))
+
+(define-public python2-graphql-core
+ (let ((base (package-with-python2
+(strip-python2-variant python-graphql-core
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))
--
2.10.0
[PATCH 16/16] gnu: Add onionshare.
* gnu/packages/tor.scm (onionshare): New variable.
* gnu/packages/patches/onionshare-fix-install-paths.patch: New variable.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
.../patches/onionshare-fix-install-paths.patch | 39
gnu/packages/tor.scm | 100 +
3 files changed, 140 insertions(+)
create mode 100644 gnu/packages/patches/onionshare-fix-install-paths.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 515ca35..1999323 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -701,6 +701,7 @@ dist_patch_DATA =
\
%D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/ocaml-CVE-2015-8869.patch \
%D%/packages/patches/ocaml-findlib-make-install.patch\
+ %D%/packages/patches/onionshare-fix-install-paths.patch \
%D%/packages/patches/openexr-missing-samples.patch \
%D%/packages/patches/openjpeg-CVE-2015-6581.patch\
%D%/packages/patches/openjpeg-CVE-2016-5157.patch\
diff --git a/gnu/packages/patches/onionshare-fix-install-paths.patch
b/gnu/packages/patches/onionshare-fix-install-paths.patch
new file mode 100644
index 000..721b89f
--- /dev/null
+++ b/gnu/packages/patches/onionshare-fix-install-paths.patch
@@ -0,0 +1,39 @@
+From 7afdd3366711a0c508bfb9323af8f4268ab77c9b Mon Sep 17 00:00:00 2001
+From: Efraim Flashner <efr...@flashner.co.il>
+Date: Thu, 21 Jul 2016 13:22:45 +0300
+Subject: [PATCH] patch
+
+---
+ setup.py | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 8ae56fe..8b245c9 100644
+--- a/setup.py
b/setup.py
+@@ -91,15 +91,15 @@ setup(
+ include_package_data=True,
+ scripts=['install/scripts/onionshare', 'install/scripts/onionshare-gui'],
+ data_files=[
+-(os.path.join(sys.prefix, 'share/applications'),
['install/onionshare.desktop']),
+-(os.path.join(sys.prefix, 'share/appdata'),
['install/onionshare.appdata.xml']),
+-(os.path.join(sys.prefix, 'share/pixmaps'),
['install/onionshare80.xpm']),
+-(os.path.join(sys.prefix, 'share/onionshare'), [
++('share/applications', ['install/onionshare.desktop']),
++('share/appdata', ['install/onionshare.appdata.xml']),
++('share/pixmaps', ['install/onionshare80.xpm']),
++('share/onionshare', [
+ 'resources/version.txt',
+ 'resources/wordlist.txt'
+ ]),
+-(os.path.join(sys.prefix, 'share/onionshare/images'), images),
+-(os.path.join(sys.prefix, 'share/onionshare/locale'), locale),
+-(os.path.join(sys.prefix, 'share/onionshare/html'), html)
++('share/onionshare/images', images),
++('share/onionshare/locale', locale),
++('share/onionshare/html', html)
+ ]
+ )
+--
+2.9.1
+
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 951b8f6..fe74c3c 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages autotools)
#:use-module (gnu packages tls)
#:use-module (gnu packages w3m))
@@ -145,3 +146,102 @@ flexible configuration and can be customized to suit
individual needs and
tastes. It has application for both stand-alone systems and multi-user
networks.")
(license gpl2+)))
+
+(define-public onionshare
+ (package
+(name "onionshare")
+(version "0.9")
+(source
+ (origin
+(method url-fetch)
+(uri (string-append "https://github.com/micahflee/onionshare/archive/v;
+version ".tar.gz"))
+(file-name (string-append name "-" version ".tar.gz"))
+(sha256
+ (base32
+ "0pc3xbq379415s0i0y6rz02hay20zbvgra1jmg4mgrl9vbdr8zmw"))
+(patches (search-patches "onionshare-fix-install-paths.patch"
+(build-system python-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-install-path
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out(assoc-ref outputs "out"))
+(onionshare (string-append out "/share/onionshare")))
+ (substitute*
+ "install/pyinstaller.spec"
+ ;; inform onionshare where the 'resources' files are installed
+ (("../resources") onionshare))
+ (substitute*
+ "onionshare/strings.py"
+ ;; correct the locale directory
+ (("helpers.get_resource_path\\('loca
[PATCH 04/16] gnu: Add python-pytest-mock.
* gnu/packages/python.scm (python-pytest-mock): New variable.
---
gnu/packages/python.scm | 39 +++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a340604..0886c4f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1683,6 +1683,45 @@ supports coverage of subprocesses.")
(define-public python2-pytest-runner
(package-with-python2 python-pytest-runner))
+(define-public python-pytest-mock
+ (package
+(name "python-pytest-mock")
+(version "1.2")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "pytest-mock" version ".zip"))
+(sha256
+ (base32
+ "03zxar5drzm7ksqyrwypjaza3cri6wqvpr6iam92djvg6znp32gp"
+(build-system python-build-system)
+(native-inputs
+ `(("unzip" ,unzip)))
+(inputs
+ `(("python-py" ,python-py)
+ ("python-pytest" ,python-pytest)))
+(home-page "https://github.com/pytest-dev/pytest-mock/;)
+(synopsis "Thin-wrapper around the mock package for easier use with
py.test")
+(description
+ "This plugin installs a @code{mocker} fixture which is a thin-wrapper
+around the patching API provided by the @code{mock} package, but with the
+benefit of not having to worry about undoing patches at the end of a test.
+The mocker fixture has the same API as @code{mock.patch}, supporting the
+same arguments.")
+(properties `((python2-variant . ,(delay python2-pytest-mock
+(license license:expat)))
+
+(define-public python2-pytest-mock
+ (let ((base (package-with-python2
+(strip-python2-variant python-pytest-mock
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base)))
+ (inputs
+ `(("python2-mock" ,python2-mock)
+ ,@(package-inputs base))
+
(define-public python-pytest-xdist
(package
(name "python-pytest-xdist")
--
2.10.0
[PATCH 13/16] gnu: Add python-nose2.
* gnu/packages/python.scm (python-nose2): New variable.
---
gnu/packages/python.scm | 31 +++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 81c706d..94ebd7d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1505,6 +1505,37 @@ matching them against a list of media-ranges.")
(define-public python2-nose
(package-with-python2 python-nose))
+(define-public python-nose2
+ (package
+(name "python-nose2")
+(version "0.6.5")
+ (source
+(origin
+ (method url-fetch)
+ (uri (pypi-uri "nose2" version))
+ (sha256
+ (base32
+"1x4zjq1zlyrh8b9ba0cmafd3w94pxhid408kibyjd3s6h1lap6s7"
+(build-system python-build-system)
+(arguments `(#:tests? #f)) ; 'module' object has no attribute 'collector'
+(native-inputs
+ `(("python-setuptools" ,python-setuptools)))
+(inputs
+ `(("python-cov-core" ,python-cov-core)
+ ("python-pytest-cov" ,python-pytest-cov)
+ ("python-six" ,python-six)))
+(home-page "https://github.com/nose-devs/nose2;)
+(synopsis "Next generation of nicer testing for Python")
+(description
+ "Nose2 is the next generation of nicer testing for Python, based on the
+plugins branch of unittest2. Nose2 aims to improve on nose by providing a
+better plugin api, being easier for users to configure, and simplifying
internal
+interfaces and processes.")
+(license license:bsd-2)))
+
+(define-public python2-nose2
+ (package-with-python2 python-nose2))
+
(define-public python-unittest2
(package
(name "python-unittest2")
--
2.10.0
[PATCH 09/16] gnu: Add python-django-filter.
* gnu/packages/python.scm (python-django-filter): New variable.
---
gnu/packages/python.scm | 30 ++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 36b96f6..7effc67 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1762,6 +1762,36 @@ useful tools for testing Django applications and
projects.")
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))
+(define-public python-django-filter
+ (package
+(name "python-django-filter")
+(version "0.14.0")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "django-filter" version))
+(sha256
+ (base32
+ "0f78hmk8c903zwfzlsiw7ivgag81ymmb5hi73rzxbhnlg2v0l3fx"
+(build-system python-build-system)
+(home-page "https://django-filter.readthedocs.io/en/latest/;)
+(synopsis "Reusable Django application to filter querysets dynamically")
+(description
+ "Django-filter is a generic, reusable application to alleviate writing
+some of the more mundane bits of view code. Specifically, it allows users to
+filter down a queryset based on a model’s fields, displaying the form to let
+them do this.")
+(properties `((python2-variant . ,(delay python2-django-filter
+(license license:bsd-3)))
+
+(define-public python2-django-filter
+ (let ((base (package-with-python2
+(strip-python2-variant python-django-filter
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))
+
(define-public python-pytest-xdist
(package
(name "python-pytest-xdist")
--
2.10.0
[PATCH 02/16] gnu: Add python-peewee.
* gnu/packages/databases.scm (python-peewee): New variable.
---
gnu/packages/databases.scm | 30 ++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index fc31653..85bbca1 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -63,6 +63,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
+ #:use-module (guix build-system python)
#:use-module (guix build-system cmake)
#:use-module (guix utils)
#:use-module (srfi srfi-26)
@@ -1094,3 +1095,32 @@ trees (LSM), for sustained throughput under random
insert workloads.")
(synopsis "Lightning memory-mapped database library")
(description "Lightning memory-mapped database library.")
(license license:openldap2.8)))
+
+(define-public python-peewee
+ (package
+(name "python-peewee")
+(version "2.8.3")
+ (source
+(origin
+(method url-fetch)
+(uri (pypi-uri "peewee" version))
+(sha256
+ (base32
+ "1605bk11s7aap2q4qyba93rx7yfh8b11kk0cqi08z8klx2iar8yd"
+(build-system python-build-system)
+(arguments
+ `(#:tests? #f)) ; Fails to import test data
+(native-inputs
+ `(("python-cython" ,python-cython)))
+(home-page "https://github.com/coleifer/peewee/;)
+(synopsis "Small object-relational mapping utility")
+(description
+ "Peewee is a simple and small ORM (object-relation mapping) tool. Peewee
+handles converting between pythonic values and those used by databases, so you
+can use Python types in your code without having to worry. It has built-in
+support for sqlite, mysql and postgresql. If you already have a database, you
+can autogenerate peewee models using @code{pwiz}, a model generator.")
+(license license:expat)))
+
+(define-public python2-peewee
+ (package-with-python2 python-peewee))
--
2.10.0
[PATCH 03/16] gnu: Add python-promise.
* gnu/packages/python.scm (python-promise): New variable.
---
gnu/packages/python.scm | 34 ++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 101e7f1..a340604 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7441,6 +7441,40 @@ asynchronously executing callables. This package
backports the
concurrent.futures package from Python 3.2")
(license license:bsd-3)))
+(define-public python-promise
+ (package
+(name "python-promise")
+(version "0.4.2")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "promise" version))
+(sha256
+ (base32
+ "1k19ms8l3d5jzjh557rgkxb5sg4mqgfc315rn4hx1z3n8qq6lr3h"
+(build-system python-build-system)
+;; Tests wants python-futures, which is a python2 only program, and
+;; can't be found by python2-promise at test time.
+(arguments `(#:tests? #f))
+(home-page "https://github.com/syrusakbary/promise;)
+(synopsis "Promises/A+ implementation for Python")
+(description
+ "Promises/A+ implementation for Python")
+(properties `((python2-variant . ,(delay python2-promise
+(license license:expat)))
+
+(define-public python2-promise
+ (let ((promise (package-with-python2
+ (strip-python2-variant python-promise
+(package (inherit promise)
+ (arguments (substitute-keyword-arguments (package-arguments promise)
+ ((#:tests? _) #t)))
+ (native-inputs
+ `(("python2-futures" ,python2-futures)
+ ("python2-pytest" ,python2-pytest)
+ ("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs promise))
+
(define-public python-urllib3
(package
(name "python-urllib3")
--
2.10.0
[PATCH 08/16] gnu: Add python-pytest-django.
* gnu/packages/python.scm (python-pytest-django): New variable.
---
gnu/packages/python.scm | 40
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 91d82aa..36b96f6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1722,6 +1722,46 @@ same arguments.")
`(("python2-mock" ,python2-mock)
,@(package-inputs base))
+(define-public python-pytest-django
+ (package
+(name "python-pytest-django")
+(version "2.9.1")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "pytest-django" version))
+(sha256
+ (base32
+ "1mmc7zsz3dlhs6sx4sppkj1vgshabi362r1a8b8wpj1qfximpqcb"
+(build-system python-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-setuppy
+ (lambda _
+ (substitute* "setup.py"
+ (("setuptools_scm==1.8.0") "setuptools_scm"))
+ #t)
+(native-inputs
+ `(("python-setuptools-scm" ,python-setuptools-scm)))
+(inputs
+ `(("python-py" ,python-py)
+ ("python-pytest" ,python-pytest)))
+(home-page "http://pytest-django.readthedocs.org/;)
+(synopsis "Django plugin for py.test")
+(description "Pytest-django is a plugin for py.test that provides a set of
+useful tools for testing Django applications and projects.")
+(properties `((python2-variant . ,(delay python2-pytest-django
+(license license:bsd-3)))
+
+(define-public python2-pytest-django
+ (let ((base (package-with-python2
+(strip-python2-variant python-pytest-django
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))
+
(define-public python-pytest-xdist
(package
(name "python-pytest-xdist")
--
2.10.0
Re: [PATCH] gnu: Add git-review.
On Fri, Sep 09, 2016 at 10:23:20AM +0200, Clément Lassieur wrote:
> Efraim Flashner <efr...@flashner.co.il> writes:
>
> > On Thu, Sep 08, 2016 at 10:28:37PM +1000, Ben Woodcroft wrote:
>
> >> I think including git simply as an input is problematic because git-review
> >> calls git via 'subprocess', as evidenced by
> >>
> >> $ ./pre-inst-env guix environment -C --ad-hoc git-review
> >> $ git-review
> >> [..]
> >> File
> >> "/gnu/store/m4gc2wx4q9if1vrhgclpspdil7rqsn21-python-3.4.3/lib/python3.4/subprocess.py",
> >> line 1457, in _execute_child
> >> raise child_exception_type(errno_num, err_msg)
> >> FileNotFoundError: [Errno 2] No such file or directory: 'git'
> >>
> >> So, I think we need to patch the source code to call the full path to git,
> >> or otherwise wrap the 'git-review' executable.
> >>
> >> > +(home-page "http://docs.openstack.org/infra/git-review/;)
> >> > +(synopsis "Command-line tool for Gerrit")
> >> > +(description
> >> > + "Git-review is a command-line tool that helps submitting Git
> >> > branches to
> >> > +Gerrit for review, or fetching existing ones.")
> >> > +(license asl2.0)))
> >> Otherwise seems OK to me. Can you test with environment -C -N?
> >> ben
> >>
> >
> > Try it with the attached patch
>
> Hi, sorry for the mess and thanks for the reviews.
>
> I did not know about the "guix environment -C -N" way of testing
> packages, and I'm very happy to learn this.
>
> The attached patch seems to work for git, but the same error now happens
> with ssh.
>
> --
> Clément
I found ssh and I found an instance of scp, so this should be better.
--
Efraim Flashner <efr...@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
From a4169c369d850da7859e94152f96dc71acb42e4f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efr...@flashner.co.il>
Date: Thu, 8 Sep 2016 21:31:32 +0300
Subject: [PATCH] gnu: python-git-review: Find outside commands.
* gnu/packages/openstack.scm (python-git-review)[arguments]: Hardcode
the location of `git', `ssh' and `scp' so that `git-review' can find
it natively.
[inputs]: Add openssh.
---
gnu/packages/openstack.scm | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 4cb38a9..65bc296 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -20,6 +20,7 @@
(define-module (gnu packages openstack)
#:use-module (gnu packages python)
+ #:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (guix build-system python)
@@ -796,11 +797,33 @@ permanence.")
(base32
"07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"
(build-system python-build-system)
-(arguments `(#:tests? #f)) ; tests require a running Gerrit server
+(arguments
+ `(#:tests? #f ; tests require a running Gerrit server
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'hardcode-outside-programs
+ (lambda _
+ (let* ((git (string-append
+(assoc-ref %build-inputs "git") "/bin/git"))
+(base (assoc-ref %build-inputs "openssh"))
+(ssh (string-append base "/bin/ssh"))
+(scp (string-append base "/bin/scp")))
+ (substitute* '("git_review/cmd.py"
"git_review/tests/test_git_review.py"
+ "git_review/tests/test_unit.py"
"git_review/tests/utils.py")
+(("\"git ") (string-append "\"" git " "))
+(("\"git\"") (string-append "\"" git "\""))
+(("'git'") (string-append "'" git "'")))
+ (substitute* "git_review/cmd.py"
+(("\"ssh\"") (string-append "\"" ssh "\""))
+(("'ssh'") (string-append "'" ssh "'"))
+(("\"scp\"") (string-append "\"" scp "\""))
+(("'scp") (string-append "'" scp)))
+ #t))
(native-inputs
`(("python-pbr" ,python-pbr)))
(inputs
`(("python-requests" ,python-requests)
+ ("openssh" ,openssh)
("git" ,git)))
(home-page "http://docs.openstack.org/infra/git-review/;)
(synopsis "Command-line tool for Gerrit")
--
2.10.0
signature.asc
Description: PGP signature
[PATCH 00/16] Add onionshare
When I started this seemed like an easy way to share files. I'm not entirely happy with the number of packages that I ended up putting in python.scm, grapql-* seems like it could be broken off, django ones could go in Hartmut's django.scm. Python-nautilus doesn't seem to belong anywhere. I'd like to move all the sqlalchemy packages to databases.scm, but I don't think there's anything we can do about python.scm hitting 10k+ lines. python-nautilus can be upgraded to 0.5.x, but it involves packaging more python packages, so I figured that could wait until later. I've also included my "master file" that I pulled the patches from, it makes building all the patches a bit easier to only have to drop in one file than to apply 16 patches. Efraim Flashner (16): gnu: Add python-pika. gnu: Add python-peewee. gnu: Add python-promise. gnu: Add python-pytest-mock. gnu: Add python-graphql-core. gnu: Add python-graphql-relay. gnu: Add python-sqlalchemy-utils. gnu: Add python-pytest-django. gnu: Add python-django-filter. gnu: Add python-graphene. gnu: Add python-consul. gnu: Add python-cov-core. gnu: Add python-nose2. gnu: Add python-bcrypt. gnu: Add python-nautilus. gnu: Add onionshare. gnu/local.mk | 1 + gnu/packages/databases.scm | 30 ++ gnu/packages/password-utils.scm| 35 ++ .../patches/onionshare-fix-install-paths.patch | 39 ++ gnu/packages/python.scm| 452 - gnu/packages/tor.scm | 100 + 6 files changed, 656 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/onionshare-fix-install-paths.patch -- 2.10.0
[PATCH 01/16] gnu: Add python-pika.
* gnu/packages/python.scm (python-pika): New variable.
---
gnu/packages/python.scm | 25 +
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8b9273c..101e7f1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9199,6 +9199,31 @@ focus on event-based network programming and
multiprotocol integration.")
(define-public python2-twisted
(package-with-python2 python-twisted))
+(define-public python-pika
+ (package
+(name "python-pika")
+(version "0.10.0")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "pika" version))
+(sha256
+ (base32
+ "0nb4h08di432lv7dy2v9kpwgk0w92f24sqc2hw2s9vwr5b8v8xvj"
+(build-system python-build-system)
+(native-inputs
+ `(("python-twisted" ,python-twisted)))
+(home-page "https://pika.readthedocs.org;)
+(synopsis "Pure Python AMQP Client Library")
+(description
+ "Pika is a pure-Python implementation of the AMQP (Advanced Message
Queuing
+Protocol) 0-9-1 protocol that tries to stay fairly independent of the
underlying
+network support library.")
+(license license:bsd-3)))
+
+(define-public python2-pika
+ (package-with-python2 python-pika))
+
(define-public python-ply
(package
(name "python-ply")
--
2.10.0
[PATCH 06/16] gnu: Add python-graphql-relay.
* gnu/packages/python.scm (python-graphql-relay): New variable.
---
gnu/packages/python.scm | 37 +
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a4493c5..0ef9b6a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10470,3 +10470,40 @@ to Python.")
(native-inputs
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))
+
+(define-public python-graphql-relay
+ (package
+(name "python-graphql-relay")
+(version "0.4.4")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "graphql-relay" version))
+(sha256
+ (base32
+ "04wr9ayshxjjdcg2v21c7ffbz36kif1wjl3604fqd3qignb3fbxi"
+(build-system python-build-system)
+(native-inputs
+ `(("python-pytest" ,python-pytest)))
+(inputs
+ `(("python-graphql-core" ,python-graphql-core)
+ ("python-promise" ,python-promise)
+ ("python-six" ,python-six)))
+(home-page "https://github.com/graphql-python/graphql-relay-py;)
+(synopsis "Relay implementation for Python")
+(description
+ "This is a library to allow the easy creation of Relay-compliant servers
+using the GraphQL Python reference implementation of a GraphQL server. It
+should be noted that the code is a exact port of the original
+@url{https://github.com/graphql/graphql-relay-js,graphql-relay js
implementation}
+from Facebook.")
+(properties `((python2-variant . ,(delay python2-graphql-relay
+(license license:expat)))
+
+(define-public python2-graphql-relay
+ (let ((base (package-with-python2
+(strip-python2-variant python-graphql-relay
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))
--
2.10.0
[PATCH 14/16] gnu: Add python-bcrypt.
* gnu/packages/password-utils.scm (python-bcrypt): New variable.
---
gnu/packages/password-utils.scm | 35 +++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 7288da6..d2410c6 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -334,3 +334,38 @@ through the pass command.")
(description "Argon2 provides a key derivation function that was declared
winner of the 2015 Password Hashing Competition.")
(license license:cc0)))
+
+(define-public python-bcrypt
+ (package
+(name "python-bcrypt")
+(version "3.1.0")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "bcrypt" version))
+(sha256
+ (base32
+ "1giy0dvd8gvq6flxh44np1v2nqwsji5qsnrz038mgwzgp7c20j75"
+(build-system python-build-system)
+(native-inputs
+ `(("python-pycparser" ,python-pycparser)
+ ("python-pytest" ,python-pytest)))
+(inputs
+ `(("python-cffi" ,python-cffi)
+ ("python-six" ,python-six)))
+(home-page "https://github.com/pyca/bcrypt/;)
+(synopsis
+ "Modern password hashing library")
+(description
+ "Bcrypt is a Python module which provides a password hashing method based
+on the Blowfish password hashing algorithm, as described in
+@url{http://static.usenix.org/events/usenix99/provos.html,\"A Future-Adaptable
+Password Scheme\"} by Niels Provos and David Mazieres.")
+(license license:asl2.0)))
+
+(define-public python2-bcrypt
+ (let ((bcrypt (package-with-python2 python-bcrypt)))
+(package (inherit bcrypt)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs bcrypt))
--
2.10.0
Re: [PATCH 00/16] Add onionshare
On Sun, Sep 11, 2016 at 09:58:41PM +0300, Efraim Flashner wrote:
> When I started this seemed like an easy way to share files. I'm not
> entirely happy with the number of packages that I ended up putting in
> python.scm, grapql-* seems like it could be broken off, django ones could
> go in Hartmut's django.scm. Python-nautilus doesn't seem to belong
> anywhere. I'd like to move all the sqlalchemy packages to databases.scm,
> but I don't think there's anything we can do about python.scm hitting
> 10k+ lines.
>
> python-nautilus can be upgraded to 0.5.x, but it involves packaging more
> python packages, so I figured that could wait until later.
>
> I've also included my "master file" that I pulled the patches from, it
> makes building all the patches a bit easier to only have to drop in one
> file than to apply 16 patches.
>
>
> Efraim Flashner (16):
> gnu: Add python-pika.
> gnu: Add python-peewee.
> gnu: Add python-promise.
> gnu: Add python-pytest-mock.
> gnu: Add python-graphql-core.
> gnu: Add python-graphql-relay.
> gnu: Add python-sqlalchemy-utils.
> gnu: Add python-pytest-django.
> gnu: Add python-django-filter.
> gnu: Add python-graphene.
> gnu: Add python-consul.
> gnu: Add python-cov-core.
> gnu: Add python-nose2.
> gnu: Add python-bcrypt.
> gnu: Add python-nautilus.
> gnu: Add onionshare.
>
> gnu/local.mk | 1 +
> gnu/packages/databases.scm | 30 ++
> gnu/packages/password-utils.scm| 35 ++
> .../patches/onionshare-fix-install-paths.patch | 39 ++
> gnu/packages/python.scm| 452
> -
> gnu/packages/tor.scm | 100 +
> 6 files changed, 656 insertions(+), 1 deletion(-)
> create mode 100644 gnu/packages/patches/onionshare-fix-install-paths.patch
>
> --
> 2.10.0
>
And here's the onionshare.scm that I was using
--
Efraim Flashner <efr...@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
;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il>
;;;
;;; This file is an addendum to 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 (wip onionshare)
#:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system python)
#:use-module (gnu packages databases)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages zip))
(define-public onionshare
(package
(name "onionshare")
(version "0.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/micahflee/onionshare/archive/v;
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0pc3xbq379415s0i0y6rz02hay20zbvgra1jmg4mgrl9vbdr8zmw"))
(patches (search-patches "onionshare-fix-install-paths.patch"
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-install-path
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out(assoc-ref outputs "out"))
(onionshare (string-append out "/share/onionshare")))
(substitute*
"install/pyinstaller.spec"
;; inform onionshare where the 'resources' files are installed
(("../resources") onionshare))
(substitute*
"onionshare/strings.py"
;; correct the locale directory
(("helpers.get_resource_path\\('locale'\\)")
(string-append "'" onionshare "/locale'")))
(substitute*
"onionshare/helpers.py"
[PATCH 10/16] gnu: Add python-graphene.
* gnu/packages/python.scm (python-graphene): New variable.
---
gnu/packages/python.scm | 42 ++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7effc67..5ab8ed1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10608,3 +10608,45 @@ from Facebook.")
(native-inputs
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))
+
+(define-public python-graphene
+ (package
+(name "python-graphene")
+(version "0.10.2")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "graphene" version))
+(sha256
+ (base32
+ "09zhac7igh9ixdz0ay6csy35b40l1jwbf2wrbxmgxwfhy51iy06q"
+(build-system python-build-system)
+(native-inputs
+ `(("python-django-filter" ,python-django-filter)
+ ("python-mock" ,python-mock)
+ ("python-psycopg2" ,python-psycopg2)
+ ("python-pytest-django" ,python-pytest-django)
+ ("python-sqlalchemy-utils" ,python-sqlalchemy-utils)))
+(inputs
+ `(("python-graphql-core" ,python-graphql-core)
+ ("python-graphql-relay" ,python-graphql-relay)
+ ("python-iso8601" ,python-iso8601)
+ ("python-promise" ,python-promise)
+ ("python-six" ,python-six)))
+(home-page "http://graphene-python.org/;)
+(synopsis "GraphQL Framework for Python")
+(description
+ "Graphene is a Python library for building GraphQL schemas/types.
+A GraphQL schema describes your data model, and provides a GraphQL server
+with an associated set of resolve methods that know how to fetch data.")
+(properties `((python2-variant . ,(delay python2-graphene
+(license license:expat)))
+
+(define-public python2-graphene
+ (let ((base (package-with-python2
+(strip-python2-variant python-graphene
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ("python2-sqlalchemy" ,python2-sqlalchemy)
+ ,@(package-native-inputs base))
--
2.10.0
[PATCH 12/16] gnu: Add python-cov-core.
* gnu/packages/python.scm (python-cov-core): New variable.
---
gnu/packages/python.scm | 28
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4d151a3..81c706d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2172,6 +2172,34 @@ executed.")
(define-public python2-coverage
(package-with-python2 python-coverage))
+(define-public python-cov-core
+ (package
+(name "python-cov-core")
+(version "1.15.0")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "cov-core" version))
+(sha256
+ (base32
+ "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a"
+(build-system python-build-system)
+(native-inputs
+ `(("python-coverage" ,python-coverage)))
+(home-page "https://github.com/schlamar/cov-core;)
+(synopsis "plugin core for use by pytest-cov, nose-cov and nose2-cov")
+(description
+ "This is a library package for use by pytest-cov, nose-cov and nose2-cov.
+It is useful for developing coverage plugins for these testing frameworks.")
+(license license:expat)))
+
+(define-public python2-cov-core
+ (let ((cov-core (package-with-python2 python-cov-core)))
+(package (inherit cov-core)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs cov-core))
+
(define-public python-discover
(package
(name "python-discover")
--
2.10.0
[PATCH 11/16] gnu: Add python-consul.
* gnu/packages/python.scm (python-consul): New variable.
---
gnu/packages/python.scm | 30 ++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5ab8ed1..4d151a3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10284,6 +10284,36 @@ interface for programs.")
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))
+(define-public python-consul
+ (package
+(name "python-consul")
+(version "0.6.1")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "python-consul" version))
+(sha256
+ (base32
+ "0rfyxcy4cr3x848vhx876ifalxd5ghq6l5x813m49h4vq2d4jiq8"
+(build-system python-build-system)
+(native-inputs
+ `(("python-pytest" ,python-pytest)
+ ("python-requests" ,python-requests)
+ ("python-six" ,python-six)))
+(home-page "https://github.com/cablehead/python-consul;)
+(synopsis "Python client for Consul")
+(description
+ "Python client for @url{http://www.consul.io/,Consul}, a tool for service
+discovery, monitoring and configuration.")
+(license license:expat)))
+
+(define-public python2-consul
+ (let ((consul (package-with-python2 python-consul)))
+(package (inherit consul)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs consul))
+
(define-public python-schematics
(package
(name "python-schematics")
--
2.10.0
[PATCH 15/16] gnu: Add python-nautilus.
* gnu/packages/python.scm (python-nautilus): New variable.
---
gnu/packages/python.scm | 40 +++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 94ebd7d..aadded2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -70,6 +70,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages networking)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages password-utils)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -88,7 +89,6 @@
#:use-module (gnu packages zip)
#:use-module (gnu packages tcl)
#:use-module (gnu packages bdw-gc)
- #:use-module (gnu packages pcre)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -10739,3 +10739,41 @@ with an associated set of resolve methods that know
how to fetch data.")
`(("python2-setuptools" ,python2-setuptools)
("python2-sqlalchemy" ,python2-sqlalchemy)
,@(package-native-inputs base))
+
+(define-public python-nautilus
+ (package
+(name "python-nautilus")
+(version "0.4.9")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "nautilus" version))
+(sha256
+ (base32
+ "01hwzjc1zshk4vvxrcghm398fpy4jls66dyz06g07mrwqif8878p"
+(build-system python-build-system)
+(arguments `(#:tests? #f)) ; fails to import test modules
+(native-inputs
+ `(("python-setuptools" ,python-setuptools)))
+(inputs
+ `(("python-bcrypt" ,python-bcrypt)
+ ("python-click" ,python-click)
+ ("python-consul" ,python-consul)
+ ("python-graphql-core" ,python-graphql-core)
+ ("python-graphql-relay" ,python-graphql-relay)
+ ("python-graphene" ,python-graphene)
+ ("python-jinja2" ,python-jinja2)
+ ("python-nose2" ,python-nose2)
+ ("python-peewee" ,python-peewee)
+ ("python-pika" ,python-pika)
+ ("python-pycparser" ,python-pycparser)
+ ("python-requests" ,python-requests)
+ ("python-tornado" ,python-tornado)
+ ("python-wtforms" ,python-wtforms)))
+(home-page "https://github.com/AlecAivazis/nautilus;)
+(synopsis "Library for creating microservice applications")
+(description
+ "Nautilus is a framework for flux based microservices that looks to
+provide extendible implementations of common aspects of a cloud so that you can
+focus on building massively scalable web applications.")
+(license license:expat)))
--
2.10.0
[PATCH 07/16] gnu: Add python-sqlalchemy-utils.
* gnu/packages/python.scm (python-sqlalchemy-utils): New variable.
---
gnu/packages/python.scm | 31 +++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0ef9b6a..91d82aa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3694,6 +3694,37 @@ simple and Pythonic domain language.")
(define-public python2-sqlalchemy
(package-with-python2 python-sqlalchemy))
+(define-public python-sqlalchemy-utils
+ (package
+(name "python-sqlalchemy-utils")
+(version "0.32.9")
+(source
+ (origin
+(method url-fetch)
+(uri (pypi-uri "SQLAlchemy-Utils" version))
+(sha256
+ (base32
+ "1zbmmh7n8m01ikizn2mj1mfwch26nsr1awv9mvskqry7av0mpy98"
+(build-system python-build-system)
+(inputs
+ `(("python-six" ,python-six)
+ ("python-sqlalchemy" ,python-sqlalchemy)))
+(home-page "https://github.com/kvesteri/sqlalchemy-utils;)
+(synopsis "Various utility functions for SQLAlchemy")
+(description
+ "SQLAlchemy-utils provides various utility functions and custom data types
+for SQLAlchemy. SQLAlchemy is an SQL database abstraction library for
Python.")
+(properties `((python2-variant . ,(delay python2-sqlalchemy-utils
+(license license:bsd-3)))
+
+(define-public python2-sqlalchemy-utils
+ (let ((base (package-with-python2
+(strip-python2-variant python-sqlalchemy-utils
+(package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))
+
(define-public python-alembic
(package
(name "python-alembic")
--
2.10.0
Re: [PATCH] gnu: tbb: Update to 2017_20160722.
On Sun, Sep 11, 2016 at 07:40:03AM +, ng0 wrote: > Efraim Flashner <efr...@flashner.co.il> writes: > > > > > don't forget to mention the license change here. > > Oh, yes. Thanks. > > […] > > Patch pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add sslh.
On Mon, Sep 12, 2016 at 02:32:08AM +0200, Tobias Geerinckx-Rice wrote:
> * gnu/packages/networking.scm (sslh): New variable.
> ---
> gnu/packages/networking.scm | 71
> -
> 1 file changed, 70 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
> index c4edbc3..1818b62 100644
> --- a/gnu/packages/networking.scm
> +++ b/gnu/packages/networking.scm
> @@ -40,6 +40,7 @@
>#:use-module (gnu packages audio)
>#:use-module (gnu packages bison)
>#:use-module (gnu packages check)
> + #:use-module (gnu packages code)
>#:use-module (gnu packages compression)
>#:use-module (gnu packages databases)
>#:use-module (gnu packages flex)
> @@ -54,7 +55,9 @@
>#:use-module (gnu packages perl)
>#:use-module (gnu packages pkg-config)
>#:use-module (gnu packages python)
> - #:use-module (gnu packages tls))
> + #:use-module (gnu packages textutils)
> + #:use-module (gnu packages tls)
> + #:use-module (gnu packages valgrind))
>
> (define-public macchanger
>(package
> @@ -824,3 +827,69 @@ in dynamically linked programs and redirects them
> through one or more SOCKS or
> HTTP proxies.")
> (home-page "https://github.com/rofl0r/proxychains-ng;)
> (license license:gpl2+)))
> +
> +(define-public sslh
> + (package
> +(name "sslh")
> +(version "1.18")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/yrutschle/sslh/archive/v;
> + version ".tar.gz"))
> + (file-name (string-append name "-" version ".tar.gz"))
> + (sha256
> +(base32
> + "1vzw7a7s9lhspbn5zn3hw8hir4pkjgbd68yys4hfsnjp1h7bzjpn"
> +(build-system gnu-build-system)
> +(arguments
> + '(#:phases
> + (modify-phases %standard-phases
> + (delete 'configure); no configure script
> + (add-before 'check 'fix-tests
> + (lambda* _
^^^
Don't need the underscore here
> + (substitute* "./t"
> + (("\"/tmp") "$ENV{\"TMPDIR\"} . \"")
> + (("ip6-localhost") "localhost"
return #t on the substitute
> + ;; Many of these files are mentioned in the man page. Install them.
> + (add-after 'install 'install-documentation
> +(lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (doc (string-append out "/share/doc")))
> +(install-file "README.md" doc)
> +(for-each
> + (lambda (file)
> + (install-file file (string-append doc
> "/examples")))
> + (append (find-files "." "\\.cfg")
> + (find-files "scripts" ".*"
> + #t)))
> + #:make-flags (list "CC=gcc"
> + "USELIBCAP=1"
> + "USELIBWRAP=1"
> + (string-append "PREFIX=" (assoc-ref %outputs
> "out")))
> + #:test-target "test"))
> +(native-inputs
> + ;; Tests dependencies.
> + `(("lcov" ,lcov)
> + ("perl" ,perl)
> + ("perl-io-socket-inet6" ,perl-io-socket-inet6)
> + ("perl-socket6" ,perl-socket6)
> + ("psmisc" ,psmisc)
> + ("valgrind" ,valgrind)))
> +(inputs
> + `(("libcap" ,libcap)
> + ("libconfig" ,libconfig)
> + ("tcp-wrappers" ,tcp-wrappers)))
> +(home-page "http://www.rutschle.net/tech/sslh.shtml;)
> +(synopsis "Applicative network protocol demultiplexer")
> +(description
Is the name specifically lowercase? Otherwise it should be a capital S,
and again a few lines down.
> + "sslh is a network protocol demultiplexer. It acts like a switchboard,
> +accepting connections from clients on one port and forwarding them to
> different
> +servers based on the contents of the first received data packet. Detection
> of
> +common protocols like HTTP(S), SSL, SSH, OpenVPN, tinc, and XMPP is already
> +implemented, but any other protocol that matches a regular expression can be
> +added. sslh's name comes from its original application of serving both SSH
> and
> +HTTPS on port 443, allowing SSH connections from inside corporate firewalls
> +that block port 22.")
> +(license (list license:bsd-2; tls.[ch]
> + license:gpl2+; everything else
> --
> 2.7.4
>
>
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 04/16] gnu: Add python-pytest-mock.
On Sun, Sep 11, 2016 at 09:42:34PM +0200, David Craven wrote:
> > + (inputs
> > + `(("python2-mock" ,python2-mock)
> > + ,@(package-inputs base))
>
> Is python2-mock really an input and not a native-input?
Actually, yes. I was a little suprised that the python3 version didn't
want it also. Since its one of the python test packages it actually
retains references to the other test packages.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 03/16] gnu: Add python-promise.
On Sun, Sep 11, 2016 at 09:41:10PM +0200, David Craven wrote: > > +(define-public python2-promise > > + (let ((promise (package-with-python2 > > + (strip-python2-variant python-promise > > +(package (inherit promise) > > + (arguments (substitute-keyword-arguments (package-arguments promise) > > + ((#:tests? _) #t))) > > I've seen this in a few of your patches. Why do tests fail with python > but not with python-2? In this one the tests require python-futures, which is python2 only. I tried adding python2-futures anyway to the native-inputs but unsuprisingly it didn't help with the tests. The right fix is to have upstream change it so that it says (something like) tests: require: "pytest" ,(version < '3' "futures"); but I need to read up more on my python syntax to suggest a patch. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH 01/16] gnu: Add python-pika.
On Sun, Sep 11, 2016 at 09:37:31PM +0200, David Craven wrote: > the properties delay thing is missing, dunno if it's important the properties delay is needed when the python2 variant includes the strip-python2-variant procedure, following which just about every package that relies on it also needs it, going up the chain. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH v8] gnu: Update ldc to 0.17.1.
(base32
> - "0yc6miidzgl9k33ygk7xcppmfd6kivqj02cvv4fmkbs3qz4yy3z1"))
> + "18h16lwwmr3k9dh7mcip17il72mz680wnygv9d0mdnivczn80zyv"))
> (home-page "http://wiki.dlang.org/LDC;)
> (synopsis "LLVM compiler for the D programming language")
> (description
> diff --git a/gnu/packages/patches/ldc-0.17.1-disable-tests.patch
> b/gnu/packages/patches/ldc-0.17.1-disable-tests.patch
> new file mode 100644
> index 000..b213894
> --- /dev/null
> +++ b/gnu/packages/patches/ldc-0.17.1-disable-tests.patch
> @@ -0,0 +1,86 @@
> +Adapted from "ldc-disable-tests.patch" from Guix.
> +diff -ru a/std/datetime.d b/std/datetime.d
> +--- a/std/datetime.d 2016-08-02 23:56:13.969292202 +0200
> b/std/datetime.d 2016-08-02 23:57:39.078408313 +0200
> +@@ -28080,9 +28080,6 @@
> + import std.algorithm : sort;
> + import std.range : retro;
> + import std.format : format;
> +-
> +-name = strip(name);
> +-
> + enforce(tzDatabaseDir.exists(), new
> DateTimeException(format("Directory %s does not exist.", tzDatabaseDir)));
> + enforce(tzDatabaseDir.isDir, new DateTimeException(format("%s is
> not a directory.", tzDatabaseDir)));
> +
> +@@ -28094,7 +28091,10 @@
> + immutable file = buildNormalizedPath(tzDatabaseDir, tzFilename);
> + }
> + else
> +-immutable file = buildNormalizedPath(tzDatabaseDir, name);
> ++{
> ++auto filename = "./" ~ strip(name); // make sure the prefix is
> not stripped
> ++immutable file = buildNormalizedPath(tzDatabaseDir, filename);
> ++}
> +
> + enforce(file.exists(), new DateTimeException(format("File %s does
> not exist.", file)));
> + enforce(file.isFile, new DateTimeException(format("%s is not a
> file.", file)));
> +diff -ru a/std/path.d b/std/path.d
> +--- a/std/path.d 2016-08-02 23:56:03.781158908 +0200
> b/std/path.d 2016-08-02 23:54:06.111624406 +0200
> +@@ -3724,8 +3724,8 @@
> + }
> + else
> + {
> +-assert(expandTilde("~root") == "/root", expandTilde("~root"));
> +-assert(expandTilde("~root/") == "/root/",
> expandTilde("~root/"));
> ++//assert(expandTilde("~root") == "/root", expandTilde("~root"));
> ++//assert(expandTilde("~root/") == "/root/",
> expandTilde("~root/"));
> + }
> + assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey");
> + }
> +diff -ru a/std/socket.d b/std/socket.d
> +--- a/std/socket.d 2016-08-02 23:56:22.881408857 +0200
> b/std/socket.d 2016-08-03 10:09:44.761019447 +0200
> +@@ -501,18 +501,19 @@
> + version(CRuntime_Bionic) {} else
> + unittest
> + {
> +-softUnittest({
> ++pragma(msg, "test disabled on GNU Guix");
> ++//softUnittest({
> + Protocol proto = new Protocol;
> +- assert(proto.getProtocolByType(ProtocolType.TCP));
> ++//assert(proto.getProtocolByType(ProtocolType.TCP));
> + //writeln("About protocol TCP:");
> + //writefln("\tName: %s", proto.name);
> + // foreach(string s; proto.aliases)
> + // {
> + // writefln("\tAlias: %s", s);
> + // }
> +-assert(proto.name == "tcp");
> +-assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
> +-});
> ++//assert(proto.name == "tcp");
> ++//assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
> ++//});
> + }
> +
> +
> +@@ -842,6 +843,8 @@
> +
> + unittest
> + {
> ++pragma(msg, "test disabled on GNU Guix");
> ++/*
> + InternetHost ih = new InternetHost;
> +
> + ih.getHostByAddr(0x7F_00_00_01);
> +@@ -872,6 +875,7 @@
> + // writefln("aliases[%d] = %s", i, s);
> + // }
> + });
> ++*/
> + }
> +
> +
> +Only in b/std: socket.d.orig
With this patch I got:
The following tests FAILED:
238 - std.datetime (Failed)
296 - std.regex.internal.tests (Failed)
568 - std.datetime-debug (Failed)
626 - std.regex.internal.tests-debug (Failed)
670 - dmd-testsuite-debug (Failed)
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH v4 3/3] gnu: Update ldc to 0.17.1.
https://wiki.dlang.org/LDC https://github.com/ldc-developers/ldc/releases/tag/v0.17.1 After 0.17.1 is working on guix *someone* should change the supported platforms to include arm. Based on the wiki it sounds like maybe we should try building it on mips also. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
On Tue, Sep 13, 2016 at 02:01:33PM -0400, Kei Kebreau wrote:
> Leo Famulari <l...@famulari.name> writes:
>
> > On Tue, Sep 13, 2016 at 10:37:56AM -0400, Kei Kebreau wrote:
> >> Kei Kebreau <k...@openmailbox.org> writes:
> >> > A component necessary for GNU Octave's GUI.
> >> > How does it look?
> >> Not sure how packaging Qt packages goes, but I've discovered that
> >> GNU Octave's GUI only builds with Qt4 support. I've changed the patch to
> >> adjust this. Should I leave the old patch as is and add a qt4 package
> >> that inherits from it?
> >
> > Since Qt 4 is no longer supported upstream, we are trying to remove
> > users of the qt-4 package so that we can eventually remove the qt-4
> > package itself.
> >
> > With that in mind, how about a qscintilla-for-octave package? This
> > package can inherit from a qscintilla that uses qtbase, and I think it
> > should be declared privately [using (define) instead of (define-public].
> >
> >> + (replace 'configure
> >> + (lambda _
> >> + (chdir "Qt4Qt5")
> >> + (zero? (system* "qmake" "qscintilla.pro"
> >
> > I would change directory in a separate 'chdir' phase.
> >
> >> + (substitute* (find-files "." "Makefile")
> >> + (((string-append "INSTALL_ROOT)" qt))
> >> + (string-append "INSTALL_ROOT)" out)
> > ^
> > Inconsistent indentation. Also, this phase should return #t, since the
> > return value of substitute* is unspecified.
> >
> >> +(synopsis "Qt5 port of the Scintilla editing component")
> >
> > Make sure to adjust the Qt name as appropriate :)
>
> Like below? And how could I then access qscintilla-for-octave from
> maths.scm if it isn't defined publicly?
>
> (define-public qscintilla
> (package
> (name "qscintilla")
> (version "2.9.3")
> (source (origin
> (method url-fetch)
> (uri (string-append
> "mirror://sourceforge/QScintilla2/QScintilla-"
> version "/QScintilla_gpl-" version
> ".tar.gz"))
> (sha256
>(base32
> "0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
> (build-system gnu-build-system)
> (arguments
> `(#:phases
>(modify-phases %standard-phases
> (add-before 'configure 'change-directory
>(lambda _ (chdir "Qt4Qt5") #t))
> (replace 'configure
>(lambda _ (zero? (system* "qmake" "qscintilla.pro"
> (add-before 'install 'fix-Makefiles
>(lambda* (#:key inputs outputs #:allow-other-keys)
> (let ((out(assoc-ref outputs "out"))
>(qtbase (assoc-ref inputs "qtbase")))
>(substitute* (find-files "." "Makefile")
> (((string-append "INSTALL_ROOT)" qtbase))
>(string-append "INSTALL_ROOT)" out
> #t)
> (native-inputs
> `(("python-pyqt" ,python-pyqt)
>("qtbase" ,qtbase))) ; for qmake
> (home-page "https://www.riverbankcomputing.com/software/qscintilla/intro;)
> (synopsis "Qt5 port of the Scintilla editing component")
> (description
> "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
> control.
> As well as features found in standard text editing components, QScintilla
> includes features especially useful when editing and debugging source code.
> These include support for syntax styling, error indicators, code completion
> and
> call tips.")
> (license (list license:bsd-2 ; Python/configure.py
>license:expat ; src/ and include/
>license:gpl3
>
> (define qtscintilla-for-octave
This should be qtscintilla-qt4, we might have a use for it outside of
octave
> (package
> (inherit qtscintilla)
> (name "qtscintilla-for-octave")
> (arguments
> `(#:phases
>(modify-phases %standard-phases
> (add-before 'configure 'change-directory
>(lambda _ (chdir "Qt4Qt5") #t))
> (replace 'configure
>(lambda _ (zero? (system* "qmake" "qscintilla.pro"
> (add-before 'install 'fix-Makefiles
>
Re: [PATCH v8] gnu: Update ldc to 0.17.1.
On Wed, Sep 14, 2016 at 05:55:37PM +0200, Danny Milosavljevic wrote: > Hi, > > > With this patch I got: > > > > The following tests FAILED: > > 238 - std.datetime (Failed) > > 296 - std.regex.internal.tests (Failed) > > 568 - std.datetime-debug (Failed) > > 626 - std.regex.internal.tests-debug (Failed) > > 670 - dmd-testsuite-debug (Failed) > > Huh really? > > I just cloned the guix git repo into a new directory, applied exactly this > patch, bootstrapped, built everything, then did ./pre-inst-env guix package > -i ldc and it worked, tests and all... (on x86_64 on GuixSD) > > Which architecture was your test on? > > Can you check what exactly failed? There should be a log in there (if you > built it using "--keep-failed" at least). I'm running guix on debian, on x86_64. I didn't build with -K unfortunately. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH 1/1] gnu: curl: Update replacement to 7.50.3 [fixes CVE-2016-7167].
On Wed, Sep 14, 2016 at 01:23:20PM -0400, Leo Famulari wrote: > * gnu/packages/curl.scm (curl)[replacement]: Update to 7.50.3. > (curl-7.50.2): Replace with > (curl-7.50.3): ... this. > --- > gnu/packages/curl.scm | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm > index f3c0ade..5cd8086 100644 > --- a/gnu/packages/curl.scm > +++ b/gnu/packages/curl.scm > @@ -40,7 +40,7 @@ > (define-public curl >(package > (name "curl") > - (replacement curl-7.50.2) > + (replacement curl-7.50.3) > (version "7.47.0") > (source (origin > (method url-fetch) > @@ -125,15 +125,15 @@ tunneling, and so on.") >"See COPYING in the distribution.")) > (home-page "http://curl.haxx.se/;))) > > -(define curl-7.50.2 > +(define curl-7.50.3 >(package > (inherit curl) > (source > - (let ((version "7.50.2")) > + (let ((version "7.50.3")) > (origin >(method url-fetch) >(uri (string-append "https://curl.haxx.se/download/curl-; >version ".tar.lzma")) >(sha256 > (base32 > -"0d5ly1xms0hh5zkv0m77d50c1816ywmbvmi1m158jyl70ndi9gby"))) > +"1spmk0345hq0sgpwxs8d410268lmg3wf1x9v23hxff7wxki5fm4c"))) > -- > 2.10.0 > > Looks straightforward. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
On September 14, 2016 11:37:46 PM GMT+03:00, Kei Kebreau <k...@openmailbox.org>
wrote:
>Leo Famulari <l...@famulari.name> writes:
>
>> On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote:
>>> Leo Famulari <l...@famulari.name> writes:
>>>
>>> > On Tue, Sep 13, 2016 at 08:48:43PM +, Efraim Flashner wrote:
>>> >> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau
>>> >> <k...@openmailbox.org> wrote:
>>> >> >In this case, should I leave qtscintilla-qt4 as a public package
>in
>>> >> >qt.scm
>>> >> >instead of maths.scm as Leo suggested?
>>> >>
>>> >> That's where I would leave it. You could also leave a note,
>saying
>>> >> that it was for octave, and if they switch to qt5 then we can get
>rid
>>> >> of it. We still have an old vte package I added for a terminal
>since
>>> >> all the bug reports around it haven't been cleared yet, and
>that's
>>> >> with the other versions of vte. --
>>> >
>>> > Sounds like a plan!
>>>
>>> Alright then! I have all three patches here. Tell me if I did
>anything
>>> funny. The order of application is "Add qscintilla, Add
>qscintilla-qt4,
>>> Enable Octave's Qt 4 GUI." :)
>>
>> The patches "Add qscintilla" and "Add qscintilla-qt4" both add both
>> packages.
>
>Fixed it.
If you switch ("qtbase" ,qtbase) to ("qt" ,qtbase) can you remove the whole
argument block from qscintilla?
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH] gnu: Add git-review.
On Thu, Sep 08, 2016 at 10:28:37PM +1000, Ben Woodcroft wrote:
> Hi there, thanks for the patch. I do not have any experience with Gerrit but
> some comments below:
>
>
> On 08/09/16 17:06, Clément Lassieur wrote:
> > [..]
> > +(source
> > + (origin
> > + (method url-fetch)
> > + (uri (string-append
> > +
> > "https://pypi.python.org/packages/source/g/git-review/git-review-;
> > + version ".tar.gz"))
>
> Rather: (uri (pypi-uri "git-review" version))
>
> > + (sha256
> > +(base32
> > + "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"
> > +(build-system python-build-system)
> > +(arguments `(#:tests? #f)) ; tests require a running Gerrit server
> > +(native-inputs
> > + `(("python-pbr" ,python-pbr)))
> > +(inputs
> > + `(("python-requests" ,python-requests)
> > + ("git" ,git)))
>
> I think including git simply as an input is problematic because git-review
> calls git via 'subprocess', as evidenced by
>
> $ ./pre-inst-env guix environment -C --ad-hoc git-review
> $ git-review
> [..]
> File
> "/gnu/store/m4gc2wx4q9if1vrhgclpspdil7rqsn21-python-3.4.3/lib/python3.4/subprocess.py",
> line 1457, in _execute_child
> raise child_exception_type(errno_num, err_msg)
> FileNotFoundError: [Errno 2] No such file or directory: 'git'
>
> So, I think we need to patch the source code to call the full path to git,
> or otherwise wrap the 'git-review' executable.
>
> > +(home-page "http://docs.openstack.org/infra/git-review/;)
> > +(synopsis "Command-line tool for Gerrit")
> > +(description
> > + "Git-review is a command-line tool that helps submitting Git branches
> > to
> > +Gerrit for review, or fetching existing ones.")
> > +(license asl2.0)))
> Otherwise seems OK to me. Can you test with environment -C -N?
> ben
>
Oh no! I just pushed this.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH]: opensmtpd, opensmtpd-extras, libasr.
ge
> +(name "opensmtpd-extras")
> +(version "5.7.1")
> +(source (origin
> + (method url-fetch)
> + (uri (string-append "https://www.opensmtpd.org/archives/;
> + name "-" version ".tar.gz"))
> + (sha256
> + (base32
> +"1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm"
> +(build-system gnu-build-system)
> +(inputs
> + `(("libressl" ,libressl)
> + ("libevent" ,libevent)
> + ("libasr" ,libasr)
> + ("python-2" ,python-2)
> + ("opensmtpd" ,opensmtpd)
> + ("perl" ,perl)
> + ("lua" ,lua)
> + ("postgresql" ,postgresql)
> + ("mariadb" ,mariadb)
I would remove postgresql and mariadb in an attempt to keep the closure
size smaller.
> + ("sqlite" ,sqlite)
> + ("linux-pam" ,linux-pam)))
> +(native-inputs
> + `(("bison" ,bison)
> + ("pkg-config" ,pkg-config)
> + ("groff" ,groff)
> + ("automake" ,automake)
> + ("autoconf" ,autoconf)))
> +(arguments
> + `(#:configure-flags (list
> + "--with-filter-clamav"
> "--with-filter-dkim-signer"
> + "--with-filter-dnsbl" "--with-filter-lua"
> + "--with-filter-monkey""--with-filter-pause"
> + "--with-filter-perl" "--with-filter-python"
> + "--with-filter-regex"
> "--with-filter-spamassassin"
> + "--with-filter-stub" "--with-filter-trace"
> + "--with-filter-void"
> +
> + "--with-queue-null" "--with-queue-python"
> + "--with-queue-ram""--with-queue-stub"
> +
> + "--with-scheduler-python" "--with-scheduler-ram"
> + "--with-scheduler-stub"
> +
> + "--with-table-ldap" "--with-table-mysql"
> + "--with-table-passwd" "--with-table-postgres"
> + "--with-table-python" "--with-table-socketmap"
> + "--with-table-sqlite" "--with-table-stub"
> + ;;"--with-table-redis"; TODO: package hiredis
> +
> + "--with-user=smtpd"
> "--with-privsep-user=smtpd"
> + "--localstatedir=/var""--sysconfdir=/etc"
> + "--with-lua-type=lua" ; can use lua or luajit
> +
> + (string-append "--with-python="
> + (assoc-ref %build-inputs
> "python-2"))
> + (string-append "--with-lua="
> + (assoc-ref %build-inputs "lua")
> +(license (list bsd-2 bsd-3 bsd-4 non-copyleft
> + public-domain isc openssl))
what a list! Care to elaborate?
> +(synopsis "Extra tables, filters, and various other addons for
> OpenSMTPD")
> +(description
> + "This package provides extra tables, filters, and various other addons
> +for OpenSMTPD to extend its functionality.")
> +(home-page "https://www.opensmtpd.org;)))
> --
> 2.10.0
>
>
> --
> ng0
> For non-prism friendly talk find me on http://www.psyced.org
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add python-git-review.
Patch pushed! -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add git-review.
On Thu, Sep 08, 2016 at 10:28:37PM +1000, Ben Woodcroft wrote:
> Hi there, thanks for the patch. I do not have any experience with Gerrit but
> some comments below:
>
>
> On 08/09/16 17:06, Clément Lassieur wrote:
> > [..]
> > +(source
> > + (origin
> > + (method url-fetch)
> > + (uri (string-append
> > +
> > "https://pypi.python.org/packages/source/g/git-review/git-review-;
> > + version ".tar.gz"))
>
> Rather: (uri (pypi-uri "git-review" version))
>
> > + (sha256
> > +(base32
> > + "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"
> > +(build-system python-build-system)
> > +(arguments `(#:tests? #f)) ; tests require a running Gerrit server
> > +(native-inputs
> > + `(("python-pbr" ,python-pbr)))
> > +(inputs
> > + `(("python-requests" ,python-requests)
> > + ("git" ,git)))
>
> I think including git simply as an input is problematic because git-review
> calls git via 'subprocess', as evidenced by
>
> $ ./pre-inst-env guix environment -C --ad-hoc git-review
> $ git-review
> [..]
> File
> "/gnu/store/m4gc2wx4q9if1vrhgclpspdil7rqsn21-python-3.4.3/lib/python3.4/subprocess.py",
> line 1457, in _execute_child
> raise child_exception_type(errno_num, err_msg)
> FileNotFoundError: [Errno 2] No such file or directory: 'git'
>
> So, I think we need to patch the source code to call the full path to git,
> or otherwise wrap the 'git-review' executable.
>
> > +(home-page "http://docs.openstack.org/infra/git-review/;)
> > +(synopsis "Command-line tool for Gerrit")
> > +(description
> > + "Git-review is a command-line tool that helps submitting Git branches
> > to
> > +Gerrit for review, or fetching existing ones.")
> > +(license asl2.0)))
> Otherwise seems OK to me. Can you test with environment -C -N?
> ben
>
Try it with the attached patch
--
Efraim Flashner <efr...@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
From cb5146c8eea6ea35b1ad058345f4759b36384eb4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efr...@flashner.co.il>
Date: Thu, 8 Sep 2016 21:31:32 +0300
Subject: [PATCH] gnu: python-git-review: Hardcode git path.
* gnu/packages/openstack.scm (python-git-review)[arguments]: Hardcode
the location of `git' so that `git-review' can find it natively.
---
gnu/packages/openstack.scm | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 4cb38a9..d7876a8 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -796,7 +796,19 @@ permanence.")
(base32
"07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"
(build-system python-build-system)
-(arguments `(#:tests? #f)) ; tests require a running Gerrit server
+(arguments
+ `(#:tests? #f ; tests require a running Gerrit server
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-git-calls
+ (lambda _
+ (let ((git (string-append
+ (assoc-ref %build-inputs "git") "/bin/git")))
+ (substitute* "git_review/cmd.py"
+(("\"git ") (string-append "\"" git " "))
+(("\"git\"") (string-append "\"" git "\""))
+(("'git'") (string-append "'" git "'")))
+ #t))
(native-inputs
`(("python-pbr" ,python-pbr)))
(inputs
--
2.10.0
signature.asc
Description: PGP signature
Re: [PATCH v2 2/3] gnu: Add filteraudio.
On Thu, Sep 08, 2016 at 09:02:30PM -0400, Erik Edrosa wrote:
> * gnu/packages/audio.scm (filteraudio): New variable.
> ---
> gnu/packages/audio.scm | 33 +
> 1 file changed, 33 insertions(+)
>
> diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
> index 40cc029..cc51d88 100644
> --- a/gnu/packages/audio.scm
> +++ b/gnu/packages/audio.scm
> @@ -2483,3 +2483,36 @@ with support for HD extensions.")
> flavors EBU R128, ATSC A/85, and ReplayGain 2.0. It helps normalizing the
> loudness of audio and video files to the same level.")
> (license license:gpl2+)))
> +
> +(define-public filteraudio
> + (let ((revision "1")
> +(commit "2fc669581e2a0ff87fba8de85861b49133306094"))
> +(package
> + (name "filteraudio")
> + (version (string-append "0.0.0-" revision "."
> + (string-take commit 7)))
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/irungentoo/filter_audio.git;)
> + (commit commit)))
> + (file-name (string-append name "-" version "-checkout"))
> + (sha256
> + (base32
> + "0hbb290n3wb23f2k692a6bhc23nnqmxqi9sc9j15pnya8wifw64g"
> + (build-system gnu-build-system)
> + (arguments
> + '(#:make-flags (list (string-append "PREFIX=" %output)
> +"CC=gcc")
> + ;; No tests
> + #:tests? #f
> + #:phases
> + (modify-phases %standard-phases
> + ;; No configure script
> + (delete 'configure
> + (synopsis "Lightweight audio filtering library")
> + (description "An easy to use audio filtering library made from webrtc
> code, used
> +in @code{libtoxcore}.")
> + (home-page "https://github.com/irungentoo/filter_audio;)
> + (license license:bsd-3
> --
> 2.10.0
>
Patch pushed!
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH v2 3/3] gnu: Add utox.
On Thu, Sep 08, 2016 at 09:02:31PM -0400, Erik Edrosa wrote:
> * gnu/packages/messaging.scm (utox): New variable.
> ---
> gnu/packages/messaging.scm | 51
> --
> 1 file changed, 49 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index b95239a..055cb7b 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -24,7 +24,7 @@
>
> (define-module (gnu packages messaging)
>#:use-module ((guix licenses)
> -#:select (gpl3+ gpl2+ gpl2 lgpl2.1 lgpl2.0+ bsd-2
> non-copyleft
> +#:select (gpl3+ gpl3 gpl2+ gpl2 lgpl2.1 lgpl2.0+ bsd-2
> non-copyleft
>asl2.0 x11))
>#:use-module (guix utils)
>#:use-module (guix packages)
> @@ -64,7 +64,9 @@
>#:use-module (gnu packages tls)
>#:use-module (gnu packages icu4c)
>#:use-module (gnu packages video)
> - #:use-module (gnu packages xiph))
> + #:use-module (gnu packages xiph)
> + #:use-module (gnu packages audio)
> + #:use-module (gnu packages fontutils))
>
> (define-public libotr
>(package
> @@ -612,4 +614,49 @@ protocols.")
>(license gpl3+)
>(home-page "https://tox.chat;
>
> +(define-public utox
> + (package
> + (name "utox")
> + (version "0.9.8")
> + (source
> +(origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/GrayHatter/uTox/archive/v;
> + version ".tar.gz"))
> + (file-name (string-append name "-" version ".tar.gz"))
> + (sha256
> + (base32
> + "13hfqbwzcgvfbvf9yjm62aqsvxnpqppb50c88sys43m7022yqcsy"
> + (build-system gnu-build-system)
> + (arguments
> +'(#:make-flags (list (string-append "PREFIX=" %output)
> + "CC=gcc")
> + ;; No tests
> + #:tests? #f
> + #:phases
> + (modify-phases %standard-phases
> +;; No configure script
> +(delete 'configure
> + (inputs
> +`(("dbus" ,dbus)
> + ("filteraudio" ,filteraudio)
> + ("fontconfig" ,fontconfig)
> + ("freetype" ,freetype)
> + ("libsodium" ,libsodium)
> + ("libtoxcore" ,libtoxcore)
> + ("libvpx" ,libvpx)
> + ("libx11" ,libx11)
> + ("libxext" ,libxext)
> + ("libxrender" ,libxrender)
> + ("openal" ,openal)
> + ("v4l-utils" ,v4l-utils)))
> + (native-inputs
> +`(("pkg-config" ,pkg-config)))
> + (synopsis "Lightweight Tox client")
> + (description "The lightest and fluffiest Tox client. Tox is a
> +distributed and secure instant messenger with audio and video chat
> +capabilities.")
> + (home-page "http://utox.org/;)
> + (license gpl3)))
> +
> ;;; messaging.scm ends here
> --
> 2.10.0
>
Patch pushed!
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 1/2] gnu: Add edi.
On Thu, Sep 08, 2016 at 11:41:27PM -0500, Eric Bavier wrote:
> On Thu, 8 Sep 2016 13:44:38 +0300
> Efraim Flashner <efr...@flashner.co.il> wrote:
>
> > * gnu/packages/enlightenment.scm (edi): New variable.
> > ---
> > gnu/packages/enlightenment.scm | 26 ++
> > 1 file changed, 26 insertions(+)
> >
> > diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
> > index 7cd11b5..a0c5a83 100644
> > --- a/gnu/packages/enlightenment.scm
> > +++ b/gnu/packages/enlightenment.scm
> > @@ -275,3 +275,29 @@ Libraries stack (eo, evas, ecore, edje, emotion,
> > ethumb and elementary).")
> >
> > (define-public python2-efl
> >(package-with-python2 python-efl))
> > +
> > +(define-public edi
> > + (package
> > +(name "edi")
> > +(version "0.4.0")
> > +(source
> > + (origin
> > +(method url-fetch)
> > +(uri (list
> > + (string-append
> > "https://download.enlightenment.org/rel/apps/edi;
> > + "/edi-" version ".tar.bz2")
> > + (string-append
> > "https://github.com/ajwillia-ms/edi/releases/;
> > + "download/v" version "/edi-" version
> > ".tar.bz2")))
> > +(sha256
> > + (base32
> > + "02d8hplcviayri8fxws56n362k6zqsf62v8pbn5sbgwrmkqwybhc"
> > +(build-system gnu-build-system)
> > +(native-inputs `(("pkg-config" ,pkg-config)))
> > +(inputs `(("efl" ,efl)))
>
> Apparently EDI can use libclang for syntax highlighting. Would that be
> useful enough to add clang as an input?
It would. I was worried about how big clang is compared to the rest of
the package, but with the shared libraries bringing its size down it
should be good.
>
> > +(home-page "https://www.enlightenment.org/about-edi;)
> > +(synopsis "Development environment using the EFL")
>
> I think its best (and the guix manual suggests) to avoid acronyms in
> the package synopsis. Maybe: "Development environment for
> Enlightenment"?
>
They try to draw (somewhat of) a distinction beween the libraries and
the desktop, but considering the description blurs it again this sounds
good.
> > +(description "EDI is a development environment designed for and built
> > using
> > +the EFL. It's aim is to create a new, native development environment for
> > Linux
> > +that trys to lower the barrier to getting involved in Enlightenment
> > development
>
> "tries"
>
> > +and in creating apps based on the EFL suite.")
>
> That word makes me cringe every time.
>
> > +(license license:gpl2)))
>
> According to COPYING, the code in 'data/extra/skeleton' is
> public-domain. The other GPLv2 source doesn't appear to contain
> license headers, so I think we're allowed to say gpl2+. There's also a
> COPYING.LGPL file, the header of which say it applies to "Elm_Code",
> but I can't seem to find where that code lives. And then the
> edi/packaging/pkgbuild/PKGBUILD file has "license=('WTFPL')" in it. I
> haven't looked at the other enlightenment software, do they all have
> license situations like this?
>
> Could you look into it some more and get some clarification?
>
elm_code got removed after 0.3.0 but the license wasn't. the skeleton i
believe is for if you just want a new, "default" EFL package, so while
it gets included in the install, to me it seems more like text than
code. Then again its there so I should mention it. I'm not sure why it
says WTFPL in their PKGBUILD file but I'll ask about it. Most of their
programs are light in license headers.
> Thanks,
> `~Eric
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH 0/2] OpenJPEG security fixes (CVE-2016-{5157,7163})
On Fri, Sep 09, 2016 at 02:04:39AM -0400, Leo Famulari wrote: > Two bugs disclosed in OpenJPEG, CVE-2016-5157 and CVE-2016-7163. Both > can be used to execute arbitrary code, apparently. Ah! my favorite kind of code! Joking aside, why not patch both CVEs at the same time? > > CVE-2016-7163: > http://seclists.org/oss-sec/2016/q3/442 > > CVE-2016-5157: > http://seclists.org/oss-sec/2016/q3/441 > > Leo Famulari (2): > gnu: openjpeg-2.*: Fix CVE-2016-7163. > gnu: openjpeg-2.*: Fix CVE-2016-5157. > > gnu/local.mk | 2 + > gnu/packages/image.scm| 8 +- > gnu/packages/patches/openjpeg-CVE-2016-5157.patch | 98 > +++ > gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 > 4 files changed, 177 insertions(+), 2 deletions(-) > create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-5157.patch > create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch > > -- > 2.10.0 > > -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH 1/2] gnu: openjpeg-2.*: Fix CVE-2016-7163.
+ src/lib/openjp2/pi.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
> +index 36e2ff0..809b33d 100644
> +--- a/src/lib/openjp2/pi.c
> b/src/lib/openjp2/pi.c
> +@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t
> *p_image,
> + l_current_pi->include = 00;
> + if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
> + {
> +-l_current_pi->include = (OPJ_INT16*)
> opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
> ++l_current_pi->include = (OPJ_INT16*)
> opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
> + }
> +
> + if
> +--
> +2.10.0
> +
Was from here down put/left here intentionally? It looks out of place
> +From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
> +From: trylab <try...@users.noreply.github.com>
> +Date: Tue, 6 Sep 2016 13:55:49 +0800
> +Subject: [PATCH] Fix an integer overflow issue (#809)
> +
> --
> 2.10.0
>
>
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] gnu: tbb: Update to 2017_20160722.
On Fri, Sep 09, 2016 at 04:13:54PM +, ng0 wrote: > Eric Bavier <ericbav...@openmailbox.org> writes: > > > On 2016-09-09 10:10, ng0 wrote: > >> Eric Bavier <ericbav...@openmailbox.org> writes: > >> > >>> The 2017 version also brings with it a change in license from GPLv2 > >>> with > >>> libstdc++ runtime exception to the ASL2.0. Could you include that in > >>> this patch too? > >>> > >>> Thanks, > >>> -- > >>> `~Eric > >>> > >> > >> This is what I used in the mislead "Add tbb" patch I've sent > >> yesterday. It is now completely ASL2.0, or is it GPL2+ASL2.0? I've read > >> it yesterday as ASL only. > > > > ASL only AFAICT. The www.threadbuildingblocks.org/licensing page says > > GPLv2, but that may just be outdated. The tarball is ASL, which is what > > we have to go with. > > > > -- > > `~Eric > > > > Ok. > > From a3708f40b760009c5128bd048d5cba1a63462909 Mon Sep 17 00:00:00 2001 > From: ng0 <n...@we.make.ritual.n0.is> > Date: Thu, 8 Sep 2016 23:04:52 + > Subject: [PATCH] gnu: tbb: Update to 2017. > > * gnu/packages/tbb.scm (tbb): Update to 2017. don't forget to mention the license change here. > --- > gnu/packages/tbb.scm | 11 +-- > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm > index 0e9db72..c19391a 100644 > --- a/gnu/packages/tbb.scm > +++ b/gnu/packages/tbb.scm > @@ -1,5 +1,6 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net> > +;;; Copyright © 2016 ng0 <n...@we.make.ritual.n0.is> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -27,16 +28,16 @@ > (define-public tbb >(package > (name "tbb") > -(version "4.3.2") > +(version "2017") > (source (origin >(method url-fetch) >(uri (string-append > "https://www.threadingbuildingblocks.org/sites/default; > "/files/software_releases/source/" > -"tbb43_20141204oss_src.tgz")) > +"tbb" version "_20160722oss_src.tgz")) >(sha256 > (base32 > -"0jsczl99jfgj47kj7c4sd4fk7v3rbaiax1ng9ypykz1hh0lrrsws")) > +"038rmv3s8si51bjrzwyv8ldqw742fjjdfayi8pmjaq5zw32b8pzx")) >(modules '((guix build utils))) >(snippet > '(substitute* "build/common.inc" > @@ -85,6 +86,4 @@ the low-level threading details necessary for optimal > multi-core performance. > It uses common C++ templates and coding style to eliminate tedious threading > implementation work. It provides parallel loop constructs, asynchronous > tasks, synchronization primitives, atomic operations, and more.") > -;; GPLv2 with run-time exception: > -;; <https://www.threadingbuildingblocks.org/licensing#runtime-exception> > -(license gpl2))) > +(license asl2.0))) > -- > 2.10.0 > > > -- > ng0 > For non-prism friendly talk find me on http://www.psyced.org -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add perl-mhonarc.
On Wed, Sep 07, 2016 at 06:24:39PM +, ng0 wrote: > * gnu/packages/mail.scm (perl-mhonarc): New variable. > --- > gnu/packages/mail.scm | 23 +++ > 1 file changed, 23 insertions(+) > > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index c2fc1a9..9740339 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -1388,3 +1388,26 @@ to mbox files, maildir folders or a Mail Delivery > Agent (MDA), > TLS/SSL, several authentication methods, Internationalized Domain > Names (IDN) and SOCKS proxies.") > (license gpl3+))) > + > +(define-public perl-mhonarc > + (package > +(name "perl-mhonarc") > +(version "2.6.19") > +(source > + (origin > + (method url-fetch) > + (uri (string-append > + "mirror://cpan/authors/id/E/EH/EHOOD/MHonArc-" > + version ".tar.gz")) > + (sha256 > +(base32 > + "0ll3v93yji334zqp6xfzfxc0127pmjcznmai1l5q6dzawrs2igzq" > +(build-system perl-build-system) > +(home-page "https://www.mhonarc.org/;) > +(synopsis "Create HTML archives of mail/news messages") > +(description > + "MHonArc is a Perl mail-to-HTML converter. MHonArc > +provides HTML mail archiving with index, mail thread linking, > +etc; plus other capabilities including support for MIME and > +powerful user customization features.") > +(license gpl2))) > -- > 2.10.0 > This looks good to me. Anyone else want to take a look at it before I push it? -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: gnurl: Update to 7.50.2-1.
On Sat, Sep 10, 2016 at 12:19:03PM +, ng0 wrote:
> * gnu/packages/gnunet.scm (gnurl): Update to 7.50.2-1.
> ---
> gnu/packages/gnunet.scm | 19 +++
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
> index cdc9872..60aa671 100644
> --- a/gnu/packages/gnunet.scm
> +++ b/gnu/packages/gnunet.scm
> @@ -158,7 +158,7 @@ and support for SSL3 and TLS.")
> (define-public gnurl
>(package
> (name "gnurl")
> - (version "7.50.1")
> + (version "7.50.2-1")
> (source (origin
> (method url-fetch)
> (uri (let ((version-with-underscores
> @@ -167,7 +167,7 @@ and support for SSL3 and TLS.")
>name "-" version-with-underscores
> ".tar.bz2")))
> (sha256
> (base32
> - "0irb8df3lqd9w1pb627q260hn448vbkh0sn4l6p6jh0q8lqscv84"
> + "0bxm2015xvcazgh103hi5rpdnl2hbipx0gd5z6a65bj6nzky0pml"
> (build-system gnu-build-system)
> (inputs `(("gnutls" ,gnutls)
> ("libidn" ,libidn)
> @@ -189,21 +189,16 @@ and support for SSL3 and TLS.")
>"--disable-telnet" "--disable-tftp"
> "--disable-pop3"
>"--disable-imap" "--disable-smtp"
> "--disable-gopher"
>"--disable-file" "--disable-ftp" "--disable-smb")
> - #:test-target "test"
> - #:parallel-tests? #f
> - #:phases
> - ;; We have to patch runtests.pl in tests/ directory
> + #:test-target "test"
> + #:parallel-tests? #f
> + #:phases
> + ;; We have to patch runtests.pl in tests/ directory
>(alist-cons-before
> 'check 'patch-runtests
> (lambda _
> (substitute* "tests/runtests.pl"
> (("/bin/sh") (which "sh"
> - ;; To be discussed with upstream.
> - (alist-cons-before
> -'check 'delete-failing-test1139
> -(lambda _
> - (delete-file "tests/data/test1139"))
> - %standard-phases
> + %standard-phases)))
> (synopsis "Microfork of cURL with support for the HTTP/HTTPS/GnuTLS
> subset of cURL")
> (description
> "Gnurl is a microfork of cURL, a command line tool for transferring data
> --
> 2.10.0
>
Pushed, with a note in the commit message about removing the
'delete-failing-test1139 phase.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
Re: [PATCH] gnu: Add qscintilla.
On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau <k...@openmailbox.org>
wrote:
>Efraim Flashner <efr...@flashner.co.il> writes:
>
>> On Tue, Sep 13, 2016 at 02:01:33PM -0400, Kei Kebreau wrote:
>>> Leo Famulari <l...@famulari.name> writes:
>>>
>>> > On Tue, Sep 13, 2016 at 10:37:56AM -0400, Kei Kebreau wrote:
>>> >> Kei Kebreau <k...@openmailbox.org> writes:
>>> >> > A component necessary for GNU Octave's GUI.
>>> >> > How does it look?
>>> >> Not sure how packaging Qt packages goes, but I've discovered that
>>> >> GNU Octave's GUI only builds with Qt4 support. I've changed the
>patch to
>>> >> adjust this. Should I leave the old patch as is and add a qt4
>package
>>> >> that inherits from it?
>>> >
>>> > Since Qt 4 is no longer supported upstream, we are trying to
>remove
>>> > users of the qt-4 package so that we can eventually remove the
>qt-4
>>> > package itself.
>>> >
>>> > With that in mind, how about a qscintilla-for-octave package? This
>>> > package can inherit from a qscintilla that uses qtbase, and I
>think it
>>> > should be declared privately [using (define) instead of
>(define-public].
>>> >
>>> >> + (replace 'configure
>>> >> + (lambda _
>>> >> + (chdir "Qt4Qt5")
>>> >> + (zero? (system* "qmake" "qscintilla.pro"
>>> >
>>> > I would change directory in a separate 'chdir' phase.
>>> >
>>> >> + (substitute* (find-files "." "Makefile")
>>> >> + (((string-append "INSTALL_ROOT)" qt))
>>> >> + (string-append "INSTALL_ROOT)" out)
>>> > ^
>>> > Inconsistent indentation. Also, this phase should return #t, since
>the
>>> > return value of substitute* is unspecified.
>>> >
>>> >> +(synopsis "Qt5 port of the Scintilla editing component")
>>> >
>>> > Make sure to adjust the Qt name as appropriate :)
>>>
>>> Like below? And how could I then access qscintilla-for-octave from
>>> maths.scm if it isn't defined publicly?
>>>
>>> (define-public qscintilla
>>> (package
>>> (name "qscintilla")
>>> (version "2.9.3")
>>> (source (origin
>>> (method url-fetch)
>>> (uri (string-append
>"mirror://sourceforge/QScintilla2/QScintilla-"
>>> version "/QScintilla_gpl-" version
>".tar.gz"))
>>> (sha256
>>>(base32
>>>
>"0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq"
>>> (build-system gnu-build-system)
>>> (arguments
>>> `(#:phases
>>>(modify-phases %standard-phases
>>> (add-before 'configure 'change-directory
>>>(lambda _ (chdir "Qt4Qt5") #t))
>>> (replace 'configure
>>>(lambda _ (zero? (system* "qmake" "qscintilla.pro"
>>> (add-before 'install 'fix-Makefiles
>>>(lambda* (#:key inputs outputs #:allow-other-keys)
>>> (let ((out(assoc-ref outputs "out"))
>>>(qtbase (assoc-ref inputs "qtbase")))
>>>(substitute* (find-files "." "Makefile")
>>> (((string-append "INSTALL_ROOT)" qtbase))
>>>(string-append "INSTALL_ROOT)" out
>>> #t)
>>> (native-inputs
>>> `(("python-pyqt" ,python-pyqt)
>>>("qtbase" ,qtbase))) ; for qmake
>>> (home-page
>"https://www.riverbankcomputing.com/software/qscintilla/intro;)
>>> (synopsis "Qt5 port of the Scintilla editing component")
>>> (description
>>> "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
>editor control.
>>> As well as features found in standard text editing components,
>QScintilla
>>> includes features especially useful when editing and debugging
>source code.
>>> These include support for syntax styling, error indicators, code
>completion and
>>> call tips.")
>>> (license (list license:bsd-2 ; Python/configure.py
>>>license:expat ; src/ and include/
>>>license:gpl3
>>>
>>> (define qtscintilla-for-octave
>>
>> This should be qtscintilla-qt4, we might have a use for it outside of
>> octave
>>
>
>In this case, should I leave qtscintilla-qt4 as a public package in
>qt.scm
>instead of maths.scm as Leo suggested?
That's where I would leave it. You could also leave a note, saying that it was
for octave, and if they switch to qt5 then we can get rid of it. We still have
an old vte package I added for a terminal since all the bug reports around it
haven't been cleared yet, and that's with the other versions of vte.
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH] Adding .xsession to guile-wm
On Mon, Sep 12, 2016 at 06:05:27PM +0200, John Darrington wrote: > Most of the .desktop files in my store do not have the /gnu/store/... on their > Exec= line. Perhaps they should? What is the policy here? > > J' > I can comment that enlightenment does, and slim finds it: Icon=/gnu/store/z9zb4dhqdb6dgl44x5b3czj0bdwg48p6-enlightenment-0.21.2/share/enlightenment/data/images/enlightenment.png TryExec=/gnu/store/z9zb4dhqdb6dgl44x5b3czj0bdwg48p6-enlightenment-0.21.2/bin/enlightenment_start Exec=/gnu/store/z9zb4dhqdb6dgl44x5b3czj0bdwg48p6-enlightenment-0.21.2/bin/enlightenment_start as does openbox: Exec=/gnu/store/xyx046dfs7lzps4q7ljj9mvkdv935wcl-openbox-3.6.1/bin/openbox-session TryExec=/gnu/store/xyx046dfs7lzps4q7ljj9mvkdv935wcl-openbox-3.6.1/bin/openbox-session -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: Add git-review.
On Fri, Sep 09, 2016 at 06:09:40PM +0200, Clément Lassieur wrote: > Efraim Flashner <efr...@flashner.co.il> writes: > > > I found ssh and I found an instance of scp, so this should be better. > > --8<---cut here---start->8--- > clement@lev ~/foo [env]# git-review -d 36373 > Downloading refs/changes/73/36373/1 from gerrit > Cannot fetch patchset contents > > Does specified change number belong to this project? > > The following command failed with exit code 128 > "/gnu/store/...-git-2.10.0/bin/git fetch gerrit refs/changes/73/36373/1" > --- > error: cannot run ssh: No such file or directory > fatal: unable to fork > --- > clement@lev ~/foo [env]# /gnu/store/...-git-2.10.0/bin/git remote -v > > gerrit ssh://bar (fetch) > gerrit ssh://bar (push) > --8<---cut here---end--->8--- > > It looks like ssh isn't hardcoded within git either. Is it worth doing > this for git-review then? This looks like you are using ssh for talking to the remote server, in which case it would exist outside of git-review. Or did I misunderstand it? It does seem that wrapping the program would be easier than trying to fing regexes that work to patching only certain instances of other programs. -- Efraim Flashner <efr...@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 signature.asc Description: PGP signature
Re: [PATCH] gnu: python-git-review: Wrap it so 'git', 'ssh' and 'scp' are found.
On Sat, Sep 10, 2016 at 11:13:32PM +0200, Clément Lassieur wrote:
> * gnu/packages/openstack.scm (python-git-review)[arguments]: Add
> 'wrap-program' phase.
> [inputs]: Add openssh.
> ---
> gnu/packages/openstack.scm | 19 +--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
> index 4cb38a9..62f1e84 100644
> --- a/gnu/packages/openstack.scm
> +++ b/gnu/packages/openstack.scm
> @@ -20,6 +20,7 @@
>
> (define-module (gnu packages openstack)
>#:use-module (gnu packages python)
> + #:use-module (gnu packages ssh)
>#:use-module (gnu packages tls)
>#:use-module (gnu packages version-control)
>#:use-module (guix build-system python)
> @@ -796,12 +797,26 @@ permanence.")
> (base32
> "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"
> (build-system python-build-system)
> -(arguments `(#:tests? #f)) ; tests require a running Gerrit server
> +(arguments
> + '(#:tests? #f ; tests require a running Gerrit server
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'install 'wrap-program
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> +(git (assoc-ref inputs "git"))
> +(openssh (assoc-ref inputs "openssh")))
> + (wrap-program (string-append out "/bin/git-review")
> + `("PATH" ":" prefix
> + ,(map (lambda (dir)
> + (string-append dir "/bin"))
> + (list git openssh))
> (native-inputs
> `(("python-pbr" ,python-pbr)))
> (inputs
> `(("python-requests" ,python-requests)
> - ("git" ,git)))
> + ("git" ,git)
> + ("openssh" ,openssh)))
> (home-page "http://docs.openstack.org/infra/git-review/;)
> (synopsis "Command-line tool for Gerrit")
> (description
> --
> 2.10.0
>
$ guix gc --references
/gnu/store/5nr0nxadwrjrwsl16zgv2adlglpjcffn-python-git-review-1.25.0/
/gnu/store/429j0rw9782lsnnj492sr51dynw1iljl-python-testrepository-0.0.20
/gnu/store/5nr0nxadwrjrwsl16zgv2adlglpjcffn-python-git-review-1.25.0
/gnu/store/h2yg74jqdm062aijw775ambram58xc4f-git-2.10.0
/gnu/store/kqyrncmqyppb8njh0mh5gmi9iwsszvp6-python-pbr-1.8.1
/gnu/store/l3dmdmchz4nc0kjp4rqag94nbchihmn8-python-testtools-1.0.0
/gnu/store/m1v516vzcxqfvwvr3vlqxm1dzsjrjz50-python-fixtures-0.3.16
/gnu/store/m4gc2wx4q9if1vrhgclpspdil7rqsn21-python-3.4.3
/gnu/store/s3hwh3ky7qa173sxq7kz43xknxnbl3db-openssh-7.3p1
/gnu/store/wa1yc835mb7pmmrj45xfgviqr5fbasqq-python-wrapper-3.4.3
/gnu/store/xg06wf5hx35pprifwjfmsshczqa2vj1c-python-mimeparse-0.1.4
/gnu/store/ykzwykkvr2c80rw4l1qh3mvfdkl7jibi-bash-4.3.42
/gnu/store/zdahv56anb0ni3kcvbr1c446xbxmlpvs-python-requests-2.9.1
Looks good, pushed.
--
Efraim Flashner <efr...@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
signature.asc
Description: PGP signature
