Commit graph

908 commits

Author SHA1 Message Date
Tuomas Tynkkynen b8b2225f6b Merge remote-tracking branch 'upstream/master' into staging 2018-03-01 06:09:20 +02:00
Ryan Mulligan 2702a81533 waf: 1.9.0 -> 2.0.4
Semi-automatic update. These checks were performed:

- built on NixOS
- found 2.0.4 with grep in /nix/store/dr6xvrw483jr5vgznwpjj0hxx3jq86ha-waf-2.0.4
- found 2.0.4 in filename of file in /nix/store/dr6xvrw483jr5vgznwpjj0hxx3jq86ha-waf-2.0.4

cc "@vrthra"
2018-02-28 20:32:55 +00:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Tim Steinbach 50e99d163e
gradle: 4.5 -> 4.6 2018-02-28 13:05:15 -05:00
Frederik Rietdijk 405407fcf5
Merge pull request #35680 from NixOS/python-unstable
Python: last major updates package set
2018-02-27 09:16:47 +00:00
Frederik Rietdijk ad5127c417 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 09:18:49 +01:00
Frederik Rietdijk 05623d202c
Merge pull request #35061 from lopsided98/buildbot-update
buildbot: 0.9.15.post1 -> 1.0.0
2018-02-27 07:43:46 +00:00
Vladimír Čunát f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
2018-02-26 22:53:18 +01:00
Frederik Rietdijk fdb6655f2c python: conan: 0.28.1 -> 1.0.4 2018-02-26 19:03:30 +01:00
Shea Levy 044c65bd06
Merge branch 'systemd-cross' into staging 2018-02-26 07:42:21 -05:00
Frederik Rietdijk fc23242220 Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master 2018-02-26 13:05:32 +01:00
Shea Levy 284f75a258
meson: Support cross-compiling 2018-02-26 06:38:32 -05:00
Frederik Rietdijk 4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
Tim Steinbach 0652ed17d0
sbt: 1.1.0 -> 1.1.1 2018-02-25 12:48:06 -05:00
Vladimír Čunát 24e2d762e8
Merge #35120: meson: print failed test logs 2018-02-22 00:59:20 +01:00
Jörg Thalheim 825ff649b5
Merge pull request #34161 from leenaars/asn2quickder
pythonPackages update: asn1ate and asn2quickder
2018-02-20 12:27:10 +00:00
Shea Levy 43522dc851
riscv: Use gnumake42HEAD. 2018-02-19 09:36:53 -05:00
Shea Levy fb8a09e8f0
gnumake: Add 4.2.90pre2491_38c8a11 for proper glibc 2.27 support. 2018-02-19 09:33:34 -05:00
Jan Tojnar 40eadf9eb0
meson: print failed test logs 2018-02-18 16:24:50 +01:00
Shea Levy a551e6debc
gnumake: Fix build against glibc 2.27. 2018-02-18 09:27:50 -05:00
Joachim F 4b43e72af7
Merge pull request #34812 from ThomasMader/dlang-update
Dlang update
2018-02-17 09:06:37 +00:00
Ben Wolsieffer a6e3d77167 buildbot: 0.9.15.post1 -> 1.0.0 2018-02-16 18:27:11 -05:00
Vladimír Čunát b5aaaf87a7
Merge staging and PR #35021
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
Herwig Hochleitner 588fe10bae cask: fix evaluation error
this was due to an override `emacsPackages = emacsPackagesNg` on my
system.

5bede1a252
2018-02-16 01:18:35 +01:00
Herwig Hochleitner 5bede1a252 cask: init
cask is a build tool for emacs packages

cc @ttuegel @mdorman
2018-02-15 23:33:49 +01:00
Guillaume Maudoux f6b6d72d06 bazel: 0.9 -> 0.10.1 2018-02-15 12:31:21 +01:00
Tuomas Tynkkynen 0ea1c45b04 gnumake: Drop pkgconfig if not building with guileSupport
This used to be the case before commit 531e4b80c9 which seems to
have dropped it by accident.

Removes one unnecessary build of pkgconfig during stdenv bootstrapping.
2018-02-14 01:47:28 +02:00
Will Dietz e25a343716 cmake: don't force gcc, use more general cc/c++ 2018-02-13 12:39:34 -06:00
Will Dietz 37c2ac90e6 cmake: fix cross
TODO: toolchain file instead?
2018-02-13 09:44:29 -06:00
Michiel Leenaars ae6887d222 arpa2cm: init -> 0.5 2018-02-12 19:43:01 +01:00
Pascal Wittmann 2d6d52b60c
icmake: 9.02.04 -> 9.02.06 2018-02-11 12:02:27 +01:00
Thomas Mader 1ac2ce107c dub: 1.7.1 -> 1.7.2 2018-02-10 14:36:19 +01:00
Ryan Mulligan 295934adda bear: 2.2.1 -> 2.3.11 2018-02-05 21:13:54 -08:00
Vladimír Čunát dd57c63793
Merge branch 'staging'
There are some Darwin regressions and a mysterious Lisp issue,
but also a security update of curl...
2018-02-03 10:56:07 +01:00
Frederik Rietdijk 73d985f1b5 buildbot: buildbot-pkg fix
Fixes issue mentioned in
https://github.com/NixOS/nixpkgs/pull/33992#issuecomment-360937226
2018-02-03 10:05:53 +01:00
Frederik Rietdijk 2564ea97c0
Merge pull request #33992 from lopsided98/buildbot-update
buildbot: 0.9.11 -> 0.9.15.post1
2018-02-03 09:05:16 +00:00
Vladimír Čunát c9171e5a4c
Merge branch 'master' into staging
Hydra: ?compare=1430035
2018-01-30 19:51:33 +01:00
Tim Steinbach 0f01846e97
gradle: 4.4.1 -> 4.5 2018-01-29 11:52:50 -05:00
Thomas Mader b07f0f9eec dub: 1.6.0 -> 1.7.1 2018-01-28 09:30:52 +01:00
Vladimír Čunát ef60e41145
cmake: bring back 3.9 for Darwin bootstrap
Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628
2018-01-27 09:11:37 +01:00
Ben Wolsieffer 7c609d76b1 buildbot: make buildbot-pkg a real package, and add it as a build input of buildbot 2018-01-26 19:41:27 -05:00
Ben Wolsieffer d2e83e6357 buildbot: 0.9.11 -> 0.9.15.post1 2018-01-26 17:29:01 -05:00
Vladimír Čunát ba6e0ae33d
cmake: 3.9.6 -> 3.10.2
Close #33435 (superseded).
2018-01-21 11:59:12 +01:00
Herwig Hochleitner 330104be9e leiningen: 2.7.1 -> 2.8.1 2018-01-18 18:55:26 +01:00
Shea Levy f040f64636
bazel: Bump nix-hacks.patch for 0.9. 2018-01-18 10:25:47 -05:00
Frederik Rietdijk 27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall
maintainers: remove mornfall from packages
2018-01-18 11:27:31 +01:00
Tim Steinbach 239606c176
gradle: 4.4 -> 4.4.1 2018-01-17 10:31:01 -05:00
Tuomas Tynkkynen 67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Yegor Timoshenko 506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Tobias Geerinckx-Rice 0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00