Commit graph

1083 commits

Author SHA1 Message Date
Edward Tjörnhammar
655ae33816 libretro.ppsspp: Fixes building on i686 2014-09-26 18:35:46 +02:00
Thomas Strobel
455b8dd9d8 Add package: vim plugin: vimoutliner
Closes #4252
2014-09-24 20:36:36 +01:00
Michael Raskin
db0348655c Update XScreensaver 2014-09-24 13:32:46 +04:00
Nathaniel Baxter
d5f40ea929 wineUnstable: Fix dynamic loading of ncurses lib. 2014-09-24 12:48:39 +10:00
Nathaniel Baxter
b99773fc00 wineUnstable: Bump version to 1.7.27 2014-09-23 21:47:47 +10:00
Nathaniel Baxter
b94e33d7b8 wineUnstable: Bump version to 1.7.26 2014-09-22 20:18:30 +02:00
Edward Tjörnhammar
383f142858 libretro: added bsnes, fba, gambatte, genesis-plus-gx, prboom 2014-09-22 12:35:07 +02:00
Mateusz Kowalczyk
85eec74433 hatari: update from 1.6.2 to 1.8.0 2014-09-21 18:37:58 +01:00
AndersonTorres
4f85f64153 Higan: adding "profile" and "gui" building options
Also, removing builder.sh and copying everything to Nix expression.

Closes #4048
2014-09-20 23:51:15 +01:00
Daniel Peebles
72e76a18c1 Update maven to 3.2.3 and put it in a more sensible location
Closes #4187.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 22:33:18 +01:00
Siarhei Zirukin
b8848c070c added alock package 2014-09-16 09:25:47 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
William A. Kennington III
686a139f29 Merge pull request #4030 from AndersonTorres/small-fixups
Small style fixups
2014-09-11 21:27:54 -07:00
cillianderoiste
15e134f127 Merge pull request #3829 from ruediger/add/oxygen-gtk3
Add oxygen-gtk3.
2014-09-11 11:02:12 +02:00
AndersonTorres
b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
Edward Tjörnhammar
6fcab9baca libretro-cores:
- adding: 4do, desmume, fceumm, mame, mupen64plus, scummvm,
            snes9x, stella, picodrive, ppsspp and vba

retroarch:
  - added retroarch wrapper for configured cores
  - changed attributes, old retroarch is now retroarchBare*
2014-09-04 20:03:13 +02:00
Michael Raskin
3f1ce8d864 Merge pull request #3886 from AndersonTorres/higan
Higan - a quick&dirty workaround
2014-09-03 21:49:05 +04:00
Michael Raskin
4c41c1ffbf Merge pull request #3890 from edwtjo/emulationstation-2.0.0-rc1
emulationstation: 1.0.2 -> 2.0.0-rc1
2014-09-03 21:47:58 +04:00
Michael Raskin
9cf910cd51 Merge pull request #3932 from MP2E/retroarch_git_master
add retroarchMaster package
2014-09-03 18:59:13 +04:00
Strahinja Popovic
fe3f7716f0 Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306 2014-09-03 15:46:59 +04:00
Michael Raskin
48dce0642b Add auto-updater for XScreensaver 2014-09-02 14:25:17 +04:00
Peter Simons
b8260f5435 dolphin-emu: drop reference to git from buildInputs since it's no longer an argument to the expression after #3936 2014-09-02 11:57:34 +02:00
Cray Elliott
cc7fa316a4 dolphinEmu doesn't need the git package 2014-09-02 02:07:22 -07:00
Cray Elliott
73439c6053 add dolphinEmu and dolphinEmuMaster
Dolphin is a high quality, open source Gamecube/Wii/Triforce emulator for
Windows, Mac OS X and Linux
2014-09-02 01:20:38 -07:00
Cray Elliott
b56a348af7 add retroarchMaster package 2014-09-02 00:56:47 -07:00
Michael Raskin
82ed86dd76 Remove unneeded definitions 2014-09-02 01:03:39 +04:00
Michael Raskin
f70337a8bd Merge pull request #3905 from AndersonTorres/stella
Stella 4.0: New Package
2014-09-02 00:55:52 +04:00
Michael Raskin
4d95ac6102 Merge pull request #3257 from tailhook/myenv-proxy
my-env: Preserve http_proxy and ftp_proxy variables
2014-09-01 10:35:18 +04:00
AndersonTorres
44d772d1e0 Stella 4.0: New Package
Stella is an Atari 2600 VCS emulator
2014-08-31 14:31:09 -03:00
Michael Raskin
3bbf64b6d0 Update unstable Wine 2014-08-31 18:20:06 +04:00
AndersonTorres
f5f4bf1a25 Higan: Updating builder.sh script
Now builder.sh will install a higan-config.sh script
to write auxiliary stuff on $HOME/.config/higan directory.
That way, higan searches locally and runs cleanly.

Obviously it's a hack, but the only other way is to do a huge patch on
upstream sources; personally I think it is better to work that type of
thing directly on higan sources.
2014-08-31 09:47:49 -03:00
Edward Tjörnhammar
a5a92fdd53 emulationstation: 1.0.2 -> 2.0.0-rc1 2014-08-31 12:50:35 +02:00
AndersonTorres
0847250505 Higan - a quick&dirty workaround
Higan uses a lot of hardcoded paths when it looks for runtime files
as shaders, icons and mainly BIOS files. So, we made a q&d wrapper
script: it copies all these files to $HOME/.config/higan in the 1st
invocation.
2014-08-30 23:59:49 -03:00
AndersonTorres
4cb061111c Higan - new package (alpha stage!)
Higan is a cycle-accurate Nintendo multi-system emulator
It is a preliminary release for Nix - I need to investigate
some issues about install process and hardcoded paths...
2014-08-29 18:32:07 +01:00
Rüdiger Sonderfeld
02e0e0dc50 Add oxygen-gtk3 and rename oxygen_gtk to oxygen-gtk2.
oxygen_gtk is still kept for backwards compatibility.
2014-08-29 15:29:03 +02:00
Mateusz Kowalczyk
10e3cf6f5a ppsspp: update to 0.9.9.1 2014-08-25 10:14:44 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Edward Tjörnhammar
a79241aa15 add: emulationstation 1.0.2 2014-08-23 15:33:22 +02:00
Thomas Strobel
8700f46a8f Vim-plugins: add vim-pathogen 2014-08-15 19:45:32 +02:00
Shea Levy
82666653d2 Merge branch 'new-vim-plugins' of git://github.com/ts468/nixpkgs 2014-08-14 21:32:52 -04:00
Shea Levy
34a3986b14 vim-pluings: Fix missing hash 2014-08-14 21:32:44 -04:00
AndersonTorres
a21a987c63 Mednafen: update to 0.9.36.3 2014-08-14 11:20:25 -03:00
Thomas Strobel
4dba947701 Added a few VIM plugins. 2014-08-13 20:58:26 +02:00
Luca Bruno
b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
Mateusz Kowalczyk
27f8a89dfa ppsspp: update to 0.9.9 2014-08-09 02:49:50 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
8f3d2b740b wine: Update to 1.7.23 2014-08-04 01:09:01 +02:00
Michael Raskin
750a5f4e0c Update Wine-unstable 2014-08-03 22:29:41 +04:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Eelco Dolstra
50f548771e Fix broken use of builtins.currentSystem
Packages should never use builtins.currentSystem.
2014-07-28 11:28:35 +02:00
Paul Colomiets
fea8454d35 my-env: Preserve http_proxy and ftp_proxy variables
There are few build scripts which set them to `nodtd.invalid` to disable
downloading files by buildscript. But for user environment we should
restore original values
2014-07-28 01:15:03 +03:00
Joachim Schiele
d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk
added snes9x-gtk with pulseaudio support
2014-07-27 21:38:25 +02:00
Joachim Schiele
de1ae606db snes9x-gtk: added changes requested by offlinehacker 2014-07-27 21:37:52 +02:00
Rok Garbas
0953235369 vimPlugins.YouCompleteMe: updated to latest 2014-07-24 12:43:43 +02:00
Bjørn Forsman
6b4df6fee8 jack1: update to version 0.124.1
The current source archive (v0.121.3) is no longer available, forcing an
upgrade. Also, jack1 grew new dependencies: Berkley DB and libuuid.
2014-07-23 20:22:15 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Joachim Schiele
743e3df3b8 made changes requested by pSub 2014-07-23 14:03:48 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Joachim Schiele
9d8a804047 added snes9x-gtk with pulseaudio support 2014-07-20 10:39:42 +02:00
Paul Colomiets
f12633c628 my-env: Support for running command directly by load-env-xxx script
First I don't think there is a reason to run shell as a child of
load-env-xxx script and not to just exec into it.

Also it's often useful to just run a command inside the environment
load-env-xxx command --args

Closes #3254
2014-07-16 23:09:49 +02:00
Pascal Wittmann
0aa6a9876f Merge pull request #3244 from ehmry/xscreensaver
xscreensaver: update from 5.26 to 5.29
2014-07-15 20:00:41 +02:00
Paul Colomiets
8d9ff87c14 Add several vim plugins
Added are:
* ctrlp
* vim-a
* colorsamplerpack
* yankring
2014-07-15 14:59:15 +02:00
Paul Colomiets
496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Emery Hemingway
f4a518e1e4 xscreensaver: update from 5.26 to 5.29 2014-07-11 11:37:47 -04:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Michael Raskin
b243ef6bef maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253 2014-07-04 21:45:30 +04:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Paul Colomiets
6f946bbb2a Add NIX_MYENV_NAME environment variable in myEnvFun 2014-06-29 15:45:20 +03:00
Eelco Dolstra
429bdef9bd winetricks: Update to 1199 2014-06-25 00:51:41 +02:00
Bjørn Forsman
d3ae8086c4 maven: add meta attributes (description, homepage, license) 2014-06-22 22:13:33 +02:00
Bjørn Forsman
24f3fb6788 maven: cosmetic changes in expression
Replace hard tabs with space. Add some whitespace between lines.
2014-06-22 22:12:54 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Michael Raskin
6bbd163df4 Update Wine unstable version 2014-06-14 00:23:11 +04:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
Bjørn Forsman
68a6c0e3e9 lilypond: unbreak build by adding t1utils to buildInputs
lilypond needs the 't1asm' tool from t1utils to build. t1asm used to be
provided by texlive-core, but does no more  (since texlive-core-2014
update).
2014-06-11 21:17:50 +02:00
Peter Simons
66da23b011 lilypond: cosmetic changes 2014-06-11 11:00:35 +02:00
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Sterling Stein
a0efad6861 fceux: Add package for a NES emulator. 2014-06-07 15:08:57 -07:00
Mateusz Kowalczyk
6c3cc8bb95 PPSSPP: add platforms 2014-06-07 22:28:56 +02:00
Austin Seipp
9087dcb9ea Merge pull request #2785 from Fuuzetsu/ppsspp
PPSSPP: 0.9.8
2014-06-03 20:32:51 -05:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Mateusz Kowalczyk
82a30be74a xboxdrv: 0.8.5 2014-05-29 04:22:34 +02:00
Mateusz Kowalczyk
59f98d0d8c PPSSPP: 0.9.8 2014-05-28 23:05:01 +02:00
Michael Raskin
bc292a5882 Updating Wine unstable to 1.7.19 2014-05-28 01:33:28 +04:00
Michael Raskin
80cc011f77 Merge pull request #2617 from ttuegel/hplip
hplip: update and fix scanning
2014-05-27 02:31:27 -07:00
Matej Cotman
116ab5f0c1 seafile: update client, ccnet, libsearpc and shared 2014-05-24 03:36:10 +02:00
Luca Bruno
d05e832b14 vlock: add meta and take maintainership 2014-05-21 16:12:33 +02:00
Thomas Tuegel
8ffd6af27e hplip: don't use udev rules to change device owner 2014-05-20 16:43:59 -05:00
AndersonTorres
010833c634 mednafen: fix wrong URL (close #2696) 2014-05-20 09:16:30 +02:00
AndersonTorres
b1dbafbdbb Mednafen: add version 0.9.34.1 + server 0.5.1
Mednafen is a portable, CLI-driven, multi-system emulator
2014-05-17 00:08:04 -03:00
Ricardo M. Correia
a0f683686c wine: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Vladimír Čunát
9c039b26e6 Merge pull request #2580 from ttuegel/qtcurve
kde.qtcurve: update and patch
2014-05-13 11:30:50 +02:00
Thomas Tuegel
4fb9c3700a hplip: avoid name collision with sane config files 2014-05-11 14:01:07 -05:00
Thomas Tuegel
56994ce2eb hplip: add pillow and reportlab dependencies 2014-05-10 23:44:03 -05:00
Thomas Tuegel
2666dcd218 hplip: assume maintainership 2014-05-10 21:57:17 -05:00
Thomas Tuegel
a0dc20719b hplip: add binary plugin 2014-05-10 21:57:05 -05:00
Thomas Tuegel
4971bdc930 hplip version bump 3.11.1 -> 3.14.4 2014-05-10 17:00:24 -05:00
Thomas Tuegel
119414ddcd qtcurve: add toolbar alpha patch 2014-05-08 14:05:09 -05:00
Thomas Tuegel
e5fcc04632 qtcurve version bump 1.8.17 -> 1.8.18 2014-05-08 14:04:59 -05:00
宋文武
f6b989e6f3 mate-themes: update from 1.6.2 to 1.6.3 2014-05-02 21:31:05 +02:00
宋文武
4080e415ca mate-icon-theme: update from 1.6.2 to 1.6.3 2014-05-02 21:31:05 +02:00
Arseniy Seroka
ad8aeebad8 vim-plugins: update and upgrade 2014-04-21 19:21:18 +02:00
Cillian de Róiste
6c1ac8159b oxygen_gtk: update from 1.4.4 to 1.4.5 2014-04-12 11:59:03 +02:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Shea Levy
a330e244ad Revert "Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs"
nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7, reversing
changes made to 4d5d6aed29.
2014-03-15 08:15:22 -04:00
Shea Levy
3cc2b243c7 Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs
Add nix-run and myEnvRun
2014-03-14 18:52:50 -04:00
Shea Levy
4d5d6aed29 Merge branch 'vimPlugins.YouCompleteMe/update' of git://github.com/offlinehacker/nixpkgs
vimPlugins.YouCompleteMe: update to ee12530df0

Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-03-14 18:50:21 -04:00
Cillian de Róiste
bba7fb62e8 oxygen_gtk: update from 1.4.3 to 1.4.4 2014-03-09 16:54:24 +01:00
Evgeny Egorochkin
531f7f56bc wineUnstable: update from 1.7.12 to 1.7.14 2014-03-08 17:51:45 +02:00
Thomas Tuegel
df5639183c Claim maintainership of recently added packages
Also set platforms for some packages where it was missing.
2014-03-07 11:23:30 -06:00
Domen Kožar
0592916851 Merge pull request #1680 from Calrama/seafile
Add packages for libzdb, libsearpc, ccnet, seafile-shared, and seafile-c...
2014-03-07 13:51:17 +01:00
Peter Simons
0968d527fa xlockmore: update from 5.38 to 5.43 2014-03-03 11:10:26 +01:00
Moritz Maxeiner
997fffb54e Set meta.platforms attribute to platforms.linux for Seafile packages and their prerequisites 2014-02-28 17:24:43 +01:00
Domen Kožar
b192f9ee13 gnome3 apps: correctly render icons 2014-02-28 01:40:21 +01:00
Evgeny Egorochkin
97be6e295c wineUnstable: update from 1.7.11 to 1.7.12 2014-02-14 21:16:22 +02:00
Evgeny Egorochkin
47dccc8511 oxygen_gtk: update from 1.4.1 to 1.4.3 2014-02-14 20:07:53 +02:00
Moritz Maxeiner
99ba14ee7a Add packages for libzdb, libsearpc, ccnet, seafile-shared, and seafile-client 2014-02-04 20:02:46 +01:00
Peter Simons
a1f7094b98 Merge pull request #1583 from MarcWeber/submit/drop-myhasktags
drop myhasktags, current hackage version has everything my version had
2014-01-25 04:24:12 -08:00
Andraz Brodnik
0121ee33d8 Add the beep-1.3. 2014-01-25 10:35:02 +01:00
Evgeny Egorochkin
862ac34bdd wineUnstable: update from 1.7.10 to 1.7.11 2014-01-23 21:04:01 +02:00
Marc Weber
0d0eb44a35 drop myhasktags, current hackage version has everything my version had 2014-01-23 14:44:21 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
56aa2ce960 Un-maintain wine. 2014-01-13 17:15:53 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Vladimír Čunát
a00e382e23 wineStable: maintenance update 1.6.1 -> .2, use lcms2
lcms2 is now supported according to the announcement, so I switched to it.
Tested on a steam game ;-)
2014-01-11 19:58:16 +01:00
Domen Kožar
094947ba73 gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset 2014-01-10 01:45:32 +01:00
Mathijs Kwik
10c15d5861 zsnes: manual header magic is no longer needed with the gcc-4.8 patch 2014-01-05 18:53:52 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Michael Raskin
e89aa035b9 Update Wine 2014-01-04 14:55:42 +04:00
Lluís Batlle i Rossell
ab7069eec4 zsnes seems to work better, without stripping.
I can't understand why. Without disabling stripping, it segfaults
saving state.
2014-01-03 00:54:59 +01:00
Thomas Tuegel
36b7499885 add qtcurve-1.8.17 2014-01-01 12:36:45 -06:00
Michael Raskin
9817df5715 Update Winetricks 2014-01-01 14:25:17 +04:00
Michael Raskin
26b3d0ab50 Update unstable Wine to 1.7.9 2013-12-30 02:32:19 +04:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Song Wenwu
88b9e1f191 retroarch: update to 0.9.9.7 2013-12-26 18:55:17 +01:00
Vladimír Čunát
50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Nixpkgs Monitor
3f20e8f44e oxygen_gtk: update from 1.3.4 to 1.4.1 2013-12-23 05:26:09 +02:00
Domen Kožar
fc9c17caf0 Merge pull request #1385 from lovek323/vim-golang
vimPlugins.golang: add expression
2013-12-22 03:47:49 -08:00
Vladimír Čunát
2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor
3ed05c26e4 xscreensaver: update from 5.19 to 5.26 2013-12-21 02:28:26 +02:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
6f17df861e wineUnstable: update from 1.7.7 to 1.7.8 2013-12-18 18:18:39 +02:00