git.iko.soy/typeable/nixpkgs
on master help sign in
libdnf: 0.60.0 -> 0.61.1
commit91ba4016a05a63c394eea5b6aac3a3f9c562f6f2 authorMarc Seeger <mseeger@fb.com> dateTue 27 Apr 2021, 10:28 (6 years ago) parent34463b2
2 files changed+2−61
pkgs/tools/package-management/libdnf/darwin.patch−57 pkgs/tools/package-management/libdnf/default.nix+2−4
pkgs/tools/package-management/libdnf/darwin.patchdeleted−57
@@ -1,57 +0,0 @@
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
23−@@ -22,7 +22,7 @@
24− #include <errno.h>
25− #include <dirent.h>
26− #include <fcntl.h>
27−-#include <linux/limits.h>
28−+#include <limits.h>
29− #include <pwd.h>
30− #include <unistd.h>
31− #include <stdio.h>
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
36−@@ -24,7 +24,20 @@
37− #include <ctype.h>
38− #include <sys/utsname.h>
39− #include <sys/stat.h>
40−-#include <sys/auxv.h>
41−+
42−+// Darwin compatibility hacks
43−+typedef int auxv_t;
44−+#ifndef AT_HWCAP2
45−+#define AT_HWCAP2 26
46−+#endif
47−+#ifndef AT_HWCAP
48−+#define AT_HWCAP 16
49−+#endif
50−+static unsigned long getauxval(unsigned long type)
51−+{
52−+ unsigned long ret = 0;
53−+ return ret;
54−+}
55−
56− // hawkey
57− #include "dnf-types.h"
pkgs/tools/package-management/libdnf/default.nix+2−4
@@ -3,17 +3,15 @@
33
44gcc9Stdenv.mkDerivation rec {
55 pname = "libdnf";
6− version = "0.60.0";
6+ version = "0.61.1";
77
88 src = fetchFromGitHub {
99 owner = "rpm-software-management";
1010 repo = pname;
1111 rev = version;
12− sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s=";
12+ sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc=";
1313 };
1414
15− patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
16−
1715 nativeBuildInputs = [
1816 cmake
1917 gettext