Merge pull request #70720 from yrashk/swipl-8.1.15
swipl: 8.1.4 -> 8.1.15
This commit is contained in:
commit
a388e920f3
@ -4,13 +4,13 @@
|
|||||||
, curl, git, unzip, gnutar, coreutils, sqlite }:
|
, curl, git, unzip, gnutar, coreutils, sqlite }:
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "pakcs-2.1.1";
|
name = "pakcs-2.1.2";
|
||||||
|
|
||||||
# Don't switch to development release without a reason, because its
|
# Don't switch to development release without a reason, because its
|
||||||
# source updates without version bump. Prefer current release instead.
|
# source updates without version bump. Prefer current release instead.
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
|
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
|
||||||
sha256 = "112v9ynqfbbm4x770mcfrai9v5bh7c3zn7jka80pv6v4y65r778c";
|
sha256 = "0i0nprli3knc7zlp5qkqkpiq3ny36v52hnvgph376l3ajjds7wf6";
|
||||||
};
|
};
|
||||||
|
|
||||||
curry-frontend = (haskellPackages.override {
|
curry-frontend = (haskellPackages.override {
|
||||||
@ -43,9 +43,14 @@ in stdenv.mkDerivation {
|
|||||||
# Since we can't expand $out in `makeFlags`
|
# Since we can't expand $out in `makeFlags`
|
||||||
#makeFlags="$makeFlags PAKCSINSTALLDIR=$out/pakcs"
|
#makeFlags="$makeFlags PAKCSINSTALLDIR=$out/pakcs"
|
||||||
|
|
||||||
substituteInPlace currytools/cpm/src/CPM/Repository.curry \
|
for file in currytools/cpm/src/CPM/Repository.curry \
|
||||||
--replace "/bin/rm" "rm"
|
currytools/cpm/src/CPM/Repository/CacheDB.curry \
|
||||||
'';
|
scripts/compile-all-libs.sh \
|
||||||
|
scripts/cleancurry.sh \
|
||||||
|
examples/test.sh testsuite/test.sh lib/test.sh; do
|
||||||
|
substituteInPlace $file --replace "/bin/rm" "rm"
|
||||||
|
done
|
||||||
|
'' ;
|
||||||
|
|
||||||
# cypm new: EXISTENCE ERROR: source_sink
|
# cypm new: EXISTENCE ERROR: source_sink
|
||||||
# "/tmp/nix-build-pakcs-2.0.2.drv-0/pakcs-2.0.2/currytools/cpm/templates/LICENSE"
|
# "/tmp/nix-build-pakcs-2.0.2.drv-0/pakcs-2.0.2/currytools/cpm/templates/LICENSE"
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "8.1.4";
|
version = "8.1.15";
|
||||||
packInstall = swiplPath: pack:
|
packInstall = swiplPath: pack:
|
||||||
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
|
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
|
||||||
'';
|
'';
|
||||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
|||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/SWI-Prolog/swipl-devel";
|
url = "https://github.com/SWI-Prolog/swipl-devel";
|
||||||
rev = "V${version}";
|
rev = "V${version}";
|
||||||
sha256 = "0qxa6f5dypwczxajlf0l736adbjb17cbak3qsh5g04hpv2bxm6dh";
|
sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cacert git cmake gmp readline openssl
|
buildInputs = [ cacert git cmake gmp readline openssl
|
||||||
|
Loading…
Reference in New Issue
Block a user