Merge pull request #239412 from siraben/swiProlog-update

This commit is contained in:
Ben Siraphob 2023-06-30 08:23:48 +07:00 committed by GitHub
commit 37cf5ce1cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -34,7 +34,7 @@
}:
let
version = "8.3.29";
version = "9.1.10";
packInstall = swiplPath: pack:
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
'';
@ -47,7 +47,7 @@ stdenv.mkDerivation {
owner = "SWI-Prolog";
repo = "swipl-devel";
rev = "V${version}";
sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU=";
sha256 = "sha256-hr9cI0Ww6RfZs99iM1hFVw4sOYZFZWr8Vzv6dognCTQ=";
fetchSubmodules = true;
};

View File

@ -16945,9 +16945,7 @@ with pkgs;
swiftpm2nix = callPackage ../development/tools/swiftpm2nix { };
swiProlog = callPackage ../development/compilers/swi-prolog {
openssl = openssl_1_1;
inherit (darwin.apple_sdk.frameworks) Security;
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
swiPrologWithGui = swiProlog.override { withGui = true; };