diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-10 12:57:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-10 12:57:19 -0500 |
commit | 09f7e376c224993e82828766bf524f0b34ad312e (patch) | |
tree | 61784455f0f29158fc189e8595d3ab37e83391d8 /pkgs/tools/package-management | |
parent | eaeb87add1ec31b3b088b65aa601b3c4f6d78e51 (diff) | |
parent | e3cbebfc7c656c50e4506bcc5d21d909fad8c22f (diff) | |
download | nixlib-09f7e376c224993e82828766bf524f0b34ad312e.tar nixlib-09f7e376c224993e82828766bf524f0b34ad312e.tar.gz nixlib-09f7e376c224993e82828766bf524f0b34ad312e.tar.bz2 nixlib-09f7e376c224993e82828766bf524f0b34ad312e.tar.lz nixlib-09f7e376c224993e82828766bf524f0b34ad312e.tar.xz nixlib-09f7e376c224993e82828766bf524f0b34ad312e.tar.zst nixlib-09f7e376c224993e82828766bf524f0b34ad312e.zip |
Merge pull request #79416 from jtojnar/flatpak-1.6
flatpak: 1.4.2 → 1.6.1
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/librepo/default.nix | 64 |
1 files changed, 50 insertions, 14 deletions
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 61435cee284d..69821ca51366 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,30 +1,66 @@ -{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, libxml2, glib, openssl, curl, check, gpgme }: +{ stdenv +, fetchFromGitHub +, cmake +, python +, pkgconfig +, 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"; + owner = "rpm-software-management"; + repo = "librepo"; + rev = version; + sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - - cmakeFlags = ["-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; - buildInputs = [ python libxml2 glib openssl curl check gpgme ]; + buildInputs = [ + python + libxml2 + glib + openssl + zchunk + curl + check + gpgme + ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here - propagatedBuildInputs = [ curl gpgme libxml2 ]; + propagatedBuildInputs = [ + curl + gpgme + libxml2 + ]; + + cmakeFlags = [ + "-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/; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = "https://rpm-software-management.github.io/librepo/"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } |