Merge staging-next into master

This commit is contained in:
Frederik Rietdijk
2018-07-22 11:04:28 +02:00
60 changed files with 339 additions and 455 deletions

View File

@@ -1,13 +1,13 @@
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
, libxml2, glib}:
let version = "1.9"; in
let version = "1.10"; in
stdenv.mkDerivation rec {
name = "shared-mime-info-${version}";
src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw";
sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
};
nativeBuildInputs = [