From 3c65622fc5b87b24975f649ce4c2d474fdcb392c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Feb 2020 03:07:04 +0100
Subject: [PATCH] =?UTF-8?q?librepo:=201.9.2=20=E2=86=92=201.11.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update
    Changes: https://github.com/rpm-software-management/librepo/compare/1.9.2...1.11.2
* Split into multiple outputs
* Default to Python 3 like upstream does
---
 .../package-management/librepo/default.nix     | 12 ++++++++++--
 pkgs/top-level/all-packages.nix                |  4 +++-
 pkgs/top-level/python-packages.nix             | 18 +++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 83af8307c75..69821ca5136 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -6,20 +6,23 @@
 , libxml2
 , glib
 , openssl
+, zchunk
 , curl
 , check
 , gpgme
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.9.2";
+  version = "1.11.2";
   pname = "librepo";
 
+  outputs = [ "out" "dev" "py" ];
+
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "librepo";
     rev = version;
-    sha256 = "0xa9ng9mhpianhjy2a0jnj8ha1zckk2sz91y910daggm1qcv5asx";
+    sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw";
   };
 
   nativeBuildInputs = [
@@ -32,6 +35,7 @@ stdenv.mkDerivation rec {
     libxml2
     glib
     openssl
+    zchunk
     curl
     check
     gpgme
@@ -48,6 +52,10 @@ stdenv.mkDerivation rec {
     "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
   ];
 
+  postFixup = ''
+    moveToOutput "lib/${python.libPrefix}" "$py"
+  '';
+
   meta = with stdenv.lib; {
     description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
     homepage = "https://rpm-software-management.github.io/librepo/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd06de5dbaf..e54e0102e44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12667,7 +12667,9 @@ in
 
   librelp = callPackage ../development/libraries/librelp { };
 
-  librepo = callPackage ../tools/package-management/librepo { };
+  librepo = callPackage ../tools/package-management/librepo {
+    python = python3;
+  };
 
   libresample = callPackage ../development/libraries/libresample {};
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 955cd768c4e..74182d10c48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4006,9 +4006,21 @@ in {
 
   libkeepass = callPackage ../development/python-modules/libkeepass { };
 
-  librepo = toPythonModule (pkgs.librepo.override {
-    inherit python;
-  });
+  librepo = pipe pkgs.librepo [
+    toPythonModule
+
+    (p: p.overrideAttrs (super: {
+      meta = super.meta // {
+        outputsToInstall = [ "py" ];
+      };
+    }))
+
+    (p: p.override {
+      inherit python;
+    })
+
+    (p: p.py)
+  ];
 
   libnacl = callPackage ../development/python-modules/libnacl {
     inherit (pkgs) libsodium;