Eelco Dolstra
eb6c0826c5
libsamplerate: Use default gcc
2014-07-23 11:45:44 +02:00
Eelco Dolstra
922af7f158
libsndfile: Fix build on Darwin
...
Fixes #3347 .
2014-07-23 11:00:41 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
27fe53e89c
nss: minor update
...
I couldn't find any kind of news or changelog.
2014-07-22 22:12:19 +02:00
Eelco Dolstra
402688b752
gcc: Fix multilib builds
...
http://hydra.nixos.org/build/12578050
2014-07-22 13:36:00 +02:00
Eelco Dolstra
0b996d886b
opencv: Enable fewer dependencies by default
...
In particular, this prevents KDE from pulling in gfortran, numpy and
atlas. We don't want anything important depending on atlas because it
has a crazy non-deterministic build system.
http://hydra.nixos.org/build/12555947
2014-07-22 13:36:00 +02:00
Eelco Dolstra
b9e9e90a02
readline-6.3: Fix build on Mac OS X < 10.9
...
http://hydra.nixos.org/build/12476331
2014-07-22 11:24:00 +02:00
Eelco Dolstra
4f7289eec9
Don't use ensureDir
2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Eelco Dolstra
f77abc8b7a
go: Fix build
...
http://hydra.nixos.org/build/12538479
2014-07-22 10:49:46 +02:00
Sven Keidel
4ef371e1f6
added platform meta information to gpodder
2014-07-22 09:39:06 +02:00
Sven Keidel
ee9ffde1cb
added metainformation for gpodder and mygpoclient
2014-07-21 21:41:27 +02:00
lethalman
5cde295b1d
Merge pull request #3327 from svenkeidel/gpodder
...
added gpodder package
2014-07-21 18:37:28 +02:00
Shea Levy
430bf4719e
Add plugins haskell package
2014-07-21 09:44:39 -04:00
Oliver Charles
a80a701101
haskellPackages.engineIO/engineIOSnap/socketIO: Update to latest versions
2014-07-21 14:24:57 +01:00
Oliver Charles
977add9710
haskellPackages.engineIO: Update to 1.0.2
2014-07-21 13:58:41 +01:00
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát
65ac375aa2
Revert "qt4: try enableParallelBuilding again"
...
This reverts commit e8dc6258a1
.
It's unfortunate, but there still are occurrences of the missing ui_qtgradientview.h
on Hydra: http://hydra.nixos.org/build/12625390/nixlog/1/tail-reload
2014-07-21 10:09:38 +02:00
Sven Keidel
eeeed00950
added gpodder package
2014-07-20 21:14:00 +02:00
Peter Simons
6609493aa5
Merge pull request #3322 from bennofs/haskell-gtk-gio
...
haskell-gtk: re-generate after applying NixOS/cabal2nix#70
2014-07-20 21:11:49 +02:00
Benno Fünfstück
e2046181b6
haskell-gtk: re-generate after applying NixOS/cabal2nix#70
2014-07-20 16:56:19 +02:00
Pascal Wittmann
c7add6c270
Merge pull request #3317 from Mathnerd314/prelink
...
Add prelink package
2014-07-20 14:03:12 +02:00
Vladimír Čunát
6b4929373f
ffmpeg: major update 2.2.4 -> 2.3
...
It's claimed to be fully API-compatible update.
2014-07-20 08:44:58 +02:00
Vladimír Čunát
14953d7bc9
mesa: maintenance update 10.2.3 -> .4
2014-07-20 08:40:25 +02:00
Vladimír Čunát
65aacd459c
harfbuzz: small update
2014-07-20 08:40:05 +02:00
Austin Seipp
f677e843d5
hhvm: remove bash input
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:46:32 -05:00
Austin Seipp
03fd95d248
hhvm: Fix path to /bin/bash
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:44:43 -05:00
Peter Simons
713379c658
Re-generate Haskell packages with cabal2nix.
2014-07-19 21:12:04 +02:00
Aycan iRiCAN
de155d13da
Merge pull request #3227 from hrdinka/haskell-stm-containers
...
haskell-stm-containers: add package version 0.1.2 and its dependencies
2014-07-19 11:47:42 +03:00
Aycan iRiCAN
bfe2e05925
Merge pull request #3319 from luke-clifton/master
...
Added cgrep utility.
2014-07-19 11:43:06 +03:00
Aycan iRiCAN
f057f06136
resolved conflicts
2014-07-19 11:25:30 +03:00
Aycan iRiCAN
9489105aca
Merge branch 'haskellPackages.rest'
2014-07-19 11:18:18 +03:00
Luke Clifton
8fcd7bffb9
Merge remote-tracking branch 'upstream/master'
2014-07-19 15:45:31 +08:00
Austin Seipp
4b0178d2a4
hhvm: 3.1.0 -> 3.2.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 01:58:09 -05:00
Luke Clifton
2fbd9e07f2
Added cgrep utility.
2014-07-19 12:21:15 +08:00
Mathnerd314
dd325fa30c
Add prelink package
2014-07-19 02:16:41 +02:00
John Wiegley
9b608c0e99
haskell-codex: jailbreak due to circular dependency
...
It seems the codex-0.1.0.2 build requires 0.1.0.1.
2014-07-18 18:00:27 -05:00
Alexander Tsamutali
a1a9c26ccc
Merge branch 'master' of https://github.com/NixOS/nixpkgs
2014-07-18 20:12:00 +04:00
Alexander Tsamutali
cc4c108965
usb-modeswitch: Update to 2.2.0.
2014-07-18 20:11:16 +04:00
Peter Simons
8a2aa3ccac
haskell-parsers: add version 0.12
2014-07-18 17:30:49 +02:00
Peter Simons
2603db86d3
haskell-aeson: add version 0.8.0.0
2014-07-18 17:30:48 +02:00
Peter Simons
91c17543f2
haskell-QuickCheck: add version 2.7.6
2014-07-18 17:30:48 +02:00
Peter Simons
125aeed5a0
haddock: update to version 2.14.3
2014-07-18 17:30:48 +02:00
Peter Simons
dfbce69f05
haskell-codex: update to version 0.1.0.2
2014-07-18 17:30:48 +02:00
Peter Simons
c0791a5b2c
haskell-HaRe: update to version 0.7.2.5
2014-07-18 17:30:48 +02:00
Peter Simons
82d1bce665
haskell-yaml: update to version 0.8.8.4
2014-07-18 17:30:48 +02:00
Peter Simons
cc25d3f876
haskell-word8: update to version 0.1.1
2014-07-18 17:30:48 +02:00
Peter Simons
6c1a24766f
haskell-webdriver: update to version 0.6.0.1
2014-07-18 17:30:48 +02:00
Peter Simons
3f881c8bdf
haskell-unix-time: update to version 0.3.2
2014-07-18 17:30:48 +02:00
Peter Simons
db91e939d5
haskell-streaming-commons: update to version 0.1.4
2014-07-18 17:30:48 +02:00