Commit graph

12373 commits

Author SHA1 Message Date
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Arseniy Seroka c80a1baa15 Merge pull request #13486 from zimbatm/vim-default-config
vim: provide a default vimrc
2016-02-27 01:09:52 +03:00
zimbatm 951dc57716 Merge pull request #13482 from nico202/qnotero
qnotero: init at 1.0.0
2016-02-26 22:09:41 +00:00
zimbatm 89f0e25189 vim: provide a default vimrc
Minimal sane defaults imported from ArchLinux.

This is basically `set :nocompatible` with some other small changes.
2016-02-26 21:58:21 +00:00
Michael Raskin a94e433936 libreoffice: 5.0.4.2 -> 5.1.0.3 (a new attempt); set XDG_DATA_DIRS for access to GSettings schemas 2016-02-26 22:58:27 +01:00
= 728b1ce557 qnotero: init at 1.0.0 2016-02-26 22:09:54 +01:00
aszlig 54b4912566
chromium: Regenerate sources.nix with new updater
No changes in functionality, but to make future source updates a bit
easier on the eyes when viewing the diff.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 20:55:17 +01:00
aszlig 28b289efa6
chromium: Refactor updater entirely in Nix
The update.sh shell script now is only a call to nix-build, which does
all the hard work of updating the Chromium source channels and the
plugins. It results in a store path with the new sources.nix that
replaces the already existing sources.nix.

Along the way, this has led to a quite massive workaround, which abuses
MD5 collisions to detect whether an URL is existing, because something
like builtins.tryEval (builtins.fetchurl url) unfortunately doesn't
work. Further explanations and implementation details are documented in
the actual implementation.

The drawback of this is that we don't have nice status messages anymore,
but on the upside we have a more robust generation of the sources.nix
file, which now also should work properly on missing upstream
sources/binaries.

This also makes it much easier to implement fetching non-GNU/Linux
versions of Chromium and we have all values from omahaproxy available as
an attribute set (see the csv2nix and channels attributes in the update
attribute).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 20:55:17 +01:00
Charles Strahan 53ea7dee75 emacs: fix priority for ctags
This fixes the previous attempt (in commit 46d1dd5) to make ctags' ctags
override emacs' ctags. The higher the value of the priority attribute,
the higher the priority (see the definition of `buildEnv`).
2016-02-26 12:27:04 -05:00
Michael Raskin 32e954db64 Reverting dependency src for revert 2016-02-26 16:28:08 +01:00
Michael Raskin 66febbdfa7 Temporarily revert LibreOffice update 2016-02-26 16:26:34 +01:00
zimbatm 3833591d95 Merge pull request #13164 from romildo/fix/eclipse-plugin-cup
eclipse-plugins-cup: fix plugin file names
2016-02-26 11:23:28 +00:00
zimbatm 8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab
gitlab: 8.0.5 -> 8.5.1, service improvements
2016-02-26 11:19:28 +00:00
Frederik Rietdijk 48085add39 Merge pull request #13461 from FRidh/kcalc
kde5.kcalc: init at 15.12
2016-02-26 11:33:42 +01:00
Franz Pletz ef0325e940 Merge pull request #13435 from tg-x/calc
calc: init at 2.12.5.3
2016-02-26 11:16:11 +01:00
aszlig 716b79d3a5
chromium: Provide SHA256s for beta/dev plugins
As stated in the parent commit, the 32bit Chrome package is not
available upstream, so let's at least provide the SHA256 hash for the
64bit package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 10:55:51 +01:00
aszlig 459642b8de
chromium/updater: Allow a single plugin arch
Until now, if we have a failure to fetch either the 32bit Debian package
or the 64bit Debian package, neither of these will be put into
sources.nix.

Unfortunately the beta/dev channels do not have a 32bit Debian package,
so even though there is a 64bit Debian package available we don't get
plugins *at* *all*.

This also introduces a nicer error message rather than just failing with
an assertion in fetchurl because we did not provide url/urls.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 10:55:51 +01:00
José Romildo Malaquias 0e94a1be40 eclipse-plugins-cup: add dependency on the zest plugin 2016-02-26 06:42:04 -03:00
José Romildo Malaquias 205398c427 eclipse-plugin-zest: init at 3.9.101
eclipse-plugins-cup: remove plugins.nix.orig that was wrongly added.
2016-02-26 06:42:04 -03:00
José Romildo Malaquias ef11f77c8f eclipse-plugins-cup: fix plugin file names 2016-02-26 06:42:04 -03:00
Franz Pletz af17efd014 Merge pull request #13466 from benley/git-stree-0.4.5
git-stree: init at 0.4.5
2016-02-26 09:59:47 +01:00
Franz Pletz db2b0c8406 Merge pull request #13430 from nico202/yarp
yarp (+ libace): init at 2.3.64
2016-02-26 09:29:21 +01:00
Franz Pletz c2412bd700 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
8.5.0 -> 8.5.1
2016-02-26 08:31:21 +01:00
Franz Pletz bcfa59bf82 gitlab: 8.0.5 -> 8.5.0, service improvements
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
2016-02-26 07:08:31 +01:00
Charles Strahan e08dd09c25 emacs: add optional support for 24-bit color ttys 2016-02-26 00:33:56 -05:00
zimbatm b9db67d8e2 Merge pull request #8393 from hrdinka/update/hugin
hugin: update 2013.0.0 -> 2015.0.0
2016-02-26 01:03:47 +00:00
zimbatm b5407d402d Merge pull request #11812 from bnikolic/recoll-update
recoll: 1.20.6 -> 1.21.3
2016-02-26 00:41:47 +00:00
zimbatm 30891166be Merge pull request #11997 from benley/google-chrome-variants
google-chrome: add -beta and -unstable variants
2016-02-26 00:13:00 +00:00
zimbatm 428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2
git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
zimbatm 35f47333d0 Merge pull request #13463 from avnik/feature/gimp-with-plugins
Feature: gimp with plugins
2016-02-25 23:27:25 +00:00
Benjamin Staffin fe6ad9e912 git-stree: init at 0.4.5 2016-02-25 15:26:06 -08:00
zimbatm 0b33cd7b59 Merge pull request #13465 from benley/git-alphabetize
git-and-tools: alphabetize attributes before it gets too huge
2016-02-25 23:24:32 +00:00
Pascal Wittmann 48db4391e8 Merge pull request #13464 from zimbatm/termite-11
Termite 11
2016-02-25 23:58:13 +01:00
Benjamin Staffin ca5f243697 git-and-tools: alphabetize attributes before it gets too huge 2016-02-25 14:23:34 -08:00
zimbatm 3f3599f6be termite: split terminfo into it's own output
Fixes #6141
2016-02-25 22:14:58 +00:00
zimbatm f1df89f902 termite: 10 -> 11 2016-02-25 22:14:55 +00:00
Alexander V. Nikolaev 0649c8bde7 gimp: add gimp-with-plugin derivation
By default all plugins from pkgs.gimpPlugins set are enabled.

Default location of plugins changed from $out/${gimp.name} to
$out/lib/gimp/${majorVersion}. Resulting derivation for gimp+plugins
is set as search path for plugins by default (additional tweaking in
gimprc done for old plugin scheme should be removed)
2016-02-25 23:34:28 +02:00
Alexander V. Nikolaev fdd11c2c2b gimp: Use http link as gimp-gap sources 2016-02-25 23:34:17 +02:00
Frederik Rietdijk 05608d50f4 kde5.kcalc: init at 15.12 2016-02-25 22:21:56 +01:00
Frederik Rietdijk b2298b02cf kde5.filelight: init at 15.12 (close #13456)
vcunat also added himself to maintainers,
as filelight has been extremely helpful on closure-size branch.
2016-02-25 21:56:23 +01:00
Robin Gloster e0200a507b ssvnc: turn off format hardening 2016-02-25 20:06:54 +00:00
Tobias Geerinckx-Rice 500132ab5c sane-backends-git -> 2016-02-25 2016-02-25 20:54:24 +01:00
Graham Christensen 712d59225e chromium{,Beta,Dev}: 48.0.2564.97 -> 48.0.2564.116
From the debian security mailing list:

Several vulnerabilities have been discovered in the chromium web browser.

CVE-2016-1622

    It was discovered that a maliciously crafted extension could bypass
    the Same Origin Policy.

CVE-2016-1623

    Mariusz Mlynski discovered a way to bypass the Same Origin Policy.

CVE-2016-1624

    lukezli discovered a buffer overflow issue in the Brotli library.

CVE-2016-1625

    Jann Horn discovered a way to cause the Chrome Instant feature to
    navigate to unintended destinations.

CVE-2016-1626

    An out-of-bounds read issue was discovered in the openjpeg library.

CVE-2016-1627

    It was discovered that the Developer Tools did not validate URLs.

CVE-2016-1628

    An out-of-bounds read issue was discovered in the pdfium library.

CVE-2016-1629

    A way to bypass the Same Origin Policy was discovered in Blink/WebKit,
    along with a way to escape the chromium sandbox.
2016-02-25 12:00:12 -06:00
Edward Tjörnhammar 77d11ec577 idea.idea-{community,ultimate}: 15.0.3 -> 15.0.4 2016-02-25 17:48:07 +01:00
Robin Gloster 40c586b7ce Merge pull request #13427 from k0ral/mercurial
mercurial: 3.5.1 -> 3.7.1
2016-02-25 17:00:58 +01:00
Robin Gloster 84a10edede Merge pull request #13449 from matthiasbeyer/update-taskwarrior
taskwarrior: 2.5.0 -> 2.5.1
2016-02-25 16:59:10 +01:00
Tobias Geerinckx-Rice 759f48ab07 sane-backends-git: 2016-02-19 -> 2016-02-22 2016-02-25 16:19:42 +01:00
Nikolay Amiantov d3d193e263 octoprint-plugins.m3d-fio: 0.27 -> 0.27.1 2016-02-25 18:18:27 +03:00
Matthias Beyer 159c8f9284 taskwarrior: 2.5.0 -> 2.5.1 2016-02-25 15:49:37 +01:00
goibhniu c2ce61c78f Merge pull request #13443 from magnetophon/helm-0.6.1
helm: 2015-09-11 -> 0.6.1
2016-02-25 14:42:51 +01:00