Commit graph

37682 commits

Author SHA1 Message Date
Gleb Peregud 7797e1a1dd erlang: put Elixir/LFE into per-OTP packageset.
This makes beam.package.erlangR19.abnf to be actually built with R19,
instead of the default R18. It means that Elixir and LFE are provided in
two versions, one built with R18 and with R19.

Please note that Elixir does not build with R16 and R17 - trying to
access beam.packages.erlang{R16,R17}.elixir will throw an error.
2017-06-19 19:58:57 +02:00
Gleb Peregud f66b0186dc erlang: fix rebar3-nix-bootstrap in Erlang < R18. 2017-06-19 19:53:15 +02:00
Gleb Peregud d1b9c9d2cd erlang: refactor: build packages per Erlang/OTP.
This change introduces a fixpoint, which allows to do deep override when
building packages defined in pkgs/development/beam-modules/default.hex.
This allows to provide beam.packages.erlang{,R16,R17,R18,R19} which
contains the same packages built with different Erlang/OTP versions.

Top-level attribute beamPackages points at beam.packages.erlangR18, the
same applies to other top-level Erlang packages.

TODO:
- beam.packages.erlang{R16,R17} is almost useless, since rebar/rebar3
  does not build using these versions;
- all packages in beam.packages which use buildMix are actually built
  with erlangR18;
- update documentation.
2017-06-19 19:53:15 +02:00
goibhniu 7d747e1b16 Merge pull request #26626 from magnetophon/jackaudio
jackaudio: 1.9.10 -> 1.9.11-RC1
2017-06-19 16:44:59 +02:00
Joachim F 311d06a787 Merge pull request #26648 from magnetophon/serd
serd: 0.24.0 -> 0.26.0
2017-06-19 14:29:14 +01:00
Bart Brouns 9d0441434d jackaudio: 1.9.10 -> 1.9.11-RC1 2017-06-19 15:11:41 +02:00
Frederik Rietdijk 76beb08313 python.pkgs: several maintenance bumps 2017-06-19 13:43:19 +02:00
Peter Hoeg 9193bcb6b4 kde-applications: 17.04.1 -> 17.04.2
use https as the remote server expects it
2017-06-19 19:26:52 +08:00
Eelco Dolstra c1e5ca92b7
aws-sdk-cpp: Better fix for the failing credentials test 2017-06-19 10:58:37 +02:00
Vladimír Čunát 629e9c6dc7
Merge branch 'staging'
I don't like to wait for the expat-induced rebuild to happen yet another
time on staging.
2017-06-19 07:29:42 +02:00
Peter Hoeg 5eac427ff2 kde-frameworks: 5.33 -> 5.34 2017-06-19 10:37:38 +08:00
Robert Helgesson 5fc48529bc
expat: 2.2.0 -> 2.2.1
Includes fixes for CVE-2017-9233 and CVE-2016-9063.
2017-06-19 00:01:17 +02:00
Jörg Thalheim bdb731a57a Merge pull request #26683 from yurrriq/update-polyml
polyml: 5.6 -> 5.7
2017-06-18 22:12:51 +01:00
Eric Bailey 0f51a2a029
polyml: autoreconfHook -> nativeBuildInputs
Thanks, @peterhoeg.
2017-06-18 11:41:26 -05:00
Eric Bailey 6818848fac polyml: enable libffi and gmp
Thanks, @Mic92.
2017-06-18 11:33:21 -05:00
Daiderd Jordan 7c90c45856 Merge pull request #26673 from LumiGuide/fix-opencv-contrib-osx
opencv-3.x: fix build on OS X
2017-06-18 17:11:59 +02:00
Thomas Tuegel e6cf9b9df0
qt56: determine plugin and import paths from PATH
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
2017-06-18 08:44:47 -05:00
Thomas Tuegel dab7700f6c
qt58: determine plugin and import paths from PATH
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
2017-06-18 08:44:47 -05:00
Thomas Tuegel 99ed5853eb
qt56.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel 8cc09c9e3e
qt56.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel c546c26e3a
qt58.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel b1dcd271d1
qt58.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel f392614251
qt58.qtbase: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel b7f895d972
kwindowsystem: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel acc45767c5
kservice: propagate shared_mime_info to environment 2017-06-18 08:44:46 -05:00
Thomas Tuegel 86dac81a70
kcmutils: fix kcm plugin path 2017-06-18 08:44:45 -05:00
Thomas Tuegel 7af16e5bd7
kcmutils: print plugin name when loading fails 2017-06-18 08:44:45 -05:00
Thomas Tuegel fc72335570
kio: print plugin name when loading fails 2017-06-18 08:44:45 -05:00
Thomas Tuegel faf0d3e91d
kdeFrameworks: fixup inputs and outputs
- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
2017-06-18 08:44:45 -05:00
Thomas Tuegel 087f20e8c6
kdeFrameworks: sort according to tier 2017-06-18 08:44:44 -05:00
Thomas Tuegel 9149faf6a9
prison: init at 5.33.0 2017-06-18 08:44:44 -05:00
Thomas Tuegel f5c00c43bb
qgpgme: init at 1.9.0 2017-06-18 08:44:44 -05:00
Jos van den Oever 05ef92e53a
gpgme: enable Qt 5 bindings 2017-06-18 08:44:44 -05:00
Thomas Tuegel 7dc961b310
qttools: move runtime tools in postFixup 2017-06-18 08:44:43 -05:00
Thomas Tuegel dea7372ebf
qtbase: fix plugin path in CMake modules 2017-06-18 08:44:43 -05:00
Thomas Tuegel d9f29afa64
qt5: use one output by default 2017-06-18 08:44:43 -05:00
Thomas Tuegel 6fa41788be
qt5: separate plugins from libraries 2017-06-18 08:44:42 -05:00
Thomas Tuegel 5a8295e596
qtbase: setup required environment in GTK3 platform theme plugin 2017-06-18 08:44:42 -05:00
Thomas Tuegel c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel 1607f51613
qmake: unify Darwin and Linux setup hooks 2017-06-18 08:43:39 -05:00
Thomas Tuegel 945758f960
kdeFrameworks: rename kdeFramework to mkDerivation 2017-06-18 08:42:20 -05:00
Thomas Tuegel 7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel 3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
Jörg Thalheim a9aefdeac9
pythonPackages.rebulk: 0.8.2 -> 0.9.0 2017-06-18 13:18:40 +01:00
Jörg Thalheim 513204073a Merge pull request #26692 from dywedir/rustfmt
rustfmt: 0.8.3 -> 0.9.0
2017-06-18 12:36:45 +01:00
Vladimír Čunát 8702fd35e2
Merge branch 'master' into staging
... to get in more fixes of setuid/setgid.
2017-06-18 13:22:23 +02:00
Jörg Thalheim 8a4a4efbe6
clooj: fix download src 2017-06-18 11:39:55 +01:00
dywedir 72f8ba269c rustfmt: 0.8.3 -> 0.9.0 2017-06-18 13:06:31 +03:00
Jörg Thalheim 76ea4df5f9
pythonPackages.keystoneauth1: fix missing argparse dep 2017-06-18 11:03:13 +01:00