Thomas Tuegel
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
Thomas Tuegel
2e0775e3a8
Revert "cc-wrapper: fix missing attribute"
...
This reverts commit 6454b8f9ef
.
2015-03-24 17:48:53 -05:00
Thomas Tuegel
1c3c6e7dbb
plasma5_latest: build with kf58
2015-03-24 17:16:11 -05:00
Thomas Tuegel
77fb55d1f0
plasma52: update to plasma-5.2.2
2015-03-24 17:16:02 -05:00
Thomas Tuegel
6632b151b8
add kf58
2015-03-24 17:15:51 -05:00
Thomas Tuegel
5d1f6ad57c
qt5: make qt-5.4.1 default
2015-03-24 17:14:56 -05:00
Thomas Tuegel
ad49ea230a
qt54: update to qt-5.4.1
2015-03-24 17:14:56 -05:00
Thomas Tuegel
6454b8f9ef
cc-wrapper: fix missing attribute
2015-03-24 17:14:55 -05:00
Vladimír Čunát
9a75c1d7c8
lensfun: fix build by using older make
2015-03-24 21:15:46 +01:00
Peter Simons
2b8328a111
Merge pull request #6926 from wjlroe/haskell-llvm-general-pin-version
...
Haskell llvm-general 3.4.4.0 requires LLVM==3.4.*
2015-03-24 20:48:47 +01:00
Luis G. Torres
f7e4be5011
flann: make it build on Darwin ( close #6946 )
2015-03-24 20:48:10 +01:00
Thomas Tuegel
60c123560e
Merge branch 'kde4-override'
2015-03-24 13:53:00 -05:00
Thomas Tuegel
d3500f67c9
kde4: fix override
2015-03-24 13:52:47 -05:00
Edward Tjörnhammar
7b7ab0cdaa
idea-{community,ultimate}: 14.0.3 -> 14.1
2015-03-24 17:01:59 +01:00
Eelco Dolstra
9c579f691f
fix-darwin-dylib-names: Fix all outputs
...
This fixes the install names of the Boost dylibs on Darwin.
2015-03-24 16:28:20 +01:00
Eelco Dolstra
b4830add94
Revert "fix-darwin-dylib-names: Fix all outputs"
...
This reverts commit 253f3d72c2
.
2015-03-24 16:27:54 +01:00
Eelco Dolstra
253f3d72c2
fix-darwin-dylib-names: Fix all outputs
...
This fixes the install names of the Boost dylibs on Darwin.
2015-03-24 15:59:05 +01:00
Michael Raskin
7c8410b196
Merge pull request #6965 from joachifm/reimplement-j
...
j: re-implement using mkDerivation
2015-03-24 17:02:48 +03:00
Eelco Dolstra
5cc05f6cf2
nixUnstable: Update to 1.9pre4083_5114a07
2015-03-24 14:42:37 +01:00
Eelco Dolstra
bda440a7b3
substitute: Fix "No such file or directory" message on Darwin
...
On Darwin, "chmod -f" does not suppress an error message if the file
doesn't exist. So just check if the file exists.
2015-03-24 14:12:24 +01:00
Joachim Fasting
62a6499243
j: re-implement using mkDerivation
2015-03-24 14:05:25 +01:00
Shea Levy
f80e342e83
ccache-links is wrapped, so it needs a gcc attribute
2015-03-24 08:59:34 -04:00
Peter Simons
85704cd9d3
cabal2nix: update to latest Git version
2015-03-24 13:58:08 +01:00
lethalman
b90dac968e
Merge pull request #6953 from aflatter/postgresql-with-openssl
...
Compile postgresql with openssl
2015-03-24 10:22:33 +01:00
lethalman
990d8d1a60
Merge pull request #6408 from benley/prometheus
...
New packages: Prometheus monitoring system
2015-03-24 10:11:15 +01:00
lethalman
4b34f11b79
Merge pull request #6941 from benley/golang-google-code-sadface
...
goPackages.protobuf: transition to new github import path
2015-03-24 10:03:10 +01:00
Arseniy Seroka
3a08b70be5
Merge pull request #6959 from pmahoney/libdevil
...
libdevil: patch to build on darwin
2015-03-24 10:36:29 +03:00
Michael Raskin
03912fb435
Update libfixposix link
2015-03-24 09:45:08 +03:00
Bjørn Forsman
ff9bc81946
lttng-modules: update to latest stable (fixes build)
...
Fixes build against linux 3.14.36+.
Also
* It works with linux 3.12 now, so remove that assert
* Remove unneeded patches (merged upstream)
2015-03-24 07:10:12 +01:00
Tobias Geerinckx-Rice
c3bc040128
python-packages: pgcli 0.16.1 -> 0.16.2
2015-03-24 04:02:13 +01:00
Ricardo M. Correia
232b434bc4
gradm: Update from 3.1-201502222102 -> 3.1-201503211320
2015-03-24 03:47:27 +01:00
Arseniy Seroka
40be415e57
Merge pull request #6957 from ehmry/rstudio
...
RStudio: initial commit at version 0.98.110
2015-03-24 00:49:28 +03:00
Patrick Mahoney
7f728ae2e1
libdevil: patch to build on darwin
...
On a OSX 10.10 system:
libtool: compile: clang++ -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -fgnu89-inline -msse -msse2 -msse3 -D_THREAD_SAFE -I/nix/store/7n9c36hz9sl2dqvfry8d554l935hq4ma-openexr-2.2.0/include/OpenEXR -I/nix/store/3jxslxa37wmfdnyfj1hckpxl0skscgj0-ilmbase-2.2.0/include/OpenEXR -O3 -c ./../src-IL/src/il_exr.cpp -fno-common -DPIC -o .libs/libIL_la-il_exr.o
In file included from ./../src-IL/src/il_exr.cpp:22:
In file included from ./../src-IL/include/il_exr.h:18:
In file included from /nix/store/7n9c36hz9sl2dqvfry8d554l935hq4ma-openexr-2.2.0/include/OpenEXR/ImfIO.h:49:
In file included from /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/string:434:
/nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/__config:32:22: error: expected value in expression
#if __LITTLE_ENDIAN__
^
/nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/__config:110:11: fatal error: 'endian.h' file not found
# include <endian.h>
^
2 errors generated.
make[1]: *** [libIL_la-il_exr.lo] Error 1
make[1]: Leaving directory `/private/var/folders/1g/yfm550_10sb76p0z469bq9mr5zsthm/T/nix-build-libdevil-1.7.8.drv-1/devil-1.7.8/lib'
make: *** [all-recursive] Error 1
See http://sourceforge.net/p/resil/tickets/8/
2015-03-23 15:53:45 -05:00
Emery Hemingway
56e21d05e8
RStudio: initial commit at version 0.98.110
2015-03-23 16:28:33 -04:00
Benjamin Staffin
bcc8293cba
New package: prometheus-statsd-bridge
2015-03-23 12:07:22 -07:00
Benjamin Staffin
781dbfb9b8
New package: prometheus-mesos-exporter
2015-03-23 12:07:22 -07:00
Benjamin Staffin
d8c2cebf01
prometheus-node-exporter: update to 0.8.0
2015-03-23 12:07:21 -07:00
Benjamin Staffin
95be71cf91
Prometheus: update to 0.12.0
2015-03-23 12:07:21 -07:00
Benjamin Staffin
5b3254a8d1
New package: prometheus-node-exporter
2015-03-23 12:07:21 -07:00
Benjamin Staffin
d11bb48234
New package: prometheus-cli
2015-03-23 12:07:20 -07:00
Benjamin Staffin
6564dd8199
New package: prometheus-pushgateway
2015-03-23 12:07:20 -07:00
Benjamin Staffin
b2d17977be
New package: prometheus-haproxy-exporter
2015-03-23 12:07:20 -07:00
Benjamin Staffin
92b08cd406
New package: prometheus-alertmanager
2015-03-23 12:07:19 -07:00
Benjamin Staffin
9c1f0b33a3
New package: Prometheus monitoring system
2015-03-23 12:06:57 -07:00
Benjamin Staffin
55bbb4fb0b
goPackages.protobuf: transition to new github import path
2015-03-23 11:53:01 -07:00
Arseniy Seroka
460ea0a8a5
slurm: update pkg
2015-03-23 21:52:30 +03:00
Alexander Flatter
e8df73e508
Compile postgresql with openssl
2015-03-23 18:51:45 +01:00
Eelco Dolstra
d3756e162c
stdenv-darwin: Auto-detect the "right" SDK version
2015-03-23 16:46:41 +01:00
Eelco Dolstra
ead7762573
stdenv-darwin: Use --sdk macosx10.9
...
Otherwise builds fail on Mac OS X 10.9 with Xcode 6.1. This is because
"xcrun --show-sdk-version" returns 10.10, which doesn't work.
2015-03-23 16:04:37 +01:00
Pascal Wittmann
7811c40974
abduco: update from 0.3 to 0.4
2015-03-23 15:55:30 +01:00