Commit graph

8291 commits

Author SHA1 Message Date
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
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
muflax 98556ef150 git-remote-hg: fix compatibility with mercurial 3.2
Close #5458.
2015-01-20 15:49:59 +01:00
Eelco Dolstra 6c4d79191c spotify: Drop more unused dependencies 2015-01-20 15:47:34 +01:00
Eelco Dolstra 836cc2f64d spotify: Drop unused qt4webkit dependency 2015-01-20 15:47:33 +01:00
Eelco Dolstra 3ea88fec96 spotify: Install in $out/lib/spotify instead of $out/lib
This prevents nix-env collisions with other packages like Hipchat due
to private copies of libQtWebKit.so.4 and other libraries.
2015-01-20 15:47:33 +01:00
Vladimír Čunát f484050a81 ikiwiki: maintenance update, and use a stable URL
CC maintainer @peti.
2015-01-20 14:05:25 +01:00
Pascal Wittmann c661352de2 gmtk: update from 1.0.8 to 1.0.9b 2015-01-20 13:02:45 +01:00
vbgl 413acf4b9f Merge pull request #4898 from vbgl/qgis
Updates qgis and dependencies
2015-01-19 18:56:19 +01:00
Pascal Wittmann 78c5ebbce6 Merge pull request #5839 from nckx/vnstat
Update vnstat 1.11 -> 1.13
2015-01-19 17:36:11 +01:00
Tobias Geerinckx-Rice baef95ebd1 Update vnstat 1.11 -> 1.13 2015-01-19 17:10:57 +01:00
Vincent Laporte 7ffd6825e1 qgis: update from 2.4.0 to 2.6.1 2015-01-19 16:18:01 +01:00
Vincent Laporte 20d994031e grass: tag as broken 2015-01-19 16:18:01 +01:00
Moritz Ulrich 4f17a18423 cura(engine): update to 14.12.1 2015-01-19 15:52:46 +01:00
Moritz Ulrich 4fbe003c99 Weechat: Update to 1.1.0. 2015-01-19 15:47:06 +01:00
Michael Raskin f33979461d Merge pull request #5815 from eduarrrd/3dfsb
Add 3dfsb
2015-01-19 09:20:08 +03:00
Eduard Bachmakov 9b049948fa Add 3dfsb 2015-01-18 22:22:22 -05:00
koral 4cf2f41f01 New package: jumanji-20140622 2015-01-18 23:44:18 +03:00
Pascal Wittmann 58513cc380 abiword: update from 3.0.0 to 3.0.1 2015-01-18 18:20:28 +01:00
Bjørn Forsman 0e3007ec88 ardour: report correct version number
Even though we build from git tag 3.5.403, `ardour --version` reports
3.5-380-g2f6065b. Fix it.

(Another way to fix this is to clone the whole git repo, preserve the
.git/ directory and add git as buildInput so that Ardour can figure out
all this version info stuff by itself.)
2015-01-18 15:24:30 +01:00
Bjørn Forsman 02458a939a taskwarrior: enable bash completion
By adding the missing link between the (already installed) completion
script and $out/etc/bash_completion.d/.
2015-01-18 14:14:36 +01:00
Robert Helgesson b2be4092c6 Add package 'pytrainer'. 2015-01-18 13:34:02 +01:00
Domen Kožar 0a24d46cca Merge pull request #5776 from taku0/firefox-bin-35.0
firefox-bin: update to version 35.0; thunderbird-bin: update to version 31.4.0
2015-01-17 15:18:37 +01:00
lethalman 127ee84d8f Merge pull request #5784 from matthiasbeyer/add-stag
Add package: stag
2015-01-17 15:17:24 +01:00
lethalman 220f6927d2 Merge pull request #5794 from matthiasbeyer/add-ctodo
Add package: ctodo
2015-01-17 15:15:51 +01:00
vi d47bec44e6 ZNC: added "privmsg" module. 2015-01-16 18:45:03 +00:00
Matthias Beyer 91e4ef3488 Fixup: Add platform 2015-01-16 17:18:06 +01:00
Matthias Beyer f3f06fc1cc Fixup: Use archive instead of git clone 2015-01-16 17:17:35 +01:00
Domen Kožar 7d5206b08a Merge pull request #5802 from DamienCassou/backintime-1.1.0
Update backintime to 1.1.0
2015-01-16 14:37:03 +01:00
Damien Cassou 2bdfa515c9 Update backintime to 1.1.0
This release removed the Gnome UI to only keep the Qt4 one.
2015-01-16 10:31:16 +01:00
Matthias Beyer ddc0d43115 Add package: ctodo 2015-01-15 22:56:09 +01:00
Matthias Beyer 261f596335 Fixup: set maintainer 2015-01-15 18:38:51 +01:00
Matthias Beyer ee06c59944 Fixup: Missing terminating quote 2015-01-15 18:38:28 +01:00
Matthias Beyer 6be4eb7a43 Add package: stag 2015-01-15 18:38:27 +01:00
Pascal Wittmann e01d24bd72 Merge pull request #5773 from matthiasbeyer/add-cortex
Add cortex in applications/misc
2015-01-15 18:32:48 +01:00
Matthias Beyer 9261b976ee Add cortex in applications/misc 2015-01-15 17:13:40 +01:00
Pascal Wittmann 99496c8346 Merge pull request #5607 from AndersonTorres/xiphos
Xiphos: upgrade to 4.0.0
2015-01-15 12:01:53 +01:00
taku0 9d2cf54c6a firefox-bin: update to version 35.0; thunderbird-bin: update to version 31.4.0 2015-01-15 09:43:10 +09:00
Pascal Wittmann db69fcd0bc gtmess: update from 0.96 to 0.97
and remove obsolete patch
2015-01-15 00:25:07 +01:00
Pascal Wittmann 398d1277c6 calibre: update from 2.15.0 to 2.16.0 2015-01-14 14:23:47 +01:00
Pascal Wittmann 82e07fb1e8 geeqie: update from 1.1 to 1.2
Fetch source from debian as the geeeqie team stopped using sourceforge, see
https://www.mail-archive.com/geeqie-devel@lists.sourceforge.net/msg01484.html
2015-01-14 14:23:46 +01:00
Pascal Wittmann 8fb18cf523 llpp: update to stable version 21 2015-01-14 14:23:46 +01:00
Domen Kožar b9cb0ce2ce Merge pull request #5756 from fredlebel/atom_0.171.0
Atom: updated to 0.171.0
2015-01-14 11:32:23 +01:00
Frederic LeBel 99c1916484 Atom: updated to 0.171.0 2015-01-13 19:46:48 -05:00
Brendan Long b46b15d868 syncthing: Update to 0.10.20. 2015-01-13 17:12:49 -06:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Vladimír Čunát 07966befee thunderbird: update, and refactor the expression
- use mach for building (the way Mozilla devs use),
- use --disable-debug-symbols to reduce build-time resource consumption
2015-01-13 22:10:39 +01:00
Luca Bruno 5f12045f34 blender: fix build after update to 2.73 2015-01-13 21:35:22 +01:00
Vladimír Čunát 1072635cf0 firefox: major bump 34.0.5 -> 35.0 2015-01-13 19:58:11 +01:00
Vladimír Čunát 38d4ef3cf4 liferea: minor update 2015-01-13 19:48:27 +01:00