Commit graph

77658 commits

Author SHA1 Message Date
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
Domen Kožar
a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt
CUPS update (second attempt)
2016-02-26 11:13:30 +00:00
Domen Kožar
c99d589162 Merge pull request #13116 from kragniz/requests2-2.9.1
requests2: 2.8.1 -> 2.9.1
2016-02-26 11:11:36 +00:00
Domen Kožar
fe9f5dbbbc Merge pull request #6600 from 4z3/tlsdate
tlsdate doesn't build on x86_64-darwin
2016-02-26 10:59:00 +00:00
zimbatm
c86e10c115 Merge pull request #13469 from tg-x/acme-external
simp_le: external_pem.sh plugin is now called external.sh
2016-02-26 10:48:55 +00:00
zimbatm
d8c3a83b5c Merge pull request #13477 from cstrahan/vte-ng
vte-ng: 0.42.1.a -> 0.42.4.a
2016-02-26 10:46:06 +00:00
vbgl
d39595c54f Merge pull request #13404 from knedlsepp/fix-darwin-tcl-tk
Fix darwin tcl tk
2016-02-26 11:38:26 +01: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
0bbe8e1884 Merge pull request #13454 from grahamc/xerces
xerces-c: 3.1.1 -> 3.1.3
2016-02-26 11:25:25 +01:00
zimbatm
6035c3a136 Merge pull request #9400 from Mathnerd314/package-overrides-fix
all-packages: Apply packageOverrides package-by-package
2016-02-26 10:17:53 +00: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
Franz Pletz
d5a2c4cb05 libinput: Add libwacom dependency
Fixes #13476 & #13147.
2016-02-26 11:03:28 +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
Eelco Dolstra
20682386ca Merge pull request #13472 from doshitan/fix-ec2-data
ec2-data: ensure providing a SSH host key is actually optional
2016-02-26 10:41:44 +01: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
Charles Strahan
ce7aa71880 vte-ng: 0.42.1.a -> 0.42.4.a 2016-02-26 00:48:39 -05:00
Charles Strahan
e08dd09c25 emacs: add optional support for 24-bit color ttys 2016-02-26 00:33:56 -05:00
Tanner Doshier
4e5ef470a7 ec2-data: ensure providing a SSH host key is actually optional
2701665904 broke this.
2016-02-25 20:11:49 -06: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
69f151f577 Merge pull request #8547 from Ralith/boost-clang
Fix detection of clang toolset
2016-02-26 00:58:05 +00:00
zimbatm
d2f3e250cf Merge pull request #8576 from obadz/nix-prefetch-zip
Add --ext option to nix-prefetch-zip
2016-02-26 00:57:30 +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
3110d60cf6 Merge pull request #10768 from rycee/refactor/nix-generate-from-cpan
nix-generate-from-cpan: large refactor
2016-02-26 00:40:15 +00:00
zimbatm
b73c5ae291 Merge pull request #10546 from aszlig/nixops-issue-350
Fixes for NixOps issue #350
2016-02-26 00:33:49 +00:00
tg(x)
629a89343e simp_le: external_pem.sh plugin is now called external.sh 2016-02-26 01:31:58 +01: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
853a213698 Merge pull request #13323 from rycee/ddclient/platform
ddclient: add meta.platforms
2016-02-26 00:02:06 +00:00
zimbatm
d4e29d0e6d Merge pull request #12896 from rycee/bump/udiskie
udiskie: 1.1.2 -> 1.4.8
2016-02-26 00:01:34 +00:00
zimbatm
06a12136a5 Merge pull request #12824 from cransom/aws_shell
aws_shell: init at 0.1.0
2016-02-26 00:00:10 +00:00
zimbatm
1b0e81c41e Merge pull request #13453 from mayflower/pkgs_upstream/gti
gti: init at 2015-05-21 (edaac79)
2016-02-25 23:57:17 +00:00
zimbatm
e3da8a40e2 Merge pull request #12235 from deeky666/update-php-packages-attributes
phpPackages: init php56Packages and php70Packages
2016-02-25 23:56:18 +00:00
zimbatm
71e1fd1a0b Merge pull request #12599 from ftrvxmtrx/e19-update-1.16.1
e19: update
2016-02-25 23:50:31 +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
Tim Steinbach
7506c58d74 linux_3_10: 3.10.96 -> 3.10.97 (close #13405) 2016-02-25 23:09:08 +01:00
Tuomas Tynkkynen
0e1319f03f linux-3.10: fixup config by a slightly hacky way
For explanation see:
https://github.com/NixOS/nixpkgs/pull/13405#issuecomment-188357637
2016-02-25 23:07:47 +01: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
4a4c432f06 pythonPackages.ipykernel: 4.2.2 -> 4.3.0 2016-02-25 22:32:40 +01: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
Frederik Rietdijk
db54eed69c Merge pull request #13460 from nlewo/master
ledger-autosync: fix ofxclient propagation
2016-02-25 21:26:34 +01:00