From 0e4c444cfecb83b294b27518c43dbcaab28b920e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 30 Nov 2018 19:59:55 -0600 Subject: [PATCH 1/3] minizincide: init at 2.2.3 * wrap so minizinc on PATH (to ensure it's avail/found) --- pkgs/development/tools/minizinc/ide.nix | 42 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/minizinc/ide.nix diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix new file mode 100644 index 00000000000..1bfb0726d6a --- /dev/null +++ b/pkgs/development/tools/minizinc/ide.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: +let + version = "2.2.3"; +in +stdenv.mkDerivation { + name = "minizinc-ide-${version}"; + + nativeBuildInputs = [ qmake makeWrapper ]; + buildInputs = [ qtbase qtwebengine qtwebkit ]; + + src = fetchFromGitHub { + owner = "MiniZinc"; + repo = "MiniZincIDE"; + rev = version; # XXX chance it//revisit: "3d66971a0cad6edbe797f4dd940229d38e5bfe3d"; # tags on the repo are disappearing: See https://github.com/MiniZinc/libminizinc/issues/257 + sha256 = "1hanq7c6li59awlwghgvpd8w93a7zb6iw7p4062nphnbd1dmg92f"; + }; + + postUnpack = ''export sourceRoot="$sourceRoot/MiniZincIDE"''; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${stdenv.lib.makeBinPath [ minizinc ]} + ''; + + meta = with stdenv.lib; { + homepage = http://www.minizinc.org/; + description = "IDE for MiniZinc, a medium-level constraint modelling language."; + + longDescription = '' + MiniZinc is a medium-level constraint modelling + language. It is high-level enough to express most + constraint problems easily, but low-level enough + that it can be mapped onto existing solvers easily and consistently. + It is a subset of the higher-level language Zinc. + ''; + + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheenobu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc18e0a0611..9e1c190aa31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8725,6 +8725,7 @@ with pkgs; minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; + minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; From 3d5ee8648846b3f36038d1197a2882fd9cca8538 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 2 Dec 2018 12:14:43 -0600 Subject: [PATCH 2/3] minizincide: https, touchup, don't volunteer others to maintain haha :P --- pkgs/development/tools/minizinc/ide.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 1bfb0726d6a..9e4edc236df 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; - rev = version; # XXX chance it//revisit: "3d66971a0cad6edbe797f4dd940229d38e5bfe3d"; # tags on the repo are disappearing: See https://github.com/MiniZinc/libminizinc/issues/257 + rev = version; sha256 = "1hanq7c6li59awlwghgvpd8w93a7zb6iw7p4062nphnbd1dmg92f"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.minizinc.org/; + homepage = https://www.minizinc.org/; description = "IDE for MiniZinc, a medium-level constraint modelling language."; longDescription = '' @@ -37,6 +37,6 @@ stdenv.mkDerivation { license = licenses.mpl20; platforms = platforms.linux; - maintainers = [ maintainers.sheenobu ]; + maintainers = [ maintainers.dtzWill ]; }; } From 5adde64416b6f4fce41e1152efe9902a28ace26b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 5 Jan 2019 13:35:10 -0600 Subject: [PATCH 3/3] minizincide: minor touchups per reviewer suggestion (sourceRoot needed a "source/" prefix, FWIW) --- pkgs/development/tools/minizinc/ide.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 9e4edc236df..ab2af43979a 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1hanq7c6li59awlwghgvpd8w93a7zb6iw7p4062nphnbd1dmg92f"; }; - postUnpack = ''export sourceRoot="$sourceRoot/MiniZincIDE"''; + sourceRoot = "source/MiniZincIDE"; enableParallelBuilding = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://www.minizinc.org/; - description = "IDE for MiniZinc, a medium-level constraint modelling language."; + description = "IDE for MiniZinc, a medium-level constraint modelling language"; longDescription = '' MiniZinc is a medium-level constraint modelling