Luca Bruno
f8a833cfb1
Revert "initialized git repo should use the set http_proxy"
...
This reverts commit 5af576ff7f4e657c0053f66d6fba03bfd1e97669.
See discussion on https://github.com/NixOS/nixpkgs/commit/5af576f
2014-11-09 13:50:48 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Luca Bruno
7f3c95e6b7
webkitgtk: disable parallel building
2014-11-08 15:55:53 +01:00
Vincent Laporte
aa2fd47e9d
Fixes ocamlscript
2014-11-08 14:28:38 +00:00
Aristid Breitkreuz
cf4a976ced
quassel: make a proper systemd unit (also properly works in containers now)
2014-11-08 14:59:25 +01:00
Luca Bruno
7885c2ed12
Revert "nixos: iso-image: use syslinux bootloader for USB booting support"
...
This reverts commit 455db168b30d53c903c96be80ef843b79e0744ae.
2014-11-08 14:33:27 +01:00
Luca Bruno
e3611709d6
Revert "nixos: installation: make installation ISOs USB bootable"
...
This reverts commit b7f6a138b13ca667464b31274a33124d252ebc8b.
2014-11-08 14:33:27 +01:00
Domen Kožar
555a094326
fix libreoffice build
2014-11-08 14:24:32 +01:00
Jaka Hudoklin
53667c7b1a
Merge pull request #4870 from bosu/docker-proxy
...
docker: propagate nix.proxy into daemon environment
2014-11-08 13:06:56 +01:00
Domen Kožar
ba8e8ec8cf
fix ccnx build
2014-11-08 13:02:05 +01:00
lethalman
27b79a0469
Merge pull request #4780 from ambrop72/kernel-ppp-filter
...
kernel: Enable PPP_FILTER by default.
2014-11-08 12:41:13 +01:00
Nikolay Amiantov
cf4398cfde
distributed-process-platform: add haskell package
2014-11-08 11:47:05 +01:00
Nikolay Amiantov
a909a12c2d
rematch: add haskell package
2014-11-08 11:47:05 +01:00
William A. Kennington III
d88c5eed1d
kernel: Add more supported features
2014-11-08 02:44:19 -08:00
vbgl
f1061e3911
Merge pull request #4887 from vbgl/ocamlnet
...
Updates ocamlnet and ocaml-http
2014-11-08 09:29:51 +00:00
Vincent Laporte
f895d68c90
ocaml-http: update from 0.1.3 to 0.1.5
2014-11-08 07:26:03 +00:00
Vincent Laporte
2f38372f73
ocamlnet: update from 3.7.6 to 3.7.7
2014-11-08 07:19:40 +00:00
Mateusz Kowalczyk
6c7793713d
lshw: fix location of the binary
...
The binary was going into sbin so even with package in profile we still
couldn't use it.
cc @phreedom
2014-11-08 03:10:26 +00:00
Arseniy Seroka
5973392f60
gmpc: fix missing dependence
2014-11-08 04:19:52 +03:00
Arseniy Seroka
106740fe2c
Merge pull request #4882 from abbradar/folly
...
Folly: add package
2014-11-08 04:12:11 +03:00
Arseniy Seroka
9551b3eaf4
Merge pull request #4883 from abbradar/boost-process
...
boost_process: add package
2014-11-08 04:11:52 +03:00
Nikolay Amiantov
761fdd440d
folly: add package
2014-11-08 03:48:54 +03:00
Arseniy Seroka
da140fb27a
Merge pull request #4885 from abbradar/libxls
...
libxls: add package
2014-11-08 03:14:43 +03:00
Arseniy Seroka
4306ebed91
Merge pull request #4884 from abbradar/xlslib
...
xlslib: add package
2014-11-08 03:14:21 +03:00
Arseniy Seroka
48de2b0de5
Merge pull request #4879 from abbradar/cppzmq
...
cppzmq: add package
2014-11-08 02:58:48 +03:00
Nikolay Amiantov
2f10e17cd7
cppzmq: add package
2014-11-08 02:57:34 +03:00
Nikolay Amiantov
0b0a50e39a
boost_process: add package
2014-11-08 02:56:21 +03:00
Nikolay Amiantov
3978aca354
libiberty: add package
2014-11-08 02:54:41 +03:00
Peter Simons
6d51e33197
Merge pull request #4880 from abbradar/text-binary
...
text-binary: add haskell package
2014-11-08 00:48:02 +01:00
Peter Simons
78bf8a6e5a
hscolourBootstrap: disable Haddock phase for this tool in ghc-7.9.x to work around a compiler bug
...
| haddock: internal error: expectJust getPackageDetails
2014-11-08 00:44:53 +01:00
Nikolay Amiantov
5ce584f81c
text-binary: add haskell package
2014-11-08 02:31:52 +03:00
Peter Simons
5be65c8cc6
Merge pull request #4868 from sjmackenzie/new-pkg-ccnx
...
new package: ccnx
2014-11-08 00:29:52 +01:00
Nikolay Amiantov
bb84431ff4
xlslib: add package
2014-11-08 02:29:37 +03:00
Nikolay Amiantov
3a97bf9ea5
libxls: add package
2014-11-08 02:28:17 +03:00
Nikolay Amiantov
064af53063
double_conversion: add package
2014-11-08 02:26:46 +03:00
Eike Kettner
e96df6c6f9
html2text: new package
...
Closes #4864
2014-11-07 23:19:49 +00:00
Peter Simons
44273088ad
cabal: enable multi-threaded builds with GHC 7.8.x or later for executables
...
Multi-threaded builds exacerbate the non-determinism in ghc package ids, which
is a serious problem for libraries. Packages that define only executables,
however, should be safe to build with parallelism enabled.
2014-11-07 23:22:27 +01:00
Peter Simons
1a8b7b6a12
all-packages.nix: strip trailing whitespace
2014-11-07 23:22:27 +01:00
Peter Simons
00c684f237
haskell-packages.nix: strip trailing whitespace
2014-11-07 23:22:27 +01:00
Peter Simons
ee0ca353f2
haskell-fixed-vector: add version 0.7.0.0
2014-11-07 23:22:27 +01:00
Peter Simons
484b26569a
ghc-head: update to version 7.9.20141106
2014-11-07 23:22:27 +01:00
Peter Simons
a93512d71f
hasktags: jailbreak to fix build with latest 'json'
2014-11-07 23:22:27 +01:00
Peter Simons
f9db7db531
haskell-keter: update to version 1.3.5.1
2014-11-07 23:22:27 +01:00
Peter Simons
77944a0df4
haskell-thyme: update to version 0.3.5.4
2014-11-07 23:22:27 +01:00
Peter Simons
ac8c970b95
haskell-snaplet-redis: update to version 0.1.4.1
2014-11-07 23:22:27 +01:00
Peter Simons
6162ff4bd1
haskell-shell-conduit: update to version 4.4
2014-11-07 23:22:27 +01:00
Peter Simons
61862a1959
haskell-pipes-text: update to version 0.0.0.13
2014-11-07 23:22:27 +01:00
Peter Simons
54eee510ec
haskell-pipes-shell: update to version 0.1.3
2014-11-07 23:22:27 +01:00
Peter Simons
2c361e2a60
haskell-persistent: update to version 2.1.1
2014-11-07 23:22:27 +01:00
Peter Simons
f9267c5f0a
haskell-monad-logger: update to version 0.3.8
2014-11-07 23:22:27 +01:00
