Vladimír Čunát
|
6b27ceb006
|
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
|
2016-06-23 12:09:03 +02:00 |
|
Vladimír Čunát
|
aa9a04883e
|
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096
This reverts commit c05d829598, reversing
changes made to f073df60d6.
|
2016-06-23 09:25:10 +02:00 |
|
Vladimír Čunát
|
ebf1cb28a2
|
openspades, arangodb: more #include error fixups
... after gcc-5.4.
|
2016-06-22 10:45:47 +02:00 |
|
Vladimír Čunát
|
ab15a62c68
|
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
|
2016-04-01 10:06:01 +02:00 |
|
Joachim Fasting
|
037e815787
|
arangodb: fix gcc5 build
https://hydra.nixos.org/build/33263863/nixlog/1/raw
|
2016-03-23 06:00:27 +01:00 |
|
Tuomas Tynkkynen
|
d91c7347d1
|
treewide: Mass replace 'openssl}/lib' to refer the 'out' output
|
2016-01-24 10:03:38 +02:00 |
|
Markus Kohlhase
|
5f9ee33df5
|
pkgs: arangodb 2.5.2 -> 2.5.3
|
2015-05-02 14:37:31 +02:00 |
|
Markus Kohlhase
|
4b0a59b3fe
|
pkgs: added ArangoDB 2.5.2
|
2015-04-30 16:48:57 +02:00 |
|