Merge branch 'master' into staging
Hydra: ?compare=1415329
This commit is contained in:
Vladimír Čunát
commit
33300c7316
|
|
@ -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>";
|
||||
|
|
@ -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>";
|
||||
|
|
@ -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>";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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 \
|
||||
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
|
||||
bin/lldb/LLDBFrontend
|
||||
|
||||
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 [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \
|
||||
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
|
||||
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 python3 ]}:$lldbLibPath" \
|
||||
bin/lldb/lib/liblldb.so
|
||||
|
||||
patchelf --set-interpreter $interp bin/gdb/bin/gdb
|
||||
|
|
@ -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
|
||||
|
|
@ -252,25 +260,25 @@ 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";
|
||||
|
|
@ -278,12 +286,12 @@ in
|
|||
|
||||
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";
|
||||
|
|
@ -291,25 +299,25 @@ in
|
|||
|
||||
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";
|
||||
|
|
@ -317,12 +325,12 @@ in
|
|||
|
||||
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";
|
||||
|
|
@ -330,38 +338,38 @@ in
|
|||
|
||||
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";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
patches = [ ./xlocale.patch ];
|
||||
|
||||
#TODO: make .desktop entry
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -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__
|
||||
|
|
@ -1,9 +1,12 @@
|
|||
{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
|
||||
|
|
@ -11,13 +14,14 @@ stdenv.mkDerivation rec {
|
|||
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
|
||||
|
|
@ -29,17 +33,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ cmake
|
||||
python
|
||||
mesa
|
||||
libXt
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
# theoretically the following should be fine, but there is an error
|
||||
# due to missing libqminimal when not using qt5.full
|
||||
|
||||
# qtbase qtx11extras qttools
|
||||
full
|
||||
];
|
||||
buildInputs = [
|
||||
python
|
||||
mesa
|
||||
libXt
|
||||
qtbase
|
||||
qtx11extras
|
||||
qttools
|
||||
qtxmlpatterns
|
||||
];
|
||||
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk2 } :
|
||||
{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk3 } :
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "pqiv-${version}";
|
||||
version = "2.9";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phillipberndt";
|
||||
repo = "pqiv";
|
||||
rev = version;
|
||||
sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd";
|
||||
sha256 = "06blqckj3bpbi2kl5ndv2d10r7nw62r386kfwrkic9amynlv9gki";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ getopt which gtk2 ];
|
||||
buildInputs = [ getopt which gtk3 ];
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Rewrite of qiv (quick image viewer)";
|
||||
description = "Powerful image viewer with minimal UI";
|
||||
homepage = http://www.pberndt.com/Programme/Linux/pqiv;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.ndowens ];
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ bzip2 qt4 libX11 ];
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
postInstall = ''
|
||||
# Patch the `evopedia.desktop' file.
|
||||
substituteInPlace $out/share/applications/evopedia.desktop \
|
||||
--replace '/usr/bin/evopedia' $out/bin/evopedia
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Offline Wikipedia Viewer";
|
||||
homepage = http://www.evopedia.info;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
{ fetchFromGitHub, ack , tree, stdenv, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "memo-${version}";
|
||||
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrVanDalo";
|
||||
repo = "memo";
|
||||
rev = "${version}";
|
||||
sha256 = "0mww4w5m6jv4s0krm74cccrz0vlr8rrwiv122jk67l1v9r80pchs";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
|
||||
mv memo $out/bin/
|
||||
mv doc/memo.1 $out/share/man/man1/memo.1
|
||||
mv completion/memo.bash $out/share/bash-completion/completions/memo.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A simple tool written in bash to memorize stuff";
|
||||
longDescription = ''
|
||||
A simple tool written in bash to memorize stuff.
|
||||
Memo organizes is structured through topics which are folders in ~/memo.
|
||||
'';
|
||||
homepage = http://palovandalo.com/memo/;
|
||||
downloadPage = https://github.com/mrVanDalo/memo/releases;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.mrVanDalo ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchgit, pkgconfig , libssh2
|
||||
{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2
|
||||
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
|
||||
, qtsvg, qttools, qtquick1
|
||||
, qtsvg, qttools, qtquick1, qtcharts
|
||||
, qmake
|
||||
}:
|
||||
|
||||
|
|
@ -15,30 +15,35 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "redis-desktop-manager-${version}";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0-alpha5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/uglide/RedisDesktopManager.git";
|
||||
fetchSubmodules = true;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
|
||||
sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake ];
|
||||
buildInputs = [
|
||||
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
|
||||
qtquick1 qtquickcontrols qtsvg qttools
|
||||
qtquick1 qtquickcontrols qtsvg qttools qtcharts
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch";
|
||||
sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = "-d 3rdparty/gbreakpad -p1";
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
srcdir=$PWD
|
||||
|
||||
substituteInPlace src/resources/qml/ValueTabs.qml \
|
||||
--replace "import QtQuick.Controls 1.4" \
|
||||
"import QtQuick.Controls 1.2"
|
||||
|
||||
cat <<EOF > src/version.h
|
||||
#ifndef RDM_VERSION
|
||||
#define RDM_VERSION "${version}-120"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -16,13 +16,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "teamviewer-${version}";
|
||||
version = "12.0.76279";
|
||||
version = "12.0.85001";
|
||||
|
||||
src = fetchurl {
|
||||
# There is a 64-bit package, but it has no differences apart from Debian dependencies.
|
||||
# Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
|
||||
url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
|
||||
sha256 = "15yhx66zxbjk0x3dpfg39gb1f2ajcp9kbp4zi58bfnvby277jl00";
|
||||
url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb";
|
||||
sha256 = "01vzky22gisjxa4ihaygkb7jwhl4z9ldd9lli8fc863nxxbrawks";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, zlib, glucose }:
|
||||
{ stdenv, zlib, glucose }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glucose-syrup-${version}";
|
||||
version = glucose.version;
|
||||
|
|
|
|||
|
|
@ -1,75 +1,106 @@
|
|||
{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx
|
||||
, libunwind, elfutils, python3, doxygen
|
||||
{ stdenv, fetchFromGitHub, cmake, elfutils, perl, python3, boost, valgrind
|
||||
# Optional requirements
|
||||
# Lua 5.3 needed and not available now
|
||||
#, luaSupport ? false, lua5
|
||||
, fortranSupport ? false, gfortran
|
||||
, buildDocumentation ? false, transfig, ghostscript, doxygen
|
||||
, buildJavaBindings ? false, openjdk
|
||||
, modelCheckingSupport ? false, libunwind, libevent # Inside elfutils - , libelf, libevent, libdw
|
||||
, debug ? false
|
||||
, moreTests ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.15";
|
||||
name = "simgrid-${version}";
|
||||
# helpers for options
|
||||
let optionals = stdenv.lib.optionals;
|
||||
optionalString = stdenv.lib.optionalString;
|
||||
optionOnOff = option: "${if option then "on" else "off"}";
|
||||
in
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz";
|
||||
sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i";
|
||||
stdenv.mkDerivation rec {
|
||||
major_version = "3";
|
||||
minor_version = "17";
|
||||
version = "v${major_version}.${minor_version}";
|
||||
tagged_version = "${major_version}_${minor_version}";
|
||||
name = "simgrid";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simgrid";
|
||||
repo = "simgrid";
|
||||
rev = "v3_17";
|
||||
sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
|
||||
#rev = "master";
|
||||
#sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind
|
||||
elfutils python3 doxygen
|
||||
];
|
||||
nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind]
|
||||
++ optionals fortranSupport [gfortran]
|
||||
++ optionals buildJavaBindings [openjdk]
|
||||
++ optionals buildDocumentation [transfig ghostscript doxygen]
|
||||
++ optionals modelCheckingSupport [libunwind libevent];
|
||||
|
||||
#buildInputs = optional luaSupport lua5;
|
||||
|
||||
preConfigure =
|
||||
# Make it so that libsimgrid.so will be found when running programs from
|
||||
# the build dir.
|
||||
'' export LD_LIBRARY_PATH="$PWD/src/.libs"
|
||||
export cmakeFlags="-Dprefix=$out"
|
||||
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
|
||||
-isystem $(echo "${libsigcxx}/lib/"sigc++*/include)
|
||||
-isystem $(echo "${libsigcxx}/include"/sigc++* )
|
||||
"
|
||||
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${libsigcxx}/lib/"sigc++*)"
|
||||
|
||||
# Enable more functionality.
|
||||
export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on
|
||||
-Denable_latency_bound_tracking=on -Denable_lua=on
|
||||
-Denable_ns3=off -Denable_gtnets=on
|
||||
"
|
||||
''
|
||||
export LD_LIBRARY_PATH="$PWD/build/lib"
|
||||
'';
|
||||
|
||||
makeFlags = "VERBOSE=1";
|
||||
# Release mode is not supported in SimGrid
|
||||
cmakeBuildType = "Debug";
|
||||
|
||||
# Disable/Enable functionality
|
||||
# Note: those packages are not packaged in Nixpkgs yet so some options
|
||||
# are disabled:
|
||||
# - papi: for enable_smpi_papi
|
||||
# - ns3: for enable_ns3
|
||||
# - lua53: for enable_lua
|
||||
#
|
||||
# For more information see:
|
||||
# http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list
|
||||
cmakeFlags= ''
|
||||
-Denable_documentation=${optionOnOff buildDocumentation}
|
||||
-Denable_java=${optionOnOff buildJavaBindings}
|
||||
-Denable_fortran=${optionOnOff fortranSupport}
|
||||
-Denable_model-checking=${optionOnOff modelCheckingSupport}
|
||||
-Denable_ns3=off
|
||||
-Denable_lua=off
|
||||
-Denable_lib_in_jar=off
|
||||
-Denable_maintainer_mode=off
|
||||
-Denable_mallocators=on
|
||||
-Denable_debug=on
|
||||
-Denable_smpi=on
|
||||
-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}
|
||||
-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}
|
||||
-Denable_compile_warnings=${optionOnOff debug}
|
||||
-Denable_compile_optimizations=${optionOnOff (!debug)}
|
||||
-Denable_lto=${optionOnOff (!debug)}
|
||||
'';
|
||||
#-Denable_lua=${optionOnOff luaSupport}
|
||||
#-Denable_smpi_papi=${optionOnOff moreTests}
|
||||
|
||||
makeFlags = optionalString debug "VERBOSE=1";
|
||||
|
||||
preBuild =
|
||||
/* Work around this:
|
||||
|
||||
[ 20%] Generating _msg_handle_simulator.c, _msg_handle_client.c, _msg_handle_server.c
|
||||
cd /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build/teshsuite/gras/msg_handle && ../../../bin/gras_stub_generator msg_handle /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/teshsuite/gras/msg_handle/msg_handle.xml
|
||||
../../../bin/gras_stub_generator: error while loading shared libraries: libsimgrid.so.3.5: cannot open shared object file: No such file or directory
|
||||
make[2]: *** [teshsuite/gras/msg_handle/_msg_handle_simulator.c] Error 127
|
||||
make[2]: Leaving directory `/tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build'
|
||||
|
||||
*/
|
||||
'' export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH"
|
||||
echo "\$LD_LIBRARY_PATH is \`$LD_LIBRARY_PATH'"
|
||||
''
|
||||
# Some perl scripts are called to generate test during build which
|
||||
# is before the fixupPhase of nix, so do this manualy here:
|
||||
patchShebangs ..
|
||||
'';
|
||||
|
||||
patchPhase =
|
||||
'' for i in "src/smpi/"*
|
||||
do
|
||||
test -f "$i" &&
|
||||
sed -i "$i" -e's|/bin/bash|/bin/sh|g'
|
||||
done
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
for i in $(grep -rl /usr/bin/perl .)
|
||||
do
|
||||
sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
|
||||
done
|
||||
patchShebangs ./tools/
|
||||
ctest --output-on-failure -E smpi-replay-multiple
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Fixing the few tests that fail is left as an exercise to the reader.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Simulator for distributed applications in heterogeneous environments";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Framework for the simulation of distributed applications";
|
||||
longDescription =
|
||||
'' SimGrid is a toolkit that provides core functionalities for the
|
||||
simulation of distributed applications in heterogeneous distributed
|
||||
|
|
@ -78,12 +109,9 @@ stdenv.mkDerivation rec {
|
|||
scheduling on distributed computing platforms ranging from simple
|
||||
network of workstations to Computational Grids.
|
||||
'';
|
||||
|
||||
homepage = http://simgrid.gforge.inria.fr/;
|
||||
|
||||
license = stdenv.lib.licenses.lgpl2Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
maintainers = with maintainers; [ mickours ];
|
||||
platforms = platforms.x86_64;
|
||||
license = licenses.lgpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ let
|
|||
mate-desktop = callPackage ./mate-desktop { };
|
||||
mate-icon-theme = callPackage ./mate-icon-theme { };
|
||||
mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
|
||||
mate-media = callPackage ./mate-media { };
|
||||
mate-menus = callPackage ./mate-menus { };
|
||||
mate-notification-daemon = callPackage ./mate-notification-daemon { };
|
||||
mate-panel = callPackage ./mate-panel { };
|
||||
|
|
@ -56,6 +57,7 @@ let
|
|||
engrampa
|
||||
eom
|
||||
mate-icon-theme-faenza
|
||||
mate-media
|
||||
mate-power-manager
|
||||
mate-terminal
|
||||
pluma
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra_gtk3, gnome3, mate, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-media-${version}";
|
||||
version = "${major-ver}.${minor-ver}";
|
||||
major-ver = "1.18";
|
||||
minor-ver = "0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
|
||||
sha256 = "0v19aipqj24367mx82ghkvgnxy1505zd35h50pi30fws36b6plll";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
libcanberra_gtk3
|
||||
gnome3.gtk
|
||||
mate.libmatemixer
|
||||
mate.mate-desktop
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
intltool
|
||||
libtool
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Media tools for MATE";
|
||||
homepage = http://mate-desktop.org;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo maintainers.chpatrick ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }:
|
||||
{ stdenv, fetchurl, gcc, glibc, m4, coreutils }:
|
||||
|
||||
let
|
||||
options = rec {
|
||||
/* TODO: there are also MacOS, FreeBSD and Windows versions */
|
||||
x86_64-linux = {
|
||||
arch = "linuxx86";
|
||||
sha256 = "0g6mkl207ri3ib9w85i9w0sv7srz784pbxidz0d95p6qkvg6shba";
|
||||
sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q";
|
||||
runtime = "lx86cl64";
|
||||
kernel = "linuxx8664";
|
||||
};
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
};
|
||||
armv7l-linux = {
|
||||
arch = "linuxarm";
|
||||
sha256 = "0k6wxwyg3pmbb5xdkwma0i3rvbjmy3p604g4minjjc1drzsn1i0q";
|
||||
sha256 = "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62";
|
||||
runtime = "armcl";
|
||||
kernel = "linuxarm";
|
||||
};
|
||||
|
|
@ -30,21 +30,13 @@ assert builtins.hasAttr stdenv.system options;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ccl-${version}";
|
||||
version = "1.11";
|
||||
revision = "16313";
|
||||
version = "1.11.5";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.clozure.com/publicsvn/openmcl/release/${version}/${cfg.arch}/ccl";
|
||||
rev = revision;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz";
|
||||
sha256 = cfg.sha256;
|
||||
};
|
||||
|
||||
patches = fetchpatch {
|
||||
name = "ccl-1.11-glibc-2.26.patch";
|
||||
url = https://patch-diff.githubusercontent.com/raw/Clozure/ccl/pull/80.patch;
|
||||
sha256 = "02v6287w0nppfpvkn9dyd5rvq2zkgd47ia9gs17hrww2hgzr6agd";
|
||||
};
|
||||
|
||||
buildInputs = [ gcc glibc m4 ];
|
||||
|
||||
CCL_RUNTIME = cfg.runtime;
|
||||
|
|
@ -52,7 +44,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
|
||||
--replace "svnversion" "echo ${revision}" \
|
||||
--replace "/bin/rm" "${coreutils}/bin/rm" \
|
||||
--replace "/bin/echo" "${coreutils}/bin/echo"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchgit, writeText, sbclBootstrap
|
||||
{ stdenv, fetchurl, writeText, sbclBootstrap
|
||||
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
|
||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system)
|
||||
# Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
|
||||
|
|
@ -9,16 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbcl-${version}";
|
||||
version = "1.4.1.0.20171104";
|
||||
version = "1.4.2";
|
||||
|
||||
#src = fetchurl {
|
||||
# url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
|
||||
# sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8";
|
||||
#};
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/sbcl/sbcl";
|
||||
sha256 = "1fq34h8h8pax5q17w84kwv5amiaag3ikkq3cdmb31r64736mxi6r";
|
||||
rev = "11aa57d23bc464d6a6867a80e946907404ceadd1";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
|
||||
sha256 = "05s7wsx6bsnx4h6w3d8yim9apbvi8ih0glmvkmgjz7nrad4abjwd";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -453,8 +453,10 @@ self: super: {
|
|||
# https://github.com/basvandijk/threads/issues/10
|
||||
threads = dontCheck super.threads;
|
||||
|
||||
# https://github.com/purescript/purescript/pull/3041
|
||||
purescript = doJailbreak super.purescript;
|
||||
# https://github.com/NixOS/nixpkgs/issues/32138
|
||||
purescript = super.purescript.override {
|
||||
optparse-applicative = self.optparse-applicative_0_14_0_0;
|
||||
};
|
||||
|
||||
# Missing module.
|
||||
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
|
||||
|
|
|
|||
|
|
@ -1,57 +1,79 @@
|
|||
{ stdenv, fetchurl, readline }:
|
||||
{ stdenv, fetchFromGitHub, readline, libedit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "j-${version}";
|
||||
version = "701_b";
|
||||
src = fetchurl {
|
||||
url = "http://www.jsoftware.com/download/j${version}_source.tar.gz";
|
||||
sha256 = "1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys";
|
||||
version = "806";
|
||||
jtype = "release";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsoftware";
|
||||
repo = "jsource";
|
||||
rev = "j${version}-${jtype}";
|
||||
sha256 = "0b9sbd5hbyr5454k0p53f03lpf03sz8mqwszaqi0vcs73bsprdjs";
|
||||
};
|
||||
buildInputs = [ readline ];
|
||||
|
||||
buildInputs = [ readline libedit ];
|
||||
bits = if stdenv.is64bit then "64" else "32";
|
||||
platform =
|
||||
/*if stdenv.isRaspberryPi then "raspberry" else*/
|
||||
if stdenv.isLinux then "linux" else
|
||||
if stdenv.isDarwin then "darwin" else
|
||||
"unknown";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildPhase = ''
|
||||
sed -i bin/jconfig -e '
|
||||
s@bits=32@bits=${bits}@g;
|
||||
s@readline=0@readline=1@;
|
||||
s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@;
|
||||
s@-W1,soname,libj.so@-Wl,-soname,libj.so@
|
||||
'
|
||||
sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@'
|
||||
export SOURCE_DIR=$(pwd)
|
||||
export HOME=$TMPDIR
|
||||
export JBIN=$HOME/j${bits}/bin
|
||||
export JLIB=$SOURCE_DIR/jlibrary
|
||||
mkdir -p $JBIN
|
||||
|
||||
sed -i f2.c -e 's/_isnan(\*wv)/_isnan(y)/'
|
||||
cd make
|
||||
|
||||
touch *.c *.h
|
||||
sh -o errexit bin/build_jconsole
|
||||
[ -e j/bin/jconsole ]
|
||||
sh -o errexit bin/build_libj
|
||||
[ -e j/bin/libj.so ]
|
||||
sh -o errexit bin/build_defs
|
||||
[ -e defs/hostdefs.ijs ] && [ -e defs/netdefs.ijs ]
|
||||
sh -o errexit bin/build_tsdll
|
||||
[ -x libtsdll.so ]
|
||||
patchShebangs .
|
||||
sed -i jvars.sh -e '
|
||||
s@~/gitdev/jsource@$SOURCE_DIR@;
|
||||
s@~/jbld@$HOME@;
|
||||
s@linux@${platform}@;
|
||||
'
|
||||
|
||||
sed -i j/bin/profile.ijs -e "
|
||||
s@userx=[.] *'.j'@userx=. '/.j'@;
|
||||
s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ;
|
||||
/install=./ainstall=. install,'/share/j'
|
||||
"
|
||||
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
|
||||
|
||||
# For future versions, watch
|
||||
# https://github.com/jsoftware/jsource/pull/4
|
||||
cp ./jvars.sh $HOME
|
||||
|
||||
echo '
|
||||
#define jversion "${version}"
|
||||
#define jplatform "${platform}"
|
||||
#define jtype "${jtype}" // release,beta,...
|
||||
#define jlicense "GPL3"
|
||||
#define jbuilder "unknown" // website or email
|
||||
' > ../jsrc/jversion.h
|
||||
|
||||
./build_jconsole.sh j${bits}
|
||||
./build_libj.sh j${bits}
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
echo 'i. 5' | j/bin/jconsole | fgrep "0 1 2 3 4"
|
||||
echo 'i. 5' | $JBIN/jconsole | fgrep "0 1 2 3 4"
|
||||
|
||||
# Now run the real tests
|
||||
cd $SOURCE_DIR/test
|
||||
# for f in *.ijs
|
||||
# do
|
||||
# echo $f
|
||||
# $JBIN/jconsole < $f
|
||||
# done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"
|
||||
cp -r j/bin "$out/bin"
|
||||
rm "$out/bin/profilex_template.ijs"
|
||||
cp -r $JBIN "$out/bin"
|
||||
|
||||
mkdir -p "$out/share/j"
|
||||
|
||||
cp -r docs j/addons j/system "$out/share/j"
|
||||
cp -r $JLIB/{addons,system} "$out/share/j"
|
||||
cp -r $JLIB/bin "$out"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.800.1";
|
||||
version = "8.300.0";
|
||||
name = "armadillo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs";
|
||||
sha256 = "0g6wcfrmb2hndz995wrlc80v6d39mhxf26lmycaqv5bjfq050ic5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -84,7 +84,7 @@ message(STATUS "DETECT_HDF5 = ${DETECT_HDF5}" )
|
||||
##
|
||||
## Find LAPACK and BLAS libraries, or their optimised versions
|
||||
##
|
||||
-
|
||||
@@ -152,6 +152,7 @@ message(STATUS "DETECT_HDF5 = ${DETECT_HDF5}" )
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/")
|
||||
|
||||
+set(APPLE false)
|
||||
if(APPLE)
|
||||
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "The FEniCS Problem Solving Environment in Python and C++";
|
||||
homepage = http://fenicsproject.org/;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ expat ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.unidata.ucar.edu/software/udunits/;
|
||||
homepage = https://www.unidata.ucar.edu/software/udunits/;
|
||||
description = "A C-based package for the programatic handling of units of physical quantities";
|
||||
license = licenses.bsdOriginal;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib
|
||||
, topkg, sexplib, ppx_sexp_conv, opam }:
|
||||
, jbuilder, sexplib, ppx_sexp_conv, ppx_deriving }:
|
||||
|
||||
buildOcaml rec {
|
||||
name = "ipaddr";
|
||||
version = "2.7.2";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz";
|
||||
sha256 = "0mnjw1xjr8vyn5x1nnbbxfxhs77znwrkz8c144w47zk2pc3xrh9d";
|
||||
sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
|
||||
};
|
||||
|
||||
buildInputs = [ findlib ocamlbuild topkg ppx_sexp_conv opam ];
|
||||
propagatedBuildInputs = [ sexplib ];
|
||||
buildInputs = [ findlib ocamlbuild jbuilder ppx_sexp_conv ];
|
||||
propagatedBuildInputs = [ ppx_deriving sexplib ];
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/mirage/ocaml-ipaddr;
|
||||
description = "A library for manipulation of IP (and MAC) address representations ";
|
||||
license = licenses.mit;
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl
|
||||
, eject, pygit2, gitMinimal, git-annex }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "git-annex-adapter";
|
||||
version = "0.2.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
disabled = (!isPy3k);
|
||||
|
||||
# There is only a wheel on PyPI - build from source instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "alpernebbi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace git_annex_adapter/process.py \
|
||||
--replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \
|
||||
--replace "'git-annex'" "'${git-annex}/bin/git-annex'"
|
||||
'';
|
||||
|
||||
# TODO: Remove for next version
|
||||
patches = fetchurl {
|
||||
url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
|
||||
sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
eject # `rev` is needed in tests/test_process.py
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pygit2 gitMinimal ];
|
||||
|
||||
buildInputs = [ git-annex ];
|
||||
|
||||
checkPhase = ''
|
||||
python -m unittest
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/alpernebbi/git-annex-adapter;
|
||||
description = "Call git-annex commands from Python";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -303,7 +303,6 @@ let
|
|||
rcdd = [ pkgs.gmp.dev ];
|
||||
RcppCNPy = [ pkgs.zlib.dev ];
|
||||
RcppGSL = [ pkgs.gsl_1 ];
|
||||
RcppOctave = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.octave ];
|
||||
RcppZiggurat = [ pkgs.gsl_1 ];
|
||||
rgdal = [ pkgs.proj pkgs.gdal ];
|
||||
rgeos = [ pkgs.geos ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, fetchFromGitHub, lib, python, which }:
|
||||
let
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr";
|
||||
sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
|
||||
rev = "version-${version}";
|
||||
repo = "gup";
|
||||
owner = "timbertson";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "drip";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "ninjudd";
|
||||
rev = version;
|
||||
sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir $out
|
||||
cp ./* $out -r
|
||||
wrapProgram $out/bin/drip \
|
||||
--prefix PATH : "${which}/bin"
|
||||
$out/bin/drip version
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
|
||||
license = licenses.epl10;
|
||||
homepage = https://github.com/ninjudd/drip;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.rybern ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jo-${version}";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpmens";
|
||||
repo = "jo";
|
||||
|
||||
rev = "v${version}";
|
||||
sha256="0vyi0aaxsp6x3cvym7mlcfdsxjhj5h0b00mqc42mg8kc95cyp2c1";
|
||||
sha256="1gn9fa37mfb85dfjznyfgciibf142kp0gisc2l2pnz0zrakbvvy3";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,20 @@ in
|
|||
python27Packages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "gdbgui";
|
||||
version = "0.9.0.1";
|
||||
version = "0.9.1.0";
|
||||
|
||||
buildInputs = [ gdb ];
|
||||
propagatedBuildInputs = builtins.attrValues deps.packages;
|
||||
|
||||
src = python27Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1gjc7dycrc4zafhrd9yib7qnh4agh7cpa6rlw4p5405rlmwmsbj3";
|
||||
sha256 = "0ybgkk4h9zwhbx5d0j0fmfzxxgg8f6apm8v7djavm0ldpr6f5z26";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > gdbgui/VERSION.txt
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gdbgui \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dbus-broker-${version}";
|
||||
version = "8";
|
||||
version = "9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bus1";
|
||||
repo = "dbus-broker";
|
||||
rev = "v${version}";
|
||||
sha256 = "07k8y6pcx58dfd0vvxcbz352v4apajs5lf0chv6fdp7xf7wbbcwb";
|
||||
sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.14.2";
|
||||
version = "4.14.3";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
|
@ -13,6 +13,6 @@ import ./generic.nix (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0k264zxibhldgi9fcax11bjdv89jkdn1nbvvng312j2f19i909p9";
|
||||
sha256 = "0rh3r1ik9xwa3pl5rrqjjbknyc7xnam10jih7v5q5v33pd716a5n";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.4.102";
|
||||
version = "4.4.103";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1zmaispqs9lw1kyalhln2l53hsg99riisgnmc50qj7cyalmc5qpd";
|
||||
sha256 = "017r4aq6bwhrir3n4nckd5407gpnryv0bbgpp7rv6lnzbxwd008x";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.65";
|
||||
version = "4.9.66";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "15a8a7p6i2dgiglps22cwsy5gsfkc39fy4jzvhjwz8s9fn3p1fi4";
|
||||
sha256 = "0fwnmba25ww5q4asfz3mqdmbrhfdfgid388701h4xy20pwpjndsy";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
|
|||
# Note: ATM only the libraries have been tested in nixpkgs.
|
||||
stdenv.mkDerivation rec {
|
||||
name = "knot-dns-${version}";
|
||||
version = "2.6.1";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3";
|
||||
sha256 = "2fb27a4006865fc12873cbadc5b4a870ec65d3293a284972c031522282987790";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ in
|
|||
''
|
||||
ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias
|
||||
test -f $ALIASFILE
|
||||
ln -s $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
|
||||
cp $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ bundlerEnv {
|
|||
description = "Easy full stack backup operations on UNIX-like systems";
|
||||
homepage = http://backup.github.io/backup/v4/;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.palo ];
|
||||
maintainers = [ maintainers.mrVanDalo ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A general-purpose command-line pipe buffer";
|
||||
homepage = http://www.glines.org/wiki/bfr;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -67,12 +67,13 @@ let
|
|||
cp -r usr/* $out
|
||||
rm $out/bin/runenpass.sh
|
||||
cp $out/bin/EnpassHelper/EnpassHelper{,.untampered}
|
||||
cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered}
|
||||
|
||||
sed \
|
||||
-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
|
||||
$out/share/applications/enpass.desktop
|
||||
|
||||
for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do
|
||||
for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do
|
||||
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i
|
||||
done
|
||||
|
||||
|
|
@ -85,8 +86,15 @@ let
|
|||
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
|
||||
--set HIDE_TOOLBAR_LINE 0 \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||
--set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered" \
|
||||
--set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered:$out/bin/EnpassHelper/EnpassNMHost=$out/bin/EnpassHelper/EnpassNMHost.untampered" \
|
||||
--prefix PATH : ${lsof}/bin
|
||||
|
||||
makeWrapper $out/bin/EnpassHelper/{EnpassNMHost,runNativeMessaging.sh} \
|
||||
--set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
|
||||
--set QT_PLUGIN_PATH "$out/plugins" \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
|
||||
--set HIDE_TOOLBAR_LINE 0
|
||||
'';
|
||||
};
|
||||
updater = {
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite
|
||||
, hicolor_icon_theme }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, ccid, qttools, qttranslations
|
||||
, pkgconfig, pcsclite, hicolor_icon_theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "3.12.5.1233";
|
||||
version = "3.12.10";
|
||||
name = "qesteidutil-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://installer.id.ee/media/ubuntu/pool/main/q/qesteidutil/qesteidutil_${version}.orig.tar.xz";
|
||||
sha256 = "b5f0361af1891cfab6f9113d6b2fab677cc4772fc18b62df7d6e997f13b97857";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir src
|
||||
tar xf $src -C src
|
||||
cd src
|
||||
'';
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-eid";
|
||||
repo = "qesteidutil";
|
||||
# TODO: Switch back to this after next release.
|
||||
#rev = "v${version}";
|
||||
# We require the remove breakpad stuff
|
||||
rev = "efdfe4c5521f68f206569e71e292a664bb9f46aa";
|
||||
sha256 = "0zly83sdqsf9lxnfw4ir2a9vmmfba181rhsrz61ga2zzpm2wf0f0";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ cmake ccid qttools pcsclite qttranslations
|
||||
|
|
|
|||
|
|
@ -3360,6 +3360,8 @@ with pkgs;
|
|||
|
||||
megatools = callPackage ../tools/networking/megatools { };
|
||||
|
||||
memo = callPackage ../applications/misc/memo/default.nix { };
|
||||
|
||||
metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
|
||||
|
||||
metar = callPackage ../applications/misc/metar { };
|
||||
|
|
@ -7242,6 +7244,8 @@ with pkgs;
|
|||
|
||||
drake = callPackage ../development/tools/build-managers/drake { };
|
||||
|
||||
drip = callPackage ../development/tools/drip { };
|
||||
|
||||
drush = callPackage ../development/tools/misc/drush { };
|
||||
|
||||
editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
|
||||
|
|
@ -7723,7 +7727,7 @@ with pkgs;
|
|||
universal-ctags = callPackage ../development/tools/misc/universal-ctags { };
|
||||
|
||||
vagrant = callPackage ../development/tools/vagrant {
|
||||
ruby = ruby_2_3;
|
||||
ruby = ruby_2_4;
|
||||
};
|
||||
|
||||
bashdb = callPackage ../development/tools/misc/bashdb { };
|
||||
|
|
@ -12546,7 +12550,6 @@ with pkgs;
|
|||
linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
|
||||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.p9_fixes
|
||||
kernelPatches.cpu-cgroup-v2."4.4"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
]
|
||||
|
|
@ -12560,7 +12563,6 @@ with pkgs;
|
|||
linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
|
||||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.p9_fixes
|
||||
kernelPatches.cpu-cgroup-v2."4.9"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
]
|
||||
|
|
@ -12590,14 +12592,10 @@ with pkgs;
|
|||
linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix {
|
||||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.p9_fixes
|
||||
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
|
||||
# when adding a new linux version
|
||||
kernelPatches.cpu-cgroup-v2."4.11"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6
|
||||
kernelPatches.iwlwifi_mvm_support_version_7_scan_req_umac_fw_command
|
||||
]
|
||||
++ lib.optionals ((platform.kernelArch or null) == "mips")
|
||||
[ kernelPatches.mips_fpureg_emu
|
||||
|
|
@ -19311,7 +19309,9 @@ with pkgs;
|
|||
|
||||
ekiga = newScope pkgs.gnome2 ../applications/networking/instant-messengers/ekiga { };
|
||||
|
||||
emulationstation = callPackage ../misc/emulators/emulationstation { };
|
||||
emulationstation = callPackage ../misc/emulators/emulationstation {
|
||||
stdenv = overrideCC stdenv gcc5;
|
||||
};
|
||||
|
||||
electricsheep = callPackage ../misc/screensavers/electricsheep { };
|
||||
|
||||
|
|
@ -19526,7 +19526,7 @@ with pkgs;
|
|||
pcre = pcre-cpp;
|
||||
});
|
||||
|
||||
redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { };
|
||||
redis-desktop-manager = libsForQt59.callPackage ../applications/misc/redis-desktop-manager { };
|
||||
|
||||
robo3t = callPackage ../applications/misc/robo3t { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1646,10 +1646,10 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
|
||||
CGI = buildPerlPackage rec {
|
||||
name = "CGI-4.37";
|
||||
name = "CGI-4.38";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
|
||||
sha256 = "7a14eee5df640f7141848f653cf48d99bfc9b5c68e18167338ee01b91cdfb883";
|
||||
sha256 = "8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4";
|
||||
};
|
||||
buildInputs = [ TestDeep TestNoWarnings TestWarn ];
|
||||
propagatedBuildInputs = [ HTMLParser self."if" ];
|
||||
|
|
@ -8032,11 +8032,13 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
|
||||
LogAny = buildPerlPackage rec {
|
||||
name = "Log-Any-1.045";
|
||||
name = "Log-Any-1.703";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz";
|
||||
sha256 = "d95180c0c2d50d7d3a541e0c79d83ee6b4ad5787e1785b361fed450c2dec8400";
|
||||
sha256 = "65a2ffba5f5fd355ce0b2365b478dda5ee091cf9d81c047dd22fe5ef4f823e3b";
|
||||
};
|
||||
# Syslog test fails.
|
||||
preCheck = "rm t/syslog.t";
|
||||
meta = {
|
||||
homepage = https://github.com/preaction/Log-Any;
|
||||
description = "Bringing loggers and listeners together";
|
||||
|
|
@ -9176,16 +9178,17 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
|
||||
Moo = buildPerlPackage rec {
|
||||
name = "Moo-2.003003";
|
||||
name = "Moo-2.003004";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
|
||||
sha256 = "6d858dcb376186533cfb63e45963d0464ac12832cc06fc6ed8ae796bdd8d5504";
|
||||
sha256 = "f8bbb625f8e963eabe05cff9048fdd72bdd26777404ff2c40bc690f558be91e1";
|
||||
};
|
||||
buildInputs = [ TestFatal ];
|
||||
propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny SubQuote ];
|
||||
meta = {
|
||||
description = "Minimalist Object Orientation (with Moose compatibility)";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -12749,6 +12752,21 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
};
|
||||
|
||||
SubInfo = buildPerlPackage rec {
|
||||
name = "Sub-Info-0.002";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
|
||||
sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea";
|
||||
};
|
||||
buildInputs = [ TestSimple13 ];
|
||||
propagatedBuildInputs = [ Importer ];
|
||||
meta = {
|
||||
description = "Tool for inspecting subroutines";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
SubInstall = buildPerlPackage {
|
||||
name = "Sub-Install-0.927";
|
||||
src = fetchurl {
|
||||
|
|
@ -12931,15 +12949,16 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
};
|
||||
|
||||
SysSyslog = buildPerlPackage {
|
||||
name = "Sys-Syslog-0.34";
|
||||
SysSyslog = buildPerlPackage rec {
|
||||
name = "Sys-Syslog-0.35";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.34.tar.gz;
|
||||
sha256 = "09cnzk0fpj2i8asi4ba5wzs3i5pmbins87xpgmxcw4ipmn66s7ld";
|
||||
url = "mirror://cpan/authors/id/S/SA/SAPER/${name}.tar.gz";
|
||||
sha256 = "fe28e47b70b77aaae754385fe1470d174289e7b6908efa247d2e52486516fbb7";
|
||||
};
|
||||
meta = {
|
||||
description = "Perl interface to the UNIX syslog(3) calls";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -13315,6 +13334,21 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
};
|
||||
|
||||
TermTable = buildPerlPackage rec {
|
||||
name = "Term-Table-0.012";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
|
||||
sha256 = "4db6118fbf862bd32a8402e1ee28ce2044d0e0887ef29b726e917ab4258a063a";
|
||||
};
|
||||
buildInputs = [ TestSimple13 ];
|
||||
propagatedBuildInputs = [ Importer ];
|
||||
meta = {
|
||||
description = "Format a header and rows into a table";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
TermVT102 = buildPerlPackage {
|
||||
name = "Term-VT102-0.91";
|
||||
src = fetchurl {
|
||||
|
|
@ -13362,12 +13396,12 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
|
||||
Test2Suite = buildPerlPackage rec {
|
||||
name = "Test2-Suite-0.000061";
|
||||
name = "Test2-Suite-0.000094";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
|
||||
sha256 = "b2ef2a59c8864c79f6c6a64c65e12c93f881361e4d9eb54419fcb4785c08ea75";
|
||||
sha256 = "7135ccb6af82bac39801234e1ce49eb8693dfe8f8e215c7de577c7ded65b6e5f";
|
||||
};
|
||||
propagatedBuildInputs = [ Importer TestSimple13 ];
|
||||
propagatedBuildInputs = [ Importer ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ];
|
||||
meta = {
|
||||
description = "Distribution with a rich set of tools built upon the Test2 framework";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
|
|
@ -14182,10 +14216,10 @@ let self = _self // overrides; _self = with self; {
|
|||
TestSimple = null;
|
||||
|
||||
TestSimple13 = buildPerlPackage rec {
|
||||
name = "Test-Simple-1.302067";
|
||||
name = "Test-Simple-1.302120";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
|
||||
sha256 = "4d43a1ed9cd43a5ad0e6cb206c0cd86d59f118ad6895220688d7bd918016b2a3";
|
||||
sha256 = "c82360092d4dacd6e3248b613fa00053072fe9cf55d022f1e0f427f51d04346c";
|
||||
};
|
||||
meta = {
|
||||
description = "Basic utilities for writing tests";
|
||||
|
|
|
|||
|
|
@ -5483,6 +5483,10 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter {
|
||||
inherit (pkgs.gitAndTools) git-annex;
|
||||
};
|
||||
|
||||
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
|
||||
google-cloud-sdk-gce = callPackage ../tools/admin/google-cloud-sdk { with-gce=true; };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue