3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1362 commits

Author SHA1 Message Date
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
Jan Malakhovski 0bee7429c2 physlock: add version git-20150126 2015-03-26 13:04:51 +00:00
Jan Malakhovski 3e15f6a370 xscreensaver: change patchPhase into preConfigure so that one can use patches, fix a comment 2015-03-26 12:58:39 +00:00
Utku Demir 2ecf9aad4a myEnvFun: use stderr instead of stdout for messages
Close #6910.
2015-03-22 18:24:35 +01:00
Michael Raskin d77a4f17f9 update wine 2015-03-21 21:29:39 +03:00
Tobias Geerinckx-Rice 9e5abbc404 vim-plugins: wakatime 3.0.7 -> 3.0.8 2015-03-10 04:58:45 +01:00
Nathaniel Baxter 358e9af3d3 wineUnstable: updates (close #6508) 2015-03-08 15:10:44 +01:00
Vladimír Čunát 2069156d5c nestopia: disable failing parallel builds
http://hydra.nixos.org/build/19861758
2015-03-07 14:34:28 +01:00
Nikolay Amiantov 0c5169b536 samsung-UnifiedLinuxDriver: fix meta 2015-03-05 20:49:45 +03:00
宋文武 4c3b9927d8 numix-gtk-theme: Install to $out/share/themes. 2015-03-05 15:13:04 +08:00
Remy Goldschmidt 8a732aecb8 Fixed licenses, fixed platform, renamed packages 2015-03-05 00:23:18 -06:00
Remy Goldschmidt 7648cb2456 Added Numix GTK theme, removed unnecessary ls -lah in Numix/Numix-Circle icon themes 2015-03-04 18:00:25 -06:00
Cray Elliott 2ee6e81896 Monthly bump of dolphinEmuMaster
Large performance improvements, smaller binary, and higher accuracy!
See for details :
https://dolphin-emu.org/blog/2015/03/01/dolphin-progress-report-february-2015/
2015-03-02 01:48:05 -08:00
Vladimír Čunát 46b48b0b43 Revert "vimPlugins: update" due to bad hashes
This reverts commit 57a0c44c2c.
https://github.com/NixOS/nixpkgs/commit/f799749442489#commitcomment-9901870
2015-02-24 21:59:41 +01:00
Vladimír Čunát f799749442 vimPlugins.Syntastic: fix fetchgit hash
I've got no idea why the hash was wrong. I hope the hashes aren't unstable.
Reported on http://unix.stackexchange.com/questions/186519/unable-to-install-vim-plugins
2015-02-24 21:21:05 +01:00
Thomas Tuegel 18e594eddb hplip: update to 3.15.2 2015-02-21 20:19:21 -06:00
Tobias Geerinckx-Rice 72b30b1b3d wakatime 20150213 -> 3.0.7 2015-02-19 14:47:52 +01:00
Nikolay Amiantov aec96d46c1 Merge pull request #6375 from abbradar/winetricks
winetricks: update
2015-02-19 02:29:54 +03:00
Nikolay Amiantov ca8137d4a8 winetricks: update 2015-02-19 02:12:09 +03:00
Arseniy Seroka 57a0c44c2c vimPlugins: update 2015-02-18 18:36:48 +03:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Arseniy Seroka a6b1cb8411 vimPlugins.YCM: fix sha 2015-02-17 16:54:06 +03:00
Tobias Geerinckx-Rice 3049ef6769 vim-plugins: add wakatime 2015-02-16 02:20:11 +01:00
Peter Simons 600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Herwig Hochleitner dea3ac7783 Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS 2015-02-10 14:44:29 +01:00
Herwig Hochleitner 7d24bcdbcf Add gdk_pixbuf, gnome_icon_theme and librsvg to cdemu gui programs 2015-02-10 14:25:23 +01:00
Herwig Hochleitner eb03122cf6 Use gnome3 icon theme in cdemu 2015-02-10 14:09:27 +01:00
Herwig Hochleitner 67f9c8b025 Fix cdemu ui gsettings schema paths 2015-02-10 13:14:25 +01:00
Herwig Hochleitner b909def3e1 Whitespace cleanup 2015-02-10 11:49:32 +01:00
Herwig Hochleitner 2961b83d08 Add cdemu packages and module 2015-02-10 06:49:47 +01:00
Michael Raskin 7a7572dc31 Update Wine unstable 2015-02-10 00:28:00 +03:00
Arseniy Seroka e7db6fd1ac vimplugins: update vim2nix and VAM 2015-02-09 01:43:24 +03:00
Valérian Galliat f4951338ce vim-plugins: add sensible 2015-02-08 16:16:31 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Arseniy Seroka a6a9d8137f vimPlugins.youCompleteMe: fix name
Using date instead of rev
See https://github.com/NixOS/nixpkgs/pull/4499#issuecomment-58805580 for more info why.
2015-02-07 23:15:00 +03:00
Cillian de Róiste c6c1aa11f8 update jack2 to version 1.9.10
Copied from 8bae32afb5, without the tags file
2015-02-07 10:37:54 +01:00
Rok Garbas 525a318a0f vimPlugins.YouCompleteMe: name should reflect revision 2015-02-06 21:05:43 +01:00
Rok Garbas e4c0ee53d2 vimPlugins.YouCompleteMe: updated to latest 2015-02-06 20:07:10 +01:00
Marc Weber 411545b038 update vam, vim2nix, fixes 6183 2015-02-06 20:02:56 +01:00
Pascal Wittmann 288ed0cfa0 xosd: update from 2.2.12 to 2.2.14 and added meta information 2015-02-06 15:31:32 +01:00
Arseniy Seroka e01997e1ef vim-plugins: add xkb-switch 2015-02-04 00:17:08 +03:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Michael Alyn Miller 6cb1d1aaaf Add xss-lock 2015-02-01 10:07:01 -08:00
Michael Raskin 3566a73b5e Update wine-unstable 2015-02-01 18:41:33 +03:00
Cray Elliott 221a6f67a5 monthly bump of dolphinEmuMaster
check out what's new at https://dolphin-emu.org/blog/2015/02/01/dolphin-progress-report-january-2015/
2015-02-01 03:59:44 -08:00