From 117d6362c25e3a6f9fcd5ac45207f66dde51ad5c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 31 Jul 2024 23:11:35 -0300 Subject: [PATCH 1/5] zchunk: migrate to by-name --- .../zchunk/default.nix => by-name/zc/zchunk/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/zchunk/default.nix => by-name/zc/zchunk/package.nix} (100%) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/by-name/zc/zchunk/package.nix similarity index 100% rename from pkgs/development/libraries/zchunk/default.nix rename to pkgs/by-name/zc/zchunk/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 797047833e74..5eac38a472ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24622,8 +24622,6 @@ with pkgs; yyjson = callPackage ../development/libraries/yyjson { }; - zchunk = callPackage ../development/libraries/zchunk { }; - zeitgeist = callPackage ../development/libraries/zeitgeist { }; zlib = callPackage ../development/libraries/zlib { }; From 86df4432f403293805bebb1d8c1a827a28f8723f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 31 Jul 2024 23:37:38 -0300 Subject: [PATCH 2/5] zchunk: nixfmt-rfc-style --- pkgs/by-name/zc/zchunk/package.nix | 44 +++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix index dd35961d085f..0e9cfc9904be 100644 --- a/pkgs/by-name/zc/zchunk/package.nix +++ b/pkgs/by-name/zc/zchunk/package.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, argp-standalone -, curl -, meson -, ninja -, pkg-config -, zstd +{ + lib, + argp-standalone, + curl, + fetchFromGitHub, + meson, + ninja, + pkg-config, + stdenv, + zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zchunk"; version = "1.4.0"; src = fetchFromGitHub { owner = "zchunk"; - repo = pname; - rev = version; + repo = "zchunk"; + rev = finalAttrs.version; hash = "sha256-GiZM8Jh+v0US8xr90rySY0Ud3eAAl8UqLi162zDR3qw="; }; @@ -29,11 +30,16 @@ stdenv.mkDerivation rec { buildInputs = [ curl zstd - ] ++ lib.optional stdenv.isDarwin argp-standalone; + ] ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; - outputs = [ "out" "lib" "dev" ]; + outputs = [ + "out" + "dev" + "lib" + ]; - meta = with lib; { + + meta = { homepage = "https://github.com/zchunk/zchunk"; description = "File format designed for highly efficient deltas while maintaining good compression"; longDescription = '' @@ -44,8 +50,8 @@ stdenv.mkDerivation rec { zchunk files are protected with strong checksums to verify that the file you downloaded is, in fact, the file you wanted. ''; - license = licenses.bsd2; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From bb5c5eb3b021e3fdadbdfb4ac4404593866ae886 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 31 Jul 2024 23:48:16 -0300 Subject: [PATCH 3/5] zchunk: rework - man output - strictDeps - updater - meta.mainProgram --- pkgs/by-name/zc/zchunk/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix index 0e9cfc9904be..a7718cebda58 100644 --- a/pkgs/by-name/zc/zchunk/package.nix +++ b/pkgs/by-name/zc/zchunk/package.nix @@ -3,6 +3,7 @@ argp-standalone, curl, fetchFromGitHub, + gitUpdater, meson, ninja, pkg-config, @@ -36,8 +37,14 @@ stdenv.mkDerivation (finalAttrs: { "out" "dev" "lib" + "man" ]; + strictDeps = true; + + passthru = { + updateScript = gitUpdater { }; + }; meta = { homepage = "https://github.com/zchunk/zchunk"; @@ -51,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { you downloaded is, in fact, the file you wanted. ''; license = lib.licenses.bsd2; + mainProgram = "zck"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; From 8ee5cd86fa7e9c1d6ae37918513c9238238b8625 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 31 Jul 2024 23:53:53 -0300 Subject: [PATCH 4/5] zchunk: add version test --- pkgs/by-name/zc/zchunk/package.nix | 5 +++++ pkgs/by-name/zc/zchunk/tests/version.nix | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/by-name/zc/zchunk/tests/version.nix diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix index a7718cebda58..37ec2f3d53db 100644 --- a/pkgs/by-name/zc/zchunk/package.nix +++ b/pkgs/by-name/zc/zchunk/package.nix @@ -1,6 +1,7 @@ { lib, argp-standalone, + callPackage, curl, fetchFromGitHub, gitUpdater, @@ -44,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gitUpdater { }; + tests = lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ./tests; + }; }; meta = { diff --git a/pkgs/by-name/zc/zchunk/tests/version.nix b/pkgs/by-name/zc/zchunk/tests/version.nix new file mode 100644 index 000000000000..936faace2dd4 --- /dev/null +++ b/pkgs/by-name/zc/zchunk/tests/version.nix @@ -0,0 +1,6 @@ +{ testers, zchunk }: + +testers.testVersion { + package = zchunk; + command = "zck --version"; +} From 7b3df1d53b90330dc6d46b6bb8092bc5104cb5e8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 31 Jul 2024 23:56:29 -0300 Subject: [PATCH 5/5] zchunk: 1.4.0 -> 1.5.1 Co-authored-by: R. RyanTM --- pkgs/by-name/zc/zchunk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix index 37ec2f3d53db..0e7df32c08a9 100644 --- a/pkgs/by-name/zc/zchunk/package.nix +++ b/pkgs/by-name/zc/zchunk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zchunk"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "zchunk"; repo = "zchunk"; rev = finalAttrs.version; - hash = "sha256-GiZM8Jh+v0US8xr90rySY0Ud3eAAl8UqLi162zDR3qw="; + hash = "sha256-X8qywx55TUVEOfYJMV5ARwyUdMjmN4hTmJQ6Upq5zyI="; }; nativeBuildInputs = [