summary refs log tree commit diff
path: root/pkgs/applications
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-02-27
|\
| * Merge pull request #11141 from cresh/darwin-msmtpzimbatm2016-02-27
| |\ | | | | | | msmtp: Enable on OS X with Keychain integration.
| | * msmtp: Enable on OS X with Keychain integration.Marcus Crestani2015-11-19
| | |
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-02-27
|\| |
| * | Merge pull request #13486 from zimbatm/vim-default-configArseniy Seroka2016-02-27
| |\ \ | | | | | | | | vim: provide a default vimrc
| | * | vim: provide a default vimrczimbatm2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | Minimal sane defaults imported from ArchLinux. This is basically `set :nocompatible` with some other small changes.
| * | | Merge pull request #13482 from nico202/qnoterozimbatm2016-02-26
| |\ \ \ | | | | | | | | | | qnotero: init at 1.0.0
| | * | | qnotero: init at 1.0.0=2016-02-26
| | | | |
| * | | | libreoffice: 5.0.4.2 -> 5.1.0.3 (a new attempt); set XDG_DATA_DIRS for ↵Michael Raskin2016-02-26
| | | | | | | | | | | | | | | | | | | | access to GSettings schemas
| * | | | chromium: Regenerate sources.nix with new updateraszlig2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | chromium: Refactor updater entirely in Nixaszlig2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | emacs: fix priority for ctagsCharles Strahan2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`).
| * | | | Reverting dependency src for revertMichael Raskin2016-02-26
| | | | |
| * | | | Temporarily revert LibreOffice updateMichael Raskin2016-02-26
| | | | |
| * | | | Merge pull request #13164 from romildo/fix/eclipse-plugin-cupzimbatm2016-02-26
| |\ \ \ \ | | | | | | | | | | | | eclipse-plugins-cup: fix plugin file names
| | * | | | eclipse-plugins-cup: add dependency on the zest pluginJosé Romildo Malaquias2016-02-26
| | | | | |
| | * | | | eclipse-plugin-zest: init at 3.9.101José Romildo Malaquias2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | eclipse-plugins-cup: remove plugins.nix.orig that was wrongly added.
| | * | | | eclipse-plugins-cup: fix plugin file namesJosé Romildo Malaquias2016-02-26
| | | | | |
| * | | | | Merge pull request #13396 from mayflower/pkg/gitlabzimbatm2016-02-26
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | gitlab: 8.0.5 -> 8.5.1, service improvements
| | * | | | fixup! gitlab: 8.0.5 -> 8.5.0, service improvementsFranz Pletz2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | 8.5.0 -> 8.5.1
| | * | | | gitlab: 8.0.5 -> 8.5.0, service improvementsFranz Pletz2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge pull request #13461 from FRidh/kcalcFrederik Rietdijk2016-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | kde5.kcalc: init at 15.12
| | * | | | | kde5.kcalc: init at 15.12Frederik Rietdijk2016-02-25
| | | | | | |
| * | | | | | Merge pull request #13435 from tg-x/calcFranz Pletz2016-02-26
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | calc: init at 2.12.5.3
| | * | | | | calc: init at 2.12.5.3tg(x)2016-02-24
| | |/ / / /
| * | | | | chromium: Provide SHA256s for beta/dev pluginsaszlig2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | chromium/updater: Allow a single plugin archaszlig2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Merge pull request #13466 from benley/git-stree-0.4.5Franz Pletz2016-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | git-stree: init at 0.4.5
| | * | | | | git-stree: init at 0.4.5Benjamin Staffin2016-02-25
| | | | | | |
| * | | | | | Merge pull request #13430 from nico202/yarpFranz Pletz2016-02-26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | yarp (+ libace): init at 2.3.64
| | * | | | | | yarp (+ libace): init at 2.3.64=2016-02-24
| | | | | | | |
| * | | | | | | emacs: add optional support for 24-bit color ttysCharles Strahan2016-02-26
| | | | | | | |
| * | | | | | | Merge pull request #8393 from hrdinka/update/huginzimbatm2016-02-26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | hugin: update 2013.0.0 -> 2015.0.0
| | * | | | | | | hugin: update 2013.0.0 -> 2015.0.0Christoph Hrdinka2016-02-06
| | | | | | | | |
| * | | | | | | | Merge pull request #11812 from bnikolic/recoll-updatezimbatm2016-02-26
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | recoll: 1.20.6 -> 1.21.3
| | * | | | | | | recoll: 1.20.6 -> 1.21.3Bojan Nikolic2015-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dependency on bison. Correct corruption caused by substituteInPlace replacing non-commands in the filters
| | * | | | | | | recoll: Disable --install-layoutBojan Nikolic2015-12-18
| | | | | | | | |
| | * | | | | | | recoll: Enable parallel buildsBojan Nikolic2015-12-18
| | | | | | | | |
| * | | | | | | | Merge pull request #11997 from benley/google-chrome-variantszimbatm2016-02-26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | google-chrome: add -beta and -unstable variants
| | * | | | | | | | google-chrome: add -beta and -unstable variantsBenjamin Staffin2015-12-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a little weird that chromium has chromium, chromiumBeta, chromiumDev but this one is google-chrome, google-chrome-beta, google-chrome-dev. Not quite sure what the best resolution is, if any.
| * | | | | | | | | Merge pull request #13154 from zimbatm/git-rebase-fix-v2zimbatm2016-02-26
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git: fixes references to gettext properly
| | * | | | | | | | | git: fixes references to gettext properlyzimbatm2016-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A better implementation of 5273dbf530a1149076cfd22c676b09c5f2627524 Fixes https://github.com/NixOS/nixpkgs/issues/13150 The attached patch removes a whole swath of unnecessary runtime gettext detection. It also adds gettext on the PATH so that git-rebase can find it.
| * | | | | | | | | | Merge pull request #13463 from avnik/feature/gimp-with-pluginszimbatm2016-02-25
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | Feature: gimp with plugins
| | * | | | | | | | | gimp: add gimp-with-plugin derivationAlexander V. Nikolaev2016-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | | | | | gimp: Use http link as gimp-gap sourcesAlexander V. Nikolaev2016-02-25
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #13465 from benley/git-alphabetizezimbatm2016-02-25
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git-and-tools: alphabetize attributes before it gets too huge
| | * | | | | | | | | | git-and-tools: alphabetize attributes before it gets too hugeBenjamin Staffin2016-02-25
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #13464 from zimbatm/termite-11Pascal Wittmann2016-02-25
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | Termite 11
| | * | | | | | | | | | termite: split terminfo into it's own outputzimbatm2016-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6141
| | * | | | | | | | | | termite: 10 -> 11zimbatm2016-02-25
| | | | | | | | | | | |