Commit Graph

12007 Commits

Author SHA1 Message Date
aszlig
61042a5b6a
chromium/plugins: Use @var@ for passing variables
There is already a pull request from @colemickens, who has just reversed
the variable references $flash and $flashVersion but the fix is kinda
fragile as he points out himself in #12713.

The reason the wrong substition was made is that both variables begin
with the same name and we do a simple replace instead of a more
complicated one using builtins.match.

So staying simple but to still not raising issues with other variables
that begin with the same name I'm now using @var@ instead, like we use
in substituteAll and other substituters (like the ones in CMake or
autotools) deal with it.

Note that I'm not using $var$ here to make sure it doesn't get confused
with real shell variables.

So with this fix in place, the wrapper now has the following flags:

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=20.0.0.294

Previously we had (#12710):

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=/nix/store/...-binary-plugins-flashVersion

Thanks to @colemickens for reporting and putting up a pull request.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12710
Fixes: #12713
2016-02-02 17:39:08 +01:00
aszlig
ff90f52375
chromium: Remove import-from-derivation again
This reverts commit f7af2272a2.

We're going to fix #12710 properly by reintroducing 38c77bb and fixing
the shell variable substitution.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-02 17:39:08 +01:00
Thomas Tuegel
269630494f Merge pull request #12745 from christopher-l/spotify
spotify: fix icons
2016-02-01 16:51:30 -06:00
Luca Bruno
b70310da23 Merge pull request #12750 from henrytill/mr
mr: 1.20150503 -> 1.20160123
2016-02-01 23:47:45 +01:00
Domen Kožar
0b3becb269 Merge pull request #12701 from mayflower/builder-def-cleanup
builderDefsPackage cleanup
2016-02-01 21:09:34 +00:00
Tobias Geerinckx-Rice
c55c909e56 liferea: 1.10.17 -> 1.10.18
This is a maintenance release that brings the following changes:
- Fixes #287: media:content support broken
- Fixes #279: Rules not visible in searchdialog
- Fixes #83: Segfault when sorting feeds in folder
- Fixes #302: Broken compilation with --disable-notify
2016-02-01 19:39:18 +01:00
Franz Pletz
1026673f37 firefox: 43.0.4 -> 44.0 2016-02-01 18:10:47 +01:00
Henry Till
79b326e9e9 mr: 1.20150503 -> 1.20160123 2016-02-01 11:24:01 -05:00
Christopher Lübbemeier
ea25afa2cb spotify: fix icons 2016-02-01 14:49:43 +01:00
Tomasz Czyż
0c5ad78c18 solaar: fix, partially (close #12685)
vcunat's comments:
Unused parameter got removed.
CLI looks good now but the GUI still won't work with:

bin/..solaar-wrapped-wrapped:45: PyGIWarning:
 Gtk was imported without specifying a version first.
 Use gi.require_version('Gtk', '3.0') before import to ensure that the right version gets loaded.
  solaar.gtk.main()
 solaar: error: Argument 0 does not allow None as a value
2016-02-01 13:21:43 +01:00
Tony White
8491d0d1ca chromium: 47.0.2526.106 - > 48.0.2564.97
- Fixes CVE-2016-1612 CVE-2016-1613 CVE-2016-1614 CVE-2016-1615
  CVE-2016-1616 CVE-2016-1617 CVE-2016-1618 CVE-2016-1619 CVE-2016-1620.
- Moves chromium stable and beta channels up one version major.
  vcunat made dev channel stay for now, as it wouldn't download otherwise.
  This is most of PR #12717.
2016-02-01 12:12:07 +01:00
Arseniy Seroka
43ea13b314 Merge pull request #12721 from romildo/update-awesome
awesome: 3.5.7 -> 3.5.8
2016-02-01 13:42:22 +03:00
Thomas Tuegel
698b14c1c9 Merge pull request #12733 from hrdinka/update/qtpass
qtpass: 1.0.6 -> 1.1.0
2016-01-31 14:54:29 -06:00
Christoph Hrdinka
12ecc1ceb3 qtpass: use wrapQtProgramm instead of standard wrapper 2016-01-31 21:35:15 +01:00
Anne Jan Brouwer
2924099dae qtpass: 1.0.6 -> 1.1.0 2016-01-31 21:32:15 +01:00
Matej Cotman
e048b48836 lighttable: update from 0.7.2 to 0.8.1 2016-01-31 21:12:45 +01:00
Pascal Wittmann
268d4699ec calibre: 2.49.0 -> 2.50.1 2016-01-31 18:06:51 +01:00
José Romildo Malaquias
866937a9f8 awesome: 3.5.7 -> 3.5.8 2016-01-31 11:34:10 -02:00
Franz Pletz
8ec3bce8f8 links: Remove package & deprecate for links2
This package is deprecated and superseeded by links2 which also provides the
links binary this maintaining backwards-compatibility.

Debian removed links back in 2008:

  https://packages.qa.debian.org/l/links.html

Fixes #12623.
2016-01-31 11:46:35 +01:00
Nikolay Amiantov
979dd17bac Merge pull request #12712 from akaWolf/deadbeef-ape-plugin
deadbeef: ape plugin fix
2016-01-31 13:45:12 +03:00
Frederik Rietdijk
0f80ba1fb4 Merge pull request #12530 from np/python-trezor
New/updated python packages related to the TREZOR hardware wallet
2016-01-31 11:26:27 +01:00
Artjom Vejsel
f650fed9e5 deadbeef: ape plugin fix 2016-01-31 12:12:16 +03:00
Vladimír Čunát
f7af2272a2 Revert "chromium: Do not rely on import-from-derivation"
This reverts commit 38c77bb72c.
In this form it causes problems #12710.
2016-01-31 10:03:57 +01:00
Robin Gloster
8c91610cb2 content: remove
Doesn't build and have been abandoned for years
2016-01-30 20:31:05 +00:00
Robin Gloster
9d7e2baf3b viewmtn: remove, source is offline and pkg dead 2016-01-30 20:31:04 +00:00
Robin Gloster
f295fef411 tailor: refactor from builderDefsPackage 2016-01-30 20:31:04 +00:00
Robin Gloster
6950c43467 monotoneViz: delete
not updated in 5 years and broken build
2016-01-30 20:31:04 +00:00
Robin Gloster
ecc580f379 carrier: deleted pidgin fork
not updated in >5 years and broken build
2016-01-30 20:31:03 +00:00
Robin Gloster
2c3013f55b cvs: Remove unneeded configureFlags 2016-01-30 20:31:01 +00:00
Franz Pletz
fc71277f4d Merge pull request #12700 from rycee/bump/eclipse-plugin-checkstyle
eclipse-plugin-checkstyle: 6.11.1 -> 6.14.0
2016-01-30 21:24:19 +01:00
Franz Pletz
ead58a86ba clawsMail: 3.13.1 -> 3.13.2 (security fix) 2016-01-30 21:16:22 +01:00
Robert Helgesson
057e54f2ad eclipse-plugin-checkstyle: 6.11.1 -> 6.14.0 2016-01-30 20:48:23 +01:00
Arseniy Seroka
f8c1d61f12 Merge pull request #12673 from kamilchm/marathon
marathon: 0.8.1 -> 0.14.1
2016-01-30 21:45:32 +03:00
Arseniy Seroka
79f34bedc6 Merge pull request #12681 from ktosiek/keepass-fix
keepass: 2.30 -> 2.31
2016-01-30 21:45:12 +03:00
Franz Pletz
62232466e5 Merge pull request #12698 from matthiasbeyer/update-scim
scim: 0.1.9 -> 0.2.1 (sc-im)
2016-01-30 17:41:32 +01:00
Matthias Beyer
72c7b1af7f scim: 0.1.9 -> 0.2.1 (sc-im)
Move derivation definition to "sc-im", as project was renamed.
Also change the license to BSD, which is what what-license.com
detechted.
2016-01-30 17:33:01 +01:00
Bjørn Forsman
ee0dc91157 eclipse-scala-sdk: fix typo in package name
Change underscore to hyphen.
2016-01-30 17:21:49 +01:00
Bjørn Forsman
b0b7fe2cce eclipse-cpp: 4.5 -> 4.5.1 2016-01-30 17:18:18 +01:00
Bjørn Forsman
75d3b418a5 eclipse-cpp: 4.4 -> 4.4.2 2016-01-30 17:18:17 +01:00
Bjørn Forsman
bf2dfb9d99 eclipse: remove old to-do comment about "mirror://eclipse/"
The comment is from 2011, before we started using officially mirrored
URLs[1] like

  http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=THE_FILE

I think using upstream mirrored URLs is better than mirror://eclipse:

  - upstream mirror list is always up to date
  - the closest / fastest mirror will be selected automatically

[1]: http://wiki.eclipse.org/IT_Infrastructure_Doc#Use_mirror_sites.2Fsee_which_mirrors_are_mirroring_my_files.3F
2016-01-30 17:18:13 +01:00
Bjørn Forsman
d5c9db8dd3 eclipse: align attrnames with pkgnames (underscore => hyphen)
Keep old attrnames too, for backward compatibility.

`nix-env -f . -qaP -A eclipses` only prints the new attributes (yay!).
2016-01-30 17:18:09 +01:00
Franz Pletz
562a41e696 Merge pull request #12584 from nathanielbaxter/dev/teamspeak
teamspeak client: bump 3.0.18.1 -> 3.0.18.2
2016-01-30 17:10:16 +01:00
Bart Brouns
ee9d7f09ea ladspa-sdk: change source url to mirror
ladspa.org has been down for a feew weeks, and I couldn't find info on a
cause or a solution.

Closes #12640.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
2016-01-30 16:31:09 +01:00
Franz Pletz
90f987718c Merge pull request #12689 from obadz/citrix
citrix-receiver: 13.2.1 -> 13.3.0
2016-01-30 15:48:34 +01:00
Nicolas Pouillard
2238ca0a5b
electrum-dash: init at 2.4.1 2016-01-30 14:04:04 +01:00
Nicolas Pouillard
65836c898f
electrum: add plugin dependencies (trezor, keepkey) 2016-01-30 14:04:04 +01:00
Carles Pagès
cb858b6ee5 Merge pull request #12671 from Profpatsch/abcde
abcde: add flac and which as runtime deps
2016-01-30 13:34:18 +01:00
Bjørn Forsman
bdc9bfc3fa eclipse-plugin-gnuarmeclipse: 2.8.1-201504061754 -> 2.11.1-201512141335
Upstream switched from sourceforge to github.
2016-01-30 12:33:12 +01:00
Eelco Dolstra
eeb9231009 slim: Sort sessions
This ensures that xfce and most others DMs are preferred over
xterm. Previously slim used directory order, which is undefined.

Of course, it's just lucky that xfce < xterm lexicographically, but
that also applies to the other display managers, AFAIK. We should have
a way to specify a DM order, but that can be accomodated by generating
desktop entries like "<NN>-session.desktop".

Fixes #4300. Parenthetical to #12516.
2016-01-30 10:47:55 +01:00
Pascal Wittmann
f272c1cbb6 Merge pull request #12679 from mstarzyk/ranger
ranger: 1.7.1 -> 1.7.2
2016-01-30 00:28:24 +01:00