swi-prolog: rename from swiProlog

This commit is contained in:
Maren van Otterdijk 2024-09-07 16:08:48 +02:00
parent b4eba969b0
commit 2e951824d9
5 changed files with 9 additions and 7 deletions

View File

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

View File

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

View File

@ -54,7 +54,7 @@
# url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz"; # url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz";
# sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3"; # 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 # julian delay list_util typedef
# ]; }; # ]; };
, extraPacks ? [] , extraPacks ? []

View File

@ -1471,6 +1471,8 @@ mapAliases ({
StormLib = stormlib; # Added 2024-01-21 StormLib = stormlib; # Added 2024-01-21
sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 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 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 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 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 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23

View File

@ -16222,10 +16222,10 @@ with pkgs;
swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { });
inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix; 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; 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_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ; tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ;