Merge remote-tracking branch 'upstream/master' into staging

2018-05-21 20:20:29 -04:00
parent 60a666507c 0106dfcbeb
commit db4d77779c
83 changed files with 798 additions and 265 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-20180502";
+  name = "osinfo-db-20180514";

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

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