summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMarc Seeger <mseeger@fb.com>2021-02-11 14:32:02 -0800
committerMarc Seeger <mseeger@fb.com>2021-02-11 15:09:30 -0800
commit7ca38f88fe856b24559b3312c92262d997d335f3 (patch)
tree8cd42a6e3d11ecf783b89453a7b3cc60ff9fc6ac /pkgs
parent26fa07898578070730cdb9062387abf69815dbe2 (diff)
downloadnixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.tar
nixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.tar.gz
nixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.tar.bz2
nixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.tar.lz
nixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.tar.xz
nixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.tar.zst
nixpkgs-7ca38f88fe856b24559b3312c92262d997d335f3.zip
libmodulemd: 2.9.2 -> 2.12.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libmodulemd/default.nix16
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix
index 8a8d9adf53d..f95d39a02da 100644
--- a/pkgs/development/libraries/libmodulemd/default.nix
+++ b/pkgs/development/libraries/libmodulemd/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv
 , substituteAll
 , fetchFromGitHub
-, fetchpatch
 , pkg-config
 , meson
 , ninja
@@ -19,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libmodulemd";
-  version = "2.9.2";
+  version = "2.12.0";
 
   outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ];
 
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
     owner = "fedora-modularity";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0xl5f6a32hmli29b0rfp54h7vnagxdv9qa2r871mrgrr6fzjwvbn";
+    sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9";
   };
 
   patches = [
@@ -36,17 +35,6 @@ stdenv.mkDerivation rec {
       src = ./glib-devdoc.patch;
       glib_devdoc = glib.devdoc;
     })
-
-    # Install pygobject overrides to our prefix instead of python3 one.
-    # https://github.com/fedora-modularity/libmodulemd/pull/469
-    (fetchpatch {
-      url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch";
-      sha256 = "1rrf94q1yf98w6b9bm67mb6w6qv1zqi306iv1vzspvjhsqvzmzpg";
-    })
-    (fetchpatch {
-      url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch";
-      sha256 = "0z35jpnnzzb5bvmc2lglrpfnwarhky2jqmhq9avnnki22fdw89i6";
-    })
   ];
 
   nativeBuildInputs = [