Skip to content

Commit

Permalink
Merge branch 'master' into staging
Browse files Browse the repository at this point in the history 
Hydra: ?compare=1415329
  • Loading branch information
@vcunat
vcunat committed Dec 2, 2017
2 parents 3152e13 + 686ce23 commit 33300c7
Show file tree
Hide file tree
Showing 49 changed files with 3,010 additions and 2,286 deletions.
3 changes: 2 additions & 1 deletion lib/maintainers.nix
View file
Expand Up @@ -414,6 +414,7 @@
michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
michalrus = "Michal Rus <m@michalrus.com>";
michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
mickours = "Michael Mercier <mickours@gmail.com<";
midchildan = "midchildan <midchildan+nix@gmail.com>";
mikefaille = "Michaël Faille <michael@faille.io>";
mikoim = "Eshin Kunishima <ek@esh.ink>";
Expand All @@ -436,6 +437,7 @@
mpcsh = "Mark Cohen <m@mpc.sh>";
mpscholten = "Marc Scholten <marc@mpscholten.de>";
mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>";
mrVanDalo = "Ingolf Wanger <contact@ingolf-wagner.de>";
msackman = "Matthew Sackman <matthew@wellquite.org>";
mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
msteen = "Matthijs Steen <emailmatthijs@gmail.com>";
Expand Down Expand Up @@ -483,7 +485,6 @@
oxij = "Jan Malakhovski <oxij@oxij.org>";
paholg = "Paho Lurie-Gregg <paho@paholg.com>";
pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
palo = "Ingolf Wanger <palipalo9@googlemail.com>";
panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com";
paperdigits = "Mica Semrick <mica@silentumbrella.com>";
pashev = "Igor Pashev <pashev.igor@gmail.com>";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/audio/airwave/default.nix
View file
Expand Up @@ -16,11 +16,11 @@ let
stdenv_multi = overrideCC stdenv gcc_multi;

vst-sdk = stdenv.mkDerivation rec {
name = "vstsdk366_27_06_2016_build_61";
name = "vstsdk368_08_11_2017_build_121";
src = requireFile {
name = "${name}.zip";
url = "http://www.steinberg.net/en/company/developers.html";
sha256 = "05gsr13bpi2hhp34rvhllsvmn44rqvmjdpg9fsgfzgylfkz0kiki";
sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70";
};
nativeBuildInputs = [ unzip ];
installPhase = "cp -r . $out";
Expand Down Expand Up @@ -64,7 +64,7 @@ stdenv_multi.mkDerivation {
# Cf. https://github.com/phantom-code/airwave/issues/57
hardeningDisable = [ "format" ];

cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}";
cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK";

postInstall = ''
mv $out/bin $out/libexec
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/aj-snapshot/default.nix
View file
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

homepage = http://aj-snapshot.sourceforge.net/;
license = licenses.gpl2;
maintainers = [ maintainers.palo ];
maintainers = [ maintainers.mrVanDalo ];
platforms = platforms.all;
};
}
7 changes: 4 additions & 3 deletions pkgs/applications/audio/keyfinder/default.nix
View file
Expand Up @@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
name = "keyfinder-${version}";
version = "2.1";
version = "2.2";

src = fetchFromGitHub {
sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn";
sha256 = "0vjszk1h8vj2qycgbffzy6k7amg75jlvlnzwaqhz9nll2pcvw0zl";
rev = version;
repo = "is_KeyFinder";
owner = "ibsh";
Expand All @@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace is_KeyFinder.pro \
--replace "keyfinder.0" "keyfinder" \
--replace "-stdlib=libc++" ""
--replace "-stdlib=libc++" "" \
--replace "\$\$[QT_INSTALL_PREFIX]" "$out"
'';

enableParallelBuilding = true;
Expand Down
64 changes: 36 additions & 28 deletions pkgs/applications/editors/jetbrains/default.nix
View file
@@ -1,6 +1,6 @@
{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, python, unzip, p7zip
, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses
, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses
}:

assert stdenv.isLinux;
Expand Down Expand Up @@ -41,11 +41,19 @@ let
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
bin/lldb/bin/lldb-server
patchelf --set-interpreter $interp \
for i in LLDBFrontend lldb lldb-argdumper; do
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
"bin/lldb/bin/$i"
done
patchelf \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
bin/lldb/LLDBFrontend
bin/lldb/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
patchelf \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
bin/lldb/lib/liblldb.so
patchelf --set-interpreter $interp bin/gdb/bin/gdb
Expand Down Expand Up @@ -226,12 +234,12 @@ in

clion = buildClion rec {
name = "clion-${version}";
version = "2017.2.3"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */
sha256 = "0gv9krqy4bhijx5s005qhswxnc05l1jsjlxs0h15z23bmv7rlpnf"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
Expand All @@ -252,116 +260,116 @@ in

goland = buildGoland rec {
name = "goland-${version}";
version = "173.3727.79"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "0bmd7r3h76pg0s9m3i5qv7zfkcj3gannj0c12cw087b831ga7ccz"; /* updated by script */
sha256 = "0l4l0lsmq1g4fwfrxhbrnfsp8nk38ml48cryvdr241zsxz43fax0"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "goland_1.0_EAP";
update-channel = "goland_release";
};

idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2017.2.6"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "150zq3wk7gsn1ibx5nkq9smfcf9n1lk347vj47yb1nwzcq0vmj2p"; /* updated by script */
sha256 = "04qp37pv4z6d9gw6j56m4zfxw4v2cydk8w7jzyzrcg52jr064kwi"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
};

idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2017.2.6"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "1g0qcv14rn9kzf0yv17ca3w1ihl1274216n7niwkqwcjp5mvj030"; /* updated by script */
sha256 = "0w9ihi6vzgfiav2qia7d7vrn14k8v56npir0dyx7ii8an887s7ws"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
};

phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2017.2.4"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0hn3x5wid2z7s2mhnxfqh2yhdkscccpbz7qgsxkjvmkxcynazrvy"; /* updated by script */
sha256 = "1byhlm5bnp6ic4n2xg17v4g34ipygy50i9xj4292b0xw7srxh910"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PS2017.2";
update-channel = "PS2017.3";
};

pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2017.2.4"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "193f44s9vh5ksd7hs586h0j66lcqsh29wwxr5yhl05lq931la857"; /* updated by script */
sha256 = "1lca3g5h716l97pkqfb8i7apsnx445xzcc9j41d0y3yyncf5hwxr"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm_Release";
};

pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2017.2.4"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0n1nps8jfk77i796yr90bvrx9j1vcdnl25sr4b5n4xznjrix4gki"; /* updated by script */
sha256 = "06lh0nxmzn0lsyd6isyb6gf01h4nbksi0f03hwwm6wdfvsfw92pb"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm_Release";
};

rider = buildRider rec {
name = "rider-${version}";
version = "2017.1.2"; /* updated by script */
version = "2017.2.1"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz";
sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */
sha256 = "1zviknxamp1y7lrlg5qfj3ijp96z0dqvcr42ca0fbx1xb887wzww"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "rider_2017_1";
update-channel = "rider_2017_2";
};

ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2017.1.5"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "198eb3d7914529ce3a6857e038167e194fb838c4b94242048ae45e8413458d66"; /* updated by script */
sha256 = "04h299mbzwrdgqxkff0vgpj2kbisb29l55mm6r45amgpqcnms6i5"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "rm2017.1";
update-channel = "rm2017.3";
};

webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2017.2.5"; /* updated by script */
version = "2017.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0apsfwcj8qfjwya794848h5iqfg9fay3h8bxqwclkw7lid9qwv7n"; /* updated by script */
sha256 = "0whr5zygrbi044pl48ac2w7a4rxldbaqlf76dkfqj83g2wl4n990"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";
Expand Down
12 changes: 11 additions & 1 deletion pkgs/applications/graphics/digikam/default.nix
View file
@@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch

# For `digitaglinktree`
, perl, sqlite
Expand Down Expand Up @@ -114,6 +114,16 @@ mkDerivation rec {
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
'';

patches = [
# fix Qt-5.9.3 empty album problem
(fetchpatch {
url = "https://cgit.kde.org/digikam.git/patch/?id=855ba5b7d4bc6337234720a72ea824ddd3b32e5b";
sha256 = "0zk8p182piy6xn9v0mhwawya9ciq596vql1qc3lgnx371a97mmni";
})
];

patchFlags = "-d core -p1";

meta = with lib; {
description = "Photo Management Program";
license = licenses.gpl2;
Expand Down
8 changes: 5 additions & 3 deletions pkgs/applications/graphics/ipe/default.nix
View file
Expand Up @@ -3,11 +3,11 @@
}:

stdenv.mkDerivation rec {
name = "ipe-7.1.10";
name = "ipe-7.2.7";

src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.1/${name}-src.tar.gz";
sha256 = "0kwk8l2jasb4fdixaca08g661d0sdmx2jkk3ch7pxh0f4xkdxkkz";
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
sha256 = "08lzqhagvr8l69hxghyw9akf5dixbily7hj2gxhzzrp334k3yvfn";
};

# changes taken from Gentoo portage
Expand Down Expand Up @@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
done
'';

patches = [ ./xlocale.patch ];

#TODO: make .desktop entry

meta = {
Expand Down
10 changes: 10 additions & 0 deletions pkgs/applications/graphics/ipe/xlocale.patch
View file
@@ -0,0 +1,10 @@
--- ipe-7.2.7/src/ipelib/ipeplatform.cpp 2016-12-09 15:09:04.000000000 +0100
+++ ipe-7.2.7/src/ipelib/ipeplatform.cpp 2017-11-23 17:13:11.152395834 +0100
@@ -38,7 +38,6 @@
#include <gdiplus.h>
#else
#include <sys/wait.h>
-#include <xlocale.h>
#include <dirent.h>
#endif
#ifdef __APPLE__
36 changes: 21 additions & 15 deletions pkgs/applications/graphics/paraview/default.nix
View file
@@ -1,23 +1,27 @@
{stdenv, fetchFromGitHub, cmake
,full, python, mesa, libXt }:
{
stdenv, fetchFromGitHub, cmake
,qtbase, qttools, python, mesa
,libXt, qtx11extras, qtxmlpatterns
}:

stdenv.mkDerivation rec {
name = "paraview-${version}";
version = "5.4.0";
version = "5.4.1";

# fetching from GitHub instead of taking an "official" source
# tarball because of missing submodules there
src = fetchFromGitHub {
owner = "Kitware";
repo = "ParaView";
rev = "v${version}";
sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n";
sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74";
fetchSubmodules = true;
};

cmakeFlags = [
"-DPARAVIEW_ENABLE_PYTHON=ON"
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
"-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
];

# During build, binaries are called that rely on freshly built
Expand All @@ -29,17 +33,19 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

buildInputs = [ cmake
python
mesa
libXt

# theoretically the following should be fine, but there is an error
# due to missing libqminimal when not using qt5.full

# qtbase qtx11extras qttools
full
];
nativeBuildInputs = [
cmake
];

buildInputs = [
python
mesa
libXt
qtbase
qtx11extras
qttools
qtxmlpatterns
];


meta = {
Expand Down

0 comments on commit 33300c7

Please sign in to comment.