1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-22 18:45:53 -04:00
Commit graph

77316 commits

Author SHA1 Message Date
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
Svend Sorensen 028f553d43 jenkins-job-builder: 1.3.0 -> 1.4.0 2016-02-17 15:34:54 -08:00
Svend Sorensen dc8213fa4d ansible2: v2.0.0_0.6.rc1 -> v2.0.0.2 2016-02-17 15:29:18 -08:00
Cole Mickens 454be2f4d7 plex: 0.9.15.3.1663 -> 0.9.15.3.1674 2016-02-17 14:47:55 -08:00
Cole Mickens 2abb0ddb53 plex: plexpass 0.9.5.3.1674 -> 0.9.15.4.1679 2016-02-17 14:46:06 -08: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
Ricardo M. Correia 26415f963a ocamlPackages.containers: init at 0.15 2016-02-17 20:42:14 +01:00
Ricardo M. Correia a1e96c7cbe ocamlPackages.sequence: init at 0.6 2016-02-17 20:42:14 +01:00
Ricardo M. Correia e20b978708 ocamlPackages.gen: init at 0.3 2016-02-17 20:42:13 +01:00
José Romildo Malaquias 1199288de9 opensmtpd: 5.7.3p1 -> 5.7.3p2 2016-02-17 17:21:28 -02: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
Nikolay Amiantov 53269f1455 octoprint service: init 2016-02-17 17:05:59 +03:00
Nikolay Amiantov 199aeab96e yaml-merge: init at 2016-02-16 2016-02-17 17:05:59 +03:00
Nikolay Amiantov 303991218b octoprint-plugins.stlviewer: init at 0.3.0 2016-02-17 17:01:14 +03:00
Nikolay Amiantov 3f9acdc148 octoprint-plugins.titlestatus: init at 0.0.2 2016-02-17 17:01:14 +03:00
Nikolay Amiantov 4db16aed11 octoprint-plugins.m3d-fio: init at 0.26 2016-02-17 17:01:01 +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 aad9a88a20 octoprint: init at 1.2.9 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 90375d6200 pythonPackages.flaskbabel: propagate dependencies 2016-02-17 16:56:14 +03:00
Nikolay Amiantov f74b5ac684 pythonPackages.tornado_4_0_1: init at 4.0.1 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 75d9531c47 pythonPackages.webassets: init at 0.11.1 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 41648cbb8b pythonPackages.sockjs-tornado: init at 1.0.2 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 55ddc3f96d pythonPackages.rsa: propagate pyasn1 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 47869abead pythonPackages.pylru: init at 1.0.9 2016-02-17 16:56:14 +03:00
Nikolay Amiantov d7b1ffe9c7 pythonPackages.flask_script: init at 2.0.5 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 95ffcafff3 pythonPackages.flask_principal: init at 0.4.0 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 25616affc5 pythonPackages.flask_login: init at 0.2.2 2016-02-17 16:56:14 +03:00
Nikolay Amiantov ef9e10f62a pythonPackages.flask_assets: init at 0.10 2016-02-17 16:56:14 +03:00
Nikolay Amiantov b96b7c9628 pythonPackages.regex: init at 2016.01.10 2016-02-17 16:56:14 +03:00
Nikolay Amiantov a0c9acb007 pythonPackages.sarge: init at 0.1.4 2016-02-17 16:56:14 +03:00
Nikolay Amiantov 7c02fc1b5e pythonPackages.awesome-slugify: init at 1.6.5 2016-02-17 16:56:14 +03:00
Nikolay Amiantov aeee93faf3 m3d-linux: init at 2016-01-20 2016-02-17 16:56:14 +03: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