JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83534 from mmilata/libosinfo-bump

Browse Source 
osinfo-db-tools: 1.6.0 -> 1.7.0, osinfo-db: 20200214 -> 20200515, libosinfo: fix test
This commit is contained in:
Jan Tojnar 2020-05-25 12:38:04 +02:00 committed by GitHub
commit 4d9de2d85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/misc/osinfo-db/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20200214";
version = "20200515";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6";
sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

9
pkgs/development/libraries/libosinfo/default.nix
View File

@ -68,10 +68,11 @@ stdenv.mkDerivation rec {
"-Denable-gtk-doc=true"
];
# FIXME: fails two new tests added in 1.7.1:
# libosinfo:symbols / check-symfile
# 3/24 libosinfo:symbols / check-symsorting
doCheck = false;
preCheck = ''
patchShebangs ../osinfo/check-symfile.pl ../osinfo/check-symsorting.pl
'';
doCheck = true;
meta = with stdenv.lib; {
description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support";

10
pkgs/tools/misc/osinfo-db-tools/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3
, libxslt, libarchive, bzip2, lzma, json-glib, libsoup
}:
stdenv.mkDerivation rec {
pname = "osinfo-db-tools";
version = "1.6.0";
version = "1.7.0";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz";
sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh";
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab";
};
nativeBuildInputs = [ pkgconfig gettext perl ];
nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ];
buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ];
meta = with stdenv.lib; {