[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 3 Jan 2018 14:32:54 -0500 (EST) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 4ed41f472bd2be465b371abf6760e8713ec59f92
Merge: 9d7d8e7 0c84e86
Author: Leo Famulari <address@hidden>
Date: Wed Jan 3 14:18:01 2018 -0500
Merge branch 'master' into core-updates
README | 5 +-
gnu/local.mk | 8 +-
gnu/packages/admin.scm | 14 +-
gnu/packages/assembly.scm | 5 +-
gnu/packages/bioinformatics.scm | 27 +++-
gnu/packages/compression.scm | 24 ++--
gnu/packages/crypto.scm | 9 +-
gnu/packages/curl.scm | 31 ++++
gnu/packages/digest.scm | 55 ++++++++
gnu/packages/dns.scm | 6 +-
gnu/packages/emacs.scm | 25 ++++
gnu/packages/games.scm | 10 +-
gnu/packages/gimp.scm | 5 +
gnu/packages/golang.scm | 75 ++++++++++
gnu/packages/kde-frameworks.scm | 4 +
gnu/packages/kde.scm | 24 +++-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/moreutils.scm | 6 +-
gnu/packages/package-management.scm | 5 +-
gnu/packages/patches/fossil-CVE-2017-17459.patch | 57 ++++++++
gnu/packages/patches/gimp-CVE-2017-17784.patch | 41 ++++++
gnu/packages/patches/gimp-CVE-2017-17785.patch | 171 +++++++++++++++++++++++
gnu/packages/patches/gimp-CVE-2017-17786.patch | 94 +++++++++++++
gnu/packages/patches/gimp-CVE-2017-17787.patch | 42 ++++++
gnu/packages/patches/gimp-CVE-2017-17789.patch | 48 +++++++
gnu/packages/patches/httpd-CVE-2017-9798.patch | 22 ---
gnu/packages/perl-check.scm | 37 ++++-
gnu/packages/perl.scm | 49 ++++---
gnu/packages/python.scm | 7 +-
gnu/packages/regex.scm | 5 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/version-control.scm | 2 +
gnu/packages/video.scm | 4 +-
gnu/packages/web.scm | 5 +-
gnu/packages/wine.scm | 115 ++++++++++++---
guix/ui.scm | 4 +-
nix/scripts/list-runtime-roots.in | 7 +-
37 files changed, 923 insertions(+), 131 deletions(-)
diff --cc gnu/local.mk
index 7299372,6f54073..37a3129
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -638,7 -639,7 +639,8 @@@ dist_patch_DATA =
%D%/packages/patches/fltk-xfont-on-demand.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
+ %D%/packages/patches/fontconfig-remove-debug-printf.patch \
+ %D%/packages/patches/fossil-CVE-2017-17459.patch \
%D%/packages/patches/freeimage-CVE-2015-0852.patch \
%D%/packages/patches/freeimage-CVE-2016-5684.patch \
%D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \
@@@ -672,8 -676,12 +674,13 @@@
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/ghostscript-runpath.patch \
+ %D%/packages/patches/gimp-CVE-2017-17784.patch \
+ %D%/packages/patches/gimp-CVE-2017-17785.patch \
+ %D%/packages/patches/gimp-CVE-2017-17786.patch \
+ %D%/packages/patches/gimp-CVE-2017-17787.patch \
+ %D%/packages/patches/gimp-CVE-2017-17789.patch \
%D%/packages/patches/glib-networking-ssl-cert-file.patch \
+ %D%/packages/patches/glib-respect-datadir.patch \
%D%/packages/patches/glib-tests-timer.patch \
%D%/packages/patches/glibc-CVE-2015-5180.patch \
%D%/packages/patches/glibc-CVE-2015-7547.patch \
diff --cc gnu/packages/curl.scm
index 3df8acc,5f61800..302c696
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -131,3 -125,44 +134,31 @@@ tunneling, and so on."
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))
(home-page "https://curl.haxx.se/";)))
+
-(define-public curl-7.57.0
- (package
- (inherit curl)
- (version "7.57.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://curl.haxx.se/download/curl-";
- version ".tar.xz"))
- (sha256
- (base32
- "0y3qbjjcxhcvm1yawp3spfssjbskv0g6gyzld6ckif5pf8ygvxpm"))))))
-
+ (define-public kurly
+ (package
+ (name "kurly")
+ (version "1.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/davidjpeacock/kurly.git";)
+ (commit (string-append "v" version))))
+ (sha256
+ (base32
+ "1q192f457sjypgvwq7grrf8gq8w272p3zf1d5ppc20mriqm0mbc3"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/davidjpeacock/kurly"))
+ (inputs
+ `(("go-github-com-alsm-ioprogress" ,go-github-com-alsm-ioprogress)
+ ("go-github-com-aki237-nscjar" ,go-github-com-aki237-nscjar)
+ ("go-github-com-davidjpeacock-cli" ,go-github-com-davidjpeacock-cli)))
+ (synopsis "Command-line HTTP client")
+ (description "kurly is an alternative to the @code{curl} program written
in
+ Go. kurly is designed to operate in a similar manner to curl, with select
+ features. Notably, kurly is not aiming for feature parity, but common flags
and
+ mechanisms particularly within the HTTP(S) realm are to be expected. kurly
does
+ not offer a replacement for libcurl.")
+ (home-page "https://github.com/davidjpeacock/kurly";)
+ (license license:asl2.0)))