public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librepo: 1.9.2 → 1.11.2

Browse Source 
* 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
This commit is contained in:
Jan Tojnar 2020-02-08 03:07:04 +01:00 committed by worldofpeace
parent 0e651ce7fa
commit 3c65622fc5
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/package-management/librepo/default.nix
View File

@ -6,20 +6,23 @@
, libxml2 , libxml2
, glib , glib
, openssl , openssl
, zchunk
, curl , curl
, check , check
, gpgme , gpgme
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.9.2"; version = "1.11.2";
pname = "librepo"; pname = "librepo";
outputs = [ "out" "dev" "py" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rpm-software-management"; owner = "rpm-software-management";
repo = "librepo"; repo = "librepo";
rev = version; rev = version;
sha256 = "0xa9ng9mhpianhjy2a0jnj8ha1zckk2sz91y910daggm1qcv5asx"; sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,6 +35,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
glib glib
openssl openssl
zchunk
curl curl
check check
gpgme gpgme
@ -48,6 +52,10 @@ stdenv.mkDerivation rec {
"-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
]; ];
postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
homepage = "https://rpm-software-management.github.io/librepo/"; homepage = "https://rpm-software-management.github.io/librepo/";

4
pkgs/top-level/all-packages.nix
View File

@ -12667,7 +12667,9 @@ in
librelp = callPackage ../development/libraries/librelp { }; librelp = callPackage ../development/libraries/librelp { };
librepo = callPackage ../tools/package-management/librepo { }; librepo = callPackage ../tools/package-management/librepo {
python = python3;
};
libresample = callPackage ../development/libraries/libresample {}; libresample = callPackage ../development/libraries/libresample {};

18
pkgs/top-level/python-packages.nix
View File

@ -4006,9 +4006,21 @@ in {
libkeepass = callPackage ../development/python-modules/libkeepass { }; libkeepass = callPackage ../development/python-modules/libkeepass { };
librepo = toPythonModule (pkgs.librepo.override { librepo = pipe pkgs.librepo [
inherit python; toPythonModule
});
(p: p.overrideAttrs (super: {
meta = super.meta // {
outputsToInstall = [ "py" ];
};
}))
(p: p.override {
inherit python;
})
(p: p.py)
];
libnacl = callPackage ../development/python-modules/libnacl { libnacl = callPackage ../development/python-modules/libnacl {
inherit (pkgs) libsodium; inherit (pkgs) libsodium;