JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swi-prolog: rename from swiProlog, 9.2.6 -> 9.2.7, fix extraPacks (#340314)

Browse Source
This commit is contained in:
Fabián Heredia Montiel 2024-09-29 18:06:36 -06:00 committed by GitHub
commit fe370c252d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/ape/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, swiProlog, makeWrapper,
{ lib, stdenv, swi-prolog, makeWrapper,
fetchFromGitHub,
lexiconPath ? "prolog/lexicon/clex_lexicon.pl",
pname ? "ape",
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "2019-08-10";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ swiProlog ];
buildInputs = [ swi-prolog ];
src = fetchFromGitHub {
owner = "Attempto";

4
pkgs/development/compilers/pakcs/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeWrapper
, haskellPackages, haskell
, which, swiProlog, rlwrap, tk
, which, swi-prolog, rlwrap, tk
, curl, git, unzip, gnutar, coreutils, sqlite }:
let
@ -26,7 +26,7 @@ let
in stdenv.mkDerivation {
inherit pname version src;
buildInputs = [ swiProlog ];
buildInputs = [ swi-prolog ];
nativeBuildInputs = [ which makeWrapper ];
makeFlags = [

8
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -54,7 +54,7 @@
# url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz";
# sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3";
# };
# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [
# swi-prolog = pkgs.swi-prolog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [
# julian delay list_util typedef
# ]; };
, extraPacks ? []
@ -63,7 +63,7 @@
let
# minorVersion is even for stable, odd for unstable
version = "9.2.6";
version = "9.2.7";
# This package provides several with* options, which replaces the old extraLibraries option.
# This error should help users that still use this option find their way to these flags.
@ -72,7 +72,7 @@ let
"option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies";
packInstall = swiplPath: pack:
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false)])." -t "halt."
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt."
'';
withGui' = withGui && !stdenv.hostPlatform.isDarwin;
optionalDependencies = []
@ -99,7 +99,7 @@ stdenv.mkDerivation {
owner = "SWI-Prolog";
repo = "swipl";
rev = "V${version}";
hash = "sha256-FgEn+Ht45++GFpfcdaJ5In5x+NyIOopSlSAs+t7sPDE=";
hash = "sha256-O9ogltcbBST111FA85jEVW6jGOLJSt/5PeBABtMu2Ws=";
fetchSubmodules = true;
};

2
pkgs/top-level/aliases.nix
View File

@ -1512,6 +1512,8 @@ mapAliases {
StormLib = stormlib; # Added 2024-01-21
sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22
swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07
swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06
swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23

4
pkgs/top-level/all-packages.nix
View File

@ -15972,10 +15972,10 @@ with pkgs;
swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { });
inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix;
swiProlog = callPackage ../development/compilers/swi-prolog {
swi-prolog = callPackage ../development/compilers/swi-prolog {
inherit (darwin.apple_sdk.frameworks) Security;
};
swiPrologWithGui = swiProlog.override { withGui = true; };
swi-prolog-gui = swi-prolog.override { withGui = true; };
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ;