mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 09:02:46 +00:00
Code Issues Wiki Activity

createrepo_c: 0.11.1 -> 0.17.1

Browse source
This commit is contained in:
Maisem Ali 2021-04-30 23:09:59 -07:00 committed by Jonathan Ringer
parent 0c2ad9135f
commit 852b4e9018
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/package-management/createrepo_c/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "createrepo_c"; pname = "createrepo_c";
version = "0.11.1"; version = "0.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rpm-software-management"; owner = "rpm-software-management";
repo = "createrepo_c"; repo = "createrepo_c";
rev = version; rev = version;
sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6"; sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q=";
}; };
patches = [ patches = [
# Use the output directory to install the bash completions.
./fix-bash-completion-path.patch ./fix-bash-completion-path.patch
# Use the output directory to install the python modules.
./fix-python-install-path.patch ./fix-python-install-path.patch
]; ];
@ -23,15 +27,15 @@ stdenv.mkDerivation rec {
--replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}" --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; { meta = with lib; {
description = "C implementation of createrepo"; description = "C implementation of createrepo";
homepage = "http://rpm-software-management.github.io/createrepo_c/"; homepage = "https://rpm-software-management.github.io/createrepo_c/";
license = licenses.gpl2; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ]; maintainers = with maintainers; [ copumpkin ];
}; };
} }

22
pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
View file

@ -1,11 +1,11 @@
--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100 --- a/CMakeLists.txt
+++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100 +++ b/CMakeLists.txt
@@ -100,7 +100,7 @@ @@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON)
IF (ENABLE_BASHCOMP)
pkg_check_modules(BASHCOMP bash-completion) 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) - execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") + SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
message("Bash completion directory: ${BASHCOMP_DIR}") message("Bash completion directory: ${BASHCOMP_DIR}")
INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
INSTALL(CODE " INSTALL(CODE "

14
pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
View file

@ -1,11 +1,11 @@
--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100 --- a/src/python/CMakeLists.txt
+++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100 +++ b/src/python/CMakeLists.txt
@@ -19,7 +19,7 @@ @@ -14,7 +14,7 @@ if (NOT SKBUILD)
FIND_PACKAGE(PythonInterp 3.0 REQUIRED) FIND_PACKAGE(PythonLibs 3 REQUIRED)
endif() 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) -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@") +SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")