Commit 737ce9d1 authored by Vincent Laporte's avatar Vincent Laporte Committed by Vincent Laporte
Browse files

minizinc: update gecode to 6.3.0

parent e80d02eb

pkgs/development/tools/minizinc/default.nix

+17 −1
Original line number Diff line number Diff line
@@ -13,6 +13,22 @@ 
  zlib,

}:



let

  gecode_6_3_0 = gecode.overrideAttrs (_: {

    version = "6.3.0";

    src = fetchFromGitHub {

      owner = "gecode";

      repo = "gecode";

      rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a";

      hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k=";

    };

    patches = [ ];

  });

in

let

  gecode = gecode_6_3_0;

in



stdenv.mkDerivation (finalAttrs: {

  pname = "minizinc";

  version = "2.9.3";
@@ -42,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { 
    mkdir -p $out/share/minizinc/solvers/

    jq \

      '.version = "${gecode.version}"

       | .mznlib = "${gecode}/share/gecode/mznlib"

       | .mznlib = "${gecode}/share/minizinc/gecode/"

       | .executable = "${gecode}/bin/fzn-gecode"' \

       ${./gecode.msc} \

       >$out/share/minizinc/solvers/gecode.msc

pkgs/development/tools/minizinc/simple-test/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ stdenv.mkDerivation { 
  dontInstall = true;



  buildCommand = ''

    minizinc --solver gecode ${./aust.mzn}

    minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}

    touch $out

    mkdir -p $out

    minizinc --solver gecode ${./aust.mzn} | tee $out/aust.log

    minizinc --solver gecode ${./nqueens.mzn} | tee $out/nqueens.log

    minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn} | tee $out/loan.log

  '';



  meta.timeout = 10;

pkgs/development/tools/minizinc/simple-test/nqueens.mzn

0 → 100644
+9 −0
Original line number Diff line number Diff line 
int: n = 8; % The number of queens.



array [1..n] of var 1..n: q;



include "alldifferent.mzn";



constraint alldifferent(q);

constraint alldifferent(i in 1..n)(q[i] + i);

constraint alldifferent(i in 1..n)(q[i] - i);