Unverified Commit e35a60ee authored by Paul Meyer's avatar Paul Meyer Committed by GitHub
Browse files

dnf-plugins-core: 4.9.0 -> 4.10.0 (#355641)

parents 45c94f97 8d24c9c0

pkgs/development/python-modules/dnf-plugins-core/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ in 


buildPythonPackage rec {

  pname = "dnf-plugins-core";

  version = "4.9.0";

  version = "4.10.0";

  format = "other";



  outputs = [
@@ -35,18 +35,15 @@ buildPythonPackage rec { 
    owner = "rpm-software-management";

    repo = "dnf-plugins-core";

    rev = "refs/tags/${version}";

    hash = "sha256-MQ7QZ5qn/0OU0slohwEP83w8NvSP2M+hpCDKvYqlezY=";

    hash = "sha256-7MPCLnclRT07m6CrGguDxSB+sIybp4tMcExU9+Sz9EM=";

  };



  patches = [ ./fix-python-install-dir.patch ];



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" \

      --replace "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \

      --replace "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system"

      --replace-fail "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \

      --replace-fail "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system"

    substituteInPlace doc/CMakeLists.txt \

      --replace 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"'

      --replace-fail 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"'

  '';



  nativeBuildInputs = [
@@ -68,6 +65,7 @@ buildPythonPackage rec { 
  cmakeFlags = [

    "-DPYTHON_DESIRED=${pyMajor}"

    "-DWITHOUT_LOCAL=0"

    "-DPYTHON_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"

  ];



  postBuild = ''

pkgs/development/python-modules/dnf-plugins-core/fix-python-install-dir.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index a1eea7b..00fbaf3 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -18,7 +18,7 @@ ELSE ()

     MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED})

 ENDIF()



-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)

+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")

 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")



 SET (SYSCONFDIR /etc)