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
parent 6aa04f01d0 1831d2c531
commit 2f29fdbf83
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 = ''