diff options
author | Will Dietz <github@wdtz.org> | 2019-03-07 14:58:18 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-07 14:58:18 -0600 |
commit | 2f29fdbf83fb9bc63b048ac251cddee5cbc22975 (patch) | |
tree | 205a35182c3c08c5f8560f8eda73131eecd8759c /pkgs | |
parent | 6aa04f01d06c11521b7ef77103202b9947fb2a84 (diff) | |
parent | 1831d2c53109fd57eb9e9604280ecb19c27de24d (diff) | |
download | nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.tar nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.tar.gz nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.tar.bz2 nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.tar.lz nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.tar.xz nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.tar.zst nixlib-2f29fdbf83fb9bc63b048ac251cddee5cbc22975.zip |
Merge pull request #56598 from dtzWill/update/osinfo-1.4.0
libosinfo: 1.2.0 -> 1.4.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libosinfo/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/misc/osinfo-db-tools/default.nix | 11 |
3 files changed, 12 insertions, 20 deletions
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index d8f5ebf56b97..4e6a5bde55d8 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20181214"; + pname = "osinfo-db"; + version = "20190301"; src = fetchurl { - url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd"; + url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; + sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index e0f3be230709..e947ec22bf84 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libosinfo-1.2.0"; + name = "libosinfo-1.4.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf"; + sha256 = "0ra1p2rnnwkq0181ayn0l0rs1pvk4a0i8fa08nqjfmqs5fl637m2"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -20,16 +20,6 @@ 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 = '' diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 10aa5d1ae99b..bd7b036a65a1 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2 -, libxslt, libarchive, bzip2, lzma +, libxslt, libarchive, bzip2, lzma, json-glib }: stdenv.mkDerivation rec { - name = "osinfo-db-tools-1.2.0"; + pname = "osinfo-db-tools"; + version = "1.4.0"; src = fetchurl { - url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v"; + url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; + sha256 = "08zpjq1g27n6wmmqwxws95w045warhg9bxcv1phvkdcrddf15q3y"; }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib libxml2 libxslt libarchive bzip2 lzma ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma ]; meta = with stdenv.lib; { description = "Tools for managing the osinfo database"; |