diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-12 01:31:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 01:31:47 +0100 |
| commit | 34e0672cc4d0df434fee9f94d36eb589c6c83c02 (patch) | |
| tree | 5174797cadb63107a2a14fbd3a0453cce76ce0b7 /pkgs | |
| parent | 0906b3e1fc2b683cca742c0af97db599d85be6f3 (diff) | |
| parent | 7ca38f88fe856b24559b3312c92262d997d335f3 (diff) | |
| download | nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.tar nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.tar.gz nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.tar.bz2 nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.tar.lz nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.tar.xz nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.tar.zst nixpkgs-34e0672cc4d0df434fee9f94d36eb589c6c83c02.zip | |
Merge pull request #112827 from rb2k/libmodulemd_bump
libmodulemd: 2.9.2 -> 2.12.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libmodulemd/default.nix | 16 |
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 = [ |