3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

77153 commits

Author SHA1 Message Date
Eelco Dolstra f98a5946b7 glibc: 2.21 -> 2.22 2016-02-18 20:54:52 +01:00
Bjørn Forsman b2b1511353 nixos/collectd: add defaultText to package option
CC @fpletz
2016-02-18 20:30:05 +01:00
Eelco Dolstra 8af685d089 Merge pull request #13097 from jerith666/antrun
ant: preserve antRun script
2016-02-18 19:48:12 +01:00
Shea Levy c4910af815 Merge branch 'redis-3.0.7' of https://github.com/kragniz/nixpkgs 2016-02-18 13:30:57 -05:00
Eelco Dolstra 7b2ac69ada aws-sdk-cpp: Allow building some APIS and disabling custom memory management 2016-02-18 19:29:40 +01:00
Eelco Dolstra 42255f8945 Merge pull request #13087 from rasendubi/gdb_multitarget
gdb: add multitarget option
2016-02-18 19:14:41 +01:00
Arseniy Seroka 5a7ff03fe6 Merge pull request #12923 from mboes/update-spark
spark: 1.5 -> 1.6.
2016-02-18 20:37:20 +03:00
Louis Taylor 6326172fed redis: 3.0.6 -> 3.0.7 2016-02-18 17:36:36 +00:00
Mathieu Boespflug 936312879c spark: 1.4 -> 1.6. 2016-02-18 18:29:44 +01:00
Luca Bruno b7c57c831f Merge pull request #13099 from datakurre/datakurre-dockertools
dockerTools: Fix issue where image name with repository prefix was no…
2016-02-18 17:30:54 +01:00
Asko Soukka 584427c694 dockerTools: Fix issue where image name with repository prefix was not supported 2016-02-18 18:16:58 +02:00
Frederik Rietdijk 278663bb77 Merge pull request #13065 from DamienCassou/update-pythonPackages.keyring
pythonPackages.keyring: 3.3 -> 8.4.1
2016-02-18 16:38:38 +01:00
Matt McHenry e5e633ca11 ant: preserve antRun script 2016-02-18 10:13:39 -05:00
Thomas Tuegel aa2e03e6ff qt55.qtbase: upstream patch for backing store issue
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.

This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-02-18 06:09:20 -06:00
Franz Pletz 30213ffa3b rspamd: git-2016-01-16 -> 1.1.3 2016-02-18 13:03:01 +01:00
Franz Pletz 799a3f8147 rmilter: 1.6.7 -> 1.7.3
Fixes #13080.
2016-02-18 13:02:35 +01:00
Frederik Rietdijk 1a4ecefa3d Merge pull request #13095 from mdorman/alsafix
Fix sha256 for alsa-tools.
2016-02-18 13:02:04 +01:00
Franz Pletz 4a8871a8ac Merge pull request #13086 from tg-x/tlsdated-extraOptions
tlsdated: add missing default value for extraOptions
2016-02-18 13:01:21 +01:00
Michael Alan Dorman 1318ab1246 Fix sha256 for alsa-tools. 2016-02-18 06:41:40 -05:00
Frederik Rietdijk b3f764428f Merge pull request #13050 from bendlas/fix-inkscape
inkscape: add numpy to runtime path
2016-02-18 09:17:31 +01:00
Alexey Shmalko bdf89087d9 gdb: add multitarget option
Multitarget option builds gdb with support for all targets. That's
similar to gdb-multiarch package in Ubuntu or gdb with multitarget
USE-flag in Gentoo.
2016-02-18 07:26:27 +02:00
tg(x) de787adb90 tlsdated: add missing default value for extraOptions 2016-02-18 05:29:12 +01:00
Franz Pletz de5a233a71 firmware-linux-nonfree: 2015-12-04 -> 2016-01-26 2016-02-18 03:49:14 +01:00
Franz Pletz ed979124ca collectd service: Add option package 2016-02-18 03:44:55 +01:00
Franz Pletz eff9726d54 linux: 4.3.4 -> 4.3.5 2016-02-18 03:44:19 +01:00
Franz Pletz 6cdf5fe85f linux: 4.1.17 -> 4.1.18 2016-02-18 03:44:12 +01:00
Franz Pletz d756ff9354 linux: 3.18.26 -> 3.18.27 2016-02-18 03:44:07 +01:00
Frederik Rietdijk 81fe3eb13f pythonPackages.numexpr: 2.4.6 -> 2.5 2016-02-17 22:19:00 +01:00
Tomas Hlavaty a6c09bf4b4 msitools: init at 0.94
I'm leaving authorship to the one who created most of the expression.
2016-02-17 22:05:21 +01:00
Frederik Rietdijk b0d54e00f9 Merge pull request #13078 from FRidh/matplotlib
pythonPackages: update matplotlib and cycler
2016-02-17 21:15:25 +01:00
aszlig 98faa0c8f3
lib/types: Set name of types.package to "package"
Nobody seems to have noticed this (except @Profpatsch) that options with
a "package" type do not get included in the manual.

So debugging this was a bit more involving because while generating the
manual there is an optionList' attribute built from the collected
attributes of all the option declarations.

Up to that point everything is fine except if it comes to
builtins.toXML, where attributes with { type = "derivation" } won't get
included, for example see here:

nix-repl> builtins.toXML { type = "derivation"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <derivation>
 <repeated />\n  </derivation>\n</expr>\n"

nix-repl> builtins.toXML { type = "somethingelse"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <attrs>
     <attr name=\"foo\">\n      <string value=\"bar\" />\n    </attr>
     <attr name=\"type\">\n      <string value=\"somethingelse\" />
     </attr>\n </attrs>\n</expr>\n"

The following function in libexpr/eval.cc (Nix) is responsible for toXML
dropping the attributes:

bool EvalState::isDerivation(Value & v)
{
    if (v.type != tAttrs) return false;
    Bindings::iterator i = v.attrs->find(sType);
    if (i == v.attrs->end()) return false;
    forceValue(*i->value);
    if (i->value->type != tString) return false;
    return strcmp(i->value->string.s, "derivation") == 0;
}

So I've renamed this now to "package" which is not only more consistent
with the option type but also shouldn't cause similar issues anymore.

Tested this on base of b60ceea, because building the dependencies on
recent libc/staging changes on master took too long.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Profpatsch <mail@profpatsch.de>
2016-02-17 21:12:24 +01:00
aszlig 7bdcfb33f4
nixos: Provide a defaultText for type = package
We don't want to build all those things along with the manual, so that's
what the defaultText attribute is for.

Unfortunately a few of them were missing, so let's add them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-17 21:12:24 +01:00
Frederik Rietdijk ddec19c823 pythonPackages.matplotlib: 1.5.0 -> 1.5.1 2016-02-17 21:02:15 +01:00
Frederik Rietdijk 61f0527694 pythonPackages.cycler: 0.9.0 -> 0.10.0 2016-02-17 21:02:03 +01:00
Allan Espinosa 60c7bd1237 jenkins: 1.643 -> 1.647 2016-02-17 20:45:01 +01:00
Frederik Rietdijk c44176237a pythonPackages.fs: build with all Python versions
and add updated explanation of why tests are disabled.
See also https://github.com/NixOS/nixpkgs/pull/13066
2016-02-17 19:42:43 +01:00
Vladimír Čunát 74bda15a94 gettext.sh: fixup calls to absolute paths
For discussion see https://github.com/NixOS/nixpkgs/pull/13072
2016-02-17 18:16:20 +01:00
Nikolay Amiantov 57b3ad8962 Merge pull request #13070 from jgillich/elm
elm: update to latest revs
2016-02-17 17:17:20 +03:00
Jakob Gillich d006529ca9 elm: update to latest revs
Some tags were updated with bug fixes. Also fixed update-elm.rb to
include the callPackage argument for release.nix.
2016-02-17 14:59:29 +01:00
Nikolay Amiantov 18c3420579 openbrf: init at 2016-01-09 2016-02-17 16:54:41 +03:00
Nikolay Amiantov 0418733737 vcg: init at 2016-02-14 2016-02-17 16:54:05 +03:00
Damien Cassou 3f3aa755a3 pythonPackages.keyring: 3.3 -> 8.4.1 2016-02-17 14:33:30 +01:00
Frederik Rietdijk 800fdcfa11 Merge pull request #13063 from desiderius/redis-2.10.5
pythonPackages.redis: 2.10.3 -> 2.10.5
2016-02-17 14:27:49 +01:00
Franz Pletz 1b40dec2a6 Merge pull request #13062 from datakurre/datakurre-mopidy-spotify
mopidy-spotify: 2.2.0 -> 2.3.1
2016-02-17 14:08:54 +01:00
Rob Vermaas b2f2d2fef3 Fix azure image, by adding subformat=fixed to disk generation. 2016-02-17 12:02:52 +00:00
Rob Vermaas 1ecb2a8782 Fix xclip hash, make revision explicit, in stead of depending on HEAD.
(cherry picked from commit c9ef3b51a3)
2016-02-17 12:00:20 +00:00
zimbatm 078e85e0e5 Merge pull request #12922 from igsha/dirac
dirac: init at 1.0.2
2016-02-17 10:17:59 +00:00
Vladimír Čunát b8c489e781 Merge branch 'staging'
It seemed very fine on Hydra before it was cancelled due to glibc rebuild,
in particular the nixpkgs unstable job succeeded except for
bootstrap-tarball tests which should be fine after ee994dfae6.

Therefore, let's avoid another mass rebuild by merging now when we don't
have binaries for master anyway.
2016-02-17 10:54:26 +01:00
Vladimír Čunát 4ca2332bac nixpkgs manual: fix typo in filename 2016-02-17 10:52:42 +01:00
desiderius 15a1a72c4e pythonPackages.redis: 2.10.3 -> 2.10.5 2016-02-17 10:47:28 +01:00