Commit Graph

1164 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
Gleb Peregud f66b0186dc erlang: fix rebar3-nix-bootstrap in Erlang < R18. 2017-06-19 19:53:15 +02:00
Tim Steinbach 6b199db895 Merge pull request #26644 from NeQuissimus/gradle_4_0
gradle: 3.5 -> 4.0
2017-06-17 16:05:26 -04:00
Volth b1928704d4 sbt: support build scala-native targets 2017-06-16 15:52:13 +00:00
Tim Steinbach a4a0f30108
gradle: 3.5 -> 4.0 2017-06-16 08:29:08 -04:00
Vladimír Čunát d74d871f52
cmake: 3.7.2 -> 3.8.2
Tested several cmake-built packages, and all seems OK;
hopefully there won't be many problems.
2017-06-11 17:10:49 +02:00
Vladimír Čunát cb9f953c92
Merge branch 'master' into staging
More larger rebuilds.
2017-06-10 10:07:33 +02:00
Tim Jäger cfe23e19ab buck: build buckd as well
buck tries to launch buckd to run in the background. While not neccessary, it
does speed up builds.
2017-06-08 15:36:30 -07:00
Tim Jäger 926f3eada8 buck: cleanup 2017-06-08 11:26:42 -07:00
Jörg Thalheim dffbe98dd6
buck: make propagatedBuildInputs runtime deps 2017-06-08 08:36:59 +01:00
Tim Jäger 48c910611f buck: init at v2017.05.31.01 2017-06-06 22:46:02 -07:00
Daiderd Jordan 30f329e74b Merge pull request #26310 from LnL7/darwin-stdenv-no-sphinx
darwin-stdenv: remove python dependencies
2017-06-05 12:44:07 +02:00
Daiderd Jordan 9e2aba3572
darwin-stdenv: remove python-sphinx and a bunch of other dependencies from the stdenv 2017-06-01 23:23:56 +02:00
Dan Peebles 0f1753b1d3 pants13-pre: 1.3.0rc2 -> 1.3.0rc4 2017-06-01 13:53:19 +00:00
Gabriel Gonzalez 0dd5e832f0 kati: init at 2017-05-23 (#26168) 2017-05-31 02:16:16 +02:00
Joachim F 789bde2408 Merge pull request #25940 from bendlas/update-chromium
chromium: 57.0.2987.133 -> 58.0.3029.110 + build fixes
2017-05-29 22:19:57 +01:00
Vladimír Čunát 00672dec8a
Merge older staging
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
2017-05-26 15:45:43 +02:00
Vladimír Čunát 78ea189a6b
Merge branch 'master' into staging
... to fix *some* of the evaluation problems.
2017-05-24 13:56:28 +02:00
Dan Peebles c05461fde6 pants13-pre: make it actually work on Linux
Third time's a charm. Not sure how I thought that three different files
would download and have the same hash, but that's what the old code did.
This one should have the three distinct platform hashes.
2017-05-24 07:52:58 -04:00
Dan Peebles a43e104ada pants13-pre: fix on non-Darwin platforms 2017-05-24 00:05:20 -04:00
Dan Peebles b0adb09b32 pants13-pre: pre-download the native engine
This saves pants 1.3 from having to download it at startup. Eventually
we'll build it ourselves (it's a rust binary) but for now this works.
2017-05-23 22:29:33 -04:00
Vladimír Čunát 8004e79415
Merge branch 'master' into staging 2017-05-24 03:24:06 +02:00
Dan Peebles 9d5c28d22c pants: fix buggy pathspec version
When transplanting the expression in 845d1b28bf
I accidentally switched pants 1.3 to use the old pathspec, which breaks
at runtime. This should fix it.
2017-05-22 15:34:46 -04:00
Brendan Miller b737ddd65d pants13-pre: 1.3.0.dev19 -> 1.3.0rc2
Pulling in the latest 1.3.0 release candidate from pants.
2017-05-22 12:31:27 -04:00
Dan Peebles 845d1b28bf pants{,13-pre}: move from pythonPackages to top level
That means it'll build in Hydra and we don't really care which version of
Python it builds against.
2017-05-22 12:22:13 -04:00
Herwig Hochleitner 6509ba66a8 ninja: 1.7.1 -> 1.7.2 2017-05-20 16:02:50 +02:00
Vladimír Čunát 5aa530f2a8
Merge branch 'master' into staging
A few thousand rebuilds from master.
2017-05-19 08:57:59 +02:00
Benjamin Staffin 965bffdb69 bazel: 0.4.4 -> 0.4.5 (#25821)
Also added zsh and bash completion support
2017-05-18 23:14:50 -04:00
Tuomas Tynkkynen beb43a651c Merge remote-tracking branch 'upstream/master' into staging 2017-05-14 14:24:20 +03:00
Fernando J Pando a6bcf148d7 buildbot: 0.9.6 -> 0.9.7 2017-05-12 10:59:27 -04:00
Linus Heckemann 28154f45a6 cmake setup hook: allow other build types 2017-05-10 14:33:20 +01:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
Lancelot SIX d41a0832b6
buildbot: 0.9.5 -> 0.9.6 2017-05-04 12:24:55 +02:00
Frederik Rietdijk 9e48fc3268 Merge pull request #24131 from nand0p/buildbot-0.9.5
buildbot: 0.9.4 -> 0.9.5
2017-05-03 07:56:29 +02:00
Vladimír Čunát 92ee3b02e8
Merge branch 'staging'
Master is seeing a very large rebuild now, and this version of staging
seemed rather fine already (only a few thousand builds remaining now).
I really didn't want to wait a few more days because of this.
2017-05-01 18:00:21 +02:00
Michael Raskin d8b2641b58 Merge pull request #25029 from wizeman/u/new-doit
doit: init at 0.30.3
2017-05-01 13:29:18 +02:00
Vladimír Čunát 9860e77f79
Merge branch 'master' into staging 2017-04-30 14:40:39 +02:00
David Grayson 934ed02750 cmake: Prevent it from looking for packages in /
when cross-compiling for Windows.
2017-04-29 09:55:37 -07:00
Jörg Thalheim 0ee8160aa4
meson: 0.35.0 -> 0.40.0
In configured builds other tools tries to call meson by directly
passing meson tools directly to python. Since they were shell scripts
due wrapping this failed
2017-04-26 16:41:49 +02:00
Fernando J Pando 4ac06ea6a1 buildbot: 0.9.4 -> 0.9.5
- adds distro dependency
- buildbot nodaemon in service module
- fakerepo for module tests
- service module parameter fixup
- tested on nixos
- tested on darwin
2017-04-21 10:32:36 -04:00
Ricardo M. Correia 70a5b53a27 doit: init at 0.30.3
doit is a task management & automation tool.
2017-04-19 21:20:23 +02:00
Tim Steinbach 3c29b8e7da Merge pull request #24864 from NeQuissimus/gradle_3_5
gradle: 3.4.1 -> 3.5
2017-04-13 08:50:49 -04:00
mucaho 8d5e55a0f0 conan: init at 0.21.2 2017-04-13 03:43:21 +02:00
Tim Steinbach 47e82ef817
gradle: 3.4.1 -> 3.5 2017-04-12 19:40:05 -04:00
Tim Steinbach 5a3dca24d8
sbt: 0.13.14 -> 0.13.15 2017-04-10 08:44:32 -04:00
Christine Koppelt b7223e0393 maven: 3.3.9 -> 3.5.0 2017-04-09 16:58:48 +02:00
Tim Steinbach 4c718a9a5a
sbt: 0.13.13 -> 0.13.14 2017-04-07 08:22:04 -04:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Sergii Paryzhskyi af0b7afd05 sbt_0_12_4: remove old version of sbt 2017-03-21 18:12:19 +01:00
Orivej Desh 3cb1faebc7 jam: 2.5 -> 2.6 2017-03-19 04:58:21 +00:00
Michael Raskin 24f35daa60 Merge pull request #23726 from sternenseemann/master
redo-sh: init at 1.2.6
2017-03-18 19:19:51 +01:00
Sergii Paryzhskyi 18a272ef75 sbt-0.12.4: add an older stable version (#23933) 2017-03-15 21:17:23 +00:00
Tim Steinbach 56fea1a8c0
gradle: 3.4.0 -> 3.4.1 2017-03-13 20:00:58 -04:00
sternenseemann f3bf3a4318 redo-sh: init at 1.2.6 2017-03-10 21:50:25 +01:00
Dan Peebles ca5a1d927f buildbot: fix .withPlugins to propagate inputs
Before I was just grabbing the immediate dependencies. I _think_ this
will do the right thing by using the pre-existing setup hook to avoid
having to compute the transitive closure myself.
2017-03-08 12:39:44 -05:00
Dan Peebles 49b20e5569 buildbot: assorted cleanups
Some changes to be more idiomatic and use stdenv building blocks more.
I also added a `buildbot.withPlugins` instead of the current plugins
mechanism, which forces an unnecessary rebuild of the package and reruns
all the tests. This should be equivalent and more pleasant to use in
practice.
2017-03-08 11:28:44 -05:00
Fernando J Pando 9f062c2c0b buildbot: 0.9.3 -> 0.9.4
- adds jwt
- adds module tests
- master.cfg as path in module
- fix systemd worker config
- builds on darwin
- tested on nixos
2017-03-07 00:45:37 +01:00
Itai Zukerman 1f709ad136 bazel: add gcc to PATH and simplify patch
Removed patches that are purely for testing.
Removed dependencies that seemed to not be needed.
Expand all instances of #!/bin/bash, not just those at the start of scripts.
2017-03-02 00:09:10 -08:00
Benjamin Staffin 7c17c10bab bazel: Wrap so java is present at runtime
Bazel can't start up without javac in $PATH.
2017-02-28 12:44:44 -05:00
Benjamin Staffin 14ef7c0c59 bazel: consolidate bazel test invocations
This way it can run them in parallel.
2017-02-28 12:21:52 -05:00
Itai Zukerman 17835f14c5 bazel: replace patch with patchShebangs and substituteInPlace 2017-02-28 17:41:52 +01:00
Benjamin Staffin d348b80f31 bazel: Log test errors to stderr during checkPhase
Otherwise it's difficult or impossible to retrieve them, particularly
from a hydra build.
2017-02-27 19:22:37 -05:00
Benjamin Staffin 0c3afbd8a7 Merge pull request #23074 from izuk/bazel
bazel: remove dependence on buildFHSUserEnv
2017-02-25 23:11:27 -05:00
Itai Zukerman 59bb3d1f3f bazel: remove dependence on buildFHSUserEnv 2017-02-22 20:42:21 -08:00
Vladimír Čunát 145d3ea81c
Merge branch 'master' into staging 2017-02-22 17:47:49 +01:00
Tim Steinbach 83f29e9b99
gradle: 3.3 -> 3.4 2017-02-21 19:02:42 -05:00
Vladimír Čunát 5cf7b7c109
cmake: 3.7.1 -> 3.7.2 2017-02-20 21:29:52 +01:00
Nikolay Amiantov ec2c9d57b5 Merge pull request #22568 from abbradar/chromium-updates
Chromium updates
2017-02-20 15:49:04 +03:00
Itai Zukerman 25121d4350 bazel: 0.3.2 -> 0.4.4 2017-02-13 16:12:26 -08:00
Nikolay Amiantov 003fa8fed5 gn: remove
Chromium depends on bundled versioon of gn. It's also chromium-specific build
tool, so it's not feasible to package.
2017-02-08 22:52:40 +03:00
Fernando J Pando 34b5c9a4de buildbot: 0.9.0.post1 -> 0.9.3
- Fixes unneeded patching
- Adds worker to build inputs now needed for tests
- Replaces enableworker option with worker configuration module
- Openssh required for tests
- Fixes worker hardcoded paths
- Tested on Nixos Unstable
2017-02-07 11:14:42 -05:00
Herwig Hochleitner 67ccc41a67 leiningen: 2.6.1 -> 2.7.1 (#22485) 2017-02-06 08:44:20 +01:00
Eelco Dolstra 35349b6c2a
gup: 0.5.5 -> 0.6.0 2017-01-30 11:44:15 +01:00
Eelco Dolstra 12dd086c39
Revert "gup: 0.5.5 -> 0.6.0 and derivation update"
This reverts commit a59c3038cd due to
use of importJSON.
2017-01-30 11:44:15 +01:00
Michael Raskin 1d44213c7e Merge pull request #21516 from timbertson/gup
gup: 0.5.5 -> 0.6.0 and extract src into JSON
2017-01-26 07:46:16 +00:00
Tim Cuthbertson a59c3038cd gup: 0.5.5 -> 0.6.0 and derivation update 2017-01-25 22:25:31 +11:00
romildo a0d29cf33e drake: init at 0.9.2.0.3.1 2017-01-24 16:36:22 -02:00
Jörg Thalheim ffbcea3ce5
rake: use gemdir 2017-01-18 00:52:57 +01:00
Graham Christensen 6b504f8b52 Merge pull request #21626 from NeQuissimus/gradle_3_3
gradle: 3.2.1 -> 3.3
2017-01-03 18:45:42 -05:00
Tim Steinbach 02efac3f9f
gradle: 3.2.1 -> 3.3 2017-01-03 17:38:01 -05:00
Daiderd Jordan 538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Michael Raskin 31106095e1 scons: 2.5.0 -> 2.5.1 2017-01-02 20:18:52 +01:00
Daiderd Jordan 481569e580 Merge pull request #21339 from sifmelcara/add/crystal-lang
crystal: init at 0.20.3
2016-12-24 23:14:58 +01:00
mingchuan 6db2c983c1 shards: init at 0.7.1
Dependency manager for the Crystal language
2016-12-25 01:14:19 +08:00
Aristid Breitkreuz 76c4b5fcca cmake: 3.6.2 -> 3.7.1 2016-12-20 16:20:08 +01:00
Fernando J Pando 50466c2d4f
buildbot: 0.9.0rc4 -> 0.9.0.post1
- updates buildbot to version 9 release
- adds nixos configuration module
- fixes buildbot-www package deps
- re-hardcode path to tail
- builbot configuration via module vars

fixes #19759
2016-12-13 10:52:56 +01:00
Eric Bailey ab9688a63a rebar3: Fix typos and support name-version-tag
The fixup_app_name/1 change notably supports packages like proper-1.1.1-beta.
2016-12-08 00:11:41 +02:00
Eric Bailey fe727a19c1 rebar3: 3.1.0 -> 3.3.2 2016-12-08 00:11:41 +02:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk 9b88697bbd gn: use python2 2016-11-24 22:28:04 +01:00
Tim Steinbach dc9f2c903e
gradle: 3.2 -> 3.2.1 2016-11-23 16:48:58 -05:00
Tim Steinbach 2896042738
gradle: Add variable nativeVersion 2016-11-15 18:38:48 -05:00
Tim Steinbach f11b7cf579
gradle: 3.1 -> 3.2 2016-11-15 16:11:29 -05:00
aszlig c67a7ee731
Merge branch 'chromium-update-with-gn'
This brings in the new stable version 54 which also introduces a lot of
security fixes:

  CVE-2016-5198: Out of bounds memory access in V8
  CVE-2016-5181: Universal XSS in Blink
  CVE-2016-5182: Heap overflow in Blink
  CVE-2016-5183: Use after free in PDFium
  CVE-2016-5184: Use after free in PDFium
  CVE-2016-5185: Use after free in Blink
  CVE-2016-5187: URL spoofing
  CVE-2016-5188: UI spoofing
  CVE-2016-5192: Cross-origin bypass in Blink
  CVE-2016-5189: URL spoofing
  CVE-2016-5186: Out of bounds read in DevTools
  CVE-2016-5191: Universal XSS in Bookmarks
  CVE-2016-5190: Use after free in Internals
  CVE-2016-5193: Scheme bypass

Detailed announcements about these changes can be found here (latest to
oldest):

https://googlechromereleases.blogspot.de/2016/11/stable-channel-update-for-desktop.html
https://googlechromereleases.blogspot.de/2016/10/stable-channel-update-for-desktop_20.html
https://googlechromereleases.blogspot.de/2016/10/stable-channel-update-for-desktop.html

The update process of Chromium has been a bit bumpy on our side, because
version 54 also did the switch from GYP to GN so it wasn't just a matter
of updating the upstream-info file.

I've tested the Flash plugin (which runs fine) and WideVine manually,
although I couldn't get WideVine to work (I was running this within a VM
though).

So if people want to use WideVine they need to use Chrome instead until
we got this sorted out.

VM test results along with builds for all platforms can be found here:

https://headcounter.org/hydra/eval/339328

I'm going to backport these changes to stable as soon as the
tests/builds succeed there as well.

Closes: #19565
Closes: #20120
2016-11-09 09:55:31 +01:00
Tobias Geerinckx-Rice 8de2eeec33
icmake: 9.00.00 -> 9.02.02 2016-11-09 02:24:28 +01:00
aszlig 09f87eeb7f
gn: Init at 0.0.0.20161008
This is the standalone version of GN used currently solely for building
Chromium. An upstream bug report is available at
https://crbug.com/504074 to support a standalone build without needing
various components from the Chromium source tree.

Because there isn't a standalone vrsion available, I'm choosing
0.0.0.${date} as the version scheme here so that we don't conflict with
versioned releases from upstream someday[TM].

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-11-08 20:11:48 +01:00
Vladimír Čunát f77801d88d Merge branch 'master' into staging 2016-11-06 11:26:02 +01:00
Tobias Geerinckx-Rice 784bd713cc
dub: 1.0.0 -> 1.1.0 2016-11-05 18:44:11 +01:00
Shea Levy ca4b43d180 Merge branch 'master' into staging 2016-11-04 22:57:07 -04:00
Tim Steinbach 1368ff89a0
remake: 3.82 -> 4.1 2016-11-04 10:14:00 -04:00
Pavel Chuprikov 6693e3b06c bear: ignore wrapper calls (#20070)
Fixes #20056
2016-11-03 15:27:03 +01:00
Pavel Chuprikov 6f17cb108d bear: 2.2.0 -> 2.2.1
Taken from #20020.
2016-11-02 18:34:44 +01:00
Tuomas Tynkkynen d0ae7b973d Merge remote-tracking branch 'upstream/master' into staging 2016-10-31 20:13:06 +02:00
Vladimír Čunát 31f0fdef32
cmake: minor update 3.6.0 -> 3.6.2 2016-10-29 22:08:25 +02:00
Vladimír Čunát 135a914ded
Merge #19514: cmake: improve if without glibc
and bootstrap in parallel.
2016-10-29 17:08:50 +02:00
Vladimír Čunát e78ef9cc12
gnumake-3.81: remove
It doesn't seem to be of any use, except for spitting warnings about md5.
2016-10-29 15:49:27 +02:00
Tim Steinbach a79fdce0b8
sbt: 0.13.12 -> 0.13.13 2016-10-28 14:08:20 -04:00
Frederik Rietdijk f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Will Dietz 48d7c7751a cmake: bootstrap in parallel
Builds on previous commit so this happens without needing stdenv.glibc.
2016-10-13 08:07:58 -05:00
Will Dietz 07849e749a cmake: When there is no stdenv.glibc, still fix search paths.
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
2016-10-13 08:05:37 -05:00
Frederik Rietdijk 67005e3c79 Merge pull request #19230 from nand0p/buildbot-9rc4
buildbot: 0.9.0rc3 -> 0.9.0rc4
2016-10-11 17:00:41 +02:00
sternenseemann 2dca4f7ded meson: 0.32.0 -> 0.35.0 2016-10-10 16:03:33 +02:00
Benjamin Staffin d42fb35713 bazel: Allow linux i686 builds too 2016-10-09 15:18:29 -04:00
Irene Knapp 81c82bb5d6 Update the packaged Bazel to 0.3.2, and also make it actually work. 2016-10-08 20:54:12 -07:00
Fernando J Pando 5173cdb9cb buildbot: 0.9.0rc3 -> 0.9.0rc4
- upgrade to rc4
- un-hardcode path in logwatcher
- fix shebang in wrapper
- add gpl2 license
- remove duplicate wrapper

Tested on CentOS and NixOS
2016-10-05 11:08:01 -04:00
Tim Steinbach 084fa30411 gradle: 3.0 -> 3.1 (#18898) 2016-09-24 00:57:09 +02:00
Tom Hunger 93c773391d bazel: 20150326.981b7bc1 -> 0.3.1 2016-09-21 18:42:43 +01:00
Eelco Dolstra e03d1ababa cmake-2.8: Fix build
The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.
2016-09-20 11:56:11 +02:00
Fernando J Pando b31b262623 buildbot: 0.9.0rc3 wrapper fix
- Tested on Linux
- Tested binary execution
- Fixes missing PYTHONPATH
2016-09-16 16:27:49 -04:00
Fernando J Pando 57726b54af Remove obsolete buildbot slave
buildbot-slave has been replaced with buildbot-worker.
2016-09-16 11:20:26 -04:00
Fernando J Pando 164036d728 buildbot: 0.9.0rc2 -> 0.9.0rc3
Tested on Linux
Tested Binary Execution
2016-09-16 11:20:02 -04:00
Franz Pletz fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Chris Martin d1e23ed8ed mk: md5->sha256 2016-09-10 14:08:26 -04:00
Chris Martin 5a3560fecf gnumake-3.80: md5->sha256 2016-09-10 14:06:13 -04:00
Michael Raskin dabf09aa92 cmake: update setup-hook to take -isystem instead of -I into account 2016-09-08 09:10:00 +02:00
Tuomas Tynkkynen 3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Frederik Rietdijk f2fc64a412 Remove buildbot_8
We now have a newer version and the older version didn't work anymore
anyway because it depended on sqlalchemy7 which was itself broken,
because it depended on an older version of sqlite.
2016-09-01 17:46:27 +02:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Fernando J Pando d86114cbd5 buildbot: init at 0.9.0rc2
buildbot: init
buildbot-0.9.0rc2

buildbot-worker: init
buildbot-worker-0.9.0rc2

buildbot-ui: init
buildbot-www-0.9.0rc2

buildbot-full: init
buildbot-www-0.9.0rc1
buildbot-waterfall-view-0.9.0rc2
buildbot-console-view-0.9.0rc2
2016-09-01 11:31:15 +02:00
Frederik Rietdijk 7cf000b77e buildbot -> buildbot_8 2016-09-01 11:31:15 +02:00
Tuomas Tynkkynen d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Vladimír Čunát f688ea37d8 bear: init at 2.2.0 2016-08-29 14:13:01 +02:00
Tuomas Tynkkynen 8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +03:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Joachim F 56bfc0240e Merge pull request #17766 from NeQuissimus/gradle30
gradle: 2.14.1 -> 3.0, keep 2.14.1
2016-08-23 16:22:05 +02:00
Moritz Ulrich 08933f8a07 leiningen: Simplify build. 2016-08-23 12:38:24 +02:00
Joachim F 96ee6f08c6 Merge pull request #17923 from vrthra/redo-update
redo: update download URL
2016-08-23 01:20:14 +02:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Rahul Gopinath 746ec27c46 redo: update download URL 2016-08-22 13:37:59 -07:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Matthew Bauer c3974455eb gnustep: rescope everything into one folder
This should make merge conflicts easier to
handle. "gnustep" prefix has been removed to
make thing simpler. So "gnustep_make" is now
"make" within the gnustep scope.
2016-08-16 21:10:54 +00:00
Artyom Shalkhakov d3d580ebbe gnustep: cleanup
Major clean-up. Everything builds fine.
2016-08-16 21:00:27 +00:00
Artyom Shalkhakov 15c5a533b5 gnustep: add gworkspace and systempreferences
Packaging some basic GNUstep apps: GWorkspace and SystemPreferences.

Unfortunately, GWorkspace doesn't work well, because gdomap, gdnc, gpbs
are not started. Also, there is some issue with fonts not being found.
2016-08-16 20:59:58 +00:00
Artyom Shalkhakov ea3dcb3264 gnustep: add setup hook for make
Adding a setup-hook for gnustep-make.
2016-08-16 20:59:50 +00:00
Artyom Shalkhakov 4cbeef463c gnustep: use gnustep_builder
Built ProjectCenter and Gorm with the new gnustep_builder. Had to go
back and fix a few things.
2016-08-16 20:59:36 +00:00
Artyom Shalkhakov d39e5372dc gnustep: cleanup
Cleaning up. Adding GNUstep package builder for abstracting out GNUstep
compilation specifics (with thanks to GitHub user lethalman).

The rules for using build_gnustep_package are as simple: any
GNUstep-based package that the package being compiled depends upon are
to be put in [deps] (this is used for setting up a buildEnv), while
other dependencies are put into [buildInputs] as usual.
2016-08-16 20:59:30 +00:00
Artyom Shalkhakov 52d17a5f41 gnustep: packageg libs separately
Packing gnustep libs separately, with no use of gnustep-startup. Also,
fixed a bug in WindowMaker package (some imaging dependencies were not supplied).
2016-08-16 20:59:08 +00:00
Tim Steinbach 6654b8274e
gradle: 2.14.1 -> 3.0, keep 2.14.1 2016-08-16 00:03:18 +00:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Vladimír Čunát 03e32315a5 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
Tuomas Tynkkynen fcc3a1b41d bazel: Broken on i686
http://hydra.nixos.org/build/38314298
2016-08-06 17:06:45 +03:00
Tobias Geerinckx-Rice 06966f4955
icmake: 8.01.00 -> 9.00.00 2016-08-04 00:25:20 +02:00
Robin Gloster c95ab0a2d1 gnumake380: disable format hardening 2016-08-03 20:03:04 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Alexey Shmalko 176f804f36 cmake: 3.4.3 -> 3.6.0 2016-08-02 10:32:52 -05:00
Julien Dehos 5286c0aebb cmake: add support for cxxtest 2016-08-01 22:11:00 +02:00
Alexey Shmalko a18abd2aa3 meson: 0.26.0 -> 0.32.0 2016-07-24 00:34:19 +02:00
Gabriel Ebner 3016eb1c4b sbt: 0.13.11 -> 0.13.12 2016-07-21 12:29:14 +02:00
Tim Steinbach 3563be8dd6 gradle: 2.14 -> 2.14.1 2016-07-19 15:10:54 +00:00
Vladimír Čunát 40785f0dac Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00
Eelco Dolstra 05bdc0c89f Remove unnecessary references to gcc5
These cause an unnecessary rebuild of gcc.
2016-07-11 10:46:34 +02:00
Vladimír Čunát 9d3228f99d gnumake42: bugfix 4.2 -> 4.2.1 2016-07-09 16:50:12 +02:00
Vladimír Čunát 3b2627586d Merge #16448: gnumake: optionally build with guile
Fixed up nested lists within the merge.
2016-07-09 16:36:49 +02:00
Tim Steinbach e00c572698 gradle: 2.13 -> 2.14 2016-07-01 02:23:28 +00:00
Rahul Gopinath 021dd6a5f6 waf: 1.8.19 -> 1.9.0 2016-06-26 21:59:23 -07:00
Rahul Gopinath 586a9c0d9c gnumake: Allow guile extension language as an optional feature 2016-06-23 09:55:54 -07:00
Tobias Geerinckx-Rice ffd2afd89d
dub: 0.9.25 -> 1.0.0 2016-06-20 19:34:19 +02:00
Moritz Ulrich e72282be84 Merge pull request #16052 from dvc94ch/rust-cross
Rust and cargo improvements
2016-06-16 09:42:23 +02:00
Eric Merritt 864a0816c4 rebar3: remove no longer needed registrySnapshot.nix 2016-06-15 07:20:17 -07:00
Eric Merritt b1cd08246f beamPackages: turn on debug_info for beam packages
This allows you to turn on debug infor for all the beam packages in the
system with a single change at the top level. This is required for
debugging and dialyzer work. It also allows you to switch it on on a
package by package basis.
2016-06-15 07:20:01 -07:00
David Craven 54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
David Craven 0720373dfc cargo: Use stable releases instead of snapshots 2016-06-14 23:09:21 +02:00
Moritz Ulrich b05f991f5f Rust infrastructure refactoring
Rust infrastructure updates & refactoring
2016-06-03 00:11:13 +02:00
David Craven 895db6daf3 Update cargo head 2016-06-02 17:15:52 +02:00
Thomas Tuegel d5d4606190 Revert "cmake: use supplied RPATH instead of guessing"
This reverts commit 8ec5adc953.

This broke stdenv on Darwin, see #15881. A Darwin user will need to fix
the problem and un-revert. This commit causes CMake to use the same
RPATH settings as the compiler, so it is obviously correct.
2016-05-31 16:30:15 -05:00
Thomas Tuegel 8ec5adc953 cmake: use supplied RPATH instead of guessing 2016-05-31 13:02:10 -05:00
Moritz Ulrich 303aac8381 cargo: 0.9.0 -> 0.10.0, rustRegistry: 2016-05-12 -> 2016-05-28. 2016-05-28 15:05:11 +02:00
Joachim Fasting 4da35b7c56 Merge pull request #15705 from vrthra/redo
redo: Init at 1.2
2016-05-26 10:14:34 +02:00
Bjørn Forsman 25960389da ninja: 1.6.0 -> 1.7.1
Release notes:
https://groups.google.com/forum/#!topic/ninja-build/bkDE7auQwiI/discussion

The current github src URL redirects to the "ninja-build" github user,
so use that directly.
2016-05-26 09:51:10 +02:00
Rahul Gopinath df40533f11 redo: Init at 1.2
Redo is an alternative for Make. This package is a C++ implementation
of redo.
2016-05-25 13:49:21 -07:00
Bjørn Forsman 2fb4b797a1 meson: add meta.platforms 2016-05-25 21:18:48 +02:00
Bjørn Forsman a35874b41a meson: fix chroot build
/usr/bin/env is not available in chroot builds. Invoke the python3
interpreter directly instead of trying to let env do it (which fails).

Fixes this build error:

  $ nix-build -A meson
  ...
  /nix/store/HASH-stdenv/setup: ./install_meson.py: /usr/bin/env: bad interpreter: No such file or directory
  builder for ‘/nix/store/HASH-meson-0.26.0.drv’ failed with exit code 126
2016-05-25 21:18:48 +02:00
Nick Novitski 93b99cd361 gnumake: add version 4.2 2016-05-23 15:30:41 +00:00
Tobias Geerinckx-Rice 2964212b45
dub: 0.9.24 -> 0.9.25 2016-05-23 01:31:58 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Thomas Tuegel b70d728ed7 cmake: use single output
Fixes #15184. Install everything, including documentation, into one
output, increasing package size by 10%. Otherwise, the help commands for
CMake do not work. This is a good trade because CMake should be a
build-only dependency. The only reason the docs should ever make it to
runtime is if the user has actually installed CMake, in which case
there's a pretty good chance they want the docs, too.
2016-05-06 16:26:40 -05:00
Tim Steinbach a17c90dcd1
gradle: 2.12 -> 2.13 2016-05-06 10:52:25 -04:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Joachim Fasting e1197f6896 Merge pull request #15082 from namore/init_rake
rake: init at 11.1.1
2016-05-02 03:20:51 +02:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Roman Naumann 61c8af996f rake: init at 11.1.1 2016-04-29 15:45:11 +02:00
Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Frederik Rietdijk d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Joachim Fasting 2dbfe512db Merge pull request #14858 from ericbmerritt/elixir-support
Elixir support
2016-04-25 23:04:14 +02:00
Eric Merritt cd27abe751 rebar3: refactor
cleanup up the code quite a bit in the bootstrapper
2016-04-25 08:34:55 -07:00
Nikolay Amiantov 96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov 5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Eric Merritt 658a49b81d rebar3: 3.0.0-beta.4 -> 3.1.0 2016-04-23 19:03:30 -07:00
Eric Merritt 383626b9d7 move rebar3-nix-bootstrap to rebar3
This moves rebar3-nix-bootstrap from its own repository to rebar3. Its a
single file and this vastly reduces the complexity of making changes.
2016-04-23 19:03:29 -07:00
Eric Merritt 8dbcb4e35e beamPackages: Add support for Mix and Erlang.mk 2016-04-23 19:03:24 -07:00
Tadas Barzdzius a49ffbb196 cargo: add libiconv to buildInputs to fix darwin build 2016-04-23 23:08:02 +03:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Thomas Tuegel 491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Tadas Barzdzius 7d661a4ab4 cargo: 0.8.0 -> 0.9.0. Enable Darwin 2016-04-20 12:42:37 +03:00
Mathieu Boespflug 6c9c59067b gradle: fix attribute name for gcc libs path.
PR #14326 fixed gradle so that its native code library could find
libstdc++.so.6, but this fix is inoperative now, because this library
is in `"${stdenv.cc.cc.lib}/lib"` now, rather than
`"${stdenv.cc.cc}/lib"`.
2016-04-17 01:09:24 +02:00
Nikolay Amiantov 52637e22cd cmake: add all glibc outputs to system prefix 2016-04-14 01:03:23 +03:00
Nikolay Amiantov d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Michael Raskin 238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tobias Geerinckx-Rice 57ef1712e3
Substite new GitHub username ‘timbertson’ for ‘gfxmonk’ 2016-04-11 16:35:18 +02:00
Tobias Geerinckx-Rice 613cef6240
gup: 0.5.4 -> 0.5.5; use fetchFromGitHub 2016-04-11 16:21:12 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Aaron Son bbfad5111a gradle: Fix gradle-2.12 on Linux to find libstdc++.so reference in native library. 2016-04-01 14:33:23 -07:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Jakob Gillich a9326f6f34 cargoMaster: 2016-02-25 -> 2016-03-22 2016-03-22 13:16:56 +01:00
Tim Steinbach aa4af87501 gradle: 2.11 -> 2.12 2016-03-16 18:55:11 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Frederik Rietdijk 36506df7fe Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
2016-03-05 11:07:50 -05:00
Gabriel Ebner de24ea40f8 sbt: 0.13.9 -> 0.13.11 2016-03-03 16:09:00 +01:00
Tim Cuthbertson 70df5bf9ea gup: 0.5.3 -> 0.5.4 2016-02-29 20:15:19 +11:00
zimbatm 17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Lancelot SIX 0467a17858 pythonPackages.sqlalchemy: follows upstream, sqlalchemy7 for lecagy
This makes pythonPackages.sqlalchemy the most up to date revision (it
was called sqlalchemy_1_0 before), and maintains the various “legacy”
versions available as pythonPackages.sqlalchemyX for X in {7,8,9}.

All derivations that required `sqlalchemy_1_0` now require `sqlalchemy`
while those that required `sqlalchemy` now require `sqlalchemy7`.

The derivations are not changed, only the attribute names they are
bound to.
2016-02-27 12:11:12 +01:00
Nikolay Amiantov a4902ff1fa rustUnstable.cargo: 2016-01-10 -> 2016-02-25 2016-02-25 14:21:46 +03:00
Jude Taylor 45ea4956d8 fix library dependencies for cargo on darwin 2016-02-23 16:42:51 -08:00
Frederik Rietdijk 40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Pascal Wittmann 50f45db51c icmake: 8.00.05 -> 8.01.00 2016-02-20 20:28:26 +01:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Eelco Dolstra 8af685d089 Merge pull request #13097 from jerith666/antrun
ant: preserve antRun script
2016-02-18 19:48:12 +01:00
Matt McHenry e5e633ca11 ant: preserve antRun script 2016-02-18 10:13:39 -05:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Herwig Hochleitner b7b696e534 leiningen: 2.5.3 -> 2.6.1 2016-02-16 22:39:34 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tim Steinbach e81fd09b85 gradle: 2.10 -> 2.11 2016-02-10 21:48:45 +00:00
tg(x) 310a20eda8 waf 2016-02-10 20:34:05 +01:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Nikolay Amiantov d9c4fc4de9 Merge pull request #12682 from zohl/nant
NAnt
2016-02-03 22:56:12 +03:00
Al Zohali 9679042278 nant: init at 20151115 2016-02-03 22:00:41 +03:00
Vladimír Čunát d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát 80270e2019 cmake: maintenance updates 3.4.0 -> 3.4.3 2016-02-03 16:59:38 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Ricardo M. Correia 52475afe77 cargo: 0.7.0 -> 0.8.0 2016-02-02 17:25:44 +01:00
Thomas Tuegel a714284d8b cmake: don't set incompatible flags for multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 1087020a46 cmake: invoke configure hooks correctly
Otherwise, the multiple-outputs hooks will not fire correctly.
2016-01-31 21:15:03 -06:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tim Cuthbertson b82d5ef857 gup: 0.5.1 -> 0.5.3 2016-01-24 16:34:07 +11:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Eric Merritt 8021b5241c rebar3: refactor to make hermetic
This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
2016-01-18 08:19:15 -08:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Gleb Peregud ed4373e8b7 Pass buildPlugins to rebar3-nix-bootstrap.
To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
2016-01-17 21:59:27 +01:00
Eric Merritt 24a9dcd12f rebar3: refactor
Move registrySnapshot to the erlang-nix github organization
2016-01-15 09:07:06 -08:00
Vladimír Čunát 2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Eric Merritt 474e417891 erlang support: allow nix-shell to work correctly
This changes build-hex.nix so that the buildHex and related functions
work correctly in a nix-shell.
2016-01-14 14:36:47 -08:00
Nikolay Amiantov d1ed30ac0d cargoUnstable: init at 2016-01-10 2016-01-13 13:48:24 +03:00
Pascal Wittmann 1d947ed4bf icmake: 7.23.02 -> 8.00.05 2016-01-09 20:07:43 +01:00
Jude Taylor 08c081309b Revert "gnustep-make: fix installation path"
This reverts commit 4f1559a751.
2016-01-07 21:52:11 -08:00
Peter Simons 1355e928cf Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage
boot: Update shell script version and remove makeWrapper usage
2016-01-05 12:22:23 +01:00
Eric Seidel 222f4b9e2b gnustep-make: dont write to /Library/GNUstep 2016-01-04 14:07:17 -08:00
Ragnar Dahlén a25bfab690 boot: Update shell script version and remove makeWrapper usage 2016-01-04 17:23:45 +00:00
Tobias Geerinckx-Rice ddd48258e8 gnustep-make: 2.6.6 -> 2.6.7 2016-01-03 00:24:28 +01:00
Tobias Geerinckx-Rice 4f1559a751 gnustep-make: fix installation path
Get rid of the nested /nix/store/.../nix/store/... directories.
2016-01-03 00:24:28 +01:00
Michael Raskin 1dba4b4e6a scons: 2.3.6 -> 2.4.1 2016-01-01 12:30:17 +03:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster 2faea53f8e cargo: 0.6.0 -> 0.7.0 2015-12-24 13:20:24 +01:00
Tim Steinbach d509f8a30a gradle: 2.9 -> 2.10 2015-12-23 08:44:49 -05:00
Tim Steinbach 895875bdac maven: 3.3.3 -> 3.3.9, fixes #11867 2015-12-22 02:11:00 +01:00
Tim Steinbach 9121277144 gradle: 2.8 -> 2.9 2015-12-21 11:37:21 -05:00
Herwig Hochleitner b3b7f9f37f fix lib path for gradle, fixes #11191 2015-12-18 23:12:43 +03:00
Gleb Peregud bb1b5c7194 Update hex.pm registry 2015-12-15 15:06:47 +01:00
Gleb Peregud 474da3bf24 Add sources of specific rebar bootstrap deps via new fetchHex
derivation.
2015-12-15 15:06:44 +01:00
Gleb Peregud 108f3cf67f Add patch which makes rebar compilation hermetic 2015-12-15 14:05:51 +01:00
Gleb Peregud 4ba1a51b7f Move registry to rebar3, since it needs it itself to be bootstrapped.
This makes rebar3 build a bit more hermetic. Next stage is to pull in
rebar3 plugins dependencies for bootstrap to pick up.
2015-12-15 14:05:19 +01:00
Gleb Peregud 033902d269 Refactor fetchHex out of buildHex.
This will allow to reuse this code to fetch rebar3's dependencies to
ensure it's hermetic build.
2015-12-15 14:01:38 +01:00
Gleb Peregud bcc4ca029a Add rebar3 package 2015-12-15 01:02:52 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Herwig Hochleitner 58ba1d5bd3 leiningen: 2.5.2 -> 2.5.3, fixes #11537 2015-12-08 02:58:33 +01:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát f2ad4a47e8 cmake: remove conditional patch that no longer applies
Close #11290. The patch will no longer apply on *any* platform.
2015-11-29 08:58:39 +01:00
Domen Kožar 67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting 6ccf87defe bam: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Mikhail Volkhov bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Domen Kožar 704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Danny Wilson 1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Ricardo M. Correia 2b694c237b cargo, cargoSnapshot: add rustc runtime dependency
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
2015-11-18 02:41:45 +01:00
William A. Kennington III 050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
Desmond O. Chang b9c11de2a8 gradle: 2.6 -> 2.8 2015-11-11 16:45:19 +08:00
Edward Tjörnhammar 38ca909811 maven: 3.2.5 -> 3.3.3 2015-11-10 08:46:14 +01:00
Aristid Breitkreuz c35e349409 rename make->gnustep-make to avoid people installing it accidentally 2015-11-07 16:08:17 +01:00
Pascal Wittmann fcb4627695 Merge pull request #9980 from wavewave/gradle25
add gradle 2.5.
2015-11-06 17:17:28 +01:00
Ian-Woo Kim 3d5f95d61b gradle: reinit at 2.5.
For some projects (especially using android ndk), we still need to keep 2.5.
2015-11-06 07:31:58 -08:00
Ricardo M. Correia 84afac6b89 cargo: 0.5.0 -> 0.6.0 2015-11-03 20:32:12 +01:00
Pascal Wittmann 36a529e566 icmake: 7.22.01 -> 7.23.02 2015-10-28 17:43:41 +01:00
Vladimír Čunát 1d921ad3a7 cmake-2.8: fix build with multiple outputs 2015-10-28 13:30:50 +01:00
Cillian de Róiste e42e4cfbd9 Meson: tidy up, untabify 2015-10-24 12:50:15 +02:00
Brandon Edens 6774b09af7 Add meson build system package. 2015-10-21 09:08:48 -07:00
Edward Tjörnhammar c10caef1a2 Merge pull request #10062 from gebner/sbt-loader-package
sbt: use sbt-launcher-package.
2015-10-12 23:02:58 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Gabriel Ebner 98be4ed5e8 sbt: use sbt-launcher-package. 2015-09-25 16:54:35 +02:00
William A. Kennington III d5395b0506 Merge pull request #10024 from mayflower/update-rust
Update rust and dependants
2015-09-23 22:43:25 -07:00
William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Robin Gloster feda2925f7 cargo: 0.3.0 -> 0.5.0 2015-09-23 21:16:16 +00:00
Tobias Geerinckx-Rice ee7df6a566 dub: 0.9.23 -> 0.9.24
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
2015-09-21 19:22:14 +02:00
William A. Kennington III 5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
goibhniu 529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms
Update argyllcms
2015-09-14 10:01:36 +02:00
Tim Cuthbertson 9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Samuel Rivas 4ef2d19981 jam: add yacc as build input
I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
2015-09-07 11:37:18 +02:00
Peter Simons fcb0bdbaa0 Merge pull request #9639 from k0ral/scons
scons: 2.3.5 -> 2.3.6
2015-09-03 21:08:32 +02:00
koral bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Eelco Dolstra 6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice 687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub
Also add myself as a maintainer.

CC@ pSub
2015-09-01 05:28:53 +02:00
Thomas Tuegel 90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Desmond O. Chang ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
William A. Kennington III 901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
Moritz Ulrich 2ffc2099be leiningen: 2.5.1 -> 2.5.2. 2015-08-19 12:25:50 +02:00
William A. Kennington III 6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Rickard Nilsson cef8f0180d Merge pull request #9213 from j-keck/sbt0.13.9
sbt: 0.13.8 -> 0.13.9
2015-08-12 11:02:42 +02:00
j-keck 5e7d2e2003 sbt: 0.13.8 -> 0.13.9 2015-08-12 07:45:25 +02:00
William A. Kennington III 6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Profpatsch 062cdfb3a1 sbt: add JAVA_HOME to sbt script 2015-08-08 20:08:00 +02:00
William A. Kennington III 4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
William A. Kennington III 793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
lethalman dad54b36fb Merge pull request #9008 from philandstuff/fix-bazel
Fix bazel package
2015-08-06 11:47:54 +02:00
Ragnar Dahlén 25bad2be17 boot: 2.0.0 -> 2.2.0 2015-08-05 11:54:40 +01:00
Nikolay Amiantov 4dde32b4f2 gradle: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:49 +03:00
Nikolay Amiantov 52fb36e7e0 maven: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:45 +03:00
Philip Potter 76dd430cd8 bazel: fix build, make compatible with openjdk
Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
2015-07-28 20:38:44 +01:00
Ricardo M. Correia 205a6b894d cargo: workaround frequent hash mismatches due to #8567
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.

Fixes #8566 and closes #8862.
2015-07-21 21:26:02 +02:00
Austin Seipp f07d5a244f nixpkgs: ninja 1.5.3 -> 1.6.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Stewart Mackenzie f46bbbce49 boot: correct sha256 2015-07-19 02:33:43 +08:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Jude Taylor 43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00
Robert Irelan 51972d427e cargo: 2015-05-13 -> 0.3.0
Rename cargo to use a version number rather than a date because Cargo
has started releasing packages using version numbers.
2015-07-09 22:56:51 -07:00
Robert Irelan e6ee86b941 cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env
Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
2015-07-09 21:14:55 -07:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin b280d6cbc7 scons: update 2.3.4 -> 2.3.5 2015-07-05 00:32:53 +03:00
William A. Kennington III 954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Rok Garbas 0860826795 cygwin: cmake expression should not change for linux 2015-06-12 12:17:12 +02:00
Rok Garbas 277c263c1e cygwin: update patch for cmake 3.2.2 2015-06-12 12:17:12 +02:00
Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra 3ede0a64a2 make: Don't segfault if we can't get a tty name
This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
2015-06-04 19:47:34 +02:00
Eelco Dolstra e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra 553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Pascal Wittmann f675c4d90d icmake: update from 7.22.00 to 7.22.01 2015-05-28 18:57:32 +02:00
Florian Friesdorf 90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Florian Friesdorf f33f2a7e82 cygwin: disable gnumake check because of hanging test 2015-05-28 10:53:35 +02:00
Arseniy Seroka 6c9ac3f967 Merge pull request #8024 from ragnard/update-boot-version
boot: Update version from 2.0.0-rc14 to 2.0.0.
2015-05-27 22:43:15 +03:00
Ragnar Dahlén 9cb63367dc boot: Update version from 2.0.0-rc14 to 2.0.0. 2015-05-27 20:39:17 +01:00
Ricardo M. Correia 2817e74d37 cargo: Add myself to maintainers 2015-05-19 19:02:38 +02:00
Ricardo M. Correia 9b752fd0e1 buildRustPackage: Don't hardcode registry index hash
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
2015-05-19 19:02:38 +02:00
Ricardo M. Correia de322b48b7 cargo: Fix src hash
It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes
the output can still change (i.e. it's not completely deterministic).

This could be due to changes in the upstream git repository...
2015-05-19 19:02:38 +02:00
Joel Taylor 78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor 1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát b7fe141f6b Revert "remove cmake-2.8"
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
2015-05-15 23:02:41 +02:00
Eelco Dolstra 26f17ee091 cmake: Get rid of circular dependency
Also, don't install static libraries in jsoncpp.
2015-05-13 18:17:26 +02:00
Ricardo M. Correia 981ea747b5 cargo: 2015-05-11 -> 2015-05-13 2015-05-13 17:23:18 +02:00
Ricardo M. Correia 755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust
Add support for Rust / Cargo packaging
2015-05-12 17:30:11 +02:00
Ricardo M. Correia cbdedca255 cargo: 2015-04-14 -> 2015-05-11 2015-05-12 17:28:50 +02:00
Vladimír Čunát 3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
William A. Kennington III 64c68c5413 cmake: 3.2.1 -> 3.2.2 2015-05-01 22:27:14 -07:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann 6b4aec742d Merge pull request #7628 from ragnard/bump-boot
boot: bump from rc8 to rc14
2015-04-29 10:55:16 +02:00
Ragnar Dahlén 543ec3cf46 boot: bump from rc8 to rc14 2015-04-29 08:50:48 +01:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Ricardo M. Correia d6093505cc buildRustPackage: Get rid of /proc/self/cwd hack
This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
2015-04-23 20:22:19 +02:00
Ricardo M. Correia 0cde1dc524 cargo: Remove setupHook
Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
2015-04-23 15:26:23 +02:00
Ricardo M. Correia e42c17ee97 buildRustPackage: Fix Cargo.lock being ignored
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
2015-04-23 02:58:07 +02:00
Ricardo M. Correia d648be6724 buildRustPackage: Add check phase and enable it by default
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
2015-04-21 20:45:05 +02:00
Ricardo M. Correia 5e8a447739 cargo: Build optimized binary 2015-04-21 20:44:41 +02:00
Georges Dubus 7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Vladimír Čunát a8813a3db0 cmake: fix with multiple outputs, split help, refactor
The removed configureFlags seemed to have no effect.
2015-04-18 22:30:26 +02:00
Vladimír Čunát 65ac24c903 gnumake-4.1: split docs 2015-04-18 19:48:00 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Arseniy Seroka d56e9b4f05 Merge pull request #7330 from RumataEstor/rust-beta
Provide rustc-1.0.0-beta as the default rust package
2015-04-16 13:05:40 +03:00
Charles Cooper ba206b550a dub update to v0.9.23 2015-04-14 10:46:16 -07:00
Dmitry Belyaev 871d11c176 Update cargoSnapshot to rustc-1.0.0-beta release 2015-04-13 15:55:39 +10:00
Eric Seidel c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
John Wiegley d628247bdf Merge pull request #7095 from giogadi/cmake-full-install-name-staging
Make cmake install shared libraries with full install names by default
2015-03-30 21:47:27 -05:00
Luis G. Torres ff35c4a5e2 Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821. 2015-03-30 21:25:44 -04:00
William A. Kennington III 22018c40d1 cmake: Remove obsolete openssl patch 2015-03-27 11:30:39 -07:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
goodwillcoding 62d4564de4 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1

(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-26 11:42:02 +01:00
Rob Vermaas 46eedd9de5 Dohh 2015-03-26 09:48:27 +00:00
Rob Vermaas ac35d15bcc bazel: Upstream pushed patch, removing patch. 2015-03-26 09:46:31 +00:00
Rob Vermaas 7721ff4ccb bazel: add patch suggested by upstream 2015-03-26 06:30:21 +00:00
Rob Vermaas f5eed7e14e Add initial version for bazel.io build manager. 2015-03-25 15:12:02 +00:00
Thomas Tuegel 8fd5dd89ac Merge branch 'master' into staging 2015-03-24 17:49:30 -05:00
Thomas Tuegel f47af9b2c8 remove cmake-3.0 2015-03-22 17:03:57 -05:00
Thomas Tuegel 3628370127 remove cmake-2.6.4 2015-03-22 17:02:32 -05:00
Thomas Tuegel 67199bda4e remove cmake-2.8 2015-03-22 17:01:45 -05:00
Thomas Tuegel a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -05:00
j-keck de9e7bc5f1 sbt: bump to 0.13.8 2015-03-22 19:58:01 +01:00