Eelco Dolstra
d6c88eaeb8
Apply upstream fix for Nix on XFS
...
Fixes #6424 .
2015-02-18 10:41:39 +01:00
Eelco Dolstra
cbab474cea
nixUnstable: Update
2015-02-18 10:39:47 +01:00
Wout Mertens
1a6b92bb71
Merge pull request #6421 from Havvy/patch-1
...
Update Node stable to v.0.12.0
2015-02-18 10:36:40 +01:00
Dan Peebles
c6ce6460c4
Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin)
2015-02-18 02:05:56 -05:00
Ryan Scheel
ffc1a595e4
Update Node stable to v.0.12.0
...
Patch is from ewemoa on IRC and claims it built successfully. User didn't want to create a Github account. Original patch is at https://pastee.org/zx45s
2015-02-17 22:44:58 -08:00
Damien Cassou
ae0263f960
Merge pull request #6420 from DamienCassou/deactivate-simpleparse-on-python3
...
Disable simpleparse on python3 and pypy
2015-02-18 07:38:03 +01:00
Damien Cassou
6938b79de8
Disable simpleparse on python3 and pypy
2015-02-18 07:35:54 +01:00
William A. Kennington III
8b4156fb3e
Merge pull request #6404 from codyopel/rtmpdump
...
rtmpdump: refactor & bump commit
2015-02-17 22:30:00 -08:00
William A. Kennington III
ad0277fbdc
Merge pull request #6386 from codyopel/xvidcore
...
xvidcore: refactor & 1.3.2 -> 1.3.3
2015-02-17 22:29:40 -08:00
William A. Kennington III
f7cdbb091a
Merge pull request #6417 from benley/haproxy
...
haproxy: update to 1.5.11
2015-02-17 22:28:57 -08:00
Dan Peebles
3caa6f4d7d
This doesn't hurt the current darwin stdenv and doesn't affect anything else, but is needed for the upcoming pure darwin stdenv
2015-02-18 01:19:59 -05:00
Dan Peebles
7cc575c870
Fish wants libiconv too, even though it won't admit it
2015-02-18 01:14:36 -05:00
Dan Peebles
12c1c8d590
wget wants libiconv but doesn't say so
2015-02-18 00:49:37 -05:00
Dan Peebles
025f87f79a
Bootstrap tools for the upcoming new darwin stdenv (not working yet in this stdenv, but will soon)
2015-02-18 00:24:34 -05:00
Dan Peebles
ecf662efc6
Flip cctools and cctools cross
2015-02-18 00:24:33 -05:00
Eric Seidel
9f84592160
Merge pull request #6250 from gridaphobe/emacs-melpa
...
add package.el-based emacs package builder
2015-02-17 20:32:28 -08:00
Eric Seidel
3cb5ee6b58
Merge pull request #6418 from gridaphobe/master
...
provide explicit libiconv for the rare cases that need it, like uclibc
2015-02-17 20:30:23 -08:00
Eric Seidel
d2a987d6e3
fix travis evaluation by providing explicit libiconv for the rare cases
...
that need it, like uclibc
2015-02-17 20:10:26 -08:00
Benjamin Staffin
2efd1a4700
haproxy: update to 1.5.11
...
Change-Id: I6f5d8d62084da89c22e99df2a99b4608ba95f874
2015-02-17 19:57:17 -08:00
Dan Peebles
3a423e4405
It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools
2015-02-17 22:39:31 -05:00
Dan Peebles
a78d164b1e
Minor fixes for git on darwin (libiconv and Security dependencies)
2015-02-17 22:30:59 -05:00
Dan Peebles
a68484a0ac
Minor fix for broken ruby evaluation and libiconv
2015-02-17 21:39:29 -05:00
Joel Taylor
695136db1c
Temporarily fix build of x509-system on Darwin.
...
Introduces a nasty impurity but what can you do :(
2015-02-17 16:58:42 -08:00
Eric Seidel
76a501acdb
reorganize emacs packages and add some meta info
2015-02-17 15:08:55 -08:00
Peter Simons
c08716029b
Merge pull request #6406 from bstrik/master
...
Add myself to the maintainers
2015-02-17 23:20:55 +01:00
Eric Seidel
07ebc363c8
emacs: add ac-haskell-process and update auto-complete
2015-02-17 13:21:13 -08:00
Eric Seidel
4676d0137b
add hi2 haskell-indentation mode
2015-02-17 13:21:13 -08:00
Eric Seidel
04509a3c36
fix auto-complete
2015-02-17 13:21:13 -08:00
Eric Seidel
9a77480b0e
pull package-build.el from github
2015-02-17 13:21:13 -08:00
Eric Seidel
39c647c218
add package.el-based emacs package builder
2015-02-17 13:21:12 -08:00
Mathijs Kwik
2fe44b95d0
nixos/wpa_supplicant: fix conflicting documentation
...
fixes #6298
2015-02-17 22:16:20 +01:00
codyopel
25c9b84994
rtmpdump: refactor & bump commit
2015-02-17 16:15:03 -05:00
bstrik
929335e32f
Add myself to the maintainers
2015-02-17 22:06:59 +01:00
Arseniy Seroka
0e63ac0acf
Merge pull request #6402 from codyopel/xavs
...
xavs: add package
2015-02-17 23:42:01 +03:00
Bjørn Forsman
9b79a35371
speedtest-cli: drop the "python2.7-" name prefix
2015-02-17 20:22:39 +01:00
Bjørn Forsman
ea6a9a2281
speedtest-cli: align attrname with pkgname
2015-02-17 20:14:10 +01:00
Shea Levy
2f061ff16b
Merge remote-tracking branch 'origin/staging'
...
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
codyopel
be0b4050aa
xavs: add package
2015-02-17 13:29:48 -05:00
lethalman
6be3ffb0d4
Merge pull request #6394 from codyopel/libwebp
...
libwebp: refactor & 0.4.1 -> 0.4.2
2015-02-17 15:28:35 +01:00
Arseniy Seroka
c070665ca9
Merge commit 'a6b1cb8'
2015-02-17 16:55:01 +03:00
Arseniy Seroka
a6b1cb8411
vimPlugins.YCM: fix sha
2015-02-17 16:54:06 +03:00
Peter Simons
519c696bcf
haskell-configuration-common.nix: fix evaluation
2015-02-17 14:35:25 +01:00
Aycan iRiCAN
ae5e377eb3
Merge pull request #6398 from aycanirican/httpStreamsFix
...
disable tests for haskellngPackages.http-streams since it doesn't includ...
2015-02-17 15:29:55 +02:00
Aycan iRiCAN
60cbac103e
Merge branch 'httpStreamsFix' of github.com:aycanirican/nixpkgs into httpStreamsFix
...
Conflicts:
pkgs/development/haskell-modules/configuration-common.nix
2015-02-17 15:28:33 +02:00
Aycan iRiCAN
2d54eb7693
disable tests for haskellngPackages.http-streams since it doesn't include test modules
2015-02-17 15:26:56 +02:00
Aycan iRiCAN
c723352d77
disable tests for haskellngPackages.http-streams since it doesn't include test modules
2015-02-17 15:23:15 +02:00
Rob Vermaas
8495c101dc
Fixes #6374 . Now for real, dohhh.
2015-02-17 13:10:13 +00:00
Rob Vermaas
1a0e6f0039
Fixes #6374 .
2015-02-17 13:07:54 +00:00
Arseniy Seroka
e13b0a8bb1
Merge pull request #6396 from codyopel/wavpack
...
wavpack: add package
2015-02-17 16:05:21 +03:00
Peter Simons
ad01e9dfbb
haskell-language-lua fails its test suite.
2015-02-17 13:51:19 +01:00
