From 2e951824d909ba2c0625650879c279fcb5f0b861 Mon Sep 17 00:00:00 2001 From: Maren van Otterdijk Date: Sat, 7 Sep 2024 16:08:48 +0200 Subject: [PATCH 1/3] swi-prolog: rename from swiProlog --- pkgs/applications/misc/ape/default.nix | 4 ++-- pkgs/development/compilers/pakcs/default.nix | 4 ++-- pkgs/development/compilers/swi-prolog/default.nix | 2 +- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index 30911d6380fe9..598ad82c1e35f 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -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"; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 768d125cfff47..8241d8580e54b 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -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 = [ diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 628e69eb5bc9a..99f2eee15bfd6 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -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 ? [] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fd656feba7ae5..290b07c5b11c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1471,6 +1471,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d506b2c03ad..6273a13440295 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16222,10 +16222,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 { } ; From 52057458d2ea325e79a3b84941a98d640d7961e4 Mon Sep 17 00:00:00 2001 From: Maren van Otterdijk Date: Sat, 7 Sep 2024 16:11:09 +0200 Subject: [PATCH 2/3] swi-prolog: 9.2.6 -> 9.2.7 --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 99f2eee15bfd6..56932f5d35958 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -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. @@ -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; }; From f6c72271415dc39f6044e57c65b8c0c7e3fe8bf9 Mon Sep 17 00:00:00 2001 From: Maren van Otterdijk Date: Sat, 7 Sep 2024 16:17:27 +0200 Subject: [PATCH 3/3] swi-prolog: prevent git from running during extraPacks install --- pkgs/development/compilers/swi-prolog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 56932f5d35958..31bfd5a5bab41 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -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.isDarwin; optionalDependencies = []