createrepo_c: 0.11.1 -> 0.17.1
This commit is contained in:
parent
0c2ad9135f
commit
852b4e9018
|
@ -1,18 +1,22 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm
|
||||
, openssl, sqlite, file, xz, pcre, bash-completion, zstd, zchunk, libmodulemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "createrepo_c";
|
||||
version = "0.11.1";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = "createrepo_c";
|
||||
rev = version;
|
||||
sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6";
|
||||
sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use the output directory to install the bash completions.
|
||||
./fix-bash-completion-path.patch
|
||||
# Use the output directory to install the python modules.
|
||||
./fix-python-install-path.patch
|
||||
];
|
||||
|
||||
|
@ -23,15 +27,15 @@ stdenv.mkDerivation rec {
|
|||
--replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config rpm ];
|
||||
|
||||
buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ];
|
||||
buildInputs = [ bzip2 expat glib curl libxml2 python3 openssl sqlite file xz pcre bash-completion zstd zchunk libmodulemd ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C implementation of createrepo";
|
||||
homepage = "http://rpm-software-management.github.io/createrepo_c/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://rpm-software-management.github.io/createrepo_c/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100
|
||||
+++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON)
|
||||
IF (ENABLE_BASHCOMP)
|
||||
pkg_check_modules(BASHCOMP bash-completion)
|
||||
if (BASHCOMP_FOUND)
|
||||
IF (BASHCOMP_FOUND)
|
||||
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
|
||||
message("Bash completion directory: ${BASHCOMP_DIR}")
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100
|
||||
+++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
|
||||
endif()
|
||||
--- a/src/python/CMakeLists.txt
|
||||
+++ b/src/python/CMakeLists.txt
|
||||
@@ -14,7 +14,7 @@ if (NOT SKBUILD)
|
||||
FIND_PACKAGE(PythonLibs 3 REQUIRED)
|
||||
endif (NOT SKBUILD)
|
||||
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
|
||||
|
|
Loading…
Reference in a new issue