772 Commits

Author	SHA1	Message	Date
Jason "Don" O'Conal	72afda56d5	vim-xdebug: add expression	2013-06-27 11:21:11 +10:00
Jason "Don" O'Conal	60fd718856	vim-coffee-script: add expression	2013-06-21 15:11:07 +10:00
Vladimír Čunát	c72ed04892	Merge 'master' and 'stdenv-fixes' into x-updates ... Final stabilization phase before merging into master. Conflicts (glibc-2.13): pkgs/top-level/all-packages.nix	2013-06-16 10:13:51 +02:00
Jason "Don" O'Conal	4968acde6b	Add vim syntastic plugin	2013-06-15 13:22:11 +10:00
Michael Raskin	19530856ed	Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix	2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal	b31db11a69	ghostscript: add libiconvOrEmpty to build inputs	2013-06-13 15:52:55 +10:00
Michael Raskin	1a45886454	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04: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
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	8a7bd8b200	Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work".	2013-06-09 05:37:47 +03: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
Michael Raskin	3fe8b9451a	Update Wine	2013-06-07 10:27:19 +04:00
Michael Raskin	8615f6ef35	Update Wine	2013-06-07 10:23:48 +04:00
Bjørn Forsman	142fca279b	solfege: new package ... Solfege is an ear training application. This patch is based on the work of @mornfall.	2013-06-06 19:30:41 +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
Marc Weber	71628d6e35	vim: supporting multiple sources: ... - vim-nox: client-server implementation without X - latest: latest mercurial sources (still very stable) - default: latest release vim-plugins: Introduce an area to put vim plugins which are worth adding to nix because they need more effort than just "unpacking". Document that	2013-05-27 22:26:29 +02:00
Petr Rockai	dd23b30120	lilypond: Update to 2.16.2, fix guile.	2013-05-18 13:35:14 +02:00
Lluís Batlle i Rossell	44e99f41be	Fixing 'my-env', when without cleanup.	2013-05-14 18:59:50 +02:00
Vladimír Čunát	ec3965d8d0	Revert Merge x-updates into master due to mesa bloat ... See #490 discussion. This reverts commit 1278859d31, reversing changes made to 0c020c98f9. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)	2013-05-09 14:03:35 +02:00
Marc Weber	b50b9bf2b7	add versionedDerivation	2013-05-08 15:43:07 +03:00
Vladimír Čunát	1278859d31	Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix	2013-05-08 13:46:46 +02:00
Michael Raskin	0c020c98f9	Updates: Wine, SBCL, XBoard	2013-05-08 10:52:47 +04:00
Phreedom	d7e2acbe97	Merge pull request #464 from the-kenny/my-env-exit-commands ... Add cleanupCmds option to pkgs.myEnvFun. The downside is that /bin/sh remains in memory to be able to execute cleanup commands.	2013-05-05 08:14:58 -07:00
Vladimír Čunát	bde20f3e88	Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix	2013-04-24 06:29:09 +00:00
Lluís Batlle i Rossell	031d1ee8c5	Merge branch of 'hatari'	2013-04-23 11:06:17 +04:00
Lluís Batlle i Rossell	7ca16e5115	hatari: fix pthread_cancel+gcc_s thing, and some spacing	2013-04-23 11:05:46 +04:00
Michael Raskin	b98ece6bc2	Auto-update some packages; no early build failures (SBCL and Wine not yet fully built)	2013-04-23 09:15:48 +04:00
Jordi	019472eaa3	Add hatari Atari St emulator.	2013-04-22 22:10:15 +02:00
Moritz Ulrich	d84bfa78e1	Add cleanupCmds option to pkgs.myEnvFun ... This option allows the user to specify commands to run when the shell exits. This can be used to cleanup operations done in `extraCmds'. Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>	2013-04-13 19:10:50 +02:00
Vladimír Čunát	7e5286db50	cups: fix reference to dbus.libs	2013-04-11 16:02:24 +02:00
Vladimír Čunát	eb2e46aab2	Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix	2013-04-04 21:43:40 +02:00
Vladimír Čunát	16f4550761	Merge pull request #411 from ocharles/gnome-themes-standard ... gnome-themes-standard: Initial expression	2013-04-03 11:59:19 -07:00
Moritz Ulrich	51229692ca	Add sha256 hash to winetricks. ... Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>	2013-03-30 20:00:05 +01:00
Michael Raskin	e9439d7811	Fix Wine libDRM reference	2013-03-29 09:29:19 +04:00
Lluís Batlle i Rossell	5f677039c7	Adding back the 1.5 expression of mupen64plus ... It has a GUI, for example.	2013-03-28 18:16:40 +01:00
Lluís Batlle i Rossell	3abc3f4a68	Updating mupen64plus, and adding a GUI for it. ... I can't say the GUI works very well... it doesn't find the core properly, but I couldn't find why.	2013-03-28 18:13:18 +01:00
Oliver Charles	0a947728e2	gnome-themes-standard: Initial expression	2013-03-25 15:23:45 +01:00
Vladimír Čunát	86639d9bb9	Merge branch 'master' into x-updates ... Conflicts (taken master versions): pkgs/desktops/xfce-4.8/core/libxfcegui4.nix pkgs/desktops/xfce/applications/gigolo.nix pkgs/desktops/xfce/applications/mousepad.nix pkgs/desktops/xfce/applications/ristretto.nix pkgs/desktops/xfce/applications/terminal.nix pkgs/desktops/xfce/applications/xfce4-mixer.nix pkgs/desktops/xfce/applications/xfce4-notifyd.nix pkgs/desktops/xfce/applications/xfce4-taskmanager.nix pkgs/desktops/xfce/art/xfce4-icon-theme.nix pkgs/desktops/xfce/core/exo.nix pkgs/desktops/xfce/core/garcon.nix pkgs/desktops/xfce/core/gtk-xfce-engine.nix pkgs/desktops/xfce/core/libxfce4ui.nix pkgs/desktops/xfce/core/libxfce4util.nix pkgs/desktops/xfce/core/libxfcegui4.nix pkgs/desktops/xfce/core/thunar-volman.nix pkgs/desktops/xfce/core/thunar.nix pkgs/desktops/xfce/core/tumbler.nix pkgs/desktops/xfce/core/xfce4-appfinder.nix pkgs/desktops/xfce/core/xfce4-panel.nix pkgs/desktops/xfce/core/xfce4-power-manager.nix pkgs/desktops/xfce/core/xfce4-session.nix pkgs/desktops/xfce/core/xfce4-settings.nix pkgs/desktops/xfce/core/xfconf.nix pkgs/desktops/xfce/core/xfdesktop.nix pkgs/desktops/xfce/core/xfwm4.nix pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix pkgs/development/libraries/webkit/default.nix pkgs/top-level/all-packages.nix	2013-03-09 17:55:37 +01:00
Eelco Dolstra	674c51af3c	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
Michael Raskin	c8acc350b9	Wine: update to 1.5.25	2013-03-07 00:28:59 +04:00
Peter Simons	04b2efff19	Merge branch 'master' into stdenv-updates.	2013-02-25 01:26:26 +01:00
viric	e2d097c5c0	Merge pull request #333 from bjornfor/fix-typo ... my-env/default.nix: fix "sdl-env" vs "env-sdl" typo	2013-02-24 12:39:20 -08:00
Bjørn Forsman	5b9a7fc95a	my-env/default.nix: fix "sdl-env" vs "env-sdl" typo ... my-env/default.nix lists an example on how to create an SDL environment that can be installed with "nix-env -i sdl-env". That is actually wrong and will not work. The correct command is "nix-env -i env-sdl".	2013-02-24 21:35:23 +01:00
Peter Simons	5f32207dfc	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-02-24 19:27:08 +01:00
Cillian de Róiste	b2ad9627d6	oxygen-gtk: upgrade gtk2 version to 1.3.2.1	2013-02-24 02:30:53 +01:00
Vladimír Čunát	0d72174dbd	Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)	2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell	bcbf9472ea	Merge remote-tracking branch 'central/master' into x-updates	2013-02-18 13:49:11 +01:00
Eelco Dolstra	2aa6f262cb	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
Corey O'Connor	fde87b3a9b	add winetricks, modified by vcunat@gmail.com ... Originally from #89.	2013-02-10 16:20:24 +01:00
Aristid Breitkreuz	b2afb45b8d	hplip: make pyqt4 dependency conditional on qtSupport	2013-02-08 00:27:07 +01:00