Vladimír Čunát
77da5efc78
merge the rest of multiple-outputs
...
Conflicts:
pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
pkgs/development/tools/misc/patchelf/default.nix (easy)
pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Vladimír Čunát
694fa543af
Merge 'staging'
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
2c62a36b77
Merge remote-tracking branch 'origin/staging' into modular-stdenv
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
Vladimír Čunát
30fef8a3cf
readline: remove unused old versions 4 and 5
...
...including an unused patch.
2014-08-21 15:13:20 +02:00
Vladimír Čunát
50b65a7f8e
readline: use 6.3 by default
...
I found no build regressions with the most common dependents.
It's possible that older readline branches may be vulnerable,
although the last one announced seemed not to affect regular packages.
2014-08-21 15:13:19 +02:00
Luca Bruno
facb810bcc
rhash: new package
...
Console utility for computing and verifying hash sums of files
http://rhash.anz.ru
2014-08-21 00:46:35 +02:00
Vladimír Čunát
c198a36898
twinkle: fix build ( fixes #3673 )
...
Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.
CC: maintainer @MarcWeber.
2014-08-20 21:32:19 +02:00
Peter Simons
30d05ba082
haskell-timeparsers: build this package with a recent version of 'convertible'
2014-08-20 20:26:57 +02:00
Peter Simons
e910c8d6c9
Disable Hydra builds for broken Haskell packages.
...
The following packages are broken with GHC 7.8.3:
- filesystem-conduit version 1.0.0.2
- ghc-events-analyze version 0.2.0
- haskelldb version 2.2.2
- haskell-mpi version 1.2.1
- haxr-th version 3000.5
- hoauth version 0.3.5
- holy-project version 0.1.1.0
- hoogle version 4.2.32
- hspread version 0.3.3
- instant-generics version 0.4
- ivor version 0.1.14.1
- jmacro-rpc-happstack version 0.3
- lambdacube-engine version 0.2.4
- language-c-inline version 0.6.0.0
- lockfree-queue version 0.2.3
- monad-peel version 0.1.1
- network-transport-tests version 0.1.0.1
- poppler version 0.12.3
- profiteur version 0.1.2.1
- prolog-graph-lib version 0.2.0.1
- semigroupoid-extras version 4.0
- setlocale version 0.0.3
- sized-types version 0.5.0
- snaplet-postgresql-simple version 0.5
- snap-loader-dynamic version 0.10.0.2
- uhc git version 20120502
- uniqueid version 0.1.1
- unix-process-conduit version 0.2.2.3
- vado version 0.0.1
- vcsgui version 0.0.4
- xml-html-conduit-lens version 0.3.2.0
The following packages depend on one of the broken ones above:
- hoodle-builder version 0.3
- hoodle-core version 0.14
- hoodle-extra version 0.1
- hoodle-parser version 0.3
- hoodle-render version 0.4
- hoodle-types version 0.3
- hoodle version 0.3
- kansas-lava version 0.2.4
- liblastfm version 0.4.0.0
- prolog-graph version 0.1.0.2
- vacuum-cairo version 0.5
- wcwidth version 0.0.2
2014-08-20 20:26:57 +02:00
Peter Simons
17d3aee3eb
Merge pull request #3693 from ruediger/add/colord-kde
...
Add colord-kde.
2014-08-20 19:59:15 +02:00
Peter Simons
b4175c94e9
Merge pull request #3689 from Fuuzetsu/ghc-mod
...
haskell-ghc-mod: add 5.0.1
2014-08-20 17:17:00 +02:00
Moritz Ulrich
77437983a2
Slic3r: Bump to 1.1.7.
2014-08-20 16:27:47 +02:00
Mateusz Kowalczyk
c9dd66fde6
haskell-ghc-mod: add 5.0.1
...
Separate expression for now due to big API chanages.
2014-08-20 12:09:54 +01:00
Peter Simons
9a57058125
all-packages.nix: strip trailing whitespace
2014-08-20 11:57:56 +02:00
Peter Simons
c25d90de7b
Move 'cryptol' and 'darcs' from the generic Haskell package set into all-packages.nix.
...
These packages need very a version of GHC to compile.
2014-08-20 11:57:38 +02:00
Austin Seipp
8b96a44460
nixpkgs: boringssl 20140820-a7d1363f
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:23:40 -05:00
Austin Seipp
0aa8cdcef9
nixpkgs: libressl 2.0.5
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 00:51:15 -05:00
Austin Seipp
47c443bede
nixpkgs: openresty 1.7.4.1rc1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 00:38:49 -05:00
Rüdiger Sonderfeld
fd5084bc8f
Add colord-kde.
...
A KDE front-end for colord.
2014-08-20 01:54:45 +02:00
Carlo Nucera
fd1ec088d2
Added monadSupply (monad-supply) to haskellPackages
2014-08-19 23:47:58 +02:00
Emil Rangden
e15036dbd0
haskell fix - fay
...
Remove explicit old aeson version and update to latest
2014-08-19 23:47:58 +02:00
Peter Simons
a72e2d6046
Merge pull request #3667 from rrnewton/manticore
...
Add parallel functional compiler, Manticore
2014-08-19 17:18:52 +02:00
Ryan Newton
ff6057d686
Add parallel functional compiler, Manticore
2014-08-19 02:36:57 -04:00
Mateusz Kowalczyk
6870cb88ae
haskell-gtk3: add 0.13.0.0
2014-08-19 03:45:54 +01:00
Mateusz Kowalczyk
4cf5ef541f
haskell-haskoin: add 0.1.0.2
2014-08-18 17:15:54 +01:00
Mateusz Kowalczyk
32739cffde
haskell-json-rpc: add 0.2.0.1
2014-08-18 16:58:29 +01:00
Peter Simons
c5dca72abe
Merge pull request #3657 from ttuegel/network-uri
...
Add haskell-network-uri-2.6.0.0
2014-08-18 17:48:49 +02:00
Oliver Charles
ab7b973b33
haskellPackages.xlsx: New expression
2014-08-18 15:57:24 +01:00
Vladimír Čunát
26d68ce798
merge #3301 : add Adom game (with fixes)
2014-08-18 16:26:39 +02:00
Thomas Tuegel
26a5718957
Add haskell-network-uri-2.6.0.0
2014-08-18 08:29:16 -05:00
Michael Raskin
fba7d7c4b8
Add Firejail cheap-sandbox-building package
2014-08-18 02:18:33 +04:00
Peter Simons
d49f5283d7
haskell-packages.nix: drop trailing whitespace
2014-08-17 00:20:12 +02:00
Peter Simons
253f2825e2
haskell-haddock-library: add version 1.1.0
2014-08-17 00:20:12 +02:00
Peter Simons
c552ae1c95
haskell-loop: add version 0.2.0
2014-08-17 00:20:12 +02:00
Domen Kožar
57e17edd26
Merge pull request #3536 from geerds/firefox-wrapper
...
Fix default icon location in 'wrapFirefox'
2014-08-16 20:23:15 +02:00
Domen Kožar
31c394abef
Merge pull request #3612 from nathanielbaxter/dev/flexget_update
...
flexget: Updated to 1.2.161, with additional dependancies added.
2014-08-16 15:05:23 +02:00
Peter Simons
751ccf9560
Merge pull request #3620 from NOTtheMessiah/master
...
added implicit and storableEndian to haskellPackages for ImplicitCAD
2014-08-16 13:35:26 +02:00
Mateusz Kowalczyk
631e4097a6
haskell-base32-bytestring: add version 0.2.1.0
2014-08-16 11:47:14 +01:00
Mateusz Kowalczyk
babec1351f
haskell-bits-extras: add version 0.1.3
2014-08-16 11:46:53 +01:00
Aycan iRiCAN
dd9fcdce1d
Merge pull request #3623 from MP2E/algebra
...
add the Haskell algebra library
2014-08-16 10:45:01 +03:00
John Wiegley
cd89cc018f
haskell-aeson: Add version 0.7.0.6
2014-08-16 00:13:15 -05:00
Cray Elliott
947d1945fb
add the Haskell algebra library
2014-08-15 20:27:58 -07:00
Brian Cohen
fea19a1fd6
Added implicit and storableEndian to haskellPackages for ImplicitCAD
2014-08-15 21:26:11 -04:00
Peter Simons
e0632b21dc
Merge pull request #3613 from phunehehe/HaskellNet-SSL
...
add HaskellNet-SSL
2014-08-15 18:30:56 +02:00
Hoang Xuan Phu
6ded64bd05
add HaskellNet-SSL
2014-08-15 22:14:23 +08:00
Matthew Brown
33c7f791d8
Added haskell hex protobuf packages
2014-08-15 14:17:40 +01:00
Nathaniel Baxter
69390c184b
flexget: Updated to 1.2.161, with additional dependancies added.
...
Also made deluge plugin support conditional on deluge being installed,
and added similar conditional support for the transmission plugin.
2014-08-15 22:41:31 +10:00
Domen Kožar
3233e56935
add pythonPackages.detox
2014-08-15 13:13:02 +02:00
Vladimír Čunát
36a9fb094f
merge #3462 : zotero update and resurrect xulrunner
2014-08-15 01:55:56 +02:00