Commit Graph

69869 Commits

Author SHA1 Message Date
William A. Kennington III
271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Jaka Hudoklin
ea4850ca64 Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add
modsecurity: add modsecurity, and create nginx plugin
2015-09-30 00:19:38 +02:00
Thomas Tuegel
8e9fca18e3 plasma54: don't override mkDerivation
Provides a globally unique name (plasmaPackage) instead of using
attribute paths as namespaces and locally overloading the mkDerivation
name.
2015-09-29 16:58:59 -05:00
Thomas Tuegel
5ba93bd4c3 kf513: don't override mkDerivation
Provides a globally unique name (kdeFramework) instead of using
attribute paths as namespaces and locally overloading the mkDerivation
name.
2015-09-29 16:57:26 -05:00
Thomas Tuegel
cf5ed04f49 kdeApps_15_08: don't override mkDerivation
Provide a globally unique name (kdeApp) instead of using attribute paths
as namespaces and locally overloading the mkDerivation name.
2015-09-29 16:54:51 -05:00
Rob Vermaas
92e98c2b03 nixops: 1.2 -> 1.3
(cherry picked from commit a91d4f8a24)
2015-09-29 19:53:47 +00:00
Domen Kožar
41007653db Merge pull request #10122 from Havvy/elixir
elixir: 1.0.5 -> 1.1.0
2015-09-29 21:48:25 +02:00
Charles Strahan
597d191844 eventstat: init at 0.02.02 2015-09-29 15:45:09 -04:00
Arseniy Seroka
e166298ed3 Merge pull request #9646 from codedmart/vimDarwinPython
vim: update python_framework.patch for darwin
2015-09-29 22:42:36 +03:00
vbgl
b02c07641b Merge pull request #10014 from vbgl/camlp5-6.13
camlp5: 6.12 → 6.14
2015-09-29 19:43:15 +02:00
Vladimír Čunát
bfd8e56aa6 webkitgtk-2.4: drop autoreconf, propagate harfbuzz-icu
The autoreconf phase isn't needed anymore but wasn't removed.

Fixes #10099 (I think).
It's maybe slightly wasteful for the closure, but it's likely that
in the case of webkit it won't be a big deal and icu might
be in the closure anyway.
2015-09-29 18:16:37 +02:00
Thomas Strobel
8d7fba9b65 neard: init at 0.15-post-git-20510929 2015-09-29 17:54:26 +02:00
Marcus Crestani
c6de42d4d4 libxkbcommon: Remove --version-script on Darwin
Close #10094. Simplified by vcunat.
2015-09-29 15:30:05 +02:00
Eelco Dolstra
9008c9cd5f Hack to parallelize AMI copying 2015-09-29 14:54:12 +02:00
Eelco Dolstra
d06fdade6f Tweak AMI script 2015-09-29 14:54:12 +02:00
Eelco Dolstra
0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
Peter Simons
391549c5f4 Remove the haskell.packages.ghc6104 package set.
It's broken, and no-one seems to care enough to fix it (which would be a
tricky endeavor, anyway).
2015-09-29 14:46:40 +02:00
Peter Simons
664de99887 Fix nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc6123. 2015-09-29 14:46:08 +02:00
Brandon Martin
265e675152 vim: update python_framework.patch for darwin 2015-09-29 06:44:17 -06:00
Rickard Nilsson
94eac9ccbd opentsdb: 2.1.0 -> 2.1.1 2015-09-29 14:26:12 +02:00
Tobias Geerinckx-Rice
9515611009 geolite-legacy: update 2015-09-22 -> 2015-09-29 2015-09-29 13:48:31 +02:00
Thomas Tuegel
e6eb429128 remove kde414.networkmanagement
It has been unmaintained for years, being replaced by plasma-nm.
2015-09-29 06:42:38 -05:00
Peter Simons
8ce784cc02 Merge pull request #10135 from matthiasbeyer/update-gitAndTools.git-extras
gitAndTools.git-extras: 2.2.0 -> 3.0.0
2015-09-29 13:34:42 +02:00
Ryan Scheel (Havvy)
f824566fb3 elixir: 1.0.5 -> 1.1.1
Had to change the `mix` shebang to do coreutils/bin/env elixir, not
coreutils/bin/env elixir/bin/elixir.
2015-09-29 13:10:39 +02:00
Matthias Beyer
05fab76355 gitAndTools.git-extras: 2.2.0 -> 3.0.0 2015-09-29 12:27:22 +02:00
Peter Simons
4578784820 nixos: add services.bind.extraConfig option
This option allows users to add arbitrary configuration statements into
the generated named.conf file.
2015-09-29 11:51:40 +02:00
Luca Bruno
51512d4c8f heimdal: try disabling parallel builds due to hydra issues
cc @wkennington
2015-09-29 10:49:33 +02:00
Luca Bruno
b7f49e89af xulrunner: disable gconf 2015-09-29 10:29:48 +02:00
Peter Simons
5602d609c7 Fix or disable broken Haskell builds. 2015-09-29 09:53:37 +02:00
Peter Simons
a14264db3e haskell-pandoc-citeproc has spurious test suite failures. 2015-09-29 09:53:37 +02:00
Peter Simons
e23d69c6f3 Add LTS Haskell 3.7. 2015-09-29 09:53:37 +02:00
Peter Simons
0139c51f1b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:

  - Nixpkgs: f21f116631
  - Hackage: f8855b5494
  - LTS Haskell: 831a37566b
  - Stackage Nightly: 96ef887f31
2015-09-29 09:53:36 +02:00
Tobias Geerinckx-Rice
788800e437 libpsl: list 2015-09-15 -> 2015-09-25 2015-09-29 03:45:44 +02:00
Tobias Geerinckx-Rice
87989f0e2f mcelog: fix --version output ("unknown" -> "127") 2015-09-29 03:35:55 +02:00
Jude Taylor
48a791d270 darwin purity: doxygen 2015-09-28 18:32:41 -07:00
Tobias Geerinckx-Rice
d53cb31426 mcelog: 126 -> 127 2015-09-29 03:28:54 +02:00
Tobias Geerinckx-Rice
614f7a46bf hack-font: 2.013 -> 2.015
Changes: https://github.com/chrissimpkins/Hack/blob/master/CHANGELOG.md
2015-09-29 03:27:13 +02:00
Tobias Geerinckx-Rice
ff2bb85e2c redshift: clean up a little
- Remove bogus second 'python' argument from substituteInPlace
- Format optional dependencies after their *Support argument
2015-09-29 03:21:35 +02:00
Tobias Geerinckx-Rice
19f2be4523 redshift: add gtk3 & correctly set GI_TYPELIB_PATH
This should fix https://github.com/NixOS/nixpkgs/issues/10097.
2015-09-29 03:21:35 +02:00
Tobias Geerinckx-Rice
8ce79e0ef0 d-feet: remove unused arguments 2015-09-29 03:21:34 +02:00
Tobias Geerinckx-Rice
3e5e151b04 redshift: lib.optional -> lib.optionals 2015-09-29 03:21:34 +02:00
Jude Taylor
0b1fd74a8d fix syntax error 2015-09-28 17:33:33 -07:00
Jude Taylor
f4a7173e83 add darwin libtool to nodejs 4.1.0 2015-09-28 17:23:25 -07:00
Jude Taylor
06eab94f16 patch sbcl-bootstrap for purity 2015-09-28 17:09:50 -07:00
ts468
6d5a742c2e Merge pull request #10000 from ts468/upstream.vswitch
nixos networking: add vswitch option
2015-09-29 00:52:58 +02:00
Moritz Ulrich
47c92a87c8 mutt: 1.5.23 -> 1.5.24
This change uses a different patchset for mutt-with-sidebar.
2015-09-29 00:23:55 +02:00
Jude Taylor
4f9ef9bbfb give xquartz impure deps to make it build 2015-09-28 14:45:45 -07:00
Arseniy Seroka
e916273209 Merge pull request #10102 from bdimcheff/add-textile-to-jekyll
jekyll: add RedCloth dependency for textile support
2015-09-28 23:57:26 +03:00
Arseniy Seroka
248e38d995 Merge pull request #10120 from mstarzyk/obnam
obnam: 1.16 -> 1.17
2015-09-28 23:53:56 +03:00
Brandon Dimcheff
2131d401ea jekyll: add RedCloth dependency for textile support
This allows jekyll to be used with textile markup
2015-09-28 16:53:43 -04:00