public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into parnell/fetchdocker

Browse Source
This commit is contained in:
Parnell Springmeyer 2017-12-02 09:22:22 -06:00
commit a6cdf0aaa1
No known key found for this signature in database
GPG Key ID: C7FD72B325BC271F
38 changed files with 1909 additions and 1275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -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>";

6
pkgs/applications/audio/airwave/default.nix
View File

@ -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

7
pkgs/applications/audio/keyfinder/default.nix
View File

@ -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;

66
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;
@ -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";

12
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
@ -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;

6
pkgs/applications/misc/evopedia/default.nix
View File

@ -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;

770
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

770
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/science/logic/glucose/syrup.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, glucose }:
{ stdenv, zlib, glucose }:
stdenv.mkDerivation rec {
name = "glucose-syrup-${version}";
version = glucose.version;

148
pkgs/applications/science/misc/simgrid/default.nix
View File

@ -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;
};
}

7
pkgs/applications/version-management/tortoisehg/default.nix
View File

@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
doCheck = false;
doCheck = true;
dontStrip = true;
buildPhase = "";
installPhase = ''
@ -23,6 +23,11 @@ python2Packages.buildPythonApplication rec {
ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
'';
checkPhase = ''
echo "test: thg version"
$out/bin/thg version
'';
meta = {
description = "Qt based graphical tool for working with Mercurial";
homepage = http://tortoisehg.bitbucket.org/;

2
pkgs/desktops/mate/default.nix
View File

@ -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

36
pkgs/desktops/mate/mate-media/default.nix Normal file
View File

@ -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 ];
};
}

4
pkgs/development/compilers/elm/default.nix
View File

@ -72,7 +72,9 @@ let
where foo is a tag for a new version, for example "0.3.1-alpha".
*/
elm-format = self.callPackage ./packages/elm-format.nix { };
elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {
aeson-pretty = self.aeson-pretty_0_7_2;
};
};
in elmPkgs // {
inherit elmPkgs;

24
pkgs/development/compilers/elm/packages/elm-interface-to-json.nix Normal file
View File

@ -0,0 +1,24 @@
{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
, concatenative, containers, directory, either, elm-compiler
, filemanip, filepath, indents, optparse-applicative, parsec
, stdenv, text, transformers, fetchgit
}:
mkDerivation {
pname = "elm-interface-to-json";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/stoeffel/elm-interface-to-json";
sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k";
rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323";
};
isLibrary = false;
isExecutable = true;
jailbreak = true;
executableHaskellDepends = [
aeson aeson-pretty base binary bytestring concatenative containers
directory either elm-compiler filemanip filepath indents
optparse-applicative parsec text transformers
];
homepage = "https://github.com/githubuser/elm-interface-to-json#readme";
license = stdenv.lib.licenses.bsd3;
}

6
pkgs/development/compilers/go/1.8.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, fetchpatch
, perl, which, pkgconfig, patch, procps
, pcre, cacert, llvm
, Security, Foundation, bash
, makeWrapper, git, subversion, mercurial, bazaar }:
@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ];
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
++ optionals stdenv.isLinux [ procps ];
buildInputs = [ pcre ]
++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
@ -144,6 +145,7 @@ stdenv.mkDerivation rec {
export GOROOT=$out/share/go
export GOBIN=$GOROOT/bin
export PATH=$GOBIN:$PATH
ulimit -a
'';
postConfigure = optionalString stdenv.isDarwin ''

6
pkgs/development/compilers/go/1.9.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, fetchpatch
, perl, which, pkgconfig, patch, procps
, pcre, cacert, llvm
, Security, Foundation, bash
, makeWrapper, git, subversion, mercurial, bazaar }:
@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ];
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
++ optionals stdenv.isLinux [ procps ];
buildInputs = [ pcre ]
++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
@ -150,6 +151,7 @@ stdenv.mkDerivation rec {
export GOROOT=$out/share/go
export GOBIN=$GOROOT/bin
export PATH=$GOBIN:$PATH
ulimit -a
'';
postConfigure = optionalString stdenv.isDarwin ''

3
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -9,6 +9,7 @@ let
hashes = {
i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668";
x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8";
aarch64-unknown-linux-gnu = "eaab3df489d4d8f976c4327d812b9870730eed6d0bbd52712767083d02be7472";
i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5";
x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5";
};
@ -18,6 +19,8 @@ let
then "i686-unknown-linux-gnu"
else if stdenv.system == "x86_64-linux"
then "x86_64-unknown-linux-gnu"
else if stdenv.system == "aarch64-linux"
then "aarch64-unknown-linux-gnu"
else if stdenv.system == "i686-darwin"
then "i686-apple-darwin"
else if stdenv.system == "x86_64-darwin"

4
pkgs/development/compilers/rust/default.nix
View File

@ -23,7 +23,9 @@ rec {
patches = [
./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch
# https://github.com/rust-lang/rust/issues/45410
++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;
};

12
pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/librustc_back/dynamic_lib.rs b/src/librustc_back/dynamic_lib.rs
index 1b42fa0..92256dc 100644
--- a/src/librustc_back/dynamic_lib.rs
+++ b/src/librustc_back/dynamic_lib.rs
@@ -80,6 +80,7 @@ mod tests {
use std::mem;
#[test]
+ #[ignore]
fn test_loading_cosine() {
if cfg!(windows) {
return

1
pkgs/development/compilers/rust/print-hashes.sh
View File

@ -10,6 +10,7 @@ set -euo pipefail
PLATFORMS=(
i686-unknown-linux-gnu
x86_64-unknown-linux-gnu
aarch64-unknown-linux-gnu
i686-apple-darwin
x86_64-apple-darwin
)

3
pkgs/development/compilers/rust/rustc.nix
View File

@ -34,6 +34,9 @@ stdenv.mkDerivation {
__darwinAllowLocalNetworking = true;
# The build will fail at the very end on AArch64 without this.
dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
# Enable nightly features in stable compiles (used for

628
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/interpreters/j/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cd make
sed -i *.sh -e 's@/bin/bash@/usr/bin/env bash@;'
patchShebangs .
sed -i jvars.sh -e '
s@~/gitdev/jsource@$SOURCE_DIR@;
s@~/jbld@$HOME@;

4
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -6,9 +6,9 @@ Before a major version update, make a copy of this directory. (We like to
keep the old version around for a short time after major updates.) Add a
top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `maintainers/scripts/generate-qt.sh`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes.
4. Check that the new packages build correctly.
5. Commit the changes and open a pull request.

2
pkgs/development/libraries/qt-5/5.9/fetch.sh
View File

@ -1,2 +1,2 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \
-A '*.tar.xz' )

115
pkgs/development/libraries/qt-5/5.9/qtbase.patch
View File

@ -101,7 +101,7 @@ index bb5083c925..da8e2cb386 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 17da8b979e..d648ab4058 100644
index 55c74aad66..0bbc8718eb 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
@ -261,10 +261,10 @@ index 17da8b979e..d648ab4058 100644
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 395ac34001..a0e5c68b7e 100644
index e645ba5803..a0e5c68b7e 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -24,165 +24,3 @@ qt {
@@ -24,166 +24,3 @@ qt {
}
}
}
@ -427,17 +427,18 @@ index 395ac34001..a0e5c68b7e 100644
-}
-
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-cache(QMAKE_XCODE_VERSION, stash)
-!isEmpty(QMAKE_XCODE_VERSION): \
- cache(QMAKE_XCODE_VERSION, stash)
-
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e21e749ee9..3b01424e67 100644
index 44636f2288..61ed486a76 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -1,51 +1,2 @@
@@ -1,56 +1,3 @@
CONFIG = asset_catalogs rez $$CONFIG
load(default_pre)
-
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
- # Get path of Xcode's Developer directory
- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
@ -447,18 +448,23 @@ index e21e749ee9..3b01424e67 100644
- # Make sure Xcode path is valid
- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
-
- # Make sure Xcode is set up properly
- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
-}
-
-isEmpty(QMAKE_XCODE_VERSION) {
- # Extract Xcode version using xcodebuild
- xcode_version = $$system("/usr/bin/xcodebuild -version")
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
- unset(xcode_version)
-isEmpty(QMAKE_XCODEBUILD_PATH): \
- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")
-
-!isEmpty(QMAKE_XCODEBUILD_PATH) {
- # Make sure Xcode is set up properly
- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \
- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")
-
- isEmpty(QMAKE_XCODE_VERSION) {
- # Extract Xcode version using xcodebuild
- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
- unset(xcode_version)
- }
-}
-
-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
@ -487,11 +493,11 @@ index e21e749ee9..3b01424e67 100644
-# at build time, depending on the current Xcode SDK and configuration.
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 68ab7e4053..e69de29bb2 100644
index 3f6dc076ca..8b13789179 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -1,49 +0,0 @@
-
@@ -1,58 +1 @@
-isEmpty(QMAKE_MAC_SDK): \
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
-
@ -500,13 +506,22 @@ index 68ab7e4053..e69de29bb2 100644
-
-defineReplace(xcodeSDKInfo) {
- info = $$1
- equals(info, "Path"): \
- info = --show-sdk-path
- equals(info, "PlatformPath"): \
- info = --show-sdk-platform-path
- equals(info, "SDKVersion"): \
- info = --show-sdk-version
- sdk = $$2
- isEmpty(sdk): \
- sdk = $$QMAKE_MAC_SDK
-
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null")
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'")
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
- # --show-sdk-platform-path won't work for Command Line Tools; this is fine
- # only used by the XCTest backend to testlib
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
- error("Could not resolve SDK $$info for \'$$sdk\'")
- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
- }
-
@ -581,10 +596,10 @@ index d49f4c49c1..097dcd7d39 100644
target.path = $$instbase/$$TARGETPATH
INSTALLS += target
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
index cb84ae0da8..45e16f4302 100644
index 883f8ca215..81db8eb2d4 100644
--- a/mkspecs/features/qt_app.prf
+++ b/mkspecs/features/qt_app.prf
@@ -29,7 +29,7 @@ host_build:force_bootstrap {
@@ -33,7 +33,7 @@ host_build:force_bootstrap {
target.path = $$[QT_HOST_BINS]
} else {
!build_pass:qtConfig(debug_and_release): CONFIG += release
@ -607,7 +622,7 @@ index 1848f00e90..2af93675c5 100644
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
}
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 1e138730b3..b7ba74dc3f 100644
index fb96d1b6a0..508ed17d30 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) {
@ -661,20 +676,32 @@ index 72dde61a40..f891a2baed 100644
INSTALLS += inst_qch_docs
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 0a008374e5..5e7cd92f6f 100644
index 668669e4cd..30f7fbac41 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -73,7 +73,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
$$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
$$DBUS_ADAPTORS $$DBUS_INTERFACES
addInstallFiles(sources.files, $$sourcefiles)
- sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase
INSTALLS += sources
@@ -77,13 +77,13 @@ for(extra, extras): \
# Just for Qt Creator
OTHER_FILES += $$sourcefiles
check_examples {
-sourcefiles += \
- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
- $$DBUS_ADAPTORS $$DBUS_INTERFACES
-addInstallFiles(sources.files, $$sourcefiles)
-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
-INSTALLS += sources
+ sourcefiles += \
+ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
+ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
+ $$DBUS_ADAPTORS $$DBUS_INTERFACES
+ addInstallFiles(sources.files, $$sourcefiles)
+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase
+ INSTALLS += sources
check_examples {
srcfiles = $$sources.files
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index c00fdb73f8..5789cd0c06 100644
index 1903e509c8..ae7b585989 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@ -836,7 +863,7 @@ index 706304cf34..546420f6ad 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 39e7c71a9c..dced1f2811 100644
index cba279c184..5ae3fd62e5 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths()
@ -856,7 +883,7 @@ index 39e7c71a9c..dced1f2811 100644
if (!libPathEnv.isEmpty()) {
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
index 1714c9802f..fd2ebb1336 100644
index 4fdc2e36ac..d3ec222543 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
@ -872,7 +899,7 @@ index 1714c9802f..fd2ebb1336 100644
if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
@@ -645,12 +649,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
if (!tzif.open(QIODevice::ReadOnly))
return;
} else {
@ -967,7 +994,7 @@ index 1da00813ce..0bf877afcb 100644
return false;
}
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index cf08a15f96..2310488298 100644
index 9a24938284..74962b4ae2 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -102,7 +102,7 @@ static bool resolveLibraryInternal()
@ -1024,7 +1051,7 @@ index 341d3bccf2..3368234c26 100644
scanThread->interfaceName = QString::fromNSString(ifName);
scanThread->start();
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index ca9f7af127..a337ad73bf 100644
index b5a0a5bbeb..6c20305f4d 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
@ -1042,7 +1069,7 @@ index ca9f7af127..a337ad73bf 100644
QString TableGenerator::findComposeFile()
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 59b76370ae..b91139ded9 100644
index 5cd4beb4f0..84919e6d6a 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -320,7 +320,7 @@ static void qt_closePopups()
@ -1055,7 +1082,7 @@ index 59b76370ae..b91139ded9 100644
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index 7640a711a9..ef9a14d38b 100644
index e2e573f0e1..1c8289f81e 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
@ -1074,11 +1101,11 @@ index 7640a711a9..ef9a14d38b 100644
#endif
}
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index d257ab1242..75853af4e4 100644
index 7c62c2e2b3..fefa40e0f6 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
#if defined(XCB_USE_XLIB) && QT_CONFIG(library)
#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
static bool function_ptrs_not_initialized = true;
if (function_ptrs_not_initialized) {
- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);

312
pkgs/development/libraries/qt-5/5.9/srcs.nix
View File

@ -3,275 +3,275 @@
{
qt3d = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz";
sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg";
name = "qt3d-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz";
sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp";
name = "qt3d-opensource-src-5.9.3.tar.xz";
};
};
qtactiveqt = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz";
sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg";
name = "qtactiveqt-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz";
sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r";
name = "qtactiveqt-opensource-src-5.9.3.tar.xz";
};
};
qtandroidextras = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz";
sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj";
name = "qtandroidextras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz";
sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n";
name = "qtandroidextras-opensource-src-5.9.3.tar.xz";
};
};
qtbase = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz";
sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw";
name = "qtbase-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz";
sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y";
name = "qtbase-opensource-src-5.9.3.tar.xz";
};
};
qtcanvas3d = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz";
sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb";
name = "qtcanvas3d-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz";
sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y";
name = "qtcanvas3d-opensource-src-5.9.3.tar.xz";
};
};
qtcharts = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz";
sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k";
name = "qtcharts-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz";
sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc";
name = "qtcharts-opensource-src-5.9.3.tar.xz";
};
};
qtconnectivity = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz";
sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0";
name = "qtconnectivity-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz";
sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2";
name = "qtconnectivity-opensource-src-5.9.3.tar.xz";
};
};
qtdatavis3d = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz";
sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13";
name = "qtdatavis3d-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz";
sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh";
name = "qtdatavis3d-opensource-src-5.9.3.tar.xz";
};
};
qtdeclarative = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz";
sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj";
name = "qtdeclarative-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz";
sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh";
name = "qtdeclarative-opensource-src-5.9.3.tar.xz";
};
};
qtdoc = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz";
sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x";
name = "qtdoc-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz";
sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5";
name = "qtdoc-opensource-src-5.9.3.tar.xz";
};
};
qtgamepad = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz";
sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi";
name = "qtgamepad-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz";
sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6";
name = "qtgamepad-opensource-src-5.9.3.tar.xz";
};
};
qtgraphicaleffects = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz";
name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr";
name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
};
};
qtimageformats = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz";
sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr";
name = "qtimageformats-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz";
sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl";
name = "qtimageformats-opensource-src-5.9.3.tar.xz";
};
};
qtlocation = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz";
sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b";
name = "qtlocation-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz";
sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0";
name = "qtlocation-opensource-src-5.9.3.tar.xz";
};
};
qtmacextras = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz";
sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11";
name = "qtmacextras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz";
sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy";
name = "qtmacextras-opensource-src-5.9.3.tar.xz";
};
};
qtmultimedia = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz";
sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4";
name = "qtmultimedia-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz";
sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7";
name = "qtmultimedia-opensource-src-5.9.3.tar.xz";
};
};
qtnetworkauth = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz";
sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra";
name = "qtnetworkauth-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz";
sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz";
name = "qtnetworkauth-opensource-src-5.9.3.tar.xz";
};
};
qtpurchasing = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz";
sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss";
name = "qtpurchasing-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz";
sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j";
name = "qtpurchasing-opensource-src-5.9.3.tar.xz";
};
};
qtquickcontrols = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz";
sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj";
name = "qtquickcontrols-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz";
sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih";
name = "qtquickcontrols-opensource-src-5.9.3.tar.xz";
};
};
qtquickcontrols2 = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz";
sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0";
name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz";
sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1";
name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz";
};
};
qtremoteobjects = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz";
sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0";
name = "qtremoteobjects-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz";
sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk";
name = "qtremoteobjects-opensource-src-5.9.3.tar.xz";
};
};
qtscript = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz";
sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp";
name = "qtscript-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz";
sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq";
name = "qtscript-opensource-src-5.9.3.tar.xz";
};
};
qtscxml = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz";
sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0";
name = "qtscxml-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz";
sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq";
name = "qtscxml-opensource-src-5.9.3.tar.xz";
};
};
qtsensors = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz";
sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was";
name = "qtsensors-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz";
sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr";
name = "qtsensors-opensource-src-5.9.3.tar.xz";
};
};
qtserialbus = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz";
sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa";
name = "qtserialbus-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz";
sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg";
name = "qtserialbus-opensource-src-5.9.3.tar.xz";
};
};
qtserialport = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz";
sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1";
name = "qtserialport-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz";
sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac";
name = "qtserialport-opensource-src-5.9.3.tar.xz";
};
};
qtspeech = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz";
sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c";
name = "qtspeech-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz";
sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1";
name = "qtspeech-opensource-src-5.9.3.tar.xz";
};
};
qtsvg = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz";
sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr";
name = "qtsvg-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz";
sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz";
name = "qtsvg-opensource-src-5.9.3.tar.xz";
};
};
qttools = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz";
sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4";
name = "qttools-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz";
sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24";
name = "qttools-opensource-src-5.9.3.tar.xz";
};
};
qttranslations = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz";
sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja";
name = "qttranslations-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz";
sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20";
name = "qttranslations-opensource-src-5.9.3.tar.xz";
};
};
qtvirtualkeyboard = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b";
name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr";
name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
};
};
qtwayland = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz";
sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g";
name = "qtwayland-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz";
sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih";
name = "qtwayland-opensource-src-5.9.3.tar.xz";
};
};
qtwebchannel = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz";
sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0";
name = "qtwebchannel-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz";
sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3";
name = "qtwebchannel-opensource-src-5.9.3.tar.xz";
};
};
qtwebengine = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz";
sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn";
name = "qtwebengine-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz";
sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5";
name = "qtwebengine-opensource-src-5.9.3.tar.xz";
};
};
qtwebkit = {
@ -291,43 +291,43 @@
};
};
qtwebsockets = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz";
sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1";
name = "qtwebsockets-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz";
sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf";
name = "qtwebsockets-opensource-src-5.9.3.tar.xz";
};
};
qtwebview = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz";
sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn";
name = "qtwebview-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz";
sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf";
name = "qtwebview-opensource-src-5.9.3.tar.xz";
};
};
qtwinextras = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz";
sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s";
name = "qtwinextras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz";
sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl";
name = "qtwinextras-opensource-src-5.9.3.tar.xz";
};
};
qtx11extras = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz";
sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6";
name = "qtx11extras-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz";
sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74";
name = "qtx11extras-opensource-src-5.9.3.tar.xz";
};
};
qtxmlpatterns = {
version = "5.9.1";
version = "5.9.3";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz";
sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m";
name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz";
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz";
sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g";
name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz";
};
};
}

4
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -3,7 +3,7 @@
src, patches, version, qtCompatVersion,
coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
ruby,
ruby, which,
# darwin support
darwin, libiconv, libcxx,
@ -84,7 +84,7 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs =
[ bison flex gperf lndir perl pkgconfig python2 ]
[ bison flex gperf lndir perl pkgconfig python2 which ]
++ lib.optional (!stdenv.isDarwin) patchelf;
propagatedNativeBuildInputs = [ lndir ];

14
pkgs/development/ocaml-modules/ipaddr/default.nix
View File

@ -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 ];
};
}

49
pkgs/development/python-modules/git-annex-adapter/default.nix Normal file
View File

@ -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 ];
};
}

40
pkgs/development/tools/drip/default.nix Normal file
View File

@ -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 ];
};
}

8
pkgs/development/tools/misc/gdbgui/default.nix
View File

@ -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 ]}

12
pkgs/tools/security/enpass/default.nix
View File

@ -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 = {

28
pkgs/tools/security/qesteidutil/default.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -7249,6 +7249,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 { };

64
pkgs/top-level/perl-packages.nix
View File

@ -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";

4
pkgs/top-level/python-packages.nix
View File

@ -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; };