pyrox.dev
lol
Merge pull request #112845 from rb2k/libdnf_update
+29
-7
+26
-4
pkgs/tools/package-management/libdnf/darwin.patch
+26
-4
pkgs/tools/package-management/libdnf/darwin.patch
···
1
-
--- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800
2
-
+++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800
1
+
diff --git src/libdnf/config.h src/libdnf/config.h
2
+
index 16121f6f..737d0bc4 100644
3
+
--- src/libdnf/config.h
4
+
+++ src/libdnf/config.h
5
+
@@ -18,7 +18,12 @@
6
+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
7
+
*/
8
+
9
+
+
10
+
+#ifdef __APPLE__
11
+
+#include <stdint.h>
12
+
+#else
13
+
#include <bits/wordsize.h>
14
+
+#endif
15
+
16
+
17
+
#if __WORDSIZE == 32
18
+
#include "config-32.h"
19
+
diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp
20
+
index 497c560d..5de077fa 100644
21
+
--- src/libdnf/hy-iutil.cpp
22
+
+++ src/libdnf/hy-iutil.cpp
3
23
@@ -22,7 +22,7 @@
4
24
#include <errno.h>
5
25
#include <dirent.h>
···
9
29
#include <pwd.h>
10
30
#include <unistd.h>
11
31
#include <stdio.h>
12
-
--- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800
13
-
+++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800
32
+
diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp
33
+
index 295fdc1b..9d584b8a 100644
34
+
--- src/libdnf/hy-util.cpp
35
+
+++ src/libdnf/hy-util.cpp
14
36
@@ -24,7 +24,20 @@
15
37
#include <ctype.h>
16
38
#include <sys/utsname.h>
+3
-3
pkgs/tools/package-management/libdnf/default.nix
+3
-3
pkgs/tools/package-management/libdnf/default.nix
···
1
1
{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check
2
-
, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
2
+
, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
3
3
4
4
gcc9Stdenv.mkDerivation rec {
5
5
pname = "libdnf";
6
-
version = "0.55.2";
6
+
version = "0.58.0";
7
7
8
8
src = fetchFromGitHub {
9
9
owner = "rpm-software-management";
10
10
repo = pname;
11
11
rev = version;
12
-
sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq";
12
+
sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l";
13
13
};
14
14
15
15
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];