philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

4864 commits

Author SHA1 Message Date
Mathijs Kwik c1bec6fb5b firefox-21: use more system libraries 
Conflicts:
	pkgs/applications/networking/browsers/firefox/21.0.nix
 2013-06-11 14:05:15 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Mathijs Kwik 1fb979b4f5 firefox-21: fix search box not working when built on xulrunner 2013-06-11 09:32:39 +02:00
Mathijs Kwik ad5970b680 firefox-21: fix building with system cairo 2013-06-11 09:32:38 +02:00
Michael Raskin 46cd2d0d68 Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins 
vim: supporting multiple sources & complicated plugins
 2013-06-10 23:06:56 -07:00
Mathijs Kwik 9aa7f55017 firefox: use system jpeg library 2013-06-10 09:04:07 +02:00
Mathijs Kwik 5fb93bd27e firefox: enable the (enabled by default) elf hack 
It's supposed to speed things up but had some troubles in the past
that seem to have been fixed
 2013-06-10 08:58:54 +02:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Evgeny Egorochkin c96c105c5c Merge pull request #600 from bencahill/master 
Add pianobar, a command-line Pandora client
 2013-06-08 14:36:39 -07:00
Peter Simons 3c05bb799f Merge pull request #603 from craff/emacs-mode/tuareg+update 
Added tuareg emacs mode and fixed some other emacs mode.
 2013-06-08 14:21:44 -07:00
Benjamin Cahill 9350c1d5ce pianobar: Change license and clean up code 
The license was set to unfree so that Hydra doesn't build it; this is
for potential problems arising from the Pandora TOS.
 2013-06-08 14:13:36 -05:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Jack Cummings bbbf625b7d Cherry-picking gphoto update by Jack Cummings, too 2013-06-08 19:32:52 +04:00
Christophe Raffalli a69cd62f71 Added tuareg emacs mode and fixed some other emacs mode. 
ecb emacs mode is commented out because it's dependency appears not to compile.
 2013-06-08 12:42:46 +02:00
Benjamin Cahill 00e720471b Add pianobar, a command-line Pandora client 2013-06-07 20:52:34 -05:00
Jack Cummings b0cef0b6b8 gphoto2-2.5.2 and libgphoto2-2.5.2 2013-06-07 10:58:39 -07:00
aszlig 62176d3b4e
chromium: Update stable and beta channels. 
These new versions are introduced with this commit:

stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta:   27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)

Unfortunately the tarball for the dev version 29.0.1530.2 isn't available at the
moment, so we're going to update it later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-07 14:39:00 +02:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Lluís Batlle i Rossell fad6bc90b3 Adding ZNC, irc bouncer. 2013-06-06 23:08:59 +02:00
Eelco Dolstra ebe6b96698 firefox: Update to 21.0 
Only problem was that the chrome resources were not in the right place
(and you only see that by running with the -jsconsole flag).
 2013-06-06 13:07:54 +02:00
Eelco Dolstra 34dbf4face Remove Firefox 19 2013-06-06 11:59:05 +02:00
Christophe Raffalli a7b8017583 Added imapfilter 2013-06-06 10:48:57 +02:00
Mathijs Kwik a479aafb75 Revert "Fixing LibreOffice configure for now" 
This reverts commit 9e4bee5270.
 2013-06-05 22:51:21 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Peter Simons 14ecb17f61 haskell-xmobar: update to version 0.18 2013-06-05 12:17:35 +02:00
Vladimír Čunát 341aadaba1 kdenlive+mlt: enabling some subcomponents, parallel builds 2013-06-05 00:30:44 +02:00
Michael Raskin 9e4bee5270 Fixing LibreOffice configure for now 2013-06-04 20:00:13 +04:00
Vladimír Čunát 7cfdfda910 audacity: minor update, prefer system-wide libs 
- Using system-wide libs where we have them (except for portaudio, which
  I couldn't make work).
- Add the soxr library (now the preferred way of audio resampling).
 2013-06-04 11:37:43 +02:00
Evgeny Egorochkin 8d167adaf4 Merge pull request #551 from MarcWeber/submit/alchemy 
adding alchemy painting application
 2013-06-03 15:45:12 -07:00
Peter Simons 7b21e19a82 git-annex: generate build instructions with cabal2nix 2013-06-03 22:09:34 +02:00
Peter Simons 823765e305 haskell-mode: update to current version from git 2013-06-03 10:51:27 +02:00
Evgeny Egorochkin 6609df220b Merge pull request #584 from bjornfor/cgit 
cgit: new package
 2013-06-02 14:13:05 -07:00
Bjørn Forsman 4ecd9cdb14 cgit: new package 
cgit is a web frontend for git repositories - it is a CGI program to use
with your favourite webserver. Add the latest version, 0.9.2.
 2013-06-02 18:25:54 +02:00
Peter Simons de100cb899 Merge pull request #575 from errge/master 
Add vanitygen
 2013-06-01 03:11:14 -07:00
Lluís Batlle i Rossell 2e6c1ebf42 Revert "firefox update to 21.0" 
This reverts commit 971337a119.
 2013-05-31 20:45:10 +02:00
Lluís Batlle i Rossell 94d83c8953 digikam 3.2: fixing url 2013-05-30 18:46:30 +02:00
Rob Vermaas 298f8fc459 Added bro 2.1 2013-05-30 18:13:50 +02:00
Lluís Batlle i Rossell 71229f8eb9 digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10) 2013-05-30 15:13:53 +02:00
Rob Vermaas 7c3c250a2c Add snort-2.9.4.6 2013-05-30 15:05:39 +02:00
Domen Kozar 03d4faa703 bittorrentSync: fix hash 2013-05-30 13:30:43 +02:00
Gergely Risko 02c1dd624f Add vanitygen 2013-05-30 12:41:29 +02:00
Peter Simons 6fadcc2d69 git-annex: disable building of the web application to fix the build in the presence of yesod 1.2 2013-05-30 12:33:40 +02:00
Peter Simons e7975c0d33 git-annex: update to version 4.20130521 2013-05-30 12:33:40 +02:00
Lluís Batlle i Rossell 2599ec692b gnunet-svn: slight update 
For not any special reason
 2013-05-30 09:56:30 +02:00
Lluís Batlle i Rossell 14cd1be498 freecad: update to stable from February, 0.13.1830 2013-05-30 09:56:30 +02:00
Marc Weber 67d41e4424 gpl fix 2013-05-30 01:30:48 +02:00
Vladimír Čunát 25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell 971337a119 firefox update to 21.0 2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell 4d682cc112 digikam: enable parallel building 2013-05-29 21:50:02 +02:00