[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 4 Jan 2018 21:23:37 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 247d23680a222bc5440dec7c3fe0d36ad463a121
Merge: e21ce0f 72687ca
Author: Mark H Weaver <address@hidden>
Date: Thu Jan 4 21:21:04 2018 -0500
Merge branch 'master' into core-updates
gnu/packages/algebra.scm | 6 +-
gnu/packages/emacs.scm | 37 +++++++++++-
gnu/packages/embedded.scm | 120 ++++++++++++++++++++++++++++++++++++++
gnu/packages/file.scm | 2 +-
gnu/packages/fonts.scm | 4 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/geo.scm | 51 ++++++++++++++++
gnu/packages/graphics.scm | 8 +--
gnu/packages/linux.scm | 12 ++--
gnu/packages/python.scm | 69 ++++++++++++++++++++++
gnu/packages/syndication.scm | 76 +++++++++++++++---------
gnu/packages/video.scm | 7 +++
gnu/packages/web.scm | 45 ++++++++++++--
13 files changed, 387 insertions(+), 54 deletions(-)
diff --cc gnu/packages/file.scm
index 63aa3fa,34a4bba..0473c51
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@@ -47,6 -48,13 +47,6 @@@
"The file command is a file type guesser, a command-line tool that tells
you in words what kind of data a file contains. It does not rely on filename
extensions to tell you the type of a file, but looks at the actual contents
- of the file.")
+ of the file. This package provides the libmagic library.")
(license bsd-2)
- (home-page "http://www.darwinsys.com/file/";)))
-
-(define file/fixed
- (package
- (inherit file)
- (source (origin
- (inherit (package-source file))
- (patches (search-patches "file-CVE-2017-1000249.patch"))))))
+ (home-page "https://www.darwinsys.com/file/";)))