lethalman
9576ff49d8
Merge pull request #5737 from matthiasbeyer/add-gitolite_admin_pubkey_oneline_note
...
Add note that admin-pub-key for gitolite has to be written in one line
2015-01-30 11:24:06 +01:00
lethalman
f457b11ba8
Merge pull request #6055 from victoredwardocallaghan/zd1211fw
...
zd1211fw: update from 1.4 to 1.5
2015-01-30 10:55:11 +01:00
lethalman
41cca7d2d6
Merge pull request #6045 from ragnard/apache-kafka
...
apache-kafka: New package and service
2015-01-30 10:50:14 +01:00
Pascal Wittmann
c43c0bbfd5
Merge pull request #5783 from ragnard/clojure-boot
...
Clojure: boot: Add derivation for boot build tooling
2015-01-30 10:46:45 +01:00
Luca Bruno
a239775488
Merge PR #5772 , boot.loader.timeout
2015-01-30 10:39:50 +01:00
Bob van der Linden
a3d5f4f3ef
nixos: gummiboot: change default to 1000 if boot.loader.timeout is null
...
When gummiboot.timeout == null, the menu will still be skipped.
When gummiboot.timeout == 0, the menu will also be skipped.
The only way to show the menu 'indefinitely' is to show it a long time.
2015-01-30 10:36:21 +01:00
Ragnar Dahlén
aaa6d79300
Clojure: boot: Add new derivation for boot build tooling
2015-01-30 09:33:55 +00:00
Ragnar Dahlén
85ba5c7bc9
Maintainers: Add Ragnar Dahlen
2015-01-30 09:33:55 +00:00
Pascal Wittmann
3c7e1ef698
Merge pull request #5866 from nckx/maven
...
maven 3.2.3 -> 3.2.5
2015-01-30 10:17:35 +01:00
Bob van der Linden
f93ba51469
nixos: loader: added generic config.boot.loader.timeout option
...
timeout options of grub and gummiboot will inherit the value of this
option by default.
2015-01-30 09:53:44 +01:00
Lluís Batlle i Rossell
adf6ef3865
cjdns: updating with bugfix, and readd nodejs tools
...
(cherry picked from commit cd80d050cb
)
2015-01-30 09:26:53 +01:00
Pascal Wittmann
98a69c0dcb
calibre: update from 2.17.0 to 2.18.0
2015-01-30 09:04:45 +01:00
Shea Levy
52d4b9d982
Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs
2015-01-30 01:07:59 -05:00
Vladimír Čunát
b35e0a09a8
imagemagick: fixup URL after #6056
2015-01-29 23:18:19 +01:00
Lluís Batlle i Rossell
e3a93dc45f
gpa: using mirror url.
...
(cherry picked from commit bdc630e7e9
)
2015-01-29 22:38:46 +01:00
Lluís Batlle i Rossell
0326fd03d4
Adding GPA, The GNU Privacy Assistant.
...
(cherry picked from commit 24a89c028a
)
2015-01-29 20:29:58 +01:00
Wout Mertens
f736843200
Merge pull request #6061 from wmertens/fortune-darwin
...
fortune: fix Darwin build
2015-01-29 19:56:03 +01:00
Lluís Batlle i Rossell
8ea408be56
Update cjdns to v15
...
(cherry picked from commit aeefbe552a
)
2015-01-29 19:50:19 +01:00
Lluís Batlle i Rossell
7f29d1882e
Install more rkflashtools.
...
(cherry picked from commit 56e0562cdb
)
2015-01-29 19:50:19 +01:00
Rok Garbas
7f27a9a7e8
pythonPackages.alot: update to 0.3.6
2015-01-29 19:48:05 +01:00
Sibi
8e5cf5889c
imagemagick: rename package to lowercase ( close #6056 )
...
Change it to lowercase to according to the convention presented here:
http://nixos.org/nixpkgs/manual/#chap-conventions
Thanks to goibhniu from #nixos for pointing me this.
2015-01-29 19:36:26 +01:00
Wout Mertens
bc6a35c92d
fortune: fix Darwin build
2015-01-29 19:14:49 +01:00
Eelco Dolstra
f0f99d5212
Merge pull request #6051 from victoredwardocallaghan/php
...
php: update from 5.4.35 to 5.4.37
2015-01-29 19:03:53 +01:00
Pascal Wittmann
d25bf1519e
Merge pull request #6047 from k0ral/webkitgtk
...
webkitgtk: 2.6.4 -> 2.6.5
2015-01-29 16:20:49 +01:00
Edward O'Callaghan
ed232ef5f8
php: update from 5.4.35 to 5.4.37
...
Potentially fixes CVE-2014-8142, CVE-2014-9427, CVE-2015-0231, CVE-2015-0232
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-30 01:54:20 +11:00
Peter Simons
e439e1dfa8
haskell-HGraphStorage does not compile.
2015-01-29 15:31:49 +01:00
Peter Simons
04f12cc838
Avoid build errors in Haskell packages sdf2p1-parser, grid, and stratum-tool.
2015-01-29 15:31:49 +01:00
Peter Simons
51de585de2
haskell-text-show: test suite doesn't compile because of missing overlap.h header
2015-01-29 15:31:49 +01:00
Peter Simons
c924672374
haskell-configuration-ghc-7.8.x: smtp-mail-ng compiles now
2015-01-29 15:31:49 +01:00
Peter Simons
a065319173
hackage-packages.nix: re-generate from Hackage 2015-01-29T10:57:55+0100
2015-01-29 15:31:49 +01:00
Pascal Wittmann
bbea8de994
Merge pull request #6058 from nckx/update-perl-Gtk-Glib
...
Update Perl Gtk2 & Glib
2015-01-29 15:21:51 +01:00
lethalman
848bd3a441
Merge pull request #6049 from victoredwardocallaghan/gitolite
...
version-management/gitolite: Bump version 3.6.1 -> 3.6.2
2015-01-29 14:35:34 +01:00
Edward O'Callaghan
32e9704b61
zd1211fw: update from 1.4 to 1.5
...
Potentially fixes CVE-2012-2187.
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:54:01 +11:00
Tobias Geerinckx-Rice
694732f5a7
perl-packages: update Gtk2 1.2494 -> 1.2495
2015-01-29 13:49:04 +01:00
Tobias Geerinckx-Rice
e23eb33bfd
perl-packages: update Glib 1.307 -> 1.310
2015-01-29 13:48:20 +01:00
Edward O'Callaghan
e7ecb78aab
version-management/gitolite: Bump version 3.6.1 -> 3.6.2
...
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:45:50 +11:00
Pascal Wittmann
d72047882e
Merge pull request #6043 from victoredwardocallaghan/bladeRF
...
libraries/libbladeRF: Fix documentation build
2015-01-29 12:10:24 +01:00
Ragnar Dahlén
17bd96ea25
apache-kafka: New service for Apache Kafka
2015-01-29 11:10:22 +00:00
Ragnar Dahlén
736764afee
apache-kafka: New package for Apache Kafka
2015-01-29 11:10:12 +00:00
koral
2a64bd0e49
webkitgtk: 2.6.4 -> 2.6.5
2015-01-29 11:16:42 +01:00
Wout Mertens
ef2e0ffdea
stdenv: fix eval - the return
2015-01-29 10:54:07 +01:00
Domen Kožar
857f32dfe7
Merge pull request #5967 from k0ral/rmlint
...
rmlint: 1.0.8 -> 2.0.0
2015-01-29 10:48:54 +01:00
Domen Kožar
54f0b25d92
Merge pull request #6006 from ts468/mdadm
...
Update path in udev rule of mdadm
2015-01-29 10:47:29 +01:00
Wout Mertens
006769be70
stdenv: fix eval
...
silly 💩
2015-01-29 10:46:35 +01:00
Thomas Strobel
c9364fdbb7
Update path in udev rule of mdadm
2015-01-29 10:44:06 +01:00
Domen Kožar
45c52b7312
Merge pull request #6040 from ambrop72/gawk-cross
...
gawk: Fix cross compiling.
2015-01-29 10:42:18 +01:00
Wout Mertens
0feb19b6b4
stdenv: take license parameter checks out of mkDerivation path
2015-01-29 10:38:33 +01:00
Ragnar Dahlén
d1acaf2760
Add Ragnar Dahlen to maintainers.
2015-01-29 08:58:02 +00:00
Vincent Laporte
db75b5d052
merlin: update from 2.1 to 2.1.1
2015-01-29 08:43:15 +01:00
Vincent Laporte
54c8a82818
utop: wrap all installed programs
2015-01-29 08:43:15 +01:00