Commit graph

764 commits

Author SHA1 Message Date
Jörg Thalheim
b6c68c34e5 Merge pull request #29327 from jtojnar/fix/meson-0.42.1
meson: 0.41.2 → 0.42.1
2017-09-13 22:16:32 +01:00
Jan Tojnar
ad8e4c272a
meson: 0.41.2 → 0.42.1 2017-09-13 22:37:30 +02:00
Vladimír Čunát
422adc3063
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Guillaume Massé
49c7bed763 sbt-with-scala-native: does not support sbt 1.X yet (#29148)
https://github.com/scala-native/scala-native/issues/915
2017-09-12 08:43:40 +01:00
Jörg Thalheim
b1140f92cc Merge pull request #29227 from gleber/beam-tooling-upgrade
beam: tooling upgrade (rebar3, hex2nix, relx, etc)
2017-09-12 08:24:15 +01:00
Artem Kazakov
60709abb82 buildbot: add wsgi dashboards plugin
fixes #29236
2017-09-12 08:16:57 +01:00
Gleb Peregud
adbc1ed0d9 rebar3: 3.3.2 -> 3.4.3 2017-09-11 22:56:43 +02:00
Frederik Rietdijk
628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
James Kay
cf497c60f0 buildbot: 0.9.9post2 -> 0.9.11 2017-09-11 13:25:53 +01:00
Frederik Rietdijk
febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Nikolay Amiantov
e5059a8739 bazel: 0.4.5 -> 0.5.4 2017-09-07 17:04:29 +03:00
Peter Hoeg
0bac95c976 rake: 11.1.0 -> 12.0.0 2017-09-07 17:50:36 +08:00
Frederik Rietdijk
d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Frederik Rietdijk
b1504b444b conan: 0.21.2 -> 0.26.2, and fix build 2017-09-07 09:28:03 +02:00
Bernd Amend
b49b9da3ce
cmake: add withQt5 option and make it the default 2017-09-06 08:02:08 -05:00
Bernd Amend
f3ac052f24
cmake: 3.8.2 -> 3.9.1 2017-09-06 08:02:05 -05:00
Tim Steinbach
aa59865333
sbt: 1.0.0 -> 1.0.1 2017-09-02 12:54:50 -04:00
Lukas Werling
f0a1ab78b4 meson/ninja: add setup hooks (#28444)
* Add setupHook for meson/ninja build

* libhttpseverywhere: Use meson/ninja setupHooks

* jamomacore: Remove superfluous ninja buildInput

* Remove obsolete ninja buildPhases

These are all handled by ninja's setup hook.

* lean2, xcbuild: fix build with ninja setup hook

Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.

* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
Frederik Rietdijk
6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
volth
a0d87c6885 Delete 2.5.nix
delete orphan file

```gradle_2_5``` is in ```default.nix```
2017-08-18 01:46:50 +00:00
Frederik Rietdijk
8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
mimadrid
4fb22bb622
meson: 0.40.0 -> 0.41.2 2017-08-15 11:54:43 +02:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Vladimír Čunát
34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Tim Steinbach
ae5e8dda07
sbt: 0.13.16 -> 1.0.0 2017-08-11 10:22:20 -04:00
Tim Steinbach
4edcfa3eb7
gradle: 4.0.2 -> 4.1 2017-08-07 11:44:35 -04:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Frederik Rietdijk
20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Tim Steinbach
9ea8535fa7 Merge pull request #27717 from NeQuissimus/sbt_0_13_16
sbt: 0.13.15 -> 0.13.16
2017-07-30 00:21:55 -04:00
Tim Steinbach
324197e60e
sbt: 0.13.15 -> 0.13.16 2017-07-28 11:27:35 -04:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Tim Steinbach
8b3e9a1358
gradle: 4.0.1 -> 4.0.2 2017-07-26 14:19:01 -04:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Guillaume Maudoux
868dd0f7c1 tup: 0.7.3 -> 0.7.5 2017-07-26 15:38:43 +02:00
Eelco Dolstra
6669a3b477
stdenv: Remove log nesting
Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
2017-07-24 14:30:46 +02:00
Eelco Dolstra
9f345ce2c7
gnumake41: Remove unused version 2017-07-24 14:27:12 +02:00
Eelco Dolstra
8cfe77444b
gnumake40: Remove unused version 2017-07-24 14:27:11 +02:00
Eelco Dolstra
969d7b0451
gnumake380: Remove
This hasn't been used in a long time.
2017-07-24 14:27:11 +02:00
Thomas Tuegel
4f88ceff49
jam: unset AR
Commit 093cc00cdd sets the AR environment variable
by default, but this causes the jam Makefile to use the wrong command.
2017-07-22 19:36:55 -05:00
Dan Peebles
8253fc2ae5 pants: 1.2.1 -> 1.3.0
I'm also removing the pants13-pre attribute since it's unnecessary and I
don't want to maintain 1.4.x prereleases yet.

I'm temporarily taking out the pants native rust engine shenanigans until
I can get a nix-native rust build of it to work (it works on Linux but
not on Darwin!)
2017-07-17 10:37:52 -04:00
Tim Steinbach
1a7d9f573b
gradle: 4.0 -> 4.0.1 2017-07-07 19:52:57 -04:00
Frederik Rietdijk
ea5b2df865 Merge pull request #27094 from nand0p/buildbot-0.9.9
buildbot: 0.9.7 -> 0.9.9.post2
2017-07-07 17:48:29 +02:00
Fernando J Pando
f6a7b851d4 buildbot: 0.9.7 -> 0.9.9.post2
- adds grid-view plugin
- module fixup
- tested on nixos
2017-07-07 10:00:37 -04:00
Pascal Wittmann
bd3b58b197 Merge pull request #27015 from expipiplus1/qbs
qbs: init at 1.8
2017-07-06 10:21:52 +02:00
Joe Hermaszewski
6fd51f96fe qbs: init at 1.8 2017-07-05 22:53:38 +01:00
hsloan
3e69864717 cmake 2.8: Don't use stdenv ? cross 2017-06-28 19:42:46 -04:00
Gleb Peregud
0fccd5bba4 erlang: update documentation.
The documentation got a bit stale compared to actual contents of
nixpkgs. This commit focuses on updating existing docs, not on making
sure all details of beam packages are covered.
2017-06-19 19:58:57 +02:00