Merge branch 'master' into staging-next

2019-12-25 05:15:06 +01:00
parent d244b77850 760be1f4b2
commit ca39dd3a8a
492 changed files with 22222 additions and 7240 deletions
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "osinfo-db";
-  version = "20190920";
+  version = "20191125";

  src = fetchurl {
    url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    sha256 = "12kwlqljaai4fsa08m7l28v41q6244dbracvqzcbg1cs0y9jxqy8";
+    sha256 = "102mdykp5pjv7lw7saig640vb5a8ivy4ji8sa68q2wzfwg1yix78";
  };

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