Commit graph

20,657 commits

Author SHA1 Message Date
Arseniy Seroka
36242a14a2 Merge pull request #12843 from magnetophon/master-faust1-0.9.73
faust: update faust1, rename default.nix->faust2.nix
2016-02-06 23:54:11 +03:00
Robin Gloster
008acbc506 Merge pull request #12844 from magnetophon/master-ladspaH-mirror
ladspaH: move src to mirror, please also merge in 15.09
2016-02-06 20:06:14 +01:00
Arseniy Seroka
39beea3662 Merge pull request #12842 from roblabla/bugfix-fixKeybase
keybase: 0.8.22 -> 0.8.25
2016-02-06 18:47:43 +03:00
Christoph Hrdinka
c737ee5aba znc: delete 1.4 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
9423951609 znc-playback: init at git-2015-08-04 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
bc63d669f5 znc-clientbuffer: init at git-2015-08-27 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
0765936b63 znc-privmsg: c9f98690be -> git-2015-02-22 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
41480ae67b znc-fish: 8e1f150fda -> git-2014-10-10 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
ce4bd7bbc6 znc-push: 1.0.0 -> git-2015-12-07 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
86de7b1d2b hugin: update 2013.0.0 -> 2015.0.0 2016-02-06 13:50:32 +01:00
Bart Brouns
3b6b47976e ladspaH: move src to mirror, please also merge in 15.09 2016-02-06 13:39:30 +01:00
Bart Brouns
f357b6eb2b faust: update faust1, rename default.nix->faust2.nix 2016-02-06 13:26:31 +01:00
roblabla
16ddf9ea87 keybase: 0.8.22 -> 0.8.25 2016-02-06 12:51:26 +01:00
William Casarin
c77f1f6cc9 obs-studio: 0.12.1 -> 0.13.1 2016-02-05 20:29:33 -08:00
Lancelot SIX
c5379e7da8 pkgs.darktable: 1.6.9 -> 2.0.0
See http://www.darktable.org/2015/12/darktable-2-0-released/

changes by @globin: added wrapGAppsHook and adwaita-icon-theme

Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-06 01:30:07 +00:00
Robin Gloster
5b67ed7c55 Merge pull request #12819 from Beauhurst/hg_crecord_revert
hg_crecord: revert changes adding mercurial crecord
2016-02-05 21:24:19 +01:00
Robin Gloster
18c44e9c6e Merge pull request #12835 from zimbatm/sublime-3101
sublime3: 3083 -> 3101
2016-02-05 21:22:00 +01:00
Cole Mickens
14dfebd364 rkt: reset stage1 to rkt's recommended version 2016-02-05 11:18:12 -08:00
zimbatm
943e049ff8 sublime3: 3083 -> 3101 2016-02-05 15:02:55 +00:00
Arseniy Seroka
50f94c2751 Merge pull request #12831 from colemickens/rkt-1.0.0
rkt 0.15.0 -> 1.0.0 + trousers
2016-02-05 17:32:45 +03:00
Cole Mickens
34f59ae390 rkt 0.15.0 -> 1.0.0 + trousers 2016-02-04 22:52:55 -08:00
Cole Mickens
712eb6b7e0 docker 1.9.1 -> 1.10.0 2016-02-04 22:52:06 -08:00
Thomas Tuegel
53aee90d57 melpaStablePackages 2016-02-04 2016-02-04 18:05:21 -06:00
Thomas Tuegel
73093823f4 melpaPackages 2016-02-04 2016-02-04 17:13:37 -06:00
Thomas Tuegel
d5281958f0 elpaPackages 2016-02-04 2016-02-04 15:11:00 -06:00
Michael Raskin
0d1a188c5d Re-add Monotone-Viz with Fedora as a source 2016-02-04 20:13:49 +01:00
Robert Scott
d192057519 hg_crecord: revert changes adding mercurial crecord
crecord is included in modern hg releases - I failed to realize this.
2016-02-04 15:13:24 +00:00
Nikolay Amiantov
8821ebe3ad remove gmcs substitutes from mono packages 2016-02-04 03:51:47 +03:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Sven Keidel
ca21ae0eda isabelle: 2014 -> 2015
Picked from #8510. /cc maintainer @jwiegley.
2016-02-03 13:51:35 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Jascha Geerds
ace76b5bdb keepassx2: 2.0 -> 2.0.2 2016-02-03 11:36:53 +01:00
Damien Cassou
22d9e4ef26 Merge pull request #12777 from matthiasbeyer/update-some-packages
Update some packages
2016-02-02 23:09:13 +01:00
Matthias Beyer
11f95e1681 mdp: 1.0.1 -> 1.0.4 2016-02-02 21:33:09 +01:00
Matthias Beyer
61bef57edb ctodo: 1.1 -> 1.2 2016-02-02 21:23:07 +01:00
Matthias Beyer
0c2ac149a3 hstr: 1.17 -> 1.19 2016-02-02 21:21:38 +01:00
Matthias Beyer
51e0077e79 khard: 0.6.3 -> 0.8.1 2016-02-02 21:19:35 +01:00
Jos van den Oever
ba8b7fff6a davmail: 4.7.0 -> 4.7.1
Bugfix release, mainly for Carddav regression over EWS, also includes an NTLM support enhancement.

Enhancement:
- Improve NTLM support try to send hostname as workstation name instead of UNKNOWN
- Fix notification dialog message
- Prepare ExchangeSessionFactory refactoring
- Fix typo in french translation
- Fix broken Sourceforge link in About dialog

Carddav:
- Carddav: fix regression on contact update with empty field triggering DeleteItemField

(cherry picked from commit cf327c3dcfd442cea4368d76c59f72dcd5da6768)

[Bjørn: Cherry-picked from release-15.09 to master. (I guess merging
first to release-15.09 was a mistake.)]
2016-02-02 19:25:43 +01:00
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
Ali Abrar
b2a91caea0 vim_configurable: add configuration option for XIM support 2016-02-02 10:14:26 -05: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
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5dfcafb205 treewide: Mass replace 'xwayland}/bin' to refer the 'out' output 2016-02-01 20:46:27 +02:00
Tuomas Tynkkynen
7b0c4d452a treewide: Mass replace 'poppler_utils}/bin' to refer the 'out' output 2016-02-01 20:46:18 +02:00
Tuomas Tynkkynen
13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00