Merge staging-next into staging

2018-10-17 08:36:28 +02:00
parent 7b2ed00ef6 18fcc337af
commit 89349fdae9
347 changed files with 8824 additions and 5155 deletions
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:

 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180920";
+  name = "osinfo-db-20181011";

  src = fetchurl {
    url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac";
+    sha256 = "1f0xa50xn15p3zig9031icqky8drf0654sbjmmziw2ijcdyzfkcp";
  };

  nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];