From 85dd909bbdad6687c53de587e1b4f8778f127512 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 24 Jan 2024 12:18:00 -0300 Subject: [PATCH 1/2] trealla: 2.32.13 -> 2.33.0 --- pkgs/by-name/tr/trealla/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 44ae8b7775b4..4306b704104b 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.32.13"; + version = "2.33.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-Meyy6muzJt/Lg76sa+nwZXCOhfeMTwO4VYTXO/o20XI="; + hash = "sha256-IMvxoDh7B/EgtzFwImzM81ps2WWxg6Z29ZhdEKocSFg="; }; postPatch = '' @@ -38,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - lib.optional enableFFI libffi - ++ lib.optional enableSSL openssl - ++ lib.optional (lineEditingLibrary == "readline") readline; + lib.optionals enableFFI [ libffi ] + ++ lib.optionals enableSSL [ openssl ] + ++ lib.optionals (lineEditingLibrary == "readline") [ readline ]; nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [ valgrind ]; @@ -49,10 +49,10 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "GIT_VERSION=\"v${finalAttrs.version}\"" ] - ++ lib.optional (lineEditingLibrary == "isocline") "ISOCLINE=1" - ++ lib.optional (!enableFFI) "NOFFI=1" - ++ lib.optional (!enableSSL) "NOSSL=1" - ++ lib.optional enableThreads "THREADS=1"; + ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ] + ++ lib.optionals (!enableFFI) [ "NOFFI=1" ] + ++ lib.optionals (!enableSSL) [ "NOSSL=1" ] + ++ lib.optionals enableThreads [ "THREADS=1" ]; enableParallelBuilding = true; @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { checkFlags = [ "test" - ] ++ lib.optional checkLeaks "leaks"; + ] ++ lib.optionals checkLeaks [ "leaks" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; From 681c0c0f8d0213a17227ce71745457b8fa15f279 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 24 Jan 2024 12:20:13 -0300 Subject: [PATCH 2/2] trealla: 2.33.0 -> 2.34.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 4306b704104b..e125ec2b1583 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-IMvxoDh7B/EgtzFwImzM81ps2WWxg6Z29ZhdEKocSFg="; + hash = "sha256-cqIiPeQO/M8MtpHRomN/fzxIq7TgUwZSvL3PFCVsEnY="; }; postPatch = ''