Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

librepo: 1.9.2 -> 1.11.2, zchunk #78041

Closed
wants to merge 2 commits into from
Closed

librepo: 1.9.2 -> 1.11.2, zchunk #78041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e70c868
zchunk: init at 1.1.5
dtzWill Jan 19, 2020
b46edad
librepo: 1.9.2 -> 1.11.2
dtzWill Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions pkgs/tools/compression/zchunk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, curl, openssl, zstd, argp-standalone }:

stdenv.mkDerivation rec {
pname = "zchunk";
version = "1.1.5";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "13sqjslk634mkklnmzdlzk9l9rc6g6migig5rln3irdnjrxvjf69";
};

patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/void-linux/void-packages/5aa57003367c31a6ced50a0fa144a2a3bd71b045/srcpkgs/zchunk/patches/001-musl.patch";
sha256 = "0dzchagcw67c02ns796savyadbhmc484wfr6kayql1w7b0i25mdz";
extraPrefix = "";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/void-linux/void-packages/5aa57003367c31a6ced50a0fa144a2a3bd71b045/srcpkgs/zchunk/patches/002-musl.patch";
sha256 = "0f62q0cc144k9jd9lnf0b185szcl153gh9qg6jfximb46x99hvf4";
extraPrefix = "";
})
];

outputs = [ "out" "dev" ];

nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ curl openssl zstd ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl argp-standalone;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-largp";

doCheck = true;

meta = with stdenv.lib; {
description = "Easy-to-delta, compressed file format";
license = licenses.bsd2;
homepage = "https://github.com/zchunk/zchunk";
maintainers = with maintainers; [ dtzWill ];
};
}
8 changes: 4 additions & 4 deletions pkgs/tools/package-management/librepo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, libxml2, glib, openssl, curl, check, gpgme }:
{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, libxml2, glib, openssl, curl, check, gpgme, zchunk }:

stdenv.mkDerivation rec {
version = "1.9.2";
version = "1.11.2";
pname = "librepo";

src = fetchFromGitHub {
owner = "rpm-software-management";
repo = "librepo";
rev = version;
sha256 = "0xa9ng9mhpianhjy2a0jnj8ha1zckk2sz91y910daggm1qcv5asx";
sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw";
};

nativeBuildInputs = [ cmake pkgconfig ];

cmakeFlags = ["-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ];

buildInputs = [ python libxml2 glib openssl curl check gpgme ];
buildInputs = [ python libxml2 glib openssl curl check gpgme zchunk ];

# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
propagatedBuildInputs = [ curl gpgme libxml2 ];
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7534,6 +7534,8 @@ in

zbar = libsForQt5.callPackage ../tools/graphics/zbar { };

zchunk = callPackage ../tools/compression/zchunk { };

zdelta = callPackage ../tools/compression/zdelta { };

zerotierone = callPackage ../tools/networking/zerotierone { };
Expand Down