[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
From: |
Leo Famulari |
Subject: |
01/01: Merge branch 'master' into core-updates |
Date: |
Sun, 30 Oct 2016 01:44:53 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 062c7e43ed306c66f1107ee3bd52357aa8daf11a
Merge: f4fe6c9 269d917
Author: Leo Famulari <address@hidden>
Date: Sat Oct 29 21:44:39 2016 -0400
Merge branch 'master' into core-updates
doc/guix.texi | 56 +-
gnu/local.mk | 1 +
gnu/packages/backup.scm | 4 +-
gnu/packages/ccache.scm | 4 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/dns.scm | 39 +
gnu/packages/embedded.scm | 139 +++
gnu/packages/flex.scm | 19 +
gnu/packages/games.scm | 6 +-
gnu/packages/gnuzilla.scm | 5 +-
gnu/packages/kde-frameworks.scm | 1691 +++++++++++++++---------------
gnu/packages/libusb.scm | 38 +
gnu/packages/linux.scm | 55 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 31 +-
gnu/packages/music.scm | 17 +-
gnu/packages/patches/openocd-nrf52.patch | 843 +++++++++++++++
gnu/packages/python.scm | 88 +-
gnu/packages/sdcc.scm | 2 +-
gnu/packages/video.scm | 10 +-
gnu/packages/vim.scm | 9 +-
guix/scripts/hash.scm | 4 +-
nix/libstore/local-store.cc | 468 ++-------
nix/libstore/local-store.hh | 42 +-
nix/libstore/optimise-store.cc | 23 +-
nix/libstore/sqlite.cc | 166 +++
nix/libstore/sqlite.hh | 102 ++
nix/libstore/store-api.hh | 4 +-
nix/local.mk | 4 +-
tests/guix-hash.sh | 3 +-
30 files changed, 2567 insertions(+), 1314 deletions(-)
diff --cc gnu/packages/kde-frameworks.scm
index 3790e8f,69ea9e6..9df37ac
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -589,19 -597,19 +597,19 @@@ interfaces in the areas of colors, font
(define-public ki18n
(package
(name "ki18n")
- (version "5.24.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/frameworks/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv"))))
+ (version "5.27.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0a66z325bvdv7g6ysml2bf8559nkjhv2fxwj1ja6vsxkn95d54ff"))))
(build-system cmake-build-system)
(propagated-inputs
- `(("gettext" ,gnu-gettext)
+ `(("gettext" ,gettext-minimal)
("python" ,python)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))