Commit graph

1407 commits

Author SHA1 Message Date
Herwig Hochleitner
e15a4b0ee2 wine: 1.7.47 -> 1.7.48 2015-08-06 00:21:31 +02:00
William A. Kennington III
926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Tobias Geerinckx-Rice
b62debe042 hplip: 3.15.7 -> 3.15.6
Version 3.15.7 breaks certain (but not all) PCL-based printers:
b0e46fc3ea

Forgetting to revert a failed patch hunk certainly didn't help. Grr.
2015-08-04 20:00:20 +02:00
Thomas Tuegel
b0e46fc3ea hplip: remove ttuegel from maintainers
I no longer commit my changes to Nixpkgs because they are usually broken
by other maintainers.
2015-08-03 21:31:44 -05:00
William A. Kennington III
49adfe2ff9 ghostscript: Fix patches 2015-08-03 14:28:11 -07:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Cray Elliott
84dc71ebe4 bump dolphinEmuMaster, remove no longer needed SDL dep
also add libevdev as a dep, read about all the changes at
https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/
2015-08-02 03:17:03 -07:00
Robert Scott
179cdbc62c ghostscript: add patch fixing CVE-2015-3228 (from debian) 2015-08-02 09:40:05 +02:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Mateusz Kowalczyk
7930150366 Merge pull request #9045 from AndersonTorres/PPSSPP
PPSSPP: 0.9.9.1 -> 1.1.0
2015-07-31 09:43:49 +01:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
AndersonTorres
752bbdbfbc PPSSPP: 0.9.9.1 -> 1.1.0
Changing SDL to version 2.
2015-07-30 13:18:52 -03:00
Nathaniel Baxter
196fcdf80f wine: unstable and staging update: 1.7.46 -> 1.7.47
Close #8913.
2015-07-30 13:48:58 +02:00
Nathaniel Baxter
148f7e6624 winetricks: update 20150416 -> 20150706 2015-07-30 13:48:58 +02:00
Arseniy Seroka
ef082f9cc0 vimPlugins: fix evaluation 2015-07-29 22:03:23 +03:00
Arseniy Seroka
300f2e2bdf vimPlugins: 2015-07-29 2015-07-29 21:58:17 +03:00
Nikolay Amiantov
30facde98c zsnes: use Debian patches, fix segfault on saving state 2015-07-28 12:53:57 +03:00
William A. Kennington III
494be35e40 ghostscript: Fix after merge from master 2015-07-27 09:11:23 -07:00
William A. Kennington III
bd5f2c9638 Merge branch 'master.upstream' into staging.upstream 2015-07-27 08:17:19 -07:00
Eelco Dolstra
0c91c169c0 ghostscript: Get rid of docs/examples 2015-07-26 22:46:45 +02:00
Eelco Dolstra
689897088c cups: Don't depend on OpenSSL
Afaict, it doesn't use OpenSSL, just GNU/TLS.
2015-07-26 22:46:23 +02:00
Arseniy Seroka
1bb59f2c57 Merge pull request #8979 from rycee/package/theme-vertex
theme-vertex: init at 20150718
2015-07-26 23:33:11 +03:00
Robert Helgesson
e972f65f3c theme-vertex: init at 20150718 2015-07-26 20:46:46 +02:00
Arseniy Seroka
99ac72994c Merge pull request #8984 from AndersonTorres/stella
Stella: 4.6 -> 4.6.1
2015-07-26 20:07:25 +03:00
Vladimír Čunát
b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00
Vladimír Čunát
3465ffa8b0 ghostscript: reduce size significantly, /cc #8990
- Don't use static bin/gs.
- Split docs into a separate output.
- Split fonts into another derivation, so they're not reinstalled when
  something changes.
- Drop --disable-sse2
  https://github.com/NixOS/nixpkgs/commit/e723c512c#commitcomment-12361078
- Some cleanups.
2015-07-26 16:04:17 +02:00
AndersonTorres
6ccd69872a Stella: 4.6 -> 4.6.1 2015-07-25 10:49:53 -03:00
Tobias Geerinckx-Rice
aebb3ec0f4 hplip: patch shebangs in $out/share
A full wrap isn't needed as these scripts are only run from within
hplip's own environment, and unwanted because they are imported
as Python modules.

Also fix a reference to /etc in $out/etc/hp/hplip.conf, though I've no
idea whether it is actually used.
2015-07-23 03:12:24 +02:00
Tobias Geerinckx-Rice
603b146979 hplip: 3.15.6 -> 3.15.7 2015-07-23 03:12:23 +02:00
Tobias Geerinckx-Rice
1bad2fa611 hplip: fix scanning for USB devices 2015-07-23 03:12:23 +02:00
Tobias Geerinckx-Rice
72f6a797fa hplip: fix (Python) tools again
Something changed in the generic fixupPhase magic exposing a bug
in the previous fix (wrapPythonPrograms where I should have used
wrapPythonProgramsIn).

Also move buildInputs and friends to a more conventional spot.
2015-07-23 03:12:23 +02:00
Vladimír Čunát
9147dee57f cups-filters: update, including security fixes
- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable

/cc maintainer @ttuegel.
2015-07-21 20:57:49 +02:00
Rehno Lindeque
f6f5b34977 vimPlugins: add vim-multiple-cursors 2015-07-20 19:58:56 +00:00
AndersonTorres
517451df97 FS-UAE: 2.4.1 -> 2.4.3 2015-07-15 09:35:58 -03:00
AndersonTorres
0b9f605a2d Mednafen: Updates
Mednafen: 0.9.36.4 -> 0.9.38.5
Server: 0.5.1 -> 0.5.2
2015-07-15 08:11:23 -03:00
Leroy Hopson
c5c75be064 vimPlugins: add changeColorScheme-vim 2015-07-09 14:28:11 +12:00
Leroy Hopson
070133bfb8 vimPlugins: add random-vim 2015-07-09 14:15:40 +12:00
Leroy Hopson
450c0da6d7 vimPlugins: change wombat256 source to github
See issue #8694. Previously wombat256 was downloading its source from
the vim website using fetchurl. The builder was failing when it tried to
unpack the .vim source file. Using the vim-scripts github repo avoids
this problem.
2015-07-08 19:01:26 +12:00
Simon Vandel Sillesen
e85dac137e sundtek init at 30-06-2015 2015-07-07 10:58:58 +02:00
William A. Kennington III
afd532f7cb cups: 2.0.2 -> 2.0.3 2015-07-07 00:30:25 -07:00
aszlig
cb94cce94f
xscreensaver: Fix SHA256 hash of upstream tarball.
The upstream tarball has changed, so I checked why this has happened and
found a tarball with the old SHA256 hash here:

http://fossies.org/linux/misc/xscreensaver-5.33.tar.gz/

After checking the contents of this and the new upstream tarball I found
that the old tarball had only .so, .o and .o.d files which now are no
longer existent in the new tarball.

Seems that the upstream author has accidentally put object files in the
source tarball and has now corrected this mistake.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 16:42:07 +02:00
Michael Raskin
2e462069a8 Wine: unstable, staging: update 1.7.43 -> 1.7.46; remove updater scripts because with the new layout they don't work anyway 2015-07-05 00:32:54 +03:00
Michael Raskin
de78e3ea0c xscreensaver: update 5.32 -> 5.33 2015-07-05 00:32:53 +03:00
Leroy Hopson
b0e6cedf6e vimPlugins: add vim-sleuth 2015-07-04 02:19:57 +12:00
Leroy Hopson
a28f0340e1 vimPlugins: add CSApprox 2015-07-04 02:19:57 +12:00
Kamil Chmielewski
6db7437a64 New GTK theme - Albatross from Shimmer Project
http://shimmerproject.org/our-projects/albatross/
2015-07-03 08:40:40 +02:00
Tuomas Tynkkynen
0ec0790348 U-Boot: Patch Versatile Express to use config_distro_bootcmd.h
With this patch in place, ARMv7 NixOS can be booted in QEMU:

qemu-system-arm -kernel u-boot -M vexpress-a9 -serial stdio -sd nixos-sd-image-armv7l-linux.img -m 1024

...with all the features that boot.loader.generic-extlinux-compatible
supports, like the boot generation menu and seamless kernel upgrades
in the VM.
2015-06-30 11:10:18 +03:00
Tuomas Tynkkynen
d013de6d32 U-Boot: Update to 2015.04 and major refactor
Instead of selecting the defconfig based on stdenv.platform.uboot,
provide different ubootFoo packages. Otherwise we couldn't easily build
U-Boots for different platforms than what we are currently running on.

All users of the ubootChooser function appear to be using only CLI tools
like mkimage, whose behaviour is not affected by the defconfig (their
build outputs are bitwise-identical). So add a separate package for the
CLI tools.

Of the removed patches, some version of sheevaplug-sdio.patch has
apparently been applied upstream (with at least mv_sdio.c renamed to
mvebu_mmc.c). sheevaplug-config.patch needs rebasing & re-testing on
real hardware.

Tested boards and input/output methods that upstream supports:
 - Raspberry Pi:
    - HDMI works, USB keyboard not yet supported
    - Serial via the 26-pin connector (3.3V)
 - pcDuino3 Nano:
    - HDMI + USB keyboard (only if attached to a hub)
    - Serial via the 3-pin connector (3.3V)
 - Jetson TK1: RS-232 serial port only
 - Versatile Express CA9 (for QEMU only): Serial via '-serial stdio'
2015-06-30 10:49:56 +03:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
Arseniy Seroka
da4266afb6 vimPlugins: update 2015-06-27 2015-06-27 02:05:15 +03:00
William A. Kennington III
fd829968c7 jack2: 1.9.10 -> 2015-06-02 2015-06-22 23:42:10 -07:00
lassulus
4ed0a4eaf8 add pkg: vbam, closes #8339 2015-06-18 11:35:43 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Arseniy Seroka
b83d53e355 vimPlugins: 2015-06-16 update 2015-06-16 01:44:35 +03:00
Arseniy Seroka
4cd061abfd Merge pull request #8270 from LnL7/youcompleteme-clang
removed clang-unwrapped in vimPlugins.youcompleteme
2015-06-16 00:25:48 +02:00
Daiderd Jordan
06d49aa696 vimPlugins.youcompleteme: use clang instead of clang-unwrapped on darwin 2015-06-15 22:38:56 +02:00
Tobias Geerinckx-Rice
9f5b9de559 hplip 3.15.4 -> 3.15.6 2015-06-13 16:14:40 +02:00
Cray Elliott
e7c2a58250 bump dolphinEmuMaster, now needs gcc5 to compile
also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix
2015-06-09 03:24:18 -07:00
Arseniy Seroka
ab8561e3e5 fix: vim-xkbswitch proper lib 2015-06-07 16:00:13 +03:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Eelco Dolstra
3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa19.
2015-06-04 14:54:48 +02:00
Arseniy Seroka
9cd797ff26 vim plugins: refactor and regenerate 2015-06-01 23:40:29 +03:00
Pascal Wittmann
4d70496ebb sails: don't treat warnings as errors to fix the build
Reported upstream as kragniz/sails/issues/18
2015-06-01 12:10:48 +02:00
Tobias Geerinckx-Rice
484e903da3 vim-plugins: vim-wakatime -> 4.0.1
- upgrade wakatime cli to v4.0.14
- make sure config file has api_key
- only display setup complete message first time setting up cfg file
- don't log time towards git temporary files
- prevent slowness in quickfix window to fix #24
- reuse SSL connection across multiple processes for improved performance
- correctly display caller and lineno in log file when debug is true
- project passed with --project argument will always be used
- new --alternate-project argument
- fix bug with auto detecting project name
- correctly log message from py.warnings module
- handle plugin_directory containing spaces
2015-06-01 04:04:33 +02:00
Lengyel Balázs
bd3e162311 Inital Commit for Gnu Talk Filters 2015-05-31 22:49:15 +02:00
Pascal Wittmann
1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
William A. Kennington III
be5f4082fd pulseaudio: Remove default derivation 2015-05-29 14:47:33 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
fro_ozen
a6531b084e Update alock to version 20150418 2015-05-25 23:45:53 +02:00
William A. Kennington III
25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Tobias Geerinckx-Rice
d01927269e uae: use archive.org links
The original homepage is long gone (as is the tarball it hosted).
2015-05-20 16:42:12 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Herwig Hochleitner
2f53355ff6 winetricks: 20150316 -> 20150416 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
b4c2351806 wine: unstable 1.7.42 -> 1.7.43 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
ef9cfd3dda wine: enable 64bit build for wineStaging 2015-05-18 21:01:54 +02:00
Tobias Geerinckx-Rice
ff7dd3e3b1 hplip: do wrap Python scripts in $out/lib 2015-05-17 23:39:58 +02:00
Tobias Geerinckx-Rice
393219d000 hplip: stop installing corrupted tools
None of the installed tools like hp-align or hp-toolbox could
work, because they tried to import wrapped Python scripts (i.e.
shell code) as Python modules. Fix this by:

- Substituting `dbus` for the defective `pythonDBus`.

- No longer blindly wrapping all python files, but replacing
  the original symlinks in $out/bin with wrapper scripts.
  These wrappers then `exec` the unmodified Python scripts in
  $out/share/hplip directly, instead of the .<name>-wrapped
  copy that wrapPythonProgramsIn creates. The latter are simply
  removed.

Sure, it's a bit ugly. It's also 2015 and I couldn't use my
printer :-/
2015-05-17 21:11:36 +02:00
Thomas Tuegel
c59c20ca0f Update HPLIP to 3.15.4 2015-05-16 14:12:11 -05:00
Simon Jagoe
691a65cb41 Update SHA256 for hplip plugin 2015-05-15 13:04:11 +01:00
Pascal Wittmann
bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Tobias Geerinckx-Rice
5f7f793d4e hplip: coalesce find -exec sed invocations
No need to scan the (biggish) source tree six times, forking a separate
process for every file each time. This was slowing down testing.
2015-05-13 15:09:43 +02:00
Arseniy Seroka
97cff06f5b Merge pull request #7814 from jagajaga/vim_plugins
vimPlugins: update
2015-05-12 23:57:03 +03:00
Arseniy Seroka
a4fc6eb596 vimPlugins: update 2015-05-11 22:46:41 +03:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Arseniy Seroka
87b4f9286d Merge pull request #7604 from bendlas/wine64
wine: add 64 bit build and module
2015-05-10 19:13:37 +03:00
Arseniy Seroka
f6016b9a7b Merge pull request #7784 from seppeljordan/emulationstation
Update emulationstation 2.0.0.rc1 -> 2.0.1a
2015-05-10 19:07:46 +03:00
Herwig Hochleitner
ae6d2796bc wine: add 64 bit build and nixpkgs configuration
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
Jascha Geerds
e9cf6cd34f cups: Use systemd files provided by CUPS 2015-05-10 13:46:32 +02:00
Jascha Geerds
252bc4a4b9 cups: Add xdg_utils to build inputs 2015-05-10 13:46:32 +02:00
Jascha Geerds
b89bf5668a cups: Refactor meta attributes 2015-05-10 13:46:32 +02:00
William A. Kennington III
862510079a cups: 1.7.5 -> 2.0.2 2015-05-10 13:46:32 +02:00
Michael Raskin
a31b9e1816 Update Wine staging to match Wine unstable 2015-05-10 13:46:31 +02:00
Michael Raskin
8a4630d9dd Update Wine unstable 2015-05-10 13:46:31 +02:00
koral
856f1c79e1 slock: 1.1 -> 1.2 2015-05-10 13:46:01 +02:00
Jascha Geerds
4ac95ab328 cups: Use systemd files provided by CUPS 2015-05-10 12:41:20 +02:00
Jascha Geerds
5f5ba7dda0 cups: Add xdg_utils to build inputs 2015-05-10 12:41:20 +02:00
Jascha Geerds
0a090d80ac cups: Refactor meta attributes 2015-05-10 12:41:20 +02:00
William A. Kennington III
d6edaea4f7 cups: 1.7.5 -> 2.0.2 2015-05-10 12:41:20 +02:00
Michael Raskin
90453cc5ca Update Wine staging to match Wine unstable 2015-05-10 13:36:48 +03:00
Michael Raskin
ede1211cbc Update Wine unstable 2015-05-10 13:36:47 +03:00
Sebastian Jordan
72d3d6fbfc Update emulationstation 2.0.0.rc1 -> 2.0.1a 2015-05-10 01:49:09 +02:00
koral
073d4102b3 slock: 1.1 -> 1.2 2015-05-09 11:02:19 +00:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Domen Kožar
ce688330fb Merge pull request #7725 from willtim/master
xss-lock: upstream fix: exit when X connection dies
2015-05-06 11:29:35 +02:00
Tim Williams
d0462cdf25 xss-lock: upstream fix: exit when X connection dies 2015-05-06 08:52:40 +01:00
Tobias Geerinckx-Rice
65775f9a0e vim-plugins: wakatime 3.0.9 -> 4.0.0 2015-05-03 22:29:14 +02:00
Thomas Tuegel
e1cbfa5415 jack2: depend on libsndfile 2015-05-03 12:46:10 -05:00
William A. Kennington III
36f6601e12 gnuk: Add derivation for fst-01 2015-05-02 15:54:42 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Hendrik Bunke
c9c972b872 vimPlugins: vim-nerdtree-tabs, vim-buffergator 2015-04-30 17:21:50 +02:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Pascal Wittmann
2f15fcc4c9 Merge pull request #7389 from AndersonTorres/atari++
Atari++: 1.46 -> 1.73
2015-04-26 10:05:14 +02:00
William A. Kennington III
418963ef63 jack2: Refactor 2015-04-25 21:27:54 -07:00
William A. Kennington III
04aefc111b jack1: Refactor 2015-04-25 21:27:54 -07:00
Nikolay Amiantov
f6607ca4a5 wineStaging: add derivation 2015-04-23 21:00:42 +03:00
Hendrik Bunke
a96c076743 vimPlugins: added vim-jinja 2015-04-23 17:40:16 +02:00
Cray Elliott
56de3acd5a dolphinEmuMaster: add libusb to depends, bump git version
this allows dolphin-emu to detect and use the Nintendo Wii U Gamecube Adapter
2015-04-21 20:40:32 -07:00
Tobias Geerinckx-Rice
ff6be09c2e Merge pull request #7437 from AndersonTorres/atari800
Atari800: no more ROM install
2015-04-21 03:39:37 +02:00
AndersonTorres
28f5eccd8d Atari800: no more ROM install
Now, the expression will not install ROM files anymore. It is easier the
final user install them locally by himself, in a local directory.
Also, it appears that there is a missing ROM in the package provided by
the project's site.
2015-04-17 21:39:25 -03:00
AndersonTorres
10dbc6cf3a Atari++: 1.46 -> 1.73
And a complete reformulation of build expression.
2015-04-14 22:44:57 -03:00
Kirill Elagin
29f431e2a4 cups-browsed: build with Avahi
Fixes 5409.
2015-04-13 23:21:44 +03:00
Kirill Elagin
82eed03bfa cups-filters: fix build on non-NixOS 2015-04-13 23:20:30 +03:00
AndersonTorres
eae83dc472 Atari800: 2.2.1 -> 3.1.0 2015-04-13 05:35:43 -03:00
Arseniy Seroka
0d3be79490 Merge pull request #7323 from AndersonTorres/gxemul
Gxemul: 0.4.6 -> 0.6.0.1
2015-04-12 04:22:16 +03:00
AndersonTorres
9ebba5fe0c Gxemul: 0.4.6 -> 0.6.0.1 2015-04-11 16:00:55 -03:00
Pascal Wittmann
0777c4439d xlockmore: update from 5.45 to 5.46 2015-04-09 16:22:30 +02:00
dnhgff
faf23cd8ab vim-plugins: update youcompleteme to build with latest llvmPackages 2015-04-07 08:21:58 -07:00
AndersonTorres
5a91f9a34d Stella: 4.2 -> 4.6 2015-04-06 12:14:29 +02:00
AndersonTorres
5ff233be6b Higan: minor update
Updating source url
2015-04-06 11:51:33 +02:00
Michael Raskin
99b5486db6 Update Wine 2015-04-05 20:27:25 +03:00
Cray Elliott
ae413373ca monthly bump of dolphinEmuMaster
see dolphin's progress report if you want to know what is new!
https://dolphin-emu.org/blog/2015/04/01/dolphin-progress-report-march-2015/
2015-04-04 11:00:47 -07:00
Tobias Geerinckx-Rice
5e6aca84c4 vim-plugins: wakatime 3.0.8 -> 3.0.9
- upgrade wakatime cli to v4.0.7
- update requests package to v2.0.6
- update simplejson to v3.6.5
- capture warnings in log file
2015-04-04 02:28:20 +02:00
Thomas Tuegel
394562655f cups_filter: fix build 2015-04-02 19:13:26 -05:00
Thomas Tuegel
01e9dfb449 cups-filters: fix build with latest poppler 2015-04-02 06:58:09 -05:00
Tobias Geerinckx-Rice
eecb59a805 samsungUnifiedLinuxDriver 0.92 -> 4.00.39
This not the latest, but the greatest version (by number of models still
supported).

A big bump. Everything seems to work fine. Tested with a Samsung CLP-325.
Also fixed some strange things. Did this ever even work? On x86_64?
2015-04-01 19:54:40 +02:00
Domen Kožar
146eb665d0 Revert "cups: 1.7.5 -> 2.0.2"
This reverts commit 032859faba.

Conflicts:
	pkgs/misc/cups/default.nix

Breaks nixos printing tests, see
032859faba (commitcomment-10495609)
2015-03-31 16:51:07 +02:00
Arseniy Seroka
f8c1aa96b8 apulse: fix sha 2015-03-31 15:11:47 +03:00
Arseniy Seroka
62ad004862 apulse: update 2015-03-31 03:17:43 +03:00
Edward Tjörnhammar
1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
Nikolay Amiantov
602ff46403 winetricks: update 2015-03-29 13:05:28 +03:00
Arseniy Seroka
59771abeda vimPlugins: add vim-gista 2015-03-28 20:45:10 +03:00
Domen Kožar
883ee4dd72 Merge pull request #6994 from oxij/trivial-package-fixes
Trivial package fixes
2015-03-27 11:09:16 +01:00
William A. Kennington III
b91bac282d cups: Fix gmp linking by propagating 2015-03-26 16:18:17 -07:00
William A. Kennington III
032859faba cups: 1.7.5 -> 2.0.2 2015-03-26 13:30:54 -07:00
Arseniy Seroka
3b0f27052b Merge pull request #7010 from jagajaga/update_vim_plugins
vimPlugins: update
2015-03-26 22:55:14 +03:00
Arseniy Seroka
ec21d9d526 vimPlugins: update 2015-03-26 22:54:29 +03:00
Arseniy Seroka
f8c9810794 Merge pull request #6998 from oxij/update-rss-glx
rss-glx: update 0.8.1 -> 0.9.1, add meta, rename attribute in all-packages
2015-03-26 20:14:20 +03:00
Jan Malakhovski
47328e663c rss-glx: update 0.8.1 -> 0.9.1, add meta, rename attribute in all-packages 2015-03-26 13:08:28 +00:00