mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
Merge pull request #283550 from atorres1985-contrib/trealla
trealla: 2.32.13 -> 2.34.0
This commit is contained in:
commit
3bbdce5d83
@ -17,13 +17,13 @@
|
||||
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.32.13";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Meyy6muzJt/Lg76sa+nwZXCOhfeMTwO4VYTXO/o20XI=";
|
||||
hash = "sha256-cqIiPeQO/M8MtpHRomN/fzxIq7TgUwZSvL3PFCVsEnY=";
|
||||
};
|
||||
|
||||
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";
|
||||
|
Loading…
Reference in New Issue
Block a user