diff options
| author | Marc Seeger <mseeger@fb.com> | 2021-02-11 17:36:53 -0800 |
|---|---|---|
| committer | Marc Seeger <mseeger@fb.com> | 2021-02-11 18:19:02 -0800 |
| commit | 5c9e89085a09f089eb737601c841e5baa235217c (patch) | |
| tree | cf286932467bb6aa065512ce01c7aba4f678fed4 /pkgs/tools/package-management/libdnf | |
| parent | 79270a3152268452fb7111df58a77115b47a3d08 (diff) | |
| download | nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.tar nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.tar.gz nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.tar.bz2 nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.tar.lz nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.tar.xz nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.tar.zst nixpkgs-5c9e89085a09f089eb737601c841e5baa235217c.zip | |
libdnf: 0.55.2 -> 0.58.0
Diffstat (limited to 'pkgs/tools/package-management/libdnf')
| -rw-r--r-- | pkgs/tools/package-management/libdnf/darwin.patch | 30 | ||||
| -rw-r--r-- | pkgs/tools/package-management/libdnf/default.nix | 6 |
2 files changed, 29 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/libdnf/darwin.patch b/pkgs/tools/package-management/libdnf/darwin.patch index 56bafb2f7b8..53f2c04f9ef 100644 --- a/pkgs/tools/package-management/libdnf/darwin.patch +++ b/pkgs/tools/package-management/libdnf/darwin.patch @@ -1,5 +1,25 @@ ---- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800 -+++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800 +diff --git src/libdnf/config.h src/libdnf/config.h +index 16121f6f..737d0bc4 100644 +--- src/libdnf/config.h ++++ src/libdnf/config.h +@@ -18,7 +18,12 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++ ++#ifdef __APPLE__ ++#include <stdint.h> ++#else + #include <bits/wordsize.h> ++#endif + + + #if __WORDSIZE == 32 + #include "config-32.h" +diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp +index 497c560d..5de077fa 100644 +--- src/libdnf/hy-iutil.cpp ++++ src/libdnf/hy-iutil.cpp @@ -22,7 +22,7 @@ #include <errno.h> #include <dirent.h> @@ -9,8 +29,10 @@ #include <pwd.h> #include <unistd.h> #include <stdio.h> ---- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800 -+++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800 +diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp +index 295fdc1b..9d584b8a 100644 +--- src/libdnf/hy-util.cpp ++++ src/libdnf/hy-util.cpp @@ -24,7 +24,20 @@ #include <ctype.h> #include <sys/utsname.h> diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 08702e8bf6b..59df56f86fa 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,15 +1,15 @@ { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check -, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: +, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.55.2"; + version = "0.58.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; + sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l"; }; patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; |