Shea Levy
b45aa294d4
Merge branch 'llvm-bump'
...
Bump default llvm on non-darwin too
2015-02-04 11:48:50 -05:00
Shea Levy
c1aefe5d7e
Merge branch 'master' of git://github.com/gridaphobe/nixpkgs
...
make wget build on darwin
2015-02-04 16:41:15 +00:00
Rickard Nilsson
57d71cf8d2
More download mirrors for samba URLs
2015-02-04 17:38:39 +01:00
Shea Levy
0e225c0e37
llvm-3.5: Don't try to use libc++ on linux
2015-02-04 11:30:25 -05:00
Rickard Nilsson
52cb8db899
libldb: Add mirror url
2015-02-04 17:05:16 +01:00
Shea Levy
92962f049b
Merge branch 'less-tradcpp' of git://github.com/active-group/nixpkgs
...
Shorten tradcpp patch by re-running autoconf
2015-02-04 15:56:49 +00:00
Pascal Wittmann
97e50cac40
Merge pull request #6142 from k0ral/aria
...
aria2: 1.18.8 -> 1.18.9
2015-02-04 16:30:31 +01:00
Rickard Nilsson
100cc6b425
samba: Add download mirror
2015-02-04 16:28:48 +01:00
koral
a3f0c7bff4
aria2: 1.18.8 -> 1.18.9
2015-02-04 15:55:49 +01:00
Peter Simons
fe07c77ff1
haskell-gtkglext: drop obsolete override
2015-02-04 14:53:58 +01:00
Peter Simons
fbaf6dcbb0
git-annex: fix build on Darwin
2015-02-04 14:53:58 +01:00
Peter Simons
638ea434cb
haskell-system-canonicalpath: fix build by disabling the test suite
2015-02-04 14:53:58 +01:00
Peter Simons
7ce799f0f8
haskell-hjsonschema doesn't pass the Haddock stage.
2015-02-04 14:53:58 +01:00
Peter Simons
483b71a44a
hackage-packages.nix: re-generate from Hackage 2015-02-04T14:35:51+0100
2015-02-04 14:53:54 +01:00
Eelco Dolstra
038a837f02
nixUnstable: Update to 1.9pre4028_0d1dafa
2015-02-04 14:22:34 +01:00
Domen Kožar
a3e23f6535
fix eval
2015-02-04 14:11:33 +01:00
Domen Kožar
bb7246be3e
Revert "arduino: new package"
...
This reverts commit ca982158bf
.
@bjornfor
2015-02-04 13:49:27 +01:00
Mike Sperber
93343fbb33
Reduce size of tradcpp derivation.
...
Generate configure using autoconf instead of including it in the patch.
2015-02-04 13:34:13 +01:00
Domen Kožar
d75a91ef1e
pypy: 2.4 -> 2.5
2015-02-04 13:21:20 +01:00
Peter Simons
955001a55b
Merge pull request #6134 from joachifm/haskell-monad-logger
...
haskell-monad-logger: version bump
2015-02-04 12:07:14 +01:00
Moritz Ulrich
a5807eb7c4
pass: default to withX = true & install passmenu.
2015-02-04 12:06:48 +01:00
Domen Kožar
cb6706c22f
Remove Varnish 2.1.5
...
Last release was in 2010, has vulns CVE-2013-4484, cc @garbas
2015-02-04 11:53:22 +01:00
Domen Kožar
98a480363c
varnish: 3.0.5 -> 3.0.6
2015-02-04 11:51:57 +01:00
Domen Kožar
ee74e1a055
solr: 4.10.2 -> 4.10.3, CVE-2014-3628
...
(cherry picked from commit 4fa25ee93a
)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:48:28 +01:00
Domen Kožar
eaeef0377f
jasper: CVE-2014-8157, CVE-2014-8158, fixes #6114
2015-02-04 11:37:49 +01:00
Domen Kožar
d50bfd7515
unzip: CVE-2014-9636, fixes #6128
2015-02-04 11:17:19 +01:00
Shea Levy
df430ab2ea
Fix imake on darwin.
...
Taken from joelteon/nixpkgs@6b3f7e6fb0
Original author Mike Sperber <sperber@deinprogramm.de>
2015-02-04 10:00:50 +00:00
Mike Sperber
b611e3fb61
Add tradcpp package, needed for making imake work.
...
(cherry picked from commit e0c197b2f4fa53ebd7896940e6e14170664de8e7)
2015-02-04 09:29:34 +00:00
Eric Seidel
9a1817c778
make wget build on darwin
2015-02-04 00:09:13 -08:00
John Wiegley
ad60eaedf1
clucene-core: make darwin-related patch conditional
...
This relates to pull request #6137 , and was made at request of the
submitter.
2015-02-04 01:40:17 -06:00
John Wiegley
33ecb3438f
Merge pull request #6137 from gridaphobe/master
...
fix clucene on darwin
2015-02-04 02:35:13 -05:00
Eric Seidel
58a891afb2
fix clucene on darwin
2015-02-03 23:34:03 -08:00
John Wiegley
cb91cf9ae3
Merge pull request #6136 from gridaphobe/master
...
fix obscure bug in apr on darwin
2015-02-04 02:13:19 -05:00
Eric Seidel
a600443bb3
fix obscure bug in apr on darwin
2015-02-03 23:11:44 -08:00
Bjørn Forsman
ca982158bf
arduino: new package
...
This commit adds the graphical Arduino IDE, built from the arduino-core
expression.
Also:
- Add libusb to RPATH for avrdude. Without this, avrdude is broken.
Possible TODO: replace bundled avrdude with the one from nixpkgs.
- Use "cp -r ./build/linux/work/*", so example sketeches, the HTML
reference documentation and the 'arduino' shell script that starts the
IDE gets included.
- Make meta.description slightly more generic, to cover both GUI/core
variants.
2015-02-04 07:22:39 +01:00
Bjørn Forsman
83e3f38593
arduino-core: align attrname with package name
...
arduino_core => arduino-core. Retain copy of old attrname for backward
compatibility.
2015-02-04 07:22:39 +01:00
Bjørn Forsman
ef64865ea9
xflux: stdenv.cc.gcc -> gcc.cc (fix evaluation)
2015-02-04 07:16:22 +01:00
Bjørn Forsman
bc18d0dbc0
mendeley: gcc.gcc -> gcc.cc (fix evaluation)
2015-02-04 07:16:19 +01:00
Joachim Fasting
40b4b1490d
haskell-monad-logger: version bump
...
The previous version fails to build.
2015-02-04 04:03:10 +01:00
Shea Levy
a1f1d0d442
Switch default llvm to 3.5
2015-02-03 20:01:39 -05:00
Shea Levy
5ac0318332
Merge branch 'new-darwin-stdenv' of git://github.com/gridaphobe/nixpkgs
...
refs #6122
2015-02-03 18:19:22 -05:00
Eric Seidel
cbd446d465
fix gmp on darwin
2015-02-03 15:18:28 -08:00
Eric Seidel
4a467ec02b
move libcxx[abi] into llvm tree
2015-02-03 14:58:10 -08:00
Eric Seidel
fe49487a05
fix evaluation
2015-02-03 14:31:07 -08:00
Eric Seidel
dbf3d31727
make llvm-3.5 the default and remove references to gccApple
...
make perl be less dumb
revert change to release.nix
2015-02-03 14:31:04 -08:00
Domen Kožar
f8dacd8528
Merge pull request #6090 from richardlarocque/xbmc_rtmp
...
xbmc: Add rtmp support
2015-02-03 23:22:52 +01:00
Domen Kožar
8aad92fc96
Merge pull request #6126 from lukaslihotzki/gitlab
...
gitlab: Fix typo
2015-02-03 23:17:40 +01:00
Eric Seidel
ebb8d03f96
darwin-specific stuff
2015-02-03 14:06:13 -08:00
Eric Seidel
92188d9d17
new darwin stdenv
2015-02-03 14:05:22 -08:00
Eric Seidel
6f7632a7bd
update libcxx[abi] to 3.5
2015-02-03 14:02:59 -08:00