BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
74985 commits 1 branch 0 tags 3.8 GiB
Commit graph

1448 commits

Author SHA1 Message Date
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
AndersonTorres
65e44c62de Desmume: init at 0.9.11 2015-09-12 23:58:23 -03:00
Andrew Kelley
3f47c2fb2c add libjack2-git 
closes #9467
 2015-09-11 16:59:28 -07:00
Thomas Strobel
260be2cbf6 xtrlock-pam: init at 3.4 2015-09-10 09:13:06 +02:00
Simon Vandel Sillesen
d14669b9dc sundtek: 28-07-2015 -> 2015-09-07 (close #9723) 2015-09-09 09:04:37 +02:00
Rok Garbas
747e0149cc marking junit and dolphinEmu as broken 2015-09-08 14:05:40 +02:00
Domen Kožar
264a83c707 cups: 2.0.3 -> 2.0.4, fix transient failure 
(cherry picked from commit cc06f9c0be051f7ef2e1fcbd2ce13b902acc8adc)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-06 16:01:22 +02:00
Cillian de Róiste
55d822c512 jack2: apply patch to fix build with gcc5 2015-09-03 11:22:28 -07:00
Cillian de Róiste
1e83055cd2 Revert "jack2: 1.9.10 -> 2015-06-02" 
This reverts commit fd829968c7.
 2015-09-03 11:22:23 -07:00
Arseniy Seroka
1c158ecdb4 vimPlugins: 2015-09-01 update 2015-09-01 05:10:53 +03:00
Arseniy Seroka
e04f23b332 Merge pull request #9507 from benley/vim-unity 
vimPlugins.unite: Init at 2015-08-29
 2015-09-01 04:41:26 +03:00
Nikolay Amiantov
4ce182c736 xlockmore: clean configure flags and add Xinerama and DPMS support 
Close #9391.
 2015-08-31 16:35:26 +02:00
Cillian de Róiste
75f880b1d1 mednafen: fix src url (sourceforge -> mednafen.fobby.net) 
Also bump the minor version 0.9.38.5 -> 0.9.38.6
 2015-08-31 13:50:14 +02:00
Benjamin Staffin
cd142cea4f vimPlugins.unite: Init at 2015-08-29 
unite works nicely together with vimshell.
 2015-08-30 15:31:52 -07:00
Arseniy Seroka
7cf4d2cf5b Merge pull request #9556 from kamilchm/vim-go 
vimPlugins: replace unmaintained vim-golang with vim-go
 2015-08-31 00:58:54 +03:00
Kamil Chmielewski
25f19c2725 vimPlugins: replace unmaintained vim-golang with vim-go 2015-08-30 22:36:02 +02:00
Arseniy Seroka
984ca122f4 Merge pull request #9506 from benley/vim2nix 
vimUtils.pluginnames2nix: fixes for non-nixos systems
 2015-08-30 23:15:26 +03:00
Rok Garbas
33cb16104c vimPlugins: adding css_color_5056, ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons 2015-08-29 21:01:38 +02:00
Rok Garbas
c61ade7b52 vimPlugins: updated (and sorted alphabetically) 2015-08-29 21:01:28 +02:00
Domen Kožar
cbb7bc92b6 Merge pull request #9320 from kamilchm/vimPlugins-molokai 
vimPlugins: add molokai
 2015-08-29 14:09:51 +02:00
Benjamin Staffin
5fe9618a30 vimUtils.pluginnames2nix: fixes for non-nixos systems 
Now referring to the nix prefetch scripts through their nixpkgs
derivation in order to make sure their shebang lines are rewritten
properly.  Otherwise nix-prefetch-hg fails on Ubuntu (and probably
Debian) systems, where /bin/sh is not bash.
 2015-08-28 19:27:33 -07:00
Benjamin Staffin
a166119486 vimproc: Fix when run on non-NixOS linux distros 
Prior to this change, if there exists a /lib*/ld-linux*.so.2 on a
system, vimproc will try to load vimproc_linux64.so or
vimproc_linux32.so instead of vimproc_unix.so, which is what nix
actually builds.
 2015-08-27 20:35:46 -07:00
Arseniy Seroka
096515656d Merge pull request #9475 from dezgeg/pr-uboot-update 
u-boot: 2015.04 -> 2015.07
 2015-08-28 01:31:02 +03:00
Tuomas Tynkkynen
02f9f0c7e0 u-boot: 2015.04 -> 2015.07 
A new regularly release. Some improvements I've noted:
    - Keyboard on the pcDuino3 Nano now works without a hub.
    - Ctrl-C now correctly cancels the 'sysboot' boot menu

Also, config_cmd_default.h is replaced by equivalents in the kconfig
system, so the vexpress patch needs some updating.
 2015-08-26 22:07:18 +03:00
Bjørn Forsman
d61c46c1bd libqglviewer: rename attrname and pkgname from libQGLViewer 
Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
 2015-08-26 16:50:55 +02:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Eelco Dolstra
60a0bb7f66 Make "nix-env -i wine" work again 
Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts)

Issue #8990.
 2015-08-25 13:07:16 +02:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Nikolay Amiantov
6d6eb1913a Merge pull request #9025 from abbradar/zsnes 
zsnes: use Debian patches, fix segfault on saving state
 2015-08-21 23:53:44 +03:00
William A. Kennington III
4f22eadf2c Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
Thomas Strobel
26ef514981 canon-cups-ufr2: init at 2.90 2015-08-20 01:22:10 +02:00
Kamil Chmielewski
86b34e3a0d vimPlugins: add molokai 2015-08-19 14:44:20 +02:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Vladimír Čunát
a732b1413f ghostcript: work around a parallel check problem 
http://hydra.nixos.org/build/24811657
Hopefully OK now - I couldn't reproduce it with 4 cores and HT.
 2015-08-18 10:36:00 +02:00
Cray Elliott
e99167d7f1 new package: mgba 0.3.0 
This is a new Gameboy Advance emulator which aims to run on lower
end hardware without sacrificing accuracy or portability.
 2015-08-17 18:00:33 -07:00
Jan Malakhovski
c88e9deff4 cups: remove xdg_utils dependency 
`cups.desktop` that depends on some fixed version of `xdg-open` is not
particularly useful; it should use `xdg-open` from the environment
it's being run from.

As a side effect, one can now fiddle with `xdg_utils` package without
rebuilding pretty much every single one of graphical packages (they
all depend on `cups` through their graphical toolkits).
 2015-08-16 20:23:01 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Simon Vandel Sillesen
a7648a2226 sundtek: 30-06-2015 -> 28-07-2015 
Tested on local machine.
 2015-08-12 17:25:08 +02:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Eric Sagnes
0abedda1cc vimPlugins: add CheckAttach, vimwiki 2015-08-06 10:56:46 +09:00
Herwig Hochleitner
440dde6950 wine: cleanup and comment build script 2015-08-06 00:27:32 +02:00
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