From a2d1abe2371bfc568cde5ff0ad992e31d7c5c3ce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 11:49:43 -0300 Subject: [PATCH 01/11] trealla: nixfmt --- pkgs/by-name/tr/trealla/package.nix | 66 +++++++++++++++-------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index e125ec2b1583..002d6222d604 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -1,20 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, libffi -, openssl -, readline -, valgrind -, xxd -, gitUpdater -, checkLeaks ? false -, enableFFI ? true -, enableSSL ? true -, enableThreads ? true -, lineEditingLibrary ? "isocline" +{ + lib, + fetchFromGitHub, + gitUpdater, + libffi, + openssl, + readline, + stdenv, + valgrind, + xxd, + # Boolean flags + checkLeaks ? false, + enableFFI ? true, + enableSSL ? true, + enableThreads ? true, + # Configurable inputs + lineEditingLibrary ? "isocline", }: -assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; +assert lib.elem lineEditingLibrary [ + "isocline" + "readline" +]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; version = "2.34.0"; @@ -33,9 +39,7 @@ stdenv.mkDerivation (finalAttrs: { --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' ''; - nativeBuildInputs = [ - xxd - ]; + nativeBuildInputs = [ xxd ]; buildInputs = lib.optionals enableFFI [ libffi ] @@ -46,13 +50,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - makeFlags = [ - "GIT_VERSION=\"v${finalAttrs.version}\"" - ] - ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ] - ++ lib.optionals (!enableFFI) [ "NOFFI=1" ] - ++ lib.optionals (!enableSSL) [ "NOSSL=1" ] - ++ lib.optionals enableThreads [ "THREADS=1" ]; + makeFlags = + [ "GIT_VERSION=\"v${finalAttrs.version}\"" ] + ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ] + ++ lib.optionals (!enableFFI) [ "NOFFI=1" ] + ++ lib.optionals (!enableSSL) [ "NOSSL=1" ] + ++ lib.optionals enableThreads [ "THREADS=1" ]; enableParallelBuilding = true; @@ -64,13 +67,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !valgrind.meta.broken; - checkFlags = [ - "test" - ] ++ lib.optionals checkLeaks [ "leaks" ]; + checkFlags = [ "test" ] ++ lib.optionals checkLeaks [ "leaks" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { homepage = "https://trealla-prolog.github.io/trealla/"; @@ -88,7 +87,10 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/trealla-prolog/trealla/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ siraben AndersonTorres ]; + maintainers = with lib.maintainers; [ + siraben + AndersonTorres + ]; mainProgram = "tpl"; platforms = lib.platforms.all; broken = stdenv.isDarwin && stdenv.isx86_64; From 3b12d3ea94ee6ecd37d2a6d54e7e1ec2710b5f31 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 18:03:40 -0300 Subject: [PATCH 02/11] trealla: remove update script It is not working as expected, since r-ryantm did not update the expressions. --- pkgs/by-name/tr/trealla/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 002d6222d604..7eb6837a999b 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - gitUpdater, libffi, openssl, readline, @@ -69,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { checkFlags = [ "test" ] ++ lib.optionals checkLeaks [ "leaks" ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = { homepage = "https://trealla-prolog.github.io/trealla/"; description = "A compact, efficient Prolog interpreter written in ANSI C"; From d1af472dc04421d4c3af2ea71edc15cf8afbca9f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 20:08:42 -0300 Subject: [PATCH 03/11] trealla: add version tester --- pkgs/by-name/tr/trealla/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 7eb6837a999b..d99d5d2d51c0 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -5,6 +5,7 @@ openssl, readline, stdenv, + testers, valgrind, xxd, # Boolean flags @@ -68,6 +69,15 @@ stdenv.mkDerivation (finalAttrs: { checkFlags = [ "test" ] ++ lib.optionals checkLeaks [ "leaks" ]; + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + }; + }; + meta = { homepage = "https://trealla-prolog.github.io/trealla/"; description = "A compact, efficient Prolog interpreter written in ANSI C"; From fd42ba7511a93862efa63909cb0072a02f93d896 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 11:55:42 -0300 Subject: [PATCH 04/11] trealla: 2.34.0 -> 2.35.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index d99d5d2d51c0..06f7b5db3000 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-cqIiPeQO/M8MtpHRomN/fzxIq7TgUwZSvL3PFCVsEnY="; + hash = "sha256-vezr94hN3TcI1m/uS1PtyzcpU0vQE/ZjnvP5s7ZcSJo="; }; postPatch = '' From cb2f18d7861d96a95bafc3474ed561e617a1c9b8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 12:01:16 -0300 Subject: [PATCH 05/11] trealla: 2.35.0 -> 2.36.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 06f7b5db3000..480799ff916a 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-vezr94hN3TcI1m/uS1PtyzcpU0vQE/ZjnvP5s7ZcSJo="; + hash = "sha256-7r9e2BLa2I1+4zHFUhUBvTim3/J6rGXJdyEjN+vROuc="; }; postPatch = '' From 8ca2e68cbcd771e2436d2523642d491ee1f3056f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 12:28:50 -0300 Subject: [PATCH 06/11] trealla: 2.36.0 -> 2.37.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 480799ff916a..d4817bd86657 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-7r9e2BLa2I1+4zHFUhUBvTim3/J6rGXJdyEjN+vROuc="; + hash = "sha256-BMMziw79EAl9W6JsuAYHe7DzjG1mkT5oMgBGOKOoNqA="; }; postPatch = '' From d758da94de6ed64b4ab22afcfd743899fae6b5bc Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 12:29:39 -0300 Subject: [PATCH 07/11] trealla: 2.37.0 -> 2.38.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index d4817bd86657..2bdd79aa0921 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-BMMziw79EAl9W6JsuAYHe7DzjG1mkT5oMgBGOKOoNqA="; + hash = "sha256-/yJdStIc6EdJ4cJ3adcCO3lK0lrzy4zlYkXOsbzb5R4="; }; postPatch = '' From 9fe32398d5ccb1028d738ea33a6f2417aad1ec84 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 17:45:14 -0300 Subject: [PATCH 08/11] trealla: 2.38.0 -> 2.39.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 2bdd79aa0921..efa820c7a3c1 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-/yJdStIc6EdJ4cJ3adcCO3lK0lrzy4zlYkXOsbzb5R4="; + hash = "sha256-JheXWuswjY8rS9Ato7/6MJVUOlfqeXFiTTs1NtOb8sw="; }; postPatch = '' From 406af3f789e011ea4de6bd308ca0a8abce466e8b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 17:46:07 -0300 Subject: [PATCH 09/11] trealla: 2.39.0 -> 2.40.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index efa820c7a3c1..163e68e978d8 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.39.0"; + version = "2.40.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-JheXWuswjY8rS9Ato7/6MJVUOlfqeXFiTTs1NtOb8sw="; + hash = "sha256-gFFgmvahHHONNTSELMTiPRHo9YXGHw+CjQUfrah4NzQ="; }; postPatch = '' From 8b06c4793b62b48a110ede4bff8c92ce2e6c1a95 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 17:54:00 -0300 Subject: [PATCH 10/11] trealla: 2.40.0 -> 2.50.0 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 163e68e978d8..4390c1f5040c 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.40.0"; + version = "2.50.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-gFFgmvahHHONNTSELMTiPRHo9YXGHw+CjQUfrah4NzQ="; + hash = "sha256-DRYD5itgwGxojJMt1Pz1dUzvQTlm3OohQqgbdoA2ZJI="; }; postPatch = '' From 3331d1ec2647f7267969ec5fb7b7b8b930219317 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 May 2024 18:02:29 -0300 Subject: [PATCH 11/11] trealla: 2.50.0 -> 2.52.6 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 4390c1f5040c..64344c770923 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.50.0"; + version = "2.52.6"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-DRYD5itgwGxojJMt1Pz1dUzvQTlm3OohQqgbdoA2ZJI="; + hash = "sha256-JTyXpaoHpf10fUNxx+qllhS0D9rfOP64BpjLQ9bob8k="; }; postPatch = ''