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
Nixpkgs Monitor
231e9cff36
mate-themes: update from 1.6.1 to 1.6.2
2013-12-18 18:18:38 +02:00
Nixpkgs Monitor
50bfd93274
mate-icon-theme: update from 1.6.1 to 1.6.2
2013-12-18 18:18:38 +02:00
Nixpkgs Monitor
c47477d06e
foomatic_filters: update from 4.0.12 to 4.0.17
2013-12-18 18:18:27 +02:00
Nixpkgs Monitor
e4258fe1a7
cupsBjnp: update from 0.5.4 to 1.2.1
2013-12-18 18:18:23 +02:00
Nixpkgs Monitor
de91f24803
atari800: update from 2.0.2 to 2.2.1
2013-12-18 18:18:17 +02:00
Jason "Don" O'Conal
c95b774f52
vimPlugins.golang: add expression
2013-12-16 01:21:23 +00:00
Vladimír Čunát
1d6c351046
enable osmesa for wine ( close #1228 )
2013-12-10 16:36:23 +01:00
Peter Simons
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich
2d6c240913
winetricks: Update to rev 1078
...
And add some missing dependencies to the PATH of the script.
2013-12-09 00:34:35 +00:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor
03d64a9041
slock: update from 1.0 to 1.1
2013-12-04 06:23:35 +02:00
Michael Raskin
435cffee5b
Update unstable Wine to 1.7.7
2013-11-25 10:59:38 +04:00
Bjørn Forsman
8347ff8a21
solfege: refactor meta attributes
2013-11-24 13:27:24 +01:00
Bjørn Forsman
2a78fadf33
solfege: update 3.22 -> 3.22.2 (latest stable)
...
Changes:
Solfege 3.22.2, October 6, 2013
* Updated Esperanto, Portugese and Turkish translations to the users manual
* Updated Spannish and Turkish messages
* distribute solfege/tests/lesson-files/*
* help/C/scales/modes.html are never translated. So we must link to the
C-locale file in every translation.
* gettext tweaks to make the test suite work both when run as "test.py" and
"test.py test_lessonfile". There is still something wrong because we have to
disable the test to run debuild
* distribute solfege/tests/lib/* and solfege/test/include/*
Solfege 3.22.1, September 16, 2013
* Adjust some of the short interval names used when selecting intervals to
practise: u->P1 4->P4, 5->P5, tt->TT, p11->P11, p12->P12, tt8->d12. Added long
name for intervals from Eleventh to Double Octave.
* Fix the bug where we could not select the Default profile
* Updated Esperanto, Spannish, Polish, Turkish, Vietnamese, Norwegian bokmål,
Brazilian Portugese and Vietnamese translations.
2013-11-24 13:23:50 +01:00
Vladimír Čunát
b5356f7f27
wine: (stable) bugfix update 1.6 -> 1.6.1
...
Tested on a couple of apps.
2013-11-16 18:22:16 +01:00
Evgeny Egorochkin
829b29153b
clean up git revision handling in several packages
2013-11-13 12:46:55 +02:00
Cillian de Róiste
72aae985ae
gutenprint: wrap sbin/cups-genppd.5.2
...
This is used to generate ppd files for cups:
$ cups-genppd.5.2 -M | grep p50
canon-cp500
escp2-p50
$ cups-genppd.5.2 -p . escp2-p50
This will create the relevant ppd file in the current directory. This
can then be used by cups after setting services.drivers.drivers =
[pkgs.gutenprint]; and configuring the printer to use this ppd e.g.
via the web interface on http://localhost:631
2013-11-10 16:32:05 +01:00
Cillian de Róiste
80e2706e51
gutenprint: fix the cupsd driver
2013-11-10 00:38:42 +01:00
Cillian de Róiste
78c76daf16
gutenprint: upgrade to 5.2.9
2013-11-10 00:38:42 +01:00
Eelco Dolstra
a0e21fd1ca
Mark more packages as broken
2013-11-04 21:11:00 +01:00
Mathijs Kwik
609f8dc04b
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Jason \"Don\" O'Conal
db5c6917f3
vimPlugins.ipython: add expression
...
close #1141
2013-10-29 15:45:46 +02:00
Peter Simons
91f2c362de
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Jonas Hoersch
a917b7b011
my-env: pull --norc shell flag out into shell parameter
...
As zsh's corresponding flag is called --no-rcs, the build environment
couldn't be configured to use zsh at all.
Even then the custom PS1 won't work on zsh, but it's usable enough.
Close #1040 .
2013-10-21 20:58:40 +03:00
Michael Raskin
ae39f6c0cb
Make 1.6 the default Wine version and call 1.7.4 wineUnstable
2013-10-21 21:27:18 +04:00
Jason "Don" O'Conal
3c3c631a45
vimPlugins.vimshell: add expression
...
vimPlugins.vimproc: add expression
close #978
2013-10-20 23:35:53 +03:00
Michael Raskin
6f3e7d17d3
Fix Wine source
2013-10-20 22:02:02 +04:00
Michael Raskin
c4d78d376a
Updating Wine to 1.7.4
2013-10-20 21:08:42 +04:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
