diff options
| author | Marc Seeger <mseeger@fb.com> | 2021-04-27 10:28:33 -0700 |
|---|---|---|
| committer | Marc Seeger <mseeger@fb.com> | 2021-04-27 10:47:35 -0700 |
| commit | 91ba4016a05a63c394eea5b6aac3a3f9c562f6f2 (patch) | |
| tree | 8c8f8e495b5b250c432124163f68980546183996 /pkgs/tools/package-management | |
| parent | 34463b2e3875fade97b61180b7676654ddad49fe (diff) | |
| download | nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.tar nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.tar.gz nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.tar.bz2 nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.tar.lz nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.tar.xz nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.tar.zst nixpkgs-91ba4016a05a63c394eea5b6aac3a3f9c562f6f2.zip | |
libdnf: 0.60.0 -> 0.61.1
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/libdnf/darwin.patch | 57 | ||||
| -rw-r--r-- | pkgs/tools/package-management/libdnf/default.nix | 6 |
2 files changed, 2 insertions, 61 deletions
diff --git a/pkgs/tools/package-management/libdnf/darwin.patch b/pkgs/tools/package-management/libdnf/darwin.patch deleted file mode 100644 index 53f2c04f9ef..00000000000 --- a/pkgs/tools/package-management/libdnf/darwin.patch +++ /dev/null @@ -1,57 +0,0 @@ -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> - #include <fcntl.h> --#include <linux/limits.h> -+#include <limits.h> - #include <pwd.h> - #include <unistd.h> - #include <stdio.h> -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> - #include <sys/stat.h> --#include <sys/auxv.h> -+ -+// Darwin compatibility hacks -+typedef int auxv_t; -+#ifndef AT_HWCAP2 -+#define AT_HWCAP2 26 -+#endif -+#ifndef AT_HWCAP -+#define AT_HWCAP 16 -+#endif -+static unsigned long getauxval(unsigned long type) -+{ -+ unsigned long ret = 0; -+ return ret; -+} - - // hawkey - #include "dnf-types.h" diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 5d4a0716cc7..446761cca1d 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,17 +3,15 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.60.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s="; + sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc="; }; - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; - nativeBuildInputs = [ cmake gettext |