Commit graph

57144 commits

Author SHA1 Message Date
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Sven Keidel
b50cabf2d4 cool-old-term: rename to cool-retro-term (close #6071)
The project has changed its name to cool-retro-term. The project also added a
dependency that is included as a submodule. I added this dependency as a
separate expression.
2015-01-31 19:23:45 +01:00
lethalman
59d1d46088 Merge pull request #6069 from arno01/cherrytree
Adds a new package: cherrytree - A hierarchical note taking application
2015-01-31 14:42:08 +01:00
lethalman
87377cec15 Merge pull request #6064 from ktosiek/sstp
Add sstp client.
2015-01-31 13:30:08 +01:00
Pascal Wittmann
378b908545 Merge pull request #6075 from arno01/flashplayer
flashplayer: minor update (sha256 correction)
2015-01-31 13:17:54 +01:00
Andrey Arapov
79c5029f2e flashplayer: minor update (sha256 correction) 2015-01-31 12:21:08 +01:00
Jascha Geerds
c7ef048ebe Merge pull request #6074 from k0ral/youtube-dl
youtube-dl: 2015.01.25 -> 2015.01.30.2
2015-01-31 11:29:00 +01:00
Jascha Geerds
a90106eb22 Merge pull request #6065 from arno01/utox
libtoxcore, utox, qtox, toxic: Update to the newest Dev version
2015-01-31 11:26:14 +01:00
koral
6d7e09602f youtube-dl: 2015.01.25 -> 2015.01.30.2 2015-01-31 11:09:23 +01:00
Andrey Arapov
522d059dc9 libtoxcore, utox, qtox, toxic: Update to the newest Dev version 2015-01-31 03:20:12 +01:00
Andrey Arapov
9f623a820d Adds a new package: cherrytree - A hierarchical note taking application
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.

This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.

Official page http://www.giuspen.com/cherrytree
2015-01-31 02:17:00 +01:00
Domen Kožar
2d19af84de Revert "Update path in udev rule of mdadm"
This reverts commit c9364fdbb7.

See https://github.com/NixOS/nixpkgs/pull/6006
2015-01-30 20:55:02 +01:00
Tomasz Kontusz
99c0af0d73 Add sstp client. 2015-01-30 20:09:35 +01:00
Vincent Laporte
0b9e2f8798 Adds ocaml-cpdf
A range of tools to modify PDF files and a corresponding OCaml library

Homepage: http://www.coherentpdf.com/
2015-01-30 20:04:42 +01:00
Peter Simons
14cd6ae2a9 haskell-cartel: fix build with ghc 7.10.1 2015-01-30 18:43:29 +01:00
Peter Simons
008256d8bd emacs-flycheck: add current snapshot from Git 2015-01-30 18:30:59 +01:00
Peter Simons
9f1cb04876 emacs-let-alist: add version 1.0.3 2015-01-30 18:30:38 +01:00
Mayeu
5dab625862 Patch kbd to add the dvorak programmer (dvp) keymap 2015-01-30 16:47:08 +01:00
lethalman
1335946d61 Merge pull request #6039 from np/filter_audio
Add filter_audio
2015-01-30 15:47:57 +01:00
Peter Simons
8ac54550b5 Merge pull request #6067 from psibi/pythonmagick-fix
Version bump and made name attribute to lowercase.
2015-01-30 15:11:46 +01:00
Sibi
7f5718b06f Version bump and made name attribute to lowercase.
(Tested the fix in my local machine just to be sure)
2015-01-30 18:49:38 +05:30
Peter Simons
7ccd363015 Merge pull request #6059 from joelmo/python-graph-tool
add graph-tool
2015-01-30 13:33:49 +01:00
Peter Simons
9ecafbe366 ethtool: update to 3.18 2015-01-30 13:23:06 +01:00
Joel Moberg
7b33a74235 Add graph-tool 2015-01-30 13:13:02 +01:00
Peter Simons
3ced26be95 hackage-packages: re-generate from Hackage 2015-01-30T10:29:45+0100 2015-01-30 12:10:55 +01:00
lethalman
d4e7fada66 Merge pull request #5951 from arno01/socat
socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack
2015-01-30 11:31:06 +01:00
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 cd80d050cb8145d45c56533625beb82f37177fae)
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 bdc630e7e97837aa4457c7da4562f9d22e21df87)
2015-01-29 22:38:46 +01:00
Lluís Batlle i Rossell
0326fd03d4 Adding GPA, The GNU Privacy Assistant.
(cherry picked from commit 24a89c028a0d2988805b17f4c69c3f2b3a284b1f)
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 aeefbe552adda2b3191bbd48cd7cf79ad9425d94)
2015-01-29 19:50:19 +01:00
Lluís Batlle i Rossell
7f29d1882e Install more rkflashtools.
(cherry picked from commit 56e0562cdb41c160825c700bb0873625db985d55)
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