From 2393e9d763cb0a0c5ee0241d6c052b147c29c4b2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 19 Aug 2023 20:10:20 -0300 Subject: [PATCH 1/3] trealla: 2.23.35 -> 2.23.48 - Set strictDeps - checkInputs -> nativeCheckInputs --- pkgs/development/interpreters/trealla/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 2fc3da05786b..336960860597 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -16,13 +16,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.23.35"; + version = "2.23.48"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-yCVBjxO9tEKlyWo6RlK4EdyUxCkxp0z2EzJ2np0xOUU="; + hash = "sha256-uL8nRVzb/PxrVvIQYRUkePTZIM8DBnc8eAU/2yfDNuQ="; }; postPatch = '' @@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableSSL openssl ++ lib.optional (lineEditingLibrary == "readline") readline; - checkInputs = lib.optionals finalAttrs.doCheck [ valgrind ]; + nativeCheckInputs = lib.optionals finalAttrs.doCheck [ valgrind ]; - dontConfigure = true; + strictDeps = true; makeFlags = [ "GIT_VERSION=\"v${finalAttrs.version}\"" @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { "test" ] ++ lib.optional checkLeaks "leaks"; - meta = { + meta = { homepage = "https://trealla-prolog.github.io/trealla/"; description = "A compact, efficient Prolog interpreter written in ANSI C"; longDescription = '' From 25575ae935c01e883fe77b716fe4ad0ca58c1927 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 19 Aug 2023 21:00:31 -0300 Subject: [PATCH 2/3] trealla: 2.23.48 -> 2.24.0 - Set line editing library to isocline by default - Set passthru.updateScript --- pkgs/development/interpreters/trealla/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 336960860597..05ac612d9774 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -6,23 +6,24 @@ , readline , valgrind , xxd +, gitUpdater , checkLeaks ? false , enableFFI ? true , enableSSL ? true , enableThreads ? true -, lineEditingLibrary ? "readline" +, lineEditingLibrary ? "isocline" }: assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.23.48"; + version = "2.24.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-uL8nRVzb/PxrVvIQYRUkePTZIM8DBnc8eAU/2yfDNuQ="; + hash = "sha256-2VjghmQuOkPW335ryIZRSdOnYYhdJDacJ97TCizcVJ0="; }; postPatch = '' @@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { "test" ] ++ lib.optional checkLeaks "leaks"; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://trealla-prolog.github.io/trealla/"; description = "A compact, efficient Prolog interpreter written in ANSI C"; From 69f8e0853a6e114ba599ecfa2a738ec679c3b408 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 19 Aug 2023 21:13:39 -0300 Subject: [PATCH 3/3] trealla: 2.24.0 -> 2.24.21 --- pkgs/development/interpreters/trealla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 05ac612d9774..4c04940470e0 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.24.0"; + version = "2.24.21"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-2VjghmQuOkPW335ryIZRSdOnYYhdJDacJ97TCizcVJ0="; + hash = "sha256-zpHdZiDtNcQko+gn92fiGWSvYT4aQ4t6nYFwf6zu0cA="; }; postPatch = ''