Michael Raskin
e9439d7811
Fix Wine libDRM reference
2013-03-29 09:29:19 +04: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
Aristid Breitkreuz
b73dff89f7
enable networking support for hplip, net_snmp is available now
2013-02-06 14:08:27 +01:00
Aristid Breitkreuz
b5e2a027c4
hplip: now hp-setup actually shows a dialog
2013-02-06 13:44:39 +01:00
Aristid Breitkreuz
f590891ac2
hplip: start work on making python programs work
2013-02-06 13:44:38 +01:00
Александр Цамутали
5406828d76
jackaudio/default.nix: Update to 1.9.9.5.
2013-02-03 20:22:43 +04:00
Vladimír Čunát
35a927149f
Merge branch 'master' into x-updates
...
Conflicts (both messed with mesa):
pkgs/top-level/all-packages.nix
2013-02-02 21:11:00 +01:00
Vladimír Čunát
0fa7bc7379
wine: update to 1.5.23, update gecko
2013-02-02 15:03:02 +01:00
Vladimír Čunát
539d9bc1af
ghostscript: fix infinite recursion in meta (sorry for that)
2013-01-31 13:21:21 +01:00
Vladimír Čunát
a95c85fe94
ghostscript: minor update, replace more internal libraries by nix ones
2013-01-29 17:05:58 +01:00
Vladimír Čunát
570b0f8c54
libtiff: major update to 4.*
...
Also minor modification of ghostscript to work with it.
2013-01-29 14:07:30 +01:00
Eelco Dolstra
5d6da38d33
cups: Don't build on Darwin
2013-01-29 12:43:53 +01:00
Lluis Batlle
0353c08d38
uboot: updating the default uboot to 2012.07
...
This is what I use in the sheevplug, with the provided patches.
The old sheevaplug uboot doesn't understand ubifs.
2013-01-27 15:38:39 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Evgeny Egorochkin
5dcdcf4af3
Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now.
2013-01-15 07:43:40 +02:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Michael Raskin
029d4fd1db
Wine: Update to 1.5.21
2013-01-07 01:35:58 +04:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
84779a6f7d
Remove unnecessary parentheses around if conditions
...
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Michael Raskin
17a4e01c69
Wine: update to 1.5.20
2012-12-22 14:54:22 +04:00
Michael Raskin
50f368c0ec
Update Wine
2012-12-08 13:28:15 +04:00
Peter Simons
7d3be6b5f9
dlx: link with gcc instead of g++ -- there is no c++ code here
2012-12-05 16:44:04 +01:00
Peter Simons
c4038db19d
dlx: install both hp.m and new.m microcode
2012-12-05 16:43:49 +01:00
Evgeny Egorochkin
0eecd67d14
Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca>
2012-12-05 05:43:19 +02:00
Peter Simons
50e7ddbdca
Add DLX simulator. Upstream provides no version number.
2012-12-04 14:29:48 +01:00
Evgeny Egorochkin
21379504a4
Wine: add printing(cups) support
2012-12-03 17:02:01 +02:00
Ambrus Kaposi
0fc2fd5bfb
Create a symbolic link to cups/lib so that gutenprintBin can be specified as a driver in services.printing.drivers in /etc/nixos/configuration.nix
2012-11-30 12:43:00 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons
a814d0bc90
SANE: switch snapshot version of the backends to git (and general cleanup)
2012-11-26 16:18:05 +01:00
Peter Simons
0bf71add78
sane-backends: update snapshot to version: 1.0.22.git20121123
2012-11-23 21:31:23 +01:00
Lluís Batlle i Rossell
5c09167b67
myEnv: making it not to add -rpath /lib
...
NIX_LDFLAGS was left with "-rpath /lib", which is annoying on non-nixos.
2012-11-22 10:55:53 +01:00
Michael Raskin
3061db0bb2
Wine: update, add auto-update helper
2012-11-10 14:43:17 +04:00
Rickard Nilsson
a25a84ff86
jackaudio: Add extra download URL. Main site seems down.
2012-10-18 14:17:21 +02:00
Eelco Dolstra
f7436a9141
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-17 12:07:03 -04:00
Michael Raskin
07f44ad945
Update Wine
2012-10-17 17:22:32 +04:00
Peter Simons
6ff829f19d
Merge branch 'master' into x-updates
2012-10-10 18:46:48 +02:00
Rickard Nilsson
e74916ed62
xscreensaver: Update to 5.19
2012-10-10 16:05:37 +02:00
