Commit Graph

30507 Commits

Author SHA1 Message Date
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rickard Nilsson
511565e996 kibana: 4.4.1 -> 4.5.1 2016-06-10 01:35:39 +00:00
Rushmore Mushambi
902b6d5691 Merge pull request #16093 from rushmorem/update-go
go: v1.5.3 -> v1.5.4
2016-06-10 00:14:56 +02:00
Joachim Fasting
7bd515979c
tinycc: fix paxmark call
I missed this due to testing on a checkout that didn't contain
the paxmark fix ...
2016-06-09 23:06:01 +02:00
Peter Simons
7914242b37 haskell-timezone-series: fix build with GHC 8.0.1
- Fix the incorrect sha256 hash of the patch.
 - Apply the patch only when compiling with GHC 8.0.x.
2016-06-09 21:51:09 +02:00
Peter Simons
cf042ae750 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-38-g2269395 using the following inputs:

  - Hackage: 65d1dbe8dd
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 5863aeaee3
2016-06-09 21:51:00 +02:00
Thomas Tuegel
e6fdc9f7f0 Merge pull request #16092 from abbradar/qt561
Qt: 5.6.0 -> 5.6.1
2016-06-09 14:32:53 -05:00
Thomas Tuegel
04ad2ebfb2 Merge branch 'kde-propagate' 2016-06-09 12:40:04 -05:00
rushmorem
0e262f52f3 go: v1.5.3 -> v1.5.4 2016-06-09 19:18:07 +02:00
Nikolay Amiantov
97d791978c qt56: 5.6.0 -> 5.6.1 2016-06-09 18:44:56 +03:00
Thomas Tuegel
09d63127de Revert "qt56: 5.6.0 -> 5.6.1"
This reverts commit 4d2cf4baac.
2016-06-09 10:42:52 -05:00
Franz Pletz
a0996c2c60 libressl: 2.3.4 -> 2.3.5 2016-06-09 17:37:29 +02:00
Rushmore Mushambi
83c40ada7e Merge pull request #16017 from kamilchm/rework-go
Rework goPackages
2016-06-09 17:09:13 +02:00
Thomas Tuegel
c9ffb7e5f9 Merge branch 'qt-5.6' 2016-06-09 09:40:18 -05:00
Thomas Tuegel
4d2cf4baac qt56: 5.6.0 -> 5.6.1 2016-06-09 09:39:55 -05:00
Thomas Tuegel
de842765be qt56.qtbase: propagate build inputs correctly 2016-06-09 09:14:06 -05:00
zimbatm
943d59268a packer: fix compilation
* Remove duplicate "packer" source
* Use the same version of go everywhere
2016-06-09 16:11:25 +02:00
zimbatm
f870d6aeb6 goBuildPackage: export go
This is useful to make sure to use the same version of go in further
derivations.
2016-06-09 16:11:17 +02:00
Joachim Fasting
e52194f17d Merge pull request #16061 from vrthra/io
io: 2013.12.04 -> 2015.11.11
2016-06-09 14:15:55 +02:00
Vladimír Čunát
cbca34b1a7 Merge #13977: ffmpeg: add 3.0 version
I made the default not change for now.
2016-06-09 14:11:30 +02:00
Vladimír Čunát
9876769698 ffmpeg_3: 3.0 -> 3.0.2 2016-06-09 14:06:18 +02:00
Joachim Fasting
b9428a4576 Merge pull request #16089 from vrthra/factor
factor: disable build on i686-linux
2016-06-09 13:55:06 +02:00
Rahul Gopinath
35c544e6d4 factor: disable build on i686-linux
The factor language should be built only on x86_64 machines.
2016-06-09 04:19:00 -07:00
Rahul Gopinath
c860de987d io: 2013.12.04 -> 2015.11.11
Updating IO language to latest version
2016-06-09 04:15:26 -07:00
Kamil Chmielewski
8cd1d4cda5 buildGoPackage: use Go 1.6 by default 2016-06-09 13:08:10 +02:00
Kamil Chmielewski
734d152977 buildGo16Packages: fetchgit -> fetchFromGitHub 2016-06-09 13:08:10 +02:00
Kamil Chmielewski
bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is
a tag
2016-06-09 13:08:10 +02:00
Kamil Chmielewski
9683f5751f FIX: deis and gawp shas 2016-06-09 13:08:09 +02:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Peter Simons
dc6f1cf4b3 Merge pull request #16080 from mstarzyk/timezone-series
haskellPackages.timezone-series: Add support for time-1.6 - applied p…
2016-06-09 12:09:12 +02:00
Eelco Dolstra
109096247a php56: update to 5.6.22
(cherry picked from commit 72b4009367257c2447aac89d5f34f2421bbc88dc)
2016-06-09 10:04:39 +00:00
Rushmore Mushambi
3871831b37 Merge pull request #16059 from vrthra/factor
factor-lang: Init at 0.97
2016-06-09 11:24:53 +02:00
Kamil Chmielewski
6f51fdd81c drive: extracted from goPackges 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
7b4e868173 govers: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
fc88548b5d go2nix: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
5d3f8fec7c prometheus-statsd-bridge: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
5fec17a3e2 prometheus-pushgateway: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
28b6e9863c prometheus-node-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
0f13eab7c8 prometheus-nginx-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
f44b557476 prometheus-mysqld-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
485ad053e0 prometheus-mesos-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
a3cf92fdba prometheus-collectd-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
fc9bc9eba5 goDeps: support for mercurial repos 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
4bf5a93f2d prom2json: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
03feac7937 pond: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
826ff3efc2 glide: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
4ce39be8ea caddy: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
06327d22d6 syncthing012: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
abcec97b1e confd: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski
9e80bfed89 golint: FIX proper link to godeps file 2016-06-09 11:22:02 +02:00