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 8bae32afb58b2bd21, 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
Thomas Tuegel
8994b50dda
orion: add GTK3 theme
2015-01-26 20:59:51 -06:00
Edward Tjörnhammar
6bbec634a7
Merge pull request #5850 from edwtjo/kodi-plugins
...
XBMC to Kodi migrations
2015-01-24 14:17:14 +01:00
David Virgilio
0075e6bd3a
frescobaldi: add pygame dependency for midi support
2015-01-22 23:34:10 -06:00
Charles Strahan
8d49e87dec
Merge pull request #4677 from cstrahan/pleasant-ruby
...
Pleasant ruby
2015-01-21 23:27:38 -05:00
Thomas Tuegel
28b55a318a
hplip: ensure plugin version always up-to-date
2015-01-21 07:57:05 -06:00
Thomas Tuegel
7a20c4cae4
hplip: version 3.14.10
2015-01-21 07:57:05 -06:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Edward Tjörnhammar
3a321906d1
Add Kodi retroarch launchers
2015-01-19 22:14:37 +01:00
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
Michael Raskin
41f0b9e851
Wine unstable: 1.7.33 -> 1.7.34
2015-01-11 16:43:29 +03:00
Moritz Maxeiner
56fe81a2e6
seafile: update client, ccnet, libsearpc and shared
2015-01-09 13:37:44 +01:00
Sander van der Burg
af9bb71848
Merge pull request #5592 from AndersonTorres/fsuae
...
FS-UAE (version 2.4.1): New Package
2015-01-06 09:59:56 +00:00
AndersonTorres
291d507d98
FS-UAE (version 2.4.1): New Package
...
FS-UAE is a new, cycle-accurate, customizable Amiga Emulator.
2015-01-05 17:47:07 -02:00
Cray Elliott
5a92c9f0a1
remove extraneous platform from dolphinEmuMaster
2015-01-03 23:00:29 -08:00
Cray Elliott
c9d963c4e6
time for the monthly dolphinEmuMaster bump
2015-01-03 19:44:34 -08:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Charles Strahan
145733c479
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/redmine/default.nix
pkgs/development/interpreters/ruby/gem.nix
pkgs/development/interpreters/ruby/generated.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/tools/vagrant/default.nix
pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Cray Elliott
183f0b9d9a
update retroarch and all of the libretro cores
2014-12-25 02:04:08 -08:00
Domen Kožar
1980e6225d
Merge pull request #5428 from bdimcheff/fix-cups-filter-bash
...
Fix compiled-in /bin/bash in foomatic filters
2014-12-23 21:05:10 +01:00
Brandon Dimcheff
139d7f6e1a
squish cups patches all into one statement
2014-12-23 11:53:58 -05:00
Cray Elliott
d54db47b3c
add new emulator, nestopia undead
2014-12-23 02:33:00 -08:00
Brandon Dimcheff
6a2195c3a5
Fix compiled-in /bin/bash in foomatic filters
...
Foomatic filters contained a 64-char c string hardcoded to /bin/bash.
This caused some filters (at least pdftops) to fail.
I also had to increase the size of the string because nix paths are too
long.
2014-12-21 20:47:36 -05:00
Michael Raskin
1317dd7e62
Wine: 1.7.30 → 1.7.33
2014-12-21 11:14:25 +03:00
Michael Raskin
5f451686cb
xscreensaver: 5.30 → 5.32
2014-12-21 11:14:25 +03:00
Pascal Wittmann
f94580da69
Fix license attribute of many bsd-like licensed packages
2014-12-21 00:00:35 +01:00
Arseniy Seroka
b11927ff68
Revert "vim-plugins: update"
...
This reverts commit b736b20203
.
Because `vim-plugin-names-to-nix` doesn't create sha's.
2014-12-18 02:41:47 +03:00
Arseniy Seroka
b736b20203
vim-plugins: update
2014-12-18 02:39:51 +03:00
Eelco Dolstra
be0e73b938
cups: Build with SERVERROOT set to /etc/cups
2014-12-16 18:23:41 +01:00
Eelco Dolstra
ffdabf02b9
cups: Get rid of obsolete banners
...
These use bannertops, which no longer exists. And they conflicted with
the working banners in cups-filters.
2014-12-16 18:23:41 +01:00
Eelco Dolstra
fb079432b0
cups-filters: Fix gstoraster
...
It was trying to find "gs" via execve, so use execvpe instead. It's
probably better to use gs's absolute path, but maybe not every
cups-filters user needs it.
2014-12-16 18:23:41 +01:00
Eelco Dolstra
6c00d9f7e4
cups-filters: Fix finding GS in several filters
2014-12-16 18:23:40 +01:00
Eelco Dolstra
0aa452e179
cups-filters: Fix banners
...
It was looking in cups' prefix for the PDF templates. So for instance
printing a CUPS test page wouldn't work.
2014-12-16 18:23:40 +01:00
Siarhei Zirukin
167ffb7ef5
alock: update the package
2014-12-10 17:16:38 +01:00
Vladimír Čunát
e815624b67
dolphin-emu-master: disable unsupported i686 platform
2014-12-10 15:43:15 +01:00
Pavan Rikhi
97f66f5899
clearlooks-phenix: Fix the Meta Description
2014-12-07 18:16:11 -05:00
Pavan Rikhi
b79bf417f0
Add the Clearlooks-Phenix GTK3 Theme
2014-12-05 05:13:17 -05:00
Arseniy Seroka
22dfaefea5
yunocommit-vim: fix link
2014-12-05 02:32:36 +03:00
Arseniy Seroka
3342729bd0
yunocommit-vim: update plugin
2014-12-05 01:50:55 +03:00
Marc Weber
abd016cea8
Refactoring vim plugins again:
...
- sort automatcially generated vim derivations
- move the plugins to be derived by VAM into its own file: vim-plugin-names
- rename vimrc into vimUtils moving all common code into it
so that it is possible to use it within ~/.nixpkgs/config.nix
- Moving all important documentation into vimUtils
- provide vimPlugins.pluginnames2Nix to provide a bin/vim-* command
writing updated derivations into its buffer
VAM's repository's nix.vim got some improvements @ VAM repository, eg hg
fetchout out got fixed and shell failures are noticed now (Thanks to Arseniy
Seroka)
2014-12-04 15:32:38 +01:00
Pascal Wittmann
5543796ce8
xlockmore: update from 5.44 to 5.45
2014-12-03 17:32:58 +01:00
Arseniy Seroka
116ac0d252
Merge pull request #5195 from prikhi/fix-vimplugin-docu
...
Fix the Vim Plugins Documentation
2014-12-02 19:01:12 +03:00
Cray Elliott
682ea7c775
monthly bump of dolphinEmuMaster
...
Tons of accuracy improvements per usual, some somewhat interesting ones:
- Constant Angular Velocity for Disk Reads
- FIFO buffer fix
- Vectorized Vertex loading
and more! read about it at dolphin-emu.org
2014-12-02 01:06:15 -08:00
Lysergia
eb7f8666f2
Fix the Vim Plugins Documentation
2014-11-30 17:12:32 -05:00
aszlig
6f683e4ba3
my-env: Use sed to substitute $initialPath.
...
initialPath is now added to the top of the modified setup.sh. It's not
very nice altogether to patch setup.sh in this way, as it is prone to
break on setup.sh changes, but it should (hopefully finally, but
unfortunately only temporarily) fix the issue ewemoa (in #nixos) had
with myEnvFun.
In the long term, if people want to have roughly similar functionality,
nix-shell provides a better way for that, so maybe we might either
remove myEnvFun or replace it with a smaller implementation using
nix-shell.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig
83c2fcada4
my-env: Provide explicit store path for "rm".
...
If you do not provide any dependencies which don't propagate coreutils,
you'll get "rm: No such file or directory". Like for example by using
this:
nix-build -E '(import <nixpkgs> {}).myEnvFun {
name = "mybrokentest";
buildInputs = [];
}'
Thanks to "ewemoa" from the #nixos IRC channel for spotting this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 02:05:48 +01:00
Domen Kožar
5f599a3ddd
remove pdf-filter
2014-11-24 08:43:43 +01:00
Arseniy Seroka
3367a28270
fix typos and remove useless imports
2014-11-24 02:44:27 +03:00
Arseniy Seroka
ec8bfcb696
racer: add pkg and vim plugin
2014-11-24 02:41:36 +03:00
Domen Kožar
23567ac200
cups-pdf-filter -> cups-filters, enable by default for cups
2014-11-23 17:51:55 +01:00
aszlig
392a4c0a26
Merge branch 'chromium'.
...
This introduces Chromium 39 as the new stable version along with a bunch
of fixes.
Fixes #2799 , particularily the PDF plugin, which now is open source and
thus no longer an issue.
Also fixes #3219 and merges #2906 , so we no longer get a crash while
trying to bring up the print preview dialog.
Thanks to @edwtjo for the CUPS version bump.
* chromium: Switch to use open-source PDF plugin.
* cups: bump 1.5.4 -> 1.7.5
* chromium: Allow env vars for passing plugin paths.
* chromium: Update all channels to latest versions.
* protobuf: Clean up and update to version 2.6.1.
2014-11-22 04:34:16 +01:00
Edward Tjörnhammar
45c4d68960
cups: bump 1.5.4 -> 1.7.5
2014-11-22 04:26:17 +01:00
Arseniy Seroka
f54f79e5a3
sort plugins
2014-11-20 23:49:17 +03:00
Cillian de Róiste
21753791b1
hplip: fix typo in license
2014-11-20 14:23:19 +01:00
Thomas Tuegel
4e11748886
hplip: update license attribute
2014-11-20 05:14:02 -06:00
Thomas Tuegel
ac696769af
Revert "Merge pull request #4693 from flosse/hplip-update"
...
This reverts commit 1b064645ed
, reversing
changes made to 14cef95e84
.
As discussed in the comments to the aforementioned pull request, while
the new version supports many new printer models, many components of the
driver are broken because of some corner cases in the Python wrapper. In
particular, the loader for the binary binary driver needed by many
middle- and high-end printers is broken, negating most of the value in
updating!
2014-11-20 05:14:01 -06:00
Cray Elliott
825e99808c
add a platform to all of my packages
2014-11-19 03:03:00 -08:00
Arseniy Seroka
555e3a0deb
vim: add plugins
2014-11-19 01:12:54 +03:00
Pascal Wittmann
be7d29a036
apulse: update from 0.1.2 to 0.1.4
2014-11-18 20:36:46 +01:00
AndersonTorres
a86ba451bf
Stella: update to 4.2
2014-11-18 11:12:47 -02:00
AndersonTorres
f9c2d0a7a3
Stella: update to 4.1.1
2014-11-18 11:12:47 -02:00
Aristid Breitkreuz
d50cb78b78
vim-plugins/YouCompleteMe: fix build
2014-11-16 17:27:13 +01:00
Michael Raskin
ba77c90161
Revert "cups: update package"
...
This reverts commit aa548af5a5
.
2014-11-15 17:00:15 +03:00
Michael Raskin
d86c047f9c
Revert "cups-filters: add package"
...
This reverts commit f7ba33de56
.
2014-11-15 16:59:58 +03:00
Michael Raskin
a7c8d00b27
Merge pull request #4857 from abbradar/cups2
...
[WIP] Improve printing experience and update related packages
2014-11-15 15:18:35 +03:00
Nikolay Amiantov
a75d294516
foomatic-filters: fix building with cups-2
2014-11-14 22:52:04 +03:00
Nikolay Amiantov
f7ba33de56
cups-filters: add package
2014-11-14 13:51:26 +03:00
Nikolay Amiantov
aa548af5a5
cups: update package
2014-11-14 13:51:26 +03:00
Nikolay Amiantov
e723c512c5
ghostscript: drop GNU fork and update
2014-11-14 13:51:26 +03:00
Arseniy Seroka
9b2cff2fc7
fix missing sha and rev
2014-11-13 22:43:32 +03:00
Cray Elliott
026d004a36
dolphinEmuMaster bump to bring in new HLE Audio code
...
Generally we only bump once per month, but due to the new
dolphin-emu.org blog post covering the subject, I couldn't
resist :)
if you'd like to read more about it, read here!
https://dolphin-emu.org/blog/2014/11/12/the-rise-of-hle-audio/#cuthere
2014-11-12 17:54:02 -08:00
Arseniy Seroka
2399edd633
fix travis eval and remove duplicate
2014-11-13 00:18:47 +03:00
Arseniy Seroka
ad2160f9b4
vim-plugins: fix missing deps
2014-11-12 23:29:47 +03:00
Arseniy Seroka
c75502acd2
Merge pull request #4897 from MarcWeber/submit/vim-plugins-with-vam-or-pathogen
...
experimental/vim-vam-pathogen-vimrc-support
2014-11-12 22:11:29 +03:00