From a1623ab7516cc90d97b1509ebbf0397244b26d30 Mon Sep 17 00:00:00 2001 From: kyehn Date: Mon, 8 Sep 2025 19:45:49 +0800 Subject: [PATCH 1/2] tinycdb: 0.80 -> 0.81 --- pkgs/by-name/ti/tinycdb/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ti/tinycdb/package.nix b/pkgs/by-name/ti/tinycdb/package.nix index 3612958ea36d..415960152764 100644 --- a/pkgs/by-name/ti/tinycdb/package.nix +++ b/pkgs/by-name/ti/tinycdb/package.nix @@ -12,12 +12,12 @@ let ar = if !isCross then "ar" else "${cross}-ar"; ranlib = if !isCross then "ranlib" else "${cross}-ranlib"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i 's,set --, set -x; set --,' Makefile ''; pname = "tinycdb"; - version = "0.80"; + version = "0.81"; # In general, static library (.a) goes to "dev", shared (.so) to # "lib". In case of static build, there is no .so library, so "lib" # output is useless and empty. @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $dev/lib $out/bin mv $out/lib/libcdb.a $dev/lib - rmdir $out/lib + rm --recursive $out/lib '' + ( if static then @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { ); src = fetchurl { - url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-wyG5BekCwsqZo/+Kjd39iCMkf+Ht7IpLuF+Dhpxjn7g="; + url = "https://www.corpit.ru/mjt/tinycdb/tinycdb-${finalAttrs.version}.tar.gz"; + hash = "sha256-Rp3i1EW/VIgPZS9LbclcfN9vVQLDVSSkWyEi1w1H68I="; }; meta = with lib; { @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; platforms = platforms.linux; }; -} +}) From ac07f6aa8e8f3844bcde16d395682c6e4432a016 Mon Sep 17 00:00:00 2001 From: kyehn Date: Mon, 8 Sep 2025 19:46:22 +0800 Subject: [PATCH 2/2] tinycdb: remove with lib --- pkgs/by-name/ti/tinycdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinycdb/package.nix b/pkgs/by-name/ti/tinycdb/package.nix index 415960152764..703fdd45597e 100644 --- a/pkgs/by-name/ti/tinycdb/package.nix +++ b/pkgs/by-name/ti/tinycdb/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Rp3i1EW/VIgPZS9LbclcfN9vVQLDVSSkWyEi1w1H68I="; }; - meta = with lib; { + meta = { description = "Utility to manipulate constant databases (cdb)"; mainProgram = "cdb"; @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.corpit.ru/mjt/tinycdb.html"; - license = licenses.publicDomain; - platforms = platforms.linux; + license = lib.licenses.publicDomain; + platforms = lib.platforms.linux; }; })