[PATCH 13/13] gnu: Add lchat.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (lchat): New variable.
---
 gnu/packages/suckless.scm | 52 ++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index c95119b21..bdcad2be9 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -43,7 +43,9 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages gawk))
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages libbsd))
 
 (define-public dwm
   (package
@@ -623,3 +625,51 @@ fullrune(s,n) ? chartorune(p,s): 0.
 as -1, to be used instead of U+FFFD.
 @end itemize\n")
   (license license:expat
+
+;; No release tarballs so far.
+(define-public lchat
+  (let ((revision "1")
+(commit "bbde23732f8c7769b982f0c1bda9b99fbf93f932"))
+(package
+  (name "lchat")
+  (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/younix/lchat";)
+   (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+  (base32
+   "00q3rc0aa5416jvjvrj71x1wnr0331kxhvjjs7pyxgnq4xf36k63"
+  (build-system gnu-build-system)
+  (arguments
+   `(#:tests? #f ; No tests
+ #:make-flags (list "CC=gcc"
+(string-append "PREFIX=" %output))
+ #:phases
+ (modify-phases %standard-phases
+   (delete 'configure) ; No configure script
+   (add-before 'build 'libbsd
+ (lambda _
+   (substitute* "Makefile"
+ (("-lutf") "-lutf -lbsd"
+   (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+   (let* ((out (assoc-ref outputs "out"))
+  (bin (string-append out "/bin")))
+ (install-file "lchat" bin)
+ #t))
+  (inputs
+   `(("grep" ,grep)
+ ("ncurses" ,ncurses)
+ ("libutf" ,libutf)
+ ("libbsd" ,libbsd)))
+  (home-page "https://github.com/younix/lchat";)
+  (synopsis "Line chat is a frontend for the irc client ii from suckless")
+  (description
+   "Lchat (line chat) is the little and small brother of cii.
+It is a front end for ii-like chat programs.  It uses tail(1) -f to get the
+chat output in background.")
+  (license license:isc
-- 
2.11.0




[PATCH 09/13] gnu: Add human.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (human): New variable.
---
 gnu/packages/suckless.scm | 36 
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index b52a43f1f..a871db522 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -27,6 +27,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (gnu packages)
@@ -467,3 +468,38 @@ cups server to be installed.")
 (description
  "Noice is a small curses-based file browser.")
 (license license:bsd-2)))
+
+;; There is no 0.2 release tarball, but it has been tagged.
+(define-public human
+  (let ((commit "50c80e6ba12823184b6866e06b955dbd2ccdc5d7")
+(revision "1"))
+(package
+  (name "human")
+  (version (string-append "0.2-" revision "." (string-take commit 7)))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "git://git.2f30.org/human.git")
+   (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+  (base32
+   "18xngm4h9vsyip52zwd79rrp1irzg6rs462lpbp61amf7hj955gn"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(home-page "http://git.2f30.org/human/";)
+(synopsis "Convert bytes to human readable formats")
+(description
+ "Human is a small program which translate numbers into a
+human readable format.  By default, it tries to detect the best
+factorisation, but you can force its output.
+You can adjust the number of decimals with the @code{SCALE}
+environment variable.")
+(license license:wtfpl2
-- 
2.11.0




[PATCH 10/13] gnu: Add fortify-headers.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (fortify-headers): New variable.
---
 gnu/packages/suckless.scm | 41 +
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index a871db522..74b0211be 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -503,3 +503,44 @@ factorisation, but you can force its output.
 You can adjust the number of decimals with the @code{SCALE}
 environment variable.")
 (license license:wtfpl2
+
+(define-public fortify-headers
+  (package
+(name "fortify-headers")
+(version "0.8")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "1cacdczpjb49c4i1168g541wnl3i3gbpv2m2wbnmw5wddlyhgkdg"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(home-page "http://git.2f30.org/fortify-headers/";)
+(synopsis "Standalone fortify-source implementation")
+(description
+ "This is a standalone implementation of fortify source.  It provides
+compile time buffer checks.  It is libc-agnostic and simply overlays the
+system headers by using the @code{#include_next} extension found in GCC.  It 
was
+initially intended to be used on musl based Linux distributions.
+
+@itemize
+@item It is portable, works on *BSD, Linux, Solaris and possibly others.
+@item It will only trap non-conformant programs.  This means that fortify
+  level 2 is treated in the same way as level 1.
+@item Avoids making function calls when undefined behaviour has already been
+  invoked.  This is handled by using __builtin_trap().
+@item Support for out-of-bounds read interfaces, such as send(), write(),
+  fwrite() etc.
+@item No ABI is enforced.  All of the fortify check functions are inlined
+  into the resulting binary.
+@end itemize\n")
+(license license:isc)))
-- 
2.11.0




[PATCH 11/13] gnu: Add colors.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (colors): New variable.
---
 gnu/packages/suckless.scm | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 74b0211be..056487baf 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -544,3 +544,33 @@ initially intended to be used on musl based Linux 
distributions.
   into the resulting binary.
 @end itemize\n")
 (license license:isc)))
+
+(define-public colors
+  (package
+(name "colors")
+(version "0.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(inputs
+ `(("libpng" ,libpng)))
+(home-page "http://git.2f30.org/colors/";)
+(synopsis "Extract colors from pictures")
+(description
+ "Extract colors from PNG files.  It is similar to
+strings(1) but for pictures.  For a given input file it outputs a
+colormap to stdout.")
+(license license:isc)))
-- 
2.11.0




[PATCH 06/13] gnu: Add sbm.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (sbm): New variable.
---
 gnu/packages/suckless.scm | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 002c9273b..87ffe7204 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -373,3 +373,29 @@ drivers capable of injecting packets in wireless 
networks.")
 Pipe text to it, and it will scroll a given number of letters from right to
 left.")
 (license license:wtfpl2)))
+
+(define-public sbm
+  (package
+(name "sbm")
+(version "0.9")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(home-page "http://git.2f30.org/sbm/";)
+(synopsis "Simple bandwidth monitor")
+(description
+ "Sbm is a simple bandwidth monitor.")
+(license license:isc)))
-- 
2.11.0




[PATCH 02/13] gnu: Add wificurse.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (wificurse): New variable.
---
 gnu/packages/suckless.scm | 33 +
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 1d35e9389..bcfa16922 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -282,3 +282,36 @@ few minutes.")
 (description
  "Xbattmon is a simple battery monitor for X.")
 (license license:isc)))
+
+(define-public wificurse
+  (package
+(name "wificurse")
+(version "0.3.9")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "067ghr1xly5ca41kc83xila1p5hpq0bxfcmc8jvxi2ggm6wrhavn"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list
+ (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(home-page "http://git.2f30.org/wificurse/";)
+(synopsis "Wifi DoS attack tool")
+(description
+ "Wificurses listens for beacons sent from wireless access points
+in the range of your wireless station.  Once received the program
+extracts the BSSID of the AP and transmits deauthentication packets
+using the broadcast MAC address.  This results to the disconnection
+of all clients connected to the AP at the time of the attack.  This
+is essencially a WiFi DoS attack tool created for educational
+purposes only.  It works only in Linux and requires wireless card
+drivers capable of injecting packets in wireless networks.")
+(license license:gpl3+)))
-- 
2.11.0




[PATCH 12/13] gnu: Add libutf.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (libutf): New variable.
---
 gnu/packages/suckless.scm | 51 ++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 056487baf..c95119b21 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -42,7 +42,8 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
-  #:use-module (gnu packages ncurses))
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages gawk))
 
 (define-public dwm
   (package
@@ -574,3 +575,51 @@ initially intended to be used on musl based Linux 
distributions.
 strings(1) but for pictures.  For a given input file it outputs a
 colormap to stdout.")
 (license license:isc)))
+
+;; No new releases were made at github, this repository is more active than
+;; the one at http://git.suckless.org/libutf/ and it is
+;; done by the same developer.
+(define-public libutf
+  (let ((revision "1")
+(commit "ff4c60635e1f455b0a0b4200f8183fbd5a88225b"))
+(package
+  (name "libutf")
+  (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/cls/libutf";)
+   (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+  (base32
+   "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d"
+  (build-system gnu-build-system)
+  (arguments
+   `(#:tests? #f ; No tests
+ #:make-flags (list "CC=gcc"
+(string-append "PREFIX=" %output))
+ #:phases
+ (modify-phases %standard-phases
+   (delete 'configure ; No configure script
+  (inputs
+   `(("gawk" ,gawk)))
+  (home-page "https://github.com/cls/libutf";)
+  (synopsis "Plan 9 compatible UTF-8 library")
+  (description
+   "This is a C89 UTF-8 library, with an API compatible with that of
+Plan 9's libutf, but with a number of improvements:
+
+@itemize
+@item Support for runes beyond the Basic Multilingual Plane.
+@item utflen and utfnlen cannot overflow on 32- or 64-bit machines.
+@item chartorune treats all invalid codepoints as though Runeerror.
+@item fullrune, utfecpy, and utfnlen do not overestimate the length
+of malformed runes.
+@item An extra function, charntorune(p,s,n), equivalent to
+fullrune(s,n) ? chartorune(p,s): 0.
+@item Runeerror may be set to an alternative replacement value, such
+as -1, to be used instead of U+FFFD.
+@end itemize\n")
+  (license license:expat
-- 
2.11.0




[PATCH 08/13] gnu: Add noice.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (noice): New variable.
---
 gnu/packages/suckless.scm | 35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 688b4c339..b52a43f1f 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -40,7 +40,8 @@
   #:use-module (gnu packages mpd)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages cups))
+  #:use-module (gnu packages cups)
+  #:use-module (gnu packages ncurses))
 
 (define-public dwm
   (package
@@ -434,3 +435,35 @@ It has no feature, and does nothing else.  Just set your 
default
 printer in client.conf(5) and start printing.  No need for a local
 cups server to be installed.")
 (license license:wtfpl2)))
+
+(define-public noice
+  (package
+(name "noice")
+(version "0.6")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "0ldkbb71z6k4yzj4kpg3s94ijj1c1kx9dfcjz393py09scfyg5hr"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure) ; No configure script
+ (add-before 'build 'curses
+   (lambda _
+ (substitute* "Makefile"
+   (("lcurses") "lncurses")))
+(inputs
+ `(("ncurses" ,ncurses)))
+(home-page "http://git.2f30.org/noice/";)
+(synopsis "Small file browser")
+(description
+ "Noice is a small curses-based file browser.")
+(license license:bsd-2)))
-- 
2.11.0




[PATCH 07/13] gnu: Add prout.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (prout): New variable.
---
 gnu/packages/suckless.scm | 37 -
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 87ffe7204..688b4c339 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -38,7 +38,9 @@
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages mpd)
-  #:use-module (gnu packages linux))
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cups))
 
 (define-public dwm
   (package
@@ -399,3 +401,36 @@ left.")
 (description
  "Sbm is a simple bandwidth monitor.")
 (license license:isc)))
+
+(define-public prout
+  (package
+(name "prout")
+(version "0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(inputs
+ `(("cups-minimal" ,cups-minimal)
+   ("zlib" ,zlib)))
+(home-page "http://git.2f30.org/prout/";)
+(synopsis "Smaller lp command")
+(description
+ "Prout (PRint OUT) is a small utility one can use to send
+documents to a printer.
+It has no feature, and does nothing else.  Just set your default
+printer in client.conf(5) and start printing.  No need for a local
+cups server to be installed.")
+(license license:wtfpl2)))
-- 
2.11.0




2f30, v2

2017-01-11 Thread ng0
[PATCH 01/13] gnu: Add xbattmon.
[PATCH 02/13] gnu: Add wificurse.
[PATCH 03/13] gnu: Add spoon.
[PATCH 04/13] licenses: Add wtfpl2.
[PATCH 05/13] gnu: Add skroll.
[PATCH 06/13] gnu: Add sbm.
[PATCH 07/13] gnu: Add prout.

Prout is untested due to my bad situation with printer (see HP printing thread).
It builds and is assumed to be working, and if this needs to be tested I'd 
rather want someone with an functional printer test this.

[PATCH 08/13] gnu: Add noice.
[PATCH 09/13] gnu: Add human.
[PATCH 10/13] gnu: Add fortify-headers.
[PATCH 11/13] gnu: Add colors.
[PATCH 12/13] gnu: Add libutf.
[PATCH 13/13] gnu: Add lchat.



[PATCH 04/13] licenses: Add wtfpl2.

2017-01-11 Thread ng0
* guix/licenses.scm (wtfpl2): New variable.
---
 guix/licenses.scm | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 1e1930058..7b2ac2d31 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2016 Fabian Harfert 
 ;;; Copyright © 2016 Rene Saavedra 
-;;; Copyright © 2016 ng0 
+;;; Copyright © 2016, 2017 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,7 +74,8 @@
 x11 x11-style
 zpl2.1
 zlib
-fsf-free))
+fsf-free
+wtfpl2))
 
 (define-record-type 
   (license name uri comment)
@@ -450,6 +451,11 @@ at URI, which may be a file:// URI pointing the package's 
tree."
"https://unlicense.org/";
"https://www.gnu.org/licenses/license-list.html#Unlicense";))
 
+(define wtfpl2
+  (license "WTFPL 2"
+   "http://www.wtfpl.net";
+   "http://www.wtfpl.net/about/";))
+
 (define x11
   (license "X11"
"http://directory.fsf.org/wiki/License:X11";
-- 
2.11.0




[PATCH 03/13] gnu: Add spoon.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (spoon): New variable.
---
 gnu/packages/suckless.scm | 32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index bcfa16922..c9465b9fe 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -36,7 +36,9 @@
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages webkit)
-  #:use-module (gnu packages fontutils))
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages mpd)
+  #:use-module (gnu packages linux))
 
 (define-public dwm
   (package
@@ -114,6 +116,34 @@ optimising the environment for the application in use and 
the task performed.")
 numbers of user-defined menu items efficiently.")
 (license license:x11)))
 
+(define-public spoon
+  (package
+(name "spoon")
+(version "0.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "10c5i7ykpy7inzzfiw1dh0srpkljycr3blxhvd8160wsvplbws48"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output
+(inputs
+ `(("libx11" ,libx11)
+   ("libxkbfile" ,libxkbfile)
+   ("alsa-lib" ,alsa-lib)
+   ("libmpdclient" ,libmpdclient)))
+(home-page "http://git.2f30.org/spoon/";)
+(synopsis "Set dwm status")
+(description
+ "Spoon can be used to set the dwm status.")
+(license license:isc)))
+
 (define-public slock
   (package
 (name "slock")
-- 
2.11.0




[PATCH 01/13] gnu: Add xbattmon.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (xbattmon): New variable.
---
 gnu/packages/suckless.scm | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index a00420312..1d35e9389 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 Cyril Roelandt 
 ;;; Copyright © 2015 Amirouche Boubekki 
 ;;; Copyright © 2016 Al McElrath 
-;;; Copyright © 2016 ng0 
+;;; Copyright © 2016, 2017 ng0 
 ;;; Copyright © 2015 Dmitry Bogatov 
 ;;; Copyright © 2015 Leo Famulari 
 ;;; Copyright © 2016 Eric Bavier 
@@ -257,3 +257,28 @@ allows you to write down the presentation for a quick 
lightning talk within a
 few minutes.")
 (home-page "http://tools.suckless.org/sent";)
 (license license:x11)))
+
+(define-public xbattmon
+  (package
+(name "xbattmon")
+(version "0.9")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "0n2rrjq03pgqrdkl7cz5snsfdanf4s58w9h6dbvnl7p8bbd3j2kn"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output
+(inputs
+ `(("libx11" ,libx11)))
+(home-page "http://git.2f30.org/xbattmon/";)
+(synopsis "Simple battery monitor for X")
+(description
+ "Xbattmon is a simple battery monitor for X.")
+(license license:isc)))
-- 
2.11.0




[PATCH 05/13] gnu: Add skroll.

2017-01-11 Thread ng0
* gnu/packages/suckless.scm (skroll): New variable.
---
 gnu/packages/suckless.scm | 28 
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index c9465b9fe..002c9273b 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -345,3 +345,31 @@ is essencially a WiFi DoS attack tool created for 
educational
 purposes only.  It works only in Linux and requires wireless card
 drivers capable of injecting packets in wireless networks.")
 (license license:gpl3+)))
+
+(define-public skroll
+  (package
+(name "skroll")
+(version "0.6")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.2f30.org/releases/";
+   name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; No tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; No configure script
+(home-page "http://2f30.org";)
+(synopsis "Commandline utility which scrolls text")
+(description
+ "Skroll is a small utility that you can use to make a text scroll.
+Pipe text to it, and it will scroll a given number of letters from right to
+left.")
+(license license:wtfpl2)))
-- 
2.11.0




Re: [PATCH] gnu: Add inox.

2017-01-11 Thread David Craven
So finished building chromium finally!

A major issue:

* no hidpi scaling: didn't there use to be an enable_hdpi flag?
Recompiling with enable_hdpi=true see if that works

and some issues minor issues:

* ugly font: is new times roman the default? what do other distros do?

* menu has a dark background with classic theme and gtk dark system
theme, google-chrome from the nix repo keeps the dropdown menu nice
and white

any ideas? awesome that it finally builds! :)



Re: [PATCH] gnu: audacity: Update to 2.1.2.

2017-01-11 Thread Kei Kebreau
Leo Famulari  writes:

> On Wed, Jan 11, 2017 at 04:33:10PM -0500, Kei Kebreau wrote:
>> -   (uri (string-append "mirror://sourceforge/audacity/audacity/" version
>> -   "/audacity-minsrc-" version ".tar.xz"))
>> +   (uri (string-append "https://github.com/audacity/audacity/archive";
>> +   "/Audacity-" version ".zip"))
>
> It looks like they recommend another URL:
>
> http://www.audacityteam.org/download/source/
>
> which points to
>
> https://www.fosshub.com/Audacity.html/audacity-minsrc-2.1.2.tar.xz

I got a 403 error and Access Denied when I tried to download the source
code from that page. Did you have better luck?


signature.asc
Description: PGP signature


Re: [PATCH 02/13] gnu: Add wificurse.

2017-01-11 Thread ng0
Leo Famulari  writes:

> On Mon, Jan 09, 2017 at 08:21:14PM +, ng0 wrote:
>> * gnu/packages/suckless.scm (wificurse): New variable.
>
>> +(synopsis "Wifi DoS attack tool")
>> +(description
>> + "Wificurses listens for beacons sent from wireless access points
>> +in the range of your wireless station.  Once received the program
>> +extracts the BSSID of the AP and transmits deauthentication packets
>> +using the broadcast MAC address.  This results to the disconnection
>> +of all clients connected to the AP at the time of the attack.  This
>> +is essencially a WiFi DoS attack tool created for educational
>> +purposes only.  It works only in Linux and requires wireless card
>> +drivers capable of injecting packets in wireless networks.")
>
> I wonder if we should mention that this is against the law in many
> jurisdictions?

Is it? I see it as educational software which is also included in
some pen-testing systems. We ship other software which could be
seen as having an equal legal status.
I have no problem in keeping this outside of master, I'm just
working on packaging more and more pen-testing software so if it
can be included, good, if not, it'll be no problem.

>> +(license license:gpl3)))
>
> The license is actually gpl3+:

Thanks.

> http://git.2f30.org/wificurse/file/src/wificurse.c.html
>

Thanks for reviewing them all.
What do you think about adding some kind of suckless/minimal
build-system thing? They are mostly very repetive. I don't know
if we gain something with it, but the url format would be one
thing. I've asked about this in the first email I think.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/



Re: Introduce packages/chess.el

2017-01-11 Thread Ricardo Wurmus

Stefan Reichör  writes:

> Does someone provide feedback for this patch?
> Is it useful or is increasing the number of .scm files a bad thing?

We usually avoid moving around packages unless there’s a very good
reason for it.  One of the disadvantages of moving package expressions
is that it breaks existing manifest.

Could your new chess-related packages be added to games.scm instead?

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net




Re: [PATCH] gnu: audacity: Update to 2.1.2.

2017-01-11 Thread Leo Famulari
On Wed, Jan 11, 2017 at 04:33:10PM -0500, Kei Kebreau wrote:
> -   (uri (string-append "mirror://sourceforge/audacity/audacity/" version
> -   "/audacity-minsrc-" version ".tar.xz"))
> +   (uri (string-append "https://github.com/audacity/audacity/archive";
> +   "/Audacity-" version ".zip"))

It looks like they recommend another URL:

http://www.audacityteam.org/download/source/

which points to

https://www.fosshub.com/Audacity.html/audacity-minsrc-2.1.2.tar.xz


signature.asc
Description: PGP signature


Re: Introduce packages/chess.el

2017-01-11 Thread Stefan Reichör
Hi again!

Does someone provide feedback for this patch?
Is it useful or is increasing the number of .scm files a bad thing?

Thanks,
  Stefan.

> Hi there,
>
> I would like to add some chess related packages to GUIX.
> I found the packages xboard and chess that are already covered by GUIX.
>
> The attached patch moves these two packages to a new file named chess.scm
>
> I would like to add some more chess related packages to chess.scm in the 
> future.
>
> Stefan.
>
>
> From 7fb3eba51f0919a2e1c9b13ecb4ff77757bf4267 Mon Sep 17 00:00:00 2001
> From: Stefan Reichoer 
> Date: Sat, 7 Jan 2017 20:30:14 +0100
> Subject: [PATCH] gnu: chess, xboard: Move to (gnu packages chess).
>
> * gnu/packages/games.scm: Move 'chess', 'xboard' to...
>
> * gnu/packages/chess.scm: New file.
>
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add chess.scm.
> ---
>  gnu/local.mk   |  1 +
>  gnu/packages/chess.scm | 77 
> ++
>  gnu/packages/games.scm | 49 
>  3 files changed, 78 insertions(+), 49 deletions(-)
>  create mode 100644 gnu/packages/chess.scm
>
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 1889a0e..b043f41 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -69,6 +69,7 @@ GNU_SYSTEM_MODULES =\
>%D%/packages/c.scm \
>%D%/packages/calcurse.scm  \
>%D%/packages/ccache.scm\
> +  %D%/packages/chess.scm \
>%D%/packages/cdrom.scm \
>%D%/packages/certs.scm \
>%D%/packages/check.scm \
> diff --git a/gnu/packages/chess.scm b/gnu/packages/chess.scm
> new file mode 100644
> index 000..28383c8
> --- /dev/null
> +++ b/gnu/packages/chess.scm
> @@ -0,0 +1,77 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2013 John Darrington 
> +;;; Copyright © 2016 Sou Bunnbu 
> +;;; Copyright © 2016 Efraim Flashner 
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see .
> +
> +(define-module (gnu packages chess)
> +  #:use-module ((guix licenses) #:prefix license:)
> +  #:use-module (guix packages)
> +  #:use-module (guix download)
> +  #:use-module (gnu packages)
> +  #:use-module (gnu packages gtk)
> +  #:use-module (gnu packages pkg-config)
> +  #:use-module (gnu packages texinfo)
> +  #:use-module (guix build-system gnu))
> +
> +(define-public chess
> +  (package
> +(name "chess")
> +(version "6.2.4")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (string-append "mirror://gnu/chess/gnuchess-" version
> +   ".tar.gz"))
> +   (sha256
> +(base32
> + "1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw"
> +(build-system gnu-build-system)
> +(home-page "https://www.gnu.org/software/chess";)
> +(synopsis "Full chess implementation")
> +(description "GNU Chess is a chess engine.  It allows you to compete
> +against the computer in a game of chess, either through the default terminal
> +interface or via an external visual interface such as GNU XBoard.")
> +(license license:gpl3+)))
> +
> +(define-public xboard
> +  (package
> +(name "xboard")
> +(version "4.9.1")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (string-append "mirror://gnu/xboard/xboard-" version
> +   ".tar.gz"))
> +   (sha256
> +(base32
> + "1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib"
> +(build-system gnu-build-system)
> +(inputs
> + `(("gtk+" ,gtk+-2)
> +   ("librsvg" ,librsvg)))
> +(native-inputs
> + `(("texinfo" ,texinfo)
> +   ("pkg-config" ,pkg-config)))
> +(home-page "https://www.gnu.org/software/xboard";)
> +(synopsis "Graphical user interface for chess programs")
> +(description "GNU XBoard is a graphical board for all varieties of chess,
> +including international chess, xiangqi (Chinese chess), shogi (Japanese 
> chess)
> +and Makruk.  Several lesser-known variants are also supported.  It presents a
> +fully interactive graphical interface and it can load and save games in the
> +Portable Game Notation.")
> +(license license:gpl3+)))
> diff --git a/gnu/packages

[PATCH] gnu: audacity: Update to 2.1.2.

2017-01-11 Thread Kei Kebreau
If this reproducibly builds for someone else, I will push it master.
From daf80af2ea435f27b4d2fbc5fab2a4d451d6a36f Mon Sep 17 00:00:00 2001
From: Kei Kebreau 
Date: Wed, 11 Jan 2017 16:18:49 -0500
Subject: [PATCH] gnu: audacity: Update to 2.1.2.

* gnu/packages/audacity.scm (audacity): Update to 2.1.2.
[source](uri): Update source URL.
[inputs]: Replace wxwidgets-2 with wxwidgets-gtk2.
[native-inputs]: Add gettext-minimal.
---
 gnu/packages/audacity.scm | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm
index 0f9554deb..a70d0e3a6 100644
--- a/gnu/packages/audacity.scm
+++ b/gnu/packages/audacity.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages mp3)
@@ -38,20 +39,20 @@
 (define-public audacity
   (package
 (name "audacity")
-(version "2.1.0")
+(version "2.1.2")
 (source
  (origin
(method url-fetch)
-   (uri (string-append "mirror://sourceforge/audacity/audacity/" version
-   "/audacity-minsrc-" version ".tar.xz"))
+   (uri (string-append "https://github.com/audacity/audacity/archive";
+   "/Audacity-" version ".zip"))
(sha256
-(base32 "1cs2w3fwqylpqmfwkvlgdx5lhclpckfil7pqibl37qlbnf4qvndh"))
+(base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq"))
(patches (search-patches "audacity-fix-ffmpeg-binding.patch"
 (build-system gnu-build-system)
 (inputs
  ;; TODO: Add portSMF and libwidgetextra once they're packaged.  In-tree
  ;; versions shipping with Audacity are used for now.
- `(("wxwidgets" ,wxwidgets-2)
+ `(("wxwidgets" ,wxwidgets-gtk2)
("gtk" ,gtk+-2)
("alsa-lib" ,alsa-lib)
("jack" ,jack-1)
@@ -72,7 +73,8 @@
("lilv" ,lilv)
("portaudio" ,portaudio)))
 (native-inputs
- `(("pkg-config" ,pkg-config)
+ `(("gettext" ,gettext-minimal) ;for msgfmt
+   ("pkg-config" ,pkg-config)
("python" ,python-2)
("which" ,which)))
 (arguments
-- 
2.11.0



signature.asc
Description: PGP signature


[PATCH 3/4] gnu: xfd: Remove wrapper.

2017-01-11 Thread John Darrington
* gnu/packages/xorg.scm (xfd): Remove wrapper.
---
 gnu/packages/xorg.scm | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 16eb344..45ff4c9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4015,19 +4015,9 @@ Font Description (XLFD) full name for a font.")
 "0n97iqqap9wyxjan2n520vh4rrf5bc0apsw2k9py94dqzci258y1"
 (build-system gnu-build-system)
 (arguments
- ;; The same 'app-defaults' problem as with 'xfontsel' package.
- (let ((app-defaults-dir "/share/X11/app-defaults"))
`(#:configure-flags
  (list (string-append "--with-appdefaultdir="
-  %output ,app-defaults-dir))
- #:phases
- (modify-phases %standard-phases
-   (add-after 'install 'wrap-xfd
- (lambda* (#:key outputs #:allow-other-keys)
-   (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/xfd")
-   `("XAPPLRESDIR" =
- (,(string-append out ,app-defaults-dir)))
+  %output ,%app-defaults-dir
 (inputs
  `(("fontconfig" ,fontconfig)
("libx11" ,libx11)
-- 
2.1.4




[PATCH 1/4] gnu: xfontsel: Simplify definition.

2017-01-11 Thread John Darrington
* gnu/packages/xorg.scm (%app-defaults-dir): New variable.
(xfontsel): Remove wrapper.
---
 gnu/packages/xorg.scm | 23 +--
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e6ee0c0..556b9f4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2016 ng0 
 ;;; Copyright © 2016 Alex Kost 
 ;;; Copyright © 2016 David Craven 
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -335,6 +335,7 @@ provided.")
 (license (license:x11-style "file://dri3proto.h"
 "See 'dri3proto.h' in the distribution."
 
+(define %app-defaults-dir "/lib/X11/app-defaults")
 
 (define-public editres
   (package
@@ -3982,23 +3983,9 @@ protocol.")
 "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"
 (build-system gnu-build-system)
 (arguments
- ;; By default, it tries to install XFontSel file in
- ;; "/gnu/store//share/X11/app-defaults": it defines this
- ;; directory from 'libxt' (using 'pkg-config').  To put this file
- ;; inside output dir and to use it properly, we need to configure
- ;; --with-appdefaultdir and to wrap 'xfontsel' binary.
- (let ((app-defaults-dir "/share/X11/app-defaults"))
-   `(#:configure-flags
- (list (string-append "--with-appdefaultdir="
-  %output ,app-defaults-dir))
- #:phases
- (modify-phases %standard-phases
-   (add-after 'install 'wrap-xfontsel
- (lambda* (#:key outputs #:allow-other-keys)
-   (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/xfontsel")
-   `("XAPPLRESDIR" =
- (,(string-append out ,app-defaults-dir)))
+ `(#:configure-flags
+   (list (string-append "--with-appdefaultdir="
+%output ,%app-defaults-dir
 (inputs
  `(("libx11" ,libx11)
("libxaw" ,libxaw)
-- 
2.1.4




[PATCH 2/4] gnu: editres: Use %app-defaults-dir.

2017-01-11 Thread John Darrington
* gnu/packages/xorg.scm (editres): Replace string literal with
%app-defaults-dir.
---
 gnu/packages/xorg.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 556b9f4..16eb344 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -355,7 +355,7 @@ provided.")
 (arguments
  `(#:configure-flags
(list (string-append "--with-appdefaultdir="
-%output "/lib/X11/app-defaults"
+%output ,%app-defaults-dir
 (inputs
  `(("libxaw" ,libxaw)
("libxmu" ,libxmu)
-- 
2.1.4




[PATCH 4/4] gnu: xfig: Use modify-phases.

2017-01-11 Thread John Darrington
* gnu/packages/xfig.scm (xfig): Use modify-phases.
---
 gnu/packages/xfig.scm | 159 +-
 1 file changed, 79 insertions(+), 80 deletions(-)

diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm
index 6436e52..27d9cf9 100644
--- a/gnu/packages/xfig.scm
+++ b/gnu/packages/xfig.scm
@@ -34,12 +34,12 @@
 (version "3.2.5c")
 (source
  (origin
-  (method url-fetch)
-  (uri (string-append "mirror://sourceforge/mcj/mcj-source/xfig."
-  version ".full.tar.gz"))
-  (sha256
-   (base32
-"1yd1jclvw5w3ja4jjzr1ysbn8iklh88wq84jn9d1gavrbfbqyqpa"
+   (method url-fetch)
+   (uri (string-append "mirror://sourceforge/mcj/mcj-source/xfig."
+   version ".full.tar.gz"))
+   (sha256
+(base32
+ "1yd1jclvw5w3ja4jjzr1ysbn8iklh88wq84jn9d1gavrbfbqyqpa"
 (build-system gnu-build-system)
 (native-inputs
  `(("imake" ,imake)
@@ -59,51 +59,51 @@
 (arguments
  `(#:tests? #f
#:phases
-   (alist-replace
-'configure
-(lambda* (#:key inputs outputs #:allow-other-keys)
-  (let ((imake (assoc-ref inputs "imake"))
-(out   (assoc-ref outputs "out")))
-   (substitute* "Imakefile"
- (("XCOMM (BINDIR = )[[:graph:]]*" _ front)
-  (string-append front out "/bin"))
- (("(PNGLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libpng") "/lib"))
- (("(PNGINC = -I)[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libpng") "/include"))
- (("(JPEGLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libjpeg") "/lib"))
- (("(JPEGINC = -I)[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libjpeg") "/include"))
- (("(ZLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "zlib") "/lib"))
- (("(XPMLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libxpm") "/lib"))
- (("(XPMINC = -I)[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libxpm") "/include"))
- (("(XFIGLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front out "/lib"))
- (("(XFIGDOCDIR = )[[:graph:]]*" _ front)
-  (string-append front out "/share/doc"))
- (("XCOMM USEINLINE") "USEINLINE"))
-   ;; The -a argument is required in order to pick up the correct paths
-   ;; to several X header files.
-   (zero? (system* "xmkmf" "-a"))
-   ;; Reset some variables that are inherited from imake templates
-   (substitute* "Makefile"
- ;; These imake variables somehow remain undefined
- (("DefaultGcc2[[:graph:]]*Opt") "-O2")
- ;; Reset a few variable defaults that are set in imake templates
- ((imake) out)
- (("(MANPATH = )[[:graph:]]*" _ front)
-  (string-append front out "/share/man"))
- (("(CONFDIR = )([[:graph:]]*)" _ front default)
-  (string-append front out default)
-(alist-cons-after
- 'install 'install/libs
- (lambda _
-   (zero? (system* "make" "install.libs")))
- (alist-cons-after
+   (modify-phases %standard-phases
+ (replace 'configure
+  (lambda* (#:key inputs outputs #:allow-other-keys)
+(let ((imake (assoc-ref inputs "imake"))
+  (out   (assoc-ref outputs "out")))
+  (substitute* "Imakefile"
+(("XCOMM (BINDIR = )[[:graph:]]*" _ front)
+ (string-append front out "/bin"))
+(("(PNGLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libpng") 
"/lib"))
+(("(PNGINC = -I)[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libpng") 
"/include"))
+(("(JPEGLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libjpeg") 
"/lib"))
+(("(JPEGINC = -I)[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libjpeg") 
"/include"))
+(("(ZLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "zlib") 
"/lib"))
+(("(XPMLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libxpm") 
"/lib"))
+(("(XPMINC = -I)[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libxpm") 
"/include"))
+(("(XFIGLIBDIR = )[

Re: [PATCH 0/2] ImageMagick 7

2017-01-11 Thread Leo Famulari
Hydra finished evaluating the imagemagick-updates branch on
x86_64-linux:

https://hydra.gnu.org/eval/109433?full=1&compare=master#tabs-now-fail

It's a surprisingly small number of failures! But, I wonder how many
packages that use ImageMagick use the "command-line API" and actually
test it.

So, I think we should carefully check each package that uses ImageMagick
directly to see if they are ready. We can check their commit logs and
bug trackers for anything related to ImageMagick.

It's a short list, and I'll start looking into a2ps and awesome:

$ guix package -s . | recsel -e "dependencies ~ 'imagemagick'" -p name,location
name: a2ps
location: gnu/packages/pretty-print.scm:40:2

name: awesome
location: gnu/packages/wm.scm:498:2

name: dblatex
location: gnu/packages/docbook.scm:174:2

name: discrover
location: gnu/packages/bioinformatics.scm:2045:2

name: emacs-w3m
location: gnu/packages/emacs.scm:746:2

name: enblend-enfuse
location: gnu/packages/photo.scm:222:2

name: fbida
location: gnu/packages/pdf.scm:698:2

name: lilypond
location: gnu/packages/music.scm:584:2

name: perl-image-magick
location: gnu/packages/imagemagick.scm:120:2

name: python-matplotlib
location: gnu/packages/python.scm:3605:2

name: python2-matplotlib
location: gnu/packages/python.scm:3736:4

name: skribilo
location: gnu/packages/skribilo.scm:32:2

name: synfig
location: gnu/packages/animation.scm:60:2



Re: [PATCH] gnu: Add inox.

2017-01-11 Thread David Craven
> I actually picked most of the patches from ungoogled-chromium (which
> includes inox and iridium), but skipped "high maintenance" ones. This
> started as an attempt to package that very project, but they were
> lagging too far behind upstream IMO.

Ah yes, I saw it now. Including the Warning in the description :)

> I think if most of the "FIXMEs" are resolved upstream, it might be eligible 
> for a free distro.

Is there reason to believe that this is going to happen any time soon?
Looks like a lot of the remaining work is waiting for upstream to fix
stuff?



[PATCH] gnu: python-argcomplete: Add python-pexpect.

2017-01-11 Thread Danny Milosavljevic
* gnu/packages/python.scm (python-argcomplete)[native-inputs]:
  Add python-pexpect.
---
 gnu/packages/python.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 727e1bff2..4dc284d03 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12295,6 +12295,8 @@ specs from your Flask-Restful projects.")
   (base32
 "11bwiw6j0nilgz81xnw6f1npyga3prp8asjqrm87cdr3ria5l03x"
 (build-system python-build-system)
+(native-inputs
+ `(("python-pexpect" ,python-pexpect)))
 (home-page "https://github.com/kislyuk/argcomplete";)
 (synopsis "Shell tab completion for Python argparse")
 (description "argcomplete provides extensible command line tab completion



[PATCH] gnu: Mark /gnu/store as needed for boot.

2017-01-11 Thread John Darrington
* gnu/system/file-systems.scm (all-subpaths): New procedure.
(file-system-needed-for-boot?): Use it to check for ancestors
of %store-directory.
---
 gnu/system/file-systems.scm | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 4cc1221..d42f271 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -20,6 +20,7 @@
   #:use-module (ice-9 match)
   #:use-module (guix records)
   #:use-module (guix store)
+  #:use-module (guix build utils)
   #:use-module ((gnu build file-systems)
 #:select (string->uuid uuid->string))
   #:re-export (string->uuid
@@ -95,11 +96,29 @@
   (dependencies file-system-dependencies  ; list of 
 (default '(   ; or 
 
+
+(define (all-subpaths path)
+  "Given a directory PATH return a list of all paths which
+are ancestors of this path, including PATH itself"
+ (let loop ((path (string-split path #\/))
+   (ac '()))
+   (if (null? path)
+   ac
+   (loop (cdr path)
+(cons
+ (string-append
+  (match ac
+(()  "/")
+((x _ . _) (string-append x "/"))
+((x . _) x))
+  (car path))
+ ac)
+
 (define-inlinable (file-system-needed-for-boot? fs)
-  "Return true if FS has the 'needed-for-boot?' flag set, or if it's the root
-file system."
+  "Return true if FS has the 'needed-for-boot?' flag set, or if it holds
+the store directory."
   (or (%file-system-needed-for-boot? fs)
-  (string=? "/" (file-system-mount-point fs
+  (member (file-system-mount-point fs) (all-subpaths (%store-directory)
 
 (define (file-system->spec fs)
   "Return a list corresponding to file-system FS that can be passed to the
-- 
2.1.4




[PATCH] gnu: python-click: Fix test failure.

2017-01-11 Thread Danny Milosavljevic
* gnu/packages/python.scm (python-click)[arguments]: Fix test failure.
---
 gnu/packages/python.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4dc284d03..2f1bd8315 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2383,6 +2383,8 @@ is used by the Requests library to verify HTTPS 
requests.")
(modify-phases %standard-phases
  (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
+ ;; Causes test failure if present.
+ (delete-file "click/_winconsole.py")
  (let ((glibc (assoc-ref inputs ,(if (%current-target-system)
  "cross-libc" "libc"
(substitute* "click/_unicodefun.py"



[PATCH 1/4] gnu: kdevelop: Update to 5.0.3.

2017-01-11 Thread Thomas Danckaert
* gnu/packages/kde.scm (kdevelop, kdevplatform): Update to 5.0.3.
---
 gnu/packages/kde.scm | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index db8609a..5f227ac 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Efraim Flashner 
-;;; Copyright © 2016 Thomas Danckaert 
+;;; Copyright © 2016, 2017 Thomas Danckaert 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,7 +39,7 @@
 (define-public kdevelop
   (package
 (name "kdevelop")
-(version "5.0.2")
+(version "5.0.3")
 (source
   (origin
 (method url-fetch)
@@ -48,7 +48,7 @@
 version ".tar.xz"))
 (sha256
  (base32
-  "0rl6csmzf14gf0r0mk7z2lj7cq8fggf5qmlbxq6j68vp2q0pj0cv"
+  "00gn2c66pyd9qaa0zhn2lqam0zsg7fbyi13hk32wclxq73y8v98p"
 (build-system cmake-build-system)
 (native-inputs
  `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -145,14 +145,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
 (define-public kdevplatform
   (package
 (name "kdevplatform")
-(version "5.0.2")
+(version "5.0.3")
 (source (origin
   (method url-fetch)
   (uri (string-append 
"https://github.com/KDE/kdevplatform/archive/v";
   version ".tar.gz"))
   (sha256
(base32
-"1m8c0ixv91diyy9bvq53d4jik4zrnf7bix7clad4ywxnlpcs4ahr"))
+"1k40wg08iwyswnpbs4bfh4yq38pp0qi78shjh4pf7yfa2kbid30j"))
   (file-name (string-append name "-" version ".tar.gz"
 (build-system cmake-build-system)
 (native-inputs
-- 
2.7.4




Re: 01/01: gnu: font-liberation: Use @item in @enumerate.

2017-01-11 Thread Tobias Geerinckx-Rice
David,

On 08/01/17 23:01, David Craven wrote:
> dvc pushed a commit to branch master
> 
> gnu: font-liberation: Use @item in @enumerate.
> Followup to 0102fba27c550a951799399e6a8ce2faf2cb8cd3.

Thanks!

Kind regards,

T G-R



signature.asc
Description: OpenPGP digital signature


Re: [PATCH] git download: Remove redundant argument in 'gexp->derivation' call.

2017-01-11 Thread Mathieu Lirzin
l...@gnu.org (Ludovic Courtès) writes:

> Mathieu Lirzin  skribis:
>
>> * guix/git-download.scm (git-fetch): Call 'gexp->derivation' with only one
>> '#:local-build?' keyword argument.
>
> Good catch!  Thanks,
> Ludo'.

Pushed in commit 5c6a30c5119ffd5702c02e07e7f04669a8f225bb.

Thanks.

-- 
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37



[PATCH 3/4] gnu: Add kdev-python.

2017-01-11 Thread Thomas Danckaert
* gnu/packages/kde.scm (kdev-python): New variable.
---
 gnu/packages/kde.scm | 47 +++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aef56bb..902038f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages qt)
@@ -122,6 +123,52 @@ build systems (CMake, QMake, custom Makefiles) and version 
control
 software (Git, Subversion, Mercurial, CVS and Bazaar).")
 (license license:lgpl2.1+)))
 
+(define-public kdev-python
+  (package
+(name "kdev-python")
+(version "5.0.3")
+(source
+  (origin
+(method url-fetch)
+(uri (string-append "mirror://kde/stable/kdevelop"
+"/" version "/src/kdev-python-"
+version ".tar.xz"))
+(sha256
+ (base32
+  "1sh5k3il985f991vzlqdkihn588bz14p5dl7kymwcrgc52cp0h7i"
+(build-system cmake-build-system)
+(native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+(inputs
+ `(("kdevplatform" ,kdevplatform)
+   ("python" ,python) ; only supports Python3
+   ("grantlee" ,grantlee)
+   ("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+   ("ki18n" ,ki18n)
+   ("karchive" ,karchive)
+   ("kguiaddons" ,kguiaddons)
+   ("knewstuff" ,knewstuff)
+   ("kiconthemes" ,kiconthemes)
+   ("kitemmodels" ,kitemmodels)
+   ("knotifications" ,knotifications)
+   ("knotifyconfig" ,knotifyconfig)
+   ("kparts" ,kparts)
+   ("kcrash" ,kcrash)
+   ("kwindowsystem" ,kwindowsystem)
+   ("threadweaver" ,threadweaver)
+   ("ktexteditor" ,ktexteditor)
+   ("kcmutils" ,kcmutils)
+   ("kdevelop" ,kdevelop)))
+(arguments
+ `(#:tests? #f)) ; tests fail, require display
+(home-page "https://kdevelop.org";)
+(synopsis "Python language support for KDevelop")
+(description "The KDevelop Python plugin provides semantic syntax
+highlighting, code navigation, completion, documentation integration and more
+for Python3 in KDevelop.")
+(license license:lgpl2.1+)))
+
 (define-public kdevelop-pg-qt
   (package
 (name "kdevelop-pg-qt")
-- 
2.7.4




Re: [PATCH v2] gnu: Add python2-cheetah

2017-01-11 Thread Leo Famulari
On Wed, Jan 11, 2017 at 05:00:57PM +0100, Danny Milosavljevic wrote:
> * gnu/packages/python.scm (python2-cheetah): New variable.

Thanks!

> +(description "Text-base template engine and Python code generator.

I made this into a complete sentence and pushed!

"Cheetah is a text-based template engine and Python code generator"



Re: [PATCH] derivations: Make record datatype immutable.

2017-01-11 Thread Mathieu Lirzin
l...@gnu.org (Ludovic Courtès) writes:

> Mathieu Lirzin  skribis:
>
>> * guix/derivations.scm (): Make it immutable.
>> (derivation): Use generic 'set-field' instead of ad-hoc functional setter.
>
> LGTM, thanks!
>
> Ludo'.

Pushed in commit dc673fa1131fb5d1e5ca29acb4a693cfb906986f.

Thanks.

-- 
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37



[PATCH 4/4] gnu: Add python-autopep8.

2017-01-11 Thread Thomas Danckaert
* gnu/packages/python.scm (python-autopep8, python2-autopep8): New variables.
---
 gnu/packages/python.scm | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fce6217..78532e1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4159,6 +4159,36 @@ SQLAlchemy Database Toolkit for Python.")
 (define-public python2-alembic
   (package-with-python2 python-alembic))
 
+(define-public python-autopep8
+  (package
+  (name "python-autopep8")
+  (version "1.2.4")
+  (source
+   (origin
+ (method url-fetch)
+ (uri (pypi-uri "autopep8" version))
+ (sha256
+  (base32
+   "18parm383lfn42a00wklv3qf20p4v277f1x3cn58x019dqk1xqrq"
+  (build-system python-build-system)
+  (propagated-inputs
+`(("python-pep8" ,python-pep8)))
+  (home-page "https://github.com/hhatto/autopep8";)
+  (synopsis
+"Automatically format Python code according to the PEP 8 style
+guide")
+  (description
+"@code{autopep8} automatically formats Python code to conform to
+the PEP 8 style guide.  It uses the pycodestyle utility to determine
+what parts of the code needs to be formatted.  @code{autopep8} is
+capable of fixing most of the formatting issues that can be reported
+by pycodestyle.")
+  (license (license:non-copyleft
+"https://github.com/hhatto/autopep8/blob/master/LICENSE";
+
+(define-public python2-autopep8
+  (package-with-python2 python-autopep8))
+
 (define-public python-distutils-extra
   (package
 (name "python-distutils-extra")
-- 
2.7.4




[PATCH 0/4] kdevelop updates

2017-01-11 Thread Thomas Danckaert
Hi Guix,

This patchseries updates kdevelop & kdevplatform, sets a few more paths in the
kdevelop wrapper, and adds the kdevelop Python plugin.  The kdevelop package
is still a bit rough around the edges (still have to think of a satisfying
solution to the QT_PLUGIN_PATH issues, see
https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00652.html), but
usable.

There is one issue: when I apply this patch series on current master (after
commit e10872c gnu: gpgme: Patch CMake files), `guix build kdevelop` seems to
get stuck after completing the build (at least it doesn't return after running
at ~100%cpu for over 40minutes, with no output).  When I apply the patch
series on commit 4d0a3d8 (system: grub: Load relevant EFI modules on EFI
systems), I don't have this problem.  I'm not sure if this is an issue just on
my system, or not (I upgraded guix-daemon to lastest master, but the problem
remains). Hints on how to investigate this are welcome!

best,

Thomas Danckaert (4):
  gnu: kdevelop: Update to 5.0.3.
  gnu: kdevelop: Set more paths in wrapper script.
  gnu: Add kdev-python.
  gnu: Add python-autopep8.

 gnu/packages/kde.scm| 68 ++---
 gnu/packages/python.scm | 30 ++
 2 files changed, 89 insertions(+), 9 deletions(-)

-- 
2.7.4




Re: [PATCH] gnu: Add inox.

2017-01-11 Thread Marius Bakke
David Craven  writes:

>> One thing that worries me about Inox is that version 53 is very old and
>> likely contains known vulnerabilities. Do you know if they backport
>> fixes? If not, I think we should try to stick with upstream Chromium.
>
> This is due to me not having worked on it for a while. Inox are just a couple
> of patches and default configure flags, but it's still chromium. I'm not too
> concerned with inox, but *whisper* I got the impression that there where
> FSDG issues with chromium. By applying a bunch of patches and calling it
> inox instead of chromium, I think it could be considered a "good faith 
> effort",
> and the problem avoided until someone complains.
>
> Another interesting collection of chromium patches would be:
> https://github.com/Eloston/ungoogled-chromium

I actually picked most of the patches from ungoogled-chromium (which
includes inox and iridium), but skipped "high maintenance" ones. This
started as an attempt to package that very project, but they were
lagging too far behind upstream IMO.

FSDG problems is the reason I haven't advertised it. At the very least,
the Google integrations should be disabled and analytics removed (but
Chromium can't currently build without either). I think if most of the
"FIXMEs" are resolved upstream, it might be eligible for a free distro.

Now that the cat is out of the box, feel free to send patches somewhere
and I'll incorporate them in the branch :-)


signature.asc
Description: PGP signature


[PATCH 2/4] gnu: kdevelop: Set more paths in wrapper script.

2017-01-11 Thread Thomas Danckaert
* gnu/packages/kde.scm (kdevelop)[arguments]: Add more paths in
 wrap-executable: add "/share" output of kdevplatform and kcmutils to
 $XDG_DATA_DIRS; add "lib/plugins" from user profile to $QT_PLUGIN_PATH.
---
 gnu/packages/kde.scm | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 5f227ac..aef56bb 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -98,15 +98,18 @@
  (let* ((out  (assoc-ref outputs "out"))
 (kdevplatform (assoc-ref inputs "kdevplatform"))
 (kio (assoc-ref inputs "kio"))
+(kcmutils (assoc-ref inputs "kcmutils"))
 (qtquickcontrols (assoc-ref inputs "qtquickcontrols"))
 (qtdeclarative (assoc-ref inputs "qtdeclarative"))
-(plugins "/lib/plugins")
+(profile "$HOME/.guix-profile")
 (qml "/qml"))
(wrap-program (string-append out "/bin/kdevelop")
+ `("XDG_DATA_DIRS" ":" prefix
+   ,(map (lambda (s) (string-append s "/share"))
+ (list profile out kdevplatform kcmutils)))
  `("QT_PLUGIN_PATH" ":" prefix
-   (,(string-append out plugins)
-,(string-append kdevplatform plugins)
-,(string-append kio plugins)))
+   ,(map (lambda (s) (string-append s "/lib/plugins"))
+ (list profile out kdevplatform kio)))
  `("QML2_IMPORT_PATH" ":" prefix
(,(string-append qtquickcontrols qml)
 ,(string-append qtdeclarative qml))
-- 
2.7.4




[PATCH] gnu: Mark /gnu/store as needed for boot.

2017-01-11 Thread John Darrington
* gnu/system/file-systems.scm (all-subpaths): New procedure.
(file-system-needed-for-boot?): Use it to check for ancestors
of %store-directory.
---
 gnu/system/file-systems.scm | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 4cc1221..6789b0d 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -20,6 +20,7 @@
   #:use-module (ice-9 match)
   #:use-module (guix records)
   #:use-module (guix store)
+  #:use-module (guix build utils)
   #:use-module ((gnu build file-systems)
 #:select (string->uuid uuid->string))
   #:re-export (string->uuid
@@ -95,11 +96,29 @@
   (dependencies file-system-dependencies  ; list of 
 (default '(   ; or 
 
+
+(define (all-subpaths path)
+  "Given a directory PATH return a list of all paths which
+are ancestors of this path, including PATH itself"
+ (let loop ((path (string-split path #\/))
+   (ac '()))
+   (if (null? path)
+   ac
+   (loop (cdr path)
+(cons
+ (string-append
+  (match ac
+(()  "/")
+((x _ . _) (string-append x "/"))
+((x . _) x))
+  (car path))
+ ac)
+
 (define-inlinable (file-system-needed-for-boot? fs)
-  "Return true if FS has the 'needed-for-boot?' flag set, or if it's the root
-file system."
+  "Return true if FS has the 'needed-for-boot?' flag set, or if it holds
+the store directory."
   (or (%file-system-needed-for-boot? fs)
-  (string=? "/" (file-system-mount-point fs
+  (member (file-system-mount-point fs) %store-directory)))
 
 (define (file-system->spec fs)
   "Return a list corresponding to file-system FS that can be passed to the
-- 
2.1.4




Re: Add a generalized git-file? to Guix?

2017-01-11 Thread Mathieu Lirzin
Hi,

Christopher Allan Webber  writes:

> Thompson, David writes:
>
>> Hi Christopher and Jan,
>>
>> On Tue, Jan 10, 2017 at 11:28 AM, Christopher Allan Webber
>>  wrote:
>>> Jan Nieuwenhuizen writes:
>>>
 Christopher Allan Webber writes:

> Thanks!
>
> The file is updated, and even nicer now, since I'm using a hack from
> guile-sdl2 which allows you to set the source to the whole checkout.

 Ohh!  That needs to go in the Guix manual... could git-file? be added
 to guix/utils?
>>>
>>> Maybe!  I think David knows more about the provenance?
>>
>> I took this code from Ludovic.  See make-git-predicate in
>> gnu/packages/package-management.scm in the Guix source tree.
>>
>>> I agree it would be nice to have in Guix itself.
>>
>> Agreed.  A generalized and publicly available procedure would be great.
>>
>> - Dave
>
> Hello!  See the above conversation... 8sync now uses `git-file?' in its
> guix.scm, a predicate check which allows for checking out the whole
> local directory as a "source" for testing a package.  I borrowed it from
> Dave who originally adapted it from some code in Guix itself.  See:
>
>   http://git.savannah.gnu.org/cgit/8sync.git/tree/guix.scm#n62
>
> This is pretty handy; probably other projects would like to make use of
> it.  What do we think of making it a generally available utility?

I would make use of it and I am in favour of adding it to Guix.

Thanks.

-- 
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37



Re: [PATCH] gnu: moc: Update to 2.5.2.

2017-01-11 Thread Marius Bakke
Kei Kebreau  writes:

> Thanks for the review! The macros you mention were indeed introduced in
> this version.

Wow, good catch!

> Does this commit message look good to you?
>
> * gnu/packages/music.scm (moc): Update to 2.5.2.
> [source](modules, snippet): Remove timestamps from the output.

I'd just write "[source]: Add snippet to make it reproducible.".

> Does the ghc binary work for you? I get complaints about the ncursesw
> library missing. I suspect it has to do with the LD_LIBRARY_PATH, as
> seen in the ghc package definition.

Looks like you're right. I've filed a bug report:

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25421

Thank you!


signature.asc
Description: PGP signature


Re: [PATCH] gnu: gnutls: Replace with 3.5.8 [fixes GNUTLS-SA-2017-{1,2}].

2017-01-11 Thread Leo Famulari
On Tue, Jan 10, 2017 at 06:08:39PM -0500, Leo Famulari wrote:
> On Tue, Jan 10, 2017 at 11:41:40PM +0100, Ludovic Courtès wrote:
> > Leo Famulari  skribis:
> > > The last time I noticed an exported replacement, I found that it was
> > > resolved non-deterministically (using `guix build -S` in a loop), and
> > > we made the replacement private:
> > >
> > > http://git.savannah.gnu.org/cgit/guix.git/commit/?id=69aa6e0995b55a38d5ce174602a107645be726d5
> > 
> > I can’t seem to reproduce it here, but it sounds like an interesting
> > bug.  :-)
> 
> Me neither. IIRC, it would manifest at least 1/10 iterations of the
> loop.

I can reproduce it by applying the diff below on
88f2dd1ddf8123f628ee0b64406b6fd2a6a9f076 and running:

$ while true; do ./pre-inst-env guix build gnutls -S; done
guix build: warning: ambiguous package specification `gnutls'
guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:139:2
/gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz
guix build: warning: ambiguous package specification `gnutls'
guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:216:2
/gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz
guix build: warning: ambiguous package specification `gnutls'
guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:216:2
/gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz
guix build: warning: ambiguous package specification `gnutls'
guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:139:2
/gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index e577421fa..19d5049c3 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -138,6 +138,7 @@ living in the same process.")
 (define-public gnutls
   (package
 (name "gnutls")
+(replacement gnutls-3.5.8)
 (version "3.5.4")
 (source (origin
  (method url-fetch)
@@ -211,6 +212,20 @@ required structures.")
 (properties '((ftp-server . "ftp.gnutls.org")
   (ftp-directory . "/gcrypt/gnutls")
 
+(define-public gnutls-3.5.8
+  (package
+(inherit gnutls)
+(source
+  (let ((version "3.5.8"))
+(origin
+  (method url-fetch)
+  (uri (string-append "mirror://gnupg/gnutls/v"
+  (version-major+minor version)
+  "/gnutls-" version ".tar.xz"))
+  (sha256
+   (base32
+"1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf")))
+
 (define-public openssl
   (package
(name "openssl")


signature.asc
Description: PGP signature


[PATCH v2] gnu: Add python2-cheetah

2017-01-11 Thread Danny Milosavljevic
* gnu/packages/python.scm (python2-cheetah): New variable.
---
 gnu/packages/python.scm | 43 +++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c15a12f9b..234b51004 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12331,3 +12331,46 @@ possible on all supported Python versions.")
 
 (define-public python2-xopen
   (package-with-python2 python-xopen))
+
+(define-public python2-cheetah
+  (package
+(name "python2-cheetah")
+(version "2.4.4")
+(source
+  (origin
+(method url-fetch)
+(uri (pypi-uri "Cheetah" version))
+(sha256
+  (base32
+"0l5mm4lnysjkzpjr95q5ydm9xc8bv43fxmr79ypybrf1y0lq4c5y"
+(build-system python-build-system)
+(arguments
+ `(#:python ,python-2))
+(propagated-inputs
+ `(("python2-markdown" ,python2-markdown)))
+(home-page "https://pythonhosted.org/Cheetah/";)
+(synopsis "Template engine")
+(description "Text-base template engine and Python code generator.
+
+Cheetah can be used as a standalone templating utility or referenced as
+a library from other Python applications.  It has many potential uses,
+but web developers looking for a viable alternative to ASP, JSP, PHP and
+PSP are expected to be its principle user group.
+
+Features:
+@enumerate
+@item Generates HTML, SGML, XML, SQL, Postscript, form email, LaTeX, or any 
other
+   text-based format.
+@item Cleanly separates content, graphic design, and program code.
+@item Blends the power and flexibility of Python with a simple template 
language
+   that non-programmers can understand.
+@item Gives template writers full access to any Python data structure, module,
+   function, object, or method in their templates.
+@item Makes code reuse easy by providing an object-orientated interface to
+   templates that is accessible from Python code or other Cheetah templates.
+   One template can subclass another and selectively reimplement sections of 
it.
+@item Provides a simple, yet powerful, caching mechanism that can dramatically
+   improve the performance of a dynamic website.
+@item Compiles templates into optimized, yet readable, Python code.
+@end enumerate")
+(license (license:x11-style "file://LICENSE"



Add a generalized git-file? to Guix?

2017-01-11 Thread Christopher Allan Webber
Thompson, David writes:

> Hi Christopher and Jan,
>
> On Tue, Jan 10, 2017 at 11:28 AM, Christopher Allan Webber
>  wrote:
>> Jan Nieuwenhuizen writes:
>>
>>> Christopher Allan Webber writes:
>>>
 Thanks!

 The file is updated, and even nicer now, since I'm using a hack from
 guile-sdl2 which allows you to set the source to the whole checkout.
>>>
>>> Ohh!  That needs to go in the Guix manual... could git-file? be added
>>> to guix/utils?
>>
>> Maybe!  I think David knows more about the provenance?
>
> I took this code from Ludovic.  See make-git-predicate in
> gnu/packages/package-management.scm in the Guix source tree.
>
>> I agree it would be nice to have in Guix itself.
>
> Agreed.  A generalized and publicly available procedure would be great.
>
> - Dave

Hello!  See the above conversation... 8sync now uses `git-file?' in its
guix.scm, a predicate check which allows for checking out the whole
local directory as a "source" for testing a package.  I borrowed it from
Dave who originally adapted it from some code in Guix itself.  See:

  http://git.savannah.gnu.org/cgit/8sync.git/tree/guix.scm#n62

This is pretty handy; probably other projects would like to make use of
it.  What do we think of making it a generally available utility?

 - Chris



Re: [PATCH] gnu: Add python2-cheetah.

2017-01-11 Thread Danny Milosavljevic
Hi Leo,

On Tue, 10 Jan 2017 14:51:09 -0500
Leo Famulari  wrote:
> On Tue, Jan 10, 2017 at 01:01:30AM +0100, Danny Milosavljevic wrote:
> > * gnu/packages/python.scm (python2-cheetah): New variable.  
> 
> Thanks!
> 
> > +(arguments
> > + `(#:python ,python-2))  
> 
> Is only Python 2 supported?

Unfortunately yes. See also https://pythonhosted.org/Cheetah/roadmap.html .

> 
> > +(home-page "http://www.cheetahtemplate.org/";)  
> 
> This site doesn't load for me.

Huh. Strange, it doesn't for me either.

Maybe we should better use https://pythonhosted.org/Cheetah/ .



Re: FOSDEM 2017 audio/video volunteers needed

2017-01-11 Thread Pjotr Prins
Awesome. Ricardo can you co-ordinate between the 3 V&A, or ask one of
the others to coordinate and that you have each other's phone numbers?
I suggest to come half an hour before the room starts to boot up -
literally.

Hopefully the system does not miss out on talks like last year...

On Wed, Jan 11, 2017 at 02:08:16PM +0100, Catonano wrote:
> 2017-01-11 11:52 GMT+01:00 Amirouche Boubekki :
> 
> >
> > No response. We need help! Two people can take turns over the day.
> >>> Please volunteer, it is important we capture all talks.
> >>>
> >>
> >> I could do some of it, but I’m also giving talks, so we need at least
> >> one more person to help out.
> >>
> >
> > I hope I will be up to the task; count me in.
> >
> >
> 
> I can take a share of the burden. Count me in
> 

-- 



Re: FOSDEM 2017 audio/video volunteers needed

2017-01-11 Thread Catonano
2017-01-11 11:52 GMT+01:00 Amirouche Boubekki :

>
> No response. We need help! Two people can take turns over the day.
>>> Please volunteer, it is important we capture all talks.
>>>
>>
>> I could do some of it, but I’m also giving talks, so we need at least
>> one more person to help out.
>>
>
> I hope I will be up to the task; count me in.
>
>

I can take a share of the burden. Count me in


Re: [PATCH] gnu: gnutls: Make perl a native-input.

2017-01-11 Thread David Craven
> Do you know what perl is used for in gnutls? I see it contains no
> references, but I also tried building without perl and everything seems
> fine. Perhaps we can just remove it?

Anyone against simply removing perl as a dependency?

> Looks good to me, but this should be applied to 'core-updates' due to
> the large number of dependent packages.

Ok



Re: FOSDEM 2017 audio/video volunteers needed

2017-01-11 Thread Amirouche Boubekki

On 2017-01-11 09:05, Ricardo Wurmus wrote:

Pjotr Prins  writes:


On Tue, Jan 10, 2017 at 04:02:32AM +, Pjotr Prins wrote:

Hi all,

FOSDEM provides live streaming of talks and archiving. We need
volunteers to man the FOSS setup that handles the camera and mike.
Ideally two people who expect to be in the room all day :). It is
mostly automated and does not require special skills.


No response. We need help! Two people can take turns over the day.
Please volunteer, it is important we capture all talks.


I could do some of it, but I’m also giving talks, so we need at least
one more person to help out.


I hope I will be up to the task; count me in.



Re: Problem with Hydra?

2017-01-11 Thread Konrad Hinsen

Hi Ludovic,


The problem is that mirror.hydra.gnu.org was serving a zero-length
file.  This is fixed now.


Indeed - I am up to date again!

Thanks,
  Konrad.




Re: [PATCH] gnu: Add inox.

2017-01-11 Thread David Craven
> Tell me about it! I've been secretly maintaining a Chromium branch over
> at https://github.com/mbakke/guix/commits/chromium . It's frequently
> rebased.

Looks awesome!

> One thing that worries me about Inox is that version 53 is very old and
> likely contains known vulnerabilities. Do you know if they backport
> fixes? If not, I think we should try to stick with upstream Chromium.

This is due to me not having worked on it for a while. Inox are just a couple
of patches and default configure flags, but it's still chromium. I'm not too
concerned with inox, but *whisper* I got the impression that there where
FSDG issues with chromium. By applying a bunch of patches and calling it
inox instead of chromium, I think it could be considered a "good faith effort",
and the problem avoided until someone complains.

Another interesting collection of chromium patches would be:
https://github.com/Eloston/ungoogled-chromium

> Also, Chromium 54+ have abandoned the "gyp" build system completely in
> favor of the "gn" build system. With it, many build flags don't work
> properly yet. See the FIXMEs in the HEAD of the above branch :-)

Good to know, thanks for the heads up!

> Anyway, great work so far, hopefully we can join efforts and get this in
> somehow. I'm not happy with the current build, the 3rd party stuff
> should be removed in a source snippet, and some sites tend to just
> "hang" infrequently, likely from one of the patches (IPv6 probe?).

Sounds good! We should definitely use your package as a base...



Re: [PATCH] gnu: xmonad: Add missing propagated input.

2017-01-11 Thread Ricardo Wurmus

Ludovic Courtès  writes:

> José Miguel Sánchez García  skribis:
>
>> xmonad package needs some love, and this is the first step. ghc should
>> be a
>> propagated input, because it's needed for certain commands such as
>> xmonad --recompile.
>
> Instead of propagating it, would it be possible to hard-code the
> absolute file name of ‘ghc’ inside the xmonad source?
>
> That would avoid pulling in GHC in the user’s profile, which could
> conflict with the user’s GHC.

Could we avoid all of this if we encouraged users to also install
whichever version of GHC they liked best?  Propagation seems bad here
and hard-coding a particular version of GHC in the store also doesn’t
quite seem right to me.

If a user wants to use a different GHC with libraries that are only
available with their particular version of GHC to reconfigure xmonad
then I think it’s best to just leave the decision up to the user.  The
user decides by installing their desired version of GHC into their
profile.

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net




Re: [PATCH 2/2] scripts: system: Rename --no-grub option to --no-bootloader.

2017-01-11 Thread David Craven
> What do you think?

I want to clearly separate the bootloader configuration file stuff
from the bootloader stuff. I think that we shouldn't have to even
specify a bootloader tag at all (it defaults to #f).

We can have a default bootloader entry printer that just prints all
the important information for making it a gc root and that would be
the default for qemu when we are not using full-boot?

Then we can have a bootloader entry printer for grub.cfg and
extlinux.conf and a default that does the absolute minimum.



Re: FOSDEM 2017 audio/video volunteers needed

2017-01-11 Thread Ricardo Wurmus

Pjotr Prins  writes:

> On Tue, Jan 10, 2017 at 04:02:32AM +, Pjotr Prins wrote:
>> Hi all,
>> 
>> FOSDEM provides live streaming of talks and archiving. We need
>> volunteers to man the FOSS setup that handles the camera and mike.
>> Ideally two people who expect to be in the room all day :). It is
>> mostly automated and does not require special skills.
>
> No response. We need help! Two people can take turns over the day.
> Please volunteer, it is important we capture all talks.

I could do some of it, but I’m also giving talks, so we need at least
one more person to help out. 

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net