JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,889 Commits 2 Branches 0 Tags 13 GiB
3a9983b45d
Commit Graph

65729 Commits

Author SHA1 Message Date
Ricardo M. Correia
097c82f6c5 fstar: init at 2016-01-12 2016-01-19 01:46:30 +01:00
Eric Sagnes
9f38c9a675 albert: init at 0.8.0 2016-01-19 09:41:21 +09:00
Domen Kožar
3b381d37ee Merge pull request #5096 from aszlig/buildenv-check-collision-contents 
buildEnv: Check the content of colliding paths.
 2016-01-19 01:00:09 +01:00
Gleb Peregud
8d6dd873a9 rebar3-nix-bootstrap: 0.0.1 -> 0.0.2 2016-01-18 23:13:40 +01:00
Gleb Peregud
a7f7698e04 hex2nix: 0.0.2 -> 0.0.3 2016-01-18 23:13:40 +01:00
Thomas Tuegel
9dfd9fe0bf elpa2nix: fix packages with DOS line endings 2016-01-18 15:29:19 -06:00
Thomas Tuegel
decb5802c9 elpaBuild: factor out package installation 
Building packages requires package-build.el from Melpa, but installing
packages only requires package.el. Packages from ELPA are already built,
so there is no need to involve package-build.el.
 2016-01-18 15:29:19 -06:00
Thomas Tuegel
1724a07e2e melpaBuild: keep original source file names without hash 2016-01-18 15:29:19 -06:00
Thomas Tuegel
b81c8b9013 emacsPackagesNg: add note about elpaBuild 2016-01-18 15:29:18 -06:00
Thomas Tuegel
001341f8c9 emacs-org-plus-contrib: use elpaBuild 2016-01-18 15:29:18 -06:00
Thomas Tuegel
e01a41aee1 emacs-auctex: 11.87.7 -> 11.89 
Uses generated package from ELPA.
 2016-01-18 15:29:18 -06:00
Thomas Tuegel
d40e9bed15 emacs-let-alist: use generated package 2016-01-18 15:29:17 -06:00
Thomas Tuegel
cd54d7af47 melpaBuild: don't download dependencies 
Stop package.el from trying to download dependencies. It wouldn't work
anyway.
 2016-01-18 15:29:17 -06:00
Thomas Tuegel
18251778c9 melpaBuild: don't guess archive file name 
package-build can tell us exactly what the archive file name is, instead
of globbing for it.
 2016-01-18 15:29:17 -06:00
Thomas Tuegel
4b2303b8c9 melpaBuild: get Emacs package name from recipe 
When building a package from a Melpa recipe file, get the Emacs package
name from the recipe. Nix is more restrictive about packages names than
Emacs, so the Nix name for a package is sometimes different.
 2016-01-18 15:29:16 -06:00
Thomas Tuegel
61436c90e2 emacsPackagesNg: prefer melpaStablePackages to elpaPackages 
Both package sets are stable, but elpaPackages is an ad hoc set, so we
should prefer melpaStablePackages.
 2016-01-18 15:29:16 -06:00
Thomas Tuegel
7c42f9a200 melpa-stable-packages 2016-01-18 
The MELPA Stable package expressions are now generated in one file to
improve evaluation performance.
 2016-01-18 15:29:10 -06:00
Thomas Tuegel
3bd6edf0e2 melpa-packages 2016-01-18 
The MELPA package expressions are now generated in a single file to
improve evaluation performance.
 2016-01-18 15:28:28 -06:00
Thomas Tuegel
93bd5a2c32 elpa-packages 2016-01-18 
The ELPA package expressions are now generated as a single file to
improve evaluation performance.
 2016-01-18 15:27:15 -06:00
Damien Cassou
61d7fde27c Merge pull request #12425 from DamienCassou/pharo-vm-no-conflict-v3 
Refactor Pharo to allow co-installation of VMs
 2016-01-18 20:40:30 +01:00
Arseniy Seroka
05fe3faced Merge pull request #12455 from mogorman/paho-mqtt 
paho-mqtt: init at 1.1
 2016-01-18 22:21:45 +03:00
Damien Cassou
d422861055 Refactor Pharo to allow co-installation of VMs 2016-01-18 20:14:19 +01:00
Matthew O'Gorman
34c1f87750
paho-mqtt: init at 1.1 2016-01-18 13:35:07 -05:00
Tobias Geerinckx-Rice
a07e5839af snapper: use autoreconfHook 2016-01-18 19:32:48 +01:00
Michael Raskin
c983078735 Merge pull request #12454 from otwieracz/pioneer 
pioneer: nixpkg added
 2016-01-18 18:20:09 +00:00
Tobias Geerinckx-Rice
6c2b00bcb2 Merge pull request #12452 from Profpatsch/snapper 
snapper: 0.2.4 -> 0.2.8
 2016-01-18 19:13:59 +01:00
Slawomir Gonet
2ad985f3ed pioneer: nixpkg added 2016-01-18 19:03:35 +01:00
Vladimír Čunát
4c1e9ffd12 gmock: refactor source 2016-01-18 18:45:03 +01:00
Eric Merritt
8021b5241c rebar3: refactor to make hermetic 
This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
 2016-01-18 08:19:15 -08:00
Profpatsch
9a1f430e53 snapper: 0.2.4 -> 0.2.8 2016-01-18 16:16:29 +01:00
Vladimír Čunát
b4052f0a1e vte: remove the forgotten patch 2016-01-18 16:03:56 +01:00
Vladimír Čunát
45bf78373e termite: fix up the business with vte patching 
I didn't see nice patches to apply,
so I exchanged the whole source (-> autoreconf).

/cc maintainer: k0ral. BTW, it's practical to have the maintainers attribute
match the github name exactly so that people know how to /cc you.
 2016-01-18 15:57:41 +01:00
Franz Pletz
5160c8887e Merge pull request #12199 from jgillich/torbrowser-desktop 
torbrowser: add .desktop file
 2016-01-18 15:28:43 +01:00
Tobias Geerinckx-Rice
5cf03589a4 geolite-legacy 2016-01-11 -> 2016-01-18 2016-01-18 15:22:40 +01:00
Franz Pletz
501f9166b1 Merge pull request #12407 from jgillich/chats 
xmpp-client, ricochet
 2016-01-18 15:15:59 +01:00
Vladimír Čunát
72e6e6a483 tarball: fix evaluation of mdadm on darwin 
It probably doesn't make any sense to have mdadm on darwin,
but we have to "fail in a right way".
 2016-01-18 15:05:38 +01:00
Tobias Geerinckx-Rice
b9cc08c7c2 Merge pull request #12449 from nckx/update-vbox 
virtualbox: 5.0.10 -> 5.0.12
 2016-01-18 15:05:09 +01:00
Rob Vermaas
0cf5c65511 nixops: 1.3 -> 1.3.1 2016-01-18 13:56:28 +00:00
Jakob Gillich
87c3063d68 torbrowser: 5.0.6 -> 5.0.7, add desktop file 2016-01-18 14:47:33 +01:00
Tobias Geerinckx-Rice
9609eb8d10 btrfs-progs: 4.3.1 -> 4.4 
Bugfixes:
- chunk recovery: fix floating point exception
- chunk recovery: endianity bugfix during rebuild
- mkfs with 64K pages and nodesize reported superblock checksum mismatch
- check: properly reset nlink of multi-linked file

Too many changes to list here. See:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
 2016-01-18 14:46:40 +01:00
Franz Pletz
ca3af3ce88 pythonPackages.frozendict: Remove duplicate declaration 2016-01-18 14:19:56 +01:00
Franz Pletz
55fc3acfcb Merge pull request #12159 from rasendubi/ycmd 
ycmd: Init at 2016-01-12
 2016-01-18 14:11:22 +01:00
Vladimír Čunát
9fc8766eaf telepathy-qt: fixup build with qt5 
I only tested building with qt4, which turned out to be a mistake.
 2016-01-18 12:25:27 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible 
Close #12446.
 2016-01-18 10:45:31 +01:00
taku0
fba7544812 firefox-bin: wrap firefox-bin (close #12416) 2016-01-18 10:42:57 +01:00
Vladimír Čunát
1a4ab04e29 Merge branch 'staging' 
There are some darwin failures
https://github.com/NixOS/nixpkgs/commit/a3dcb3051#commitcomment-15482351
but also pre-built libxml2 security fixes.
 2016-01-18 10:02:48 +01:00
vbgl
877d9af793 Merge pull request #12451 from eduarrrd/photoqt 
photoqt: fix breakage from qt infrastucture transition
 2016-01-18 09:56:01 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
vbgl
c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42 
Eliom42
 2016-01-18 09:32:48 +01:00
Eduard Bachmakov
352ff0be29 protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2 
Also split out gmock's source so that it can be copied into protobuf's
source. Hopefull this hack can be removed again once gmock is replaced
by gtest.

This does not include python bindings.
 2016-01-18 00:43:21 -05:00
Tobias Geerinckx-Rice
3f10b2874f Merge pull request #12450 from eduarrrd/pshs 
pshs: 0.2.6 -> 0.3
 2016-01-18 04:55:25 +01:00
Eduard Bachmakov
0e55c43718 photoqt: fix breakage from qt infrastucture transition 2016-01-17 22:53:25 -05:00
Eduard Bachmakov
f3ae60295f pshs: 0.2.6 -> 0.3 2016-01-17 22:44:48 -05:00
Tobias Geerinckx-Rice
34dc7fe49f simple-scan: 3.19.3 -> 3.19.4 2016-01-18 04:26:09 +01:00
aszlig
011c149ed5
mdadm: Set allowedReferences to only include libc. 
The updates we had in the past (7719f7f and 1faf610) broke the mdadm
installer test and systems in the wild using mdraid because newer mdadm
versions contained a self-referenc to its own store path.

Instead of putting a big warning about updating in the package
expression, let's just add allowedReferences so the build immediately
fails if there is a self-reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-18 04:21:16 +01:00
aszlig
5e227e6f1d
mdadm: Clean up package expression. 
Let's use makeFlags directly instead of stitching together a
makeFlagsArray in preBuild.

This should make the expression much more readable and clean.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-18 04:21:16 +01:00
aszlig
bcd31d0acb
mdadm: 3.3 -> 3.3.4 
Okay, this update is a bit more tricky and the patch I've included is
not very nice to be honest.

So the patch causes "mdadm --udev-rules" to search for the right store
path using /proc/self/exec. This has the disadvantage that we could end
up having /run/current-system/bin/mdadm in the rule file.

But on the other hand, when we're on NixOS, we don't need to use that
command *at*all*, so we should be safe.

The patch also sets BINDIR to /sbin, which causes the included rule and
systemd files to not work out of the box on NixOS. But we have a
substituteInPlace where we do rewrite /sbin/mdadm to the right store
path in our udev rule generator, so that shouldn't be an issue.

I've tested this using the mdraid installer test and it succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-18 04:21:15 +01:00
Tobias Geerinckx-Rice
b01b11c657 virtualbox: 5.0.10 -> 5.0.12 
This is a maintenance release.
Changes: https://www.virtualbox.org/wiki/Changelog.
 2016-01-18 03:57:09 +01:00
aszlig
bfb11fd030
buildEnv: Skip content check on ignoreCollisions. 
Checking file contents is redundant in this case, because we will go
ahead anyway, regardless of whether the content is the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-18 03:56:09 +01:00
aszlig
4529ed1259
buildEnv: Check the content of colliding paths. 
Originally wanted to include ignoreCollisions in cups-progs, but I think
it's better if we use ignoreCollisions only if there are _real_
collisions between files with different contents.

Of course, we also check whether the file permissions match, so you get
a collision if contents are the same but the permissions are different.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-18 03:54:22 +01:00
Tobias Geerinckx-Rice
48fad440f1 Merge pull request #12448 from jb55/terra-patch 
terra: init at git-2016-01-06
 2016-01-18 03:48:36 +01:00
aszlig
85dd89f6eb
chromium: Remove myself from maintainers 
Working on Chromium really drives me nuts due to its build time, also I
really don't have quite a lot of time these days to properly maintain it
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-18 03:35:28 +01:00
aszlig
38c77bb72c
chromium: Do not rely on import-from-derivation 
This has been introduced by me in 690a845 and discovered by @vcunat in
his comment over at:

690a845de9 (commitcomment-14209868)

It's really a bit ugly to have builds running during evaluation, but
back when I made that commit the reason was to avoid having to shell
quote the hell out of it (see the comment in mkPluginInfo for the
reason).

Now we propagate plugin flags and environment variables as a list of
arguments in a plain file that's appended verbatim to makeWrapper, so
it shouldn't do any builds anymore during instantiation.

I have tested this with both just WideVine and just Flash enabled as
well as both in combination and none of the plugins and the output seems
correct. However I didn't test to run Chromium with the new
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Vladimír Čunát <vcunat@gmail.com>
 2016-01-18 03:35:28 +01:00
Tobias Geerinckx-Rice
8b57eb8f17 tldr: use fetchFromGitHub; pkgconfig 
pkgconfig is unrelated, but trivial (removes a harmless but
distracting error message) and doesn't warrant its own commit.
 2016-01-18 03:04:56 +01:00
Tobias Geerinckx-Rice
907481aca8 hack-font: 2.018 -> 2.019 2016-01-18 02:51:17 +01:00
Tobias Geerinckx-Rice
ebad3ffeb4 tldr: 1.0 -> 1.1.0; maintain 2016-01-18 02:47:10 +01:00
Tobias Geerinckx-Rice
5db2412159 Merge pull request #12447 from gpyh/fix-android-build-tools 
Renamed subdirectories in Android SKD's build-tools
 2016-01-18 02:35:59 +01:00
William Casarin
e66965fdee terra: init at git-2016-01-06 2016-01-17 17:30:01 -08:00
Tobias Geerinckx-Rice
7f2d6d8ee6 ms-sys: correct licence 2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice
f0cc8f9ec5 4suite: remove dead package 
Project abandoned in 2006. Broken since June 2014.
 2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice
6f640acfba ms-sys: 2.5.1 -> 2.5.2; maintain 
Changes:
  - Added german man page,
  - added support for Grub2 and Grub4Dos MBR,
  - added support for KolibriOS MBR and FAT32 boot record,
  - added support for ReactOS MBR, FAT32 and FAT16 BR,
  - added support for Rufus MBR,
  - added experimental support for large sectors ( > 512),
  - now possible to alter OEM ID of FAT and NTFS boot records.
  - now possible to alter Windows Disk Signature in MBR.
 2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice
837594fe6b Merge pull request #12363 from expipiplus1/llvm-enable-shared 
llvm: Add enableSharedLibraries option to 3.5 and 3.6
 2016-01-18 01:41:25 +01:00
Yacine Hmito
1d8313042d Renamed subdirectories in Android SKD's build-tools 
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
 2016-01-18 00:42:54 +01:00
Franz Pletz
0f107fcb67 3dfsb: Remove package 
Package is broken, old and not easily fixable.

See #12397.
 2016-01-17 23:57:23 +01:00
Robin Gloster
ba4b4752f2 racerRust: 1.0.0 -> 1.1.0 2016-01-17 22:05:25 +00:00
Robin Gloster
a80a07865d rustRegistry: 2015-12-23 -> 2016-01-17 2016-01-17 22:05:20 +00:00
Robin Gloster
1cdc7c556a Merge pull request #12445 from 4z3/urlwatch 
urlwatch: 1.18 -> 2.0 incl. its new dependency minidb-2.0.1
 2016-01-17 22:42:50 +01:00
Peter Simons
1ab1c7166b Merge pull request #12444 from erlang-nix/propagate-build-plugins 
Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3
 2016-01-17 22:36:11 +01:00
tv
180655290d urlwatch: 1.18 -> 2.0 2016-01-17 22:00:39 +01:00
Gleb Peregud
ed4373e8b7 Pass buildPlugins to rebar3-nix-bootstrap. 
To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
 2016-01-17 21:59:27 +01:00
tv
ceaec1a108 minidb: init at 2.0.1 2016-01-17 21:59:22 +01:00
Tobias Geerinckx-Rice
0ef8fa011f sshuttle: 0.74 -> 0.76 
And back to fetchurl we go:

  “LookupError: setuptools-scm was unable to detect version for
   '/tmp/nix-build-.../sshuttle-v0.76-src'. Make sure you're not
   using GitHub's tarballs (or similar ones), as those don't
   contain the necessary metadata. Use PyPI's tarballs instead.”
 2016-01-17 21:52:36 +01:00
Domen Kožar
9e8eba48ab xorg.xorgserver: wrap Xvfb with required flags 2016-01-17 21:14:49 +01:00
Nikolay Amiantov
00eeae1179 gajim: add extraPythonPackages option 
For exampole, this allows to add python-axolotl to PYTHONPATH,
which is needed for OMEMO OTR messaging plugin.
 2016-01-17 22:24:14 +03:00
Nikolay Amiantov
49363a40ba python-axolotl: init at 0.1.7 2016-01-17 22:24:10 +03:00
Nikolay Amiantov
4d43687fc1 python-axolotl-curve25519: init at 0.1 2016-01-17 22:24:05 +03:00
Christopher Lübbemeier
ebd1a4ca9f spotify: 0.9.17.1 -> 1.0.19.106 
changes by @globin:
used wrapper instead of propagatedUserEnvPkgs for zenity

closes #12191

Signed-off-by: Robin Gloster <mail@glob.in>
 2016-01-17 19:18:32 +00:00
Pascal Wittmann
ff837f9288 Merge pull request #12443 from gebner/lean-ninja 
lean: update and add wrapper for linja
 2016-01-17 20:00:16 +01:00
Matthias Beyer
ae5ef2b009 pygraphviz: init at 1.3 
changes by @globin:
1.2 -> 1.3
correct license information

Signed-off-by: Robin Gloster <mail@glob.in>
 2016-01-17 18:11:37 +00:00
Robin Gloster
656acf3719 mates: remove package 
see #11926 for context

closes #11926
 2016-01-17 18:11:08 +00:00
Mateusz Kowalczyk
2be0338ec3 Merge pull request #12329 from luke-clifton/gsasl-krb5 
Bring in krb5 for darwin builds seeing as we use
 2016-01-17 17:38:50 +00:00
Robin Gloster
1dfdd01ec9 Merge pull request #11589 from kragniz/cookiecutter 
Add cookiecutter
 2016-01-17 17:57:55 +01:00
Louis Taylor
fb9052c098 cookiecutter: init at 1.3.0 2016-01-17 16:53:31 +00:00
Louis Taylor
b0ca115059 pythonPackages.chardet: update homepage 2016-01-17 16:31:28 +00:00
Louis Taylor
9fa25759cc pythonPackages.chardet: 2.1.1 -> 2.3.0 2016-01-17 16:31:22 +00:00
Louis Taylor
ff5c859460 pythonPackages.ruamel_base: init at 1.0.0 2016-01-17 16:31:17 +00:00
Louis Taylor
96bb93a5a1 pythonPackages.ruamel_ordereddict: init at 0.4.9 2016-01-17 16:31:10 +00:00
Louis Taylor
a5846c6c51 pythonPackages.ruamel_yaml: init at 0.10.13 2016-01-17 16:31:05 +00:00
Louis Taylor
d0db3c2d52 pythonPackages.future: 0.14.3 -> 0.15.2 2016-01-17 16:30:57 +00:00
Louis Taylor
84c8763a17 pythonPackages.whichcraft: init at 0.1.1 2016-01-17 16:30:52 +00:00
Louis Taylor
6f94a131e8 pythonPackages.binaryornot: init at 0.4.0 2016-01-17 16:30:42 +00:00
Robin Gloster
11468de4a1 Merge pull request #12421 from otwieracz/0ad_0.18_to_0.19 
0ad: 0.18 -> 0.19
 2016-01-17 16:55:24 +01:00
Arseniy Seroka
a69192df2b Merge pull request #12431 from henrytill/racket-6.3 
racket: 6.2.1 -> 6.3, add parameter to enable building docs
 2016-01-17 18:36:44 +03:00
Frederik Rietdijk
19c1c5dd78 Merge pull request #12434 from mogorman/sopel 
sopel: init at 6.1.1
 2016-01-17 16:20:44 +01:00
Matthew O'Gorman
3a14a5b375
sopel: init at 6.1.1 2016-01-17 10:13:06 -05:00
Pascal Wittmann
a0c40bfcff python-radicale: 1.0.1 -> 1.1.1 2016-01-17 14:56:12 +01:00
Slawomir Gonet
5dbf70b924 0ad: binary renamed from 'pyrogenesis' to '0ad' 2016-01-17 14:15:59 +01:00
Pascal Wittmann
67a61addf4 abduco: 0.4 -> 0.5 2016-01-17 14:06:42 +01:00
Nikolay Amiantov
8bc95895e1 openmpi: remove enableStatic while it's still hot 
Eelco showed alternative way of building static libraries via
stdenv adapter in a conversation several days ago and expressed
concern about adding new enableStatic flags.
 2016-01-17 15:07:51 +03:00
Domen Kožar
f69743b4b4 Merge pull request #11401 from zagy/add/shortuuid 
pythonPackage shortuuid: init at 0.4.2
 2016-01-17 13:01:16 +01:00
Domen Kožar
e16ed8c579 Merge pull request #12287 from abbradar/openmpi 
openmpi: 1.6.5 -> 1.10.1
 2016-01-17 12:59:05 +01:00
Domen Kožar
07dcea52e6 Merge pull request #12419 from avnik/rmilter+rspamd 
Rmilter+rspamd packages and NixOS modules
 2016-01-17 12:57:51 +01:00
Domen Kožar
64d305245d Merge pull request #12424 from k0ral/lemonbar 
lemonbar: 1.1 -> 1.2pre
 2016-01-17 12:46:29 +01:00
Domen Kožar
30cf0be24b Merge pull request #12440 from hrdinka/update/nginx-lua 
nginxModules.lua: 0.9.19 -> 0.10.0
 2016-01-17 12:45:59 +01:00
Peter Simons
f62bcff14d configuration-hackage2nix.yaml: update list of broken packages 2016-01-17 12:29:03 +01:00
Peter Simons
9815d92d91 haskell-generic-builder: GHC 8.0.x wants --disable-profiling instead of --disable-executable-profiling 2016-01-17 12:29:03 +01:00
Peter Simons
1c74ad9f04 haskell-transformers-compat: use latest version when building with GHC 8.0.x. 2016-01-17 12:29:02 +01:00
Peter Simons
d3d0978abf darcs: remove obsolete overrides 2016-01-17 12:29:02 +01:00
Peter Simons
1c4666409c hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 3a04b0b2d4
  - Hackage: e505b113f6
  - LTS Haskell: e72964a553
  - Stackage Nightly: 14a3a2d00e
 2016-01-17 12:27:33 +01:00
Pascal Wittmann
57469df20b Merge pull request #12439 from k0ral/conky 
conky: 1.10.0 -> 1.10.1
 2016-01-17 11:54:34 +01:00
Vladimír Čunát
4a097fdc3f ffmpeg-2.2: remove this vulnerable branch 
Upstream doesn't maintain it anymore and it's unused in nixpkgs.
/cc #12437.
 2016-01-17 11:45:10 +01:00
Svein Ove Aas
0dc1bc4aee fgallery: 1.7 -> 1.8 2016-01-17 11:28:50 +01:00
koral
dd4dd8c87a conky: 1.10.0 -> 1.10.1 2016-01-17 11:22:10 +01:00
Mathieu Boespflug
545444cd19 R: add a new enableStrictBarrier package option. 
This option compiles R with --enable-strict-barrier. Doing so is
enables extra memory diagnostics in R that very useful for debugging
memory leak or memory protections issues in extensions to R written in
C, or for any apps embedding R (e.g. Haskell aps embedding R via
HaskellR).
 2016-01-17 11:09:05 +01:00
Domen Kožar
9dc768f308 Merge pull request #12397 from eduarrrd/3dfsb 
3dfsb: mark as broken, remove self from maintainers
 2016-01-17 11:02:42 +01:00
Vladimír Čunát
0b7e17e5a5 audacity: apply Arch patch to avoid vulnerable ffmpeg 
Now it builds with the latest branch. /cc #12437.
 2016-01-17 10:25:46 +01:00
Frederik Rietdijk
83ff34d08c Merge pull request #12369 from leenaars/lpod 
lpod-python: init -> 1.1.5
 2016-01-17 10:24:23 +01:00
Domen Kožar
ec71535c81 Merge pull request #12432 from kragniz/12405 
pythonPackages.mezzanine: disable pypy
 2016-01-17 10:10:02 +01:00
Vladimír Čunát
85628148de ffmpeg(-2.8): security update to fix #12437 
2.8.5 is claimed to fix CVE-2016-{1897,1898}.
 2016-01-17 09:56:32 +01:00
Gabriel Ebner
8a26d9b84f lean: add wrapper for linja 2016-01-17 09:29:18 +01:00
Gabriel Ebner
36c430de12 lean: 20150821 -> 20160117 2016-01-17 09:29:05 +01:00
Michiel Leenaars
889936791d lpod: init -> 1.1.5 2016-01-16 23:45:40 +01:00
Louis Taylor
5be28250cb pythonPackages.mezzanine: disable pypy 
Closes #12405.
 2016-01-16 21:17:38 +00:00
Domen Kožar
36057827f6 requireFile: remove colon from the url for easier copy/paste 2016-01-16 21:58:40 +01:00
Henry Till
00f394e2a9 racket: 6.2.1 -> 6.3 2016-01-16 15:57:23 -05:00
Henry Till
6fc61a173e racket: add parameter to enable building docs 2016-01-16 15:57:02 -05:00
Arseniy Seroka
e20ec1b12b Merge pull request #12426 from womfoo/unrar 
unrar: 5.2.7 -> 5.3.9
 2016-01-16 23:11:45 +03:00
Arseniy Seroka
647cc4ff10 Merge pull request #12430 from LnL7/youcompleteme-python-path 
vimPlugins.youcompleteme: patch default python path
 2016-01-16 23:11:26 +03:00
Dan Peebles
edaf46fb64 stdenv-darwin: add parent attribute to bootstrap 
This makes it far easier than before to hit/test early stages of the
stdenv bootstrap.
 2016-01-16 14:54:11 -05:00
Nikolay Amiantov
de9634bba3 Merge pull request #11998 from abbradar/initrd-root 
make-initrd: store all files with root as owner
 2016-01-16 22:45:49 +03:00
Daiderd Jordan
ea5910a859 vimPlugins.youcompleteme: patch default python path 2016-01-16 20:21:47 +01:00
Peter Simons
fc32bc1963 Merge pull request #12429 from erlang-nix/fix-rebar3-nix-bootstrap-shebang 
Make rebar3-nix-bootstrap depend on erlang.
 2016-01-16 19:47:40 +01:00
Gleb Peregud
0692c6a96d Make rebar3-nix-bootstrap depend on erlang. 
This fixes patchShebangs ability to properly fix up path to escript
binary.
 2016-01-16 18:53:48 +01:00
Damien Cassou
6115684b73 Avoid CamelCase in filenames and add buildEclipse 2016-01-16 18:35:35 +01:00
Damien Cassou
351ae1bd24 Merge pull request #12427 from DamienCassou/launcher-0.2.9 
pharo-launcher: 0.2.8 -> 0.2.9
 2016-01-16 18:31:13 +01:00
Damien Cassou
6c6bf8790d pharo-launcher: 0.2.8 -> 0.2.9 2016-01-16 18:30:11 +01:00
Arseniy Seroka
5042e323be Merge pull request #12412 from eduarrrd/qtcreator 
qtcreator: 3.5.1 -> 3.6.0
 2016-01-16 19:52:55 +03:00
Peter Simons
3ec7fa20fb Improve GHC 8.0.x package set configuration. 2016-01-16 17:42:18 +01:00
Christoph Hrdinka
a3e3b76363 nginxModules.lua: 0.9.19 -> 0.10.0 2016-01-16 16:35:07 +01:00
Frederik Rietdijk
1d02daf9b0 Merge pull request #12423 from k0ral/aria2 
aria2: 1.19.2 -> 1.19.3
 2016-01-16 16:03:41 +01:00
koral
9ed9457846 lemonbar: 1.1 -> 1.2pre 
'bar' has been officially renamed 'lemonbar'.
Last release (1.1) is almost a year old, but some bugfixes and new features are available in the repository, let's include them in the derivation.
 2016-01-16 16:03:18 +01:00
Franz Pletz
1bac185dae openttd: Add OpenGFX, OpenSFX, OpenMSX 
Closes #12400.
 2016-01-16 15:58:09 +01:00
Frederik Rietdijk
b8a59b10c1 Merge pull request #12355 from FRidh/pyaudio 
pythonPackages.pyaudio: 0.2.4 -> 0.2.9
 2016-01-16 15:39:07 +01:00
koral
2077895251 aria2: 1.19.2 -> 1.19.3 2016-01-16 15:34:29 +01:00
Peter Simons
7824b8c330 Merge pull request #12409 from erlang-nix/master 
Improvements for Erlang support in Nix
 2016-01-16 15:25:06 +01:00
Slawomir Gonet
1e0434ebe0 0ad: 0.18 -> 0.19 2016-01-16 15:09:47 +01:00
Alexander V. Nikolaev
480083922c rspamd: init at git-2016-01-11 2016-01-16 15:10:36 +02:00
Alexander V. Nikolaev
59f0090ded rmilter: init at 1.6.7 2016-01-16 15:10:36 +02:00
Pascal Wittmann
06d49bfba7 Merge pull request #12413 from kragniz/terminator-0.98 
terminator: 0.97 -> 0.98
 2016-01-16 13:51:32 +01:00
Mate Kovacs
60dcdac5c2 pythonPackages.pyshp: init at 1.2.3 2016-01-16 00:37:19 -08:00
Gabriel Ebner
c7e48a3eb8 libsoup: 2.50.0 -> 2.52.2 2016-01-16 08:51:38 +01:00
Gabriel Ebner
e8980608c6 glib-networking: 2.44.0 -> 2.46.1 2016-01-16 08:40:44 +01:00
Kranium Gikos Mendoza
0baa5abb9b unrar: 5.2.7 -> 5.3.9 2016-01-16 15:29:32 +08:00
Jakob Gillich
6a24c20744 ricochet: add desktop file, cleanups 
closes #11979, #11974
 2016-01-16 08:23:59 +01:00
Gabriel Ebner
23b3e6430e qutebrowser: 0.4.1 -> 0.5.0 
Fixes #8568 by using the release tarballs.
 2016-01-16 07:23:44 +01:00
Gabriel Ebner
dbd3a5ff20 qutebrowser: use correct plugin versions 
Since PyQt uses Qt 5.5, we need to use the Qt plugins from 5.5 as well,
and gstreamer plugins from 1.0.
 2016-01-16 07:23:44 +01:00
Tobias Geerinckx-Rice
4a860b8fbf copy-com: remove deprecated Nix-specific alias 2016-01-16 04:56:08 +01:00
Louis Taylor
b3eca61b55 terminator: 0.97 -> 0.98 2016-01-16 03:36:31 +00:00
aszlig
8f793ce6bb
elfutils: Fix header compatibility with glibc 2.21 
Regression introduced by df2b9b48cb.

This breaks the build for ltrace and other programs using libelf,
because the header file relies on features from glibc >= 2.22.

Here is an excerpt from the log output of the configure script from
ltrace:

In file included from ...elfutils-0.165/include/gelf.h:32:0,
                 from conftest.c:57:
...elfutils-0.165/include/libelf.h:280:8: error: unknown type name 'Elf32_Chdr'
 extern Elf32_Chdr *elf32_getchdr (Elf_Scn *__scn);
        ^
...elfutils-0.165/include/libelf.h:281:8: error: unknown type name 'Elf64_Chdr'
 extern Elf64_Chdr *elf64_getchdr (Elf_Scn *__scn);
        ^
In file included from conftest.c:57:0:
...elfutils-0.165/include/gelf.h:89:9: error: unknown type name 'Elf64_Chdr'
 typedef Elf64_Chdr GElf_Chdr;
         ^

The issue has been reported in the Debian bug tracker at
https://bugs.debian.org/810885 and I'm using the patch from Mark
Wielaard that has been posted there which adds compatibility for older
glibc versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-01-16 01:37:37 +01:00
Eduard Bachmakov
7a0dbbbe43 qtcreator: 3.5.1 -> 3.6.0 2016-01-15 19:19:42 -05:00
Evgeny Egorochkin
26f221d6b6 azure-cli: fix dependencies 2016-01-16 00:33:03 +02:00
Pascal Wittmann
df7139de36 hevea: 2.26 -> 2.28 2016-01-15 21:36:23 +01:00
Pascal Wittmann
edeaa7d26c linuxConsoleTools: 1.4.8 -> 1.4.9 2016-01-15 21:36:23 +01:00
Pascal Wittmann
5cee8ff809 calibre: 2.48.0 -> 2.49.0 2016-01-15 21:36:23 +01:00
Peter Simons
623664daaa ghc-8.0.1: drop unused docbooc-related build inputs 
The documentation is now built via Sphinx (todo).
 2016-01-15 20:47:58 +01:00
Peter Simons
19e5ecfb49 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:

  - Nixpkgs: 65d4f18f9e
  - Hackage: 03c5ce2cbc
  - LTS Haskell: e72964a553
  - Stackage Nightly: 23478137ac
 2016-01-15 20:47:58 +01:00
Arseniy Seroka
f845685128 Merge pull request #12394 from rasendubi/terminess 
powerline-fonts: Install Terminus font
 2016-01-15 22:45:34 +03:00
Simon Jagoe
42d4175e4e kernel: 4.1.13 -> 4.1.15 (close #12408) 2016-01-15 19:59:52 +01:00
Vladimír Čunát
340d3088aa telepathy-qt: finish the of fix parallel build 
Recommended by upstream
https://bugs.freedesktop.org/show_bug.cgi?id=93707#c5
 2016-01-15 19:55:06 +01:00
Louis Taylor
6309f48137 rkt: 0.14.0 -> 0.15.0 2016-01-15 18:09:58 +00:00
Robin Gloster
00b2e1f704 Merge pull request #11809 from mayflower/fix/libvirtd_service 
libvirtd service: Move mutable configs to /var
 2016-01-15 18:58:40 +01:00
Edward Tjörnhammar
d4f9220ed2 idea.idea14-community: init at 14.1.6 2016-01-15 18:21:45 +01:00
Edward Tjörnhammar
69c98f75e2 idea: unpin the common builder 2016-01-15 18:21:45 +01:00
Eric Merritt
24a9dcd12f rebar3: refactor 
Move registrySnapshot to the erlang-nix github organization
 2016-01-15 09:07:06 -08:00
Vladimír Čunát
dbfb717f55 telepathy-qt: tiny update 0.9.6 -> 0.9.6.1 2016-01-15 18:06:01 +01:00
Vladimír Čunát
cdb0db3f31 telepathy-qt: fix parallel build by upstream patch 2016-01-15 18:06:00 +01:00
Shea Levy
d9fa9b1a45 Add rt and perl packages it needs 2016-01-15 12:05:43 -05:00
Frederik Rietdijk
e99005382e Merge pull request #12214 from FRidh/numpy 
pythonPackages.numpy: 1.10.2 -> 1.10.4
 2016-01-15 17:23:03 +01:00
Eric Merritt
e8933f6a4e webdriver: init at 0.0.0+build.18.7ceaf1f 2016-01-15 08:17:33 -08:00
Eric Merritt
acf4bfd585 erlang support: overridable allow installPhase 
This commit allows the installPhase of buildRebar3 to be overridden by
the user.
 2016-01-15 08:17:33 -08:00
Eelco Dolstra
2fcee55e5f separateDebugInfo: Create symlinks matching original binaries 
For instance, a binary like libfoo.so will cause a symlink
lib/debug/libfoo.so.debug -> .build-id/<build-ID>.debug to be
created. This is primarily useful for use with eu-addr2line, if you
know the name of a binary and the relative address, but not the build
ID.
 2016-01-15 16:16:11 +01:00
Lluís Batlle i Rossell
5b20713041 inadyn: update to 1.99.15 
It fixes a big bug about IP not getting updated.
https://github.com/troglobit/inadyn/issues/107
 2016-01-15 16:14:40 +01:00
lethalman
2ba13aa534 Merge pull request #12301 from roblabla/feature-initMatrixSynapse 
matrix-synapse: init at 0.12.0
 2016-01-15 16:07:14 +01:00
Lluís Batlle i Rossell
4eb1e346c6 Improving the patch for mairix for mbox>2GB. 
https://github.com/rc0/mairix/pull/19
 2016-01-15 16:00:46 +01:00
roblabla
7e10bf4327 matrix-synapse: init at 0.12.0 2016-01-15 15:17:14 +01:00
Eelco Dolstra
df2b9b48cb elfutils: 163 -> 165 
Also, install programs with the "eu-" prefix to prevent collisions
with binutils (as recommended by upstream), enable xz support, and
enable deterministic archives.
 2016-01-15 15:01:13 +01:00
Tristan Helmich
bce59a1a8b libvirtd service: Move mutable configs to /var 
Modifies libvirt package to search for configs in /var/lib and changes
libvirtd service to copy the default configs to the new location.

This enables the user to change e.g. the networking configuration with
virsh or virt-manager and keep those settings.
 2016-01-15 14:26:20 +01:00
Vladimír Čunát
6607b72dc0 Revert "eigen: 3.2.5 -> 3.3-alpha1" to fix freecad 
This reverts commit c8b9753882.
Fixes #12401. It wasn't intended to have "alpha" version as default.
 2016-01-15 13:56:37 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
c29df5f8a7 firefox: fixup ${name} problems introduced in 2e78e19 
Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
 2016-01-15 13:32:36 +01:00
Nikolay Amiantov
26bd247921 Merge pull request #12404 from abbradar/steam-newlibcpp 
Add options to use new libstdc++ on Steam
 2016-01-15 15:13:00 +03:00
Nikolay Amiantov
f4d71737a8 steam: propagate runtime-wrapped flags for more convenient overrides 2016-01-15 15:01:55 +03:00
Nikolay Amiantov
9a07a8505e steam-runtime-wrapped: add optional override of libstdc++ 2016-01-15 15:01:55 +03:00
Domen Kožar
514a7f9e2e Merge pull request #12381 from FRidh/dyn 
pythonPackages.dyn: init at 1.5.0
 2016-01-15 12:21:06 +01:00
Franz Pletz
a25fc6e54d Merge pull request #12391 from rycee/bump/nethogs 
nethogs: 0.8.1-git -> 0.8.1
 2016-01-15 12:20:25 +01:00
Frederik Rietdijk
cdb38d5fdf Merge pull request #12367 from nlewo/master 
ledger-autosync: init at 0.2.3
 2016-01-15 12:04:57 +01:00
Eelco Dolstra
126d3e1449 Fix evaluation of "unstable" job 
Commit 19f6edbfb8 made "unstable" depend
on some Darwin jobs, but these didn't exist because of the "= linux"
overrides in release.nix.
 2016-01-15 11:46:49 +01:00
Antoine Eiche
9319129e58 ledger-autosync: init at 0.2.3 2016-01-15 11:19:34 +01:00
Vladimír Čunát
34fe0833c8 iozone: commit some forgotten fixups (/cc #12387) 2016-01-15 10:26:18 +01:00
Vladimír Čunát
c169718a6b git-bz: fix meta typo 
Thanks to @heydojo.
 2016-01-15 10:26:18 +01:00
Vincent Laporte
38226ea4c3 smtube: add missing build dependency 2016-01-15 10:04:06 +01:00
Vincent Laporte
32b8d31b3a gnumeric: 1.12.24 -> 1.12.26 2016-01-15 10:04:06 +01:00
Vincent Laporte
60e1740763 goffice: 0.10.24 -> 0.10.26 2016-01-15 10:04:06 +01:00
Svein Ove Aas
a28032ed58 iozone: init at 3.434 (close #12387) 
vcunat amended some $out/share/ install paths.
 2016-01-15 09:47:57 +01:00
Damien Cassou
0b4c7d42a8 pharo-vm: Refactor to introduce new VMs (close #12388) 
The Pharo community now has a Spur VM: this VM is the only one to
open Pharo50 images.
 2016-01-15 09:29:11 +01:00
Vladimír Čunát
98218971c2 Merge #12299: make firefox-like browsers wrapped by default 2016-01-15 08:53:58 +01:00
Vladimír Čunát
f50d80f627 makeDesktopItem: change name of the derivations 
The name wasn't suggesting what kind of stuff is in there;
now it's the same as the name of the file that gets generated.
 2016-01-15 08:37:02 +01:00
Vladimír Čunát
2e78e19de0 firefox: put "unwrapped" into its name 
I'm not certain about this, so I'm trying for firefox only.
Rationale: it might be confusing to see two firefox-${version} instances
in logs or paths, so I wanted to differentiate them.
 2016-01-15 08:36:22 +01:00
Vladimír Čunát
a8f1d40c1f all-packages: browserWrapper -> browser 
- I chose to keep `browser-unwrapped` attributes so that it's much
  easier to override parameters for the browser (through `packageOverrides`).
- Aliases `browserWrapper` are retained for now, as usual.
 2016-01-15 08:36:08 +01:00
Pascal Wittmann
3be1836e3d Merge pull request #12398 from eduarrrd/pianobar 
pianobar: 2014.09.28 -> 2015.11.22
 2016-01-15 07:45:54 +01:00
Tobias Geerinckx-Rice
d1440745c6 git-bz: meta: un-break; fix licence; maintain 
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
36a68c8b6b git-bz: 3.20110902 -> 3.2015-09-08 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
123065aa3d git-bz: use callPackage and canonical package name 
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
 2016-01-15 05:31:47 +01:00
Eduard Bachmakov
f119de4b35 pianobar: 2014.09.28 -> 2015.11.22 2016-01-14 22:25:39 -05:00
Thomas Tuegel
c3ea981263 Merge pull request #12395 from eduarrrd/dfm 
dfilemanager: update to git from 2016-01-10
 2016-01-14 20:56:43 -06:00
Eduard Bachmakov
82abca9c9b 3dfsb: mark as broken, remove self from maintainers 2016-01-14 21:56:38 -05:00
Tobias Geerinckx-Rice
8c5ef127f4 simp_le: 20151207 -> 2016-01-09; co-maintain 
CC maintainer @gebner.
 2016-01-15 03:49:13 +01:00
Eduard Bachmakov
6e7362dc8f dfilemanager: update to git from 2016-01-10 2016-01-14 21:06:03 -05:00
Evgeny Egorochkin
dcd428db08 azure-cli: init at 0.9.13 2016-01-15 03:11:20 +02:00
Tobias Geerinckx-Rice
a52b238bab Merge pull request #12120 from benley/cdparanoia-darwin 
cdparanoia: fix Darwin build
 2016-01-15 00:56:06 +01:00
Franz Pletz
a224badfea Merge pull request #12373 from nathan7/docker-journald 
docker: enable journald support
 2016-01-15 00:54:55 +01:00
Alexey Shmalko
c37c8e1c00 ycmd: Init at 2016-01-12 2016-01-15 01:39:21 +02:00
Alexey Shmalko
3b1fe914b9 powerline-fonts: Install Terminus font 
Patched Terminus font is neither .otf, nor .ttf so it wasn't installed
before.
 2016-01-15 01:21:26 +02:00
Tobias Geerinckx-Rice
5876238d54 eid-mw: 4.1.11 -> 4.1.12 2016-01-14 23:55:47 +01:00
Tobias Geerinckx-Rice
d8fa7f7b06 miniupnpd 1.9.20151212 -> 1.9.20160113 
Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt
 2016-01-14 23:55:47 +01:00
Tobias Geerinckx-Rice
d1232049fb tkgate 2.x: remove dead package 
Broken since April 2014. Homepage leads to an expired domain.
 2016-01-14 23:55:47 +01:00
Tobias Geerinckx-Rice
ad80ae008a cinnamon: remove dead packages 
Broken since April 2014. Never more than a handful of basic
framework packages, had most of its work ahead of it.
Almost immediately abandoned, and the maintainer vanished.

Close #2132.
 2016-01-14 23:55:47 +01:00
Eric Merritt
4ed5836dd3 hex2nix: init at 0.0.2 2016-01-14 14:38:10 -08:00
Eric Merritt
b1719f9fcc erlang support: Add 187 packages pulled from Hex 
This commit adds 187 packages from Hex.pm and documents 100 more that
could not be imported for various reasons. The packages where generated
by hex2nix.
 2016-01-14 14:37:56 -08:00
Eric Merritt
d541d0e640 erlang support: seperate hex and rebar3 support 
Building Hex packages is a superset of building with rebar3. There is no
need to force folks that use rebar3 but not hex to build with hex. This
commit seperates the rebar3 specific bits and the hex specific bits into
seperate functions that can be used independently.
 2016-01-14 14:37:35 -08:00
Eric Merritt
b509dadbf1 erlang support: remove broken buildErlang function 
The buildErlang function is broken and and leads Engineers down a wrong
path. For vanilla erlang that doesn't user rebar3, its better to simply
use `stdenv.mkDerivation` along with a set setupHook then the existing
functionality.
 2016-01-14 14:37:21 -08:00
Eric Merritt
10fd4dff99 erlang support: move hex packages to hex namespace 
This commit moves all the hex based packages to a single namespace. It
also moves all the packages to a single file.  This is in preparation
for the move to a system to generate the hex packages from the hex
package store.
 2016-01-14 14:37:07 -08:00
Eric Merritt
474e417891 erlang support: allow nix-shell to work correctly 
This changes build-hex.nix so that the buildHex and related functions
work correctly in a nix-shell.
 2016-01-14 14:36:47 -08:00
Eric Merritt
a0309d871c move callPackage into the export set for 'Erlang' 
This allows us to have a callPackages that includes erlang packages
 2016-01-14 14:35:03 -08:00
Eric Merritt
99bf9bf07a rebar3-nix-boostrap: init at 0.0.1 2016-01-14 14:34:47 -08:00
Robert Helgesson
b4f03263ec nethogs: 0.8.1-git -> 0.8.1 
Also use fetchFromGitHub, use make flags instead of patching Makefile,
and add myself as maintainer since the package is unmaintained.
 2016-01-14 20:49:20 +01:00
Robin Gloster
07f07f2d30 Merge pull request #12389 from jgillich/atom-1.4.0 
atom: 1.3.3 -> 1.4.0
 2016-01-14 17:42:32 +01:00
Lluís Batlle i Rossell
6401bb1795 mairix: add fix (patch) for big files. 2016-01-14 17:38:57 +01:00
Arseniy Seroka
be12086866 Merge pull request #12371 from otwieracz/master 
ccl updated to 1.11
 2016-01-14 19:01:32 +03:00
codsl
79cc97c637 ricochet: init at 1.1.1 2016-01-14 16:55:25 +01:00