From 2b94c14c9e7bbd2f582e6b5df89424dd089fc78f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jun 2018 21:37:41 +0300 Subject: gnu: x265: Fix building on armhf-linux and aarch64-linux. * gnu/packages/video.scm (x265)[source]: Add patch. [arguments]: Enable PIC on armhf-linux. * gnu/packages/patches/x265-fix-ppc64le-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/packages/patches/x265-fix-ppc64le-build.patch | 25 +++++++++++++++++++++++ gnu/packages/video.scm | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/x265-fix-ppc64le-build.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/x265-fix-ppc64le-build.patch b/gnu/packages/patches/x265-fix-ppc64le-build.patch new file mode 100644 index 0000000000..f71d2436ab --- /dev/null +++ b/gnu/packages/patches/x265-fix-ppc64le-build.patch @@ -0,0 +1,25 @@ +https://sources.debian.org/data/main/x/x265/2.8-3/debian/patches/0003-Fix-build-error-on-on-ppc64le.patch + +This patch also fixes building on armhf-linux and aarch64-linux + +From: Jayashree +Date: Fri, 25 May 2018 10:26:05 +0530 +Subject: Fix build error on on ppc64le + +--- + source/common/param.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/common/param.cpp b/source/common/param.cpp +index 31bcbc7..4a6d0c8 100644 +--- a/source/common/param.cpp ++++ b/source/common/param.cpp +@@ -633,7 +633,7 @@ int x265_param_parse(x265_param* p, const char* name, const char* value) + if (bValueWasNull) + p->cpuid = atobool(value); + else +- p->cpuid = parseCpuName(value, bError); ++ p->cpuid = parseCpuName(value, bError, false); + #endif + } + OPT("fps") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e31238243f..ff05557089 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -44,6 +44,7 @@ (define-module (gnu packages video) #:use-module (ice-9 match) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) @@ -393,6 +394,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (sha256 (base32 "0qx8mavwdzdpkkby7n29i9av7zsnklavacwfz537mf62q2pzjnbf")) + (patches (search-patches "x265-fix-ppc64le-build.patch")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "source/compat/getopt") @@ -401,7 +403,9 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built ;; Currently the source code doesn't check for aarch64. - ,@(if (string-prefix? "aarch64" (or (%current-target-system) (%current-system))) + ,@(if (any (cute string-prefix? <> (or (%current-system) + (%current-target-system))) + '("armhf" "aarch64")) '(#:configure-flags '("-DENABLE_PIC=TRUE")) '()) #:phases -- cgit 1.4.1 From 737d1b3cd6fd583903428545cdd6bac0f5f6faab Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 19 Jun 2018 21:17:49 +0200 Subject: gnu: faba-icon-theme: Fix build. * gnu/packages/gnome.scm (faba-icon-theme)[arguments]: Do not run configure during the bootstrap phase. --- gnu/packages/gnome.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1d53af7515..f66ac7446d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6486,6 +6486,12 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.") (substitute* '("Makefile.am") (("\\$\\(DESTDIR\\)/usr/share") "$(datadir)")) + #t)) + (add-after 'unpack 'disable-configure-during-bootstrap + (lambda _ + ;; Do not run configure as part of autogen.sh because references + ;; to /bin are not fixed yet. + (setenv "NOCONFIGURE" "y") #t))))) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From 9e1ede95df446f17df3c2164766545daeea472d3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 19 Jun 2018 21:32:24 +0200 Subject: gnu: arc-icon-theme: Fix build. * gnu/packages/gnome.scm (arc-icon-theme)[arguments]: Do not run configure during the bootstrap phase. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f66ac7446d..b5d8170ae2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6541,6 +6541,14 @@ simple and consistent.") (base32 "1ya1cqvv8q847c0rpcg6apzky87q3h04y8jz5nmi52qk6kg8si0b")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-configure-during-bootstrap + (lambda _ + (substitute* "autogen.sh" + (("^\"\\$srcdir/configure\".*") "")) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) -- cgit 1.4.1 From 3110c74b98eab04183a0fc4573a97f9997ea818c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jun 2018 17:55:27 +0200 Subject: Revert "gnu: Remove Mr. Rescue." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 33f61dc1b5e14f8a2e3dfb3fb48102bda0fd6b13. The game can be patched to run on Löve 11 (done in a separate commit for clarity). --- gnu/packages/games.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 06ac1b80bb..e5d5765ff3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3252,6 +3252,53 @@ application that locks the keyboard and mouse and instead displays bright colors, pictures, and sounds.") (license license:gpl3+))) +(define-public mrrescue + (package + (name "mrrescue") + (version "1.02e") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/SimonLarsen/mrrescue/releases/" + "download/" version "/" name version ".love")) + (file-name (string-append name "-" version ".love")) + (sha256 + (base32 + "0jwzbwkgp1l5ia6c7s760gmdirbsncp6nfqp7vqdqsfb63la9gl2")))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (bindir (string-append out "/bin")) + (prog (string-append bindir "/mrrescue")) + (source (assoc-ref %build-inputs "source")) + (bash (string-append (assoc-ref %build-inputs "bash") + "/bin/bash")) + (love (string-append (assoc-ref %build-inputs "love") + "/bin/love"))) + (mkdir-p bindir) + (with-output-to-file prog + (lambda () + (format #t "#!~a~%" bash) + (format #t "exec -a mrrescue \"~a\" \"~a\"~%" love source))) + (chmod prog #o755) + #t)))) + (inputs + `(("bash" ,bash) + ("love" ,love))) + (home-page "http://tangramgames.dk/games/mrrescue") + (synopsis "Arcade-style fire fighting game") + (description + "Mr. Rescue is an arcade styled 2d action game centered around evacuating +civilians from burning buildings. The game features fast paced fire +extinguishing action, intense boss battles, a catchy soundtrack and lots of +throwing people around in pseudo-randomly generated buildings.") + (license (list license:zlib ; for source code + license:cc-by-sa3.0)))) ; for graphics and music assets + (define-public hyperrogue (package (name "hyperrogue") -- cgit 1.4.1 From 8893218a7d9c750e657cde17e3a670621ec3ea2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jun 2018 04:49:33 +0200 Subject: gnu: mrrescue: Work on Löve 11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (mrrescue)[arguments]: Extract & patch the game data, and point ‘love’ to this modified copy. Minor cosmetic tweaks. [native-inputs]: Add unzip, patch, and the love-11.patch which is... * gnu/packages/patches/mrrescue-support-love-11.patch: ...a new file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 47 +++-- .../patches/mrrescue-support-love-11.patch | 213 +++++++++++++++++++++ 3 files changed, 248 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/mrrescue-support-love-11.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 6560944d1b..cdb1edbfb7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -940,6 +940,7 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-shell-version.patch \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ + %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mumble-1.2.19-abs.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e5d5765ff3..ff9adbbd57 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3267,25 +3267,46 @@ colors, pictures, and sounds.") "0jwzbwkgp1l5ia6c7s760gmdirbsncp6nfqp7vqdqsfb63la9gl2")))) (build-system trivial-build-system) (arguments - '(#:modules ((guix build utils)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils)) - (let* ((out (assoc-ref %outputs "out")) - (bindir (string-append out "/bin")) - (prog (string-append bindir "/mrrescue")) - (source (assoc-ref %build-inputs "source")) - (bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) - (love (string-append (assoc-ref %build-inputs "love") - "/bin/love"))) - (mkdir-p bindir) - (with-output-to-file prog + (let* ((out (assoc-ref %outputs "out")) + (script (string-append out "/bin/" ,name)) + (data (string-append out "/share/" ,name)) + (source (assoc-ref %build-inputs "source")) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip")) + (patch (string-append (assoc-ref %build-inputs "patch") + "/bin/patch")) + (bash (string-append (assoc-ref %build-inputs "bash") + "/bin/bash")) + (love (string-append (assoc-ref %build-inputs "love") + "/bin/love"))) + + (mkdir-p (dirname script)) + (with-output-to-file script (lambda () (format #t "#!~a~%" bash) - (format #t "exec -a mrrescue \"~a\" \"~a\"~%" love source))) - (chmod prog #o755) + (format #t "exec -a ~a \"~a\" \"~a\"~%" ,name love data))) + (chmod script #o755) + + ;; The better way to package this game would be to install *only* the + ;; script above, pointing to the unextracted .love file in the store. + ;; However, mrrescue 1.02e needs to be patched to work with Love 11. + ;; Instead of extracting the .love file, patching it, and re-zipping + ;; it to the store, simply point the script to the extracted patched + ;; data directory directly. + (mkdir-p data) + (with-directory-excursion data + (invoke unzip source) + (invoke patch "-p1" "-i" + (assoc-ref %build-inputs "love-11.patch"))) #t)))) + (native-inputs + `(("unzip" ,unzip) + ("patch" ,patch) + ("love-11.patch" ,(search-patch "mrrescue-support-love-11.patch")))) (inputs `(("bash" ,bash) ("love" ,love))) diff --git a/gnu/packages/patches/mrrescue-support-love-11.patch b/gnu/packages/patches/mrrescue-support-love-11.patch new file mode 100644 index 0000000000..2786a6b01b --- /dev/null +++ b/gnu/packages/patches/mrrescue-support-love-11.patch @@ -0,0 +1,213 @@ +From: Tobias Geerinckx-Rice +Date: Tue, 19 Jun 2018 04:37:46 +0200 +Subject: gnu: mrrescue: Support Love 11. + +The patch below was copied verbatim from an as-yet-unmerged PR[0] to +make Mr. Rescue run on a newer version of the Löve engine. + +[0]: https://github.com/SimonLarsen/mrrescue/pull/17 +--- +From ab23031e0c2faecb77fde1be8a41d6f8ea4e6eda Mon Sep 17 00:00:00 2001 +From: Mystro256 +Date: Sun, 10 Jun 2018 21:19:23 -0400 +Subject: [PATCH] Love 11 support + +--- + conf.lua | 2 +- + config.lua | 6 +++--- + highscore_entry.lua | 4 ++-- + highscore_list.lua | 4 ++-- + ingame.lua | 6 +++--- + ingame_menu.lua | 4 ++-- + joystick.lua | 4 ++-- + main.lua | 2 +- + resources.lua | 4 ++-- + util.lua | 4 ++-- + 10 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/conf.lua b/conf.lua +index 8776da4..f00b216 100644 +--- a/conf.lua ++++ b/conf.lua +@@ -1,6 +1,6 @@ + function love.conf(t) + t.identity = "mrrescue" +- t.version = "0.10.0" ++ t.version = "11.0" + t.console = false + t.accelerometerjoystick = true + t.gammacorrect = false +diff --git a/config.lua b/config.lua +index 63eeb04..71c2b66 100644 +--- a/config.lua ++++ b/config.lua +@@ -38,7 +38,7 @@ function loadConfig() + config[i] = v + end + end +- if love.filesystem.exists("settings") then ++ if love.filesystem.getInfo("settings")~= nil then + local data = love.filesystem.read("settings") + local file = TSerial.unpack(data) + for i,v in pairs(file) do +@@ -52,7 +52,7 @@ function loadConfig() + end + + function loadHighscores() +- if love.filesystem.exists("highscores") then ++ if love.filesystem.getInfo("highscores")~= nil then + local data = love.filesystem.read("highscores") + local file = TSerial.unpack(data) + for i=1,3 do +@@ -64,7 +64,7 @@ function loadHighscores() + end + + function loadStats() +- if love.filesystem.exists("stats") then ++ if love.filesystem.getInfo("stats")~= nil then + local data = love.filesystem.read("stats") + stats = TSerial.unpack(data) + end +diff --git a/highscore_entry.lua b/highscore_entry.lua +index 2f763af..3b3bb73 100644 +--- a/highscore_entry.lua ++++ b/highscore_entry.lua +@@ -45,9 +45,9 @@ function highscore_entry.draw() + for ix = 1,10 do + if highscore_entry.selection == char then + lg.rectangle("fill", 33+ix*16, 66+iy*16, 14, 14) +- lg.setColor(0,0,0,255) ++ lg.setColor(0,0,0,1) + lg.print(KEYBOARD:sub(char,char), 37+ix*16, 70+iy*16) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + else + lg.print(KEYBOARD:sub(char,char), 37+ix*16, 70+iy*16) + end +diff --git a/highscore_list.lua b/highscore_list.lua +index 6a17973..b66d0e2 100644 +--- a/highscore_list.lua ++++ b/highscore_list.lua +@@ -31,10 +31,10 @@ function highscore_list.draw() + if scores[i] then + if highscore_list.level == highscore_list.hllevel + and highscore_list.hlpos == i then +- lg.setColor(25,118,115,255) ++ lg.setColor(25/255,118/255,115/255,1) + lg.print(scores[i].name, 48, 14+i*16) + lg.print(scores[i].score, 105, 14+i*16) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + else + lg.print(scores[i].name, 48, 14+i*16) + lg.print(scores[i].score, 105, 14+i*16) +diff --git a/ingame.lua b/ingame.lua +index 52004f1..f5c6f7c 100644 +--- a/ingame.lua ++++ b/ingame.lua +@@ -189,16 +189,16 @@ function ingame.draw() + lg.pop() + + if map.type == MT_NORMAL then +- lg.setBlendMode("multiply") ++ lg.setBlendMode("multiply", "premultiplied") + lg.draw(canvas, 0,0) + lg.setBlendMode("alpha") + end + + -- Draw red screen if hit + if player.heat > 0 then +- lg.setColor(255,255,255,cap(player.heat*255, 16, 255)) ++ lg.setColor(1,1,1,cap(player.heat*255, 16, 255)/255) + lg.draw(img.red_screen, quad.red_screen, 0,0) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + end + + -- Draw hud +diff --git a/ingame_menu.lua b/ingame_menu.lua +index 9fcf768..82a8459 100644 +--- a/ingame_menu.lua ++++ b/ingame_menu.lua +@@ -18,10 +18,10 @@ function ingame_menu.draw() + lg.pop() + + lg.scale(config.scale) +- lg.setColor(0,0,0,238) ++ lg.setColor(0,0,0,238/255) + lg.rectangle("fill", 0, 0, WIDTH, HEIGHT) + +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + lg.printf("PAUSED", 0, 46, WIDTH, "center") + lg.print("RESUME", 103, 92) + lg.print("QUIT", 103, 106) +diff --git a/joystick.lua b/joystick.lua +index 50ccadb..72d545e 100644 +--- a/joystick.lua ++++ b/joystick.lua +@@ -22,11 +22,11 @@ function joystick.draw() + lg.printf("SET JOYSTICK", 0, 39, WIDTH, "center") + for i=1,4 do + if joystick.waiting == true and joystick.selection == i then +- lg.setColor(195,52,41) ++ lg.setColor(195/255,52/255,41/255) + end + lg.print(string.upper(joykeynames[i]), 65, 53+i*13) + lg.print(config.joykeys[joykeynames[i]], 165, 53+i*13) +- lg.setColor(255,255,255) ++ lg.setColor(1,1,1) + end + lg.print("DEFAULT", 65, 118) + lg.print("BACK", 65, 131) +diff --git a/main.lua b/main.lua +index 9433e42..56096fa 100644 +--- a/main.lua ++++ b/main.lua +@@ -273,7 +273,7 @@ function love.releaseerrhand(msg) + local font = love.graphics.newFont(14) + love.graphics.setFont(font) + +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 1) + + love.graphics.clear() + +diff --git a/resources.lua b/resources.lua +index e5aa70d..1bab520 100644 +--- a/resources.lua ++++ b/resources.lua +@@ -7,7 +7,7 @@ local snd = {} -- sound Sources + + local IMAGE_FILES = { + "splash", "tangram", "lovesplashpixel", "howto", +- "tiles", "door", "boldfont", "captain_dialog", "captain_dialog_sad", ++ "tiles", "door", "captain_dialog", "captain_dialog_sad", + "boss_health", "highscore_panes", "exclamation", "stats_screen", + "awards", "hud", "hud2", "hud_people", "item_slots", "water_bar", + "reserve_bar", "overloaded_bar", "temperature_bar", "temperature_bar_blink", +@@ -147,7 +147,7 @@ function loadResources() + img.stream:setWrap("repeat", "clamp") + + -- Create fonts +- font.bold = lg.newImageFont(img.boldfont, " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!'-:*@<>+/_$&?", 2) ++ font.bold = lg.newImageFont("data/boldfont.png", " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!'-:*@<>+/_$&?", 2) + lg.setFont(font.bold) + + -- Create quads +diff --git a/util.lua b/util.lua +index b9976da..656600a 100644 +--- a/util.lua ++++ b/util.lua +@@ -105,9 +105,9 @@ end + + + function drawBox(x,y,w,h) +- lg.setColor(30,23,18) ++ lg.setColor(30/255,23/255,18/255) + lg.rectangle("fill",x+1,y+1,w-2,h-2) +- lg.setColor(255,255,255) ++ lg.setColor(1,1,1) + -- Draw sides + lg.draw(img.menu_box, quad.box_left, x, y+1, 0, 1, (h-2)) + lg.draw(img.menu_box, quad.box_left, x+w, y+1, 0, -1, (h-2)) -- cgit 1.4.1 From ab5fc6a98274f2e4e618535565e05a8b4afe8496 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jun 2018 15:12:30 +0200 Subject: gnu: libyaml: Update to 0.1.7. * gnu/packages/web.scm (libyaml): Update to 0.1.7. [source]: Remove patch. * gnu/packages/patches/libyaml-CVE-2014-9130.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/libyaml-CVE-2014-9130.patch | 30 ------------------------ gnu/packages/web.scm | 5 ++-- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 gnu/packages/patches/libyaml-CVE-2014-9130.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index cdb1edbfb7..dfd25c7088 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1211,7 +1211,6 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ - %D%/packages/patches/libyaml-CVE-2014-9130.patch \ %D%/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = \ diff --git a/gnu/packages/patches/libyaml-CVE-2014-9130.patch b/gnu/packages/patches/libyaml-CVE-2014-9130.patch deleted file mode 100644 index 800358c0d6..0000000000 --- a/gnu/packages/patches/libyaml-CVE-2014-9130.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fixes CVE-2014-9130 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9130 - -Upstream source: -https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2 - -# HG changeset patch -# User Kirill Simonov -# Date 1417197312 21600 -# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2 -# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33 -Removed invalid simple key assertion (thank to Jonathan Gray). - -diff --git a/src/scanner.c b/src/scanner.c ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -1106,13 +1106,6 @@ - && parser->indent == (ptrdiff_t)parser->mark.column); - - /* -- * A simple key is required only when it is the first token in the current -- * line. Therefore it is always allowed. But we add a check anyway. -- */ -- -- assert(parser->simple_key_allowed || !required); /* Impossible. */ -- -- /* - * If the current position may start a simple key, save it. - */ - diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 19058de2d3..aaf8505ef4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1025,17 +1025,16 @@ hash/signatures.") (define-public libyaml (package (name "libyaml") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (string-append "http://pyyaml.org/download/libyaml/yaml-" version ".tar.gz")) - (patches (search-patches "libyaml-CVE-2014-9130.patch")) (sha256 (base32 - "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx")))) + "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240")))) (build-system gnu-build-system) (home-page "http://pyyaml.org/wiki/LibYAML") (synopsis "YAML 1.1 parser and emitter written in C") -- cgit 1.4.1 From c19af99c256230fc02f679591f231a7c38115aad Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 Jun 2018 22:43:11 -0400 Subject: gnu: git-annex: Update to 6.20180529. * gnu/packages/version-control.scm (git-annex): Update to 6.20180529. [inputs]: Add ghc-tagsoup. --- gnu/packages/version-control.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 378a6fcf09..15974c8792 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1999,7 +1999,7 @@ directory full of HOWTOs.") (define-public git-annex (package (name "git-annex") - (version "6.20170818") + (version "6.20180529") (source (origin (method url-fetch) @@ -2007,7 +2007,7 @@ directory full of HOWTOs.") "git-annex/git-annex-" version ".tar.gz")) (sha256 (base32 - "0ybxixbqvy4rx6mq9s02rh349rbr04hb17z4bfayin0qwa5kzpvx")))) + "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -2101,6 +2101,7 @@ directory full of HOWTOs.") ("ghc-split" ,ghc-split) ("ghc-stm" ,ghc-stm) ("ghc-stm-chans" ,ghc-stm-chans) + ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) -- cgit 1.4.1 From d6331fcaa603b18726fc166561d7c4c88e2c9b13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jun 2018 04:36:22 +0200 Subject: gnu: mrrescue: Fix typo in description. * gnu/packages/games.scm (mrrescue)[description]: Hyphenate. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ff9adbbd57..ef84073f93 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3314,8 +3314,8 @@ colors, pictures, and sounds.") (synopsis "Arcade-style fire fighting game") (description "Mr. Rescue is an arcade styled 2d action game centered around evacuating -civilians from burning buildings. The game features fast paced fire -extinguishing action, intense boss battles, a catchy soundtrack and lots of +civilians from burning buildings. The game features fast-paced fire +extinguishing action, intense boss battles, a catchy soundtrack, and lots of throwing people around in pseudo-randomly generated buildings.") (license (list license:zlib ; for source code license:cc-by-sa3.0)))) ; for graphics and music assets -- cgit 1.4.1 From aa0551c270abe45cf36c2fda80a15351fbcaba3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jun 2018 23:12:05 +0200 Subject: gnu: bspwm: Update to 0.9.5. * gnu/packages/wm.scm (bspwm): Update to 0.9.5. --- gnu/packages/wm.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a3705c9d91..2a09521601 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -103,7 +103,7 @@ nested include statements).") (define-public bspwm (package (name "bspwm") - (version "0.9.4") + (version "0.9.5") (source (origin (file-name (string-append name "-" version ".tar.gz")) @@ -113,7 +113,7 @@ nested include statements).") version ".tar.gz")) (sha256 (base32 - "0yjr0vzbj3ar8qfr6gvpvjd82ay8iy1sg2fkw2swghlqiy6ix4kw")))) + "10pph8wxqysgk7b2h0svs0nwacn1a4y44jnzzry32pd1ysx92d97")))) (build-system gnu-build-system) (inputs `(("libxcb" ,libxcb) @@ -123,10 +123,13 @@ nested include statements).") ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-wm" ,xcb-util-wm))) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f ; no check target - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)))) + '(#:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:tests? #f ; no check target + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" %output)))) (home-page "https://github.com/baskerville/bspwm") (synopsis "Tiling window manager based on binary space partitioning") (description "bspwm is a tiling window manager that represents windows as -- cgit 1.4.1 From d4cf0382e5478978db061b388e8d86cd802b137f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jun 2018 23:24:15 +0200 Subject: gnu: inxi-minimal: Update to 3.0.12-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.0.12-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d1bc004410..80132ba019 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2669,7 +2669,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.11-1") + (version "3.0.12-1") (source (origin (method git-fetch) @@ -2678,7 +2678,7 @@ Python loading in HPC environments.") (commit version))) (sha256 (base32 - "07wihl4gsamq98mhxvm6k4vpphym75467cxfa19b3g5ggpyq894g")))) + "1a2sjz90gzzvhp63x89hs0a424rkd13qrff2njqmjxp322zyp527")))) (build-system trivial-build-system) (inputs `(("bash" ,bash) -- cgit 1.4.1 From cac85e8bdbc510dbbe49b951b76b327c9eaa0008 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 00:24:47 +0200 Subject: gnu: r-xfun: Update to 0.2. * gnu/packages/cran.scm (r-xfun): Update to 0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aa5bdc958d..2d4dd18c2c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2570,14 +2570,14 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.1") + (version "0.2") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 (base32 - "1sm51gmwgw876d6d1q8smxmfgfh6zsnykfx8qp8z6jmh0fvd89pj")))) + "0zl22fcw90kdvzkjyf6vbmdmn9rz3bl51522fasvmykypffyng4a")))) (build-system r-build-system) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") -- cgit 1.4.1 From 6917161d74bd5141490ce41525a7f54d0c00409e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 00:49:26 +0200 Subject: gnu: emacs-with-editor: Update to 2.7.3. * gnu/packages/emacs.scm (emacs-with-editor): Update to 2.7.3. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a0ae045ab7..aa0e000bc5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -411,7 +411,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "2.7.2") + (version "2.7.3") (source (origin (method url-fetch) (uri (string-append @@ -420,7 +420,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jqi3axcs0cb1pcv1jxxc2a09v6psrm33wwl6hmyshzl8kbxs2mv")))) + "1ln2s0kckzkv50qmr6x1kb2j30cfjii0vs6lpghg7ff4lav8jqgh")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit 1.4.1 From de99ba7e7c0ba782451f1ccf60135adfce058ad5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 01:03:47 +0200 Subject: Fix some more lonely unquotes. * gnu/packages/gnome.scm (workrave)[inputs]: Move unquote to its operand. * gnu/packages/java.scm (java-asm-bootstrap)[propagated-inputs]: Likewise. * gnu/packages/maven.scm (maven-compat)[native-inputs]: Likewise. (maven)[inputs]: Likewise. * gnu/packages/networking.scm (amule)[inputs]: Likewise. * gnu/packages/wm.scm (nitrogen)[native-inputs]: Likewise. --- gnu/packages/gnome.scm | 2 +- gnu/packages/java.scm | 2 +- gnu/packages/maven.scm | 4 ++-- gnu/packages/networking.scm | 2 +- gnu/packages/wm.scm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b5d8170ae2..a21adf4f56 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7287,7 +7287,7 @@ mp3, Ogg Vorbis and FLAC") ("libxtst" ,libxtst) ("dconf" ,dconf) ("libice" ,libice))) - (inputs `(("libsm", libsm) + (inputs `(("libsm" ,libsm) ("python-cheetah" ,python2-cheetah))) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b4b1eedd2e..30a9b77380 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3583,7 +3583,7 @@ complex transformations and code analysis tools.") `(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap) ("java-aqute-libg" ,java-aqute-libg-bootstrap) ,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib) - (delete `("java-aqute-libg", java-aqute-libg) + (delete `("java-aqute-libg" ,java-aqute-libg) (package-inputs java-asm))))))) (define-public java-cglib diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 070bd7131c..0feb01f040 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1405,7 +1405,7 @@ logging support."))) ;; tests ("java-plexus-cipher" ,java-plexus-cipher) ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) - ("java-jsr250", java-jsr250) + ("java-jsr250" ,java-jsr250) ("java-cdi-api" ,java-cdi-api) ("java-junit" ,java-junit) ("maven-resolver-impl" ,maven-resolver-impl) @@ -1463,7 +1463,7 @@ layer for plugins that need to keep Maven2 compatibility."))) ("maven-settings" ,maven-settings) ("maven-settings-builder" ,maven-settings-builder) ("maven-plugin-api" ,maven-plugin-api) - ("maven-repository-metadata", maven-repository-metadata) + ("maven-repository-metadata" ,maven-repository-metadata) ("maven-shared-utils" ,maven-shared-utils) ("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-spi" ,maven-resolver-spi) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5cdfec3431..b72a4734d7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1776,7 +1776,7 @@ file for more details.") `(("zlib" ,zlib) ("crypto++" ,crypto++) ("libpng" ,libpng) - ("wxwidgets-gtk2", wxwidgets-gtk2))) + ("wxwidgets-gtk2" ,wxwidgets-gtk2))) (home-page "http://amule.org/") (synopsis "Peer-to-peer client for the eD2K and Kademlia networks") (description diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2a09521601..a076cbbb1d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -991,7 +991,7 @@ project derived from the original Calm Window Manager.") ("glib" ,glib) ("glibmm" ,glibmm))) (native-inputs - `(("pkg-config", pkg-config))) + `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags (list (string-append "--prefix=" %output) -- cgit 1.4.1 From 5a368b2adfffff8892819d6ce04eb52dd41fad61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 01:15:25 +0200 Subject: gnu: emacs-ghub: Update to 2.0.1. * gnu/packages/emacs.scm (emacs-ghub): Update to 2.0.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index aa0e000bc5..919986e6c8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -602,7 +602,7 @@ process, passing on the arguments as command line arguments.") (define-public emacs-ghub (package (name "emacs-ghub") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (string-append @@ -611,7 +611,7 @@ process, passing on the arguments as command line arguments.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zrb3xk04a228g2ahx0r02d0d3xskj60q73qavvmm2i56r66cxvc")))) + "0d0qj5r1bm2aidi61rigrdaycxnyb7y1ivb3h8rpvvapsf8sk7z0")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit 1.4.1 From f6fefe12f10fa78b464ba09cab2bd50459cee9a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 01:55:12 +0200 Subject: gnu: guile-emacs: Return #t from phases. * gnu/packages/emacs.scm (guile-emacs)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 919986e6c8..98cf9984a9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -312,12 +312,12 @@ editor (without an X toolkit)" ) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'autogen - (lambda _ - (zero? (system* "sh" "autogen.sh")))) + (lambda _ + (invoke "sh" "autogen.sh"))) ;; Build sometimes fails: deps/dispnew.d: No such file or directory (add-before 'build 'make-deps-dir (lambda _ - (zero? (system* "mkdir" "-p" "src/deps")))))))))) + (invoke "mkdir" "-p" "src/deps"))))))))) ;;; -- cgit 1.4.1 From d78f1fdc5ddb5d2ac0115ceef52e20ef9b69c9a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 02:33:31 +0200 Subject: gnu: emacs-magit-popup: Return #t from phases. * gnu/packages/emacs.scm (emacs-magit-popup)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98cf9984a9..2f85e774fa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -585,7 +585,7 @@ support for Git-SVN.") (modify-phases %standard-phases (add-before 'install 'make-info (lambda _ - (zero? (system* "make" "info"))))))) + (invoke "make" "info")))))) (native-inputs `(("texinfo" ,texinfo))) (propagated-inputs -- cgit 1.4.1 From 67cf588f4fbde7ccab4084293eb7b1ae2e05f025 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 02:36:36 +0200 Subject: gnu: emacs-ghub: Return #t from phases. * gnu/packages/emacs.scm (emacs-ghub)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2f85e774fa..b413658710 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -618,7 +618,7 @@ process, passing on the arguments as command line arguments.") (modify-phases %standard-phases (add-before 'install 'make-info (lambda _ - (zero? (system* "make" "info"))))))) + (invoke "make" "info")))))) (native-inputs `(("texinfo" ,texinfo))) (home-page "https://github.com/magit/ghub") -- cgit 1.4.1 From ff6275fd261ab54b70058abee62a4d2f93c22396 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 02:38:49 +0200 Subject: gnu: haskell-mode: Use INVOKE. * gnu/packages/emacs.scm (haskell-mode)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b413658710..cf6ee9e270 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -702,8 +702,7 @@ only a handful of functions that are not resource-specific.") files)) (with-directory-excursion "doc" - (unless (zero? (system* "makeinfo" "haskell-mode.texi")) - (error "makeinfo failed")) + (invoke "makeinfo" "haskell-mode.texi") (install-file "haskell-mode.info" info)) (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) (copy-to-dir el-dir (find-files "." "\\.elc?")) -- cgit 1.4.1 From 93adf925ba5a0a39abdb7f71d082ec67ef91c3f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 02:55:56 +0200 Subject: gnu: emacs-w3m: Return #t from phases. * gnu/packages/emacs.scm (emacs-w3m)[arguments]: Substitute INVOKE for SYSTEM* & risky plumbing. --- gnu/packages/emacs.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cf6ee9e270..340f882d00 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -793,7 +793,7 @@ provides an optional IDE-like error list.") (modify-phases %standard-phases (add-after 'unpack 'autoconf (lambda _ - (zero? (system* "autoconf")))) + (invoke "autoconf"))) (add-before 'configure 'support-emacs! (lambda _ ;; For some reason 'AC_PATH_EMACS' thinks that 'Emacs 26' is @@ -824,13 +824,13 @@ provides an optional IDE-like error list.") #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (and (zero? (system* "make" "install" "install-icons")) - (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp") - (for-each delete-file '("ChangeLog" "ChangeLog.1")) - (symlink "w3m-load.el" "w3m-autoloads.el") - #t))))))) + (invoke "make" "install" "install-icons") + (with-directory-excursion + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp") + (for-each delete-file '("ChangeLog" "ChangeLog.1")) + (symlink "w3m-load.el" "w3m-autoloads.el") + #t)))))) (home-page "http://emacs-w3m.namazu.org/") (synopsis "Simple Web browser for Emacs based on w3m") (description -- cgit 1.4.1 From f9299da92a4822cbb3e85c976734990fdf486e18 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 02:59:47 +0200 Subject: gnu: emacs-ag: Return #t from phases. * gnu/packages/emacs.scm (emacs-ag)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 340f882d00..0681c7e3b0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1153,7 +1153,7 @@ than @code{electric-indent-mode}.") (add-before 'install 'make-info (lambda _ (with-directory-excursion "docs" - (zero? (system* "make" "info"))))) + (invoke "make" "info")))) (add-after 'install 'install-info (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From 8bc1967503a12fc4bbd79fdb8cfb9c68f062cccc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:01:26 +0200 Subject: gnu: emacs-graphviz-dot-mode: Return #t from phases. * gnu/packages/emacs.scm (emacs-graphviz-dot-mode)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0681c7e3b0..6c0f1a15d3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1454,13 +1454,12 @@ Maps directly inside Emacs.") (substitute* "Makefile" (("\\/usr\\/bin\\/gzip") (string-append (assoc-ref inputs "gzip") "/bin/gzip"))) - (zero? - (system* "make" - "clean" - "info" - (string-append "TEXINFODIR=" - (assoc-ref inputs "texinfo") - "/bin")))))) + (invoke "make" + "clean" + "info" + (string-append "TEXINFODIR=" + (assoc-ref inputs "texinfo") + "/bin"))))) (add-after 'install 'install-info (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From 32a8a6bb60720524679cc570e799194cf635b2c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:09:24 +0200 Subject: gnu: emacs-mmm-mode: Return #t from phases. * gnu/packages/emacs.scm (emacs-mmm-mode)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6c0f1a15d3..b298f393b8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1497,7 +1497,7 @@ diagrams.") (modify-phases %standard-phases (add-after 'unpack 'autogen (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From d2f3817d69d55a767488b2a88d28b2da2f87a0e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:15:11 +0200 Subject: gnu: emacs-pdf-tools: Return #t from phases. As I read it, EMACS-SUBSTITUTE-VARIABLES always returns #t. * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b298f393b8..7682860be5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1562,7 +1562,7 @@ filters, new key bindings and faces. It can be enabled by (lambda _ (chdir "server") #t)) (add-after 'enter-server-dir 'autogen (lambda _ - (zero? (system* "bash" "autogen.sh")))) + (invoke "bash" "autogen.sh"))) ;; Build emacs side using 'emacs-build-system'. (add-after 'compress-documentation 'enter-lisp-dir -- cgit 1.4.1 From e76d959d6a85d96e5c1dd3f8a4cea27878cdf57d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:22:38 +0200 Subject: gnu: emacs-slime: Use INVOKE. * gnu/packages/emacs.scm (emacs-slime)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7682860be5..6418cedcdd 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2969,8 +2969,8 @@ in @code{html-mode}.") (substitute* "Makefile" (("infodir=/usr/local/info") (string-append "infodir=" info-dir))) - (system* "make" "html/index.html") - (system* "make" "slime.info") + (invoke "make" "html/index.html") + (invoke "make" "slime.info") (install-file "slime.info" info-dir) (copy-recursively "html" (string-append doc-dir "/html"))) (for-each (lambda (f) -- cgit 1.4.1 From e97ad01e4d9dff679ae9e9e0d0ad0918f21959a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:24:36 +0200 Subject: gnu: emacs-ivy: Return #t from phases. * gnu/packages/emacs.scm (emacs-ivy)[arguments]: Substitute INVOKE for SYSTEM* and return #t where otherwise undefined. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6418cedcdd..1b6598408c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3650,9 +3650,9 @@ automatically.") (let* ((out (assoc-ref outputs "out")) (info (string-append out "/share/info"))) (with-directory-excursion "doc" - (unless (zero? (system* "makeinfo" "ivy.texi")) - (error "makeinfo failed")) - (install-file "ivy.info" info)))))))) + (invoke "makeinfo" "ivy.texi") + (install-file "ivy.info" info) + #t))))))) (propagated-inputs `(("emacs-hydra" ,emacs-hydra))) (native-inputs -- cgit 1.4.1 From 2f48416f47a1271a4c9f824c1095a97ad9fafa34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:29:51 +0200 Subject: gnu: emacs-ess: Return #t from phases. * gnu/packages/emacs.scm (emacs-ess)[arguments]: Substitute INVOKE for SYSTEM* and return #t where otherwise undefined. --- gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1b6598408c..ae22a2f326 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4104,14 +4104,15 @@ programming language.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "Makeconf" (("SHELL = /bin/sh") - (string-append "SHELL = " (which "sh")))))) + (string-append "SHELL = " (which "sh")))) + #t)) ;; FIXME: the texlive-union insists on regenerating fonts. It stores ;; them in HOME, so it needs to be writeable. (add-before 'build 'set-HOME (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check (lambda _ - (zero? (system* "make" "test")))))))) + (invoke "make" "test"))))))) (inputs `(("emacs" ,emacs-minimal) ("r-minimal" ,r-minimal))) -- cgit 1.4.1 From bca4b2e7cce1fbb9ec7f9c093a3697c8ddb4cffd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:32:02 +0200 Subject: gnu: emacs-xelb: Return #t from phases. * gnu/packages/emacs.scm (emacs-xelb)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ae22a2f326..87159a915a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6148,13 +6148,13 @@ which code derived from Kelvin H's org-page.") (modify-phases %standard-phases (add-after 'unpack 'regenerate-el-files (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "make" - (string-append "PROTO_PATH=" - (assoc-ref inputs "xcb-proto") - "/share/xcb") - (string-append "EMACS_BIN=" - (assoc-ref inputs "emacs") - "/bin/emacs -Q")))))))) + (invoke "make" + (string-append "PROTO_PATH=" + (assoc-ref inputs "xcb-proto") + "/share/xcb") + (string-append "EMACS_BIN=" + (assoc-ref inputs "emacs") + "/bin/emacs -Q"))))))) (native-inputs `(("xcb-proto" ,xcb-proto))) (home-page "https://github.com/ch11ng/xelb") (synopsis "X protocol Emacs Lisp binding") -- cgit 1.4.1 From d4c68d3236b7ce76b6abbd317790fe9956639641 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:32:58 +0200 Subject: gnu: emacs-m-buffer-el: Return #t from phases. * gnu/packages/emacs.scm (emacs-m-buffer-el)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 87159a915a..1829c5900c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -8967,10 +8967,10 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (modify-phases %standard-phases (add-before 'install 'check (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "test/m-buffer-test.el" - "-l" "test/m-buffer-at-test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + (invoke "emacs" "--batch" "-L" "." + "-l" "test/m-buffer-test.el" + "-l" "test/m-buffer-at-test.el" + "-f" "ert-run-tests-batch-and-exit")))))) (build-system emacs-build-system) (home-page "https://github.com/phillord/m-buffer-el") (synopsis "List oriented buffer operations for Emacs") -- cgit 1.4.1 From cd0750fcf2a951c3c7d6242b026463f62f802dca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:38:17 +0200 Subject: gnu: memcached: Update to 1.5.8. * gnu/packages/databases.scm (memcached): Update to 1.5.8. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0cdd8ed71e..0f1e47f485 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -398,7 +398,7 @@ mapping from string keys to string values.") (define-public memcached (package (name "memcached") - (version "1.5.6") + (version "1.5.8") (source (origin (method url-fetch) @@ -406,7 +406,7 @@ mapping from string keys to string values.") "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 (base32 - "00szy9d4szaixi260dcd4846zci04y0sd47ia2lzg0bxkn2ywxcn")))) + "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit 1.4.1 From 0430eb6643a7f8666b056f2d064aa79822d147fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 03:39:55 +0200 Subject: gnu: r-prroc: Update to 1.3.1. * gnu/packages/cran.scm (r-prroc): Update to 1.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2d4dd18c2c..a04af976e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3540,14 +3540,14 @@ extracting and replacing data in arrays.") (define-public r-prroc (package (name "r-prroc") - (version "1.3") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "PRROC" version)) (sha256 (base32 - "03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc")))) + "1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7")))) (properties `((upstream-name . "PRROC"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/PRROC/") -- cgit 1.4.1 From a86049d9b696628067d6db2b449e4e7b2cd49d2f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:00:24 +0200 Subject: gnu: Add r-pls. * gnu/packages/cran.scm (r-pls): New public variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a04af976e4..bfeeae47c4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -424,6 +424,41 @@ the plog header-only C++ logging library, and a method to log to R's standard error stream.") (license license:expat))) +(define-public r-pls + (package + (name "r-pls") + (version "2.6-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "pls" version)) + (sha256 + (base32 + "15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx")))) + (build-system r-build-system) + (home-page "http://mevik.net/work/software/pls.html") + (synopsis "Partial Least Squares and Principal Component Regression") + (description + "The pls package implements multivariate regression methods: Partial Least +Squares Regression (@dfn{PLSR}), Principal Component Regression (@dfn{PCR}), and +Canonical Powered Partial Least Squares (@dfn{CPPLS}). It supports: + +@itemize +@item several algorithms: the traditional orthogonal scores (@dfn{NIPALS}) PLS +algorithm, kernel PLS, wide kernel PLS, Simpls, and PCR through @code{svd} +@item multi-response models (or @dfn{PLS2}) +@item flexible cross-validation +@item Jackknife variance estimates of regression coefficients +@item extensive and flexible plots: scores, loadings, predictions, coefficients, +(R)MSEP, R², and correlation loadings +@item formula interface, modelled after @code{lm()}, with methods for predict, +print, summary, plot, update, etc. +@item extraction functions for coefficients, scores, and loadings +@item MSEP, RMSEP, and R² estimates +@item multiplicative scatter correction (@dfn{MSC}) +@end itemize\n") + (license license:gpl2))) + (define-public r-rcpp (package (name "r-rcpp") -- cgit 1.4.1 From 3321234cf302ee6fdde6e0e7f48aacf3f647ed1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:00:51 +0200 Subject: gnu: r-recipes: Update to 0.1.3. * gnu/packages/cran.scm (r-recipes): Update to 0.1.3. [propagated-inputs]: Add r-pls. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bfeeae47c4..a493a449c8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1749,14 +1749,14 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9")))) + "1vqh3pxs4n1azhnd1lzg91vasya6g323kllhbrw177j7kdxqyimy")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -1768,6 +1768,7 @@ provides a one-row summary of model-level statistics.") ("r-lubridate" ,r-lubridate) ("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) + ("r-pls" ,r-pls) ("r-purrr" ,r-purrr) ("r-rcpproll" ,r-rcpproll) ("r-rlang" ,r-rlang) -- cgit 1.4.1 From 80683c1e00162696cc686c44a536d3fc34000ee2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:03:27 +0200 Subject: gnu: emacs-htmlize: Update to 1.53. * gnu/packages/emacs.scm (emacs-htmlize): Update to 1.53. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1829c5900c..7a8ddaf227 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5865,7 +5865,7 @@ source file, @file{jl-encrypt.el}.") (define-public emacs-htmlize (package (name "emacs-htmlize") - (version "1.51") + (version "1.53") (source (origin (method url-fetch) @@ -5875,7 +5875,7 @@ source file, @file{jl-encrypt.el}.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1fy1lybzrxl8a8r88f6p19nz8ygmvcxhxbnymkxh7jqaz25viwld")))) + "1lzaf9m1qr9dhw4nn53g6wszk2vqw95gpsbrc3y85bams4cn24ga")))) (build-system emacs-build-system) (home-page "https://github.com/hniksic/emacs-htmlize") (synopsis "Convert buffer text and decorations to HTML") -- cgit 1.4.1 From aa86a564635da8cbe0368576a7af553409884527 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:05:23 +0200 Subject: gnu: emacs-d-mode: Update to 2.0.9. * gnu/packages/emacs.scm (emacs-d-mode): Update to 2.0.9. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7a8ddaf227..219358bbdb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1725,7 +1725,7 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or (define-public emacs-d-mode (package (name "emacs-d-mode") - (version "2.0.8") + (version "2.0.9") (source (origin (method url-fetch) (uri (string-append @@ -1734,7 +1734,7 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0knpgi55jm09282aqf8pv55zillpnpzf9f4sgm6gwsmvxf17xaw0")))) + "127aa77ix3p7w4g339bx026df9y649dahlr3v359z0hs40zjz3kd")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-undercover" ,emacs-undercover))) -- cgit 1.4.1 From 59e8a57d0878fbbb50ed2c88426f0ad704e4d17f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:15:13 +0200 Subject: gnu: pioneers: Update to 15.5. * gnu/packages/games.scm (pioneers): Update to 15.5. [native-inputs]: Add itstool and libxml2. --- gnu/packages/games.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ef84073f93..09b3dc4032 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2411,19 +2411,21 @@ are only two levels to play with, but they are very addictive.") (define-public pioneers (package (name "pioneers") - (version "15.4") + (version "15.5") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/pio/" "pioneers-" version ".tar.gz")) (sha256 (base32 - "1p1d18hrfmqcnghip3shkzcs5qkz6j99jvkdkqfi7pqdvjc323cs")))) + "037gdiiw690jw3wd1s9lxmkqx0caxyk0b4drpm7i9p28gig43q9y")))) (build-system gnu-build-system) - (inputs `(("gtk+" ,gtk+) - ("librsvg" ,librsvg) - ("avahi" ,avahi))) + (inputs `(("avahi" ,avahi) + ("gtk+" ,gtk+) + ("librsvg" ,librsvg))) (native-inputs `(("intltool" ,intltool) + ("itstool" ,itstool) + ("libxml2" ,libxml2) ("pkg-config" ,pkg-config))) (synopsis "Board game inspired by The Settlers of Catan") (description "Pioneers is an emulation of the board game The Settlers of -- cgit 1.4.1 From 50e1d36c48e1662f42c6047d31849e1173e6eaf1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:23:41 +0200 Subject: gnu: fizmo: Update to 0.8.5. * gnu/packages/games.scm (fizmo): Update to 0.8.5. [arguments]: Adjust #:configure-flags to improved library detection. --- gnu/packages/games.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 09b3dc4032..0db22f1e9e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1616,23 +1616,20 @@ reference interpreter, using the Glk API.") (define-public fizmo (package (name "fizmo") - (version "0.8.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (string-append "https://christoph-ender.de/fizmo/source/" name "-" version ".tar.gz")) (sha256 (base32 - "1sd988db2302r7cbfcfghbmg8ck43c6hvnlnlpb0rqxb7pm9cwyy")))) + "1amyc4n41jf08kxmdgkk30bzzx54miaxa97w28f417qwn8lrl98w")))) (build-system gnu-build-system) (arguments '(#:configure-flags (let ((libjpeg (assoc-ref %build-inputs "libjpeg")) (ncurses (assoc-ref %build-inputs "ncurses"))) - (list (string-append "jpeg_CFLAGS=-I" libjpeg "/include") - (string-append "jpeg_LIBS=-ljpeg") - (string-append "ncursesw_CFLAGS=-I" ncurses "/include") - (string-append "ncursesw_LIBS=-lncursesw"))))) + (list (string-append "--with-jpeg-includedir=" libjpeg "/include"))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From 6ad191ba10f95f4303cf92376d0f83535d218ace Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:21:25 +0200 Subject: gnu: fizmo: Update home page. * gnu/packages/games.scm (fizmo)[source, home-page]: Update URIs. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0db22f1e9e..bc27336a23 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1619,7 +1619,7 @@ reference interpreter, using the Glk API.") (version "0.8.5") (source (origin (method url-fetch) - (uri (string-append "https://christoph-ender.de/fizmo/source/" + (uri (string-append "https://fizmo.spellbreaker.org/source/" name "-" version ".tar.gz")) (sha256 (base32 @@ -1640,7 +1640,7 @@ reference interpreter, using the Glk API.") ("libxml2" ,libxml2) ("ncurses" ,ncurses) ("sdl2" ,sdl2))) - (home-page "https://christoph-ender.de/fizmo/") + (home-page "https://fizmo.spellbreaker.org/") (synopsis "Z-machine interpreter") (description "Fizmo is a console-based Z-machine interpreter. It is used to play -- cgit 1.4.1 From 1b915698a0ff740f4f2a9763bf774135cb58698e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:27:40 +0200 Subject: gnu: quakespasm: Update to 0.93.1. * gnu/packages/games.scm (quakespasm): Update to 0.93.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bc27336a23..3b600a245e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4542,7 +4542,7 @@ Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") (define-public quakespasm (package (name "quakespasm") - (version "0.93.0") + (version "0.93.1") (source (origin (method url-fetch) @@ -4550,7 +4550,7 @@ Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") version ".tgz")) (sha256 (base32 - "0b2nz7w4za32pc34r62ql270z692qcjs2pm0i3svkxkvfammhdfq")))) + "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd")))) (arguments `(#:tests? #f #:make-flags '("CC=gcc" -- cgit 1.4.1 From 101460d46101e120dc9747ce3c1e07f1110ae149 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:38:44 +0200 Subject: gnu: extremetuxracer: Update to 0.7.5. * gnu/packages/games.scm (extremetuxracer): Update to 0.7.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3b600a245e..640877844c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1676,7 +1676,7 @@ Protocol).") (define-public extremetuxracer (package (name "extremetuxracer") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (string-append @@ -1684,7 +1684,7 @@ Protocol).") version "/etr-" version ".tar.xz")) (sha256 (base32 - "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s")))) + "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 5bc0ac962c99b101a695a229f51717157f3118dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:39:25 +0200 Subject: gnu: extremetuxracer: Fix typo in synopsis. * gnu/packages/games.scm (extremetuxracer)[synopis]: Hyphenate. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 640877844c..22489dd0ba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1691,8 +1691,8 @@ Protocol).") (inputs `(("glu" ,glu) ("sfml" ,sfml))) - (synopsis "High speed arctic racing game based on Tux Racer") - ;; Snarfed straight from Debian + (synopsis "High-speed arctic racing game based on Tux Racer") + ;; Snarfed straight from Debian. (description "Extreme Tux Racer, or etracer as it is called for short, is a simple OpenGL racing game featuring Tux, the Linux mascot. The goal of the game is to slide down a snow- and ice-covered mountain as quickly as possible, -- cgit 1.4.1 From de0dfb8c0b428bf61085c9413afc2fcf3aa961fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:42:50 +0200 Subject: gnu: meandmyshadow: Return #t from phases. * gnu/packages/games.scm (meandmyshadow)[arguments]: Return #t rather than undefined from phases. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 22489dd0ba..73fbe6ad21 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -485,7 +485,7 @@ automata. The following features are available: ;; link with libX11, even though we're using the GL backend. (substitute* "CMakeLists.txt" (("\\$\\{X11_LIBRARIES\\}") "-lX11")) - ))))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From bdf1fe51d53409e3d0991cc54cba53184f191bf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 04:41:42 +0200 Subject: gnu: meandmyshadow: Update to 0.4.1. * gnu/packages/games.scm (meandmyshadow): Update to 0.4.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 73fbe6ad21..65def5ae61 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -461,7 +461,7 @@ automata. The following features are available: (define-public meandmyshadow (package (name "meandmyshadow") - (version "0.4") + (version "0.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/meandmyshadow/" @@ -469,7 +469,7 @@ automata. The following features are available: "-src.tar.gz")) (sha256 (base32 - "1dpb7s32b2psj5w3nr5kqibib8nndi86mw8gxp4hmxwrfiisf86d")))) + "0wl5dc75qy001s6043cx0vr2l5y2qfv1cldqnwill9sfygqj9p95")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; there are no tests -- cgit 1.4.1 From 80f755090db5d67af5a44992d11799cb65792c3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jun 2018 19:59:10 +0200 Subject: gnu: perl-lwp-protocol-https: Update to 6.07. * gnu/packages/web.scm (perl-lwp-protocol-https): Update to 6.07. [native-inputs]: Add perl-test-requiresinternet. --- gnu/packages/web.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index aaf8505ef4..2319acb3ca 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3089,16 +3089,19 @@ exists it is used instead.") (define-public perl-lwp-protocol-https (package (name "perl-lwp-protocol-https") - (version "6.06") + (version "6.07") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/M/MS/MSCHILLI/" + (uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/" "LWP-Protocol-https-" version ".tar.gz")) (sha256 (base32 - "1vxdjqj4bwq56m9h1bqqwkk3c6jr76f2zqzvwa26yjng3p686v5q")))) + "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j")))) (build-system perl-build-system) + (native-inputs + ;; For tests. + `(("perl-test-requiresinternet" ,perl-test-requiresinternet))) (propagated-inputs `(("perl-io-socket-ssl" ,perl-io-socket-ssl) ("perl-libwww" ,perl-libwww) -- cgit 1.4.1 From 229e4d59f50809bb72af93684fb52c47fbedc631 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 20 Jun 2018 11:07:33 +0200 Subject: gnu: neofetch: Update to 5.0.0. * gnu/packages/admin.scm (neofetch): Update to 5.0.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 80132ba019..af9cdbfbcc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2391,7 +2391,7 @@ tool for remote execution and deployment.") (define-public neofetch (package (name "neofetch") - (version "4.0.2") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/dylanaraps/neofetch/" @@ -2399,7 +2399,7 @@ tool for remote execution and deployment.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "014hlbzs6j4b669b64hnq8vc5knwiv9ncw9m9d193p9jsybxpm1w")))) + "1cwmv54rrr6laqpkkczfyl45ggf8j0xcbnwlg41qmf43px9lhkra")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit 1.4.1 From e5b77ccfe861545a61f6c6355f5c9fb712bc4894 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jun 2018 10:56:23 +0200 Subject: gnu: guile-sdl2: Install compiled files to the expected place. * gnu/packages/sdl.scm (guile-sdl2)[arguments]: Add build phase "patch-makefile". --- gnu/packages/sdl.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 43cf2795dd..ba4477df9c 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,7 +504,16 @@ sound and device input (keyboards, joysticks, mice, etc.).") (string-append "--with-libsdl2-ttf-prefix=" (assoc-ref %build-inputs "sdl2-ttf")) (string-append "--with-libsdl2-mixer-prefix=" - (assoc-ref %build-inputs "sdl2-mixer"))))) + (assoc-ref %build-inputs "sdl2-mixer"))) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-makefile + (lambda _ + ;; Install compiled Guile files in the expected place. + (substitute* '("Makefile") + (("^godir = .*$") + "godir = $(moddir)\n")) + #t))))) (native-inputs `(("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 00fca594da4c63a976e1c67ec3caab47f2a38d87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jun 2018 02:59:23 +0200 Subject: gnu: Add guile-chickadee. * gnu/packages/game-development.scm (guile-chickadee): New variable. --- gnu/packages/game-development.scm | 40 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 3d6a038d9d..b428fa77f2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017 David Thompson ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Kei Kebreau -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Julian Graham ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis @@ -74,6 +74,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) @@ -1233,3 +1234,40 @@ related games such as Heretic and Hexen. It comes with a 3d preview mode and a 2D editor view.") (home-page "http://eureka-editor.sourceforge.net/") (license license:gpl2+))) + +(define-public guile-chickadee + (package + (name "guile-chickadee") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://files.dthompson.us/chickadee/" + "chickadee-" version ".tar.gz")) + (sha256 + (base32 + "10qx0ha5gsayybd186r1my7vc7rf5fbzp9jvmc4xg9a8wz8rqhah")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) + (propagated-inputs + `(("guile-opengl" ,guile-opengl) + ("guile-sdl2" ,guile-sdl2))) + (inputs + `(("guile" ,guile-2.2))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://dthompson.us/projects/chickadee.html") + (synopsis "Game development toolkit for Guile Scheme with SDL2 and OpenGL") + (description "Chickadee is a game development toolkit for Guile Scheme +built on top of SDL2 and OpenGL. Chickadee aims to provide all the features +that parenthetically inclined game developers need to make 2D (and eventually +3D) games in Scheme, such as: + +@enumerate +@item extensible, fixed-timestep game loop +@item OpenGL-based rendering engine +@item keyboard, mouse, controller input +@item REPL-driven development model +@end enumerate\n") + (license license:gpl3+))) -- cgit 1.4.1 From acb1c72c1eceffee2427b01b51299d8151aa180a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 14:34:31 +0200 Subject: gnu: neofetch: Remove dead code. Turns out that's most of it. * gnu/packages/admin.scm (neofetch)[arguments]: Remove all custom phases. --- gnu/packages/admin.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af9cdbfbcc..fa8e60087b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2407,27 +2407,7 @@ tool for remote execution and deployment.") (list (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-target-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("\\$\\(DESTDIR\\)/etc/") - "$(PREFIX)/etc/")) - (substitute* "neofetch" - (("\"/etc/neofetch") - (string-append "\"" out "/etc/neofetch")) - (("\"/usr/share/neofetch") - (string-append "\"" out "/share/neofetch")))) - #t)) - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key make-flags outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version)) - (etc (string-append doc "/examples/etc"))) - (zero? (apply system* `("make" ,@make-flags - ,(string-append "SYSCONFDIR=" etc) - "install"))))))))) + (delete 'configure)))) ; no configure script (home-page "https://github.com/dylanaraps/neofetch") (synopsis "System info script") (description "Neofetch is a CLI system information tool written in Bash. -- cgit 1.4.1 From 7e04f210e3f5f37fc79c578f85215feff4de1773 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Jun 2018 14:33:13 +0200 Subject: gnu: neofetch: Don't use auto-generated tarball. * gnu/packages/admin.scm (neofetch)[source]: Use GIT-FETCH. --- gnu/packages/admin.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fa8e60087b..9fd5215172 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2393,13 +2393,13 @@ tool for remote execution and deployment.") (name "neofetch") (version "5.0.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dylanaraps/neofetch/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dylanaraps/neofetch") + (commit version))) (sha256 (base32 - "1cwmv54rrr6laqpkkczfyl45ggf8j0xcbnwlg41qmf43px9lhkra")))) + "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit 1.4.1 From 780205a04b29247dbeff6f757fbbc0a9f6e6fbe7 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Mon, 18 Jun 2018 08:19:33 +0200 Subject: gnu: Add go-github-com-prometheus-node-exporter. * gnu/packages/monitoring.scm (go-github-com-prometheus-node-exporter): New variable. --- gnu/packages/monitoring.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index bbfa4957fc..db6c22a69c 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -22,10 +22,12 @@ (define-module (gnu packages monitoring) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages check) @@ -295,3 +297,27 @@ WSGI and the node exporter textfile collector.") (define-public python2-prometheus-client (package-with-python2 python-prometheus-client)) + +(define-public go-github-com-prometheus-node-exporter + (let ((commit "55c32fcf02492fe4946f7ab563547cc5df7fc61e") + (revision "0")) + (package + (name "go-github-com-prometheus-node-exporter") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/node_exporter.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "041b87a0sid23c29swqmi5hw6cxbxvkfj3415jg73cm2pi8wh5s6")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/node_exporter")) + (synopsis "Prometheus exporter for hardware and OS metrics") + (description "Prometheus exporter for metrics exposed by *NIX kernels, +written in Go with pluggable metric collectors.") + (home-page "https://github.com/prometheus/node_exporter") + (license license:asl2.0)))) -- cgit 1.4.1 From 7427b2c6c1e5495d551375edf0c4177ab56179d7 Mon Sep 17 00:00:00 2001 From: Rouby Pierre-Antoine Date: Tue, 19 Jun 2018 10:43:30 +0200 Subject: gnu: Add go-github-com-sirupsen-logrus. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a83cdcde83..f7653a8c8b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1702,3 +1702,33 @@ with the @uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html, GNU extensions} to the POSIX recommendations for command-line options.") (license license:bsd-3)))) + +(define-public go-github-com-sirupsen-logrus + (package + (name "go-github-com-sirupsen-logrus") + (version "1.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sirupsen/logrus.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz")))) + (build-system go-build-system) + (native-inputs + `(("go-golang-org-x-crypto-ssh-terminal" + ,go-golang-org-x-crypto-ssh-terminal) + ("go-github-com-stretchr-testify" + ,go-github-com-stretchr-testify) + ("go-golang-org-x-sys-unix" + ,go-golang-org-x-sys-unix))) + (arguments + '(#:tests? #f ;FIXME missing dependencies + #:import-path "github.com/sirupsen/logrus")) + (home-page "https://github.com/sirupsen/logrus") + (synopsis "Structured, pluggable logging for Go") + (description "Logrus is a structured logger for Go, completely API +compatible with the standard library logger.") + (license license:expat))) -- cgit 1.4.1 From 5cc2b8456fab4f1057526d73cc2250436d7bd424 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 20 Jun 2018 12:40:29 -0400 Subject: gnu: Move go-github-com-kardianos-osext to (gnu packages golang). This package will not be used in later versions of Syncthing but may be needed by other Go programs. * gnu/packages/syncthing.scm (go-github-com-kardianos-osext): Move to ... * gnu/packages/golang.scm: ... here. --- gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/syncthing.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f7653a8c8b..22da7ccef1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1732,3 +1732,31 @@ GNU extensions} to the POSIX recommendations for command-line options.") (description "Logrus is a structured logger for Go, completely API compatible with the standard library logger.") (license license:expat))) + +(define-public go-github-com-kardianos-osext + (let ((commit "ae77be60afb1dcacde03767a8c37337fad28ac14") + (revision "1")) + (package + (name "go-github-com-kardianos-osext") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kardianos/osext") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/kardianos/osext" + ;; The tests are flaky: + ;; + #:tests? #f)) + (synopsis "Find the running executable") + (description "Osext provides a method for finding the current executable +file that is running. This can be used for upgrading the current executable or +finding resources located relative to the executable file.") + (home-page "https://github.com/kardianos/osext") + (license license:bsd-3)))) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index f43c51714a..14e83b5861 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -490,34 +490,6 @@ address of the default LAN gateway.") (home-page "https://github.com/jackpal/gateway") (license bsd-3)))) -(define-public go-github-com-kardianos-osext - (let ((commit "ae77be60afb1dcacde03767a8c37337fad28ac14") - (revision "1")) - (package - (name "go-github-com-kardianos-osext") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kardianos/osext") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/kardianos/osext" - ;; The tests are flaky: - ;; - #:tests? #f)) - (synopsis "Find the running executable") - (description "Osext provides a method for finding the current executable -file that is running. This can be used for upgrading the current executable or -finding resources located relative to the executable file.") - (home-page "https://github.com/kardianos/osext") - (license bsd-3)))) - (define-public go-github-com-lib-pq (let ((commit "83612a56d3dd153a94a629cd64925371c9adad78") (revision "1")) -- cgit 1.4.1 From aed4944d51669089620d8fe13b2e63c59e722b79 Mon Sep 17 00:00:00 2001 From: Rouby Pierre-Antoine Date: Wed, 20 Jun 2018 12:50:57 -0400 Subject: gnu: Add go-github-com-ayufan-golang-kardianos-service. * gnu/packages/golang.scm (go-github-com-ayufan-golang-kardianos-service): New variable. --- gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 22da7ccef1..ea6ca2286c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1760,3 +1760,34 @@ file that is running. This can be used for upgrading the current executable or finding resources located relative to the executable file.") (home-page "https://github.com/kardianos/osext") (license license:bsd-3)))) + +(define-public go-github-com-ayufan-golang-kardianos-service + (let ((commit "0c8eb6d8fff2e2fb884a7bfd23e183fb63c0eff3") + (revision "0")) + (package + (name "go-github-com-ayufan-golang-kardianos-service") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/ayufan/golang-kardianos-service.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x0cn7l5gda2khsfypix7adxd5yqighzn04mxjw6hc4ayrh7his5")))) + (build-system go-build-system) + (native-inputs + `(("go-github-com-kardianos-osext" + ,go-github-com-kardianos-osext))) + (arguments + '(#:tests? #f ;FIXME tests fail: Service is not running. + #:import-path "github.com/ayufan/golang-kardianos-service")) + (home-page "https://github.com/ayufan/golang-kardianos-service") + (synopsis "Go interface to a variety of service supervisors") + (description "This package provides @code{service}, a Go module that can +run programs as a service using a variety of supervisors, including systemd, +SysVinit, and more.") + (license license:zlib)))) -- cgit 1.4.1 From 6a8d3381588ad335d14ad8e7d68bcd8530a68252 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 20 Jun 2018 20:33:31 +0200 Subject: gnu: ocaml: Build reproducibly. * gnu/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch: New file. * gnu/packages/ocaml.scm (ocaml)[origin]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/ocaml.scm | 3 +- .../ocaml-enable-ocamldoc-reproducibility.patch | 149 +++++++++++++++++++++ 3 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index dfd25c7088..9057826770 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -964,6 +964,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ %D%/packages/patches/ocaml-Add-a-.file-directive.patch \ + %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch \ %D%/packages/patches/ocaml-findlib-make-install.patch \ %D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 864038fe99..f21c2b2610 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -135,7 +135,8 @@ (patches (search-patches "ocaml-CVE-2015-8869.patch" - "ocaml-Add-a-.file-directive.patch")))) + "ocaml-Add-a-.file-directive.patch" + "ocaml-enable-ocamldoc-reproducibility.patch")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification diff --git a/gnu/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch b/gnu/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch new file mode 100644 index 0000000000..39fb7aa226 --- /dev/null +++ b/gnu/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch @@ -0,0 +1,149 @@ +From a87c3f20e846c00e53d695497dba7038edbd12f0 Mon Sep 17 00:00:00 2001 +From: Valentin Lorentz +Date: Thu, 13 Aug 2015 11:59:04 +0200 +Subject: [PATCH] Enable ocamldoc to build reproducible manpages + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794586 +Signed-off-by: Stephane Glondu +--- + ocamldoc/odoc_man.ml | 15 +++++---------- + ocamldoc/odoc_misc.ml | 12 ++++++++++-- + ocamldoc/odoc_misc.mli | 7 ++++++- + 3 files changed, 21 insertions(+), 13 deletions(-) + +diff --git a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml +index 615c5e172..3c85aa32a 100644 +--- a/ocamldoc/odoc_man.ml ++++ b/ocamldoc/odoc_man.ml +@@ -864,14 +864,13 @@ class man = + (** Generate the man page for the given class.*) + method generate_for_class cl = + Odoc_info.reset_type_names () ; +- let date = Unix.time () in + let file = self#file_name cl.cl_name in + try + let chanout = self#open_out file in + let b = new_buf () in + bs b (".TH \""^cl.cl_name^"\" "); + bs b !man_section ; +- bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^" "); ++ bs b (" source: "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -923,14 +922,13 @@ class man = + (** Generate the man page for the given class type.*) + method generate_for_class_type ct = + Odoc_info.reset_type_names () ; +- let date = Unix.time () in + let file = self#file_name ct.clt_name in + try + let chanout = self#open_out file in + let b = new_buf () in + bs b (".TH \""^ct.clt_name^"\" "); + bs b !man_section ; +- bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^" "); ++ bs b (" source: "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -1016,14 +1014,13 @@ class man = + (** Generate the man file for the given module type. + @raise Failure if an error occurs.*) + method generate_for_module_type mt = +- let date = Unix.time () in + let file = self#file_name mt.mt_name in + try + let chanout = self#open_out file in + let b = new_buf () in + bs b (".TH \""^mt.mt_name^"\" "); + bs b !man_section ; +- bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^" "); ++ bs b (" source: "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -1099,14 +1096,13 @@ class man = + (** Generate the man file for the given module. + @raise Failure if an error occurs.*) + method generate_for_module m = +- let date = Unix.time () in + let file = self#file_name m.m_name in + try + let chanout = self#open_out file in + let b = new_buf () in + bs b (".TH \""^m.m_name^"\" "); + bs b !man_section ; +- bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^" "); ++ bs b (" source: "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -1206,14 +1202,13 @@ class man = + | Res_const (_,f) -> f.vc_name + ) + in +- let date = Unix.time () in + let file = self#file_name name in + try + let chanout = self#open_out file in + let b = new_buf () in + bs b (".TH \""^name^"\" "); + bs b !man_section ; +- bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^" "); ++ bs b (" source: "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + bs b ".SH NAME\n"; +diff --git a/ocamldoc/odoc_misc.ml b/ocamldoc/odoc_misc.ml +index 4c74476da..456225f62 100644 +--- a/ocamldoc/odoc_misc.ml ++++ b/ocamldoc/odoc_misc.ml +@@ -223,9 +223,9 @@ let apply_opt f v_opt = + None -> None + | Some v -> Some (f v) + +-let string_of_date ?(hour=true) d = ++let string_of_date ?(absolute=false) ?(hour=true) d = + let add_0 s = if String.length s < 2 then "0"^s else s in +- let t = Unix.localtime d in ++ let t = (if absolute then Unix.gmtime else Unix.localtime) d in + (string_of_int (t.Unix.tm_year + 1900))^"-"^ + (add_0 (string_of_int (t.Unix.tm_mon + 1)))^"-"^ + (add_0 (string_of_int t.Unix.tm_mday))^ +@@ -238,6 +238,14 @@ let string_of_date ?(hour=true) d = + "" + ) + ++let current_date = ++ let time = ++ try ++ float_of_string (Sys.getenv "SOURCE_DATE_EPOCH") ++ with ++ Not_found -> Unix.time () ++ in string_of_date ~absolute: true ~hour: false time ++ + + let rec text_list_concat sep l = + match l with +diff --git a/ocamldoc/odoc_misc.mli b/ocamldoc/odoc_misc.mli +index dd5a7fcb9..38ff0612b 100644 +--- a/ocamldoc/odoc_misc.mli ++++ b/ocamldoc/odoc_misc.mli +@@ -62,7 +62,12 @@ val apply_opt : ('a -> 'b) -> 'a option -> 'b option + + (** Return a string representing a date given as a number of seconds + since 1970. The hour is optionnaly displayed. *) +-val string_of_date : ?hour:bool -> float -> string ++val string_of_date : ?absolute:bool -> ?hour:bool -> float -> string ++ ++(* Value returned by string_of_date for current time. ++ * Uses environment variable SOURCE_DATE_EPOCH if set; falls back to ++ * current timestamp otherwise. *) ++val current_date : string + + (** Return the first sentence (until the first dot) of a text. + Don't stop in the middle of [Code], [Verbatim], [List], [Lnum], +-- +2.17.1 + -- cgit 1.4.1 From addda2eeb3ecd3ce411993a4638ca79559132923 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 17 Jun 2018 00:54:08 +0200 Subject: gnu: Add emacs-mu4e-conversation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-mu4e-conversation): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 219358bbdb..da3a3f6a41 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11291,3 +11291,34 @@ file.") "@code{wgrep-helm} allows you to edit a @code{helm-grep-mode} buffer and apply those changes to the file buffer.") (license license:gpl3+)))) + +(define-public emacs-mu4e-conversation + (let ((commit "b60d6bd27d7220c3dd041ff2a090e29f2166a319")) + (package + (name "emacs-mu4e-conversation") + (version (git-version "20180615" "1" commit)) + (source + (origin + (method url-fetch) + (uri (string-append + "https://gitlab.com/Ambrevar/mu4e-conversation/" + "repository/archive.tar.gz?ref=" + commit)) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0x8kmi0rmbaaxn5zicm1f9yb8ynxi8074hi2n0rvymlfpxbpn0ma")))) + (build-system emacs-build-system) + (propagated-inputs + `(("mu" ,mu))) + (home-page + "https://gitlab.com/Ambrevar/mu4e-conversation") + (synopsis + "Show a complete thread in a single buffer") + (description + "This package offers an alternate view to mu4e e-mail display. It +shows all e-mails of a thread in a single view, where each correspondant has +their own face. Threads can be displayed linearly (in which case e-mails are +displayed in chronological order) or as an Org document where the node tree +maps the thread tree.") + (license license:gpl3+)))) -- cgit 1.4.1 From 9abf135b202a3c6c91c0bb67aa6ac53a6e37b15f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 17 Jun 2018 11:08:00 +0200 Subject: gnu: emacs-evil-collection: Update to 20180617. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-evil-collection): Update to 20180617. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index da3a3f6a41..7fef631ba4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4751,11 +4751,11 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "f40704a57fd33b4bfad64147a2b771fc8961fdfc") + (let ((commit "ac21b8957cfc22485cdaa316384edf9cb220d837") (revision "1")) (package (name "emacs-evil-collection") - (version (git-version "20180425" revision commit)) + (version (git-version "20180617" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4764,7 +4764,7 @@ extensions.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0qn19k0f3isnbi1hkmcf3qjxbyvp23m5ak5ny7623qgwb2nwz1l5")))) + "082a3c5c2ls9ryqrl5kzb4z6bcprhqx8pypnlj1razbld3lny934")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit 1.4.1 From 1e5fb529d193164f14ab9f543b0e2a84229a8849 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 17 Jun 2018 11:09:40 +0200 Subject: gnu: emacs-evil-ediff: Deprecate in favor of emacs-evil-collection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-evil-ediff): Deprecate. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7fef631ba4..dc4802cbad 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10701,27 +10701,8 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (license license:gpl3+))) (define-public emacs-evil-ediff - (package - (name "emacs-evil-ediff") - (version "20170724") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/emacs-evil/evil-ediff/archive/" - "67b0e69f65c196eff5b39dacb7a9ec05bb919c74" - ".tar.gz")) - (sha256 - (base32 - "0j2x26zfc6md54mjf76qpybil4yal70lp5bifcz62l1f8fc1vvlq")))) - (build-system emacs-build-system) - (propagated-inputs `(("emacs-evil" ,emacs-evil))) - (home-page "https://github.com/emacs-evil/evil-ediff") - (synopsis "Make Ediff a little evil") - (description - "This Emacs package configures Ediff to be friendlier to users of Vi-like -keybindings. Consult the help buffer for more information.") - (license license:gpl3+))) + ;; Evil-Ediff is included in Evil Collection from 20180617. + (deprecated-package "emacs-evil-ediff" emacs-evil-collection)) (define-public emacs-evil-magit (let ((commit "dbf5a646a7ce1c35c229dfdc423bd5ecd927a3a8")) -- cgit 1.4.1 From 5a74886ef55271a35949a0d1151dba2f246fe732 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 17 Jun 2018 11:09:41 +0200 Subject: gnu: emacs-evil-mu4e: Deprecate in favor of emacs-evil-collection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-evil-mu4e): Deprecate. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index dc4802cbad..8baa28d1bb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10734,30 +10734,8 @@ describing the key binding changes.") (license license:gpl3+)))) (define-public emacs-evil-mu4e - (package - (name "emacs-evil-mu4e") - (version "0.0.8") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/JorisE/evil-mu4e/archive/" - "c03a0e11afda3092eb1461be09fa6a61ebc0e4f6" - ".tar.gz")) - (sha256 - (base32 - "1k3z5h04bqslrkq13paqf8pv9r0rf0zjl0zbb57ly043ds3nvxr2")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-evil" ,emacs-evil) - ("mu" ,mu))) - (home-page "https://github.com/JorisE/evil-mu4e") - (synopsis "Evil-based key bindings for mu4e") - (description - "Use keybindings for the mu4e mail reader in Emacs that make sense for -Evil users.") - (license license:gpl3+))) + ;; Evil-mu4e is included in Evil Collection from 20180617. + (deprecated-package "emacs-evil-mu4e" emacs-evil-collection)) (define-public emacs-evil-multiedit (let ((commit "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d")) -- cgit 1.4.1 From 913f1f1ff784e7d75f802c6213c9bf49a396bf63 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 19 Jun 2018 15:17:38 +0200 Subject: gnu: emacs-evil: Update to 20180517. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-evil): Update to 20180517. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8baa28d1bb..cdd72ec553 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4726,29 +4726,31 @@ news items, openrc and runscripts.") (license license:gpl2+))) (define-public emacs-evil - (package - (name "emacs-evil") - (version "1.2.13") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/emacs-evil/evil/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1z63zsxmsc6mh74wv6065carwqmgs7b7lz5044s12xvgsjfbwi8h")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-undo-tree" ,emacs-undo-tree) - ("emacs-goto-chg" ,emacs-goto-chg))) - (home-page "https://github.com/emacs-evil/evil") - (synopsis "Extensible Vi layer for Emacs") - (description - "Evil is an extensible vi layer for Emacs. It emulates the + (let ((commit "230b87212c81aaa68ef5547a6b998d9c365fe139")) + (package + (name "emacs-evil") + (version (git-version "1.2.13" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-evil/evil") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0c9zy3bpck10gcrv79kd3h7i4ygd5bgbgy773n0lg7a2r5kwn1gx")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-undo-tree" ,emacs-undo-tree) + ("emacs-goto-chg" ,emacs-goto-chg))) + (home-page "https://github.com/emacs-evil/evil") + (synopsis "Extensible Vi layer for Emacs") + (description + "Evil is an extensible vi layer for Emacs. It emulates the main features of Vim, and provides facilities for writing custom extensions.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-evil-collection (let ((commit "ac21b8957cfc22485cdaa316384edf9cb220d837") -- cgit 1.4.1 From 1e2b2f41d7170a7e171719174e3a258c1004b630 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:28:33 +0200 Subject: gnu: r-biocviews: Update to 1.48.2. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.48.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 42bc67e808..8d1cffe8fd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6939,13 +6939,13 @@ Bioconductor, CRAN, and Github.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.48.1") + (version "1.48.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "1q5z6xxhjyibr165di7iyachw4gd4bdrxkd8rjkcklnngsrx1azm")))) + "01yiafayl1m5704xdd2cn3zjc78rs10dqyz66lr3qkf6d8w66938")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit 1.4.1 From eafd35bad58d1997a4dc1dcb8db580a308a96372 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:28:49 +0200 Subject: gnu: r-optparse: Update to 1.6.0. * gnu/packages/bioinformatics.scm (r-optparse): Update to 1.6.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8d1cffe8fd..4b097d406e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7083,14 +7083,14 @@ support for default values, positional argument support, etc.") (define-public r-optparse (package (name "r-optparse") - (version "1.4.4") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "optparse" version)) (sha256 (base32 - "1ff4wmsszrb3spwfp7ynfs8w11qpy1sdzfxm1wk8dqqvdwris7qb")))) + "1d7v5gl45x4amsfmzn5zyyffyqlc7a82h01szlnda22viyxids0h")))) (build-system r-build-system) (propagated-inputs `(("r-getopt" ,r-getopt))) -- cgit 1.4.1 From a1c7016498ff00f3baba0c984fb6d1de7c83b196 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:29:01 +0200 Subject: gnu: r-delayedarray: Update to 0.6.1. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.6.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4b097d406e..b7b11e0fca 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7587,13 +7587,13 @@ files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "0n3w57cwy911q812wc8658y0v3xgpmg379sj98kfqdxa80z1mxdf")))) + "0sjwszxdi0vkj2i2di5i46gh9chc660yr3gs5nk9qnqp77713zds")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit 1.4.1 From 1f73fd017c1fcfdc55aad28539380f312f0767e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:29:14 +0200 Subject: gnu: r-complexheatmap: Update to 1.18.1. * gnu/packages/bioinformatics.scm (r-complexheatmap): Update to 1.18.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b7b11e0fca..a7356743f0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10070,14 +10070,14 @@ provide added flexibility for data combination and manipulation.") (define-public r-complexheatmap (package (name "r-complexheatmap") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ComplexHeatmap" version)) (sha256 (base32 - "0z57mrginzd40niy51dvnyqgbrij05ji0dbwqs3x2as80sq28i3q")))) + "0qjwz1hzpjnc90jiinjkikfnr0shi72q3zfdjjz7pxydy0mglq8n")))) (properties `((upstream-name . "ComplexHeatmap"))) (build-system r-build-system) -- cgit 1.4.1 From 9de9dcd91373b5251f343166916a0232957ed766 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:29:28 +0200 Subject: gnu: r-progress: Update to 1.2.0. * gnu/packages/cran.scm (r-progress): Update to 1.2.0. [propagated-inputs]: Add r-crayon and r-hms. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a493a449c8..832cc9bd4b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -854,17 +854,19 @@ quantities.") (define-public r-progress (package (name "r-progress") - (version "1.1.2") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "progress" version)) (sha256 (base32 - "1fxakchfjr5vj59s9sxynd7crpz97xj42438rmkhkf3rjpyspx59")))) + "1rhwm0bdw30z3rvl0bn56xprjl3zrdy7150w4gl4bkvn2d6h9fav")))) (build-system r-build-system) (propagated-inputs - `(("r-prettyunits" ,r-prettyunits) + `(("r-crayon" ,r-crayon) + ("r-hms" ,r-hms) + ("r-prettyunits" ,r-prettyunits) ("r-r6" ,r-r6))) (home-page "https://github.com/gaborcsardi/progress") (synopsis "Terminal progress bars") -- cgit 1.4.1 From 92b8a481d4f399797fcaaa667ebdaf053c4d917e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:29:53 +0200 Subject: gnu: r-mice: Update to 3.1.0. * gnu/packages/cran.scm (r-mice): Update to 3.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 832cc9bd4b..57603bf57a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1956,14 +1956,14 @@ analysis of multiply imputed data sets.") (define-public r-mice (package (name "r-mice") - (version "3.0.0") + (version "3.1.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "1p8a5ham90iaak4w17114pdnw535r2l9sxr402yrkc4gbwfbpdlq")))) + "0xpn215yfzib4hw09cwilnyg9zbvq460njavfvm84mvgwbm25byi")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit 1.4.1 From 58630da84c1b2ef92fbb86e858072a10c09ff856 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:30:12 +0200 Subject: gnu: r-mgcv: Update to 1.8-24. * gnu/packages/statistics.scm (r-mgcv): Update to 1.8-24. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 502ff9b2f9..9853e842c2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -532,14 +532,14 @@ nonlinear mixed-effects models.") (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-23") + (version "1.8-24") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 (base32 - "1lsrhf1yzn25pfn3f5x8yxjqnfryim4jx3iqd7ah8aalh5asqwbp")))) + "15b76m1f0hz8dbmj9shqvslihdx5b7c48vck9grj5xs1z2y45r9c")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) -- cgit 1.4.1 From 1a50321752aa92dcb1acdc1d68bddb65dff0a874 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Jun 2018 10:30:28 +0200 Subject: gnu: r-httpuv: Update to 1.4.4.1. * gnu/packages/web.scm (r-httpuv): Update to 1.4.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2319acb3ca..858ea1c759 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3802,13 +3802,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.4.3") + (version "1.4.4.1") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "15ghxcyg9h0za3qy077fnn3izbpihskvaqwsppm2s43a771imsf6")))) + "12kwq10xa8glrip7rai9xb4hnpysng00g2l0rw7swfzq5lk4z966")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp))) (propagated-inputs -- cgit 1.4.1 From a34801ca685df32e1df50597a96a578acb66cfb0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 21 Jun 2018 14:31:10 +0200 Subject: gnu: youtube-dl: Update to 2018.06.19. * gnu/packages/video.scm (youtube-dl): Update to 2018.06.19. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ff05557089..132f9cca74 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1222,7 +1222,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.05.09") + (version "2018.06.19") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1230,7 +1230,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d")))) + "0ys2mc84r7mjpn7rykb57sn3ii1kp3divjdn2ivwqknj8jrzg3z6")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit 1.4.1