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

Merge pull request #56598 from dtzWill/update/osinfo-1.4.0

Browse Source 
libosinfo: 1.2.0 -> 1.4.0
This commit is contained in:
Will Dietz 2019-03-07 14:58:18 -06:00 committed by GitHub
commit 2f29fdbf83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,12 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "osinfo-db-20181214"; pname = "osinfo-db";
version = "20190301";
src = fetchurl { src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd"; sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as";
}; };
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

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

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libosinfo-1.2.0"; name = "libosinfo-1.4.0";
src = fetchurl { src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf"; sha256 = "0ra1p2rnnwkq0181ayn0l0rs1pvk4a0i8fa08nqjfmqs5fl637m2";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
@ -20,16 +20,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./osinfo-db-data-dir.patch ./osinfo-db-data-dir.patch
# Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
# using upstream commits:
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
})
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
})
]; ];
postPatch = '' postPatch = ''

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

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2 { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2
, libxslt, libarchive, bzip2, lzma , libxslt, libarchive, bzip2, lzma, json-glib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "osinfo-db-tools-1.2.0"; pname = "osinfo-db-tools";
version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz";
sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v"; sha256 = "08zpjq1g27n6wmmqwxws95w045warhg9bxcv1phvkdcrddf15q3y";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ glib libxml2 libxslt libarchive bzip2 lzma ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools for managing the osinfo database"; description = "Tools for managing the osinfo database";