Commit graph

241 commits

Author SHA1 Message Date
rushmorem ac26d8ff43 rethinkdb: 2.3.4 -> 2.3.5 2016-08-31 15:15:08 +02:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz 7897e913f7 redis: 3.2.2 -> 3.2.3 2016-08-25 01:56:36 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Christine Koppelt 75bffa11d6 influxdb: add 1.0.0-beta3 (#17733) 2016-08-17 13:40:05 +02:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Frederik Rietdijk 8955dc5e7e Merge pull request #17464 from cransom/cassandra
Cassandra
2016-08-10 11:42:57 +02:00
Tuomas Tynkkynen a15da44ab0 libe: Broken on i686
http://hydra.nixos.org/build/38264907/nixlog/1/raw
2016-08-06 17:06:45 +03:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Casey Ransom 6ce28ca5c0 cassandra: refactor versioning
This change:
- refactors the packages so it is easier to create and update new versions of
  cassandra.
- fixes a bug where Cassandra will not connect to another member unless
  LD_PRELOADing libstdc++.so. Without that change, it generates a stack trace
  and dies with exceptions regarding org.xerial.snappy.
- restricts platform to linux as procps is also linux only.
2016-08-02 20:58:35 -04:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster 1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Christine Koppelt 83a2d74a7c redis: 3.0.7 -> 3.2.2 2016-07-30 21:50:34 +02:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Christine Koppelt f6d7a567a5 influxdb: parametrize default.nix to prepare packaging of 1.0 (#17161) 2016-07-23 01:08:33 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tobias Geerinckx-Rice d391db8c01
cassandra_2_1: 2.1.14 -> 2.1.15 2016-07-06 15:56:33 +02:00
Tobias Geerinckx-Rice c70db3456f
cassandra_3_0: 3.0.7 -> 3.0.8 2016-07-06 15:56:33 +02:00
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
Moritz Ulrich a3072d3a8b [apache-jena-fuseki] Fix evaluation. 2016-06-22 17:15:15 +02:00
Marius Bakke 4a7d31a392 treewide: remove double quotes from wrappers
Close #14753; see that for context.
2016-06-22 11:12:27 +02:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +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
Tobias Geerinckx-Rice 84e83fe055
riak: remove unused 1.x patches 2016-06-22 02:14:10 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
zimbatm fa5383d1fc influxdb: 0.9.4 -> 0.13.0 2016-06-18 21:32:02 +01:00
Aristid Breitkreuz 20a8349d62 Revert "Merge pull request #16172 from zimbatm/influxdb-0.13.0"
This reverts commit ed4869452d, reversing
changes made to 175e20ca5c.
2016-06-18 22:24:31 +02:00
Aristid Breitkreuz ed4869452d Merge pull request #16172 from zimbatm/influxdb-0.13.0
influxdb: 0.9.4 -> 0.13.0
2016-06-18 20:57:34 +02:00
Tim Steinbach f4ca43dc5f cassandra: Add 3.0 2016-06-16 21:12:26 +00:00
zimbatm 08770cd242 influxdb: merge deps with the common go-modules 2016-06-12 15:08:44 +01:00
zimbatm 8a1ebe98f3 influxdb: 0.9.4 -> 0.13.0 2016-06-12 14:38:11 +01:00
rushmorem 2b520ff4f6 rethinkdb: 2.3.0 -> 2.3.4 2016-06-12 11:14:13 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Michael Raskin b8c0726fc2 apache-jena-fuseki: 2.3.1 -> 2.4.0 2016-05-15 23:49:44 +02:00
Michael Raskin 80fc8542ff apache-jena: 3.0.1 -> 3.1.0 2016-05-15 23:49:44 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Tobias Geerinckx-Rice 298d47ba01
cassandra: 2.1.13 -> 2.1.14 2016-04-28 14:17:24 +02:00
Nathan Zadoks 1e4ebcdf2d redis: enable Lua scripting support 2016-04-21 14:50:11 -04:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Guillaume Maudoux df9f868537 mongodb: forget references to build inputs 2016-04-15 19:03:40 +02:00
Eric Litak 6c37503f54 mongodb: fix broken pcre dep 2016-04-14 13:41:42 -07:00
Guillaume Maudoux bf2ceb0525 mongodb: fix build (use pcre-cpp instead of pcre) 2016-04-13 11:28:52 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Louis Taylor 28c8f37eef rethinkdb: 2.2.4 -> 2.3.0
The removed patch is included in this upstream release.
2016-04-07 10:58:10 +01:00