From cbb4b91e70a3c8b8fead0d786e3a0a0e7070fb86 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii <yrashk@gmail.com> Date: Fri, 13 Sep 2019 22:49:05 +0700 Subject: [PATCH 1/2] swipl: 8.1.4 -> 8.1.15 8.1.4 can no longer download SWI-Prolog packages (pack_list, pack_install, etc), rendering it much less useful. --- 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 9245e59553fe..bbfea01fae4d 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -7,7 +7,7 @@ }: let - version = "8.1.4"; + version = "8.1.15"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/SWI-Prolog/swipl-devel"; rev = "V${version}"; - sha256 = "0qxa6f5dypwczxajlf0l736adbjb17cbak3qsh5g04hpv2bxm6dh"; + sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq"; }; buildInputs = [ cacert git cmake gmp readline openssl From 3e9e1828bbe85e144bee5a907b466591f2d0fb67 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii <yrashk@gmail.com> Date: Sat, 14 Sep 2019 16:10:27 +0700 Subject: [PATCH 2/2] pakcs: 2.1.1 -> 2.1.2 packs 2.1.1 build has been observed to be broken by the upgrade of swiProlog to 8.1.15. Upgrading packs to 2.1.2 seems to resolve this issue. --- pkgs/development/compilers/pakcs/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index a118e7ab73ba..0b46bd1f24de 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -4,13 +4,13 @@ , curl, git, unzip, gnutar, coreutils, sqlite }: let - name = "pakcs-2.1.1"; + name = "pakcs-2.1.2"; # Don't switch to development release without a reason, because its # source updates without version bump. Prefer current release instead. src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz"; - sha256 = "112v9ynqfbbm4x770mcfrai9v5bh7c3zn7jka80pv6v4y65r778c"; + sha256 = "0i0nprli3knc7zlp5qkqkpiq3ny36v52hnvgph376l3ajjds7wf6"; }; curry-frontend = (haskellPackages.override { @@ -43,9 +43,14 @@ in stdenv.mkDerivation { # Since we can't expand $out in `makeFlags` #makeFlags="$makeFlags PAKCSINSTALLDIR=$out/pakcs" - substituteInPlace currytools/cpm/src/CPM/Repository.curry \ - --replace "/bin/rm" "rm" - ''; + for file in currytools/cpm/src/CPM/Repository.curry \ + 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 # "/tmp/nix-build-pakcs-2.0.2.drv-0/pakcs-2.0.2/currytools/cpm/templates/LICENSE"