[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
From: |
Mark H. Weaver |
Subject: |
01/01: Merge branch 'master' into core-updates |
Date: |
Mon, 1 Aug 2016 03:29:34 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 3d337bbc3916b95c0197ebbb890875f0439eec53
Merge: 932b2ea 4e8efc1
Author: Mark H Weaver <address@hidden>
Date: Sun Jul 31 23:27:03 2016 -0400
Merge branch 'master' into core-updates
emacs/guix-main.scm | 20 ++-
gnu/local.mk | 2 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/education.scm | 4 +-
gnu/packages/game-development.scm | 103 ++++++++++++
gnu/packages/games.scm | 172 +++++++++++++++++++-
gnu/packages/gnome.scm | 30 ++++
gnu/packages/gnunet.scm | 4 +-
gnu/packages/golang.scm | 154 ++++++++++++++++++
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/linux.scm | 11 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/music.scm | 11 +-
.../patches/beets-image-test-failure.patch | 46 ------
gnu/packages/patches/tuxpaint-stamps-path.patch | 24 +++
gnu/packages/protobuf.scm | 4 +-
gnu/packages/skarnet.scm | 107 ++++++++++++
gnu/packages/video.scm | 38 +++++
guix/scripts.scm | 9 +-
20 files changed, 667 insertions(+), 88 deletions(-)
diff --cc gnu/packages/linux.scm
index 68ca5fc,ca3860a..e65327c
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2598,22 -2584,10 +2598,22 @@@ and copy/paste text in the console and
"btrfs-progs-v" version ".tar.xz"))
(sha256
(base32
- "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6"))))
+ "06c9l6m3w29dndk17jrlpgr01wykl10h34zva8zc2c571z6mrlaf"))))
(build-system gnu-build-system)
+ (outputs '("out"
+ "static")) ; static versions of binaries in "out"
(~16MiB!)
(arguments
- '(#:test-target "test"
+ '(#:phases (modify-phases %standard-phases
+ (add-after 'build 'build-static
+ (lambda _ (zero? (system* "make" "static"))))
+ (add-after 'install 'install-static
+ (let ((staticbin (string-append (assoc-ref %outputs
"static")
+ "/bin")))
+ (lambda _
+ (zero? (system* "make"
+ (string-append "bindir=" staticbin)
+ "install-static"))))))
+ #:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel
(inputs `(("e2fsprogs" ,e2fsprogs)
("libblkid" ,util-linux)