Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 981abce3e260
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a388e920f335
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 8, 2019

  1. 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.
    @yrashk
    yrashk committed Oct 8, 2019
    Copy the full SHA
    cbb4b91 View commit details

  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.
    @yrashk
    yrashk committed Oct 8, 2019
    Copy the full SHA
    3e9e182 View commit details

Commits on Oct 15, 2019

  1. Merge pull request #70720 from yrashk/swipl-8.1.15 

    swipl: 8.1.4 -> 8.1.15
    @marsam
    marsam authored Oct 15, 2019
    Copy the full SHA
    a388e92 View commit details
Showing with 12 additions and 7 deletions.
  1. +10 −5 pkgs/development/compilers/pakcs/default.nix
  2. +2 −2 pkgs/development/compilers/swi-prolog/default.nix
15 changes: 10 additions & 5 deletions pkgs/development/compilers/pakcs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions pkgs/development/compilers/swi-prolog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,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."
'';
@@ -21,7 +21,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