3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1686 commits

Author SHA1 Message Date
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
William A. Kennington III acbf8eb561 unifi: 3.2.7 -> 3.2.10 2015-02-02 18:03:23 -08:00
Ragnar Dahlén 736764afee apache-kafka: New package for Apache Kafka 2015-01-29 11:10:12 +00:00
Domen Kožar 2d51fe4005 Merge pull request #6031 from offlinehacker/pkgs/influxdb-backup/add
Add influxdb-backup
2015-01-28 22:41:21 +01:00
Jaka Hudoklin 9eb3b108e8 Add influxdb-backup 2015-01-28 16:28:31 +01:00
Eelco Dolstra 6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Peter Simons e3639c03f2 mailman: update from 2.1.17 to 2.1.18 2015-01-27 14:04:54 +01:00
Jaka Hudoklin 4631ea8ed9 rabbitmq: update 3.3.5 -> 3.4.3 2015-01-26 02:09:04 +01:00
Mateusz Kowalczyk 37f1938f5c mpd: update to version 19.8 2015-01-23 19:41:28 +00:00
Charles Strahan 8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan 8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Charles Strahan 317d78d145 consule: use new bundlerEnv 2015-01-21 20:33:19 -05:00
Matej Cotman 3ed3977166 owncloud: make .htaccess available 2015-01-21 22:49:22 +01:00
Matej Cotman 6fdca55e8f owncloud: add package 2015-01-21 22:49:22 +01:00
Rickard Nilsson c7c917dfff nginx: Add set-misc-nginx-module 2015-01-21 12:38:34 +01:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Benjamin Staffin e1f2da5314 Riemann: update to 0.2.8
Change-Id: I42b8e5f1341df826e8424141e9f9623e60b63767
2015-01-20 14:37:28 -05:00
Georges Dubus 0c2271c579 Merge pull request #5868 from berdario/redis
Update redis to 2.8.19
2015-01-20 16:16:52 +01:00
Kurt Dietrich f101f632b7 Add game-music-emu, a decoder plugin for mpd (close #5431)
@vcunat: nitpicks and add meta.license.
2015-01-20 16:08:01 +01:00
Dario Bertini 0919d6322b
Update redis to 2.8.19 2015-01-20 10:56:53 +00:00
lethalman 5e7501cd41 Merge pull request #5864 from nckx/cassandra
cassandra 2.1.0 -> 2.1.2
2015-01-20 10:57:00 +01:00
Tobias Geerinckx-Rice f02ced85c6 cassandra 2.1.0 -> 2.1.2
The old tarball was gone. I'll maintain it while I use it.
2015-01-20 10:28:26 +01:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
wmertens e5703d21a7 Fix glibclocales reference
Environment is auto-added if supported on the platform
2015-01-19 14:10:45 +01:00
Bjørn Forsman 412cb5a3a2 munin: remove /usr/{bin,sbin}/ references from plugins
Instead, run things out of $PATH.

Fixes errors like these (on NixOS):
  munin-available-plugins/.mysql_slowqueries-wrapped: line 67: /usr/bin/printf: No such file or directory

(Basically, this unbreaks some plugins.)
2015-01-18 14:39:57 +01:00
Domen Kožar 48bae0e685 Merge pull request #5821 from eduarrrd/pshs
pshs: 0.2.5 -> 0.2.6
2015-01-18 10:32:50 +01:00
Eduard Bachmakov 2a338357f3 pshs: 0.2.5 -> 0.2.6 2015-01-17 21:00:41 -05:00
Michael Raskin a910aa77fb Add Squid 3.5 2015-01-18 01:58:20 +03:00
Domen Kožar c222352cf8 Merge pull request #5795 from pmahoney/skarnet-2015-01-14
Skarnet release 2015-01-14
2015-01-17 15:21:27 +01:00
Vincent Laporte 4361a7a597 couchdb: fix build 2015-01-16 08:51:22 +01:00
Patrick Mahoney 50c746f983 s6: update to 2.0.1.0 2015-01-15 16:10:07 -06:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Eduard Bachmakov f9a5ad039b Add package pshs-0.2.5
Announcement blog post:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/
2015-01-14 22:56:54 -05:00
Pascal Wittmann a15198e844 squids.latest: update from 3.4.9. to 3.4.11 2015-01-15 00:54:26 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
aszlig c5354fafce
lighttpd: Fix building with magnet support.
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-13 08:37:56 +01:00
vbgl 0b09d52085 Merge pull request #5693 from benmos/riemann-0.2.7
Upgrading Riemann 0.26 -> 0.27
2015-01-10 17:06:10 +01:00
Ben Moseley b7d72dbf5b Upgrading Riemann 0.26 -> 0.27 2015-01-10 15:17:46 +00:00
William A. Kennington III db62c43a45 389-ds-base: Fix perl scripts 2015-01-09 15:01:30 -08:00
William A. Kennington III fe9529ae3f 389-ds-base: Fix build 2015-01-09 11:05:31 -08:00
William A. Kennington III 90a641310c net-snmp: Don't propagate openssl as this may break builds
Instead, explicility specify openssl during configuration which forces
the builder to include -L${openssl}/lib whenever linking against
net-snmp libraries.
2015-01-09 10:40:29 -08:00
Rickard Nilsson 0dedcdf29d elasticsearch: Update from 1.3.4 to 1.4.2 2015-01-09 00:04:59 +01:00
Domen Kožar 1ee0ec97b7 Merge pull request #5618 from flosse/prosody-update
nixpkgs: prosody 0.9.6 -> 0.9.7
2015-01-08 01:52:50 +01:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
j-keck 021e557be3 postgresql: remove 9.4betaX
final version 9.4.0 added per commit: 73839ca
2015-01-07 13:59:38 +01:00
j-keck 356d05dbc0 postgresql: add version 9.4.0 2015-01-07 13:21:18 +01:00
Markus Kohlhase 6989736730 nixpkgs: prosody 0.9.6 -> 0.9.7 2015-01-07 09:55:22 +00:00
Jaka Hudoklin a6fd4673b0 Merge pull request #5555 from offlinehacker/pkgs/nginx/syslog_fix_rev
nginx: syslog extension, fix git revision
2015-01-05 13:25:00 +01:00
Oliver Charles 4092a7cdd6 bosun: Update to 20141215200935 2015-01-05 10:35:20 +00:00
William A. Kennington III b50a73cab3 samba: Fixes for build and paths 2015-01-03 21:45:16 -08:00