nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 03:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47509 from dtzWill/update/osinfo-20180920-libs-tools

Browse Source 
libosinfo: 1.1.0 -> 1.2.0, osinfo-db: 20180903 -> 20180920
This commit is contained in:
xeji 2018-09-30 21:21:27 +02:00 committed by GitHub
commit 0e8da11c91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
name = "osinfo-db-20180903";
name = "osinfo-db-20180920";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9";
sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
}:
stdenv.mkDerivation rec {
name = "libosinfo-1.1.0";
name = "libosinfo-1.2.0";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0";
sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf";
};
outputs = [ "out" "dev" "devdoc" ];
@ -20,6 +20,16 @@ stdenv.mkDerivation rec {
patches = [
./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 = ''