summary refs log tree commit diff
path: root/pkgs/development/libraries/libosinfo
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-03-01 14:43:52 -0600
committerWill Dietz <w@wdtz.org>2019-03-01 15:30:39 -0600
commit1831d2c53109fd57eb9e9604280ecb19c27de24d (patch)
tree0721392145a5e641a7464c8da8f0b395ffdcd8a4 /pkgs/development/libraries/libosinfo
parentb5506c0482a67c126b0ffd37e3604ad75098efc4 (diff)
downloadnixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.tar
nixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.tar.gz
nixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.tar.bz2
nixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.tar.lz
nixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.tar.xz
nixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.tar.zst
nixpkgs-1831d2c53109fd57eb9e9604280ecb19c27de24d.zip
libosinfo: 1.2.0 -> 1.4.0
Diffstat (limited to 'pkgs/development/libraries/libosinfo')
-rw-r--r--pkgs/development/libraries/libosinfo/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index e0f3be23070..e947ec22bf8 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 = ''