diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-30 21:21:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-30 21:21:27 +0200 |
| commit | 0e8da11c91eaee2436ea479d52db2e438f1b6128 (patch) | |
| tree | 757610aec0523bb7588bd38642625cc524b669a2 /pkgs | |
| parent | 49dcf7be625ea919d3201dc4d78207f258b903ef (diff) | |
| parent | 6058b979ab92f3e3d35ac6ed6a54dfcd85e83460 (diff) | |
| download | nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.tar nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.tar.gz nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.tar.bz2 nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.tar.lz nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.tar.xz nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.tar.zst nixlib-0e8da11c91eaee2436ea479d52db2e438f1b6128.zip | |
Merge pull request #47509 from dtzWill/update/osinfo-20180920-libs-tools
libosinfo: 1.1.0 -> 1.2.0, osinfo-db: 20180903 -> 20180920
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libosinfo/default.nix | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 93ee6d38c7c3..0a5f7b313065 100644 --- 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-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 ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 111bea61eb65..ba267b797870 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -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 = '' |