Commit graph

872 commits

Author SHA1 Message Date
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
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